From e3caec9d8a512586461de91962c0a7d295d09228 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Wed, 2 Dec 2009 21:24:41 -0500 Subject: [PATCH 001/172] Load notice data using javascript from the html on the page instead of writing json representations of the notices on each page Clicking on a geo link pops up a map (round 2) --- plugins/Mapstraction/MapstractionPlugin.php | 72 +-------------------- plugins/Mapstraction/allmap.php | 61 ++++++++++++++++- plugins/Mapstraction/usermap.php | 66 ++++++++++++++++++- 3 files changed, 127 insertions(+), 72 deletions(-) diff --git a/plugins/Mapstraction/MapstractionPlugin.php b/plugins/Mapstraction/MapstractionPlugin.php index c0c2c5b8e3..a0dbf52040 100644 --- a/plugins/Mapstraction/MapstractionPlugin.php +++ b/plugins/Mapstraction/MapstractionPlugin.php @@ -58,12 +58,12 @@ class MapstractionPlugin extends Plugin * * The way to register new actions from a plugin. * - * @param Router $m reference to router + * @param Router &$m reference to router * * @return boolean event handler return */ - function onRouterInitialized($m) + function onRouterInitialized(&$m) { $m->connect(':nickname/all/map', array('action' => 'allmap'), @@ -110,11 +110,6 @@ class MapstractionPlugin extends Plugin function onEndShowScripts($action) { $actionName = $action->trimmed('action'); - // These are the ones that have maps on 'em - if (!in_array($actionName, - array('showstream', 'all', 'allmap', 'usermap'))) { - return true; - } switch ($this->provider) { @@ -151,39 +146,6 @@ class MapstractionPlugin extends Plugin $action->raw(sprintf('var _provider = "%s";', $this->provider)); $action->elementEnd('script'); - switch ($actionName) { - case 'usermap': - case 'showstream': - $notice = empty($action->tag) - ? $action->user->getNotices(($action->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1) - : $action->user->getTaggedNotices($action->tag, ($action->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1, 0, 0, null); - break; - case 'all': - case 'allmap': - $cur = common_current_user(); - if (!empty($cur) && $cur->id == $action->user->id) { - $notice = $action->user->noticeInbox(($action->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); - } else { - $notice = $action->user->noticesWithFriends(($action->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); - } - break; - } - - $jsonArray = array(); - - while ($notice->fetch()) { - if (!empty($notice->lat) && !empty($notice->lon)) { - $jsonNotice = $this->noticeAsJson($notice); - $jsonArray[] = $jsonNotice; - } - } - - $action->elementStart('script', array('type' => 'text/javascript')); - $action->raw('/*raw('var _notices = ' . json_encode($jsonArray)); - $action->raw('/*]]>*/'); // XHTML compat for Safari - $action->elementEnd('script'); - return true; } @@ -214,34 +176,4 @@ class MapstractionPlugin extends Plugin $action->elementEnd('div'); } - - function noticeAsJson($notice) - { - // FIXME: this code should be abstracted to a neutral third - // party, like Notice::asJson(). I'm not sure of the ethics - // of refactoring from within a plugin, so I'm just abusing - // the ApiAction method. Don't do this unless you're me! - - require_once(INSTALLDIR.'/lib/api.php'); - - $act = new ApiAction('/dev/null'); - - $arr = $act->twitterStatusArray($notice, true); - $arr['url'] = $notice->bestUrl(); - $arr['html'] = $notice->rendered; - $arr['source'] = $arr['source']; - - if (!empty($notice->reply_to)) { - $reply_to = Notice::staticGet('id', $notice->reply_to); - if (!empty($reply_to)) { - $arr['in_reply_to_status_url'] = $reply_to->bestUrl(); - } - $reply_to = null; - } - - $profile = $notice->getProfile(); - $arr['user']['profile_url'] = $profile->profileurl; - - return $arr; - } } diff --git a/plugins/Mapstraction/allmap.php b/plugins/Mapstraction/allmap.php index 6a48b141fe..3a78ac0d4b 100644 --- a/plugins/Mapstraction/allmap.php +++ b/plugins/Mapstraction/allmap.php @@ -122,4 +122,63 @@ class AllmapAction extends OwnerDesignAction 'class' => 'gray smallmap', 'style' => "width: 100%; height: 400px")); } -} \ No newline at end of file + + function showScripts() + { + parent::showScripts(); + $cur = common_current_user(); + if (!empty($cur) && $cur->id == $this->user->id) { + $notice = $this->user->noticeInbox(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); + } else { + $notice = $this->user->noticesWithFriends(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); + } + + $jsonArray = array(); + + while ($notice->fetch()) { + if (!empty($notice->lat) && !empty($notice->lon)) { + $jsonNotice = $this->noticeAsJson($notice); + $jsonArray[] = $jsonNotice; + } + } + + $this->elementStart('script', array('type' => 'text/javascript')); + $this->raw('/*raw('var _notices = ' . json_encode($jsonArray).'; '); + $this->raw('showMapstraction($("#map_canvas"),_notices);'); + $this->raw('/*]]>*/'); // XHTML compat for Safari + $this->elementEnd('script'); + + return true; + } + + function noticeAsJson($notice) + { + // FIXME: this code should be abstracted to a neutral third + // party, like Notice::asJson(). I'm not sure of the ethics + // of refactoring from within a plugin, so I'm just abusing + // the ApiAction method. Don't do this unless you're me! + + require_once(INSTALLDIR.'/lib/api.php'); + + $act = new ApiAction('/dev/null'); + + $arr = $act->twitterStatusArray($notice, true); + $arr['url'] = $notice->bestUrl(); + $arr['html'] = $notice->rendered; + $arr['source'] = $arr['source']; + + if (!empty($notice->reply_to)) { + $reply_to = Notice::staticGet('id', $notice->reply_to); + if (!empty($reply_to)) { + $arr['in_reply_to_status_url'] = $reply_to->bestUrl(); + } + $reply_to = null; + } + + $profile = $notice->getProfile(); + $arr['user']['profile_url'] = $profile->profileurl; + + return $arr; + } +} diff --git a/plugins/Mapstraction/usermap.php b/plugins/Mapstraction/usermap.php index fbf1469c33..afa48b1629 100644 --- a/plugins/Mapstraction/usermap.php +++ b/plugins/Mapstraction/usermap.php @@ -123,4 +123,68 @@ class UsermapAction extends OwnerDesignAction 'class' => 'gray smallmap', 'style' => "width: 100%; height: 400px")); } -} \ No newline at end of file + + /** + * Hook for adding extra JavaScript + * + * @param Action $action Action object for the page + * + * @return boolean event handler return + */ + + function showScripts() + { + parent::showScripts(); + $notice = empty($this->tag) + ? $this->user->getNotices(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1) + : $this->user->getTaggedNotices($this->tag, ($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1, 0, 0, null); + + $jsonArray = array(); + + while ($notice->fetch()) { + if (!empty($notice->lat) && !empty($notice->lon)) { + $jsonNotice = $this->noticeAsJson($notice); + $jsonArray[] = $jsonNotice; + } + } + + $this->elementStart('script', array('type' => 'text/javascript')); + $this->raw('/*raw('var _notices = ' . json_encode($jsonArray).'; '); + $this->raw('showMapstraction($("#map_canvas"),_notices);'); + $this->raw('/*]]>*/'); // XHTML compat for Safari + $this->elementEnd('script'); + + return true; + } + + function noticeAsJson($notice) + { + // FIXME: this code should be abstracted to a neutral third + // party, like Notice::asJson(). I'm not sure of the ethics + // of refactoring from within a plugin, so I'm just abusing + // the ApiAction method. Don't do this unless you're me! + + require_once(INSTALLDIR.'/lib/api.php'); + + $act = new ApiAction('/dev/null'); + + $arr = $act->twitterStatusArray($notice, true); + $arr['url'] = $notice->bestUrl(); + $arr['html'] = $notice->rendered; + $arr['source'] = $arr['source']; + + if (!empty($notice->reply_to)) { + $reply_to = Notice::staticGet('id', $notice->reply_to); + if (!empty($reply_to)) { + $arr['in_reply_to_status_url'] = $reply_to->bestUrl(); + } + $reply_to = null; + } + + $profile = $notice->getProfile(); + $arr['user']['profile_url'] = $profile->profileurl; + + return $arr; + } +} From c89b10ffe4adb1df724b6a7c5c31b42c7dd3376b Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 2 Dec 2009 09:47:02 -0800 Subject: [PATCH 002/172] Code style cleanup: dropped some unnecessary =& reference assignments where they're used only out of habit for PHP 4-style object semantics --- actions/all.php | 2 +- actions/subscribers.php | 2 +- actions/subscriptions.php | 2 +- actions/userbyid.php | 2 +- lib/schema.php | 18 +++++++++--------- lib/util.php | 2 +- plugins/OpenID/finishaddopenid.php | 4 ++-- scripts/fixup_utf8.php | 8 ++++---- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/actions/all.php b/actions/all.php index 61cedce749..5a9d97dd76 100644 --- a/actions/all.php +++ b/actions/all.php @@ -160,7 +160,7 @@ class AllAction extends ProfileAction function showPageTitle() { - $user =& common_current_user(); + $user = common_current_user(); if ($user && ($user->id == $this->user->id)) { $this->element('h1', null, _("You and friends")); } else { diff --git a/actions/subscribers.php b/actions/subscribers.php index df9ec99615..cc9452820b 100644 --- a/actions/subscribers.php +++ b/actions/subscribers.php @@ -57,7 +57,7 @@ class SubscribersAction extends GalleryAction function showPageNotice() { - $user =& common_current_user(); + $user = common_current_user(); if ($user && ($user->id == $this->profile->id)) { $this->element('p', null, _('These are the people who listen to '. diff --git a/actions/subscriptions.php b/actions/subscriptions.php index cc7b38ee46..0dc5ee7624 100644 --- a/actions/subscriptions.php +++ b/actions/subscriptions.php @@ -59,7 +59,7 @@ class SubscriptionsAction extends GalleryAction function showPageNotice() { - $user =& common_current_user(); + $user = common_current_user(); if ($user && ($user->id == $this->profile->id)) { $this->element('p', null, _('These are the people whose notices '. diff --git a/actions/userbyid.php b/actions/userbyid.php index 86a61f20b3..ebff7e4a72 100644 --- a/actions/userbyid.php +++ b/actions/userbyid.php @@ -69,7 +69,7 @@ class UserbyidAction extends Action if (!$id) { $this->clientError(_('No id.')); } - $user =& User::staticGet($id); + $user = User::staticGet($id); if (!$user) { $this->clientError(_('No such user.')); } diff --git a/lib/schema.php b/lib/schema.php index df7cb65f56..a8ba91b87f 100644 --- a/lib/schema.php +++ b/lib/schema.php @@ -94,7 +94,7 @@ class Schema public function getTableDef($name) { - $res =& $this->conn->query('DESCRIBE ' . $name); + $res = $this->conn->query('DESCRIBE ' . $name); if (PEAR::isError($res)) { throw new Exception($res->getMessage()); @@ -213,7 +213,7 @@ class Schema $sql .= "); "; - $res =& $this->conn->query($sql); + $res = $this->conn->query($sql); if (PEAR::isError($res)) { throw new Exception($res->getMessage()); @@ -234,7 +234,7 @@ class Schema public function dropTable($name) { - $res =& $this->conn->query("DROP TABLE $name"); + $res = $this->conn->query("DROP TABLE $name"); if (PEAR::isError($res)) { throw new Exception($res->getMessage()); @@ -269,7 +269,7 @@ class Schema $name = "$table_".implode("_", $columnNames)."_idx"; } - $res =& $this->conn->query("ALTER TABLE $table ". + $res = $this->conn->query("ALTER TABLE $table ". "ADD INDEX $name (". implode(",", $columnNames).")"); @@ -291,7 +291,7 @@ class Schema public function dropIndex($table, $name) { - $res =& $this->conn->query("ALTER TABLE $table DROP INDEX $name"); + $res = $this->conn->query("ALTER TABLE $table DROP INDEX $name"); if (PEAR::isError($res)) { throw new Exception($res->getMessage()); @@ -314,7 +314,7 @@ class Schema { $sql = "ALTER TABLE $table ADD COLUMN " . $this->_columnSql($columndef); - $res =& $this->conn->query($sql); + $res = $this->conn->query($sql); if (PEAR::isError($res)) { throw new Exception($res->getMessage()); @@ -339,7 +339,7 @@ class Schema $sql = "ALTER TABLE $table MODIFY COLUMN " . $this->_columnSql($columndef); - $res =& $this->conn->query($sql); + $res = $this->conn->query($sql); if (PEAR::isError($res)) { throw new Exception($res->getMessage()); @@ -363,7 +363,7 @@ class Schema { $sql = "ALTER TABLE $table DROP COLUMN $columnName"; - $res =& $this->conn->query($sql); + $res = $this->conn->query($sql); if (PEAR::isError($res)) { throw new Exception($res->getMessage()); @@ -446,7 +446,7 @@ class Schema $sql = 'ALTER TABLE ' . $tableName . ' ' . implode(', ', $phrase); - $res =& $this->conn->query($sql); + $res = $this->conn->query($sql); if (PEAR::isError($res)) { throw new Exception($res->getMessage()); diff --git a/lib/util.php b/lib/util.php index 99a0a1db30..ab046e871d 100644 --- a/lib/util.php +++ b/lib/util.php @@ -127,7 +127,7 @@ function common_check_user($nickname, $password) if (0 == strcmp(common_munge_password($password, $user->id), $user->password)) { //internal checking passed - $authenticatedUser =& $user; + $authenticatedUser = $user; } } } diff --git a/plugins/OpenID/finishaddopenid.php b/plugins/OpenID/finishaddopenid.php index 6e889205d7..7cd9165231 100644 --- a/plugins/OpenID/finishaddopenid.php +++ b/plugins/OpenID/finishaddopenid.php @@ -80,7 +80,7 @@ class FinishaddopenidAction extends Action function tryLogin() { - $consumer =& oid_consumer(); + $consumer = oid_consumer(); $response = $consumer->complete(common_local_url('finishaddopenid')); @@ -103,7 +103,7 @@ class FinishaddopenidAction extends Action $sreg = $sreg_resp->contents(); } - $cur =& common_current_user(); + $cur = common_current_user(); $other = oid_get_user($canonical); diff --git a/scripts/fixup_utf8.php b/scripts/fixup_utf8.php index 5a9fba7c3f..30befadfd4 100755 --- a/scripts/fixup_utf8.php +++ b/scripts/fixup_utf8.php @@ -145,7 +145,7 @@ class UTF8FixerUpper echo "$id..."; - $result =& $this->dbu->execute($sth, array($content, $rendered, $id)); + $result = $this->dbu->execute($sth, array($content, $rendered, $id)); if (PEAR::isError($result)) { echo "ERROR: " . $result->getMessage() . "\n"; @@ -209,7 +209,7 @@ class UTF8FixerUpper echo "$id..."; - $result =& $this->dbu->execute($sth, array($fullname, $location, $bio, $id)); + $result = $this->dbu->execute($sth, array($fullname, $location, $bio, $id)); if (PEAR::isError($result)) { echo "ERROR: " . $result->getMessage() . "\n"; @@ -273,7 +273,7 @@ class UTF8FixerUpper echo "$id..."; - $result =& $this->dbu->execute($sth, array($fullname, $location, $description, $id)); + $result = $this->dbu->execute($sth, array($fullname, $location, $description, $id)); if (PEAR::isError($result)) { echo "ERROR: " . $result->getMessage() . "\n"; @@ -330,7 +330,7 @@ class UTF8FixerUpper echo "$id..."; - $result =& $this->dbu->execute($sth, array($content, $rendered, $id)); + $result = $this->dbu->execute($sth, array($content, $rendered, $id)); if (PEAR::isError($result)) { echo "ERROR: " . $result->getMessage() . "\n"; From 43a1a355241079da6bf355a996910b9d116bf105 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Thu, 3 Dec 2009 19:43:02 -0500 Subject: [PATCH 003/172] refactor the common parts of usermap and allmap into a common base class --- plugins/Mapstraction/MapstractionPlugin.php | 1 + plugins/Mapstraction/allmap.php | 125 ++------------ plugins/Mapstraction/map.php | 170 ++++++++++++++++++++ plugins/Mapstraction/usermap.php | 130 +-------------- 4 files changed, 189 insertions(+), 237 deletions(-) create mode 100644 plugins/Mapstraction/map.php diff --git a/plugins/Mapstraction/MapstractionPlugin.php b/plugins/Mapstraction/MapstractionPlugin.php index a0dbf52040..ca1a3bf209 100644 --- a/plugins/Mapstraction/MapstractionPlugin.php +++ b/plugins/Mapstraction/MapstractionPlugin.php @@ -90,6 +90,7 @@ class MapstractionPlugin extends Plugin { case 'AllmapAction': case 'UsermapAction': + case 'MapAction': include_once INSTALLDIR.'/plugins/Mapstraction/' . strtolower(mb_substr($cls, 0, -6)) . '.php'; return false; default: diff --git a/plugins/Mapstraction/allmap.php b/plugins/Mapstraction/allmap.php index 3a78ac0d4b..0c4f03b31c 100644 --- a/plugins/Mapstraction/allmap.php +++ b/plugins/Mapstraction/allmap.php @@ -37,59 +37,26 @@ if (!defined('STATUSNET')) { * @category Mapstraction * @package StatusNet * @author Evan Prodromou + * @author Craig Andrews * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ -class AllmapAction extends OwnerDesignAction +class AllmapAction extends MapAction { - var $profile = null; - var $page = null; - var $notices = null; - - public $plugin = null; - function prepare($args) { - parent::prepare($args); - - $nickname_arg = $this->arg('nickname'); - $nickname = common_canonical_nickname($nickname_arg); - - // Permanent redirect on non-canonical nickname - - if ($nickname_arg != $nickname) { - $args = array('nickname' => $nickname); - if ($this->arg('page') && $this->arg('page') != 1) { - $args['page'] = $this->arg['page']; + if(parent::prepare($args)) { + $cur = common_current_user(); + if (!empty($cur) && $cur->id == $this->user->id) { + $this->notice = $this->user->noticeInbox(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); + } else { + $this->notice = $this->user->noticesWithFriends(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); } - common_redirect(common_local_url($this->trimmed('action'), $args), 301); + return true; + }else{ return false; } - - $this->user = User::staticGet('nickname', $nickname); - - if (!$this->user) { - $this->clientError(_('No such user.'), 404); - return false; - } - - $this->profile = $this->user->getProfile(); - - if (!$this->profile) { - $this->serverError(_('User has no profile.')); - return false; - } - - $page = $this->trimmed('page'); - - if (!empty($page) && Validate::number($page)) { - $this->page = $page+0; - } else { - $this->page = 1; - } - - return true; } function title() @@ -109,76 +76,4 @@ class AllmapAction extends OwnerDesignAction $this->page); } } - - function handle($args) - { - parent::handle($args); - $this->showPage(); - } - - function showContent() - { - $this->element('div', array('id' => 'map_canvas', - 'class' => 'gray smallmap', - 'style' => "width: 100%; height: 400px")); - } - - function showScripts() - { - parent::showScripts(); - $cur = common_current_user(); - if (!empty($cur) && $cur->id == $this->user->id) { - $notice = $this->user->noticeInbox(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); - } else { - $notice = $this->user->noticesWithFriends(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); - } - - $jsonArray = array(); - - while ($notice->fetch()) { - if (!empty($notice->lat) && !empty($notice->lon)) { - $jsonNotice = $this->noticeAsJson($notice); - $jsonArray[] = $jsonNotice; - } - } - - $this->elementStart('script', array('type' => 'text/javascript')); - $this->raw('/*raw('var _notices = ' . json_encode($jsonArray).'; '); - $this->raw('showMapstraction($("#map_canvas"),_notices);'); - $this->raw('/*]]>*/'); // XHTML compat for Safari - $this->elementEnd('script'); - - return true; - } - - function noticeAsJson($notice) - { - // FIXME: this code should be abstracted to a neutral third - // party, like Notice::asJson(). I'm not sure of the ethics - // of refactoring from within a plugin, so I'm just abusing - // the ApiAction method. Don't do this unless you're me! - - require_once(INSTALLDIR.'/lib/api.php'); - - $act = new ApiAction('/dev/null'); - - $arr = $act->twitterStatusArray($notice, true); - $arr['url'] = $notice->bestUrl(); - $arr['html'] = $notice->rendered; - $arr['source'] = $arr['source']; - - if (!empty($notice->reply_to)) { - $reply_to = Notice::staticGet('id', $notice->reply_to); - if (!empty($reply_to)) { - $arr['in_reply_to_status_url'] = $reply_to->bestUrl(); - } - $reply_to = null; - } - - $profile = $notice->getProfile(); - $arr['user']['profile_url'] = $profile->profileurl; - - return $arr; - } } diff --git a/plugins/Mapstraction/map.php b/plugins/Mapstraction/map.php new file mode 100644 index 0000000000..89723f43ce --- /dev/null +++ b/plugins/Mapstraction/map.php @@ -0,0 +1,170 @@ +. + * + * @category Mapstraction + * @package StatusNet + * @author Evan Prodromou + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Show a map of notices + * + * @category Mapstraction + * @package StatusNet + * @author Evan Prodromou + * @author Craig Andrews + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class MapAction extends OwnerDesignAction +{ + var $profile = null; + var $page = null; + var $notices = null; + + function prepare($args) + { + parent::prepare($args); + + $nickname_arg = $this->arg('nickname'); + $nickname = common_canonical_nickname($nickname_arg); + + // Permanent redirect on non-canonical nickname + + if ($nickname_arg != $nickname) { + $args = array('nickname' => $nickname); + if ($this->arg('page') && $this->arg('page') != 1) { + $args['page'] = $this->arg['page']; + } + common_redirect(common_local_url($this->trimmed('action'), $args), 301); + return false; + } + + $this->user = User::staticGet('nickname', $nickname); + + if (!$this->user) { + $this->clientError(_('No such user.'), 404); + return false; + } + + $this->profile = $this->user->getProfile(); + + if (!$this->profile) { + $this->serverError(_('User has no profile.')); + return false; + } + + $page = $this->trimmed('page'); + + if (!empty($page) && Validate::number($page)) { + $this->page = $page+0; + } else { + $this->page = 1; + } + + $this->notices = empty($this->tag) + ? $this->user->getNotices(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1) + : $this->user->getTaggedNotices($this->tag, ($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1, 0, 0, null); + + return true; + } + + function handle($args) + { + parent::handle($args); + $this->showPage(); + } + + function showContent() + { + $this->element('div', array('id' => 'map_canvas', + 'class' => 'gray smallmap', + 'style' => "width: 100%; height: 400px")); + } + + /** + * Hook for adding extra JavaScript + * + * @param Action $action Action object for the page + * + * @return boolean event handler return + */ + + function showScripts() + { + parent::showScripts(); + $jsonArray = array(); + + while ($this->notice->fetch()) { + if (!empty($this->notice->lat) && !empty($this->notice->lon)) { + $jsonNotice = $this->noticeAsJson($this->notice); + $jsonArray[] = $jsonNotice; + } + } + + $this->elementStart('script', array('type' => 'text/javascript')); + $this->raw('/*raw('var _notices = ' . json_encode($jsonArray).'; '); + $this->raw('showMapstraction($("#map_canvas"),_notices);'); + $this->raw('/*]]>*/'); // XHTML compat for Safari + $this->elementEnd('script'); + + return true; + } + + function noticeAsJson($notice) + { + // FIXME: this code should be abstracted to a neutral third + // party, like Notice::asJson(). I'm not sure of the ethics + // of refactoring from within a plugin, so I'm just abusing + // the ApiAction method. Don't do this unless you're me! + + require_once(INSTALLDIR.'/lib/api.php'); + + $act = new ApiAction('/dev/null'); + + $arr = $act->twitterStatusArray($notice, true); + $arr['url'] = $notice->bestUrl(); + $arr['html'] = $notice->rendered; + $arr['source'] = $arr['source']; + + if (!empty($notice->reply_to)) { + $reply_to = Notice::staticGet('id', $notice->reply_to); + if (!empty($reply_to)) { + $arr['in_reply_to_status_url'] = $reply_to->bestUrl(); + } + $reply_to = null; + } + + $profile = $notice->getProfile(); + $arr['user']['profile_url'] = $profile->profileurl; + + return $arr; + } +} diff --git a/plugins/Mapstraction/usermap.php b/plugins/Mapstraction/usermap.php index afa48b1629..3e517ee864 100644 --- a/plugins/Mapstraction/usermap.php +++ b/plugins/Mapstraction/usermap.php @@ -37,61 +37,24 @@ if (!defined('STATUSNET')) { * @category Mapstraction * @package StatusNet * @author Evan Prodromou + * @author Craig Andrews * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ -class UsermapAction extends OwnerDesignAction +class UsermapAction extends MapAction { - var $profile = null; - var $page = null; - var $notices = null; - - public $plugin = null; function prepare($args) { - parent::prepare($args); - - $nickname_arg = $this->arg('nickname'); - $nickname = common_canonical_nickname($nickname_arg); - - // Permanent redirect on non-canonical nickname - - if ($nickname_arg != $nickname) { - $args = array('nickname' => $nickname); - if ($this->arg('page') && $this->arg('page') != 1) { - $args['page'] = $this->arg['page']; - } - common_redirect(common_local_url($this->trimmed('action'), $args), 301); + if(parent::prepare($args)) { + $this->notice = empty($this->tag) + ? $this->user->getNotices(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1) + : $this->user->getTaggedNotices($this->tag, ($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1, 0, 0, null); + return true; + }else{ return false; } - - $this->user = User::staticGet('nickname', $nickname); - - if (!$this->user) { - $this->clientError(_('No such user.'), 404); - return false; - } - - $this->profile = $this->user->getProfile(); - - if (!$this->profile) { - $this->serverError(_('User has no profile.')); - return false; - } - - $page = $this->trimmed('page'); - - if (!empty($page) && Validate::number($page)) { - $this->page = $page+0; - } else { - $this->page = 1; - } - - $this->notices = $this->user->getNotices(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); - - return true; } function title() @@ -110,81 +73,4 @@ class UsermapAction extends OwnerDesignAction $this->page); } } - - function handle($args) - { - parent::handle($args); - $this->showPage(); - } - - function showContent() - { - $this->element('div', array('id' => 'map_canvas', - 'class' => 'gray smallmap', - 'style' => "width: 100%; height: 400px")); - } - - /** - * Hook for adding extra JavaScript - * - * @param Action $action Action object for the page - * - * @return boolean event handler return - */ - - function showScripts() - { - parent::showScripts(); - $notice = empty($this->tag) - ? $this->user->getNotices(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1) - : $this->user->getTaggedNotices($this->tag, ($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1, 0, 0, null); - - $jsonArray = array(); - - while ($notice->fetch()) { - if (!empty($notice->lat) && !empty($notice->lon)) { - $jsonNotice = $this->noticeAsJson($notice); - $jsonArray[] = $jsonNotice; - } - } - - $this->elementStart('script', array('type' => 'text/javascript')); - $this->raw('/*raw('var _notices = ' . json_encode($jsonArray).'; '); - $this->raw('showMapstraction($("#map_canvas"),_notices);'); - $this->raw('/*]]>*/'); // XHTML compat for Safari - $this->elementEnd('script'); - - return true; - } - - function noticeAsJson($notice) - { - // FIXME: this code should be abstracted to a neutral third - // party, like Notice::asJson(). I'm not sure of the ethics - // of refactoring from within a plugin, so I'm just abusing - // the ApiAction method. Don't do this unless you're me! - - require_once(INSTALLDIR.'/lib/api.php'); - - $act = new ApiAction('/dev/null'); - - $arr = $act->twitterStatusArray($notice, true); - $arr['url'] = $notice->bestUrl(); - $arr['html'] = $notice->rendered; - $arr['source'] = $arr['source']; - - if (!empty($notice->reply_to)) { - $reply_to = Notice::staticGet('id', $notice->reply_to); - if (!empty($reply_to)) { - $arr['in_reply_to_status_url'] = $reply_to->bestUrl(); - } - $reply_to = null; - } - - $profile = $notice->getProfile(); - $arr['user']['profile_url'] = $profile->profileurl; - - return $arr; - } } From 35ff3961e8a51e41517d8a8b9e5a1a21f826e4ca Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Thu, 3 Dec 2009 19:59:31 -0500 Subject: [PATCH 004/172] Remove unnecessary pass by reference indicators --- plugins/Mapstraction/MapstractionPlugin.php | 4 ++-- plugins/UserFlag/UserFlagPlugin.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/Mapstraction/MapstractionPlugin.php b/plugins/Mapstraction/MapstractionPlugin.php index ca1a3bf209..c4f9cd77de 100644 --- a/plugins/Mapstraction/MapstractionPlugin.php +++ b/plugins/Mapstraction/MapstractionPlugin.php @@ -58,12 +58,12 @@ class MapstractionPlugin extends Plugin * * The way to register new actions from a plugin. * - * @param Router &$m reference to router + * @param Router $m reference to router * * @return boolean event handler return */ - function onRouterInitialized(&$m) + function onRouterInitialized($m) { $m->connect(':nickname/all/map', array('action' => 'allmap'), diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php index 60c0c2c0ac..e13c2555aa 100644 --- a/plugins/UserFlag/UserFlagPlugin.php +++ b/plugins/UserFlag/UserFlagPlugin.php @@ -68,7 +68,7 @@ class UserFlagPlugin extends Plugin return true; } - function onRouterInitialized(&$m) { + function onRouterInitialized($m) { $m->connect('main/flag/profile', array('action' => 'flagprofile')); $m->connect('admin/profile/flag', array('action' => 'adminprofileflag')); return true; From aef4cc0a59276938f0f0aec4d67374f578f2117a Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 3 Dec 2009 17:06:58 -0800 Subject: [PATCH 005/172] Make it impossible to block (and thus unsubscribe from your self-subscription) via the API. Additionally, make it impossible to block yourself or unsubscribe from yourself, period. I also made User use the subs.php helper function for unsubscribing during a block. Hopefully, these changes will get rid of the problem of people accidentally deleting their self-subscriptions once and for all (knock on wood). --- actions/apiblockcreate.php | 11 +++++++++++ classes/User.php | 34 ++++++++++++++++++++++++++-------- lib/subs.php | 6 ++++++ 3 files changed, 43 insertions(+), 8 deletions(-) diff --git a/actions/apiblockcreate.php b/actions/apiblockcreate.php index 4f941f6c32..e79dec32d0 100644 --- a/actions/apiblockcreate.php +++ b/actions/apiblockcreate.php @@ -98,6 +98,17 @@ class ApiBlockCreateAction extends ApiAuthAction return; } + // Don't allow blocking yourself! + + if ($this->user->id == $this->other->id) { + $this->clientError( + _("You cannot block yourself!"), + 403, + $this->format + ); + return; + } + if ($this->user->hasBlocked($this->other) || $this->user->block($this->other) ) { diff --git a/classes/User.php b/classes/User.php index f905ea2b72..4838fe1c7d 100644 --- a/classes/User.php +++ b/classes/User.php @@ -502,6 +502,19 @@ class User extends Memcached_DataObject { // Add a new block record + // no blocking (and thus unsubbing from) yourself + + if ($this->id == $other->id) { + common_log(LOG_WARNING, + sprintf( + "Profile ID %d (%s) tried to block his or herself.", + $profile->id, + $profile->nickname + ) + ); + return false; + } + $block = new Profile_block(); // Begin a transaction @@ -520,15 +533,20 @@ class User extends Memcached_DataObject // Cancel their subscription, if it exists - $sub = Subscription::pkeyGet(array('subscriber' => $other->id, - 'subscribed' => $this->id)); + $result = subs_unsubscribe_to($this, $other); - if ($sub) { - $result = $sub->delete(); - if (!$result) { - common_log_db_error($sub, 'DELETE', __FILE__); - return false; - } + if ($result !== true) { + common_log(LOG_WARNING, + sprintf( + "Error trying to unsubscribe profile ID %d (%s) from user ID %d (%s): %s", + $other->id, + $other->nickname, + $this->id, + $this->nickname, + $result + ) + ); + return false; } $block->query('COMMIT'); diff --git a/lib/subs.php b/lib/subs.php index 2fc3160dec..4b6b03967a 100644 --- a/lib/subs.php +++ b/lib/subs.php @@ -127,6 +127,12 @@ function subs_unsubscribe_to($user, $other) if (!$user->isSubscribed($other)) return _('Not subscribed!'); + // Don't allow deleting self subs + + if ($user->id == $other->id) { + return _('Couldn\'t delete self-subscription.'); + } + $sub = DB_DataObject::factory('subscription'); $sub->subscriber = $user->id; From d2b42577de54204d83eb8eac565c25edd4205542 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 3 Dec 2009 17:44:34 -0800 Subject: [PATCH 006/172] Was deleting wrong subscription during block. Now deletes the blockee's sub if it exists. --- classes/User.php | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/classes/User.php b/classes/User.php index 4838fe1c7d..2a4fab7d43 100644 --- a/classes/User.php +++ b/classes/User.php @@ -533,21 +533,7 @@ class User extends Memcached_DataObject // Cancel their subscription, if it exists - $result = subs_unsubscribe_to($this, $other); - - if ($result !== true) { - common_log(LOG_WARNING, - sprintf( - "Error trying to unsubscribe profile ID %d (%s) from user ID %d (%s): %s", - $other->id, - $other->nickname, - $this->id, - $this->nickname, - $result - ) - ); - return false; - } + subs_unsubscribe_to($other->getUser(),$this->getProfile()); $block->query('COMMIT'); From 40afc7e9877855272caa5c65fb3575e4420b2966 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Fri, 4 Dec 2009 01:57:14 -0500 Subject: [PATCH 007/172] Add 4 new events: StartCssLinkElement, EndCssLinkElement, StartScriptElement, EndScriptElement --- EVENTS.txt | 21 +++++++++++++++++++++ lib/htmloutputter.php | 42 ++++++++++++++++++++++++------------------ 2 files changed, 45 insertions(+), 18 deletions(-) diff --git a/EVENTS.txt b/EVENTS.txt index 34a222e8f3..f4ec620338 100644 --- a/EVENTS.txt +++ b/EVENTS.txt @@ -574,3 +574,24 @@ EndShortenUrl: After a URL has been shortened - $shortenerName: name of the requested shortener - $shortenedUrl: short version of the url +StartCssLinkElement: Before a element is written +- $action +- &$src +- &$theme +- &$media + +EndCssLinkElement: After a element is written +- $action +- $src +- $theme +- $media + +StartScriptElement: Before a element is written +- $action +- &$src +- &$type + +EndScriptElement: After a element is written +- $action +- $src +- $type diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php index d267526c88..a7c596917c 100644 --- a/lib/htmloutputter.php +++ b/lib/htmloutputter.php @@ -350,14 +350,17 @@ class HTMLOutputter extends XMLOutputter */ function script($src, $type='text/javascript') { - $url = parse_url($src); - if( empty($url->scheme) && empty($url->host) && empty($url->query) && empty($url->fragment)) - { - $src = common_path($src) . '?version=' . STATUSNET_VERSION; + if(Event::handle('StartScriptElement', array($this,&$src,&$type))) { + $url = parse_url($src); + if( empty($url->scheme) && empty($url->host) && empty($url->query) && empty($url->fragment)) + { + $src = common_path($src) . '?version=' . STATUSNET_VERSION; + } + $this->element('script', array('type' => $type, + 'src' => $src), + ' '); + Event::handle('EndScriptElement', array($this,$src,$type)); } - $this->element('script', array('type' => $type, - 'src' => $src), - ' '); } /** @@ -371,19 +374,22 @@ class HTMLOutputter extends XMLOutputter */ function cssLink($src,$theme=null,$media=null) { - $url = parse_url($src); - if( empty($url->scheme) && empty($url->host) && empty($url->query) && empty($url->fragment)) - { - if(file_exists(Theme::file($src,$theme))){ - $src = Theme::path($src, $theme) . '?version=' . STATUSNET_VERSION; - }else{ - $src = common_path($src); + if(Event::handle('StartCssLinkElement', array($this,&$src,&$theme,&$media))) { + $url = parse_url($src); + if( empty($url->scheme) && empty($url->host) && empty($url->query) && empty($url->fragment)) + { + if(file_exists(Theme::file($src,$theme))){ + $src = Theme::path($src, $theme) . '?version=' . STATUSNET_VERSION; + }else{ + $src = common_path($src); + } } + $this->element('link', array('rel' => 'stylesheet', + 'type' => 'text/css', + 'href' => $src, + 'media' => $media)); + Event::handle('EndCssLinkElement', array($this,$src,$theme,$media)); } - $this->element('link', array('rel' => 'stylesheet', - 'type' => 'text/css', - 'href' => $src, - 'media' => $media)); } /** From 01b089d9be046db1253cb3bb90e8635b50fddd84 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Fri, 4 Dec 2009 12:36:00 -0500 Subject: [PATCH 008/172] Added minify plugin --- plugins/Minify/MinifyPlugin.php | 101 + plugins/Minify/README | 20 + plugins/Minify/extlib/minify/HISTORY.txt | 75 + plugins/Minify/extlib/minify/LICENSE.txt | 26 + plugins/Minify/extlib/minify/README.txt | 53 + plugins/Minify/extlib/minify/UPGRADING.txt | 35 + plugins/Minify/extlib/minify/min/README.txt | 132 + .../extlib/minify/min/builder/_index.js | 242 ++ .../Minify/extlib/minify/min/builder/bm.js | 36 + .../extlib/minify/min/builder/index.php | 182 + .../extlib/minify/min/builder/ocCheck.php | 36 + .../extlib/minify/min/builder/rewriteTest.js | 1 + .../Minify/extlib/minify/min/groupsConfig.php | 34 + plugins/Minify/extlib/minify/min/index.php | 66 + .../Minify/extlib/minify/min/lib/FirePHP.php | 1370 +++++++ .../minify/min/lib/HTTP/ConditionalGet.php | 348 ++ .../extlib/minify/min/lib/HTTP/Encoder.php | 326 ++ .../Minify/extlib/minify/min/lib/JSMin.php | 314 ++ .../extlib/minify/min/lib/JSMinPlus.php | 1872 +++++++++ .../Minify/extlib/minify/min/lib/Minify.php | 532 +++ .../extlib/minify/min/lib/Minify/Build.php | 103 + .../extlib/minify/min/lib/Minify/CSS.php | 83 + .../minify/min/lib/Minify/CSS/Compressor.php | 250 ++ .../minify/min/lib/Minify/CSS/UriRewriter.php | 270 ++ .../minify/min/lib/Minify/Cache/APC.php | 130 + .../minify/min/lib/Minify/Cache/File.php | 125 + .../minify/min/lib/Minify/Cache/Memcache.php | 137 + .../min/lib/Minify/CommentPreserver.php | 90 + .../minify/min/lib/Minify/Controller/Base.php | 202 + .../min/lib/Minify/Controller/Files.php | 78 + .../min/lib/Minify/Controller/Groups.php | 94 + .../min/lib/Minify/Controller/MinApp.php | 132 + .../minify/min/lib/Minify/Controller/Page.php | 82 + .../min/lib/Minify/Controller/Version1.php | 118 + .../extlib/minify/min/lib/Minify/HTML.php | 245 ++ .../minify/min/lib/Minify/ImportProcessor.php | 157 + .../extlib/minify/min/lib/Minify/Lines.php | 131 + .../extlib/minify/min/lib/Minify/Logger.php | 45 + .../extlib/minify/min/lib/Minify/Packer.php | 37 + .../extlib/minify/min/lib/Minify/Source.php | 187 + .../minify/min/lib/Minify/YUICompressor.php | 139 + .../extlib/minify/min/lib/Solar/Dir.php | 199 + plugins/Minify/extlib/minify/min/utils.php | 90 + .../min_unit_tests/HTTP_ConditionalGet/2.php | 44 + .../min_unit_tests/HTTP_ConditionalGet/3.php | 40 + .../min_unit_tests/HTTP_ConditionalGet/4.php | 49 + .../min_unit_tests/HTTP_ConditionalGet/5.php | 27 + .../HTTP_ConditionalGet/_include.php | 64 + .../HTTP_ConditionalGet/index.php | 36 + .../min_unit_tests/HTTP_Encoder/green.png | Bin 0 -> 202 bytes .../min_unit_tests/HTTP_Encoder/index.php | 60 + .../extlib/minify/min_unit_tests/_inc.php | 50 + .../_test_files/css/comments.css | 9 + .../_test_files/css/comments.min.css | 3 + .../min_unit_tests/_test_files/css/hacks.css | 66 + .../_test_files/css/hacks.min.css | 4 + .../_test_files/css/issue62.css | 890 +++++ .../_test_files/css/issue62.min.css | 25 + .../_test_files/css/paths_prepend.css | 12 + .../_test_files/css/paths_prepend.min.css | 1 + .../_test_files/css/paths_rewrite.css | 14 + .../_test_files/css/paths_rewrite.min.css | 1 + .../min_unit_tests/_test_files/css/readme.txt | 1 + .../_test_files/css/selectors.css | 42 + .../_test_files/css/selectors.min.css | 37 + .../min_unit_tests/_test_files/css/styles.css | 31 + .../_test_files/css/styles.min.css | 3 + .../_test_files/css/subsilver.css | 434 +++ .../_test_files/css/subsilver.min.css | 18 + .../_test_files/css/unusual_strings.css | 10 + .../_test_files/css/unusual_strings.min.css | 2 + .../_test_files/css/vladmirated.css | 658 ++++ .../_test_files/css/vladmirated.min.css | 79 + .../_test_files/css_uriRewriter/exp.css | 14 + .../_test_files/css_uriRewriter/in.css | 14 + .../_test_files/html/before.html | 96 + .../_test_files/html/before.min.html | 36 + .../_test_files/html/before2.html | 95 + .../_test_files/html/before2.min.html | 36 + .../importProcessor/1/adjacent.css | 3 + .../_test_files/importProcessor/1/tv.css | 4 + .../_test_files/importProcessor/adjacent.css | 4 + .../_test_files/importProcessor/input.css | 4 + .../_test_files/importProcessor/output.css | 48 + .../min_unit_tests/_test_files/js/before.js | 57 + .../_test_files/js/before.min.js | 22 + .../_test_files/js/before.min_plus.js | 22 + .../min_unit_tests/_test_files/js/condcomm.js | 14 + .../_test_files/js/condcomm.min_plus.js | 13 + .../min_unit_tests/_test_files/js/issue74.js | 4 + .../_test_files/js/issue74.min.js | 1 + .../_test_files/js/issue74.min_plus.js | 1 + .../_test_files/js/jquery-1.2.3.js | 3408 +++++++++++++++++ .../_test_files/minify/QueryString.js | 168 + .../_test_files/minify/email.js | 24 + .../_test_files/minify/issue73_1.js | 2 + .../_test_files/minify/issue73_2.js | 3 + .../_test_files/minify/issue89_1.css | 7 + .../_test_files/minify/issue89_2.css | 7 + .../_test_files/minify/issue89_out.min.css | 1 + .../_test_files/minify/lines_bugs.js | 2 + .../_test_files/minify/lines_output.js | 280 ++ .../_test_files/minify/minified.css | 5 + .../_test_files/minify/minified.js | 12 + .../test_HTTP_ConditionalGet.php | 137 + .../min_unit_tests/test_HTTP_Encoder.php | 260 ++ .../minify/min_unit_tests/test_JSMin.php | 63 + .../minify/min_unit_tests/test_JSMinPlus.php | 80 + .../minify/min_unit_tests/test_Minify.php | 213 ++ .../min_unit_tests/test_Minify_Build.php | 36 + .../minify/min_unit_tests/test_Minify_CSS.php | 53 + .../test_Minify_CSS_UriRewriter.php | 56 + .../min_unit_tests/test_Minify_Cache_APC.php | 33 + .../min_unit_tests/test_Minify_Cache_File.php | 54 + .../test_Minify_Cache_Memcache.php | 38 + .../test_Minify_CommentPreserver.php | 37 + .../min_unit_tests/test_Minify_HTML.php | 59 + .../test_Minify_ImportProcessor.php | 48 + .../min_unit_tests/test_Minify_Lines.php | 36 + .../extlib/minify/min_unit_tests/test_all.php | 17 + .../min_unit_tests/test_environment.php | 100 + .../min_unit_tests/test_js_in_browser.html | 4 + plugins/Minify/minify.php | 122 + 123 files changed, 17488 insertions(+) create mode 100644 plugins/Minify/MinifyPlugin.php create mode 100644 plugins/Minify/README create mode 100644 plugins/Minify/extlib/minify/HISTORY.txt create mode 100644 plugins/Minify/extlib/minify/LICENSE.txt create mode 100644 plugins/Minify/extlib/minify/README.txt create mode 100644 plugins/Minify/extlib/minify/UPGRADING.txt create mode 100644 plugins/Minify/extlib/minify/min/README.txt create mode 100644 plugins/Minify/extlib/minify/min/builder/_index.js create mode 100644 plugins/Minify/extlib/minify/min/builder/bm.js create mode 100644 plugins/Minify/extlib/minify/min/builder/index.php create mode 100644 plugins/Minify/extlib/minify/min/builder/ocCheck.php create mode 100644 plugins/Minify/extlib/minify/min/builder/rewriteTest.js create mode 100644 plugins/Minify/extlib/minify/min/groupsConfig.php create mode 100644 plugins/Minify/extlib/minify/min/index.php create mode 100644 plugins/Minify/extlib/minify/min/lib/FirePHP.php create mode 100644 plugins/Minify/extlib/minify/min/lib/HTTP/ConditionalGet.php create mode 100644 plugins/Minify/extlib/minify/min/lib/HTTP/Encoder.php create mode 100644 plugins/Minify/extlib/minify/min/lib/JSMin.php create mode 100644 plugins/Minify/extlib/minify/min/lib/JSMinPlus.php create mode 100644 plugins/Minify/extlib/minify/min/lib/Minify.php create mode 100644 plugins/Minify/extlib/minify/min/lib/Minify/Build.php create mode 100644 plugins/Minify/extlib/minify/min/lib/Minify/CSS.php create mode 100644 plugins/Minify/extlib/minify/min/lib/Minify/CSS/Compressor.php create mode 100644 plugins/Minify/extlib/minify/min/lib/Minify/CSS/UriRewriter.php create mode 100644 plugins/Minify/extlib/minify/min/lib/Minify/Cache/APC.php create mode 100644 plugins/Minify/extlib/minify/min/lib/Minify/Cache/File.php create mode 100644 plugins/Minify/extlib/minify/min/lib/Minify/Cache/Memcache.php create mode 100644 plugins/Minify/extlib/minify/min/lib/Minify/CommentPreserver.php create mode 100644 plugins/Minify/extlib/minify/min/lib/Minify/Controller/Base.php create mode 100644 plugins/Minify/extlib/minify/min/lib/Minify/Controller/Files.php create mode 100644 plugins/Minify/extlib/minify/min/lib/Minify/Controller/Groups.php create mode 100644 plugins/Minify/extlib/minify/min/lib/Minify/Controller/MinApp.php create mode 100644 plugins/Minify/extlib/minify/min/lib/Minify/Controller/Page.php create mode 100644 plugins/Minify/extlib/minify/min/lib/Minify/Controller/Version1.php create mode 100644 plugins/Minify/extlib/minify/min/lib/Minify/HTML.php create mode 100644 plugins/Minify/extlib/minify/min/lib/Minify/ImportProcessor.php create mode 100644 plugins/Minify/extlib/minify/min/lib/Minify/Lines.php create mode 100644 plugins/Minify/extlib/minify/min/lib/Minify/Logger.php create mode 100644 plugins/Minify/extlib/minify/min/lib/Minify/Packer.php create mode 100644 plugins/Minify/extlib/minify/min/lib/Minify/Source.php create mode 100644 plugins/Minify/extlib/minify/min/lib/Minify/YUICompressor.php create mode 100644 plugins/Minify/extlib/minify/min/lib/Solar/Dir.php create mode 100644 plugins/Minify/extlib/minify/min/utils.php create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/2.php create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/3.php create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/4.php create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/5.php create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/_include.php create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/index.php create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/HTTP_Encoder/green.png create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/HTTP_Encoder/index.php create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_inc.php create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/comments.css create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/comments.min.css create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/hacks.css create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/hacks.min.css create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/issue62.css create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/issue62.min.css create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/paths_prepend.css create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/paths_prepend.min.css create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/paths_rewrite.css create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/paths_rewrite.min.css create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/readme.txt create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/selectors.css create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/selectors.min.css create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/styles.css create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/styles.min.css create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/subsilver.css create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/subsilver.min.css create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/unusual_strings.css create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/unusual_strings.min.css create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/vladmirated.css create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/vladmirated.min.css create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css_uriRewriter/exp.css create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css_uriRewriter/in.css create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/html/before.html create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/html/before.min.html create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/html/before2.html create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/html/before2.min.html create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/1/adjacent.css create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/1/tv.css create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/adjacent.css create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/input.css create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/output.css create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/before.js create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/before.min.js create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/before.min_plus.js create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/condcomm.js create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/condcomm.min_plus.js create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/issue74.js create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/issue74.min.js create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/issue74.min_plus.js create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/jquery-1.2.3.js create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/minify/QueryString.js create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/minify/email.js create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/minify/issue73_1.js create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/minify/issue73_2.js create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/minify/issue89_1.css create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/minify/issue89_2.css create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/minify/issue89_out.min.css create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/minify/lines_bugs.js create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/minify/lines_output.js create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/minify/minified.css create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/minify/minified.js create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_HTTP_ConditionalGet.php create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_HTTP_Encoder.php create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_JSMin.php create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_JSMinPlus.php create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_Minify.php create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_Minify_Build.php create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_Minify_CSS.php create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_Minify_CSS_UriRewriter.php create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_Minify_Cache_APC.php create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_Minify_Cache_File.php create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_Minify_Cache_Memcache.php create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_Minify_CommentPreserver.php create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_Minify_HTML.php create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_Minify_ImportProcessor.php create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_Minify_Lines.php create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_all.php create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_environment.php create mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_js_in_browser.html create mode 100644 plugins/Minify/minify.php diff --git a/plugins/Minify/MinifyPlugin.php b/plugins/Minify/MinifyPlugin.php new file mode 100644 index 0000000000..4d37fbc708 --- /dev/null +++ b/plugins/Minify/MinifyPlugin.php @@ -0,0 +1,101 @@ + +Author URI: http://candrews.integralblue.com/ +*/ + +/* + * StatusNet - the distributed open-source microblogging tool + * Copyright (C) 2009, StatusNet, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +/** + * @package MinifyPlugin + * @maintainer Craig Andrews + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } + +class MinifyPlugin extends Plugin +{ + + /** + * Add Minification related paths to the router table + * + * Hook for RouterInitialized event. + * + * @return boolean hook return + */ + + function onStartInitializeRouter($m) + { + $m->connect('main/min', + array('action' => 'minify')); + return true; + } + + function onAutoload($cls) + { + switch ($cls) + { + case 'MinifyAction': + require_once(INSTALLDIR.'/plugins/Minify/' . strtolower(mb_substr($cls, 0, -6)) . '.php'); + return false; + default: + return true; + } + } + + function onLoginAction($action, &$login) + { + switch ($action) + { + case 'minify': + $login = true; + return false; + default: + return true; + } + } + + function onStartScriptElement($action,&$src,&$type) { + $url = parse_url($src); + if( empty($url->scheme) && empty($url->host) && empty($url->query) && empty($url->fragment)) + { + $src = common_path('main/min?f='.$src.'&v=' . STATUSNET_VERSION); + } + } + + function onStartCssLinkElement($action,&$src,&$theme,&$media) { + $url = parse_url($src); + if( empty($url->scheme) && empty($url->host) && empty($url->query) && empty($url->fragment)) + { + if(file_exists(Theme::file($src,$theme))){ + //src is a relative path, so we can do minification + if(isset($theme)) { + $src = common_path('main/min?f=theme/'.$theme.'/'.$src.'&v=' . STATUSNET_VERSION); + } else { + $src = common_path('main/min?f=theme/default/'.$src.'&v=' . STATUSNET_VERSION); + } + } + } + } +} + diff --git a/plugins/Minify/README b/plugins/Minify/README new file mode 100644 index 0000000000..7fb7e239a3 --- /dev/null +++ b/plugins/Minify/README @@ -0,0 +1,20 @@ +The Minify plugin minifies your CSS and Javascript, removing whitespace and comments. + +Note that if enabled this plugin and use a theme server + ($config['theme']['server']), your theme server will not be used. + +Installation +============ +add "addPlugin('minify', + array('setting'=>'value', 'setting2'=>'value2', ...);" +to the bottom of your config.php + +Settings +======== +None at the moment + +Example +======= + +addPlugin('minify', array()); + diff --git a/plugins/Minify/extlib/minify/HISTORY.txt b/plugins/Minify/extlib/minify/HISTORY.txt new file mode 100644 index 0000000000..95a46c87ec --- /dev/null +++ b/plugins/Minify/extlib/minify/HISTORY.txt @@ -0,0 +1,75 @@ +Minify Release History + +Version 2.1.3 + * HTTP fixes + * ETag generation now valid (different when gzipped) + * Vary header always sent when Accept-Encoding is sniffed + * Cache-Control no longer has "must-revalidate" due to webkit bug + See: http://mrclay.org/index.php/2009/02/24/safari-4-beta-cache-controlmust-revalidate-bug/ + * Dropped deflate encoding. Browser and proxy support could be buggy. + See: http://stackoverflow.com/questions/883841/ + * File cache now works w/o setting $min_cachePath + * Allow setting contentType in Minify_Source objects + * No more 5.3 deprecation warnings: split() removed + +Version 2.1.2 + * Javascript fixes + * Debug mode no longer confused by "*/*" in strings/RegExps (jQuery) + * quote characters inside RegExp literals no longer cause exception + * files ending in single-line comments no longer cause code loss + * CSS: data: URLs no longer mangled + * Optional error logging to Firefox's FirePHP extension + * Unit tests to check for common DOCUMENT_ROOT problems + * DOCUMENT_ROOT no longer overwritten on IIS servers + * Builder app doesn't fail on systems without gzdeflate() + * APC caching class included + +Version 2.1.1 + * Bug fix release + * Detection and workarounds for zlib.output_compression and non-PHP encoding modules + * Zlib not required (mod_rewrite, et.al., can still be used for encoding) + * HTML : More IE conditional comments preserved + * Minify_groupUri() utility fixed + +Version 2.1.0 + * "min" default application for quick deployment + * Minify URI Builder app & bookmarklet for quickly creating minify URIs + * Relative URIs in CSS file are fixed automatically by default + * "debug" mode for revealing original line #s in combined files + * Better IIS support + * Improved minifier classes: + * JS: preserves IE conditional comments + * CSS: smaller output, preserves more hacks and valid CSS syntax, + shorter line lengths, other bug fixes + * HTML: smaller output, shorter line lengths, other bug fixes + * Default Cache-Control: max-age of 30 minutes + * Conditional GETs supported even when max-age sent + * Experimental memcache cache class (default is files) + * Minify_Cache_File has flock()s (by default) + * Workaround for Windows mtime reporting bug + +Version 2.0.2 beta (2008-06-24) + * Fast new cache system. Cached files served almost 3x as fast. + * Dropped support of compress encoding (though HTTP_Encoder still supports it) + +Version 2.0.1 (2008-05-31) + * E_STRICT compliance (Cache_Lite_File). + +Version 2.0.0 (2008-05-22) + * Complete code overhaul. Minify is now a PEAR-style class and toolkit + for building customized minifying file servers. + * Content-Encoding: deflate/gzip/compress, based on request headers + * Expanded CSS and HTML minifiers with test cases + * Easily plug-in 3rd-party minifiers (like Packer) + * Plug-able front end controller allows changing the way files are chosen + * Compression & encoding modules lazy-loaded as needed (304 responses use + use minimal code) + * Separate utility classes for HTTP encoding and cache control + +Version 1.0.1 (2007-05-05) + * Fixed various problems resolving pathnames when hosted on an NFS mount. + * Fixed 'undefined constant' notice. + * Replaced old JSMin library with a much faster custom implementation. + +Version 1.0.0 (2007-05-02) + * First release. \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/LICENSE.txt b/plugins/Minify/extlib/minify/LICENSE.txt new file mode 100644 index 0000000000..8f008adb56 --- /dev/null +++ b/plugins/Minify/extlib/minify/LICENSE.txt @@ -0,0 +1,26 @@ +Copyright (c) 2008 Ryan Grove +Copyright (c) 2008 Steve Clay +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of this project nor the names of its contributors may be + used to endorse or promote products derived from this software without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/plugins/Minify/extlib/minify/README.txt b/plugins/Minify/extlib/minify/README.txt new file mode 100644 index 0000000000..3899b99536 --- /dev/null +++ b/plugins/Minify/extlib/minify/README.txt @@ -0,0 +1,53 @@ +WELCOME TO MINIFY 2.1! + +Minify is an HTTP content server. It compresses sources of content +(usually files), combines the result and serves it with appropriate +HTTP headers. These headers can allow clients to perform conditional +GETs (serving content only when clients do not have a valid cache) +and tell clients to cache the file for a period of time. +More info: http://code.google.com/p/minify/ + + +UPGRADING + +See UPGRADING.txt for instructions. + + +INSTALLATION AND USAGE: + +1. Place the /min/ directory as a child of your DOCUMENT_ROOT +directory: i.e. you will have: /home/user/www/public_html/min + +2. Open http://yourdomain/min/ in a web browser. This will forward +you to the Minify URI Builder application, which will help you +quickly start using Minify to serve content on your site. + + +UNIT TESTING: + +1. Place the /min_unit_tests/ directory as a child of your DOCUMENT_ROOT +directory: i.e. you will have: /home/user/www/public_html/min_unit_tests + +2. To run unit tests, access: http://yourdomain/min_unit_tests/test_all.php + +(If you wish, the other test_*.php files can be run to test individual +components with more verbose output.) + +3. Remove /min_unit_tests/ from your DOCUMENT_ROOT when you are done. + + +EXTRAS: + +The min_extras folder contains files for benchmarking using Apache ab on Windows +and a couple single-use tools. DO NOT place this on your production server. + + +FILE ENCODINGS + +Minify *should* work fine with files encoded in UTF-8 or other 8-bit +encodings like ISO 8859/Windows-1252. By default Minify appends +";charset=utf-8" to the Content-Type headers it sends. + +Leading UTF-8 BOMs are stripped from all sources to prevent +duplication in output files, and files are converted to Unix newlines. + diff --git a/plugins/Minify/extlib/minify/UPGRADING.txt b/plugins/Minify/extlib/minify/UPGRADING.txt new file mode 100644 index 0000000000..5025faf9b7 --- /dev/null +++ b/plugins/Minify/extlib/minify/UPGRADING.txt @@ -0,0 +1,35 @@ +Minify Upgrade Guide + +UPGRADING FROM 2.1.* + +1. Rename the following files: + + /min/config.php --> /min/old_config.php + /min/groupsConfig.php --> /min/old_groupsConfig.php + +2. Overwrite all files in /min (and /min_unit_tests) with those from this zip. + +3. Delete /min/groupsConfig.php + +4. Rename /min/old_groupsConfig.php --> /min/groupsConfig.php + +5. Merge your settings in old_config.php into config.php. + + * If you've set $_SERVER['DOCUMENT_ROOT'], instead set the new option + $min_documentRoot. This is advantageous on IIS systems because Minify + will no longer overwrite the path you specified. + + * $min_errorLogger adds the ability to enable FirePHP logging. + +6. (optional) Delete /min/old_config.php and the Minify files from your cache + directory (specified in $min_cachePath). + + +INSTALLING FRESH + +See README.txt for instructions on installing this app for the first time. + + +SUPPORT + +Send a message to http://groups.google.com/group/minify \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min/README.txt b/plugins/Minify/extlib/minify/min/README.txt new file mode 100644 index 0000000000..a7cf774a18 --- /dev/null +++ b/plugins/Minify/extlib/minify/min/README.txt @@ -0,0 +1,132 @@ +The files in this directory represent the default Minify setup designed to ease +integration with your site. This app will combine and minify your Javascript or +CSS files and serve them with HTTP compression and cache headers. + + +RECOMMENDED + +It's recommended to edit config.php to set $min_cachePath to a writeable +(by PHP) directory on your system. This will improve performance. + + +GETTING STARTED + +The quickest way to get started is to use the Minify URI Builder application +on your website: http://example.com/min/builder/ + + +MINIFYING A SINGLE FILE + +Let's say you want to serve this file: + http://example.com/wp-content/themes/default/default.css + +Here's the "Minify URL" for this file: + http://example.com/min/?f=wp-content/themes/default/default.css + +In other words, the "f" argument is set to the file path from root without the +initial "/". As CSS files may contain relative URIs, Minify will automatically +"fix" these by rewriting them as root relative. + + +COMBINING MULTIPLE FILES IN ONE DOWNLOAD + +Separate the paths given to "f" with commas. + +Let's say you have CSS files at these URLs: + http://example.com/scripts/jquery-1.2.6.js + http://example.com/scripts/site.js + +You can combine these files through Minify by requesting this URL: + http://example.com/min/?f=scripts/jquery-1.2.6.js,scripts/site.js + + +SIMPLIFYING URLS WITH A BASE PATH + +If you're combining files that share the same ancestor directory, you can use +the "b" argument to set the base directory for the "f" argument. Do not include +the leading or trailing "/" characters. + +E.g., the following URLs will serve the exact same content: + http://example.com/min/?f=scripts/jquery-1.2.6.js,scripts/site.js,scripts/home.js + http://example.com/min/?b=scripts&f=jquery-1.2.6.js,site.js,home.js + + +MINIFY URLS IN HTML + +In (X)HTML files, don't forget to replace any "&" characters with "&". + + +SPECIFYING ALLOWED DIRECTORIES + +By default, Minify will serve any *.css/*.js files within the DOCUMENT_ROOT. If +you'd prefer to limit Minify's access to certain directories, set the +$min_serveOptions['minApp']['allowDirs'] array in config.php. E.g. to limit +to the /js and /themes/default directories, use: + +$min_serveOptions['minApp']['allowDirs'] = array('//js', '//themes/default'); + + +GROUPS: FASTER PERFORMANCE AND BETTER URLS + +For the best performance, edit groupsConfig.php to pre-specify groups of files +to be combined under preset keys. E.g., here's an example configuration in +groupsConfig.php: + +return array( + 'js' => array('//js/Class.js', '//js/email.js') +); + +This pre-selects the following files to be combined under the key "js": + http://example.com/js/Class.js + http://example.com/js/email.js + +You can now serve these files with this simple URL: + http://example.com/min/?g=js + + +GROUPS: SPECIFYING FILES OUTSIDE THE DOC_ROOT + +In the groupsConfig.php array, the "//" in the file paths is a shortcut for +the DOCUMENT_ROOT, but you can also specify paths from the root of the filesystem +or relative to the DOC_ROOT: + +return array( + 'js' => array( + '//js/file.js' // file within DOC_ROOT + ,'//../file.js' // file in parent directory of DOC_ROOT + ,'C:/Users/Steve/file.js' // file anywhere on filesystem + ) +); + + +FAR-FUTURE EXPIRES HEADERS + +Minify can send far-future (one year) Expires headers. To enable this you must +add a number to the querystring (e.g. /min/?g=js&1234 or /min/f=file.js&1234) +and alter it whenever a source file is changed. If you have a build process you +can use a build/source control revision number. + +If you serve files as a group, you can use the utility function Minify_groupUri() +to get a "versioned" Minify URI for use in your HTML. E.g.: + +"; + + +DEBUG MODE + +In debug mode, instead of compressing files, Minify sends combined files with +comments prepended to each line to show the line number in the original source +file. To enable this, set $min_allowDebugFlag to true in config.php and append +"&debug=1" to your URIs. E.g. /min/?f=script1.js,script2.js&debug=1 + +Known issue: files with comment-like strings/regexps can cause problems in this mode. + + +QUESTIONS? + +http://groups.google.com/group/minify \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min/builder/_index.js b/plugins/Minify/extlib/minify/min/builder/_index.js new file mode 100644 index 0000000000..8e5313a3b1 --- /dev/null +++ b/plugins/Minify/extlib/minify/min/builder/_index.js @@ -0,0 +1,242 @@ +var MUB = { + _uid : 0 + ,_minRoot : '/min/?' + ,checkRewrite : function () { + var testUri = location.pathname.replace(/\/[^\/]*$/, '/rewriteTest.js').substr(1); + function fail() { + $('#minRewriteFailed')[0].className = 'topNote'; + }; + $.ajax({ + url : '../f=' + testUri + '&' + (new Date()).getTime() + ,success : function (data) { + if (data === '1') { + MUB._minRoot = '/min/'; + $('span.minRoot').html('/min/'); + } else + fail(); + } + ,error : fail + }); + } + /** + * Get markup for new source LI element + */ + ,newLi : function () { + return '
  • http://' + location.host + '/' + + ' ' + + '
    • '; + } + /** + * Add new empty source LI and attach handlers to buttons + */ + ,addLi : function () { + $('#sources').append(MUB.newLi()); + var li = $('#li' + MUB._uid)[0]; + $('button[title=Remove]', li).click(function () { + $('#results').hide(); + var hadValue = !!$('input', li)[0].value; + $(li).remove(); + }); + $('button[title$=Earlier]', li).click(function () { + $(li).prev('li').find('input').each(function () { + $('#results').hide(); + // this = previous li input + var tmp = this.value; + this.value = $('input', li).val(); + $('input', li).val(tmp); + MUB.updateAllTestLinks(); + }); + }); + $('button[title$=Later]', li).click(function () { + $(li).next('li').find('input').each(function () { + $('#results').hide(); + // this = next li input + var tmp = this.value; + this.value = $('input', li).val(); + $('input', li).val(tmp); + MUB.updateAllTestLinks(); + }); + }); + ++MUB._uid; + } + /** + * In the context of a source LI element, this will analyze the URI in + * the INPUT and check the URL on the site. + */ + ,liUpdateTestLink : function () { // call in context of li element + if (! $('input', this)[0].value) + return; + var li = this; + $('span', this).html(''); + var url = 'http://' + location.host + '/' + + $('input', this)[0].value.replace(/^\//, ''); + $.ajax({ + url : url + ,complete : function (xhr, stat) { + if ('success' == stat) + $('span', li).html('✓'); + else { + $('span', li).html('') + .find('button').click(function () { + MUB.liUpdateTestLink.call(li); + }); + } + } + ,dataType : 'text' + }); + } + /** + * Check all source URLs + */ + ,updateAllTestLinks : function () { + $('#sources li').each(MUB.liUpdateTestLink); + } + /** + * In a given array of strings, find the character they all have at + * a particular index + * @param Array arr array of strings + * @param Number pos index to check + * @return mixed a common char or '' if any do not match + */ + ,getCommonCharAtPos : function (arr, pos) { + var i + ,l = arr.length + ,c = arr[0].charAt(pos); + if (c === '' || l === 1) + return c; + for (i = 1; i < l; ++i) + if (arr[i].charAt(pos) !== c) + return ''; + return c; + } + /** + * Get the shortest URI to minify the set of source files + * @param Array sources URIs + */ + ,getBestUri : function (sources) { + var pos = 0 + ,base = '' + ,c; + while (true) { + c = MUB.getCommonCharAtPos(sources, pos); + if (c === '') + break; + else + base += c; + ++pos; + } + base = base.replace(/[^\/]+$/, ''); + var uri = MUB._minRoot + 'f=' + sources.join(','); + if (base.charAt(base.length - 1) === '/') { + // we have a base dir! + var basedSources = sources + ,i + ,l = sources.length; + for (i = 0; i < l; ++i) { + basedSources[i] = sources[i].substr(base.length); + } + base = base.substr(0, base.length - 1); + var bUri = MUB._minRoot + 'b=' + base + '&f=' + basedSources.join(','); + //window.console && console.log([uri, bUri]); + uri = uri.length < bUri.length + ? uri + : bUri; + } + return uri; + } + /** + * Create the Minify URI for the sources + */ + ,update : function () { + MUB.updateAllTestLinks(); + var sources = [] + ,ext = false + ,fail = false; + $('#sources input').each(function () { + var m, val; + if (! fail && this.value && (m = this.value.match(/\.(css|js)$/))) { + var thisExt = m[1]; + if (ext === false) + ext = thisExt; + else if (thisExt !== ext) { + fail = true; + return alert('extensions must match!'); + } + this.value = this.value.replace(/^\//, ''); + if (-1 != $.inArray(this.value, sources)) { + fail = true; + return alert('duplicate file!'); + } + sources.push(this.value); + } + }); + if (fail || ! sources.length) + return; + $('#groupConfig').val(" 'keyName' => array('//" + sources.join("', '//") + "'),"); + var uri = MUB.getBestUri(sources) + ,uriH = uri.replace(//, '>').replace(/&/, '&'); + $('#uriA').html(uriH)[0].href = uri; + $('#uriHtml').val( + ext === 'js' + ? '' + : '' + ); + $('#results').show(); + } + /** + * Handler for the "Add file +" button + */ + ,addButtonClick : function () { + $('#results').hide(); + MUB.addLi(); + MUB.updateAllTestLinks(); + $('#update').show().click(MUB.update); + $('#sources li:last input')[0].focus(); + } + /** + * Runs on DOMready + */ + ,init : function () { + $('#app').show(); + $('#sources').html(''); + $('#add button').click(MUB.addButtonClick); + // make easier to copy text out of + $('#uriHtml, #groupConfig').click(function () { + this.select(); + }).focus(function () { + this.select(); + }); + $('a.ext').attr({target:'_blank'}); + if (location.hash) { + // make links out of URIs from bookmarklet + $('#getBm').hide(); + $('#bmUris').html('

    Found by bookmarklet: /' + + location.hash.substr(1).split(',').join(' | /') + + '

    ' + ); + $('#bmUris a').click(function () { + MUB.addButtonClick(); + $('#sources li:last input').val(this.innerHTML) + MUB.liUpdateTestLink.call($('#sources li:last')[0]); + $('#results').hide(); + return false; + }).attr({title:'Add file +'}); + } else { + // copy bookmarklet code into href + var bmUri = location.pathname.replace(/\/[^\/]*$/, '/bm.js').substr(1); + $.ajax({ + url : '../?f=' + bmUri + ,success : function (code) { + $('#bm')[0].href = code + .replace('%BUILDER_URL%', location.href) + .replace(/\n/g, ' '); + } + ,dataType : 'text' + }); + $.browser.msie && $('#getBm p:last').append(' Sorry, not supported in MSIE!'); + MUB.addButtonClick(); + } + MUB.checkRewrite(); + } +}; +window.onload = MUB.init; \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min/builder/bm.js b/plugins/Minify/extlib/minify/min/builder/bm.js new file mode 100644 index 0000000000..10d1943814 --- /dev/null +++ b/plugins/Minify/extlib/minify/min/builder/bm.js @@ -0,0 +1,36 @@ +javascript:(function() { + var d = document + ,uris = [] + ,i = 0 + ,o + ,home = (location + '').split('/').splice(0, 3).join('/') + '/'; + function add(uri) { + return (0 === uri.indexOf(home)) + && (!/[\?&]/.test(uri)) + && uris.push(escape(uri.substr(home.length))); + }; + function sheet(ss) { + // we must check the domain with add() before accessing ss.cssRules + // otherwise a security exception will be thrown + if (ss.href && add(ss.href) && ss.cssRules) { + var i = 0, r; + while (r = ss.cssRules[i++]) + r.styleSheet && sheet(r.styleSheet); + } + }; + while (o = d.getElementsByTagName('script')[i++]) + o.src && !(o.type && /vbs/i.test(o.type)) && add(o.src); + i = 0; + while (o = d.styleSheets[i++]) + /* http://www.w3.org/TR/DOM-Level-2-Style/stylesheets.html#StyleSheets-DocumentStyle-styleSheets + document.styleSheet is a list property where [0] accesses the 1st element and + [outOfRange] returns null. In IE, styleSheets is a function, and also throws an + exception when you check the out of bounds index. (sigh) */ + sheet(o); + if (uris.length) + window.open('%BUILDER_URL%#' + uris.join(',')); + else + alert('No js/css files found with URLs within "' + + home.split('/')[2] + + '".\n(This tool is limited to URLs with the same domain.)'); +})(); \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min/builder/index.php b/plugins/Minify/extlib/minify/min/builder/index.php new file mode 100644 index 0000000000..1b20982220 --- /dev/null +++ b/plugins/Minify/extlib/minify/min/builder/index.php @@ -0,0 +1,182 @@ + + + + + Minify URI Builder + + + + +

    Note: Please set $min_cachePath +in /min/config.php to improve performance.

    + + +

    Note: Your webserver does not seem to + support mod_rewrite (used in /min/.htaccess). Your Minify URIs will contain "?", which +may reduce the benefit of proxy cache servers.

    + +

    Minify URI Builder

    + + + +
    + +

    Create a list of Javascript or CSS files (or 1 is fine) you'd like to combine +and click [Update].

    + +
    +
    + +
    + +

    + +
    + +

    Minify URI

    +

    Place this URI in your HTML to serve the files above combined, minified, compressed and +with cache headers.

    + + + +
    URI/min (opens in new window)
    HTML
    + +

    How to serve these files as a group

    +

    For the best performance you can serve these files as a pre-defined group with a URI +like: /min/?g=keyName

    +

    To do this, add a line like this to /min/groupsConfig.php:

    + +
    return array(
+    ... your existing groups here ...
+
+);
    + +

    Make sure to replace keyName with a unique key for this group.

    +
    + +
    +

    Find URIs on a Page

    +

    You can use the bookmarklet below to fetch all CSS & Javascript URIs from a page +on your site. When you active it, this page will open in a new window with a list of +available URIs to add.

    + +

    Create Minify URIs (right-click, add to bookmarks)

    +
    + +

    Combining CSS files that contain @import

    +

    If your CSS files contain @import declarations, Minify will not +remove them. Therefore, you will want to remove those that point to files already +in your list, and move any others to the top of the first file in your list +(imports below any styles will be ignored by browsers as invalid).

    +

    If you desire, you can use Minify URIs in imports and they will not be touched +by Minify. E.g. @import "/min/?g=css2";

    + +
    + +
    +

    Need help? Search or post to the Minify discussion list.

    +

    This app is minified :) view +source

    + + + + + + + ob_get_contents() + ,'id' => __FILE__ + ,'lastModifiedTime' => max( + // regenerate cache if either of these change + filemtime(__FILE__) + ,filemtime(dirname(__FILE__) . '/../config.php') + ) + ,'minifyAll' => true + ,'encodeOutput' => $encodeOutput +); +ob_end_clean(); + +set_include_path(dirname(__FILE__) . '/../lib' . PATH_SEPARATOR . get_include_path()); + +require 'Minify.php'; + +if (0 === stripos(PHP_OS, 'win')) { + Minify::setDocRoot(); // we may be on IIS +} +Minify::setCache(isset($min_cachePath) ? $min_cachePath : null); +Minify::$uploaderHoursBehind = $min_uploaderHoursBehind; + +Minify::serve('Page', $serveOpts); diff --git a/plugins/Minify/extlib/minify/min/builder/ocCheck.php b/plugins/Minify/extlib/minify/min/builder/ocCheck.php new file mode 100644 index 0000000000..c47baa33db --- /dev/null +++ b/plugins/Minify/extlib/minify/min/builder/ocCheck.php @@ -0,0 +1,36 @@ + 'World!' + ,'method' => 'deflate' + )); + $he->encode(); + $he->sendAll(); + +} else { + // echo status "0" or "1" + header('Content-Type: text/plain'); + echo (int)$_oc; +} diff --git a/plugins/Minify/extlib/minify/min/builder/rewriteTest.js b/plugins/Minify/extlib/minify/min/builder/rewriteTest.js new file mode 100644 index 0000000000..56a6051ca2 --- /dev/null +++ b/plugins/Minify/extlib/minify/min/builder/rewriteTest.js @@ -0,0 +1 @@ +1 \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min/groupsConfig.php b/plugins/Minify/extlib/minify/min/groupsConfig.php new file mode 100644 index 0000000000..9e2514d7ad --- /dev/null +++ b/plugins/Minify/extlib/minify/min/groupsConfig.php @@ -0,0 +1,34 @@ + array('//js/file1.js', '//js/file2.js'), + // 'css' => array('//css/file1.css', '//css/file2.css'), + + // custom source example + /*'js2' => array( + dirname(__FILE__) . '/../min_unit_tests/_test_files/js/before.js', + // do NOT process this file + new Minify_Source(array( + 'filepath' => dirname(__FILE__) . '/../min_unit_tests/_test_files/js/before.js', + 'minifier' => create_function('$a', 'return $a;') + )) + ),//*/ + + /*'js3' => array( + dirname(__FILE__) . '/../min_unit_tests/_test_files/js/before.js', + // do NOT process this file + new Minify_Source(array( + 'filepath' => dirname(__FILE__) . '/../min_unit_tests/_test_files/js/before.js', + 'minifier' => array('Minify_Packer', 'minify') + )) + ),//*/ +); \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min/index.php b/plugins/Minify/extlib/minify/min/index.php new file mode 100644 index 0000000000..51c352569a --- /dev/null +++ b/plugins/Minify/extlib/minify/min/index.php @@ -0,0 +1,66 @@ + + * @license http://www.opensource.org/licenses/bsd-license.php + * @package FirePHP + */ + + +/** + * Sends the given data to the FirePHP Firefox Extension. + * The data can be displayed in the Firebug Console or in the + * "Server" request tab. + * + * For more information see: http://www.firephp.org/ + * + * @copyright Copyright (C) 2007-2008 Christoph Dorn + * @author Christoph Dorn + * @license http://www.opensource.org/licenses/bsd-license.php + * @package FirePHP + */ +class FirePHP { + + /** + * FirePHP version + * + * @var string + */ + const VERSION = '0.2.0'; + + /** + * Firebug LOG level + * + * Logs a message to firebug console. + * + * @var string + */ + const LOG = 'LOG'; + + /** + * Firebug INFO level + * + * Logs a message to firebug console and displays an info icon before the message. + * + * @var string + */ + const INFO = 'INFO'; + + /** + * Firebug WARN level + * + * Logs a message to firebug console, displays an warning icon before the message and colors the line turquoise. + * + * @var string + */ + const WARN = 'WARN'; + + /** + * Firebug ERROR level + * + * Logs a message to firebug console, displays an error icon before the message and colors the line yellow. Also increments the firebug error count. + * + * @var string + */ + const ERROR = 'ERROR'; + + /** + * Dumps a variable to firebug's server panel + * + * @var string + */ + const DUMP = 'DUMP'; + + /** + * Displays a stack trace in firebug console + * + * @var string + */ + const TRACE = 'TRACE'; + + /** + * Displays an exception in firebug console + * + * Increments the firebug error count. + * + * @var string + */ + const EXCEPTION = 'EXCEPTION'; + + /** + * Displays an table in firebug console + * + * @var string + */ + const TABLE = 'TABLE'; + + /** + * Starts a group in firebug console + * + * @var string + */ + const GROUP_START = 'GROUP_START'; + + /** + * Ends a group in firebug console + * + * @var string + */ + const GROUP_END = 'GROUP_END'; + + /** + * Singleton instance of FirePHP + * + * @var FirePHP + */ + protected static $instance = null; + + /** + * Wildfire protocol message index + * + * @var int + */ + protected $messageIndex = 1; + + /** + * Options for the library + * + * @var array + */ + protected $options = array(); + + /** + * Filters used to exclude object members when encoding + * + * @var array + */ + protected $objectFilters = array(); + + /** + * A stack of objects used to detect recursion during object encoding + * + * @var object + */ + protected $objectStack = array(); + + /** + * Flag to enable/disable logging + * + * @var boolean + */ + protected $enabled = true; + + /** + * The object constructor + */ + function __construct() { + $this->options['maxObjectDepth'] = 10; + $this->options['maxArrayDepth'] = 20; + $this->options['useNativeJsonEncode'] = true; + $this->options['includeLineNumbers'] = true; + } + + /** + * When the object gets serialized only include specific object members. + * + * @return array + */ + public function __sleep() { + return array('options','objectFilters','enabled'); + } + + /** + * Gets singleton instance of FirePHP + * + * @param boolean $AutoCreate + * @return FirePHP + */ + public static function getInstance($AutoCreate=false) { + if($AutoCreate===true && !self::$instance) { + self::init(); + } + return self::$instance; + } + + /** + * Creates FirePHP object and stores it for singleton access + * + * @return FirePHP + */ + public static function init() { + return self::$instance = new self(); + } + + /** + * Enable and disable logging to Firebug + * + * @param boolean $Enabled TRUE to enable, FALSE to disable + * @return void + */ + public function setEnabled($Enabled) { + $this->enabled = $Enabled; + } + + /** + * Check if logging is enabled + * + * @return boolean TRUE if enabled + */ + public function getEnabled() { + return $this->enabled; + } + + /** + * Specify a filter to be used when encoding an object + * + * Filters are used to exclude object members. + * + * @param string $Class The class name of the object + * @param array $Filter An array or members to exclude + * @return void + */ + public function setObjectFilter($Class, $Filter) { + $this->objectFilters[$Class] = $Filter; + } + + /** + * Set some options for the library + * + * Options: + * - maxObjectDepth: The maximum depth to traverse objects (default: 10) + * - maxArrayDepth: The maximum depth to traverse arrays (default: 20) + * - useNativeJsonEncode: If true will use json_encode() (default: true) + * - includeLineNumbers: If true will include line numbers and filenames (default: true) + * + * @param array $Options The options to be set + * @return void + */ + public function setOptions($Options) { + $this->options = array_merge($this->options,$Options); + } + + /** + * Register FirePHP as your error handler + * + * Will throw exceptions for each php error. + */ + public function registerErrorHandler() + { + //NOTE: The following errors will not be caught by this error handler: + // E_ERROR, E_PARSE, E_CORE_ERROR, + // E_CORE_WARNING, E_COMPILE_ERROR, + // E_COMPILE_WARNING, E_STRICT + + set_error_handler(array($this,'errorHandler')); + } + + /** + * FirePHP's error handler + * + * Throws exception for each php error that will occur. + * + * @param int $errno + * @param string $errstr + * @param string $errfile + * @param int $errline + * @param array $errcontext + */ + public function errorHandler($errno, $errstr, $errfile, $errline, $errcontext) + { + // Don't throw exception if error reporting is switched off + if (error_reporting() == 0) { + return; + } + // Only throw exceptions for errors we are asking for + if (error_reporting() & $errno) { + throw new ErrorException($errstr, 0, $errno, $errfile, $errline); + } + } + + /** + * Register FirePHP as your exception handler + */ + public function registerExceptionHandler() + { + set_exception_handler(array($this,'exceptionHandler')); + } + + /** + * FirePHP's exception handler + * + * Logs all exceptions to your firebug console and then stops the script. + * + * @param Exception $Exception + * @throws Exception + */ + function exceptionHandler($Exception) { + $this->fb($Exception); + } + + /** + * Set custom processor url for FirePHP + * + * @param string $URL + */ + public function setProcessorUrl($URL) + { + $this->setHeader('X-FirePHP-ProcessorURL', $URL); + } + + /** + * Set custom renderer url for FirePHP + * + * @param string $URL + */ + public function setRendererUrl($URL) + { + $this->setHeader('X-FirePHP-RendererURL', $URL); + } + + /** + * Start a group for following messages + * + * @param string $Name + * @return true + * @throws Exception + */ + public function group($Name) { + return $this->fb(null, $Name, FirePHP::GROUP_START); + } + + /** + * Ends a group you have started before + * + * @return true + * @throws Exception + */ + public function groupEnd() { + return $this->fb(null, null, FirePHP::GROUP_END); + } + + /** + * Log object with label to firebug console + * + * @see FirePHP::LOG + * @param mixes $Object + * @param string $Label + * @return true + * @throws Exception + */ + public function log($Object, $Label=null) { + return $this->fb($Object, $Label, FirePHP::LOG); + } + + /** + * Log object with label to firebug console + * + * @see FirePHP::INFO + * @param mixes $Object + * @param string $Label + * @return true + * @throws Exception + */ + public function info($Object, $Label=null) { + return $this->fb($Object, $Label, FirePHP::INFO); + } + + /** + * Log object with label to firebug console + * + * @see FirePHP::WARN + * @param mixes $Object + * @param string $Label + * @return true + * @throws Exception + */ + public function warn($Object, $Label=null) { + return $this->fb($Object, $Label, FirePHP::WARN); + } + + /** + * Log object with label to firebug console + * + * @see FirePHP::ERROR + * @param mixes $Object + * @param string $Label + * @return true + * @throws Exception + */ + public function error($Object, $Label=null) { + return $this->fb($Object, $Label, FirePHP::ERROR); + } + + /** + * Dumps key and variable to firebug server panel + * + * @see FirePHP::DUMP + * @param string $Key + * @param mixed $Variable + * @return true + * @throws Exception + */ + public function dump($Key, $Variable) { + return $this->fb($Variable, $Key, FirePHP::DUMP); + } + + /** + * Log a trace in the firebug console + * + * @see FirePHP::TRACE + * @param string $Label + * @return true + * @throws Exception + */ + public function trace($Label) { + return $this->fb($Label, FirePHP::TRACE); + } + + /** + * Log a table in the firebug console + * + * @see FirePHP::TABLE + * @param string $Label + * @param string $Table + * @return true + * @throws Exception + */ + public function table($Label, $Table) { + return $this->fb($Table, $Label, FirePHP::TABLE); + } + + /** + * Check if FirePHP is installed on client + * + * @return boolean + */ + public function detectClientExtension() { + /* Check if FirePHP is installed on client */ + if(!@preg_match_all('/\sFirePHP\/([\.|\d]*)\s?/si',$this->getUserAgent(),$m) || + !version_compare($m[1][0],'0.0.6','>=')) { + return false; + } + return true; + } + + /** + * Log varible to Firebug + * + * @see http://www.firephp.org/Wiki/Reference/Fb + * @param mixed $Object The variable to be logged + * @return true Return TRUE if message was added to headers, FALSE otherwise + * @throws Exception + */ + public function fb($Object) { + + if(!$this->enabled) { + return false; + } + + if (headers_sent($filename, $linenum)) { + throw $this->newException('Headers already sent in '.$filename.' on line '.$linenum.'. Cannot send log data to FirePHP. You must have Output Buffering enabled via ob_start() or output_buffering ini directive.'); + } + + $Type = null; + $Label = null; + + if(func_num_args()==1) { + } else + if(func_num_args()==2) { + switch(func_get_arg(1)) { + case self::LOG: + case self::INFO: + case self::WARN: + case self::ERROR: + case self::DUMP: + case self::TRACE: + case self::EXCEPTION: + case self::TABLE: + case self::GROUP_START: + case self::GROUP_END: + $Type = func_get_arg(1); + break; + default: + $Label = func_get_arg(1); + break; + } + } else + if(func_num_args()==3) { + $Type = func_get_arg(2); + $Label = func_get_arg(1); + } else { + throw $this->newException('Wrong number of arguments to fb() function!'); + } + + + if(!$this->detectClientExtension()) { + return false; + } + + $meta = array(); + $skipFinalObjectEncode = false; + + if($Object instanceof Exception) { + + $meta['file'] = $this->_escapeTraceFile($Object->getFile()); + $meta['line'] = $Object->getLine(); + + $trace = $Object->getTrace(); + if($Object instanceof ErrorException + && isset($trace[0]['function']) + && $trace[0]['function']=='errorHandler' + && isset($trace[0]['class']) + && $trace[0]['class']=='FirePHP') { + + $severity = false; + switch($Object->getSeverity()) { + case E_WARNING: $severity = 'E_WARNING'; break; + case E_NOTICE: $severity = 'E_NOTICE'; break; + case E_USER_ERROR: $severity = 'E_USER_ERROR'; break; + case E_USER_WARNING: $severity = 'E_USER_WARNING'; break; + case E_USER_NOTICE: $severity = 'E_USER_NOTICE'; break; + case E_STRICT: $severity = 'E_STRICT'; break; + case E_RECOVERABLE_ERROR: $severity = 'E_RECOVERABLE_ERROR'; break; + case E_DEPRECATED: $severity = 'E_DEPRECATED'; break; + case E_USER_DEPRECATED: $severity = 'E_USER_DEPRECATED'; break; + } + + $Object = array('Class'=>get_class($Object), + 'Message'=>$severity.': '.$Object->getMessage(), + 'File'=>$this->_escapeTraceFile($Object->getFile()), + 'Line'=>$Object->getLine(), + 'Type'=>'trigger', + 'Trace'=>$this->_escapeTrace(array_splice($trace,2))); + $skipFinalObjectEncode = true; + } else { + $Object = array('Class'=>get_class($Object), + 'Message'=>$Object->getMessage(), + 'File'=>$this->_escapeTraceFile($Object->getFile()), + 'Line'=>$Object->getLine(), + 'Type'=>'throw', + 'Trace'=>$this->_escapeTrace($trace)); + $skipFinalObjectEncode = true; + } + $Type = self::EXCEPTION; + + } else + if($Type==self::TRACE) { + + $trace = debug_backtrace(); + if(!$trace) return false; + for( $i=0 ; $i_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php' + || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) { + /* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */ + } else + if(isset($trace[$i]['class']) + && isset($trace[$i+1]['file']) + && $trace[$i]['class']=='FirePHP' + && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') { + /* Skip fb() */ + } else + if($trace[$i]['function']=='fb' + || $trace[$i]['function']=='trace' + || $trace[$i]['function']=='send') { + $Object = array('Class'=>isset($trace[$i]['class'])?$trace[$i]['class']:'', + 'Type'=>isset($trace[$i]['type'])?$trace[$i]['type']:'', + 'Function'=>isset($trace[$i]['function'])?$trace[$i]['function']:'', + 'Message'=>$trace[$i]['args'][0], + 'File'=>isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'', + 'Line'=>isset($trace[$i]['line'])?$trace[$i]['line']:'', + 'Args'=>isset($trace[$i]['args'])?$this->encodeObject($trace[$i]['args']):'', + 'Trace'=>$this->_escapeTrace(array_splice($trace,$i+1))); + + $skipFinalObjectEncode = true; + $meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):''; + $meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:''; + break; + } + } + + } else + if($Type==self::TABLE) { + + if(isset($Object[0]) && is_string($Object[0])) { + $Object[1] = $this->encodeTable($Object[1]); + } else { + $Object = $this->encodeTable($Object); + } + + $skipFinalObjectEncode = true; + + } else { + if($Type===null) { + $Type = self::LOG; + } + } + + if($this->options['includeLineNumbers']) { + if(!isset($meta['file']) || !isset($meta['line'])) { + + $trace = debug_backtrace(); + for( $i=0 ; $trace && $i_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php' + || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) { + /* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */ + } else + if(isset($trace[$i]['class']) + && isset($trace[$i+1]['file']) + && $trace[$i]['class']=='FirePHP' + && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') { + /* Skip fb() */ + } else + if(isset($trace[$i]['file']) + && substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php') { + /* Skip FB::fb() */ + } else { + $meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):''; + $meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:''; + break; + } + } + + } + } else { + unset($meta['file']); + unset($meta['line']); + } + + $this->setHeader('X-Wf-Protocol-1','http://meta.wildfirehq.org/Protocol/JsonStream/0.2'); + $this->setHeader('X-Wf-1-Plugin-1','http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/'.self::VERSION); + + $structure_index = 1; + if($Type==self::DUMP) { + $structure_index = 2; + $this->setHeader('X-Wf-1-Structure-2','http://meta.firephp.org/Wildfire/Structure/FirePHP/Dump/0.1'); + } else { + $this->setHeader('X-Wf-1-Structure-1','http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1'); + } + + if($Type==self::DUMP) { + $msg = '{"'.$Label.'":'.$this->jsonEncode($Object, $skipFinalObjectEncode).'}'; + } else { + $msg_meta = array('Type'=>$Type); + if($Label!==null) { + $msg_meta['Label'] = $Label; + } + if(isset($meta['file'])) { + $msg_meta['File'] = $meta['file']; + } + if(isset($meta['line'])) { + $msg_meta['Line'] = $meta['line']; + } + $msg = '['.$this->jsonEncode($msg_meta).','.$this->jsonEncode($Object, $skipFinalObjectEncode).']'; + } + + $parts = explode("\n",chunk_split($msg, 5000, "\n")); + + for( $i=0 ; $i2) { + // Message needs to be split into multiple parts + $this->setHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex, + (($i==0)?strlen($msg):'') + . '|' . $part . '|' + . (($isetHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex, + strlen($part) . '|' . $part . '|'); + } + + $this->messageIndex++; + + if ($this->messageIndex > 99999) { + throw new Exception('Maximum number (99,999) of messages reached!'); + } + } + } + + $this->setHeader('X-Wf-1-Index',$this->messageIndex-1); + + return true; + } + + /** + * Standardizes path for windows systems. + * + * @param string $Path + * @return string + */ + protected function _standardizePath($Path) { + return preg_replace('/\\\\+/','/',$Path); + } + + /** + * Escape trace path for windows systems + * + * @param array $Trace + * @return array + */ + protected function _escapeTrace($Trace) { + if(!$Trace) return $Trace; + for( $i=0 ; $i_escapeTraceFile($Trace[$i]['file']); + } + if(isset($Trace[$i]['args'])) { + $Trace[$i]['args'] = $this->encodeObject($Trace[$i]['args']); + } + } + return $Trace; + } + + /** + * Escape file information of trace for windows systems + * + * @param string $File + * @return string + */ + protected function _escapeTraceFile($File) { + /* Check if we have a windows filepath */ + if(strpos($File,'\\')) { + /* First strip down to single \ */ + + $file = preg_replace('/\\\\+/','\\',$File); + + return $file; + } + return $File; + } + + /** + * Send header + * + * @param string $Name + * @param string_type $Value + */ + protected function setHeader($Name, $Value) { + return header($Name.': '.$Value); + } + + /** + * Get user agent + * + * @return string|false + */ + protected function getUserAgent() { + if(!isset($_SERVER['HTTP_USER_AGENT'])) return false; + return $_SERVER['HTTP_USER_AGENT']; + } + + /** + * Returns a new exception + * + * @param string $Message + * @return Exception + */ + protected function newException($Message) { + return new Exception($Message); + } + + /** + * Encode an object into a JSON string + * + * Uses PHP's jeson_encode() if available + * + * @param object $Object The object to be encoded + * @return string The JSON string + */ + protected function jsonEncode($Object, $skipObjectEncode=false) + { + if(!$skipObjectEncode) { + $Object = $this->encodeObject($Object); + } + + if(function_exists('json_encode') + && $this->options['useNativeJsonEncode']!=false) { + + return json_encode($Object); + } else { + return $this->json_encode($Object); + } + } + + /** + * Encodes a table by encoding each row and column with encodeObject() + * + * @param array $Table The table to be encoded + * @return array + */ + protected function encodeTable($Table) { + if(!$Table) return $Table; + for( $i=0 ; $iencodeObject($Table[$i][$j]); + } + } + } + return $Table; + } + + /** + * Encodes an object including members with + * protected and private visibility + * + * @param Object $Object The object to be encoded + * @param int $Depth The current traversal depth + * @return array All members of the object + */ + protected function encodeObject($Object, $ObjectDepth = 1, $ArrayDepth = 1) + { + $return = array(); + + if (is_object($Object)) { + + if ($ObjectDepth > $this->options['maxObjectDepth']) { + return '** Max Object Depth ('.$this->options['maxObjectDepth'].') **'; + } + + foreach ($this->objectStack as $refVal) { + if ($refVal === $Object) { + return '** Recursion ('.get_class($Object).') **'; + } + } + array_push($this->objectStack, $Object); + + $return['__className'] = $class = get_class($Object); + + $reflectionClass = new ReflectionClass($class); + $properties = array(); + foreach( $reflectionClass->getProperties() as $property) { + $properties[$property->getName()] = $property; + } + + $members = (array)$Object; + + foreach( $properties as $raw_name => $property ) { + + $name = $raw_name; + if($property->isStatic()) { + $name = 'static:'.$name; + } + if($property->isPublic()) { + $name = 'public:'.$name; + } else + if($property->isPrivate()) { + $name = 'private:'.$name; + $raw_name = "\0".$class."\0".$raw_name; + } else + if($property->isProtected()) { + $name = 'protected:'.$name; + $raw_name = "\0".'*'."\0".$raw_name; + } + + if(!(isset($this->objectFilters[$class]) + && is_array($this->objectFilters[$class]) + && in_array($raw_name,$this->objectFilters[$class]))) { + + if(array_key_exists($raw_name,$members) + && !$property->isStatic()) { + + $return[$name] = $this->encodeObject($members[$raw_name], $ObjectDepth + 1, 1); + + } else { + if(method_exists($property,'setAccessible')) { + $property->setAccessible(true); + $return[$name] = $this->encodeObject($property->getValue($Object), $ObjectDepth + 1, 1); + } else + if($property->isPublic()) { + $return[$name] = $this->encodeObject($property->getValue($Object), $ObjectDepth + 1, 1); + } else { + $return[$name] = '** Need PHP 5.3 to get value **'; + } + } + } else { + $return[$name] = '** Excluded by Filter **'; + } + } + + // Include all members that are not defined in the class + // but exist in the object + foreach( $members as $raw_name => $value ) { + + $name = $raw_name; + + if ($name{0} == "\0") { + $parts = explode("\0", $name); + $name = $parts[2]; + } + + if(!isset($properties[$name])) { + $name = 'undeclared:'.$name; + + if(!(isset($this->objectFilters[$class]) + && is_array($this->objectFilters[$class]) + && in_array($raw_name,$this->objectFilters[$class]))) { + + $return[$name] = $this->encodeObject($value, $ObjectDepth + 1, 1); + } else { + $return[$name] = '** Excluded by Filter **'; + } + } + } + + array_pop($this->objectStack); + + } elseif (is_array($Object)) { + + if ($ArrayDepth > $this->options['maxArrayDepth']) { + return '** Max Array Depth ('.$this->options['maxArrayDepth'].') **'; + } + + foreach ($Object as $key => $val) { + + // Encoding the $GLOBALS PHP array causes an infinite loop + // if the recursion is not reset here as it contains + // a reference to itself. This is the only way I have come up + // with to stop infinite recursion in this case. + if($key=='GLOBALS' + && is_array($val) + && array_key_exists('GLOBALS',$val)) { + $val['GLOBALS'] = '** Recursion (GLOBALS) **'; + } + + $return[$key] = $this->encodeObject($val, 1, $ArrayDepth + 1); + } + } else { + if(self::is_utf8($Object)) { + return $Object; + } else { + return utf8_encode($Object); + } + } + return $return; + } + + /** + * Returns true if $string is valid UTF-8 and false otherwise. + * + * @param mixed $str String to be tested + * @return boolean + */ + protected static function is_utf8($str) { + $c=0; $b=0; + $bits=0; + $len=strlen($str); + for($i=0; $i<$len; $i++){ + $c=ord($str[$i]); + if($c > 128){ + if(($c >= 254)) return false; + elseif($c >= 252) $bits=6; + elseif($c >= 248) $bits=5; + elseif($c >= 240) $bits=4; + elseif($c >= 224) $bits=3; + elseif($c >= 192) $bits=2; + else return false; + if(($i+$bits) > $len) return false; + while($bits > 1){ + $i++; + $b=ord($str[$i]); + if($b < 128 || $b > 191) return false; + $bits--; + } + } + } + return true; + } + + /** + * Converts to and from JSON format. + * + * JSON (JavaScript Object Notation) is a lightweight data-interchange + * format. It is easy for humans to read and write. It is easy for machines + * to parse and generate. It is based on a subset of the JavaScript + * Programming Language, Standard ECMA-262 3rd Edition - December 1999. + * This feature can also be found in Python. JSON is a text format that is + * completely language independent but uses conventions that are familiar + * to programmers of the C-family of languages, including C, C++, C#, Java, + * JavaScript, Perl, TCL, and many others. These properties make JSON an + * ideal data-interchange language. + * + * This package provides a simple encoder and decoder for JSON notation. It + * is intended for use with client-side Javascript applications that make + * use of HTTPRequest to perform server communication functions - data can + * be encoded into JSON notation for use in a client-side javascript, or + * decoded from incoming Javascript requests. JSON format is native to + * Javascript, and can be directly eval()'ed with no further parsing + * overhead + * + * All strings should be in ASCII or UTF-8 format! + * + * LICENSE: Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: Redistributions of source code must retain the + * above copyright notice, this list of conditions and the following + * disclaimer. Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN + * NO EVENT SHALL CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * @category + * @package Services_JSON + * @author Michal Migurski + * @author Matt Knapp + * @author Brett Stimmerman + * @author Christoph Dorn + * @copyright 2005 Michal Migurski + * @version CVS: $Id: JSON.php,v 1.31 2006/06/28 05:54:17 migurski Exp $ + * @license http://www.opensource.org/licenses/bsd-license.php + * @link http://pear.php.net/pepr/pepr-proposal-show.php?id=198 + */ + + + /** + * Keep a list of objects as we descend into the array so we can detect recursion. + */ + private $json_objectStack = array(); + + + /** + * convert a string from one UTF-8 char to one UTF-16 char + * + * Normally should be handled by mb_convert_encoding, but + * provides a slower PHP-only method for installations + * that lack the multibye string extension. + * + * @param string $utf8 UTF-8 character + * @return string UTF-16 character + * @access private + */ + private function json_utf82utf16($utf8) + { + // oh please oh please oh please oh please oh please + if(function_exists('mb_convert_encoding')) { + return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8'); + } + + switch(strlen($utf8)) { + case 1: + // this case should never be reached, because we are in ASCII range + // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + return $utf8; + + case 2: + // return a UTF-16 character from a 2-byte UTF-8 char + // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + return chr(0x07 & (ord($utf8{0}) >> 2)) + . chr((0xC0 & (ord($utf8{0}) << 6)) + | (0x3F & ord($utf8{1}))); + + case 3: + // return a UTF-16 character from a 3-byte UTF-8 char + // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + return chr((0xF0 & (ord($utf8{0}) << 4)) + | (0x0F & (ord($utf8{1}) >> 2))) + . chr((0xC0 & (ord($utf8{1}) << 6)) + | (0x7F & ord($utf8{2}))); + } + + // ignoring UTF-32 for now, sorry + return ''; + } + + /** + * encodes an arbitrary variable into JSON format + * + * @param mixed $var any number, boolean, string, array, or object to be encoded. + * see argument 1 to Services_JSON() above for array-parsing behavior. + * if var is a strng, note that encode() always expects it + * to be in ASCII or UTF-8 format! + * + * @return mixed JSON string representation of input var or an error if a problem occurs + * @access public + */ + private function json_encode($var) + { + + if(is_object($var)) { + if(in_array($var,$this->json_objectStack)) { + return '"** Recursion **"'; + } + } + + switch (gettype($var)) { + case 'boolean': + return $var ? 'true' : 'false'; + + case 'NULL': + return 'null'; + + case 'integer': + return (int) $var; + + case 'double': + case 'float': + return (float) $var; + + case 'string': + // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT + $ascii = ''; + $strlen_var = strlen($var); + + /* + * Iterate over every character in the string, + * escaping with a slash or encoding to UTF-8 where necessary + */ + for ($c = 0; $c < $strlen_var; ++$c) { + + $ord_var_c = ord($var{$c}); + + switch (true) { + case $ord_var_c == 0x08: + $ascii .= '\b'; + break; + case $ord_var_c == 0x09: + $ascii .= '\t'; + break; + case $ord_var_c == 0x0A: + $ascii .= '\n'; + break; + case $ord_var_c == 0x0C: + $ascii .= '\f'; + break; + case $ord_var_c == 0x0D: + $ascii .= '\r'; + break; + + case $ord_var_c == 0x22: + case $ord_var_c == 0x2F: + case $ord_var_c == 0x5C: + // double quote, slash, slosh + $ascii .= '\\'.$var{$c}; + break; + + case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)): + // characters U-00000000 - U-0000007F (same as ASCII) + $ascii .= $var{$c}; + break; + + case (($ord_var_c & 0xE0) == 0xC0): + // characters U-00000080 - U-000007FF, mask 110XXXXX + // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + $char = pack('C*', $ord_var_c, ord($var{$c + 1})); + $c += 1; + $utf16 = $this->json_utf82utf16($char); + $ascii .= sprintf('\u%04s', bin2hex($utf16)); + break; + + case (($ord_var_c & 0xF0) == 0xE0): + // characters U-00000800 - U-0000FFFF, mask 1110XXXX + // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + $char = pack('C*', $ord_var_c, + ord($var{$c + 1}), + ord($var{$c + 2})); + $c += 2; + $utf16 = $this->json_utf82utf16($char); + $ascii .= sprintf('\u%04s', bin2hex($utf16)); + break; + + case (($ord_var_c & 0xF8) == 0xF0): + // characters U-00010000 - U-001FFFFF, mask 11110XXX + // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + $char = pack('C*', $ord_var_c, + ord($var{$c + 1}), + ord($var{$c + 2}), + ord($var{$c + 3})); + $c += 3; + $utf16 = $this->json_utf82utf16($char); + $ascii .= sprintf('\u%04s', bin2hex($utf16)); + break; + + case (($ord_var_c & 0xFC) == 0xF8): + // characters U-00200000 - U-03FFFFFF, mask 111110XX + // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + $char = pack('C*', $ord_var_c, + ord($var{$c + 1}), + ord($var{$c + 2}), + ord($var{$c + 3}), + ord($var{$c + 4})); + $c += 4; + $utf16 = $this->json_utf82utf16($char); + $ascii .= sprintf('\u%04s', bin2hex($utf16)); + break; + + case (($ord_var_c & 0xFE) == 0xFC): + // characters U-04000000 - U-7FFFFFFF, mask 1111110X + // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + $char = pack('C*', $ord_var_c, + ord($var{$c + 1}), + ord($var{$c + 2}), + ord($var{$c + 3}), + ord($var{$c + 4}), + ord($var{$c + 5})); + $c += 5; + $utf16 = $this->json_utf82utf16($char); + $ascii .= sprintf('\u%04s', bin2hex($utf16)); + break; + } + } + + return '"'.$ascii.'"'; + + case 'array': + /* + * As per JSON spec if any array key is not an integer + * we must treat the the whole array as an object. We + * also try to catch a sparsely populated associative + * array with numeric keys here because some JS engines + * will create an array with empty indexes up to + * max_index which can cause memory issues and because + * the keys, which may be relevant, will be remapped + * otherwise. + * + * As per the ECMA and JSON specification an object may + * have any string as a property. Unfortunately due to + * a hole in the ECMA specification if the key is a + * ECMA reserved word or starts with a digit the + * parameter is only accessible using ECMAScript's + * bracket notation. + */ + + // treat as a JSON object + if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) { + + $this->json_objectStack[] = $var; + + $properties = array_map(array($this, 'json_name_value'), + array_keys($var), + array_values($var)); + + array_pop($this->json_objectStack); + + foreach($properties as $property) { + if($property instanceof Exception) { + return $property; + } + } + + return '{' . join(',', $properties) . '}'; + } + + $this->json_objectStack[] = $var; + + // treat it like a regular array + $elements = array_map(array($this, 'json_encode'), $var); + + array_pop($this->json_objectStack); + + foreach($elements as $element) { + if($element instanceof Exception) { + return $element; + } + } + + return '[' . join(',', $elements) . ']'; + + case 'object': + $vars = self::encodeObject($var); + + $this->json_objectStack[] = $var; + + $properties = array_map(array($this, 'json_name_value'), + array_keys($vars), + array_values($vars)); + + array_pop($this->json_objectStack); + + foreach($properties as $property) { + if($property instanceof Exception) { + return $property; + } + } + + return '{' . join(',', $properties) . '}'; + + default: + return null; + } + } + + /** + * array-walking function for use in generating JSON-formatted name-value pairs + * + * @param string $name name of key to use + * @param mixed $value reference to an array element to be encoded + * + * @return string JSON-formatted name-value pair, like '"name":value' + * @access private + */ + private function json_name_value($name, $value) + { + // Encoding the $GLOBALS PHP array causes an infinite loop + // if the recursion is not reset here as it contains + // a reference to itself. This is the only way I have come up + // with to stop infinite recursion in this case. + if($name=='GLOBALS' + && is_array($value) + && array_key_exists('GLOBALS',$value)) { + $value['GLOBALS'] = '** Recursion **'; + } + + $encoded_value = $this->json_encode($value); + + if($encoded_value instanceof Exception) { + return $encoded_value; + } + + return $this->json_encode(strval($name)) . ':' . $encoded_value; + } +} diff --git a/plugins/Minify/extlib/minify/min/lib/HTTP/ConditionalGet.php b/plugins/Minify/extlib/minify/min/lib/HTTP/ConditionalGet.php new file mode 100644 index 0000000000..823db058fa --- /dev/null +++ b/plugins/Minify/extlib/minify/min/lib/HTTP/ConditionalGet.php @@ -0,0 +1,348 @@ + + * list($updateTime, $content) = getDbUpdateAndContent(); + * $cg = new HTTP_ConditionalGet(array( + * 'lastModifiedTime' => $updateTime + * ,'isPublic' => true + * )); + * $cg->sendHeaders(); + * if ($cg->cacheIsValid) { + * exit(); + * } + * echo $content; + * + * + * E.g. Shortcut for the above + * + * HTTP_ConditionalGet::check($updateTime, true); // exits if client has cache + * echo $content; + * + * + * E.g. Content from DB with no update time: + * + * $content = getContentFromDB(); + * $cg = new HTTP_ConditionalGet(array( + * 'contentHash' => md5($content) + * )); + * $cg->sendHeaders(); + * if ($cg->cacheIsValid) { + * exit(); + * } + * echo $content; + * + * + * E.g. Static content with some static includes: + * + * // before content + * $cg = new HTTP_ConditionalGet(array( + * 'lastUpdateTime' => max( + * filemtime(__FILE__) + * ,filemtime('/path/to/header.inc') + * ,filemtime('/path/to/footer.inc') + * ) + * )); + * $cg->sendHeaders(); + * if ($cg->cacheIsValid) { + * exit(); + * } + * + * @package Minify + * @subpackage HTTP + * @author Stephen Clay + */ +class HTTP_ConditionalGet { + + /** + * Does the client have a valid copy of the requested resource? + * + * You'll want to check this after instantiating the object. If true, do + * not send content, just call sendHeaders() if you haven't already. + * + * @var bool + */ + public $cacheIsValid = null; + + /** + * @param array $spec options + * + * 'isPublic': (bool) if true, the Cache-Control header will contain + * "public", allowing proxies to cache the content. Otherwise "private" will + * be sent, allowing only browser caching. (default false) + * + * 'lastModifiedTime': (int) if given, both ETag AND Last-Modified headers + * will be sent with content. This is recommended. + * + * 'encoding': (string) if set, the header "Vary: Accept-Encoding" will + * always be sent and a truncated version of the encoding will be appended + * to the ETag. E.g. "pub123456;gz". This will also trigger a more lenient + * checking of the client's If-None-Match header, as the encoding portion of + * the ETag will be stripped before comparison. + * + * 'contentHash': (string) if given, only the ETag header can be sent with + * content (only HTTP1.1 clients can conditionally GET). The given string + * should be short with no quote characters and always change when the + * resource changes (recommend md5()). This is not needed/used if + * lastModifiedTime is given. + * + * 'eTag': (string) if given, this will be used as the ETag header rather + * than values based on lastModifiedTime or contentHash. Also the encoding + * string will not be appended to the given value as described above. + * + * 'invalidate': (bool) if true, the client cache will be considered invalid + * without testing. Effectively this disables conditional GET. + * (default false) + * + * 'maxAge': (int) if given, this will set the Cache-Control max-age in + * seconds, and also set the Expires header to the equivalent GMT date. + * After the max-age period has passed, the browser will again send a + * conditional GET to revalidate its cache. + * + * @return null + */ + public function __construct($spec) + { + $scope = (isset($spec['isPublic']) && $spec['isPublic']) + ? 'public' + : 'private'; + $maxAge = 0; + // backwards compatibility (can be removed later) + if (isset($spec['setExpires']) + && is_numeric($spec['setExpires']) + && ! isset($spec['maxAge'])) { + $spec['maxAge'] = $spec['setExpires'] - $_SERVER['REQUEST_TIME']; + } + if (isset($spec['maxAge'])) { + $maxAge = $spec['maxAge']; + $this->_headers['Expires'] = self::gmtDate( + $_SERVER['REQUEST_TIME'] + $spec['maxAge'] + ); + } + $etagAppend = ''; + if (isset($spec['encoding'])) { + $this->_stripEtag = true; + $this->_headers['Vary'] = 'Accept-Encoding'; + if ('' !== $spec['encoding']) { + if (0 === strpos($spec['encoding'], 'x-')) { + $spec['encoding'] = substr($spec['encoding'], 2); + } + $etagAppend = ';' . substr($spec['encoding'], 0, 2); + } + } + if (isset($spec['lastModifiedTime'])) { + $this->_setLastModified($spec['lastModifiedTime']); + if (isset($spec['eTag'])) { // Use it + $this->_setEtag($spec['eTag'], $scope); + } else { // base both headers on time + $this->_setEtag($spec['lastModifiedTime'] . $etagAppend, $scope); + } + } elseif (isset($spec['eTag'])) { // Use it + $this->_setEtag($spec['eTag'], $scope); + } elseif (isset($spec['contentHash'])) { // Use the hash as the ETag + $this->_setEtag($spec['contentHash'] . $etagAppend, $scope); + } + $this->_headers['Cache-Control'] = "max-age={$maxAge}, {$scope}"; + // invalidate cache if disabled, otherwise check + $this->cacheIsValid = (isset($spec['invalidate']) && $spec['invalidate']) + ? false + : $this->_isCacheValid(); + } + + /** + * Get array of output headers to be sent + * + * In the case of 304 responses, this array will only contain the response + * code header: array('_responseCode' => 'HTTP/1.0 304 Not Modified') + * + * Otherwise something like: + * + * array( + * 'Cache-Control' => 'max-age=0, public' + * ,'ETag' => '"foobar"' + * ) + * + * + * @return array + */ + public function getHeaders() + { + return $this->_headers; + } + + /** + * Set the Content-Length header in bytes + * + * With most PHP configs, as long as you don't flush() output, this method + * is not needed and PHP will buffer all output and set Content-Length for + * you. Otherwise you'll want to call this to let the client know up front. + * + * @param int $bytes + * + * @return int copy of input $bytes + */ + public function setContentLength($bytes) + { + return $this->_headers['Content-Length'] = $bytes; + } + + /** + * Send headers + * + * @see getHeaders() + * + * Note this doesn't "clear" the headers. Calling sendHeaders() will + * call header() again (but probably have not effect) and getHeaders() will + * still return the headers. + * + * @return null + */ + public function sendHeaders() + { + $headers = $this->_headers; + if (array_key_exists('_responseCode', $headers)) { + header($headers['_responseCode']); + unset($headers['_responseCode']); + } + foreach ($headers as $name => $val) { + header($name . ': ' . $val); + } + } + + /** + * Exit if the client's cache is valid for this resource + * + * This is a convenience method for common use of the class + * + * @param int $lastModifiedTime if given, both ETag AND Last-Modified headers + * will be sent with content. This is recommended. + * + * @param bool $isPublic (default false) if true, the Cache-Control header + * will contain "public", allowing proxies to cache the content. Otherwise + * "private" will be sent, allowing only browser caching. + * + * @param array $options (default empty) additional options for constructor + * + * @return null + */ + public static function check($lastModifiedTime = null, $isPublic = false, $options = array()) + { + if (null !== $lastModifiedTime) { + $options['lastModifiedTime'] = (int)$lastModifiedTime; + } + $options['isPublic'] = (bool)$isPublic; + $cg = new HTTP_ConditionalGet($options); + $cg->sendHeaders(); + if ($cg->cacheIsValid) { + exit(); + } + } + + + /** + * Get a GMT formatted date for use in HTTP headers + * + * + * header('Expires: ' . HTTP_ConditionalGet::gmtdate($time)); + * + * + * @param int $time unix timestamp + * + * @return string + */ + public static function gmtDate($time) + { + return gmdate('D, d M Y H:i:s \G\M\T', $time); + } + + protected $_headers = array(); + protected $_lmTime = null; + protected $_etag = null; + protected $_stripEtag = false; + + protected function _setEtag($hash, $scope) + { + $this->_etag = '"' . substr($scope, 0, 3) . $hash . '"'; + $this->_headers['ETag'] = $this->_etag; + } + + protected function _setLastModified($time) + { + $this->_lmTime = (int)$time; + $this->_headers['Last-Modified'] = self::gmtDate($time); + } + + /** + * Determine validity of client cache and queue 304 header if valid + */ + protected function _isCacheValid() + { + if (null === $this->_etag) { + // lmTime is copied to ETag, so this condition implies that the + // server sent neither ETag nor Last-Modified, so the client can't + // possibly has a valid cache. + return false; + } + $isValid = ($this->resourceMatchedEtag() || $this->resourceNotModified()); + if ($isValid) { + $this->_headers['_responseCode'] = 'HTTP/1.0 304 Not Modified'; + } + return $isValid; + } + + protected function resourceMatchedEtag() + { + if (!isset($_SERVER['HTTP_IF_NONE_MATCH'])) { + return false; + } + $clientEtagList = get_magic_quotes_gpc() + ? stripslashes($_SERVER['HTTP_IF_NONE_MATCH']) + : $_SERVER['HTTP_IF_NONE_MATCH']; + $clientEtags = explode(',', $clientEtagList); + + $compareTo = $this->normalizeEtag($this->_etag); + foreach ($clientEtags as $clientEtag) { + if ($this->normalizeEtag($clientEtag) === $compareTo) { + // respond with the client's matched ETag, even if it's not what + // we would've sent by default + $this->_headers['ETag'] = trim($clientEtag); + return true; + } + } + return false; + } + + protected function normalizeEtag($etag) { + $etag = trim($etag); + return $this->_stripEtag + ? preg_replace('/;\\w\\w"$/', '"', $etag) + : $etag; + } + + protected function resourceNotModified() + { + if (!isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) { + return false; + } + $ifModifiedSince = $_SERVER['HTTP_IF_MODIFIED_SINCE']; + if (false !== ($semicolon = strrpos($ifModifiedSince, ';'))) { + // IE has tacked on extra data to this header, strip it + $ifModifiedSince = substr($ifModifiedSince, 0, $semicolon); + } + if ($ifModifiedSince == self::gmtDate($this->_lmTime)) { + // Apache 2.2's behavior. If there was no ETag match, send the + // non-encoded version of the ETag value. + $this->_headers['ETag'] = $this->normalizeEtag($this->_etag); + return true; + } + return false; + } +} diff --git a/plugins/Minify/extlib/minify/min/lib/HTTP/Encoder.php b/plugins/Minify/extlib/minify/min/lib/HTTP/Encoder.php new file mode 100644 index 0000000000..66c26789c3 --- /dev/null +++ b/plugins/Minify/extlib/minify/min/lib/HTTP/Encoder.php @@ -0,0 +1,326 @@ + + * // Send a CSS file, compressed if possible + * $he = new HTTP_Encoder(array( + * 'content' => file_get_contents($cssFile) + * ,'type' => 'text/css' + * )); + * $he->encode(); + * $he->sendAll(); + * + * + * + * // Shortcut to encoding output + * header('Content-Type: text/css'); // needed if not HTML + * HTTP_Encoder::output($css); + * + * + * + * // Just sniff for the accepted encoding + * $encoding = HTTP_Encoder::getAcceptedEncoding(); + * + * + * For more control over headers, use getHeaders() and getData() and send your + * own output. + * + * Note: If you don't need header mgmt, use PHP's native gzencode, gzdeflate, + * and gzcompress functions for gzip, deflate, and compress-encoding + * respectively. + * + * @package Minify + * @subpackage HTTP + * @author Stephen Clay + */ +class HTTP_Encoder { + + /** + * Should the encoder allow HTTP encoding to IE6? + * + * If you have many IE6 users and the bandwidth savings is worth troubling + * some of them, set this to true. + * + * By default, encoding is only offered to IE7+. When this is true, + * getAcceptedEncoding() will return an encoding for IE6 if its user agent + * string contains "SV1". This has been documented in many places as "safe", + * but there seem to be remaining, intermittent encoding bugs in patched + * IE6 on the wild web. + * + * @var bool + */ + public static $encodeToIe6 = false; + + + /** + * Default compression level for zlib operations + * + * This level is used if encode() is not given a $compressionLevel + * + * @var int + */ + public static $compressionLevel = 6; + + + /** + * Get an HTTP Encoder object + * + * @param array $spec options + * + * 'content': (string required) content to be encoded + * + * 'type': (string) if set, the Content-Type header will have this value. + * + * 'method: (string) only set this if you are forcing a particular encoding + * method. If not set, the best method will be chosen by getAcceptedEncoding() + * The available methods are 'gzip', 'deflate', 'compress', and '' (no + * encoding) + * + * @return null + */ + public function __construct($spec) + { + $this->_content = $spec['content']; + $this->_headers['Content-Length'] = (string)strlen($this->_content); + if (isset($spec['type'])) { + $this->_headers['Content-Type'] = $spec['type']; + } + if (isset($spec['method']) + && in_array($spec['method'], array('gzip', 'deflate', 'compress', ''))) + { + $this->_encodeMethod = array($spec['method'], $spec['method']); + } else { + $this->_encodeMethod = self::getAcceptedEncoding(); + } + } + + /** + * Get content in current form + * + * Call after encode() for encoded content. + * + * return string + */ + public function getContent() + { + return $this->_content; + } + + /** + * Get array of output headers to be sent + * + * E.g. + * + * array( + * 'Content-Length' => '615' + * ,'Content-Encoding' => 'x-gzip' + * ,'Vary' => 'Accept-Encoding' + * ) + * + * + * @return array + */ + public function getHeaders() + { + return $this->_headers; + } + + /** + * Send output headers + * + * You must call this before headers are sent and it probably cannot be + * used in conjunction with zlib output buffering / mod_gzip. Errors are + * not handled purposefully. + * + * @see getHeaders() + * + * @return null + */ + public function sendHeaders() + { + foreach ($this->_headers as $name => $val) { + header($name . ': ' . $val); + } + } + + /** + * Send output headers and content + * + * A shortcut for sendHeaders() and echo getContent() + * + * You must call this before headers are sent and it probably cannot be + * used in conjunction with zlib output buffering / mod_gzip. Errors are + * not handled purposefully. + * + * @return null + */ + public function sendAll() + { + $this->sendHeaders(); + echo $this->_content; + } + + /** + * Determine the client's best encoding method from the HTTP Accept-Encoding + * header. + * + * If no Accept-Encoding header is set, or the browser is IE before v6 SP2, + * this will return ('', ''), the "identity" encoding. + * + * A syntax-aware scan is done of the Accept-Encoding, so the method must + * be non 0. The methods are favored in order of gzip, deflate, then + * compress. Deflate is always smallest and generally faster, but is + * rarely sent by servers, so client support could be buggier. + * + * @param bool $allowCompress allow the older compress encoding + * + * @param bool $allowDeflate allow the more recent deflate encoding + * + * @return array two values, 1st is the actual encoding method, 2nd is the + * alias of that method to use in the Content-Encoding header (some browsers + * call gzip "x-gzip" etc.) + */ + public static function getAcceptedEncoding($allowCompress = true, $allowDeflate = true) + { + // @link http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html + + if (! isset($_SERVER['HTTP_ACCEPT_ENCODING']) + || self::_isBuggyIe()) + { + return array('', ''); + } + $ae = $_SERVER['HTTP_ACCEPT_ENCODING']; + // gzip checks (quick) + if (0 === strpos($ae, 'gzip,') // most browsers + || 0 === strpos($ae, 'deflate, gzip,') // opera + ) { + return array('gzip', 'gzip'); + } + // gzip checks (slow) + if (preg_match( + '@(?:^|,)\\s*((?:x-)?gzip)\\s*(?:$|,|;\\s*q=(?:0\\.|1))@' + ,$ae + ,$m)) { + return array('gzip', $m[1]); + } + if ($allowDeflate) { + // deflate checks + $aeRev = strrev($ae); + if (0 === strpos($aeRev, 'etalfed ,') // ie, webkit + || 0 === strpos($aeRev, 'etalfed,') // gecko + || 0 === strpos($ae, 'deflate,') // opera + // slow parsing + || preg_match( + '@(?:^|,)\\s*deflate\\s*(?:$|,|;\\s*q=(?:0\\.|1))@', $ae)) { + return array('deflate', 'deflate'); + } + } + if ($allowCompress && preg_match( + '@(?:^|,)\\s*((?:x-)?compress)\\s*(?:$|,|;\\s*q=(?:0\\.|1))@' + ,$ae + ,$m)) { + return array('compress', $m[1]); + } + return array('', ''); + } + + /** + * Encode (compress) the content + * + * If the encode method is '' (none) or compression level is 0, or the 'zlib' + * extension isn't loaded, we return false. + * + * Then the appropriate gz_* function is called to compress the content. If + * this fails, false is returned. + * + * The header "Vary: Accept-Encoding" is added. If encoding is successful, + * the Content-Length header is updated, and Content-Encoding is also added. + * + * @param int $compressionLevel given to zlib functions. If not given, the + * class default will be used. + * + * @return bool success true if the content was actually compressed + */ + public function encode($compressionLevel = null) + { + $this->_headers['Vary'] = 'Accept-Encoding'; + if (null === $compressionLevel) { + $compressionLevel = self::$compressionLevel; + } + if ('' === $this->_encodeMethod[0] + || ($compressionLevel == 0) + || !extension_loaded('zlib')) + { + return false; + } + if ($this->_encodeMethod[0] === 'deflate') { + $encoded = gzdeflate($this->_content, $compressionLevel); + } elseif ($this->_encodeMethod[0] === 'gzip') { + $encoded = gzencode($this->_content, $compressionLevel); + } else { + $encoded = gzcompress($this->_content, $compressionLevel); + } + if (false === $encoded) { + return false; + } + $this->_headers['Content-Length'] = strlen($encoded); + $this->_headers['Content-Encoding'] = $this->_encodeMethod[1]; + $this->_content = $encoded; + return true; + } + + /** + * Encode and send appropriate headers and content + * + * This is a convenience method for common use of the class + * + * @param string $content + * + * @param int $compressionLevel given to zlib functions. If not given, the + * class default will be used. + * + * @return bool success true if the content was actually compressed + */ + public static function output($content, $compressionLevel = null) + { + if (null === $compressionLevel) { + $compressionLevel = self::$compressionLevel; + } + $he = new HTTP_Encoder(array('content' => $content)); + $ret = $he->encode($compressionLevel); + $he->sendAll(); + return $ret; + } + + protected $_content = ''; + protected $_headers = array(); + protected $_encodeMethod = array('', ''); + + /** + * Is the browser an IE version earlier than 6 SP2? + */ + protected static function _isBuggyIe() + { + $ua = $_SERVER['HTTP_USER_AGENT']; + // quick escape for non-IEs + if (0 !== strpos($ua, 'Mozilla/4.0 (compatible; MSIE ') + || false !== strpos($ua, 'Opera')) { + return false; + } + // no regex = faaast + $version = (float)substr($ua, 30); + return self::$encodeToIe6 + ? ($version < 6 || ($version == 6 && false === strpos($ua, 'SV1'))) + : ($version < 7); + } +} diff --git a/plugins/Minify/extlib/minify/min/lib/JSMin.php b/plugins/Minify/extlib/minify/min/lib/JSMin.php new file mode 100644 index 0000000000..770e1c6104 --- /dev/null +++ b/plugins/Minify/extlib/minify/min/lib/JSMin.php @@ -0,0 +1,314 @@ + (PHP port) + * @author Steve Clay (modifications + cleanup) + * @author Andrea Giammarchi (spaceBeforeRegExp) + * @copyright 2002 Douglas Crockford (jsmin.c) + * @copyright 2008 Ryan Grove (PHP port) + * @license http://opensource.org/licenses/mit-license.php MIT License + * @link http://code.google.com/p/jsmin-php/ + */ + +class JSMin { + const ORD_LF = 10; + const ORD_SPACE = 32; + const ACTION_KEEP_A = 1; + const ACTION_DELETE_A = 2; + const ACTION_DELETE_A_B = 3; + + protected $a = "\n"; + protected $b = ''; + protected $input = ''; + protected $inputIndex = 0; + protected $inputLength = 0; + protected $lookAhead = null; + protected $output = ''; + + /** + * Minify Javascript + * + * @param string $js Javascript to be minified + * @return string + */ + public static function minify($js) + { + $jsmin = new JSMin($js); + return $jsmin->min(); + } + + /** + * Setup process + */ + public function __construct($input) + { + $this->input = str_replace("\r\n", "\n", $input); + $this->inputLength = strlen($this->input); + } + + /** + * Perform minification, return result + */ + public function min() + { + if ($this->output !== '') { // min already run + return $this->output; + } + $this->action(self::ACTION_DELETE_A_B); + + while ($this->a !== null) { + // determine next command + $command = self::ACTION_KEEP_A; // default + if ($this->a === ' ') { + if (! $this->isAlphaNum($this->b)) { + $command = self::ACTION_DELETE_A; + } + } elseif ($this->a === "\n") { + if ($this->b === ' ') { + $command = self::ACTION_DELETE_A_B; + } elseif (false === strpos('{[(+-', $this->b) + && ! $this->isAlphaNum($this->b)) { + $command = self::ACTION_DELETE_A; + } + } elseif (! $this->isAlphaNum($this->a)) { + if ($this->b === ' ' + || ($this->b === "\n" + && (false === strpos('}])+-"\'', $this->a)))) { + $command = self::ACTION_DELETE_A_B; + } + } + $this->action($command); + } + $this->output = trim($this->output); + return $this->output; + } + + /** + * ACTION_KEEP_A = Output A. Copy B to A. Get the next B. + * ACTION_DELETE_A = Copy B to A. Get the next B. + * ACTION_DELETE_A_B = Get the next B. + */ + protected function action($command) + { + switch ($command) { + case self::ACTION_KEEP_A: + $this->output .= $this->a; + // fallthrough + case self::ACTION_DELETE_A: + $this->a = $this->b; + if ($this->a === "'" || $this->a === '"') { // string literal + $str = $this->a; // in case needed for exception + while (true) { + $this->output .= $this->a; + $this->a = $this->get(); + if ($this->a === $this->b) { // end quote + break; + } + if (ord($this->a) <= self::ORD_LF) { + throw new JSMin_UnterminatedStringException( + 'Unterminated String: ' . var_export($str, true)); + } + $str .= $this->a; + if ($this->a === '\\') { + $this->output .= $this->a; + $this->a = $this->get(); + $str .= $this->a; + } + } + } + // fallthrough + case self::ACTION_DELETE_A_B: + $this->b = $this->next(); + if ($this->b === '/' && $this->isRegexpLiteral()) { // RegExp literal + $this->output .= $this->a . $this->b; + $pattern = '/'; // in case needed for exception + while (true) { + $this->a = $this->get(); + $pattern .= $this->a; + if ($this->a === '/') { // end pattern + break; // while (true) + } elseif ($this->a === '\\') { + $this->output .= $this->a; + $this->a = $this->get(); + $pattern .= $this->a; + } elseif (ord($this->a) <= self::ORD_LF) { + throw new JSMin_UnterminatedRegExpException( + 'Unterminated RegExp: '. var_export($pattern, true)); + } + $this->output .= $this->a; + } + $this->b = $this->next(); + } + // end case ACTION_DELETE_A_B + } + } + + protected function isRegexpLiteral() + { + if (false !== strpos("\n{;(,=:[!&|?", $this->a)) { // we aren't dividing + return true; + } + if (' ' === $this->a) { + $length = strlen($this->output); + if ($length < 2) { // weird edge case + return true; + } + // you can't divide a keyword + if (preg_match('/(?:case|else|in|return|typeof)$/', $this->output, $m)) { + if ($this->output === $m[0]) { // odd but could happen + return true; + } + // make sure it's a keyword, not end of an identifier + $charBeforeKeyword = substr($this->output, $length - strlen($m[0]) - 1, 1); + if (! $this->isAlphaNum($charBeforeKeyword)) { + return true; + } + } + } + return false; + } + + /** + * Get next char. Convert ctrl char to space. + */ + protected function get() + { + $c = $this->lookAhead; + $this->lookAhead = null; + if ($c === null) { + if ($this->inputIndex < $this->inputLength) { + $c = $this->input[$this->inputIndex]; + $this->inputIndex += 1; + } else { + return null; + } + } + if ($c === "\r" || $c === "\n") { + return "\n"; + } + if (ord($c) < self::ORD_SPACE) { // control char + return ' '; + } + return $c; + } + + /** + * Get next char. If is ctrl character, translate to a space or newline. + */ + protected function peek() + { + $this->lookAhead = $this->get(); + return $this->lookAhead; + } + + /** + * Is $c a letter, digit, underscore, dollar sign, escape, or non-ASCII? + */ + protected function isAlphaNum($c) + { + return (preg_match('/^[0-9a-zA-Z_\\$\\\\]$/', $c) || ord($c) > 126); + } + + protected function singleLineComment() + { + $comment = ''; + while (true) { + $get = $this->get(); + $comment .= $get; + if (ord($get) <= self::ORD_LF) { // EOL reached + // if IE conditional comment + if (preg_match('/^\\/@(?:cc_on|if|elif|else|end)\\b/', $comment)) { + return "/{$comment}"; + } + return $get; + } + } + } + + protected function multipleLineComment() + { + $this->get(); + $comment = ''; + while (true) { + $get = $this->get(); + if ($get === '*') { + if ($this->peek() === '/') { // end of comment reached + $this->get(); + // if comment preserved by YUI Compressor + if (0 === strpos($comment, '!')) { + return "\n/*" . substr($comment, 1) . "*/\n"; + } + // if IE conditional comment + if (preg_match('/^@(?:cc_on|if|elif|else|end)\\b/', $comment)) { + return "/*{$comment}*/"; + } + return ' '; + } + } elseif ($get === null) { + throw new JSMin_UnterminatedCommentException('Unterminated Comment: ' . var_export('/*' . $comment, true)); + } + $comment .= $get; + } + } + + /** + * Get the next character, skipping over comments. + * Some comments may be preserved. + */ + protected function next() + { + $get = $this->get(); + if ($get !== '/') { + return $get; + } + switch ($this->peek()) { + case '/': return $this->singleLineComment(); + case '*': return $this->multipleLineComment(); + default: return $get; + } + } +} + +class JSMin_UnterminatedStringException extends Exception {} +class JSMin_UnterminatedCommentException extends Exception {} +class JSMin_UnterminatedRegExpException extends Exception {} diff --git a/plugins/Minify/extlib/minify/min/lib/JSMinPlus.php b/plugins/Minify/extlib/minify/min/lib/JSMinPlus.php new file mode 100644 index 0000000000..31a1a5cb48 --- /dev/null +++ b/plugins/Minify/extlib/minify/min/lib/JSMinPlus.php @@ -0,0 +1,1872 @@ + + * + * Usage: $minified = JSMinPlus::minify($script [, $filename]) + * + * Versionlog (see also changelog.txt): + * 12-04-2009 - some small bugfixes and performance improvements + * 09-04-2009 - initial open sourced version 1.0 + * + * Latest version of this script: http://files.tweakers.net/jsminplus/jsminplus.zip + * + */ + +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Narcissus JavaScript engine. + * + * The Initial Developer of the Original Code is + * Brendan Eich . + * Portions created by the Initial Developer are Copyright (C) 2004 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): Tino Zijdel + * PHP port, modifications and minifier routine are (C) 2009 + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +define('TOKEN_END', 1); +define('TOKEN_NUMBER', 2); +define('TOKEN_IDENTIFIER', 3); +define('TOKEN_STRING', 4); +define('TOKEN_REGEXP', 5); +define('TOKEN_NEWLINE', 6); +define('TOKEN_CONDCOMMENT_MULTILINE', 7); + +define('JS_SCRIPT', 100); +define('JS_BLOCK', 101); +define('JS_LABEL', 102); +define('JS_FOR_IN', 103); +define('JS_CALL', 104); +define('JS_NEW_WITH_ARGS', 105); +define('JS_INDEX', 106); +define('JS_ARRAY_INIT', 107); +define('JS_OBJECT_INIT', 108); +define('JS_PROPERTY_INIT', 109); +define('JS_GETTER', 110); +define('JS_SETTER', 111); +define('JS_GROUP', 112); +define('JS_LIST', 113); + +define('DECLARED_FORM', 0); +define('EXPRESSED_FORM', 1); +define('STATEMENT_FORM', 2); + +class JSMinPlus +{ + private $parser; + private $reserved = array( + 'break', 'case', 'catch', 'continue', 'default', 'delete', 'do', + 'else', 'finally', 'for', 'function', 'if', 'in', 'instanceof', + 'new', 'return', 'switch', 'this', 'throw', 'try', 'typeof', 'var', + 'void', 'while', 'with', + // Words reserved for future use + 'abstract', 'boolean', 'byte', 'char', 'class', 'const', 'debugger', + 'double', 'enum', 'export', 'extends', 'final', 'float', 'goto', + 'implements', 'import', 'int', 'interface', 'long', 'native', + 'package', 'private', 'protected', 'public', 'short', 'static', + 'super', 'synchronized', 'throws', 'transient', 'volatile', + // These are not reserved, but should be taken into account + // in isValidIdentifier (See jslint source code) + 'arguments', 'eval', 'true', 'false', 'Infinity', 'NaN', 'null', 'undefined' + ); + + private function __construct() + { + $this->parser = new JSParser(); + } + + public static function minify($js, $filename='') + { + static $instance; + + // this is a singleton + if(!$instance) + $instance = new JSMinPlus(); + + return $instance->min($js, $filename); + } + + private function min($js, $filename) + { + try + { + $n = $this->parser->parse($js, $filename, 1); + return $this->parseTree($n); + } + catch(Exception $e) + { + echo $e->getMessage() . "\n"; + } + + return false; + } + + private function parseTree($n, $noBlockGrouping = false) + { + $s = ''; + + switch ($n->type) + { + case KEYWORD_FUNCTION: + $s .= 'function' . ($n->name ? ' ' . $n->name : '') . '('; + $params = $n->params; + for ($i = 0, $j = count($params); $i < $j; $i++) + $s .= ($i ? ',' : '') . $params[$i]; + $s .= '){' . $this->parseTree($n->body, true) . '}'; + break; + + case JS_SCRIPT: + // we do nothing with funDecls or varDecls + $noBlockGrouping = true; + // fall through + case JS_BLOCK: + $childs = $n->treeNodes; + for ($c = 0, $i = 0, $j = count($childs); $i < $j; $i++) + { + $t = $this->parseTree($childs[$i]); + if (strlen($t)) + { + if ($c) + { + if ($childs[$i]->type == KEYWORD_FUNCTION && $childs[$i]->functionForm == DECLARED_FORM) + $s .= "\n"; // put declared functions on a new line + else + $s .= ';'; + } + + $s .= $t; + + $c++; + } + } + + if ($c > 1 && !$noBlockGrouping) + { + $s = '{' . $s . '}'; + } + break; + + case KEYWORD_IF: + $s = 'if(' . $this->parseTree($n->condition) . ')'; + $thenPart = $this->parseTree($n->thenPart); + $elsePart = $n->elsePart ? $this->parseTree($n->elsePart) : null; + + // quite a rancid hack to see if we should enclose the thenpart in brackets + if ($thenPart[0] != '{') + { + if (strpos($thenPart, 'if(') !== false) + $thenPart = '{' . $thenPart . '}'; + elseif ($elsePart) + $thenPart .= ';'; + } + + $s .= $thenPart; + + if ($elsePart) + { + $s .= 'else'; + + if ($elsePart[0] != '{') + $s .= ' '; + + $s .= $elsePart; + } + break; + + case KEYWORD_SWITCH: + $s = 'switch(' . $this->parseTree($n->discriminant) . '){'; + $cases = $n->cases; + for ($i = 0, $j = count($cases); $i < $j; $i++) + { + $case = $cases[$i]; + if ($case->type == KEYWORD_CASE) + $s .= 'case' . ($case->caseLabel->type != TOKEN_STRING ? ' ' : '') . $this->parseTree($case->caseLabel) . ':'; + else + $s .= 'default:'; + + $statement = $this->parseTree($case->statements); + if ($statement) + $s .= $statement . ';'; + } + $s = rtrim($s, ';') . '}'; + break; + + case KEYWORD_FOR: + $s = 'for(' . ($n->setup ? $this->parseTree($n->setup) : '') + . ';' . ($n->condition ? $this->parseTree($n->condition) : '') + . ';' . ($n->update ? $this->parseTree($n->update) : '') . ')' + . $this->parseTree($n->body); + break; + + case KEYWORD_WHILE: + $s = 'while(' . $this->parseTree($n->condition) . ')' . $this->parseTree($n->body); + break; + + case JS_FOR_IN: + $s = 'for(' . ($n->varDecl ? $this->parseTree($n->varDecl) : $this->parseTree($n->iterator)) . ' in ' . $this->parseTree($n->object) . ')' . $this->parseTree($n->body); + break; + + case KEYWORD_DO: + $s = 'do{' . $this->parseTree($n->body, true) . '}while(' . $this->parseTree($n->condition) . ')'; + break; + + case KEYWORD_BREAK: + case KEYWORD_CONTINUE: + $s = $n->value . ($n->label ? ' ' . $n->label : ''); + break; + + case KEYWORD_TRY: + $s = 'try{' . $this->parseTree($n->tryBlock, true) . '}'; + $catchClauses = $n->catchClauses; + for ($i = 0, $j = count($catchClauses); $i < $j; $i++) + { + $t = $catchClauses[$i]; + $s .= 'catch(' . $t->varName . ($t->guard ? ' if ' . $this->parseTree($t->guard) : '') . '){' . $this->parseTree($t->block, true) . '}'; + } + if ($n->finallyBlock) + $s .= 'finally{' . $this->parseTree($n->finallyBlock, true) . '}'; + break; + + case KEYWORD_THROW: + $s = 'throw ' . $this->parseTree($n->exception); + break; + + case KEYWORD_RETURN: + $s = 'return' . ($n->value ? ' ' . $this->parseTree($n->value) : ''); + break; + + case KEYWORD_WITH: + $s = 'with(' . $this->parseTree($n->object) . ')' . $this->parseTree($n->body); + break; + + case KEYWORD_VAR: + case KEYWORD_CONST: + $s = $n->value . ' '; + $childs = $n->treeNodes; + for ($i = 0, $j = count($childs); $i < $j; $i++) + { + $t = $childs[$i]; + $s .= ($i ? ',' : '') . $t->name; + $u = $t->initializer; + if ($u) + $s .= '=' . $this->parseTree($u); + } + break; + + case KEYWORD_DEBUGGER: + throw new Exception('NOT IMPLEMENTED: DEBUGGER'); + break; + + case TOKEN_CONDCOMMENT_MULTILINE: + $s = $n->value . ' '; + $childs = $n->treeNodes; + for ($i = 0, $j = count($childs); $i < $j; $i++) + $s .= $this->parseTree($childs[$i]); + break; + + case OP_SEMICOLON: + if ($expression = $n->expression) + $s = $this->parseTree($expression); + break; + + case JS_LABEL: + $s = $n->label . ':' . $this->parseTree($n->statement); + break; + + case OP_COMMA: + $childs = $n->treeNodes; + for ($i = 0, $j = count($childs); $i < $j; $i++) + $s .= ($i ? ',' : '') . $this->parseTree($childs[$i]); + break; + + case OP_ASSIGN: + $s = $this->parseTree($n->treeNodes[0]) . $n->value . $this->parseTree($n->treeNodes[1]); + break; + + case OP_HOOK: + $s = $this->parseTree($n->treeNodes[0]) . '?' . $this->parseTree($n->treeNodes[1]) . ':' . $this->parseTree($n->treeNodes[2]); + break; + + case OP_OR: case OP_AND: + case OP_BITWISE_OR: case OP_BITWISE_XOR: case OP_BITWISE_AND: + case OP_EQ: case OP_NE: case OP_STRICT_EQ: case OP_STRICT_NE: + case OP_LT: case OP_LE: case OP_GE: case OP_GT: + case OP_LSH: case OP_RSH: case OP_URSH: + case OP_MUL: case OP_DIV: case OP_MOD: + $s = $this->parseTree($n->treeNodes[0]) . $n->type . $this->parseTree($n->treeNodes[1]); + break; + + case OP_PLUS: + case OP_MINUS: + $s = $this->parseTree($n->treeNodes[0]) . $n->type; + $nextTokenType = $n->treeNodes[1]->type; + if ( $nextTokenType == OP_PLUS || $nextTokenType == OP_MINUS || + $nextTokenType == OP_INCREMENT || $nextTokenType == OP_DECREMENT || + $nextTokenType == OP_UNARY_PLUS || $nextTokenType == OP_UNARY_MINUS + ) + $s .= ' '; + $s .= $this->parseTree($n->treeNodes[1]); + break; + + case KEYWORD_IN: + $s = $this->parseTree($n->treeNodes[0]) . ' in ' . $this->parseTree($n->treeNodes[1]); + break; + + case KEYWORD_INSTANCEOF: + $s = $this->parseTree($n->treeNodes[0]) . ' instanceof ' . $this->parseTree($n->treeNodes[1]); + break; + + case KEYWORD_DELETE: + $s = 'delete ' . $this->parseTree($n->treeNodes[0]); + break; + + case KEYWORD_VOID: + $s = 'void(' . $this->parseTree($n->treeNodes[0]) . ')'; + break; + + case KEYWORD_TYPEOF: + $s = 'typeof ' . $this->parseTree($n->treeNodes[0]); + break; + + case OP_NOT: + case OP_BITWISE_NOT: + case OP_UNARY_PLUS: + case OP_UNARY_MINUS: + $s = $n->value . $this->parseTree($n->treeNodes[0]); + break; + + case OP_INCREMENT: + case OP_DECREMENT: + if ($n->postfix) + $s = $this->parseTree($n->treeNodes[0]) . $n->value; + else + $s = $n->value . $this->parseTree($n->treeNodes[0]); + break; + + case OP_DOT: + $s = $this->parseTree($n->treeNodes[0]) . '.' . $this->parseTree($n->treeNodes[1]); + break; + + case JS_INDEX: + $s = $this->parseTree($n->treeNodes[0]); + // See if we can replace named index with a dot saving 3 bytes + if ( $n->treeNodes[0]->type == TOKEN_IDENTIFIER && + $n->treeNodes[1]->type == TOKEN_STRING && + $this->isValidIdentifier(substr($n->treeNodes[1]->value, 1, -1)) + ) + $s .= '.' . substr($n->treeNodes[1]->value, 1, -1); + else + $s .= '[' . $this->parseTree($n->treeNodes[1]) . ']'; + break; + + case JS_LIST: + $childs = $n->treeNodes; + for ($i = 0, $j = count($childs); $i < $j; $i++) + $s .= ($i ? ',' : '') . $this->parseTree($childs[$i]); + break; + + case JS_CALL: + $s = $this->parseTree($n->treeNodes[0]) . '(' . $this->parseTree($n->treeNodes[1]) . ')'; + break; + + case KEYWORD_NEW: + case JS_NEW_WITH_ARGS: + $s = 'new ' . $this->parseTree($n->treeNodes[0]) . '(' . ($n->type == JS_NEW_WITH_ARGS ? $this->parseTree($n->treeNodes[1]) : '') . ')'; + break; + + case JS_ARRAY_INIT: + $s = '['; + $childs = $n->treeNodes; + for ($i = 0, $j = count($childs); $i < $j; $i++) + { + $s .= ($i ? ',' : '') . $this->parseTree($childs[$i]); + } + $s .= ']'; + break; + + case JS_OBJECT_INIT: + $s = '{'; + $childs = $n->treeNodes; + for ($i = 0, $j = count($childs); $i < $j; $i++) + { + $t = $childs[$i]; + if ($i) + $s .= ','; + if ($t->type == JS_PROPERTY_INIT) + { + // Ditch the quotes when the index is a valid identifier + if ( $t->treeNodes[0]->type == TOKEN_STRING && + $this->isValidIdentifier(substr($t->treeNodes[0]->value, 1, -1)) + ) + $s .= substr($t->treeNodes[0]->value, 1, -1); + else + $s .= $t->treeNodes[0]->value; + + $s .= ':' . $this->parseTree($t->treeNodes[1]); + } + else + { + $s .= $t->type == JS_GETTER ? 'get' : 'set'; + $s .= ' ' . $t->name . '('; + $params = $t->params; + for ($i = 0, $j = count($params); $i < $j; $i++) + $s .= ($i ? ',' : '') . $params[$i]; + $s .= '){' . $this->parseTree($t->body, true) . '}'; + } + } + $s .= '}'; + break; + + case KEYWORD_NULL: case KEYWORD_THIS: case KEYWORD_TRUE: case KEYWORD_FALSE: + case TOKEN_IDENTIFIER: case TOKEN_NUMBER: case TOKEN_STRING: case TOKEN_REGEXP: + $s = $n->value; + break; + + case JS_GROUP: + $s = '(' . $this->parseTree($n->treeNodes[0]) . ')'; + break; + + default: + throw new Exception('UNKNOWN TOKEN TYPE: ' . $n->type); + } + + return $s; + } + + private function isValidIdentifier($string) + { + return preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/', $string) && !in_array($string, $this->reserved); + } +} + +class JSParser +{ + private $t; + + private $opPrecedence = array( + ';' => 0, + ',' => 1, + '=' => 2, '?' => 2, ':' => 2, + // The above all have to have the same precedence, see bug 330975. + '||' => 4, + '&&' => 5, + '|' => 6, + '^' => 7, + '&' => 8, + '==' => 9, '!=' => 9, '===' => 9, '!==' => 9, + '<' => 10, '<=' => 10, '>=' => 10, '>' => 10, 'in' => 10, 'instanceof' => 10, + '<<' => 11, '>>' => 11, '>>>' => 11, + '+' => 12, '-' => 12, + '*' => 13, '/' => 13, '%' => 13, + 'delete' => 14, 'void' => 14, 'typeof' => 14, + '!' => 14, '~' => 14, 'U+' => 14, 'U-' => 14, + '++' => 15, '--' => 15, + 'new' => 16, + '.' => 17, + JS_NEW_WITH_ARGS => 0, JS_INDEX => 0, JS_CALL => 0, + JS_ARRAY_INIT => 0, JS_OBJECT_INIT => 0, JS_GROUP => 0 + ); + + private $opArity = array( + ',' => -2, + '=' => 2, + '?' => 3, + '||' => 2, + '&&' => 2, + '|' => 2, + '^' => 2, + '&' => 2, + '==' => 2, '!=' => 2, '===' => 2, '!==' => 2, + '<' => 2, '<=' => 2, '>=' => 2, '>' => 2, 'in' => 2, 'instanceof' => 2, + '<<' => 2, '>>' => 2, '>>>' => 2, + '+' => 2, '-' => 2, + '*' => 2, '/' => 2, '%' => 2, + 'delete' => 1, 'void' => 1, 'typeof' => 1, + '!' => 1, '~' => 1, 'U+' => 1, 'U-' => 1, + '++' => 1, '--' => 1, + 'new' => 1, + '.' => 2, + JS_NEW_WITH_ARGS => 2, JS_INDEX => 2, JS_CALL => 2, + JS_ARRAY_INIT => 1, JS_OBJECT_INIT => 1, JS_GROUP => 1, + TOKEN_CONDCOMMENT_MULTILINE => 1 + ); + + public function __construct() + { + $this->t = new JSTokenizer(); + } + + public function parse($s, $f, $l) + { + // initialize tokenizer + $this->t->init($s, $f, $l); + + $x = new JSCompilerContext(false); + $n = $this->Script($x); + if (!$this->t->isDone()) + throw $this->t->newSyntaxError('Syntax error'); + + return $n; + } + + private function Script($x) + { + $n = $this->Statements($x); + $n->type = JS_SCRIPT; + $n->funDecls = $x->funDecls; + $n->varDecls = $x->varDecls; + + return $n; + } + + private function Statements($x) + { + $n = new JSNode($this->t, JS_BLOCK); + array_push($x->stmtStack, $n); + + while (!$this->t->isDone() && $this->t->peek() != OP_RIGHT_CURLY) + $n->addNode($this->Statement($x)); + + array_pop($x->stmtStack); + + return $n; + } + + private function Block($x) + { + $this->t->mustMatch(OP_LEFT_CURLY); + $n = $this->Statements($x); + $this->t->mustMatch(OP_RIGHT_CURLY); + + return $n; + } + + private function Statement($x) + { + $tt = $this->t->get(); + $n2 = null; + + // Cases for statements ending in a right curly return early, avoiding the + // common semicolon insertion magic after this switch. + switch ($tt) + { + case KEYWORD_FUNCTION: + return $this->FunctionDefinition( + $x, + true, + count($x->stmtStack) > 1 ? STATEMENT_FORM : DECLARED_FORM + ); + break; + + case OP_LEFT_CURLY: + $n = $this->Statements($x); + $this->t->mustMatch(OP_RIGHT_CURLY); + return $n; + + case KEYWORD_IF: + $n = new JSNode($this->t); + $n->condition = $this->ParenExpression($x); + array_push($x->stmtStack, $n); + $n->thenPart = $this->Statement($x); + $n->elsePart = $this->t->match(KEYWORD_ELSE) ? $this->Statement($x) : null; + array_pop($x->stmtStack); + return $n; + + case KEYWORD_SWITCH: + $n = new JSNode($this->t); + $this->t->mustMatch(OP_LEFT_PAREN); + $n->discriminant = $this->Expression($x); + $this->t->mustMatch(OP_RIGHT_PAREN); + $n->cases = array(); + $n->defaultIndex = -1; + + array_push($x->stmtStack, $n); + + $this->t->mustMatch(OP_LEFT_CURLY); + + while (($tt = $this->t->get()) != OP_RIGHT_CURLY) + { + switch ($tt) + { + case KEYWORD_DEFAULT: + if ($n->defaultIndex >= 0) + throw $this->t->newSyntaxError('More than one switch default'); + // FALL THROUGH + case KEYWORD_CASE: + $n2 = new JSNode($this->t); + if ($tt == KEYWORD_DEFAULT) + $n->defaultIndex = count($n->cases); + else + $n2->caseLabel = $this->Expression($x, OP_COLON); + break; + default: + throw $this->t->newSyntaxError('Invalid switch case'); + } + + $this->t->mustMatch(OP_COLON); + $n2->statements = new JSNode($this->t, JS_BLOCK); + while (($tt = $this->t->peek()) != KEYWORD_CASE && $tt != KEYWORD_DEFAULT && $tt != OP_RIGHT_CURLY) + $n2->statements->addNode($this->Statement($x)); + + array_push($n->cases, $n2); + } + + array_pop($x->stmtStack); + return $n; + + case KEYWORD_FOR: + $n = new JSNode($this->t); + $n->isLoop = true; + $this->t->mustMatch(OP_LEFT_PAREN); + + if (($tt = $this->t->peek()) != OP_SEMICOLON) + { + $x->inForLoopInit = true; + if ($tt == KEYWORD_VAR || $tt == KEYWORD_CONST) + { + $this->t->get(); + $n2 = $this->Variables($x); + } + else + { + $n2 = $this->Expression($x); + } + $x->inForLoopInit = false; + } + + if ($n2 && $this->t->match(KEYWORD_IN)) + { + $n->type = JS_FOR_IN; + if ($n2->type == KEYWORD_VAR) + { + if (count($n2->treeNodes) != 1) + { + throw $this->t->SyntaxError( + 'Invalid for..in left-hand side', + $this->t->filename, + $n2->lineno + ); + } + + // NB: n2[0].type == IDENTIFIER and n2[0].value == n2[0].name. + $n->iterator = $n2->treeNodes[0]; + $n->varDecl = $n2; + } + else + { + $n->iterator = $n2; + $n->varDecl = null; + } + + $n->object = $this->Expression($x); + } + else + { + $n->setup = $n2 ? $n2 : null; + $this->t->mustMatch(OP_SEMICOLON); + $n->condition = $this->t->peek() == OP_SEMICOLON ? null : $this->Expression($x); + $this->t->mustMatch(OP_SEMICOLON); + $n->update = $this->t->peek() == OP_RIGHT_PAREN ? null : $this->Expression($x); + } + + $this->t->mustMatch(OP_RIGHT_PAREN); + $n->body = $this->nest($x, $n); + return $n; + + case KEYWORD_WHILE: + $n = new JSNode($this->t); + $n->isLoop = true; + $n->condition = $this->ParenExpression($x); + $n->body = $this->nest($x, $n); + return $n; + + case KEYWORD_DO: + $n = new JSNode($this->t); + $n->isLoop = true; + $n->body = $this->nest($x, $n, KEYWORD_WHILE); + $n->condition = $this->ParenExpression($x); + if (!$x->ecmaStrictMode) + { + // "; + * $link = ""; + * + * // in min.php + * Minify::serve('Groups', array( + * 'groups' => $groupSources + * ,'setExpires' => (time() + 86400 * 365) + * )); + * + * + * @package Minify + * @author Stephen Clay + */ +class Minify_Build { + + /** + * Last modification time of all files in the build + * + * @var int + */ + public $lastModified = 0; + + /** + * String to use as ampersand in uri(). Set this to '&' if + * you are not HTML-escaping URIs. + * + * @var string + */ + public static $ampersand = '&'; + + /** + * Get a time-stamped URI + * + * + * echo $b->uri('/site.js'); + * // outputs "/site.js?1678242" + * + * echo $b->uri('/scriptaculous.js?load=effects'); + * // outputs "/scriptaculous.js?load=effects&1678242" + * + * + * @param string $uri + * @param boolean $forceAmpersand (default = false) Force the use of ampersand to + * append the timestamp to the URI. + * @return string + */ + public function uri($uri, $forceAmpersand = false) { + $sep = ($forceAmpersand || strpos($uri, '?') !== false) + ? self::$ampersand + : '?'; + return "{$uri}{$sep}{$this->lastModified}"; + } + + /** + * Create a build object + * + * @param array $sources array of Minify_Source objects and/or file paths + * + * @return null + */ + public function __construct($sources) + { + $max = 0; + foreach ((array)$sources as $source) { + if ($source instanceof Minify_Source) { + $max = max($max, $source->lastModified); + } elseif (is_string($source)) { + if (0 === strpos($source, '//')) { + $source = $_SERVER['DOCUMENT_ROOT'] . substr($source, 1); + } + if (is_file($source)) { + $max = max($max, filemtime($source)); + } + } + } + $this->lastModified = $max; + } +} diff --git a/plugins/Minify/extlib/minify/min/lib/Minify/CSS.php b/plugins/Minify/extlib/minify/min/lib/Minify/CSS.php new file mode 100644 index 0000000000..2220cf2211 --- /dev/null +++ b/plugins/Minify/extlib/minify/min/lib/Minify/CSS.php @@ -0,0 +1,83 @@ + + * @author http://code.google.com/u/1stvamp/ (Issue 64 patch) + */ +class Minify_CSS { + + /** + * Minify a CSS string + * + * @param string $css + * + * @param array $options available options: + * + * 'preserveComments': (default true) multi-line comments that begin + * with "/*!" will be preserved with newlines before and after to + * enhance readability. + * + * 'prependRelativePath': (default null) if given, this string will be + * prepended to all relative URIs in import/url declarations + * + * 'currentDir': (default null) if given, this is assumed to be the + * directory of the current CSS file. Using this, minify will rewrite + * all relative URIs in import/url declarations to correctly point to + * the desired files. For this to work, the files *must* exist and be + * visible by the PHP process. + * + * 'symlinks': (default = array()) If the CSS file is stored in + * a symlink-ed directory, provide an array of link paths to + * target paths, where the link paths are within the document root. Because + * paths need to be normalized for this to work, use "//" to substitute + * the doc root in the link paths (the array keys). E.g.: + * + * array('//symlink' => '/real/target/path') // unix + * array('//static' => 'D:\\staticStorage') // Windows + * + * + * @return string + */ + public static function minify($css, $options = array()) + { + require_once 'Minify/CSS/Compressor.php'; + if (isset($options['preserveComments']) + && !$options['preserveComments']) { + $css = Minify_CSS_Compressor::process($css, $options); + } else { + require_once 'Minify/CommentPreserver.php'; + $css = Minify_CommentPreserver::process( + $css + ,array('Minify_CSS_Compressor', 'process') + ,array($options) + ); + } + if (! isset($options['currentDir']) && ! isset($options['prependRelativePath'])) { + return $css; + } + require_once 'Minify/CSS/UriRewriter.php'; + if (isset($options['currentDir'])) { + return Minify_CSS_UriRewriter::rewrite( + $css + ,$options['currentDir'] + ,isset($options['docRoot']) ? $options['docRoot'] : $_SERVER['DOCUMENT_ROOT'] + ,isset($options['symlinks']) ? $options['symlinks'] : array() + ); + } else { + return Minify_CSS_UriRewriter::prepend( + $css + ,$options['prependRelativePath'] + ); + } + } +} diff --git a/plugins/Minify/extlib/minify/min/lib/Minify/CSS/Compressor.php b/plugins/Minify/extlib/minify/min/lib/Minify/CSS/Compressor.php new file mode 100644 index 0000000000..a34828681d --- /dev/null +++ b/plugins/Minify/extlib/minify/min/lib/Minify/CSS/Compressor.php @@ -0,0 +1,250 @@ + + * @author http://code.google.com/u/1stvamp/ (Issue 64 patch) + */ +class Minify_CSS_Compressor { + + /** + * Minify a CSS string + * + * @param string $css + * + * @param array $options (currently ignored) + * + * @return string + */ + public static function process($css, $options = array()) + { + $obj = new Minify_CSS_Compressor($options); + return $obj->_process($css); + } + + /** + * @var array options + */ + protected $_options = null; + + /** + * @var bool Are we "in" a hack? + * + * I.e. are some browsers targetted until the next comment? + */ + protected $_inHack = false; + + + /** + * Constructor + * + * @param array $options (currently ignored) + * + * @return null + */ + private function __construct($options) { + $this->_options = $options; + } + + /** + * Minify a CSS string + * + * @param string $css + * + * @return string + */ + protected function _process($css) + { + $css = str_replace("\r\n", "\n", $css); + + // preserve empty comment after '>' + // http://www.webdevout.net/css-hacks#in_css-selectors + $css = preg_replace('@>/\\*\\s*\\*/@', '>/*keep*/', $css); + + // preserve empty comment between property and value + // http://css-discuss.incutio.com/?page=BoxModelHack + $css = preg_replace('@/\\*\\s*\\*/\\s*:@', '/*keep*/:', $css); + $css = preg_replace('@:\\s*/\\*\\s*\\*/@', ':/*keep*/', $css); + + // apply callback to all valid comments (and strip out surrounding ws + $css = preg_replace_callback('@\\s*/\\*([\\s\\S]*?)\\*/\\s*@' + ,array($this, '_commentCB'), $css); + + // remove ws around { } and last semicolon in declaration block + $css = preg_replace('/\\s*{\\s*/', '{', $css); + $css = preg_replace('/;?\\s*}\\s*/', '}', $css); + + // remove ws surrounding semicolons + $css = preg_replace('/\\s*;\\s*/', ';', $css); + + // remove ws around urls + $css = preg_replace('/ + url\\( # url( + \\s* + ([^\\)]+?) # 1 = the URL (really just a bunch of non right parenthesis) + \\s* + \\) # ) + /x', 'url($1)', $css); + + // remove ws between rules and colons + $css = preg_replace('/ + \\s* + ([{;]) # 1 = beginning of block or rule separator + \\s* + ([\\*_]?[\\w\\-]+) # 2 = property (and maybe IE filter) + \\s* + : + \\s* + (\\b|[#\'"]) # 3 = first character of a value + /x', '$1$2:$3', $css); + + // remove ws in selectors + $css = preg_replace_callback('/ + (?: # non-capture + \\s* + [^~>+,\\s]+ # selector part + \\s* + [,>+~] # combinators + )+ + \\s* + [^~>+,\\s]+ # selector part + { # open declaration block + /x' + ,array($this, '_selectorsCB'), $css); + + // minimize hex colors + $css = preg_replace('/([^=])#([a-f\\d])\\2([a-f\\d])\\3([a-f\\d])\\4([\\s;\\}])/i' + , '$1#$2$3$4$5', $css); + + // remove spaces between font families + $css = preg_replace_callback('/font-family:([^;}]+)([;}])/' + ,array($this, '_fontFamilyCB'), $css); + + $css = preg_replace('/@import\\s+url/', '@import url', $css); + + // replace any ws involving newlines with a single newline + $css = preg_replace('/[ \\t]*\\n+\\s*/', "\n", $css); + + // separate common descendent selectors w/ newlines (to limit line lengths) + $css = preg_replace('/([\\w#\\.\\*]+)\\s+([\\w#\\.\\*]+){/', "$1\n$2{", $css); + + // Use newline after 1st numeric value (to limit line lengths). + $css = preg_replace('/ + ((?:padding|margin|border|outline):\\d+(?:px|em)?) # 1 = prop : 1st numeric value + \\s+ + /x' + ,"$1\n", $css); + + // prevent triggering IE6 bug: http://www.crankygeek.com/ie6pebug/ + $css = preg_replace('/:first-l(etter|ine)\\{/', ':first-l$1 {', $css); + + return trim($css); + } + + /** + * Replace what looks like a set of selectors + * + * @param array $m regex matches + * + * @return string + */ + protected function _selectorsCB($m) + { + // remove ws around the combinators + return preg_replace('/\\s*([,>+~])\\s*/', '$1', $m[0]); + } + + /** + * Process a comment and return a replacement + * + * @param array $m regex matches + * + * @return string + */ + protected function _commentCB($m) + { + $hasSurroundingWs = (trim($m[0]) !== $m[1]); + $m = $m[1]; + // $m is the comment content w/o the surrounding tokens, + // but the return value will replace the entire comment. + if ($m === 'keep') { + return '/**/'; + } + if ($m === '" "') { + // component of http://tantek.com/CSS/Examples/midpass.html + return '/*" "*/'; + } + if (preg_match('@";\\}\\s*\\}/\\*\\s+@', $m)) { + // component of http://tantek.com/CSS/Examples/midpass.html + return '/*";}}/* */'; + } + if ($this->_inHack) { + // inversion: feeding only to one browser + if (preg_match('@ + ^/ # comment started like /*/ + \\s* + (\\S[\\s\\S]+?) # has at least some non-ws content + \\s* + /\\* # ends like /*/ or /**/ + @x', $m, $n)) { + // end hack mode after this comment, but preserve the hack and comment content + $this->_inHack = false; + return "/*/{$n[1]}/**/"; + } + } + if (substr($m, -1) === '\\') { // comment ends like \*/ + // begin hack mode and preserve hack + $this->_inHack = true; + return '/*\\*/'; + } + if ($m !== '' && $m[0] === '/') { // comment looks like /*/ foo */ + // begin hack mode and preserve hack + $this->_inHack = true; + return '/*/*/'; + } + if ($this->_inHack) { + // a regular comment ends hack mode but should be preserved + $this->_inHack = false; + return '/**/'; + } + // Issue 107: if there's any surrounding whitespace, it may be important, so + // replace the comment with a single space + return $hasSurroundingWs // remove all other comments + ? ' ' + : ''; + } + + /** + * Process a font-family listing and return a replacement + * + * @param array $m regex matches + * + * @return string + */ + protected function _fontFamilyCB($m) + { + $m[1] = preg_replace('/ + \\s* + ( + "[^"]+" # 1 = family in double qutoes + |\'[^\']+\' # or 1 = family in single quotes + |[\\w\\-]+ # or 1 = unquoted family + ) + \\s* + /x', '$1', $m[1]); + return 'font-family:' . $m[1] . $m[2]; + } +} diff --git a/plugins/Minify/extlib/minify/min/lib/Minify/CSS/UriRewriter.php b/plugins/Minify/extlib/minify/min/lib/Minify/CSS/UriRewriter.php new file mode 100644 index 0000000000..824c6bb2a1 --- /dev/null +++ b/plugins/Minify/extlib/minify/min/lib/Minify/CSS/UriRewriter.php @@ -0,0 +1,270 @@ + + */ +class Minify_CSS_UriRewriter { + + /** + * Defines which class to call as part of callbacks, change this + * if you extend Minify_CSS_UriRewriter + * @var string + */ + protected static $className = 'Minify_CSS_UriRewriter'; + + /** + * rewrite() and rewriteRelative() append debugging information here + * @var string + */ + public static $debugText = ''; + + /** + * Rewrite file relative URIs as root relative in CSS files + * + * @param string $css + * + * @param string $currentDir The directory of the current CSS file. + * + * @param string $docRoot The document root of the web site in which + * the CSS file resides (default = $_SERVER['DOCUMENT_ROOT']). + * + * @param array $symlinks (default = array()) If the CSS file is stored in + * a symlink-ed directory, provide an array of link paths to + * target paths, where the link paths are within the document root. Because + * paths need to be normalized for this to work, use "//" to substitute + * the doc root in the link paths (the array keys). E.g.: + * + * array('//symlink' => '/real/target/path') // unix + * array('//static' => 'D:\\staticStorage') // Windows + * + * + * @return string + */ + public static function rewrite($css, $currentDir, $docRoot = null, $symlinks = array()) + { + self::$_docRoot = self::_realpath( + $docRoot ? $docRoot : $_SERVER['DOCUMENT_ROOT'] + ); + self::$_currentDir = self::_realpath($currentDir); + self::$_symlinks = array(); + + // normalize symlinks + foreach ($symlinks as $link => $target) { + $link = ($link === '//') + ? self::$_docRoot + : str_replace('//', self::$_docRoot . '/', $link); + $link = strtr($link, '/', DIRECTORY_SEPARATOR); + self::$_symlinks[$link] = self::_realpath($target); + } + + self::$debugText .= "docRoot : " . self::$_docRoot . "\n" + . "currentDir : " . self::$_currentDir . "\n"; + if (self::$_symlinks) { + self::$debugText .= "symlinks : " . var_export(self::$_symlinks, 1) . "\n"; + } + self::$debugText .= "\n"; + + $css = self::_trimUrls($css); + + // rewrite + $css = preg_replace_callback('/@import\\s+([\'"])(.*?)[\'"]/' + ,array(self::$className, '_processUriCB'), $css); + $css = preg_replace_callback('/url\\(\\s*([^\\)\\s]+)\\s*\\)/' + ,array(self::$className, '_processUriCB'), $css); + + return $css; + } + + /** + * Prepend a path to relative URIs in CSS files + * + * @param string $css + * + * @param string $path The path to prepend. + * + * @return string + */ + public static function prepend($css, $path) + { + self::$_prependPath = $path; + + $css = self::_trimUrls($css); + + // append + $css = preg_replace_callback('/@import\\s+([\'"])(.*?)[\'"]/' + ,array(self::$className, '_processUriCB'), $css); + $css = preg_replace_callback('/url\\(\\s*([^\\)\\s]+)\\s*\\)/' + ,array(self::$className, '_processUriCB'), $css); + + self::$_prependPath = null; + return $css; + } + + + /** + * @var string directory of this stylesheet + */ + private static $_currentDir = ''; + + /** + * @var string DOC_ROOT + */ + private static $_docRoot = ''; + + /** + * @var array directory replacements to map symlink targets back to their + * source (within the document root) E.g. '/var/www/symlink' => '/var/realpath' + */ + private static $_symlinks = array(); + + /** + * @var string path to prepend + */ + private static $_prependPath = null; + + private static function _trimUrls($css) + { + return preg_replace('/ + url\\( # url( + \\s* + ([^\\)]+?) # 1 = URI (assuming does not contain ")") + \\s* + \\) # ) + /x', 'url($1)', $css); + } + + private static function _processUriCB($m) + { + // $m matched either '/@import\\s+([\'"])(.*?)[\'"]/' or '/url\\(\\s*([^\\)\\s]+)\\s*\\)/' + $isImport = ($m[0][0] === '@'); + // determine URI and the quote character (if any) + if ($isImport) { + $quoteChar = $m[1]; + $uri = $m[2]; + } else { + // $m[1] is either quoted or not + $quoteChar = ($m[1][0] === "'" || $m[1][0] === '"') + ? $m[1][0] + : ''; + $uri = ($quoteChar === '') + ? $m[1] + : substr($m[1], 1, strlen($m[1]) - 2); + } + // analyze URI + if ('/' !== $uri[0] // root-relative + && false === strpos($uri, '//') // protocol (non-data) + && 0 !== strpos($uri, 'data:') // data protocol + ) { + // URI is file-relative: rewrite depending on options + $uri = (self::$_prependPath !== null) + ? (self::$_prependPath . $uri) + : self::rewriteRelative($uri, self::$_currentDir, self::$_docRoot, self::$_symlinks); + } + return $isImport + ? "@import {$quoteChar}{$uri}{$quoteChar}" + : "url({$quoteChar}{$uri}{$quoteChar})"; + } + + /** + * Rewrite a file relative URI as root relative + * + * + * Minify_CSS_UriRewriter::rewriteRelative( + * '../img/hello.gif' + * , '/home/user/www/css' // path of CSS file + * , '/home/user/www' // doc root + * ); + * // returns '/img/hello.gif' + * + * // example where static files are stored in a symlinked directory + * Minify_CSS_UriRewriter::rewriteRelative( + * 'hello.gif' + * , '/var/staticFiles/theme' + * , '/home/user/www' + * , array('/home/user/www/static' => '/var/staticFiles') + * ); + * // returns '/static/theme/hello.gif' + * + * + * @param string $uri file relative URI + * + * @param string $realCurrentDir realpath of the current file's directory. + * + * @param string $realDocRoot realpath of the site document root. + * + * @param array $symlinks (default = array()) If the file is stored in + * a symlink-ed directory, provide an array of link paths to + * real target paths, where the link paths "appear" to be within the document + * root. E.g.: + * + * array('/home/foo/www/not/real/path' => '/real/target/path') // unix + * array('C:\\htdocs\\not\\real' => 'D:\\real\\target\\path') // Windows + * + * + * @return string + */ + public static function rewriteRelative($uri, $realCurrentDir, $realDocRoot, $symlinks = array()) + { + // prepend path with current dir separator (OS-independent) + $path = strtr($realCurrentDir, '/', DIRECTORY_SEPARATOR) + . DIRECTORY_SEPARATOR . strtr($uri, '/', DIRECTORY_SEPARATOR); + + self::$debugText .= "file-relative URI : {$uri}\n" + . "path prepended : {$path}\n"; + + // "unresolve" a symlink back to doc root + foreach ($symlinks as $link => $target) { + if (0 === strpos($path, $target)) { + // replace $target with $link + $path = $link . substr($path, strlen($target)); + + self::$debugText .= "symlink unresolved : {$path}\n"; + + break; + } + } + // strip doc root + $path = substr($path, strlen($realDocRoot)); + + self::$debugText .= "docroot stripped : {$path}\n"; + + // fix to root-relative URI + + $uri = strtr($path, '/\\', '//'); + + // remove /./ and /../ where possible + $uri = str_replace('/./', '/', $uri); + // inspired by patch from Oleg Cherniy + do { + $uri = preg_replace('@/[^/]+/\\.\\./@', '/', $uri, 1, $changed); + } while ($changed); + + self::$debugText .= "traversals removed : {$uri}\n\n"; + + return $uri; + } + + /** + * Get realpath with any trailing slash removed. If realpath() fails, + * just remove the trailing slash. + * + * @param string $path + * + * @return mixed path with no trailing slash + */ + protected static function _realpath($path) + { + $realPath = realpath($path); + if ($realPath !== false) { + $path = $realPath; + } + return rtrim($path, '/\\'); + } +} diff --git a/plugins/Minify/extlib/minify/min/lib/Minify/Cache/APC.php b/plugins/Minify/extlib/minify/min/lib/Minify/Cache/APC.php new file mode 100644 index 0000000000..ca84d29987 --- /dev/null +++ b/plugins/Minify/extlib/minify/min/lib/Minify/Cache/APC.php @@ -0,0 +1,130 @@ + + * Minify::setCache(new Minify_Cache_APC()); + * + * + * @package Minify + * @author Chris Edwards + **/ +class Minify_Cache_APC { + + /** + * Create a Minify_Cache_APC object, to be passed to + * Minify::setCache(). + * + * + * @param int $expire seconds until expiration (default = 0 + * meaning the item will not get an expiration date) + * + * @return null + */ + public function __construct($expire = 0) + { + $this->_exp = $expire; + } + + /** + * Write data to cache. + * + * @param string $id cache id + * + * @param string $data + * + * @return bool success + */ + public function store($id, $data) + { + return apc_store($id, "{$_SERVER['REQUEST_TIME']}|{$data}", $this->_exp); + } + + /** + * Get the size of a cache entry + * + * @param string $id cache id + * + * @return int size in bytes + */ + public function getSize($id) + { + return $this->_fetch($id) + ? strlen($this->_data) + : false; + } + + /** + * Does a valid cache entry exist? + * + * @param string $id cache id + * + * @param int $srcMtime mtime of the original source file(s) + * + * @return bool exists + */ + public function isValid($id, $srcMtime) + { + return ($this->_fetch($id) && ($this->_lm >= $srcMtime)); + } + + /** + * Send the cached content to output + * + * @param string $id cache id + */ + public function display($id) + { + echo $this->_fetch($id) + ? $this->_data + : ''; + } + + /** + * Fetch the cached content + * + * @param string $id cache id + * + * @return string + */ + public function fetch($id) + { + return $this->_fetch($id) + ? $this->_data + : ''; + } + + private $_exp = null; + + // cache of most recently fetched id + private $_lm = null; + private $_data = null; + private $_id = null; + + /** + * Fetch data and timestamp from apc, store in instance + * + * @param string $id + * + * @return bool success + */ + private function _fetch($id) + { + if ($this->_id === $id) { + return true; + } + $ret = apc_fetch($id); + if (false === $ret) { + $this->_id = null; + return false; + } + list($this->_lm, $this->_data) = explode('|', $ret, 2); + $this->_id = $id; + return true; + } +} diff --git a/plugins/Minify/extlib/minify/min/lib/Minify/Cache/File.php b/plugins/Minify/extlib/minify/min/lib/Minify/Cache/File.php new file mode 100644 index 0000000000..8744a7e04f --- /dev/null +++ b/plugins/Minify/extlib/minify/min/lib/Minify/Cache/File.php @@ -0,0 +1,125 @@ +_locking = $fileLocking; + $this->_path = $path; + } + + /** + * Write data to cache. + * + * @param string $id cache id (e.g. a filename) + * + * @param string $data + * + * @return bool success + */ + public function store($id, $data) + { + $flag = $this->_locking + ? LOCK_EX + : null; + if (is_file($this->_path . '/' . $id)) { + @unlink($this->_path . '/' . $id); + } + if (! @file_put_contents($this->_path . '/' . $id, $data, $flag)) { + return false; + } + // write control + if ($data !== $this->fetch($id)) { + @unlink($file); + return false; + } + return true; + } + + /** + * Get the size of a cache entry + * + * @param string $id cache id (e.g. a filename) + * + * @return int size in bytes + */ + public function getSize($id) + { + return filesize($this->_path . '/' . $id); + } + + /** + * Does a valid cache entry exist? + * + * @param string $id cache id (e.g. a filename) + * + * @param int $srcMtime mtime of the original source file(s) + * + * @return bool exists + */ + public function isValid($id, $srcMtime) + { + $file = $this->_path . '/' . $id; + return (is_file($file) && (filemtime($file) >= $srcMtime)); + } + + /** + * Send the cached content to output + * + * @param string $id cache id (e.g. a filename) + */ + public function display($id) + { + if ($this->_locking) { + $fp = fopen($this->_path . '/' . $id, 'rb'); + flock($fp, LOCK_SH); + fpassthru($fp); + flock($fp, LOCK_UN); + fclose($fp); + } else { + readfile($this->_path . '/' . $id); + } + } + + /** + * Fetch the cached content + * + * @param string $id cache id (e.g. a filename) + * + * @return string + */ + public function fetch($id) + { + if ($this->_locking) { + $fp = fopen($this->_path . '/' . $id, 'rb'); + flock($fp, LOCK_SH); + $ret = stream_get_contents($fp); + flock($fp, LOCK_UN); + fclose($fp); + return $ret; + } else { + return file_get_contents($this->_path . '/' . $id); + } + } + + /** + * Fetch the cache path used + * + * @return string + */ + public function getPath() + { + return $this->_path; + } + + private $_path = null; + private $_locking = null; +} diff --git a/plugins/Minify/extlib/minify/min/lib/Minify/Cache/Memcache.php b/plugins/Minify/extlib/minify/min/lib/Minify/Cache/Memcache.php new file mode 100644 index 0000000000..2b81e7a329 --- /dev/null +++ b/plugins/Minify/extlib/minify/min/lib/Minify/Cache/Memcache.php @@ -0,0 +1,137 @@ + + * // fall back to disk caching if memcache can't connect + * $memcache = new Memcache; + * if ($memcache->connect('localhost', 11211)) { + * Minify::setCache(new Minify_Cache_Memcache($memcache)); + * } else { + * Minify::setCache(); + * } + * + **/ +class Minify_Cache_Memcache { + + /** + * Create a Minify_Cache_Memcache object, to be passed to + * Minify::setCache(). + * + * @param Memcache $memcache already-connected instance + * + * @param int $expire seconds until expiration (default = 0 + * meaning the item will not get an expiration date) + * + * @return null + */ + public function __construct($memcache, $expire = 0) + { + $this->_mc = $memcache; + $this->_exp = $expire; + } + + /** + * Write data to cache. + * + * @param string $id cache id + * + * @param string $data + * + * @return bool success + */ + public function store($id, $data) + { + return $this->_mc->set($id, "{$_SERVER['REQUEST_TIME']}|{$data}", 0, $this->_exp); + } + + + /** + * Get the size of a cache entry + * + * @param string $id cache id + * + * @return int size in bytes + */ + public function getSize($id) + { + return $this->_fetch($id) + ? strlen($this->_data) + : false; + } + + /** + * Does a valid cache entry exist? + * + * @param string $id cache id + * + * @param int $srcMtime mtime of the original source file(s) + * + * @return bool exists + */ + public function isValid($id, $srcMtime) + { + return ($this->_fetch($id) && ($this->_lm >= $srcMtime)); + } + + /** + * Send the cached content to output + * + * @param string $id cache id + */ + public function display($id) + { + echo $this->_fetch($id) + ? $this->_data + : ''; + } + + /** + * Fetch the cached content + * + * @param string $id cache id + * + * @return string + */ + public function fetch($id) + { + return $this->_fetch($id) + ? $this->_data + : ''; + } + + private $_mc = null; + private $_exp = null; + + // cache of most recently fetched id + private $_lm = null; + private $_data = null; + private $_id = null; + + /** + * Fetch data and timestamp from memcache, store in instance + * + * @param string $id + * + * @return bool success + */ + private function _fetch($id) + { + if ($this->_id === $id) { + return true; + } + $ret = $this->_mc->get($id); + if (false === $ret) { + $this->_id = null; + return false; + } + list($this->_lm, $this->_data) = explode('|', $ret, 2); + $this->_id = $id; + return true; + } +} diff --git a/plugins/Minify/extlib/minify/min/lib/Minify/CommentPreserver.php b/plugins/Minify/extlib/minify/min/lib/Minify/CommentPreserver.php new file mode 100644 index 0000000000..f56eb3461c --- /dev/null +++ b/plugins/Minify/extlib/minify/min/lib/Minify/CommentPreserver.php @@ -0,0 +1,90 @@ + + */ +class Minify_CommentPreserver { + + /** + * String to be prepended to each preserved comment + * + * @var string + */ + public static $prepend = "\n"; + + /** + * String to be appended to each preserved comment + * + * @var string + */ + public static $append = "\n"; + + /** + * Process a string outside of C-style comments that begin with "/*!" + * + * On each non-empty string outside these comments, the given processor + * function will be called. The first "!" will be removed from the + * preserved comments, and the comments will be surrounded by + * Minify_CommentPreserver::$preprend and Minify_CommentPreserver::$append. + * + * @param string $content + * @param callback $processor function + * @param array $args array of extra arguments to pass to the processor + * function (default = array()) + * @return string + */ + public static function process($content, $processor, $args = array()) + { + $ret = ''; + while (true) { + list($beforeComment, $comment, $afterComment) = self::_nextComment($content); + if ('' !== $beforeComment) { + $callArgs = $args; + array_unshift($callArgs, $beforeComment); + $ret .= call_user_func_array($processor, $callArgs); + } + if (false === $comment) { + break; + } + $ret .= $comment; + $content = $afterComment; + } + return $ret; + } + + /** + * Extract comments that YUI Compressor preserves. + * + * @param string $in input + * + * @return array 3 elements are returned. If a YUI comment is found, the + * 2nd element is the comment and the 1st and 2nd are the surrounding + * strings. If no comment is found, the entire string is returned as the + * 1st element and the other two are false. + */ + private static function _nextComment($in) + { + if ( + false === ($start = strpos($in, '/*!')) + || false === ($end = strpos($in, '*/', $start + 3)) + ) { + return array($in, false, false); + } + $ret = array( + substr($in, 0, $start) + ,self::$prepend . '/*' . substr($in, $start + 3, $end - $start - 1) . self::$append + ); + $endChars = (strlen($in) - $end - 2); + $ret[] = (0 === $endChars) + ? '' + : substr($in, -$endChars); + return $ret; + } +} diff --git a/plugins/Minify/extlib/minify/min/lib/Minify/Controller/Base.php b/plugins/Minify/extlib/minify/min/lib/Minify/Controller/Base.php new file mode 100644 index 0000000000..84889b3f0c --- /dev/null +++ b/plugins/Minify/extlib/minify/min/lib/Minify/Controller/Base.php @@ -0,0 +1,202 @@ + + */ +abstract class Minify_Controller_Base { + + /** + * Setup controller sources and set an needed options for Minify::source + * + * You must override this method in your subclass controller to set + * $this->sources. If the request is NOT valid, make sure $this->sources + * is left an empty array. Then strip any controller-specific options from + * $options and return it. To serve files, $this->sources must be an array of + * Minify_Source objects. + * + * @param array $options controller and Minify options + * + * return array $options Minify::serve options + */ + abstract public function setupSources($options); + + /** + * Get default Minify options for this controller. + * + * Override in subclass to change defaults + * + * @return array options for Minify + */ + public function getDefaultMinifyOptions() { + return array( + 'isPublic' => true + ,'encodeOutput' => function_exists('gzdeflate') + ,'encodeMethod' => null // determine later + ,'encodeLevel' => 9 + ,'minifierOptions' => array() // no minifier options + ,'contentTypeCharset' => 'utf-8' + ,'maxAge' => 1800 // 30 minutes + ,'rewriteCssUris' => true + ,'bubbleCssImports' => false + ,'quiet' => false // serve() will send headers and output + ,'debug' => false + + // if you override this, the response code MUST be directly after + // the first space. + ,'badRequestHeader' => 'HTTP/1.0 400 Bad Request' + + // callback function to see/modify content of all sources + ,'postprocessor' => null + // file to require to load preprocessor + ,'postprocessorRequire' => null + ); + } + + /** + * Get default minifiers for this controller. + * + * Override in subclass to change defaults + * + * @return array minifier callbacks for common types + */ + public function getDefaultMinifers() { + $ret[Minify::TYPE_JS] = array('JSMin', 'minify'); + $ret[Minify::TYPE_CSS] = array('Minify_CSS', 'minify'); + $ret[Minify::TYPE_HTML] = array('Minify_HTML', 'minify'); + return $ret; + } + + /** + * Load any code necessary to execute the given minifier callback. + * + * The controller is responsible for loading minification code on demand + * via this method. This built-in function will only load classes for + * static method callbacks where the class isn't already defined. It uses + * the PEAR convention, so, given array('Jimmy_Minifier', 'minCss'), this + * function will include 'Jimmy/Minifier.php'. + * + * If you need code loaded on demand and this doesn't suit you, you'll need + * to override this function in your subclass. + * @see Minify_Controller_Page::loadMinifier() + * + * @param callback $minifierCallback callback of minifier function + * + * @return null + */ + public function loadMinifier($minifierCallback) + { + if (is_array($minifierCallback) + && is_string($minifierCallback[0]) + && !class_exists($minifierCallback[0], false)) { + + require str_replace('_', '/', $minifierCallback[0]) . '.php'; + } + } + + /** + * Is a user-given file within an allowable directory, existing, + * and having an extension js/css/html/txt ? + * + * This is a convenience function for controllers that have to accept + * user-given paths + * + * @param string $file full file path (already processed by realpath()) + * + * @param array $safeDirs directories where files are safe to serve. Files can also + * be in subdirectories of these directories. + * + * @return bool file is safe + */ + public static function _fileIsSafe($file, $safeDirs) + { + $pathOk = false; + foreach ((array)$safeDirs as $safeDir) { + if (strpos($file, $safeDir) === 0) { + $pathOk = true; + break; + } + } + $base = basename($file); + if (! $pathOk || ! is_file($file) || $base[0] === '.') { + return false; + } + list($revExt) = explode('.', strrev($base)); + return in_array(strrev($revExt), array('js', 'css', 'html', 'txt')); + } + + /** + * @var array instances of Minify_Source, which provide content and + * any individual minification needs. + * + * @see Minify_Source + */ + public $sources = array(); + + /** + * Mix in default controller options with user-given options + * + * @param array $options user options + * + * @return array mixed options + */ + public final function mixInDefaultOptions($options) + { + $ret = array_merge( + $this->getDefaultMinifyOptions(), $options + ); + if (! isset($options['minifiers'])) { + $options['minifiers'] = array(); + } + $ret['minifiers'] = array_merge( + $this->getDefaultMinifers(), $options['minifiers'] + ); + return $ret; + } + + /** + * Analyze sources (if there are any) and set $options 'contentType' + * and 'lastModifiedTime' if they already aren't. + * + * @param array $options options for Minify + * + * @return array options for Minify + */ + public final function analyzeSources($options = array()) + { + if ($this->sources) { + if (! isset($options['contentType'])) { + $options['contentType'] = Minify_Source::getContentType($this->sources); + } + // last modified is needed for caching, even if setExpires is set + if (! isset($options['lastModifiedTime'])) { + $max = 0; + foreach ($this->sources as $source) { + $max = max($source->lastModified, $max); + } + $options['lastModifiedTime'] = $max; + } + } + return $options; + } + + /** + * Send message to the Minify logger + * @param string $msg + * @return null + */ + protected function log($msg) { + require_once 'Minify/Logger.php'; + Minify_Logger::log($msg); + } +} diff --git a/plugins/Minify/extlib/minify/min/lib/Minify/Controller/Files.php b/plugins/Minify/extlib/minify/min/lib/Minify/Controller/Files.php new file mode 100644 index 0000000000..83f028adf7 --- /dev/null +++ b/plugins/Minify/extlib/minify/min/lib/Minify/Controller/Files.php @@ -0,0 +1,78 @@ + + * Minify::serve('Files', array( + * 'files' => array( + * '//js/jquery.js' + * ,'//js/plugins.js' + * ,'/home/username/file.js' + * ) + * )); + * + * + * As a shortcut, the controller will replace "//" at the beginning + * of a filename with $_SERVER['DOCUMENT_ROOT'] . '/'. + * + * @package Minify + * @author Stephen Clay + */ +class Minify_Controller_Files extends Minify_Controller_Base { + + /** + * Set up file sources + * + * @param array $options controller and Minify options + * @return array Minify options + * + * Controller options: + * + * 'files': (required) array of complete file paths, or a single path + */ + public function setupSources($options) { + // strip controller options + + $files = $options['files']; + // if $files is a single object, casting will break it + if (is_object($files)) { + $files = array($files); + } elseif (! is_array($files)) { + $files = (array)$files; + } + unset($options['files']); + + $sources = array(); + foreach ($files as $file) { + if ($file instanceof Minify_Source) { + $sources[] = $file; + continue; + } + if (0 === strpos($file, '//')) { + $file = $_SERVER['DOCUMENT_ROOT'] . substr($file, 1); + } + $realPath = realpath($file); + if (is_file($realPath)) { + $sources[] = new Minify_Source(array( + 'filepath' => $realPath + )); + } else { + $this->log("The path \"{$file}\" could not be found (or was not a file)"); + return $options; + } + } + if ($sources) { + $this->sources = $sources; + } + return $options; + } +} + diff --git a/plugins/Minify/extlib/minify/min/lib/Minify/Controller/Groups.php b/plugins/Minify/extlib/minify/min/lib/Minify/Controller/Groups.php new file mode 100644 index 0000000000..1ac57703ad --- /dev/null +++ b/plugins/Minify/extlib/minify/min/lib/Minify/Controller/Groups.php @@ -0,0 +1,94 @@ + + * Minify::serve('Groups', array( + * 'groups' => array( + * 'css' => array('//css/type.css', '//css/layout.css') + * ,'js' => array('//js/jquery.js', '//js/site.js') + * ) + * )); + * + * + * If the above code were placed in /serve.php, it would enable the URLs + * /serve.php/js and /serve.php/css + * + * As a shortcut, the controller will replace "//" at the beginning + * of a filename with $_SERVER['DOCUMENT_ROOT'] . '/'. + * + * @package Minify + * @author Stephen Clay + */ +class Minify_Controller_Groups extends Minify_Controller_Base { + + /** + * Set up groups of files as sources + * + * @param array $options controller and Minify options + * @return array Minify options + * + * Controller options: + * + * 'groups': (required) array mapping PATH_INFO strings to arrays + * of complete file paths. @see Minify_Controller_Groups + */ + public function setupSources($options) { + // strip controller options + $groups = $options['groups']; + unset($options['groups']); + + // mod_fcgid places PATH_INFO in ORIG_PATH_INFO + $pi = isset($_SERVER['ORIG_PATH_INFO']) + ? substr($_SERVER['ORIG_PATH_INFO'], 1) + : (isset($_SERVER['PATH_INFO']) + ? substr($_SERVER['PATH_INFO'], 1) + : false + ); + if (false === $pi || ! isset($groups[$pi])) { + // no PATH_INFO or not a valid group + $this->log("Missing PATH_INFO or no group set for \"$pi\""); + return $options; + } + $sources = array(); + + $files = $groups[$pi]; + // if $files is a single object, casting will break it + if (is_object($files)) { + $files = array($files); + } elseif (! is_array($files)) { + $files = (array)$files; + } + foreach ($files as $file) { + if ($file instanceof Minify_Source) { + $sources[] = $file; + continue; + } + if (0 === strpos($file, '//')) { + $file = $_SERVER['DOCUMENT_ROOT'] . substr($file, 1); + } + $realPath = realpath($file); + if (is_file($realPath)) { + $sources[] = new Minify_Source(array( + 'filepath' => $realPath + )); + } else { + $this->log("The path \"{$file}\" could not be found (or was not a file)"); + return $options; + } + } + if ($sources) { + $this->sources = $sources; + } + return $options; + } +} + diff --git a/plugins/Minify/extlib/minify/min/lib/Minify/Controller/MinApp.php b/plugins/Minify/extlib/minify/min/lib/Minify/Controller/MinApp.php new file mode 100644 index 0000000000..9582d292ca --- /dev/null +++ b/plugins/Minify/extlib/minify/min/lib/Minify/Controller/MinApp.php @@ -0,0 +1,132 @@ + + */ +class Minify_Controller_MinApp extends Minify_Controller_Base { + + /** + * Set up groups of files as sources + * + * @param array $options controller and Minify options + * @return array Minify options + * + */ + public function setupSources($options) { + // filter controller options + $cOptions = array_merge( + array( + 'allowDirs' => '//' + ,'groupsOnly' => false + ,'groups' => array() + ,'maxFiles' => 10 + ) + ,(isset($options['minApp']) ? $options['minApp'] : array()) + ); + unset($options['minApp']); + $sources = array(); + if (isset($_GET['g'])) { + // try groups + if (! isset($cOptions['groups'][$_GET['g']])) { + $this->log("A group configuration for \"{$_GET['g']}\" was not set"); + return $options; + } + + $files = $cOptions['groups'][$_GET['g']]; + // if $files is a single object, casting will break it + if (is_object($files)) { + $files = array($files); + } elseif (! is_array($files)) { + $files = (array)$files; + } + foreach ($files as $file) { + if ($file instanceof Minify_Source) { + $sources[] = $file; + continue; + } + if (0 === strpos($file, '//')) { + $file = $_SERVER['DOCUMENT_ROOT'] . substr($file, 1); + } + $file = realpath($file); + if (is_file($file)) { + $sources[] = new Minify_Source(array( + 'filepath' => $file + )); + } else { + $this->log("The path \"{$file}\" could not be found (or was not a file)"); + return $options; + } + } + } elseif (! $cOptions['groupsOnly'] && isset($_GET['f'])) { + // try user files + // The following restrictions are to limit the URLs that minify will + // respond to. Ideally there should be only one way to reference a file. + if (// verify at least one file, files are single comma separated, + // and are all same extension + ! preg_match('/^[^,]+\\.(css|js)(?:,[^,]+\\.\\1)*$/', $_GET['f']) + // no "//" + || strpos($_GET['f'], '//') !== false + // no "\" + || strpos($_GET['f'], '\\') !== false + // no "./" + || preg_match('/(?:^|[^\\.])\\.\\//', $_GET['f']) + ) { + $this->log("GET param 'f' invalid (see MinApp.php line 63)"); + return $options; + } + $files = explode(',', $_GET['f']); + if (count($files) > $cOptions['maxFiles'] || $files != array_unique($files)) { + $this->log("Too many or duplicate files specified"); + return $options; + } + if (isset($_GET['b'])) { + // check for validity + if (preg_match('@^[^/]+(?:/[^/]+)*$@', $_GET['b']) + && false === strpos($_GET['b'], '..') + && $_GET['b'] !== '.') { + // valid base + $base = "/{$_GET['b']}/"; + } else { + $this->log("GET param 'b' invalid (see MinApp.php line 84)"); + return $options; + } + } else { + $base = '/'; + } + $allowDirs = array(); + foreach ((array)$cOptions['allowDirs'] as $allowDir) { + $allowDirs[] = realpath(str_replace('//', $_SERVER['DOCUMENT_ROOT'] . '/', $allowDir)); + } + foreach ($files as $file) { + $path = $_SERVER['DOCUMENT_ROOT'] . $base . $file; + $file = realpath($path); + if (false === $file) { + $this->log("Path \"{$path}\" failed realpath()"); + return $options; + } elseif (! parent::_fileIsSafe($file, $allowDirs)) { + $this->log("Path \"{$path}\" failed Minify_Controller_Base::_fileIsSafe()"); + return $options; + } else { + $sources[] = new Minify_Source(array( + 'filepath' => $file + )); + } + } + } + if ($sources) { + $this->sources = $sources; + } else { + $this->log("No sources to serve"); + } + return $options; + } +} diff --git a/plugins/Minify/extlib/minify/min/lib/Minify/Controller/Page.php b/plugins/Minify/extlib/minify/min/lib/Minify/Controller/Page.php new file mode 100644 index 0000000000..fa4599abd9 --- /dev/null +++ b/plugins/Minify/extlib/minify/min/lib/Minify/Controller/Page.php @@ -0,0 +1,82 @@ + + */ +class Minify_Controller_Page extends Minify_Controller_Base { + + /** + * Set up source of HTML content + * + * @param array $options controller and Minify options + * @return array Minify options + * + * Controller options: + * + * 'content': (required) HTML markup + * + * 'id': (required) id of page (string for use in server-side caching) + * + * 'lastModifiedTime': timestamp of when this content changed. This + * is recommended to allow both server and client-side caching. + * + * 'minifyAll': should all CSS and Javascript blocks be individually + * minified? (default false) + * + * @todo Add 'file' option to read HTML file. + */ + public function setupSources($options) { + if (isset($options['file'])) { + $sourceSpec = array( + 'filepath' => $options['file'] + ); + } else { + // strip controller options + $sourceSpec = array( + 'content' => $options['content'] + ,'id' => $options['id'] + ); + unset($options['content'], $options['id']); + } + if (isset($options['minifyAll'])) { + // this will be the 2nd argument passed to Minify_HTML::minify() + $sourceSpec['minifyOptions'] = array( + 'cssMinifier' => array('Minify_CSS', 'minify') + ,'jsMinifier' => array('JSMin', 'minify') + ); + $this->_loadCssJsMinifiers = true; + unset($options['minifyAll']); + } + $this->sources[] = new Minify_Source($sourceSpec); + + $options['contentType'] = Minify::TYPE_HTML; + return $options; + } + + protected $_loadCssJsMinifiers = false; + + /** + * @see Minify_Controller_Base::loadMinifier() + */ + public function loadMinifier($minifierCallback) + { + if ($this->_loadCssJsMinifiers) { + // Minify will not call for these so we must manually load + // them when Minify/HTML.php is called for. + require_once 'Minify/CSS.php'; + require_once 'JSMin.php'; + } + parent::loadMinifier($minifierCallback); // load Minify/HTML.php + } +} + diff --git a/plugins/Minify/extlib/minify/min/lib/Minify/Controller/Version1.php b/plugins/Minify/extlib/minify/min/lib/Minify/Controller/Version1.php new file mode 100644 index 0000000000..1861aabc11 --- /dev/null +++ b/plugins/Minify/extlib/minify/min/lib/Minify/Controller/Version1.php @@ -0,0 +1,118 @@ + + * Minify::serve('Version1'); + * + * + * @package Minify + * @author Stephen Clay + */ +class Minify_Controller_Version1 extends Minify_Controller_Base { + + /** + * Set up groups of files as sources + * + * @param array $options controller and Minify options + * @return array Minify options + * + */ + public function setupSources($options) { + self::_setupDefines(); + if (MINIFY_USE_CACHE) { + $cacheDir = defined('MINIFY_CACHE_DIR') + ? MINIFY_CACHE_DIR + : ''; + Minify::setCache($cacheDir); + } + $options['badRequestHeader'] = 'HTTP/1.0 404 Not Found'; + $options['contentTypeCharset'] = MINIFY_ENCODING; + + // The following restrictions are to limit the URLs that minify will + // respond to. Ideally there should be only one way to reference a file. + if (! isset($_GET['files']) + // verify at least one file, files are single comma separated, + // and are all same extension + || ! preg_match('/^[^,]+\\.(css|js)(,[^,]+\\.\\1)*$/', $_GET['files'], $m) + // no "//" (makes URL rewriting easier) + || strpos($_GET['files'], '//') !== false + // no "\" + || strpos($_GET['files'], '\\') !== false + // no "./" + || preg_match('/(?:^|[^\\.])\\.\\//', $_GET['files']) + ) { + return $options; + } + $extension = $m[1]; + + $files = explode(',', $_GET['files']); + if (count($files) > MINIFY_MAX_FILES) { + return $options; + } + + // strings for prepending to relative/absolute paths + $prependRelPaths = dirname($_SERVER['SCRIPT_FILENAME']) + . DIRECTORY_SEPARATOR; + $prependAbsPaths = $_SERVER['DOCUMENT_ROOT']; + + $sources = array(); + $goodFiles = array(); + $hasBadSource = false; + + $allowDirs = isset($options['allowDirs']) + ? $options['allowDirs'] + : MINIFY_BASE_DIR; + + foreach ($files as $file) { + // prepend appropriate string for abs/rel paths + $file = ($file[0] === '/' ? $prependAbsPaths : $prependRelPaths) . $file; + // make sure a real file! + $file = realpath($file); + // don't allow unsafe or duplicate files + if (parent::_fileIsSafe($file, $allowDirs) + && !in_array($file, $goodFiles)) + { + $goodFiles[] = $file; + $srcOptions = array( + 'filepath' => $file + ); + $this->sources[] = new Minify_Source($srcOptions); + } else { + $hasBadSource = true; + break; + } + } + if ($hasBadSource) { + $this->sources = array(); + } + if (! MINIFY_REWRITE_CSS_URLS) { + $options['rewriteCssUris'] = false; + } + return $options; + } + + private static function _setupDefines() + { + $defaults = array( + 'MINIFY_BASE_DIR' => realpath($_SERVER['DOCUMENT_ROOT']) + ,'MINIFY_ENCODING' => 'utf-8' + ,'MINIFY_MAX_FILES' => 16 + ,'MINIFY_REWRITE_CSS_URLS' => true + ,'MINIFY_USE_CACHE' => true + ); + foreach ($defaults as $const => $val) { + if (! defined($const)) { + define($const, $val); + } + } + } +} + diff --git a/plugins/Minify/extlib/minify/min/lib/Minify/HTML.php b/plugins/Minify/extlib/minify/min/lib/Minify/HTML.php new file mode 100644 index 0000000000..fb5c1e9829 --- /dev/null +++ b/plugins/Minify/extlib/minify/min/lib/Minify/HTML.php @@ -0,0 +1,245 @@ + + */ +class Minify_HTML { + + /** + * "Minify" an HTML page + * + * @param string $html + * + * @param array $options + * + * 'cssMinifier' : (optional) callback function to process content of STYLE + * elements. + * + * 'jsMinifier' : (optional) callback function to process content of SCRIPT + * elements. Note: the type attribute is ignored. + * + * 'xhtml' : (optional boolean) should content be treated as XHTML1.0? If + * unset, minify will sniff for an XHTML doctype. + * + * @return string + */ + public static function minify($html, $options = array()) { + $min = new Minify_HTML($html, $options); + return $min->process(); + } + + + /** + * Create a minifier object + * + * @param string $html + * + * @param array $options + * + * 'cssMinifier' : (optional) callback function to process content of STYLE + * elements. + * + * 'jsMinifier' : (optional) callback function to process content of SCRIPT + * elements. Note: the type attribute is ignored. + * + * 'xhtml' : (optional boolean) should content be treated as XHTML1.0? If + * unset, minify will sniff for an XHTML doctype. + * + * @return null + */ + public function __construct($html, $options = array()) + { + $this->_html = str_replace("\r\n", "\n", trim($html)); + if (isset($options['xhtml'])) { + $this->_isXhtml = (bool)$options['xhtml']; + } + if (isset($options['cssMinifier'])) { + $this->_cssMinifier = $options['cssMinifier']; + } + if (isset($options['jsMinifier'])) { + $this->_jsMinifier = $options['jsMinifier']; + } + } + + + /** + * Minify the markeup given in the constructor + * + * @return string + */ + public function process() + { + if ($this->_isXhtml === null) { + $this->_isXhtml = (false !== strpos($this->_html, '_replacementHash = 'MINIFYHTML' . md5($_SERVER['REQUEST_TIME']); + $this->_placeholders = array(); + + // replace SCRIPTs (and minify) with placeholders + $this->_html = preg_replace_callback( + '/(\\s*)(]*?>)([\\s\\S]*?)<\\/script>(\\s*)/i' + ,array($this, '_removeScriptCB') + ,$this->_html); + + // replace STYLEs (and minify) with placeholders + $this->_html = preg_replace_callback( + '/\\s*(]*?>)([\\s\\S]*?)<\\/style>\\s*/i' + ,array($this, '_removeStyleCB') + ,$this->_html); + + // remove HTML comments (not containing IE conditional comments). + $this->_html = preg_replace_callback( + '//' + ,array($this, '_commentCB') + ,$this->_html); + + // replace PREs with placeholders + $this->_html = preg_replace_callback('/\\s*(]*?>[\\s\\S]*?<\\/pre>)\\s*/i' + ,array($this, '_removePreCB') + ,$this->_html); + + // replace TEXTAREAs with placeholders + $this->_html = preg_replace_callback( + '/\\s*(]*?>[\\s\\S]*?<\\/textarea>)\\s*/i' + ,array($this, '_removeTextareaCB') + ,$this->_html); + + // trim each line. + // @todo take into account attribute values that span multiple lines. + $this->_html = preg_replace('/^\\s+|\\s+$/m', '', $this->_html); + + // remove ws around block/undisplayed elements + $this->_html = preg_replace('/\\s+(<\\/?(?:area|base(?:font)?|blockquote|body' + .'|caption|center|cite|col(?:group)?|dd|dir|div|dl|dt|fieldset|form' + .'|frame(?:set)?|h[1-6]|head|hr|html|legend|li|link|map|menu|meta' + .'|ol|opt(?:group|ion)|p|param|t(?:able|body|head|d|h||r|foot|itle)' + .'|ul)\\b[^>]*>)/i', '$1', $this->_html); + + // remove ws outside of all elements + $this->_html = preg_replace_callback( + '/>([^<]+)_html); + + // use newlines before 1st attribute in open tags (to limit line lengths) + $this->_html = preg_replace('/(<[a-z\\-]+)\\s+([^>]+>)/i', "$1\n$2", $this->_html); + + // fill placeholders + $this->_html = str_replace( + array_keys($this->_placeholders) + ,array_values($this->_placeholders) + ,$this->_html + ); + return $this->_html; + } + + protected function _commentCB($m) + { + return (0 === strpos($m[1], '[') || false !== strpos($m[1], '_replacementHash . count($this->_placeholders) . '%'; + $this->_placeholders[$placeholder] = $content; + return $placeholder; + } + + protected $_isXhtml = null; + protected $_replacementHash = null; + protected $_placeholders = array(); + protected $_cssMinifier = null; + protected $_jsMinifier = null; + + protected function _outsideTagCB($m) + { + return '>' . preg_replace('/^\\s+|\\s+$/', ' ', $m[1]) . '<'; + } + + protected function _removePreCB($m) + { + return $this->_reservePlace($m[1]); + } + + protected function _removeTextareaCB($m) + { + return $this->_reservePlace($m[1]); + } + + protected function _removeStyleCB($m) + { + $openStyle = $m[1]; + $css = $m[2]; + // remove HTML comments + $css = preg_replace('/(?:^\\s*\\s*$)/', '', $css); + + // remove CDATA section markers + $css = $this->_removeCdata($css); + + // minify + $minifier = $this->_cssMinifier + ? $this->_cssMinifier + : 'trim'; + $css = call_user_func($minifier, $css); + + return $this->_reservePlace($this->_needsCdata($css) + ? "{$openStyle}/**/" + : "{$openStyle}{$css}" + ); + } + + protected function _removeScriptCB($m) + { + $openScript = $m[2]; + $js = $m[3]; + + // whitespace surrounding? preserve at least one space + $ws1 = ($m[1] === '') ? '' : ' '; + $ws2 = ($m[4] === '') ? '' : ' '; + + // remove HTML comments (and ending "//" if present) + $js = preg_replace('/(?:^\\s*\\s*$)/', '', $js); + + // remove CDATA section markers + $js = $this->_removeCdata($js); + + // minify + $minifier = $this->_jsMinifier + ? $this->_jsMinifier + : 'trim'; + $js = call_user_func($minifier, $js); + + return $this->_reservePlace($this->_needsCdata($js) + ? "{$ws1}{$openScript}/**/{$ws2}" + : "{$ws1}{$openScript}{$js}{$ws2}" + ); + } + + protected function _removeCdata($str) + { + return (false !== strpos($str, ''), '', $str) + : $str; + } + + protected function _needsCdata($str) + { + return ($this->_isXhtml && preg_match('/(?:[<&]|\\-\\-|\\]\\]>)/', $str)); + } +} diff --git a/plugins/Minify/extlib/minify/min/lib/Minify/ImportProcessor.php b/plugins/Minify/extlib/minify/min/lib/Minify/ImportProcessor.php new file mode 100644 index 0000000000..0d6d90a816 --- /dev/null +++ b/plugins/Minify/extlib/minify/min/lib/Minify/ImportProcessor.php @@ -0,0 +1,157 @@ + + */ +class Minify_ImportProcessor { + + public static $filesIncluded = array(); + + public static function process($file) + { + self::$filesIncluded = array(); + self::$_isCss = (strtolower(substr($file, -4)) === '.css'); + $obj = new Minify_ImportProcessor(dirname($file)); + return $obj->_getContent($file); + } + + // allows callback funcs to know the current directory + private $_currentDir = null; + + // allows _importCB to write the fetched content back to the obj + private $_importedContent = ''; + + private static $_isCss = null; + + private function __construct($currentDir) + { + $this->_currentDir = $currentDir; + } + + private function _getContent($file) + { + $file = realpath($file); + if (! $file + || in_array($file, self::$filesIncluded) + || false === ($content = @file_get_contents($file)) + ) { + // file missing, already included, or failed read + return ''; + } + self::$filesIncluded[] = realpath($file); + $this->_currentDir = dirname($file); + + // remove UTF-8 BOM if present + if (pack("CCC",0xef,0xbb,0xbf) === substr($content, 0, 3)) { + $content = substr($content, 3); + } + // ensure uniform EOLs + $content = str_replace("\r\n", "\n", $content); + + // process @imports + $content = preg_replace_callback( + '/ + @import\\s+ + (?:url\\(\\s*)? # maybe url( + [\'"]? # maybe quote + (.*?) # 1 = URI + [\'"]? # maybe end quote + (?:\\s*\\))? # maybe ) + ([a-zA-Z,\\s]*)? # 2 = media list + ; # end token + /x' + ,array($this, '_importCB') + ,$content + ); + + if (self::$_isCss) { + // rewrite remaining relative URIs + $content = preg_replace_callback( + '/url\\(\\s*([^\\)\\s]+)\\s*\\)/' + ,array($this, '_urlCB') + ,$content + ); + } + + return $this->_importedContent . $content; + } + + private function _importCB($m) + { + $url = $m[1]; + $mediaList = preg_replace('/\\s+/', '', $m[2]); + + if (strpos($url, '://') > 0) { + // protocol, leave in place for CSS, comment for JS + return self::$_isCss + ? $m[0] + : "/* Minify_ImportProcessor will not include remote content */"; + } + if ('/' === $url[0]) { + // protocol-relative or root path + $url = ltrim($url, '/'); + $file = realpath($_SERVER['DOCUMENT_ROOT']) . DIRECTORY_SEPARATOR + . strtr($url, '/', DIRECTORY_SEPARATOR); + } else { + // relative to current path + $file = $this->_currentDir . DIRECTORY_SEPARATOR + . strtr($url, '/', DIRECTORY_SEPARATOR); + } + $obj = new Minify_ImportProcessor(dirname($file)); + $content = $obj->_getContent($file); + if ('' === $content) { + // failed. leave in place for CSS, comment for JS + return self::$_isCss + ? $m[0] + : "/* Minify_ImportProcessor could not fetch '{$file}' */";; + } + return (!self::$_isCss || preg_match('@(?:^$|\\ball\\b)@', $mediaList)) + ? $content + : "@media {$mediaList} {\n{$content}\n}\n"; + } + + private function _urlCB($m) + { + // $m[1] is either quoted or not + $quote = ($m[1][0] === "'" || $m[1][0] === '"') + ? $m[1][0] + : ''; + $url = ($quote === '') + ? $m[1] + : substr($m[1], 1, strlen($m[1]) - 2); + if ('/' !== $url[0]) { + if (strpos($url, '//') > 0) { + // probably starts with protocol, do not alter + } else { + // prepend path with current dir separator (OS-independent) + $path = $this->_currentDir + . DIRECTORY_SEPARATOR . strtr($url, '/', DIRECTORY_SEPARATOR); + // strip doc root + $path = substr($path, strlen(realpath($_SERVER['DOCUMENT_ROOT']))); + // fix to absolute URL + $url = strtr($path, '/\\', '//'); + // remove /./ and /../ where possible + $url = str_replace('/./', '/', $url); + // inspired by patch from Oleg Cherniy + do { + $url = preg_replace('@/[^/]+/\\.\\./@', '/', $url, 1, $changed); + } while ($changed); + } + } + return "url({$quote}{$url}{$quote})"; + } +} diff --git a/plugins/Minify/extlib/minify/min/lib/Minify/Lines.php b/plugins/Minify/extlib/minify/min/lib/Minify/Lines.php new file mode 100644 index 0000000000..6f94fb63c4 --- /dev/null +++ b/plugins/Minify/extlib/minify/min/lib/Minify/Lines.php @@ -0,0 +1,131 @@ + + * @author Adam Pedersen (Issue 55 fix) + */ +class Minify_Lines { + + /** + * Add line numbers in C-style comments + * + * This uses a very basic parser easily fooled by comment tokens inside + * strings or regexes, but, otherwise, generally clean code will not be + * mangled. URI rewriting can also be performed. + * + * @param string $content + * + * @param array $options available options: + * + * 'id': (optional) string to identify file. E.g. file name/path + * + * 'currentDir': (default null) if given, this is assumed to be the + * directory of the current CSS file. Using this, minify will rewrite + * all relative URIs in import/url declarations to correctly point to + * the desired files, and prepend a comment with debugging information about + * this process. + * + * @return string + */ + public static function minify($content, $options = array()) + { + $id = (isset($options['id']) && $options['id']) + ? $options['id'] + : ''; + $content = str_replace("\r\n", "\n", $content); + $lines = explode("\n", $content); + $numLines = count($lines); + // determine left padding + $padTo = strlen($numLines); + $inComment = false; + $i = 0; + $newLines = array(); + while (null !== ($line = array_shift($lines))) { + if (('' !== $id) && (0 == $i % 50)) { + array_push($newLines, '', "/* {$id} */", ''); + } + ++$i; + $newLines[] = self::_addNote($line, $i, $inComment, $padTo); + $inComment = self::_eolInComment($line, $inComment); + } + $content = implode("\n", $newLines) . "\n"; + + // check for desired URI rewriting + if (isset($options['currentDir'])) { + require_once 'Minify/CSS/UriRewriter.php'; + Minify_CSS_UriRewriter::$debugText = ''; + $content = Minify_CSS_UriRewriter::rewrite( + $content + ,$options['currentDir'] + ,isset($options['docRoot']) ? $options['docRoot'] : $_SERVER['DOCUMENT_ROOT'] + ,isset($options['symlinks']) ? $options['symlinks'] : array() + ); + $content = "/* Minify_CSS_UriRewriter::\$debugText\n\n" + . Minify_CSS_UriRewriter::$debugText . "*/\n" + . $content; + } + + return $content; + } + + /** + * Is the parser within a C-style comment at the end of this line? + * + * @param string $line current line of code + * + * @param bool $inComment was the parser in a comment at the + * beginning of the line? + * + * @return bool + */ + private static function _eolInComment($line, $inComment) + { + while (strlen($line)) { + $search = $inComment + ? '*/' + : '/*'; + $pos = strpos($line, $search); + if (false === $pos) { + return $inComment; + } else { + if ($pos == 0 + || ($inComment + ? substr($line, $pos, 3) + : substr($line, $pos-1, 3)) != '*/*') + { + $inComment = ! $inComment; + } + $line = substr($line, $pos + 2); + } + } + return $inComment; + } + + /** + * Prepend a comment (or note) to the given line + * + * @param string $line current line of code + * + * @param string $note content of note/comment + * + * @param bool $inComment was the parser in a comment at the + * beginning of the line? + * + * @param int $padTo minimum width of comment + * + * @return string + */ + private static function _addNote($line, $note, $inComment, $padTo) + { + return $inComment + ? '/* ' . str_pad($note, $padTo, ' ', STR_PAD_RIGHT) . ' *| ' . $line + : '/* ' . str_pad($note, $padTo, ' ', STR_PAD_RIGHT) . ' */ ' . $line; + } +} diff --git a/plugins/Minify/extlib/minify/min/lib/Minify/Logger.php b/plugins/Minify/extlib/minify/min/lib/Minify/Logger.php new file mode 100644 index 0000000000..7844eea356 --- /dev/null +++ b/plugins/Minify/extlib/minify/min/lib/Minify/Logger.php @@ -0,0 +1,45 @@ + + */ +class Minify_Logger { + + /** + * Set logger object. + * + * The object should have a method "log" that accepts a value as 1st argument and + * an optional string label as the 2nd. + * + * @param mixed $obj or a "falsey" value to disable + * @return null + */ + public static function setLogger($obj = null) { + self::$_logger = $obj + ? $obj + : null; + } + + /** + * Pass a message to the logger (if set) + * + * @param string $msg message to log + * @return null + */ + public static function log($msg, $label = 'Minify') { + if (! self::$_logger) return; + self::$_logger->log($msg, $label); + } + + /** + * @var mixed logger object (like FirePHP) or null (i.e. no logger available) + */ + private static $_logger = null; +} diff --git a/plugins/Minify/extlib/minify/min/lib/Minify/Packer.php b/plugins/Minify/extlib/minify/min/lib/Minify/Packer.php new file mode 100644 index 0000000000..949c3eef04 --- /dev/null +++ b/plugins/Minify/extlib/minify/min/lib/Minify/Packer.php @@ -0,0 +1,37 @@ +pack()); + } +} diff --git a/plugins/Minify/extlib/minify/min/lib/Minify/Source.php b/plugins/Minify/extlib/minify/min/lib/Minify/Source.php new file mode 100644 index 0000000000..5a85d10d0d --- /dev/null +++ b/plugins/Minify/extlib/minify/min/lib/Minify/Source.php @@ -0,0 +1,187 @@ + + */ +class Minify_Source { + + /** + * @var int time of last modification + */ + public $lastModified = null; + + /** + * @var callback minifier function specifically for this source. + */ + public $minifier = null; + + /** + * @var array minification options specific to this source. + */ + public $minifyOptions = null; + + /** + * @var string full path of file + */ + public $filepath = null; + + /** + * @var string HTTP Content Type (Minify requires one of the constants Minify::TYPE_*) + */ + public $contentType = null; + + /** + * Create a Minify_Source + * + * In the $spec array(), you can either provide a 'filepath' to an existing + * file (existence will not be checked!) or give 'id' (unique string for + * the content), 'content' (the string content) and 'lastModified' + * (unixtime of last update). + * + * As a shortcut, the controller will replace "//" at the beginning + * of a filepath with $_SERVER['DOCUMENT_ROOT'] . '/'. + * + * @param array $spec options + */ + public function __construct($spec) + { + if (isset($spec['filepath'])) { + if (0 === strpos($spec['filepath'], '//')) { + $spec['filepath'] = $_SERVER['DOCUMENT_ROOT'] . substr($spec['filepath'], 1); + } + $segments = explode('.', $spec['filepath']); + $ext = strtolower(array_pop($segments)); + switch ($ext) { + case 'js' : $this->contentType = 'application/x-javascript'; + break; + case 'css' : $this->contentType = 'text/css'; + break; + case 'htm' : // fallthrough + case 'html' : $this->contentType = 'text/html'; + break; + } + $this->filepath = $spec['filepath']; + $this->_id = $spec['filepath']; + $this->lastModified = filemtime($spec['filepath']) + // offset for Windows uploaders with out of sync clocks + + round(Minify::$uploaderHoursBehind * 3600); + } elseif (isset($spec['id'])) { + $this->_id = 'id::' . $spec['id']; + if (isset($spec['content'])) { + $this->_content = $spec['content']; + } else { + $this->_getContentFunc = $spec['getContentFunc']; + } + $this->lastModified = isset($spec['lastModified']) + ? $spec['lastModified'] + : time(); + } + if (isset($spec['contentType'])) { + $this->contentType = $spec['contentType']; + } + if (isset($spec['minifier'])) { + $this->minifier = $spec['minifier']; + } + if (isset($spec['minifyOptions'])) { + $this->minifyOptions = $spec['minifyOptions']; + } + } + + /** + * Get content + * + * @return string + */ + public function getContent() + { + $content = (null !== $this->filepath) + ? file_get_contents($this->filepath) + : ((null !== $this->_content) + ? $this->_content + : call_user_func($this->_getContentFunc, $this->_id) + ); + // remove UTF-8 BOM if present + return (pack("CCC",0xef,0xbb,0xbf) === substr($content, 0, 3)) + ? substr($content, 3) + : $content; + } + + /** + * Get id + * + * @return string + */ + public function getId() + { + return $this->_id; + } + + /** + * Verifies a single minification call can handle all sources + * + * @param array $sources Minify_Source instances + * + * @return bool true iff there no sources with specific minifier preferences. + */ + public static function haveNoMinifyPrefs($sources) + { + foreach ($sources as $source) { + if (null !== $source->minifier + || null !== $source->minifyOptions) { + return false; + } + } + return true; + } + + /** + * Get unique string for a set of sources + * + * @param array $sources Minify_Source instances + * + * @return string + */ + public static function getDigest($sources) + { + foreach ($sources as $source) { + $info[] = array( + $source->_id, $source->minifier, $source->minifyOptions + ); + } + return md5(serialize($info)); + } + + /** + * Get content type from a group of sources + * + * This is called if the user doesn't pass in a 'contentType' options + * + * @param array $sources Minify_Source instances + * + * @return string content type. e.g. 'text/css' + */ + public static function getContentType($sources) + { + foreach ($sources as $source) { + if ($source->contentType !== null) { + return $source->contentType; + } + } + return 'text/plain'; + } + + protected $_content = null; + protected $_getContentFunc = null; + protected $_id = null; +} + diff --git a/plugins/Minify/extlib/minify/min/lib/Minify/YUICompressor.php b/plugins/Minify/extlib/minify/min/lib/Minify/YUICompressor.php new file mode 100644 index 0000000000..7cb61adbec --- /dev/null +++ b/plugins/Minify/extlib/minify/min/lib/Minify/YUICompressor.php @@ -0,0 +1,139 @@ + + * Minify_YUICompressor::$jarFile = '/path/to/yuicompressor-2.3.5.jar'; + * Minify_YUICompressor::$tempDir = '/tmp'; + * $code = Minify_YUICompressor::minifyJs( + * $code + * ,array('nomunge' => true, 'line-break' => 1000) + * ); + * + * + * @todo unit tests, $options docs + * + * @package Minify + * @author Stephen Clay + */ +class Minify_YUICompressor { + + /** + * Filepath of the YUI Compressor jar file. This must be set before + * calling minifyJs() or minifyCss(). + * + * @var string + */ + public static $jarFile = null; + + /** + * Writable temp directory. This must be set before calling minifyJs() + * or minifyCss(). + * + * @var string + */ + public static $tempDir = null; + + /** + * Filepath of "java" executable (may be needed if not in shell's PATH) + * + * @var string + */ + public static $javaExecutable = 'java'; + + /** + * Minify a Javascript string + * + * @param string $js + * + * @param array $options (verbose is ignored) + * + * @see http://www.julienlecomte.net/yuicompressor/README + * + * @return string + */ + public static function minifyJs($js, $options = array()) + { + return self::_minify('js', $js, $options); + } + + /** + * Minify a CSS string + * + * @param string $css + * + * @param array $options (verbose is ignored) + * + * @see http://www.julienlecomte.net/yuicompressor/README + * + * @return string + */ + public static function minifyCss($css, $options = array()) + { + return self::_minify('css', $css, $options); + } + + private static function _minify($type, $content, $options) + { + self::_prepare(); + if (! ($tmpFile = tempnam(self::$tempDir, 'yuic_'))) { + throw new Exception('Minify_YUICompressor : could not create temp file.'); + } + file_put_contents($tmpFile, $content); + exec(self::_getCmd($options, $type, $tmpFile), $output); + unlink($tmpFile); + return implode("\n", $output); + } + + private static function _getCmd($userOptions, $type, $tmpFile) + { + $o = array_merge( + array( + 'charset' => '' + ,'line-break' => 5000 + ,'type' => $type + ,'nomunge' => false + ,'preserve-semi' => false + ,'disable-optimizations' => false + ) + ,$userOptions + ); + $cmd = self::$javaExecutable . ' -jar ' . escapeshellarg(self::$jarFile) + . " --type {$type}" + . (preg_match('/^[a-zA-Z\\-]+$/', $o['charset']) + ? " --charset {$o['charset']}" + : '') + . (is_numeric($o['line-break']) && $o['line-break'] >= 0 + ? ' --line-break ' . (int)$o['line-break'] + : ''); + if ($type === 'js') { + foreach (array('nomunge', 'preserve-semi', 'disable-optimizations') as $opt) { + $cmd .= $o[$opt] + ? " --{$opt}" + : ''; + } + } + return $cmd . ' ' . escapeshellarg($tmpFile); + } + + private static function _prepare() + { + if (! is_file(self::$jarFile) + || ! is_dir(self::$tempDir) + || ! is_writable(self::$tempDir) + ) { + throw new Exception('Minify_YUICompressor : $jarFile and $tempDir must be set.'); + } + } +} + diff --git a/plugins/Minify/extlib/minify/min/lib/Solar/Dir.php b/plugins/Minify/extlib/minify/min/lib/Solar/Dir.php new file mode 100644 index 0000000000..37f7169624 --- /dev/null +++ b/plugins/Minify/extlib/minify/min/lib/Solar/Dir.php @@ -0,0 +1,199 @@ + + * + * @license http://opensource.org/licenses/bsd-license.php BSD + * + * @version $Id: Dir.php 2926 2007-11-09 16:25:44Z pmjones $ + * + */ +class Solar_Dir { + + /** + * + * The OS-specific temporary directory location. + * + * @var string + * + */ + protected static $_tmp; + + /** + * + * Hack for [[php::is_dir() | ]] that checks the include_path. + * + * Use this to see if a directory exists anywhere in the include_path. + * + * {{code: php + * $dir = Solar_Dir::exists('path/to/dir') + * if ($dir) { + * $files = scandir($dir); + * } else { + * echo "Not found in the include-path."; + * } + * }} + * + * @param string $dir Check for this directory in the include_path. + * + * @return mixed If the directory exists in the include_path, returns the + * absolute path; if not, returns boolean false. + * + */ + public static function exists($dir) + { + // no file requested? + $dir = trim($dir); + if (! $dir) { + return false; + } + + // using an absolute path for the file? + // dual check for Unix '/' and Windows '\', + // or Windows drive letter and a ':'. + $abs = ($dir[0] == '/' || $dir[0] == '\\' || $dir[1] == ':'); + if ($abs && is_dir($dir)) { + return $dir; + } + + // using a relative path on the file + $path = explode(PATH_SEPARATOR, ini_get('include_path')); + foreach ($path as $base) { + // strip Unix '/' and Windows '\' + $target = rtrim($base, '\\/') . DIRECTORY_SEPARATOR . $dir; + if (is_dir($target)) { + return $target; + } + } + + // never found it + return false; + } + + /** + * + * "Fixes" a directory string for the operating system. + * + * Use slashes anywhere you need a directory separator. Then run the + * string through fixdir() and the slashes will be converted to the + * proper separator (for example '\' on Windows). + * + * Always adds a final trailing separator. + * + * @param string $dir The directory string to 'fix'. + * + * @return string The "fixed" directory string. + * + */ + public static function fix($dir) + { + $dir = str_replace('/', DIRECTORY_SEPARATOR, $dir); + return rtrim($dir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR; + } + + /** + * + * Convenience method for dirname() and higher-level directories. + * + * @param string $file Get the dirname() of this file. + * + * @param int $up Move up in the directory structure this many + * times, default 0. + * + * @return string The dirname() of the file. + * + */ + public static function name($file, $up = 0) + { + $dir = dirname($file); + while ($up --) { + $dir = dirname($dir); + } + return $dir; + } + + /** + * + * Returns the OS-specific directory for temporary files. + * + * @param string $sub Add this subdirectory to the returned temporary + * directory name. + * + * @return string The temporary directory path. + * + */ + public static function tmp($sub = '') + { + // find the tmp dir if needed + if (! Solar_Dir::$_tmp) { + + // use the system if we can + if (function_exists('sys_get_temp_dir')) { + $tmp = sys_get_temp_dir(); + } else { + $tmp = Solar_Dir::_tmp(); + } + + // remove trailing separator and save + Solar_Dir::$_tmp = rtrim($tmp, DIRECTORY_SEPARATOR); + } + + // do we have a subdirectory request? + $sub = trim($sub); + if ($sub) { + // remove leading and trailing separators, and force exactly + // one trailing separator + $sub = trim($sub, DIRECTORY_SEPARATOR) + . DIRECTORY_SEPARATOR; + } + + return Solar_Dir::$_tmp . DIRECTORY_SEPARATOR . $sub; + } + + /** + * + * Returns the OS-specific temporary directory location. + * + * @return string The temp directory path. + * + */ + protected static function _tmp() + { + // non-Windows system? + if (strtolower(substr(PHP_OS, 0, 3)) != 'win') { + $tmp = empty($_ENV['TMPDIR']) ? getenv('TMPDIR') : $_ENV['TMPDIR']; + if ($tmp) { + return $tmp; + } else { + return '/tmp'; + } + } + + // Windows 'TEMP' + $tmp = empty($_ENV['TEMP']) ? getenv('TEMP') : $_ENV['TEMP']; + if ($tmp) { + return $tmp; + } + + // Windows 'TMP' + $tmp = empty($_ENV['TMP']) ? getenv('TMP') : $_ENV['TMP']; + if ($tmp) { + return $tmp; + } + + // Windows 'windir' + $tmp = empty($_ENV['windir']) ? getenv('windir') : $_ENV['windir']; + if ($tmp) { + return $tmp; + } + + // final fallback for Windows + return getenv('SystemRoot') . '\\temp'; + } +} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min/utils.php b/plugins/Minify/extlib/minify/min/utils.php new file mode 100644 index 0000000000..c735941520 --- /dev/null +++ b/plugins/Minify/extlib/minify/min/utils.php @@ -0,0 +1,90 @@ + + * + * + * + * + * If you do not want ampersands as HTML entities, set Minify_Build::$ampersand = "&" + * before using this function. + * + * @param string $group a key from groupsConfig.php + * @param boolean $forceAmpersand (default false) Set to true if the RewriteRule + * directives in .htaccess are functional. This will remove the "?" from URIs, making them + * more cacheable by proxies. + * @return string + */ +function Minify_groupUri($group, $forceAmpersand = false) +{ + $path = $forceAmpersand + ? "/g={$group}" + : "/?g={$group}"; + return _Minify_getBuild($group)->uri( + '/' . basename(dirname(__FILE__)) . $path + ,$forceAmpersand + ); +} + + +/** + * Get the last modification time of the source js/css files used by Minify to + * build the page. + * + * If you're caching the output of Minify_groupUri(), you'll want to rebuild + * the cache if it's older than this timestamp. + * + * + * // simplistic HTML cache system + * $file = '/path/to/cache/file'; + * if (! file_exists($file) || filemtime($file) < Minify_groupsMtime(array('js', 'css'))) { + * // (re)build cache + * $page = buildPage(); // this calls Minify_groupUri() for js and css + * file_put_contents($file, $page); + * echo $page; + * exit(); + * } + * readfile($file); + * + * + * @param array $groups an array of keys from groupsConfig.php + * @return int Unix timestamp of the latest modification + */ +function Minify_groupsMtime($groups) +{ + $max = 0; + foreach ((array)$groups as $group) { + $max = max($max, _Minify_getBuild($group)->lastModified); + } + return $max; +} + +/** + * @param string $group a key from groupsConfig.php + * @return Minify_Build + * @private + */ +function _Minify_getBuild($group) +{ + static $builds = array(); + static $gc = false; + if (false === $gc) { + $gc = (require dirname(__FILE__) . '/groupsConfig.php'); + } + if (! isset($builds[$group])) { + $builds[$group] = new Minify_Build($gc[$group]); + } + return $builds[$group]; +} diff --git a/plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/2.php b/plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/2.php new file mode 100644 index 0000000000..9b66f24932 --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/2.php @@ -0,0 +1,44 @@ + $lastModified +)); +if ($cg->cacheIsValid) { + $cg->sendHeaders(); + // we're done + exit(); +} + +// generate content +$title = 'Last-Modified is known : add Content-Length'; +$explain = ' +

    Here, like the first example, we know the Last-Modified time, +but we also want to set the Content-Length to increase cacheability and allow +HTTP persistent connections. Instead of sending headers immediately, we first +generate our content, then use setContentLength(strlen($content)) +to add the header. Then finally call sendHeaders() and send the +content.

    +

    Note: This is not required if your PHP config buffers all +output and your script doesn\'t do any incremental flushing of the output +buffer. PHP will generally set Content-Length for you if it can.

    +

    This script emulates a document that changes every ' .$every. ' seconds. +
    This is version: ' . date('r', $lastModified) . '

    +'; + +require '_include.php'; +$content = get_content(array( + 'title' => $title + ,'explain' => $explain +)); + +$cg->setContentLength(strlen($content)); +$cg->sendHeaders(); +send_slowly($content); + diff --git a/plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/3.php b/plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/3.php new file mode 100644 index 0000000000..8f5482ba89 --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/3.php @@ -0,0 +1,40 @@ +When Last-Modified is unknown, you can still use ETags, but you need a short +string that is unique for that content. In the worst case, you have to generate +all the content first, then instantiate HTTP_ConditionalGet, setting +the array key contentHash to the output of a hash function of the +content. Since we have the full content, we might as well also use +setContentLength(strlen($content)) in the case where we need to +send it.

    +

    This script emulates a document that changes every ' .$every. ' seconds. +
    This is version: ' . date('r', $lastModified) . '

    +'; +require '_include.php'; +$content = get_content(array( + 'title' => $title + ,'explain' => $explain +)); + +$cg = new HTTP_ConditionalGet(array( + 'contentHash' => substr(md5($content), 7) +)); +if ($cg->cacheIsValid) { + $cg->sendHeaders(); + // we're done + exit(); +} +$cg->setContentLength(strlen($content)); +$cg->sendHeaders(); + +send_slowly($content); + diff --git a/plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/4.php b/plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/4.php new file mode 100644 index 0000000000..4b77d2084b --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/4.php @@ -0,0 +1,49 @@ + $lastModified + ,'encoding' => $enc +)); +$cg->sendHeaders(); +if ($cg->cacheIsValid) { + // we're done + exit(); +} + +// output encoded content + +$title = 'ConditionalGet + Encoder'; +$explain = ' +

    Using ConditionalGet and Encoder is straightforward. First impliment the +ConditionalGet, then if the cache is not valid, encode and send the content

    +

    This script emulates a document that changes every ' .$every. ' seconds. +
    This is version: ' . date('r', $lastModified) . '

    +'; +require '_include.php'; +$content = get_content(array( + 'title' => $title + ,'explain' => $explain +)); + +$he = new HTTP_Encoder(array( + 'content' => get_content(array( + 'title' => $title + ,'explain' => $explain + )) +)); +$he->encode(); + +// usually you would just $he->sendAll(), but here we want to emulate slow +// connection +$he->sendHeaders(); +send_slowly($he->getContent()); diff --git a/plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/5.php b/plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/5.php new file mode 100644 index 0000000000..b443c19734 --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/5.php @@ -0,0 +1,27 @@ + 20 + ,'lastModifiedTime' => filemtime(__FILE__) +)); +$cg->sendHeaders(); + +// generate, send content +$title = 'Last-Modified + Expires'; +$explain = ' +

    Here we set a static "lastModifiedTime" and "maxAge" to 20. The browser +will consider this document fresh for 20 seconds, then revalidate its cache. After +the 304 response, the cache will be good for another 20 seconds. Unless you force +a reload, there will only be 304 responses for this page after the initial download. +'; + +require '_include.php'; +echo get_content(array( + 'title' => $title + ,'explain' => $explain +)); + diff --git a/plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/_include.php b/plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/_include.php new file mode 100644 index 0000000000..9b65ae12e4 --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/_include.php @@ -0,0 +1,64 @@ + + + + + +HTTP_ConditionalGet : <?php echo $data['title']; ?> + + +

    HTTP_ConditionalGet

    +

    + + +

    Notes

    +

    How to distinguish 200 and 304 responses

    +

    For these pages all 200 responses are sent in chunks a second apart, so you +should notice that 304 responses are quicker. You can also use HTTP sniffers +like Fiddler (win) and +LiveHTTPHeaders (Firefox add-on) +to verify headers and content being sent.

    +

    Browser notes

    +
    +
    Opera
    +
    Opera has a couple behaviors against the HTTP spec: Manual refreshes (F5) + prevents the ETag/If-Modified-Since headers from being sent; it only sends + them when following a link or bookmark. Also, Opera will not honor the + must-revalidate Cache-Control value unless max-age + is set. To get Opera to follow the spec, ConditionalGet will send Opera max-age=0 + (if one is not already set).
    +
    Safari
    +
    ETag validation is unsupported, but Safari supports HTTP/1.0 validation via + If-Modified-Since headers as long as the cache is explicitly marked + "public" or "private" ("private" is default in ConditionalGet).
    +
    + + + $lastModified +)); +$cg->sendHeaders(); +if ($cg->cacheIsValid) { + // we're done + exit(); +} + +$title = 'Last-Modified is known : simple usage'; +$explain = ' +

    If your content has not changed since a certain timestamp, set this via the +the lastModifiedTime array key when instantiating HTTP_ConditionalGet. +You can immediately call the method sendHeaders() to set the +Last-Modified, ETag, and Cache-Control headers. The, if cacheIsValid +property is false, you echo the content.

    +

    This script emulates a document that changes every ' .$every. ' seconds. +
    This is version: ' . date('r', $lastModified) . '

    +'; + +require '_include.php'; + +echo send_slowly(get_content(array( + 'title' => $title + ,'explain' => $explain +))); + diff --git a/plugins/Minify/extlib/minify/min_unit_tests/HTTP_Encoder/green.png b/plugins/Minify/extlib/minify/min_unit_tests/HTTP_Encoder/green.png new file mode 100644 index 0000000000000000000000000000000000000000..d9d3a308aec0e9c7be676a8bc5438e5c61427ff2 GIT binary patch literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_{3?x-PN__%S%*9TgAsieWw;%dH0CL#^d_r6q z{xkglf9682r8`iBv%n*=n1O-o0|+xZtudJa6cj6QjVN(0N=+=u%+FH@$;?efo0^iDsNj}alv + + + +HTTP_Encoder Test + + + +

    HTTP_Encoder test

    +

    HTML

    +

    CSS

    +

    Javascript

    +

    image

    + + + + $content + ,'type' => $type +)); +$he->encode(); +$he->sendAll(); + +?> \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_inc.php b/plugins/Minify/extlib/minify/min_unit_tests/_inc.php new file mode 100644 index 0000000000..bf416d4bb9 --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_inc.php @@ -0,0 +1,50 @@ +0, 'fail'=>0, 'total'=>0); + + $mode = $test ? 'pass' : 'fail'; + $outMode = $test ? 'PASS' : '!FAIL'; + printf("%s: %s (%d of %d tests run so far have %sed)\n", + $outMode, $message, ++$count[$mode], ++$count['total'], $mode); + + return (bool)$test; +} + +ob_start(); \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/comments.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/comments.css new file mode 100644 index 0000000000..2ef9fac498 --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/comments.css @@ -0,0 +1,9 @@ + +/* block comments get removed */ + +/*! YUI Compressor style comments are preserved */ + +/* but all other comments are removed */ + +/* comments that have any surrounding whitespace are replaced by a single space. */ +body{ background:#fff/*eef*/ url(/path/to/image.gif) repeat-y; } diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/comments.min.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/comments.min.css new file mode 100644 index 0000000000..3ea5c61a69 --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/comments.min.css @@ -0,0 +1,3 @@ + +/* YUI Compressor style comments are preserved */ +body{background:#fff url(/path/to/image.gif) repeat-y} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/hacks.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/hacks.css new file mode 100644 index 0000000000..fccd32166f --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/hacks.css @@ -0,0 +1,66 @@ +/* hide from ie5/mac \*/ a{} +.foo {color:red} +/* necessary comment */ + +/* comment to attempt to confuse parser */ + +/* feed to ie5/mac \*//*/ +@import "ie5mac.css"; +/* necessary comment */ + +/* comment to attempt to confuse parser */ + +/*/ hide from nav4 */ +.foo {display:block;} +/* necessary comment */ + +/* comment to attempt to confuse parser */ + +/*/ feed to nav *//*/ +.foo {display:crazy;} +/* necessary comment */ + +/* hide props from various IE/win */ +div { + width: 140px; + width/* */:/**/100px; + width: /**/100px; +} + +html>/**/body {} + +/* Tantek's box model hack */ +div { + width:400px; + voice-family: "\"}\""; + voice-family:inherit; + width:300px; +} + +/* don't minimize hex colors in filters */ +div { + filter:chroma(color=#aabbcc); + filter:mask(color=#000000) shadow(color=#9BAD71, direction=135) chroma(color=#000000); +} + +@media screen { + /* for IE 5.x-6, hidden from IE 5 Mac */ /*\*/ + * html div#page { + height: 1%; + } + /**/ /* end hidden from IE 5 Mac */ +} + +foo { /* filters for IE */ + _height : 20px; + *height : 15px; +} + +/* http://tantek.com/CSS/Examples/midpass.html */ +@media tty { + i{content:"\";/*" "*/}} @import 'midpassafter.css'; /*";} +}/* */ + +/* leave at least 1 space between these pseudo elements and "{" for IE6: http://www.crankygeek.com/ie6pebug/ */ +p:first-letter {color:red;} +p:first-line {color:red;} diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/hacks.min.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/hacks.min.css new file mode 100644 index 0000000000..68be2ee89e --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/hacks.min.css @@ -0,0 +1,4 @@ +/*\*/a{}.foo{color:red}/**/ /*\*//*/@import "ie5mac.css";/**/ /*/*/.foo{display:block}/**/ /*/*//*/.foo{display:crazy}/**/ div{width:140px;width/**/:/**/100px;width:/**/100px}html>/**/body{}div{width:400px;voice-family:"\"}\"";voice-family:inherit;width:300px}div{filter:chroma(color=#aabbcc);filter:mask(color=#000000) shadow(color=#9BAD71, direction=135) chroma(color=#000000)}@media +screen{/*\*/* html +div#page{height:1%}/**/}foo{_height:20px;*height:15px}@media +tty{i{content:"\";/*" "*/}}@import 'midpassafter.css';/*"}}/* */ p:first-letter {color:red}p:first-line {color:red} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/issue62.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/issue62.css new file mode 100644 index 0000000000..006c7a22fb --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/issue62.css @@ -0,0 +1,890 @@ +/* +* DEFINITION DES STYLES DE TEXTE +*/ + /*-----------------------------------------------------------------------------------*/ +h1 { + color: #339933; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 14px; + font-weight: bold; + text-decoration: none; +} + +h2 { + color: #339933; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 12px; + font-weight: bold; + text-decoration: none; +} + +h1,h2,h3,h4,h5 { + margin: 0px; + padding: 0px; +} + +.txt_10_noir { + color: black; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 10px; + text-decoration: none; +} + +.txt_10_noir:link,.txt_10_noir:visited,.txt_10_noir:active { + color: black; +} + +.txt_10_noir:hover { + color: red; +} + +.txt_11_noir { + color: black; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 11px; + text-decoration: none; +} + +.txt_11_noir:link,.txt_11_noir:visited,.txt_11_noir:active { + color: black; +} + +.txt_11_noir:hover { + color: red; +} + +.txt_12_noir { + color: black; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 12px; + text-decoration: none; +} + +.txt_12_noir:link,.txt_12_noir:visited,.txt_12_noir:active { + color: black; +} + +.txt_12_noir:hover { + color: red; +} + +.txt_14_noir { + color: black; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 14px; + text-decoration: none; +} + +.txt_14_noir:link,.txt_14_noir:visited,.txt_14_noir:active { + color: black; +} + +.txt_14_noir:hover { + color: red; +} + +/*-----------------------------------------------------------------------------------*/ +.txt_10_gris { + color: grey; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 10px; + text-decoration: none; +} + +.txt_10_gris:link,.txt_10_gris:visited,.txt_10_gris:active { + color: grey; +} + +.txt_10_gris:hover { + color: red; +} + +.txt_11_gris { + color: grey; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 11px; + text-decoration: none; +} + +.txt_11_gris:link,.txt_11_gris:visited,.txt_11_gris:active { + color: grey; +} + +.txt_11_gris:hover { + color: red; +} + +.txt_12_gris { + color: grey; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 12px; + text-decoration: none; +} + +.txt_12_gris:link,.txt_12_gris:visited,.txt_12_gris:active { + color: grey; +} + +.txt_12_gris:hover { + color: red; +} + +.txt_14_gris { + color: grey; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 14px; + text-decoration: none; +} + +.txt_14_gris:link,.txt_14_gris:visited,.txt_14_gris:active { + color: grey; +} + +.txt_14_gris:hover { + color: red; +} + +/*-----------------------------------------------------------------------------------*/ +.txt_10_blanc { + color: #FFFFFF; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 10px; + text-decoration: none; +} + +.txt_10_blanc:link,.txt_10_blanc:visited,.txt_10_blanc:active { + color: #FFFFFF; +} + +.txt_10_blanc:hover { + color: #FF8800; /*ORANGE*/ +} + +.txt_11_blanc { + color: #FFFFFF; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 11px; + text-decoration: none; +} + +.txt_11_blanc:link,.txt_11_blanc:visited,.txt_11_blanc:active { + color: #FFFFFF; +} + +.txt_11_blanc:hover { + color: #FF8800; +} + +.txt_12_blanc { + color: #FFFFFF; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 12px; + text-decoration: none; +} + +.txt_12_blanc:link,.txt_12_blanc:visited,.txt_12_blanc:active { + color: #FFFFFF; +} + +.txt_12_blanc:hover { + color: #FFAA00; +} + +.txt_14_blanc { + color: #FFFFFF; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 14px; + text-decoration: none; +} + +.txt_14_blanc:link,.txt_14_blanc:visited,.txt_14_blanc:active { + color: #FFFFFF; +} + +.txt_14_blanc:hover { + color: #FF8800; +} + +/*-----------------------------------------------------------------------------------*/ +.txt_10_orange { + color: #FF8800; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 10px; + text-decoration: none; +} + +.txt_10_orange:link,.txt_10_orange:visited,.txt_10_orange:active { + color: #FF8800; +} + +.txt_10_orange:hover { + color: darkblue +} + +.txt_11_orange { + color: #FF8800; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 11px; + text-decoration: none; +} + +.txt_11_orange:link,.txt_11_orange:visited,.txt_11_orange:active { + color: #FF8800; +} + +.txt_11_orange:hover { + color: darkblue; +} + +.txt_12_orange { + color: #FF8800; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 12px; + text-decoration: none; +} + +.txt_12_orange:link,.txt_12_orange:visited,.txt_12_orange:active { + color: #FF8800; +} + +.txt_12_orange:hover { + color: darkblue; +} + +.txt_14_orange { + color: #FF8800; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 14px; + text-decoration: none; +} + +.txt_14_orange:link,.txt_14_orange:visited,.txt_14_orange:active { + color: #FF8800; +} + +.txt_14_orange:hover { + color: darkblue; +} + +/*-----------------------------------------------------------------------------------*/ +.txt_10_rouge { + color: red; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 10px; + text-decoration: none; +} + +.txt_10_rouge:link,.txt_10_rouge:visited,.txt_10_rouge:active { + color: red; +} + +.txt_10_rouge:hover { + color: darkblue; +} + +.txt_11_rouge { + color: red; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 11px; + text-decoration: none; +} + +.txt_11_rouge:link,.txt_11_rouge:visited,.txt_11_rouge:active { + color: red; +} + +.txt_11_rouge:hover { + color: darkblue; +} + +.txt_12_rouge { + color: red; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 12px; + text-decoration: none; +} + +.txt_12_rouge:link,.txt_12_rouge:visited,.txt_12_rouge:active { + color: red; +} + +.txt_12_rouge:hover { + color: darkblue; +} + +.txt_14_rouge { + color: red; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 14px; + text-decoration: none; +} + +.txt_14_rouge:link,.txt_14_rouge:visited,.txt_14_rouge:active { + color: red; +} + +.txt_14_rouge:hover { + color: darkblue; +} + +/*-----------------------------------------------------------------------------------*/ +.txt_10_bleu { + color: blue; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 10px; + text-decoration: none; +} + +.txt_10_bleu:link,.txt_10_bleu:visited,.txt_10_bleu:active { + color: blue; +} + +.txt_10_bleu:hover { + color: red; +} + +.txt_11_bleu { + color: blue; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 11px; + text-decoration: none; +} + +.txt_11_bleu:link,.txt_11_bleu:visited,.txt_11_bleu:active { + color: blue; +} + +.txt_11_bleu:hover { + color: red; +} + +.txt_12_bleu { + color: blue; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 12px; + text-decoration: none; +} + +.txt_12_bleu:link,.txt_12_bleu:visited,.txt_12_bleu:active { + color: blue; +} + +.txt_12_bleu:hover { + color: red; +} + +.txt_14_bleu { + color: blue; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 14px; + text-decoration: none; +} + +.txt_14_bleu:link,.txt_14_bleu:visited,.txt_14_bleu:active { + color: blue; +} + +.txt_14_bleu:hover { + color: red; +} + +/*-----------------------------------------------------------------------------------*/ +.txt_10_bleu_f { + color: darkblue; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 10px; + text-decoration: none; +} + +.txt_10_bleu_f:link,.txt_10_bleu_f:visited,.txt_10_bleu_f:active { + color: darkblue; +} + +.txt_10_bleu_f:hover { + color: red; +} + +.txt_11_bleu_f { + color: darkblue; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 11px; + text-decoration: none; +} + +.txt_11_bleu_f:link,.txt_11_bleu_f:visited,.txt_11_bleu_f:active { + color: darkblue; +} + +.txt_11_bleu_f:hover { + color: red; +} + +.txt_12_bleu_f { + color: darkblue; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 12px; + text-decoration: none; +} + +.txt_12_bleu_f:link,.txt_12_bleu_f:visited,.txt_12_bleu_f:active { + color: darkblue; +} + +.txt_12_bleu_f:hover { + color: red; +} + +.txt_14_bleu_f { + color: darkblue; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 14px; + text-decoration: none; +} + +.txt_14_bleu_f:link,.txt_14_bleu_f:visited,.txt_14_bleu_f:active { + color: darkblue; +} + +.txt_14_bleu_f:hover { + color: red; +} + +/*-----------------------------------------------------------------------------------*/ +.txt_10_vert_f { + color: darkgreen; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 10px; + text-decoration: none; +} + +.txt_10_vert_f:link,.txt_10_vert_f:visited,.txt_10_vert_f:active { + color: darkgreen; +} + +.txt_10_vert_f:hover { + color: red; +} + +.txt_11_vert_f { + color: darkgreen; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 11px; + text-decoration: none; +} + +.txt_11_vert_f:link,.txt_11_vert_f:visited,.txt_11_vert_f:active { + color: darkgreen; +} + +.txt_11_vert_f:hover { + color: red; +} + +.txt_12_vert_f { + color: darkgreen; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 12px; + text-decoration: none; +} + +.txt_12_vert_f:link,.txt_12_vertf:visited,.txt_12_vert_f:active { + color: darkgreen; +} + +.txt_12_vert_f:hover { + color: red; +} + +.txt_14_vert_f { + color: darkgreen; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 14px; + text-decoration: none; +} + +.txt_14_vert_f:link,.txt_14_vert_f:visited,.txt_14_vert_f:active { + color: darkgreen; +} + +.txt_14_vert_f:hover { + color: red; +} + +/*-----------------------------------------------------------------------------------*/ +.txt_10_vert { + color: green; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 10px; + text-decoration: none; +} + +.txt_10_vert:link,.txt_10_vert:visited,.txt_10_vert:active { + color: green; +} + +.txt_10_vert:hover { + color: red; +} + +.txt_11_vert { + color: green; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 11px; + text-decoration: none; +} + +.txt_11_vert:link,.txt_11_vert:visited,.txt_11_vert:active { + color: green; +} + +.txt_11_vert:hover { + color: red; +} + +.txt_12_vert { + color: green; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 12px; + text-decoration: none; +} + +.txt_12_vert:link,.txt_12_vert:visited,.txt_12_vert:active { + color: green; +} + +.txt_12_vert:hover { + color: red; +} + +.txt_14_vert { + color: green; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 14px; + text-decoration: none; +} + +.txt_14_vert:link,.txt_14_vert:visited,.txt_14_vert:active { + color: green; +} + +.txt_14_vert:hover { + color: red; +} + +/*-----------------------------------------------------------------------------------*/ +.fond_blanc { + background-color: #FFFFFF; + color: black; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 11px; + text-decoration: none; +} + +.fond_gris_c, .fond_gris_c tr { + background-color: #FFFFFF; + color: black; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 11px; + text-decoration: none; + background-image: url(../images/fond_4.bmp); + background-repeat: repeat-x; +} + +.fond_gris_c2, .fond_gris_c2 tr { + background-color: #FBFBFB; + color: black; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 11px; + text-decoration: none; +} + +.fond_bleu_c, .fond_bleu_c tr { + background-color: #D9EEF9; + color: black; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 11px; + text-decoration: none; + background-image: url(../images/fond_1.bmp); +} + +.fond_bleu_c2 { + background-color: #ECF4FF; + color: black; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 11px; + text-decoration: none; +} + +.fond_bleu_f { + background-color: #003366; + color: black; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 11px; + text-decoration: none; +} + +.fond_orange { + background-color: #FEEFE7; + color: darkgreen; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 12px; + font-weight: bold; + text-decoration: none; + background-image: url(../images/fond_3.jpg); +} + +.fond_orange_2 { + background-color: #FFF8F4; + color: darkgreen; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 12px; + font-weight: bold; + text-decoration: none; + border: 1px solid orange; + border-collapse: collapse; +} + +.vccDlgBody { + border: 3px solid #336699; + border-collapse: collapse; + color: black; + background-color: #EEFFEE; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 11px; + text-decoration: none; +} + +/* DEFINITION DES STYLES DE TABLEAUX */ +.bordure_0 { + border: 0px solid; + color: black; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 11px; + text-decoration: none; +} + +.bordure_1_bleu { + border: 1px solid green; + border-collapse: collapse; + color: black; + background-color: #FFFFFF; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 11px; + text-decoration: none; +} + +.bordure_3_bleu { + border: 3px solid #336699; + border-collapse: collapse; + color: black; + background-color: #FFFFFF; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 11px; + text-decoration: none; +} + +.indent { + margin-left: 20px; +} + +/* DEFINITION DES STYLES D'OBJETS DE FORMULAIRE */ +.Btn { + color: #003366; + text-align: center; + font-weight: bold; + background-color: #FFFFFF; + background-image: url(../images/ongletStyle1.jpg); + background-repeat: no-repeat; + background-position: center center; +} + +.Btn:hover { + color: red; +} + +.menu1h { + background-color: #003366; + color: white; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 10px; + font-weight: bold; + text-decoration: none; + border-top: 1px solid #003366; + border-bottom: 1px solid #003366; + border-left: 1px solid #003366; + border-right: 1px solid white; + border-collapse: collapse; + display: block; +} + +.menu1h:hover { + background-color: white; + color: red; + border: 1px solid darkgreen; + border-collapse: collapse; +} + +.menu1h_f { + background-color: #003366; + color: white; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 10px; + font-weight: bold; + text-decoration: none; + border: 1px solid #003366; + display: block; +} + +.menu1h_f:hover { + background-color: white; + color: red; + border: 1px solid darkgreen; + border-collapse: collapse; +} + +.menu1v { + background-color: #003366; + color: white; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 10px; + font-weight: bold; + text-decoration: none; + border: 1px solid #003366; + border-collapse: collapse; + display: block; +} + +.menu1v:hover { + background-color: white; + color: red; + border: 1px solid darkgreen; + border-collapse: collapse; +} + +.menu2v { + background-color: #5588BB; + color: white; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 12px; + font-weight: bold; + text-decoration: none; + border: 1px solid #4277AB; + border-collapse: collapse; + float: left; + display: block; +} + +.menu2v:hover { + background-color: white; + color: red; + border: 1px solid darkgreen; + border-collapse: collapse; +} + +.menuEDF { + background-color: #003366; + color: white; + font-family: Verdana, Arial, Lucida, Tahoma; + font-size: 10px; + text-decoration: none; +} + +.menuEDF:hover { + color: #FF8800; +} + +/*bouton bleu sur blanc*/ +.Bouton { + color: #003366; + text-align: center; + font-weight: bold; + /* Ricardo cursor: hand; */ + cursor: pointer; + background-color: #FFFFFF; +} + +input { + border: 2px solid green; + color: #003366; + background-color: #FFFFFF; + background-image: url(../images/fond_4.bmp); + background-repeat: repeat-x; +} + +.disabled_input { + border: 1px solid gray; + color: grey; + background-color: #FFFFFF; + background-image: url(../images/fond_4.bmp); + background-repeat: repeat-x; +} + +.input0 { + border: 0px; + color: #003366; + background-color: #FFFFFF; + background-image: url(../images/fond_4.bmp); +} + +.input2 { + border: 1px solid green; + color: #003366; + background-color: #FFFFFF; + background-image: url(../images/fond_4.bmp); + background-repeat: repeat-x; +} + +.input3 { + border: 1px solid black; + color: #003366; + background-color: #EEEEEE; + background-image: url(); +} + +.input4 { + border: 1px solid blue; + color: #003366; + background-color: #FFFFFF; + background-image: url(../images/fond_4.bmp); + background-repeat: repeat-x; +} + +.input5 { + border: 1px solid darkblue; + color: #003366; + background-color: #FFFFFF; + background-image: url(../images/fond_4.bmp); + background-repeat: repeat-x; +} + +.input_btn { + border: 0px; + /* cursor: hand; */ + cursor: pointer; +} + +textarea { + border: 2px solid green; + color: #003366; + background-color: #FFFFFF; + background-image: url(../images/fond_5.bmp); +} + +.TEXTAREA3 { + border: 1px solid green; + color: #003366; + background-color: #FFFFFF; + background-image: url(); +} + +.TEXTAREA4 { + border: 1px solid green; + color: #003366; + background-color: #EEEEEE; + background-image: url(); +} + +.hand { + cursor: hand; + cursor: pointer; +} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/issue62.min.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/issue62.min.css new file mode 100644 index 0000000000..5eb1982282 --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/issue62.min.css @@ -0,0 +1,25 @@ +h1{color:#393;font-family:Verdana,Arial,Lucida,Tahoma;font-size:14px;font-weight:bold;text-decoration:none}h2{color:#393;font-family:Verdana,Arial,Lucida,Tahoma;font-size:12px;font-weight:bold;text-decoration:none}h1,h2,h3,h4,h5{margin:0px;padding:0px}.txt_10_noir{color:black;font-family:Verdana,Arial,Lucida,Tahoma;font-size:10px;text-decoration:none}.txt_10_noir:link,.txt_10_noir:visited,.txt_10_noir:active{color:black}.txt_10_noir:hover{color:red}.txt_11_noir{color:black;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.txt_11_noir:link,.txt_11_noir:visited,.txt_11_noir:active{color:black}.txt_11_noir:hover{color:red}.txt_12_noir{color:black;font-family:Verdana,Arial,Lucida,Tahoma;font-size:12px;text-decoration:none}.txt_12_noir:link,.txt_12_noir:visited,.txt_12_noir:active{color:black}.txt_12_noir:hover{color:red}.txt_14_noir{color:black;font-family:Verdana,Arial,Lucida,Tahoma;font-size:14px;text-decoration:none}.txt_14_noir:link,.txt_14_noir:visited,.txt_14_noir:active{color:black}.txt_14_noir:hover{color:red}.txt_10_gris{color:grey;font-family:Verdana,Arial,Lucida,Tahoma;font-size:10px;text-decoration:none}.txt_10_gris:link,.txt_10_gris:visited,.txt_10_gris:active{color:grey}.txt_10_gris:hover{color:red}.txt_11_gris{color:grey;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.txt_11_gris:link,.txt_11_gris:visited,.txt_11_gris:active{color:grey}.txt_11_gris:hover{color:red}.txt_12_gris{color:grey;font-family:Verdana,Arial,Lucida,Tahoma;font-size:12px;text-decoration:none}.txt_12_gris:link,.txt_12_gris:visited,.txt_12_gris:active{color:grey}.txt_12_gris:hover{color:red}.txt_14_gris{color:grey;font-family:Verdana,Arial,Lucida,Tahoma;font-size:14px;text-decoration:none}.txt_14_gris:link,.txt_14_gris:visited,.txt_14_gris:active{color:grey}.txt_14_gris:hover{color:red}.txt_10_blanc{color:#FFF;font-family:Verdana,Arial,Lucida,Tahoma;font-size:10px;text-decoration:none}.txt_10_blanc:link,.txt_10_blanc:visited,.txt_10_blanc:active{color:#FFF}.txt_10_blanc:hover{color:#F80}.txt_11_blanc{color:#FFF;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.txt_11_blanc:link,.txt_11_blanc:visited,.txt_11_blanc:active{color:#FFF}.txt_11_blanc:hover{color:#F80}.txt_12_blanc{color:#FFF;font-family:Verdana,Arial,Lucida,Tahoma;font-size:12px;text-decoration:none}.txt_12_blanc:link,.txt_12_blanc:visited,.txt_12_blanc:active{color:#FFF}.txt_12_blanc:hover{color:#FA0}.txt_14_blanc{color:#FFF;font-family:Verdana,Arial,Lucida,Tahoma;font-size:14px;text-decoration:none}.txt_14_blanc:link,.txt_14_blanc:visited,.txt_14_blanc:active{color:#FFF}.txt_14_blanc:hover{color:#F80}.txt_10_orange{color:#F80;font-family:Verdana,Arial,Lucida,Tahoma;font-size:10px;text-decoration:none}.txt_10_orange:link,.txt_10_orange:visited,.txt_10_orange:active{color:#F80}.txt_10_orange:hover{color:darkblue}.txt_11_orange{color:#F80;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.txt_11_orange:link,.txt_11_orange:visited,.txt_11_orange:active{color:#F80}.txt_11_orange:hover{color:darkblue}.txt_12_orange{color:#F80;font-family:Verdana,Arial,Lucida,Tahoma;font-size:12px;text-decoration:none}.txt_12_orange:link,.txt_12_orange:visited,.txt_12_orange:active{color:#F80}.txt_12_orange:hover{color:darkblue}.txt_14_orange{color:#F80;font-family:Verdana,Arial,Lucida,Tahoma;font-size:14px;text-decoration:none}.txt_14_orange:link,.txt_14_orange:visited,.txt_14_orange:active{color:#F80}.txt_14_orange:hover{color:darkblue}.txt_10_rouge{color:red;font-family:Verdana,Arial,Lucida,Tahoma;font-size:10px;text-decoration:none}.txt_10_rouge:link,.txt_10_rouge:visited,.txt_10_rouge:active{color:red}.txt_10_rouge:hover{color:darkblue}.txt_11_rouge{color:red;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.txt_11_rouge:link,.txt_11_rouge:visited,.txt_11_rouge:active{color:red}.txt_11_rouge:hover{color:darkblue}.txt_12_rouge{color:red;font-family:Verdana,Arial,Lucida,Tahoma;font-size:12px;text-decoration:none}.txt_12_rouge:link,.txt_12_rouge:visited,.txt_12_rouge:active{color:red}.txt_12_rouge:hover{color:darkblue}.txt_14_rouge{color:red;font-family:Verdana,Arial,Lucida,Tahoma;font-size:14px;text-decoration:none}.txt_14_rouge:link,.txt_14_rouge:visited,.txt_14_rouge:active{color:red}.txt_14_rouge:hover{color:darkblue}.txt_10_bleu{color:blue;font-family:Verdana,Arial,Lucida,Tahoma;font-size:10px;text-decoration:none}.txt_10_bleu:link,.txt_10_bleu:visited,.txt_10_bleu:active{color:blue}.txt_10_bleu:hover{color:red}.txt_11_bleu{color:blue;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.txt_11_bleu:link,.txt_11_bleu:visited,.txt_11_bleu:active{color:blue}.txt_11_bleu:hover{color:red}.txt_12_bleu{color:blue;font-family:Verdana,Arial,Lucida,Tahoma;font-size:12px;text-decoration:none}.txt_12_bleu:link,.txt_12_bleu:visited,.txt_12_bleu:active{color:blue}.txt_12_bleu:hover{color:red}.txt_14_bleu{color:blue;font-family:Verdana,Arial,Lucida,Tahoma;font-size:14px;text-decoration:none}.txt_14_bleu:link,.txt_14_bleu:visited,.txt_14_bleu:active{color:blue}.txt_14_bleu:hover{color:red}.txt_10_bleu_f{color:darkblue;font-family:Verdana,Arial,Lucida,Tahoma;font-size:10px;text-decoration:none}.txt_10_bleu_f:link,.txt_10_bleu_f:visited,.txt_10_bleu_f:active{color:darkblue}.txt_10_bleu_f:hover{color:red}.txt_11_bleu_f{color:darkblue;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.txt_11_bleu_f:link,.txt_11_bleu_f:visited,.txt_11_bleu_f:active{color:darkblue}.txt_11_bleu_f:hover{color:red}.txt_12_bleu_f{color:darkblue;font-family:Verdana,Arial,Lucida,Tahoma;font-size:12px;text-decoration:none}.txt_12_bleu_f:link,.txt_12_bleu_f:visited,.txt_12_bleu_f:active{color:darkblue}.txt_12_bleu_f:hover{color:red}.txt_14_bleu_f{color:darkblue;font-family:Verdana,Arial,Lucida,Tahoma;font-size:14px;text-decoration:none}.txt_14_bleu_f:link,.txt_14_bleu_f:visited,.txt_14_bleu_f:active{color:darkblue}.txt_14_bleu_f:hover{color:red}.txt_10_vert_f{color:darkgreen;font-family:Verdana,Arial,Lucida,Tahoma;font-size:10px;text-decoration:none}.txt_10_vert_f:link,.txt_10_vert_f:visited,.txt_10_vert_f:active{color:darkgreen}.txt_10_vert_f:hover{color:red}.txt_11_vert_f{color:darkgreen;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.txt_11_vert_f:link,.txt_11_vert_f:visited,.txt_11_vert_f:active{color:darkgreen}.txt_11_vert_f:hover{color:red}.txt_12_vert_f{color:darkgreen;font-family:Verdana,Arial,Lucida,Tahoma;font-size:12px;text-decoration:none}.txt_12_vert_f:link,.txt_12_vertf:visited,.txt_12_vert_f:active{color:darkgreen}.txt_12_vert_f:hover{color:red}.txt_14_vert_f{color:darkgreen;font-family:Verdana,Arial,Lucida,Tahoma;font-size:14px;text-decoration:none}.txt_14_vert_f:link,.txt_14_vert_f:visited,.txt_14_vert_f:active{color:darkgreen}.txt_14_vert_f:hover{color:red}.txt_10_vert{color:green;font-family:Verdana,Arial,Lucida,Tahoma;font-size:10px;text-decoration:none}.txt_10_vert:link,.txt_10_vert:visited,.txt_10_vert:active{color:green}.txt_10_vert:hover{color:red}.txt_11_vert{color:green;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.txt_11_vert:link,.txt_11_vert:visited,.txt_11_vert:active{color:green}.txt_11_vert:hover{color:red}.txt_12_vert{color:green;font-family:Verdana,Arial,Lucida,Tahoma;font-size:12px;text-decoration:none}.txt_12_vert:link,.txt_12_vert:visited,.txt_12_vert:active{color:green}.txt_12_vert:hover{color:red}.txt_14_vert{color:green;font-family:Verdana,Arial,Lucida,Tahoma;font-size:14px;text-decoration:none}.txt_14_vert:link,.txt_14_vert:visited,.txt_14_vert:active{color:green}.txt_14_vert:hover{color:red}.fond_blanc{background-color:#FFF;color:black;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.fond_gris_c, .fond_gris_c +tr{background-color:#FFF;color:black;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none;background-image:url(../images/fond_4.bmp);background-repeat:repeat-x}.fond_gris_c2, .fond_gris_c2 +tr{background-color:#FBFBFB;color:black;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.fond_bleu_c, .fond_bleu_c +tr{background-color:#D9EEF9;color:black;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none;background-image:url(../images/fond_1.bmp)}.fond_bleu_c2{background-color:#ECF4FF;color:black;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.fond_bleu_f{background-color:#036;color:black;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.fond_orange{background-color:#FEEFE7;color:darkgreen;font-family:Verdana,Arial,Lucida,Tahoma;font-size:12px;font-weight:bold;text-decoration:none;background-image:url(../images/fond_3.jpg)}.fond_orange_2{background-color:#FFF8F4;color:darkgreen;font-family:Verdana,Arial,Lucida,Tahoma;font-size:12px;font-weight:bold;text-decoration:none;border:1px +solid orange;border-collapse:collapse}.vccDlgBody{border:3px +solid #369;border-collapse:collapse;color:black;background-color:#EFE;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.bordure_0{border:0px +solid;color:black;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.bordure_1_bleu{border:1px +solid green;border-collapse:collapse;color:black;background-color:#FFF;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.bordure_3_bleu{border:3px +solid #369;border-collapse:collapse;color:black;background-color:#FFF;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.indent{margin-left:20px}.Btn{color:#036;text-align:center;font-weight:bold;background-color:#FFF;background-image:url(../images/ongletStyle1.jpg);background-repeat:no-repeat;background-position:center center}.Btn:hover{color:red}.menu1h{background-color:#036;color:white;font-family:Verdana,Arial,Lucida,Tahoma;font-size:10px;font-weight:bold;text-decoration:none;border-top:1px solid #036;border-bottom:1px solid #036;border-left:1px solid #036;border-right:1px solid white;border-collapse:collapse;display:block}.menu1h:hover{background-color:white;color:red;border:1px +solid darkgreen;border-collapse:collapse}.menu1h_f{background-color:#036;color:white;font-family:Verdana,Arial,Lucida,Tahoma;font-size:10px;font-weight:bold;text-decoration:none;border:1px +solid #036;display:block}.menu1h_f:hover{background-color:white;color:red;border:1px +solid darkgreen;border-collapse:collapse}.menu1v{background-color:#036;color:white;font-family:Verdana,Arial,Lucida,Tahoma;font-size:10px;font-weight:bold;text-decoration:none;border:1px +solid #036;border-collapse:collapse;display:block}.menu1v:hover{background-color:white;color:red;border:1px +solid darkgreen;border-collapse:collapse}.menu2v{background-color:#58B;color:white;font-family:Verdana,Arial,Lucida,Tahoma;font-size:12px;font-weight:bold;text-decoration:none;border:1px +solid #4277AB;border-collapse:collapse;float:left;display:block}.menu2v:hover{background-color:white;color:red;border:1px +solid darkgreen;border-collapse:collapse}.menuEDF{background-color:#036;color:white;font-family:Verdana,Arial,Lucida,Tahoma;font-size:10px;text-decoration:none}.menuEDF:hover{color:#F80}.Bouton{color:#036;text-align:center;font-weight:bold;cursor:pointer;background-color:#FFF}input{border:2px +solid green;color:#036;background-color:#FFF;background-image:url(../images/fond_4.bmp);background-repeat:repeat-x}.disabled_input{border:1px +solid gray;color:grey;background-color:#FFF;background-image:url(../images/fond_4.bmp);background-repeat:repeat-x}.input0{border:0px;color:#036;background-color:#FFF;background-image:url(../images/fond_4.bmp)}.input2{border:1px +solid green;color:#036;background-color:#FFF;background-image:url(../images/fond_4.bmp);background-repeat:repeat-x}.input3{border:1px +solid black;color:#036;background-color:#EEE;background-image:url()}.input4{border:1px +solid blue;color:#036;background-color:#FFF;background-image:url(../images/fond_4.bmp);background-repeat:repeat-x}.input5{border:1px +solid darkblue;color:#036;background-color:#FFF;background-image:url(../images/fond_4.bmp);background-repeat:repeat-x}.input_btn{border:0px;cursor:pointer}textarea{border:2px +solid green;color:#036;background-color:#FFF;background-image:url(../images/fond_5.bmp)}.TEXTAREA3{border:1px +solid green;color:#036;background-color:#FFF;background-image:url()}.TEXTAREA4{border:1px +solid green;color:#036;background-color:#EEE;background-image:url()}.hand{cursor:hand;cursor:pointer} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/paths_prepend.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/paths_prepend.css new file mode 100644 index 0000000000..da7cfca20c --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/paths_prepend.css @@ -0,0 +1,12 @@ +@import "foo.css"; +@import 'bar/foo.css' print; +@import '/css/foo.css'; /* abs, should not alter */ +@import 'http://foo.com/css/foo.css'; /* abs, should not alter */ +@import url(../foo.css) tv, projection; +@import url("/css/foo.css"); /* abs, should not alter */ +@import url(/css2/foo.css); /* abs, should not alter */ +@import url(data:image/gif;base64,AAAA); /* data, should not alter */ +foo {background:url('bar/foo.png')} +foo {background:url('http://foo.com/css/foo.css');} /* abs, should not alter */ +foo {background:url("//foo.com/css/foo.css");} /* protocol relative, should not alter */ +foo {background:url(data:image/gif;base64,AAAA);} /* data, should not alter */ \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/paths_prepend.min.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/paths_prepend.min.css new file mode 100644 index 0000000000..ffb94e2165 --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/paths_prepend.min.css @@ -0,0 +1 @@ +@import "../foo.css";@import '../bar/foo.css' print;@import '/css/foo.css';@import 'http://foo.com/css/foo.css';@import url(../../foo.css) tv, projection;@import url("/css/foo.css");@import url(/css2/foo.css);@import url(data:image/gif;base64,AAAA);foo{background:url('../bar/foo.png')}foo{background:url('http://foo.com/css/foo.css')}foo{background:url("//foo.com/css/foo.css")}foo{background:url(data:image/gif;base64,AAAA)} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/paths_rewrite.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/paths_rewrite.css new file mode 100644 index 0000000000..aa41d0a91e --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/paths_rewrite.css @@ -0,0 +1,14 @@ +@import "foo.css"; +@import 'bar/foo.css' print; +@import '../bar/foo.css' print; +@import '../../foo.css' print; +@import '/css/foo.css'; /* abs, should not alter */ +@import 'http://foo.com/css/foo.css'; /* abs, should not alter */ +@import url(../foo.css) tv, projection; +@import url("/css/foo.css"); /* abs, should not alter */ +@import url(/css2/foo.css); /* abs, should not alter */ +@import url(data:image/gif;base64,AAAA); /* data, should not alter */ +foo {background:url('bar/foo.png')} +foo {background:url('http://foo.com/css/foo.css');} /* abs, should not alter */ +foo {background:url("//foo.com/css/foo.css");} /* protocol relative, should not alter */ +foo {background:url(data:image/gif;base64,AAAA);} /* data, should not alter */ \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/paths_rewrite.min.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/paths_rewrite.min.css new file mode 100644 index 0000000000..34936155a0 --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/paths_rewrite.min.css @@ -0,0 +1 @@ +@import "/_test_files/css/foo.css";@import '/_test_files/css/bar/foo.css' print;@import '/_test_files/bar/foo.css' print;@import '/foo.css' print;@import '/css/foo.css';@import 'http://foo.com/css/foo.css';@import url(/_test_files/foo.css) tv, projection;@import url("/css/foo.css");@import url(/css2/foo.css);@import url(data:image/gif;base64,AAAA);foo{background:url('/_test_files/css/bar/foo.png')}foo{background:url('http://foo.com/css/foo.css')}foo{background:url("//foo.com/css/foo.css")}foo{background:url(data:image/gif;base64,AAAA)} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/readme.txt b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/readme.txt new file mode 100644 index 0000000000..0181755296 --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/readme.txt @@ -0,0 +1 @@ +Test suite from http://search.cpan.org/~gtermars/CSS-Minifier-XS/ \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/selectors.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/selectors.css new file mode 100644 index 0000000000..d74c9aa02a --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/selectors.css @@ -0,0 +1,42 @@ +/* http://www.w3.org/TR/css3-selectors/ */ + +* +E[foo] +E[foo="bar"] +E[foo~="bar"] +E[foo^="bar"] +E[foo$="bar"] +E[foo*="bar"] +E[hreflang|="en"] +E:root +E:nth-child(n) +E:nth-last-child(n) +E:nth-of-type(n) +E:nth-last-of-type(n) +E:first-child +E:last-child +E:first-of-type +E:last-of-type +E:only-child +E:only-of-type +E:empty +E:link +E:visited +E:active +E:hover +E:focus +E:target +E:lang(fr) +E:enabled +E:disabled +E:checked +E::first-line +E::first-letter +E::selection +E::before +E::after +E.warning#myid +E:not(s) + > F + + F + ~ F {color: red;} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/selectors.min.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/selectors.min.css new file mode 100644 index 0000000000..643089fcf7 --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/selectors.min.css @@ -0,0 +1,37 @@ +* +E[foo] +E[foo="bar"] +E[foo~="bar"] +E[foo^="bar"] +E[foo$="bar"] +E[foo*="bar"] +E[hreflang|="en"] +E:root +E:nth-child(n) +E:nth-last-child(n) +E:nth-of-type(n) +E:nth-last-of-type(n) +E:first-child +E:last-child +E:first-of-type +E:last-of-type +E:only-child +E:only-of-type +E:empty +E:link +E:visited +E:active +E:hover +E:focus +E:target +E:lang(fr) +E:enabled +E:disabled +E:checked +E::first-line +E::first-letter +E::selection +E::before +E::after +E.warning#myid +E:not(s)>F+F~F{color:red} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/styles.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/styles.css new file mode 100644 index 0000000000..bf46c0af0e --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/styles.css @@ -0,0 +1,31 @@ +/* some CSS to try to exercise things in general */ + +@import url( /more.css ); + + body, td, th { + font-family: Verdana , "Bitstream Vera Sans" , sans-serif ; + + font-size : 12px; +} + +.nav { + margin-left: 20%; +} +#main-nav { + background-color: red; + border: 1px solid #00ff77; +} + +div#content +h1 + p { + padding-top: 0; + margin-top: 0; +} + +@media all and (min-width: 640px) { + #media-queries-1 { background-color: #0f0; } +} + +@media screen and (max-width: 2000px) { + #media-queries-2 { background-color: #0f0; } +} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/styles.min.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/styles.min.css new file mode 100644 index 0000000000..a823b0550f --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/styles.min.css @@ -0,0 +1,3 @@ +@import url(/more.css);body,td,th{font-family:Verdana,"Bitstream Vera Sans",sans-serif;font-size:12px}.nav{margin-left:20%}#main-nav{background-color:red;border:1px +solid #0f7}div#content +h1+p{padding-top:0;margin-top:0}@media all and (min-width: 640px){#media-queries-1{background-color:#0f0}}@media screen and (max-width: 2000px){#media-queries-2{background-color:#0f0}} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/subsilver.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/subsilver.css new file mode 100644 index 0000000000..79d34ec4a8 --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/subsilver.css @@ -0,0 +1,434 @@ +/* Based on the original Style Sheet for the fisubsilver v2 Theme for phpBB version 2+ +Edited by Daz - http://www.forumimages.com - last updated 26-06-03 */ +/* The content of the posts (body of text) */ +/* General page style */ + + + + /* begin suggest post */ + .float-l{ + float: left; + } + + .form-suggest{ + height:200px; + background:#DEE2D0; + vertical-align: top; + } + + .form-input input{ + font-size: 10px; + } + + .hide{ + display:none; + } + + .form-input textarea{ + font-size: 11px; + width: 350px; + } + + .form-label{ + font-size: 10px; + font-weight: bold; + line-height: 25px; + padding-right: 10px; + text-align: right; + width: 100px; + color: #39738F; + } + + .font-9{ + font-size: 9px; + } + + .form-topic{ + font-weight:bold; + + } + + .form-error{ + color:red; + } + + .inline{ + display: inline; + } + + .space-10{ + clear: both; + font-size: 10px; + height: 10px; + line-height: 10px; + } + + .suggest-success{ + color:green; + padding-left:10px; + font-size:11px; + font-weight:bold; + } + + .top{ + vertical-align: top; + } + /* end suggest post */ + +table td{ + padding:3px; +} + +a:link,a:active,a:visited,a.postlink{ + color: #006699; + text-decoration: none; +} + +a:hover{ + color: #DD6900; +} + +a.admin:hover,a.mod:hover{ + color: #DD6900; +} + +a.but,a.but:hover,a.but:visited{ + color: #000000; + text-decoration: none; +} + +a.topictitle:visited{ + color: #5493B4; +} + +a.topictitle:hover{ + color: #DD6900; +} + + + +body{ + color: #000000; + font: 11px Verdana,Arial,Helvetica,sans-serif; + margin: 0 10px 10px 10px; + padding: 0; + overflow:auto; +} + +/* General font families for common tags */ +font,th,td,p{ + font: 12px Verdana,Arial,Helvetica,sans-serif; +} + +/* Form elements */ +form{ + display: inline; +} + +hr{ + border: 0px solid #FFFFFF; + border-top-width: 1px; + height: 0px; +} + +/* Gets rid of the need for border="0" on hyperlinked images */ +img{ + border: 0 solid; +} + +input{ + font: 11px Verdana,Arial,Helvetica,sans-serif; +} + +input.button,input.liteoption,.fakebut{ + background: #FAFAFA; + border: 1px solid #000000; + font-size: 11px; +} + +input.catbutton{ + background: #FAFAFA; + border: 1px solid #000000; + font-size: 10px; +} + +input.mainoption{ + background: #FAFAFA; + border: 1px solid #000000; + font-size: 11px; + font-weight: bold; +} + +input.post,textarea.post{ + background: #FFFFFF; + border: 1px solid #000000; + font: 11px Verdana,Arial,Helvetica,sans-serif; + padding-bottom: 2px; + padding-left: 2px; +} + +select{ + background: #FFFFFF; + font: 11px Verdana,Arial,Helvetica,sans-serif; +} + +table{ + text-align: left; +} + +td{ + vertical-align: middle; +} + +/* Category gradients*/ +td.cat{ + background-color: #C2C6BA; + font-weight: bold; + height: 20px; + letter-spacing: 1px; + text-indent: 4px; +} + +td.genmed,.genmed{ + font-size: 11px; +} + +/* This is for the table cell above the Topics,Post & Last posts on the index.php */ +td.rowpic{ + background: #C2C6BA; +} + +td.spacerow{ + background: #E5E6E2; +} + +/* Table Header cells */ +th{ + background-color: #FADD31; + background-image: url(images/cellpic3.gif); + background-repeat: repeat-x; + color: #68685E; + font-size: 11px; + font-weight: bold; + line-height:16px; + height: 16px; + padding-left: 8px; + padding-right: 8px; + text-align: center; + white-space: nowrap; +} + +/* Admin & Moderator Colours MODification */ +.admin,.mod{ + font-size: 11px; + font-weight: bold; +} + +.admin,a.admin,a.admin:visited{ + color: #FFA34F; +} + +/* This is the border line & background colour round the entire page */ +.bodyline{ + background: #FFFFFF; + border: 1px solid #98AAB1; +} + +.center{ + text-align: center; +} + +/* Code blocks */ +.code{ + background: #FAFAFA; + border: 1px solid #D1D7DC; + color: #006600; + font: 12px Courier,"Courier New",sans-serif; + padding: 5px; +} + +/* This is for the error messages that pop up */ +.errorline{ + background: #E5E6E2; + border: 1px solid #8F8B8B; + color:#D92A2A; +} + +.explaintitle{ + color: #5C81B1; + font-size: 11px; + font-weight: bold; +} + +/* This is the outline round the main forum tables */ +.forumline{ + background: #FFFFFF; +} + +/* General text */ +.gensmall{ + font-size: 10px; +} + +.h1-font{ + color: #006699; + display: inline; + font: bold 13px Verdana, Arial, Helvetica, sans-serif; + margin: 0; + text-decoration: none; +} + +.h2-font{ + display: inline; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 11px; +} + +.height1{ + height: 1px; +} + +.height22{ + height: 22px; +} + +.height25{ + height: 25px; +} + +.height28{ + height: 28px; +} + +.height30{ + height: 30px; +} + +.height40{ + height: 40px; +} + +/* This is the line in the posting page which shows the rollover +help line. Colour value in row2 */ +.helpline{ + border: 0 solid; + font-size: 10px; +} + +.imgfolder{ + margin: 1px 4px 1px 4px; +} + +.imgspace{ + margin-left: 1px; + margin-right: 2px; +} + +/* Specify the space around images */ +.imgtopic,.imgicon{ + margin-left: 3px; +} + +.left{ + text-align: left; +} + +/* The largest text used in the index page title and toptic title etc. */ +.maintitle,h1,h2{ + color: #5C81B1; + font: bold 20px/120% "Trebuchet MS",Verdana,Arial,Helvetica,sans-serif; + text-decoration: none; +} + +.maxwidth{ + width: 100%; +} + +.mod,a.mod,a.mod:visited{ + color: #006600; +} + +/* Name of poster in viewmsg.php and viewtopic.php and other places */ +.name{ + font-size: 11px; + font-weight: bold; +} + +/* Used for the navigation text,(Page 1,2,3 etc) and the navigation bar when in a forum */ +.nav{ + font-size: 11px; + font-weight: bold; +} + +.nowrap{ + white-space: nowrap; +} + +.postbody{ + font-size: 12px; + line-height: 125%; +} + +.postbody a{ + text-decoration: underline; +} + +/* Location,number of posts,post date etc */ +.postdetails{ + color: #00396A; + font-size: 10px; +} + +/* Quote blocks */ +.quote{ + background: #F3F3EF; + border: 1px solid #C2C6BA; + color: #006699; + font-size: 11px; + line-height: 125%; +} + +.right{ + text-align: right; +} + +/* Main table cell colours and backgrounds */ +.row1{ + background: #F0F0EB; +} + +.row2,.helpline{ + background: #E5E6E2; +} + +.row3{ + background: #DBDBD4; +} + +.subtitle,h2{ + font: bold 18px/180% "Trebuchet MS",Verdana,Arial,Helvetica,sans-serif; + text-decoration: none; +} + +/* titles for the topics:could specify viewed link colour too */ +.topictitle { + color: #000000; + font-size: 11px; + font-weight: bold; +} + +.underline{ + text-decoration: underline; +} + +.top{ +vertical-align:top; +} + +.image-hspace{ +margin-right:3px; +} + +.clear{ +clear:both; +} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/subsilver.min.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/subsilver.min.css new file mode 100644 index 0000000000..f59b15a92e --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/subsilver.min.css @@ -0,0 +1,18 @@ +.float-l{float:left}.form-suggest{height:200px;background:#DEE2D0;vertical-align:top}.form-input +input{font-size:10px}.hide{display:none}.form-input +textarea{font-size:11px;width:350px}.form-label{font-size:10px;font-weight:bold;line-height:25px;padding-right:10px;text-align:right;width:100px;color:#39738F}.font-9{font-size:9px}.form-topic{font-weight:bold}.form-error{color:red}.inline{display:inline}.space-10{clear:both;font-size:10px;height:10px;line-height:10px}.suggest-success{color:green;padding-left:10px;font-size:11px;font-weight:bold}.top{vertical-align:top}table +td{padding:3px}a:link,a:active,a:visited,a.postlink{color:#069;text-decoration:none}a:hover{color:#DD6900}a.admin:hover,a.mod:hover{color:#DD6900}a.but,a.but:hover,a.but:visited{color:#000;text-decoration:none}a.topictitle:visited{color:#5493B4}a.topictitle:hover{color:#DD6900}body{color:#000;font:11px Verdana,Arial,Helvetica,sans-serif;margin:0 +10px 10px 10px;padding:0;overflow:auto}font,th,td,p{font:12px Verdana,Arial,Helvetica,sans-serif}form{display:inline}hr{border:0px +solid #FFF;border-top-width:1px;height:0px}img{border:0 +solid}input{font:11px Verdana,Arial,Helvetica,sans-serif}input.button,input.liteoption,.fakebut{background:#FAFAFA;border:1px +solid #000;font-size:11px}input.catbutton{background:#FAFAFA;border:1px +solid #000;font-size:10px}input.mainoption{background:#FAFAFA;border:1px +solid #000;font-size:11px;font-weight:bold}input.post,textarea.post{background:#FFF;border:1px +solid #000;font:11px Verdana,Arial,Helvetica,sans-serif;padding-bottom:2px;padding-left:2px}select{background:#FFF;font:11px Verdana,Arial,Helvetica,sans-serif}table{text-align:left}td{vertical-align:middle}td.cat{background-color:#C2C6BA;font-weight:bold;height:20px;letter-spacing:1px;text-indent:4px}td.genmed,.genmed{font-size:11px}td.rowpic{background:#C2C6BA}td.spacerow{background:#E5E6E2}th{background-color:#FADD31;background-image:url(images/cellpic3.gif);background-repeat:repeat-x;color:#68685E;font-size:11px;font-weight:bold;line-height:16px;height:16px;padding-left:8px;padding-right:8px;text-align:center;white-space:nowrap}.admin,.mod{font-size:11px;font-weight:bold}.admin,a.admin,a.admin:visited{color:#FFA34F}.bodyline{background:#FFF;border:1px +solid #98AAB1}.center{text-align:center}.code{background:#FAFAFA;border:1px +solid #D1D7DC;color:#060;font:12px Courier,"Courier New",sans-serif;padding:5px}.errorline{background:#E5E6E2;border:1px +solid #8F8B8B;color:#D92A2A}.explaintitle{color:#5C81B1;font-size:11px;font-weight:bold}.forumline{background:#FFF}.gensmall{font-size:10px}.h1-font{color:#069;display:inline;font:bold 13px Verdana,Arial,Helvetica,sans-serif;margin:0;text-decoration:none}.h2-font{display:inline;font-family:Verdana,Arial,Helvetica,sans-serif;font-size:11px}.height1{height:1px}.height22{height:22px}.height25{height:25px}.height28{height:28px}.height30{height:30px}.height40{height:40px}.helpline{border:0 +solid;font-size:10px}.imgfolder{margin:1px +4px 1px 4px}.imgspace{margin-left:1px;margin-right:2px}.imgtopic,.imgicon{margin-left:3px}.left{text-align:left}.maintitle,h1,h2{color:#5C81B1;font:bold 20px/120% "Trebuchet MS",Verdana,Arial,Helvetica,sans-serif;text-decoration:none}.maxwidth{width:100%}.mod,a.mod,a.mod:visited{color:#060}.name{font-size:11px;font-weight:bold}.nav{font-size:11px;font-weight:bold}.nowrap{white-space:nowrap}.postbody{font-size:12px;line-height:125%}.postbody +a{text-decoration:underline}.postdetails{color:#00396A;font-size:10px}.quote{background:#F3F3EF;border:1px +solid #C2C6BA;color:#069;font-size:11px;line-height:125%}.right{text-align:right}.row1{background:#F0F0EB}.row2,.helpline{background:#E5E6E2}.row3{background:#DBDBD4}.subtitle,h2{font:bold 18px/180% "Trebuchet MS",Verdana,Arial,Helvetica,sans-serif;text-decoration:none}.topictitle{color:#000;font-size:11px;font-weight:bold}.underline{text-decoration:underline}.top{vertical-align:top}.image-hspace{margin-right:3px}.clear{clear:both} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/unusual_strings.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/unusual_strings.css new file mode 100644 index 0000000000..69fa756eb9 --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/unusual_strings.css @@ -0,0 +1,10 @@ +/* test unusual, but valid strings in CSS */ + +foo[attr="multiple spaces"] { + content: "Hello World!"; +} + +foo[attr="Hel\ +lo"] { + content: " \"World\""; +} diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/unusual_strings.min.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/unusual_strings.min.css new file mode 100644 index 0000000000..4b7d97e455 --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/unusual_strings.min.css @@ -0,0 +1,2 @@ +foo[attr="multiple spaces"]{content:"Hello World!"}foo[attr="Hel\ +lo"]{content:" \"World\""} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/vladmirated.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/vladmirated.css new file mode 100644 index 0000000000..819835e582 --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/vladmirated.css @@ -0,0 +1,658 @@ +/* from http://www.vladimirated.com/web-development-minify-css-using-php-and-cssmin-class */ + + #comments_inviter #close_me { + clear: both; + text-align: center; + border-top: 1px solid #eeeeee; + padding-top: 10px; + } + + #comments_inviter #close_me span { + color: #108eed; + cursor: pointer; + font-weight: bold; + } + + #comments_inviter img { + float: left; + margin-right: 3px; + margin-bottom: 10px; + } + + #comments_inviter { + width: 200px; + background-color: #FFFFFF; + border: 4px solid #eeeeee; + font-size: 10px; + font-family: verdana; + padding: 10px; + color: #333333; + } + + .one_com { + background-color: #FAFAFA; + padding: 10px; + margin-bottom: 20px; + border: 1px solid #EEEEEE; + } + + .one_com .com_says, .one_com .com_det { + text-transform: lowercase; + color: #333333; + padding: 0px; + font-family: verdana; + margin: 0px; + font-size: 13px; + font-weight: bold; + } + + .flvPlayer { + text-align: center; + border: 5px solid #dddddd; + width: 320px; + } + + .one_com .com_det { + font-size: 10px; + font-weight: normal; + margin-bottom: 20px; + padding-bottom: 10px; + border-bottom: 8px solid #eeeeee; + } + + .one_com .com_det a { + text-decoration: none; + } + + .one_com .com_txt { + background-color: #ffffff; + margin-bottom: 10px; + border-bottom: 2px solid #eeeeee + } + + .one_com .com_txt p { + font-family: verdana; + font-size: 13px; + color: #777777; + margin: 0px; + padding: 5px; + padding-bottom: 10px; + text-transform: lowercase; + } + + .one_com .com_says a { + color: #333333; + } + + .one_com .com_det a { + color: #333333; + } + + .post_box .related_posts { + + } + + .post_box .related_posts p { + padding: 0px; + margin: 0px; + padding-bottom: 20px; + padding-left: 35px; + font-family: verdana; + + } + + .post_box .related_posts a { + color: #108eed; + } + + .post_nav_2 p { + + text-align: center; + color: #cccccc; + font-family: verdana; + } + + .post_box .related_posts h3, #comments_box #respond, .comments_posted h3 { + padding: 0px; + margin: 0px; + font-size: 18px; + color: #FF8000; + padding-top: 30px; + margin-bottom: 20px; + width: 300px; + border-bottom: 5px solid #e0e0e0; + } + + .comments_posted { + + margin-bottom: 50px; + + } + + .comments_posted h3 { + padding: 0px; + margin: 0px; + margin-bottom: 20px; + + } + + .cmt_txtarea { + width: 300px; + height: 100px; + + } + + #comments_box #respond { + + padding-top: 0px; + margin-bottom: 0px; + + } + + .pagetitle { + color: #65DA33; + text-align: center; + } + + #searchform { + padding: 0px; + margin: 0px; + } + + .si { + background-color: #FFFFEE; + border: 1px solid #e0e0e0; + } + + #rightcol #r_news, #rightcol #linksbro, #rightcol #quick_tags { + margin-top: 30px; + padding-bottom: 10px; + } + + #post_nav p { + padding: 0px; + margin: 0px; + padding-bottom: 5px; + } + + #post_nav { + text-align: left; + padding-bottom: 15px; + } + + #post_nav a, .post_nav_2 p a { + text-decoration: none; + font-family: Verdana; + font-size: 12px; + color: #108eed; + } + + #post_nav a:hover, .post_nav_2 p a:hover { + text-decoration: underline; + color: #FF8000; + } + + #rightcol #about { + padding-bottom: 10px; + } + + #rightcol #r_news input { + color: #333333; + font-size: 12px; + } + + #header { + height: 200px; + width: 100%; + background-image: url('images/header_bg.jpg'); + background-repeat: x-repeat; + } + + #header img { + + float: right; + margin-right: -3px; + z-index: 100; + + } + + .tags { + text-transform: lowercase; + color: #333333; + font-family: arial; + font-size: 12px; + border-top: 2px dotted #EEEEEE; + width: 300px; + padding-top: 20px; + padding-bottom: 0px; + margin-top: 0px; + padding-left: 20px; + padding-right: 20px; + } + + .tags a { + color: #108eed; + } + + .tags p { + text-align: left; + margin: 0px; + padding: 0px; + } + + blockquote strong { + font-family: verdana; + display: block; + margin-top: 10px; + color: #FF0000; + font-style: italic; + text-align: right; + } + + blockquote { + margin: 0px; + background-color: #eeeeee; + border: 2px solid #dddddd; + padding: 24px; + padding-top: 10px; + padding-left: 60px; + padding-bottom: 10px; + font-size: 13px; + color: #333333; + margin-bottom: 30px; + margin-top: 10px; + } + + + html>body #header img { margin-right: 0px; } + + #subscribe h3 { + color: #ff0000; + margin-top: 30px; + padding: 20px; + } + + .post_actions a{ + color: #108eed; + } + + .post_actions { + border-top: 4px solid #DDDDDD; + border-bottom: 1px solid #EEEEEE; + text-align: center; + background-color: #FFFFDd; + color: #dddddd; + white-space: no-wrap; + padding-left: 20px; + padding-bottom: 5px; + text-transform: capitalize; + } + + #subscribe td { + color: #333333; + font-size: 12px; + text-transform: lowercase; + } + + #subscribe input { + font-size: 13px; + color: #333333; + } + + .post_content { + font-size: 13px; + margin-top: 10px; + padding-bottom: 10px; + text-align: justify; + font-family: verdana; + } + + .post_content p { + margin: 0px; + padding: 0px; + padding-bottom: 20px; + line-height: 20px; + } + + #header h1 { + z-index: 200; + margin: 0px; + position: absolute; + float: left; + text-transform: lowercase; + padding: 0px; + font-size: 45px; + margin-top: 70px; + margin-left: 40px; + + } + + #header h1 a { + white-space: no-wrap; + text-decoration: none; + color: #FAFAFA; + display: block + } + + #header h1 a:hover { + color: #FAFAFA; + border-bottom: 3px dotted #FAFAFA; + } + + html>body #header h1 { margin-left: 60px; } + + body { + margin: 0px; + padding: 0px; + height: 100%; + width: 100%; + font-family: 'Lucida Sans Unicode', 'Lucida Grande', Sans-Serif, Verdana, Arial; + font-size: 12px; + } + + #leftcol { + float: left; + width: 200px; + margin-left: 0px; + margin-top: 17px; + color: #000; + padding: 3px; + height: 100%; + } + + #leftcol .box_head h3 { + text-transform: uppercase; + padding: 0px; + margin: 0px; + font-family: georgia; + font-size: 18px; + color: #dddddd; + border-top: 4px solid #dddddd; + border-bottom: 4px solid #cccccc; + padding-left: 10px; + padding-top: 10px; + padding-bottom: 10px; + background-image: url('images/stripesbg.png'); + margin-bottom: 10px; + } + + #leftcol .box_head input { + text-transform: lowercase; + color: #333333; + } + + #leftcol .box_head { + margin-left: 7px; + background-color: #ffefd4; + border-bottom: 2px solid #eeeeee; + padding-bottom: 20px; + margin-bottom: 30px; + } + + #leftcol .box_head p a { + color: #0a2d4d; + display: block; + text-decoration: none; + border-bottom: 3px solid #fefefe; + padding-top: 20px; + text-transform: lowercase; + padding-bottom: 20px; + padding-left: 5px; + padding-right: 5px; + } + + #leftcol .box_head p a:hover { + background-color: #fafafa; + border-bottom: 3px solid #eeeeee; + color: #000000; + } + + #leftcol .box_head p { + text-align: left; + margin: 0px; + width: 170px; + padding-bottom: 0px; + padding-top: 0px; + font-size: 11px; + } + + #rightcol { + position: absolute; + left: 77%; + top: 278px; + border: 3px solid #eeeeee; + width: 200px; + z-index: 3; + color: #333333; + padding: 10px; + text-transform: lowercase; + + } + + #rightcol p { + padding: 0px; + marging: 0px; + text-align: justify; + } + + #rightcol #about img, #rightcol #linksbro img { + border: 5px solid #eeeeee; + } + + #rightcol #about h3, #rightcol #r_news h3, #rightcol #linksbro h3, #rightcol #quick_tags h3 { + background-color: #fafafa; + border: 1px dotted #e0e0e0; + font-size: 14px; + color: #104bbc; + padding: 5px; + padding-top: 10px; + font-family: Arial; + padding-bottom: 10px; + } + + #rightcol #about p a, #rightcol #r_news p a, #rightcol #linksbro p a { + color: #108eed; + } + + #rightcol #about p, #rightcol #r_news p, #rightcol #linksbro p { + font-size: 12px; + text-align: left; + } + + #content_warp { + margin: 20px 25% 0 215px; + padding: 3px; + color: #000; + background-color: #ededed; + } + + #content { + margin: 5px; + background-color: #FFFFFF; + padding: 10px; + } + + + #footer { + width: 99%; + margin-top: 30px; + height: 98px; + background-color: #101b1d; + } + + #footer td a { + color: #FF8000; + } + + #footer td a img { + border: 2px solid #108eed; + } + + #footer td p { + font-family: Verdana; + font-size: 10px; + color: #c0c0c0; + padding: 0px; + margin: 0px; + text-align: center; + padding-bottom: 10px; + } + + .s_offer { + color: #65DA33; + font-size: 20px; + font-weight: bold; + font-style: normal; + } + + .post_box { + text-transform: lowercase; + margin-bottom: 40px; + } + + #newsletter_box { + text-transform: lowercase; + margin-bottom: 10px; + margin-top: 30px; + font-style: normal; + background-color: #ffffff; + border: 5px solid #dddddd; + } + + #newsletter_head { + color: #EEEEEE; + font-family: Georgia; + background-image: url('images/stripesbg.png'); + padding: 10px; + padding-left: 30px; + border-bottom: 5px solid #dddddd; + } + + #newsletter_body { + color: #333333; + font-family: Verdana; + text-align: justify; + background-color: #FFFFFF; + padding: 10px; + font-size: 13px; + } + + .s_offer { + color: #65DA33; + font-size: 26px; + font-weight: bold; + font-style: normal; + } + + .post_title a { + color: #EEEEEE; + text-decoration: none; + } + + .post_title a:hover { + color: #c0c0c0; + } + + .post_title { + background-image: url('images/stripe_post.png'); + text-transform: uppercase; + font-size: 18px; + font-family: georgia; + padding: 10px; + border-top: 4px solid #c0c0c0; + margin: 0px; + border-bottom: 2px solid #ffffdd; + } + + .post_det { + text-transform: none; + margin: 0px; + border-top: 1px solid #f0f0f0; + padding: 0px; + padding-top: 5px; + color: #999999; + font-size: 10px; + font-family: verdana; + margin-bottom: 20px; + background-color: #eeeeee; + padding-bottom: 5px; + padding-left: 10px; + text-align: left; + border-bottom: 2px solid #dddddd; + } + + .post_det a { + color: #999999; + text-decoration: none; + } + + + .subtle { + text-transform: lowercase; + font-size: 10px; + font-family: verdana; + color: #108eed; + text-align: justify; + } + + #top_menu #navlist, #top_menu #navlist li { + padding:0px; + margin: 0px; + padding-top: 14px; + text-transform: lowercase; + padding-bottom: 17px; + padding-left: 30px; + border-left: 1px solid #65cdef; + } + + #top_menu #navlist, #top_menu #navlist li #first { + + border-left: 0px; + + } + + #top_menu #navlist { + padding-left: 30px; + background-color: #1dabd9; + border-top: 5px solid #0e96c3; + border-bottom: 5px solid #0e96c3; + } + + #top_menu #navlist li { + color: #444444; + font-size: 10px; + display: inline; + list-style-type: none; + padding-right: 30px; + } + + #top_menu #navlist li a { + text-decoration: none; + font-family: Verdana; + color: #fafafa; + font-size: 12px; + font-weight: bold; + } + + #top_menu #navlist li a:hover { + color: #333333; + } + + .post_content a { + color: #108eed; + } + + ul#tagcloud { padding:0; margin:0; text-align:center; list-style:none; } + ul#tagcloud li { display:inline; font-size:70%; color:#ccc; background: none; padding: 0;} + ul#tagcloud li a, ul#tagcloud li a:link { text-decoration:none; } + ul#tagcloud li a:hover { text-decoration:underline; } + ul#tagcloud li.t1 a { color:#797979; font-size: 120%; } + ul#tagcloud li.t2 a { color:#6d6d6d; font-size: 160%; } + ul#tagcloud li.t3 a { color:#616161; font-size: 190%; } + ul#tagcloud li.t4 a { color:#555555; font-size: 210%; } + ul#tagcloud li.t5 a { color:#484848; font-size: 230%; } + ul#tagcloud li.t6 a { color:#3c3c3c; font-size: 250%; } + ul#tagcloud li.t7 a { color:#303030; font-size: 270%; } + ul#tagcloud li.t8 a { color:#242424; font-size: 290%; } + ul#tagcloud li.t9 a { color:#181818; font-size: 310%; } + ul#tagcloud li.t10 a { color:#0c0c0c; font-size: 330%; } \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/vladmirated.min.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/vladmirated.min.css new file mode 100644 index 0000000000..eaffaee38a --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/vladmirated.min.css @@ -0,0 +1,79 @@ +#comments_inviter +#close_me{clear:both;text-align:center;border-top:1px solid #eee;padding-top:10px}#comments_inviter #close_me +span{color:#108eed;cursor:pointer;font-weight:bold}#comments_inviter +img{float:left;margin-right:3px;margin-bottom:10px}#comments_inviter{width:200px;background-color:#FFF;border:4px +solid #eee;font-size:10px;font-family:verdana;padding:10px;color:#333}.one_com{background-color:#FAFAFA;padding:10px;margin-bottom:20px;border:1px +solid #EEE}.one_com .com_says, .one_com +.com_det{text-transform:lowercase;color:#333;padding:0px;font-family:verdana;margin:0px;font-size:13px;font-weight:bold}.flvPlayer{text-align:center;border:5px +solid #ddd;width:320px}.one_com +.com_det{font-size:10px;font-weight:normal;margin-bottom:20px;padding-bottom:10px;border-bottom:8px solid #eee}.one_com .com_det +a{text-decoration:none}.one_com +.com_txt{background-color:#fff;margin-bottom:10px;border-bottom:2px solid #eee}.one_com .com_txt +p{font-family:verdana;font-size:13px;color:#777;margin:0px;padding:5px;padding-bottom:10px;text-transform:lowercase}.one_com .com_says +a{color:#333}.one_com .com_det +a{color:#333}.post_box +.related_posts{}.post_box .related_posts +p{padding:0px;margin:0px;padding-bottom:20px;padding-left:35px;font-family:verdana}.post_box .related_posts +a{color:#108eed}.post_nav_2 +p{text-align:center;color:#ccc;font-family:verdana}.post_box .related_posts h3, #comments_box #respond, .comments_posted +h3{padding:0px;margin:0px;font-size:18px;color:#FF8000;padding-top:30px;margin-bottom:20px;width:300px;border-bottom:5px solid #e0e0e0}.comments_posted{margin-bottom:50px}.comments_posted +h3{padding:0px;margin:0px;margin-bottom:20px}.cmt_txtarea{width:300px;height:100px}#comments_box +#respond{padding-top:0px;margin-bottom:0px}.pagetitle{color:#65DA33;text-align:center}#searchform{padding:0px;margin:0px}.si{background-color:#FFE;border:1px +solid #e0e0e0}#rightcol #r_news, #rightcol #linksbro, #rightcol +#quick_tags{margin-top:30px;padding-bottom:10px}#post_nav +p{padding:0px;margin:0px;padding-bottom:5px}#post_nav{text-align:left;padding-bottom:15px}#post_nav a, .post_nav_2 p +a{text-decoration:none;font-family:Verdana;font-size:12px;color:#108eed}#post_nav a:hover, .post_nav_2 p a:hover{text-decoration:underline;color:#FF8000}#rightcol +#about{padding-bottom:10px}#rightcol #r_news +input{color:#333;font-size:12px}#header{height:200px;width:100%;background-image:url('images/header_bg.jpg');background-repeat:x-repeat}#header +img{float:right;margin-right: -3px;z-index:100}.tags{text-transform:lowercase;color:#333;font-family:arial;font-size:12px;border-top:2px dotted #EEE;width:300px;padding-top:20px;padding-bottom:0px;margin-top:0px;padding-left:20px;padding-right:20px}.tags +a{color:#108eed}.tags +p{text-align:left;margin:0px;padding:0px}blockquote +strong{font-family:verdana;display:block;margin-top:10px;color:#F00;font-style:italic;text-align:right}blockquote{margin:0px;background-color:#eee;border:2px +solid #ddd;padding:24px;padding-top:10px;padding-left:60px;padding-bottom:10px;font-size:13px;color:#333;margin-bottom:30px;margin-top:10px}html>body #header +img{margin-right:0px}#subscribe +h3{color:#f00;margin-top:30px;padding:20px}.post_actions +a{color:#108eed}.post_actions{border-top:4px solid #DDD;border-bottom:1px solid #EEE;text-align:center;background-color:#FFD;color:#ddd;white-space:no-wrap;padding-left:20px;padding-bottom:5px;text-transform:capitalize}#subscribe +td{color:#333;font-size:12px;text-transform:lowercase}#subscribe +input{font-size:13px;color:#333}.post_content{font-size:13px;margin-top:10px;padding-bottom:10px;text-align:justify;font-family:verdana}.post_content +p{margin:0px;padding:0px;padding-bottom:20px;line-height:20px}#header +h1{z-index:200;margin:0px;position:absolute;float:left;text-transform:lowercase;padding:0px;font-size:45px;margin-top:70px;margin-left:40px}#header h1 +a{white-space:no-wrap;text-decoration:none;color:#FAFAFA;display:block}#header h1 a:hover{color:#FAFAFA;border-bottom:3px dotted #FAFAFA}html>body #header +h1{margin-left:60px}body{margin:0px;padding:0px;height:100%;width:100%;font-family:'Lucida Sans Unicode','Lucida Grande',Sans-Serif,Verdana,Arial;font-size:12px}#leftcol{float:left;width:200px;margin-left:0px;margin-top:17px;color:#000;padding:3px;height:100%}#leftcol .box_head +h3{text-transform:uppercase;padding:0px;margin:0px;font-family:georgia;font-size:18px;color:#ddd;border-top:4px solid #ddd;border-bottom:4px solid #ccc;padding-left:10px;padding-top:10px;padding-bottom:10px;background-image:url('images/stripesbg.png');margin-bottom:10px}#leftcol .box_head +input{text-transform:lowercase;color:#333}#leftcol +.box_head{margin-left:7px;background-color:#ffefd4;border-bottom:2px solid #eee;padding-bottom:20px;margin-bottom:30px}#leftcol .box_head p +a{color:#0a2d4d;display:block;text-decoration:none;border-bottom:3px solid #fefefe;padding-top:20px;text-transform:lowercase;padding-bottom:20px;padding-left:5px;padding-right:5px}#leftcol .box_head p a:hover{background-color:#fafafa;border-bottom:3px solid #eee;color:#000}#leftcol .box_head +p{text-align:left;margin:0px;width:170px;padding-bottom:0px;padding-top:0px;font-size:11px}#rightcol{position:absolute;left:77%;top:278px;border:3px +solid #eee;width:200px;z-index:3;color:#333;padding:10px;text-transform:lowercase}#rightcol +p{padding:0px;marging:0px;text-align:justify}#rightcol #about img, #rightcol #linksbro +img{border:5px +solid #eee}#rightcol #about h3, #rightcol #r_news h3, #rightcol #linksbro h3, #rightcol #quick_tags +h3{background-color:#fafafa;border:1px +dotted #e0e0e0;font-size:14px;color:#104bbc;padding:5px;padding-top:10px;font-family:Arial;padding-bottom:10px}#rightcol #about p a, #rightcol #r_news p a, #rightcol #linksbro p +a{color:#108eed}#rightcol #about p, #rightcol #r_news p, #rightcol #linksbro +p{font-size:12px;text-align:left}#content_warp{margin:20px +25% 0 215px;padding:3px;color:#000;background-color:#ededed}#content{margin:5px;background-color:#FFF;padding:10px}#footer{width:99%;margin-top:30px;height:98px;background-color:#101b1d}#footer td +a{color:#FF8000}#footer td a +img{border:2px +solid #108eed}#footer td +p{font-family:Verdana;font-size:10px;color:#c0c0c0;padding:0px;margin:0px;text-align:center;padding-bottom:10px}.s_offer{color:#65DA33;font-size:20px;font-weight:bold;font-style:normal}.post_box{text-transform:lowercase;margin-bottom:40px}#newsletter_box{text-transform:lowercase;margin-bottom:10px;margin-top:30px;font-style:normal;background-color:#fff;border:5px +solid #ddd}#newsletter_head{color:#EEE;font-family:Georgia;background-image:url('images/stripesbg.png');padding:10px;padding-left:30px;border-bottom:5px solid #ddd}#newsletter_body{color:#333;font-family:Verdana;text-align:justify;background-color:#FFF;padding:10px;font-size:13px}.s_offer{color:#65DA33;font-size:26px;font-weight:bold;font-style:normal}.post_title +a{color:#EEE;text-decoration:none}.post_title a:hover{color:#c0c0c0}.post_title{background-image:url('images/stripe_post.png');text-transform:uppercase;font-size:18px;font-family:georgia;padding:10px;border-top:4px solid #c0c0c0;margin:0px;border-bottom:2px solid #ffd}.post_det{text-transform:none;margin:0px;border-top:1px solid #f0f0f0;padding:0px;padding-top:5px;color:#999;font-size:10px;font-family:verdana;margin-bottom:20px;background-color:#eee;padding-bottom:5px;padding-left:10px;text-align:left;border-bottom:2px solid #ddd}.post_det +a{color:#999;text-decoration:none}.subtle{text-transform:lowercase;font-size:10px;font-family:verdana;color:#108eed;text-align:justify}#top_menu #navlist, #top_menu #navlist +li{padding:0px;margin:0px;padding-top:14px;text-transform:lowercase;padding-bottom:17px;padding-left:30px;border-left:1px solid #65cdef}#top_menu #navlist, #top_menu #navlist li +#first{border-left:0px}#top_menu +#navlist{padding-left:30px;background-color:#1dabd9;border-top:5px solid #0e96c3;border-bottom:5px solid #0e96c3}#top_menu #navlist +li{color:#444;font-size:10px;display:inline;list-style-type:none;padding-right:30px}#top_menu #navlist li +a{text-decoration:none;font-family:Verdana;color:#fafafa;font-size:12px;font-weight:bold}#top_menu #navlist li a:hover{color:#333}.post_content +a{color:#108eed}ul#tagcloud{padding:0;margin:0;text-align:center;list-style:none}ul#tagcloud +li{display:inline;font-size:70%;color:#ccc;background:none;padding:0}ul#tagcloud li a, ul#tagcloud li a:link{text-decoration:none}ul#tagcloud li a:hover{text-decoration:underline}ul#tagcloud li.t1 +a{color:#797979;font-size:120%}ul#tagcloud li.t2 +a{color:#6d6d6d;font-size:160%}ul#tagcloud li.t3 +a{color:#616161;font-size:190%}ul#tagcloud li.t4 +a{color:#555;font-size:210%}ul#tagcloud li.t5 +a{color:#484848;font-size:230%}ul#tagcloud li.t6 +a{color:#3c3c3c;font-size:250%}ul#tagcloud li.t7 +a{color:#303030;font-size:270%}ul#tagcloud li.t8 +a{color:#242424;font-size:290%}ul#tagcloud li.t9 +a{color:#181818;font-size:310%}ul#tagcloud li.t10 +a{color:#0c0c0c;font-size:330%} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css_uriRewriter/exp.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css_uriRewriter/exp.css new file mode 100644 index 0000000000..d749295b77 --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css_uriRewriter/exp.css @@ -0,0 +1,14 @@ +@import "/_test_files/css_uriRewriter/foo.css"; +@import '/_test_files/css_uriRewriter/bar/foo.css' print; +@import '/_test_files/bar/foo.css' print; +@import '/foo.css' print; +@import '/css/foo.css'; /* abs, should not alter */ +@import 'http://foo.com/css/foo.css'; /* abs, should not alter */ +@import url(/_test_files/foo.css) tv, projection; +@import url("/css/foo.css"); /* abs, should not alter */ +@import url(/css2/foo.css); /* abs, should not alter */ +@import url(data:image/gif;base64,AAAA); /* data, should not alter */ +foo {background:url('/_test_files/css_uriRewriter/bar/foo.png')} +foo {background:url('http://foo.com/css/foo.css');} /* abs, should not alter */ +foo {background:url("//foo.com/css/foo.css");} /* protocol relative, should not alter */ +foo {background:url(data:image/gif;base64,AAAA);} /* data, should not alter */ \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css_uriRewriter/in.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css_uriRewriter/in.css new file mode 100644 index 0000000000..aa41d0a91e --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css_uriRewriter/in.css @@ -0,0 +1,14 @@ +@import "foo.css"; +@import 'bar/foo.css' print; +@import '../bar/foo.css' print; +@import '../../foo.css' print; +@import '/css/foo.css'; /* abs, should not alter */ +@import 'http://foo.com/css/foo.css'; /* abs, should not alter */ +@import url(../foo.css) tv, projection; +@import url("/css/foo.css"); /* abs, should not alter */ +@import url(/css2/foo.css); /* abs, should not alter */ +@import url(data:image/gif;base64,AAAA); /* data, should not alter */ +foo {background:url('bar/foo.png')} +foo {background:url('http://foo.com/css/foo.css');} /* abs, should not alter */ +foo {background:url("//foo.com/css/foo.css");} /* protocol relative, should not alter */ +foo {background:url(data:image/gif;base64,AAAA);} /* data, should not alter */ \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/html/before.html b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/html/before.html new file mode 100644 index 0000000000..c22cc8f20d --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/html/before.html @@ -0,0 +1,96 @@ + + + + + + + + + + + css Zen Garden: The Beauty in CSS Design + + + + + + + + + + + + +

    Browser != IE

    +
    + + 
    +	White  space  is  important   here!
+
    +
    +

    A demonstration of what can be accomplished visually through CSS-based design. Select any style sheet from the list to load it into this page.

    +

    Download the sample html file and css file

    +
    + +
    + + \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/html/before.min.html b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/html/before.min.html new file mode 100644 index 0000000000..58ba2bb988 --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/html/before.min.html @@ -0,0 +1,36 @@ +css Zen Garden: The Beauty in CSS Design

    Browser != IE

    css Zen Garden

    The Beauty of CSS Design

    +	White  space  is  important   here!
+

    A demonstration of what can be accomplished visually through CSS-based design. Select any style sheet from the list to load it into this page.

    Download the sample html file and css file

    \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/html/before2.html b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/html/before2.html new file mode 100644 index 0000000000..4ca7f199e1 --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/html/before2.html @@ -0,0 +1,95 @@ + + + + + + + + + + + css Zen Garden: The Beauty in CSS Design + + + + + + + + + + + + +

    Browser != IE

    +
    + + 
    +	White  space  is  important   here!
+
    +
    +

    A demonstration of what can be accomplished visually through CSS-based design. Select any style sheet from the list to load it into this page.

    +

    Download the sample html file and css file

    +
    + +Preserve at least 1 char of whitespace near scripts in case of document.write(). +
    + + \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/html/before2.min.html b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/html/before2.min.html new file mode 100644 index 0000000000..ae28465bcd --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/html/before2.min.html @@ -0,0 +1,36 @@ +css Zen Garden: The Beauty in CSS Design

    Browser != IE

    css Zen Garden

    The Beauty of CSS Design

    +	White  space  is  important   here!
+

    A demonstration of what can be accomplished visually through CSS-based design. Select any style sheet from the list to load it into this page.

    Download the sample html file and css file

    Preserve at least 1 char of whitespace near scripts in case of document.write().
    \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/1/adjacent.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/1/adjacent.css new file mode 100644 index 0000000000..da52c69491 --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/1/adjacent.css @@ -0,0 +1,3 @@ +/* @import url('bad.css' ) bad; */ +adjacent2 foo { background: red url(/red.gif); } +adjacent2 bar { background: url('../green.gif') } \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/1/tv.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/1/tv.css new file mode 100644 index 0000000000..69fa2f5ef3 --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/1/tv.css @@ -0,0 +1,4 @@ +@import url( adjacent.css ) all; +@import '../input.css'; +tv foo { background: red url(/red.gif); } +tv bar { background: url('../green.gif') } \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/adjacent.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/adjacent.css new file mode 100644 index 0000000000..b452f473e7 --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/adjacent.css @@ -0,0 +1,4 @@ +@import url(../css/styles.css); +@import url(http://example.com/hello.css); +adjacent foo { background: red url(/red.gif); } +adjacent bar { background: url('../green.gif') } \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/input.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/input.css new file mode 100644 index 0000000000..bb7b959511 --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/input.css @@ -0,0 +1,4 @@ +@import url( adjacent.css ) screen; +@import "1/tv.css" tv, projection; +input foo { background: red url(/red.gif); } +input bar { background: url('../green.gif') } \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/output.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/output.css new file mode 100644 index 0000000000..1e4358c25d --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/output.css @@ -0,0 +1,48 @@ +@media screen { +/* some CSS to try to exercise things in general */ + +@import url(/more.css); + + body, td, th { + font-family: Verdana , "Bitstream Vera Sans" , sans-serif ; + + font-size : 12px; +} + +.nav { + margin-left: 20%; +} +#main-nav { + background-color: red; + border: 1px solid #00ff77; +} + +div#content +h1 + p { + padding-top: 0; + margin-top: 0; +} + +@media all and (min-width: 640px) { + #media-queries-1 { background-color: #0f0; } +} + +@media screen and (max-width: 2000px) { + #media-queries-2 { background-color: #0f0; } +} +@import url(http://example.com/hello.css); +adjacent foo { background: red url(/red.gif); } +adjacent bar { background: url('%TEST_FILES_URI%/green.gif') } +} + +@media tv,projection { +/* @import url('%TEST_FILES_URI%/importProcessor/1/bad.css') bad; */ +adjacent2 foo { background: red url(/red.gif); } +adjacent2 bar { background: url('%TEST_FILES_URI%/importProcessor/green.gif') } +@import '../input.css'; +tv foo { background: red url(/red.gif); } +tv bar { background: url('%TEST_FILES_URI%/importProcessor/green.gif') } +} + +input foo { background: red url(/red.gif); } +input bar { background: url('%TEST_FILES_URI%/green.gif') } \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/before.js b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/before.js new file mode 100644 index 0000000000..cccdb9706e --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/before.js @@ -0,0 +1,57 @@ +/*! is.js + + (c) 2001 Douglas Crockford + 2001 June 3 +*/ + +// is + +// The -is- object is used to identify the browser. Every browser edition +// identifies itself, but there is no standard way of doing it, and some of +// the identification is deceptive. This is because the authors of web +// browsers are liars. For example, Microsoft's IE browsers claim to be +// Mozilla 4. Netscape 6 claims to be version 5. + +var is = { + ie: navigator.appName == 'Microsoft Internet Explorer', + java: navigator.javaEnabled(), + ns: navigator.appName == 'Netscape', + ua: navigator.userAgent.toLowerCase(), + version: parseFloat(navigator.appVersion.substr(21)) || + parseFloat(navigator.appVersion), + win: navigator.platform == 'Win32' +} +/*!* + * preserve this comment, too + */ +is.mac = is.ua.indexOf('mac') >= 0; +if (is.ua.indexOf('opera') >= 0) { + is.ie = is.ns = false; + is.opera = true; +} +if (is.ua.indexOf('gecko') >= 0) { + is.ie = is.ns = false; + is.gecko = true; +} + +/*@cc_on + /*@if (@_win32) + if (is.ie && is.win) + document.write("PASS: IE/win honored conditional comment.
    "); + @else @*/ + if (is.ie && is.win) + document.write("FAIL: IE/win did not honor multi-line conditional comment.
    "); + else + document.write("PASS: Non-IE/win browser ignores multi-line conditional comment.
    "); + /*@end +@*/ + +var recognizesCondComm = true; +//@cc_on/* +recognizesCondComm = false; +//@cc_on*/ + +if ((is.ie && is.win) == recognizesCondComm) + document.write("PASS: IE/win honored single-line conditional comment.
    "); +else + document.write("FAIL: Non-IE/win browser did not ignore single-line conditional comment.
    "); diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/before.min.js b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/before.min.js new file mode 100644 index 0000000000..6f06c6e6ce --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/before.min.js @@ -0,0 +1,22 @@ +/* is.js + + (c) 2001 Douglas Crockford + 2001 June 3 +*/ +var is={ie:navigator.appName=='Microsoft Internet Explorer',java:navigator.javaEnabled(),ns:navigator.appName=='Netscape',ua:navigator.userAgent.toLowerCase(),version:parseFloat(navigator.appVersion.substr(21))||parseFloat(navigator.appVersion),win:navigator.platform=='Win32'} +/** + * preserve this comment, too + */ +is.mac=is.ua.indexOf('mac')>=0;if(is.ua.indexOf('opera')>=0){is.ie=is.ns=false;is.opera=true;} +if(is.ua.indexOf('gecko')>=0){is.ie=is.ns=false;is.gecko=true;}/*@cc_on + /*@if (@_win32) + if (is.ie && is.win) + document.write("PASS: IE/win honored conditional comment.
    "); + @else @*/if(is.ie&&is.win) +document.write("FAIL: IE/win did not honor multi-line conditional comment.
    ");else +document.write("PASS: Non-IE/win browser ignores multi-line conditional comment.
    ");/*@end +@*/var recognizesCondComm=true;//@cc_on/* +recognizesCondComm=false;//@cc_on*/ +if((is.ie&&is.win)==recognizesCondComm) +document.write("PASS: IE/win honored single-line conditional comment.
    ");else +document.write("FAIL: Non-IE/win browser did not ignore single-line conditional comment.
    "); \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/before.min_plus.js b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/before.min_plus.js new file mode 100644 index 0000000000..6f06c6e6ce --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/before.min_plus.js @@ -0,0 +1,22 @@ +/* is.js + + (c) 2001 Douglas Crockford + 2001 June 3 +*/ +var is={ie:navigator.appName=='Microsoft Internet Explorer',java:navigator.javaEnabled(),ns:navigator.appName=='Netscape',ua:navigator.userAgent.toLowerCase(),version:parseFloat(navigator.appVersion.substr(21))||parseFloat(navigator.appVersion),win:navigator.platform=='Win32'} +/** + * preserve this comment, too + */ +is.mac=is.ua.indexOf('mac')>=0;if(is.ua.indexOf('opera')>=0){is.ie=is.ns=false;is.opera=true;} +if(is.ua.indexOf('gecko')>=0){is.ie=is.ns=false;is.gecko=true;}/*@cc_on + /*@if (@_win32) + if (is.ie && is.win) + document.write("PASS: IE/win honored conditional comment.
    "); + @else @*/if(is.ie&&is.win) +document.write("FAIL: IE/win did not honor multi-line conditional comment.
    ");else +document.write("PASS: Non-IE/win browser ignores multi-line conditional comment.
    ");/*@end +@*/var recognizesCondComm=true;//@cc_on/* +recognizesCondComm=false;//@cc_on*/ +if((is.ie&&is.win)==recognizesCondComm) +document.write("PASS: IE/win honored single-line conditional comment.
    ");else +document.write("FAIL: Non-IE/win browser did not ignore single-line conditional comment.
    "); \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/condcomm.js b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/condcomm.js new file mode 100644 index 0000000000..28aa1268be --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/condcomm.js @@ -0,0 +1,14 @@ +var isWin; +/*@cc_on + @if (@_win32) + isWin = true; + @else @*/ isWin = false; + /*@end +@*/ + +isWin = /*@cc_on!*/!1; + +var recognizesCondComm = true; +//@cc_on/* +recognizesCondComm = false; +//@cc_on*/ diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/condcomm.min_plus.js b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/condcomm.min_plus.js new file mode 100644 index 0000000000..d8c1ed3861 --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/condcomm.min_plus.js @@ -0,0 +1,13 @@ +var isWin; +/*@cc_on + @if (@_win32) + isWin = true; + @else @*/ + isWin = false; + /*@end +@*/ + +var recognizesCondComm = true; +//@cc_on/* +recognizesCondComm = false; +//@cc_on*/ \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/issue74.js b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/issue74.js new file mode 100644 index 0000000000..e12eaeb487 --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/issue74.js @@ -0,0 +1,4 @@ + +function testIssue74() { + return /'/; +} diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/issue74.min.js b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/issue74.min.js new file mode 100644 index 0000000000..3442a73fcd --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/issue74.min.js @@ -0,0 +1 @@ +function testIssue74(){return /'/;} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/issue74.min_plus.js b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/issue74.min_plus.js new file mode 100644 index 0000000000..9caaa899c9 --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/issue74.min_plus.js @@ -0,0 +1 @@ +function testIssue74(){return /'/} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/jquery-1.2.3.js b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/jquery-1.2.3.js new file mode 100644 index 0000000000..c5a3337600 --- /dev/null +++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/jquery-1.2.3.js @@ -0,0 +1,3408 @@ +(function(){ +/*! + * jQuery 1.2.3 - New Wave Javascript + * + * Copyright (c) 2008 John Resig (jquery.com) + * Dual licensed under the MIT (MIT-LICENSE.txt) + * and GPL (GPL-LICENSE.txt) licenses. + * + * $Date: 2008-02-06 00:21:25 -0500 (Wed, 06 Feb 2008) $ + * $Rev: 4663 $ + */ + +// Map over jQuery in case of overwrite +if ( window.jQuery ) + var _jQuery = window.jQuery; + +var jQuery = window.jQuery = function( selector, context ) { + // The jQuery object is actually just the init constructor 'enhanced' + return new jQuery.prototype.init( selector, context ); +}; + +// Map over the $ in case of overwrite +if ( window.$ ) + var _$ = window.$; + +// Map the jQuery namespace to the '$' one +window.$ = jQuery; + +// A simple way to check for HTML strings or ID strings +// (both of which we optimize for) +var quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/; + +// Is it a simple selector +var isSimple = /^.[^:#\[\.]*$/; + +jQuery.fn = jQuery.prototype = { + init: function( selector, context ) { + // Make sure that a selection was provided + selector = selector || document; + + // Handle $(DOMElement) + if ( selector.nodeType ) { + this[0] = selector; + this.length = 1; + return this; + + // Handle HTML strings + } else if ( typeof selector == "string" ) { + // Are we dealing with HTML string or an ID? + var match = quickExpr.exec( selector ); + + // Verify a match, and that no context was specified for #id + if ( match && (match[1] || !context) ) { + + // HANDLE: $(html) -> $(array) + if ( match[1] ) + selector = jQuery.clean( [ match[1] ], context ); + + // HANDLE: $("#id") + else { + var elem = document.getElementById( match[3] ); + + // Make sure an element was located + if ( elem ) + // Handle the case where IE and Opera return items + // by name instead of ID + if ( elem.id != match[3] ) + return jQuery().find( selector ); + + // Otherwise, we inject the element directly into the jQuery object + else { + this[0] = elem; + this.length = 1; + return this; + } + + else + selector = []; + } + + // HANDLE: $(expr, [context]) + // (which is just equivalent to: $(content).find(expr) + } else + return new jQuery( context ).find( selector ); + + // HANDLE: $(function) + // Shortcut for document ready + } else if ( jQuery.isFunction( selector ) ) + return new jQuery( document )[ jQuery.fn.ready ? "ready" : "load" ]( selector ); + + return this.setArray( + // HANDLE: $(array) + selector.constructor == Array && selector || + + // HANDLE: $(arraylike) + // Watch for when an array-like object, contains DOM nodes, is passed in as the selector + (selector.jquery || selector.length && selector != window && !selector.nodeType && selector[0] != undefined && selector[0].nodeType) && jQuery.makeArray( selector ) || + + // HANDLE: $(*) + [ selector ] ); + }, + + // The current version of jQuery being used + jquery: "1.2.3", + + // The number of elements contained in the matched element set + size: function() { + return this.length; + }, + + // The number of elements contained in the matched element set + length: 0, + + // Get the Nth element in the matched element set OR + // Get the whole matched element set as a clean array + get: function( num ) { + return num == undefined ? + + // Return a 'clean' array + jQuery.makeArray( this ) : + + // Return just the object + this[ num ]; + }, + + // Take an array of elements and push it onto the stack + // (returning the new matched element set) + pushStack: function( elems ) { + // Build a new jQuery matched element set + var ret = jQuery( elems ); + + // Add the old object onto the stack (as a reference) + ret.prevObject = this; + + // Return the newly-formed element set + return ret; + }, + + // Force the current matched set of elements to become + // the specified array of elements (destroying the stack in the process) + // You should use pushStack() in order to do this, but maintain the stack + setArray: function( elems ) { + // Resetting the length to 0, then using the native Array push + // is a super-fast way to populate an object with array-like properties + this.length = 0; + Array.prototype.push.apply( this, elems ); + + return this; + }, + + // Execute a callback for every element in the matched set. + // (You can seed the arguments with an array of args, but this is + // only used internally.) + each: function( callback, args ) { + return jQuery.each( this, callback, args ); + }, + + // Determine the position of an element within + // the matched set of elements + index: function( elem ) { + var ret = -1; + + // Locate the position of the desired element + this.each(function(i){ + if ( this == elem ) + ret = i; + }); + + return ret; + }, + + attr: function( name, value, type ) { + var options = name; + + // Look for the case where we're accessing a style value + if ( name.constructor == String ) + if ( value == undefined ) + return this.length && jQuery[ type || "attr" ]( this[0], name ) || undefined; + + else { + options = {}; + options[ name ] = value; + } + + // Check to see if we're setting style values + return this.each(function(i){ + // Set all the styles + for ( name in options ) + jQuery.attr( + type ? + this.style : + this, + name, jQuery.prop( this, options[ name ], type, i, name ) + ); + }); + }, + + css: function( key, value ) { + // ignore negative width and height values + if ( (key == 'width' || key == 'height') && parseFloat(value) < 0 ) + value = undefined; + return this.attr( key, value, "curCSS" ); + }, + + text: function( text ) { + if ( typeof text != "object" && text != null ) + return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) ); + + var ret = ""; + + jQuery.each( text || this, function(){ + jQuery.each( this.childNodes, function(){ + if ( this.nodeType != 8 ) + ret += this.nodeType != 1 ? + this.nodeValue : + jQuery.fn.text( [ this ] ); + }); + }); + + return ret; + }, + + wrapAll: function( html ) { + if ( this[0] ) + // The elements to wrap the target around + jQuery( html, this[0].ownerDocument ) + .clone() + .insertBefore( this[0] ) + .map(function(){ + var elem = this; + + while ( elem.firstChild ) + elem = elem.firstChild; + + return elem; + }) + .append(this); + + return this; + }, + + wrapInner: function( html ) { + return this.each(function(){ + jQuery( this ).contents().wrapAll( html ); + }); + }, + + wrap: function( html ) { + return this.each(function(){ + jQuery( this ).wrapAll( html ); + }); + }, + + append: function() { + return this.domManip(arguments, true, false, function(elem){ + if (this.nodeType == 1) + this.appendChild( elem ); + }); + }, + + prepend: function() { + return this.domManip(arguments, true, true, function(elem){ + if (this.nodeType == 1) + this.insertBefore( elem, this.firstChild ); + }); + }, + + before: function() { + return this.domManip(arguments, false, false, function(elem){ + this.parentNode.insertBefore( elem, this ); + }); + }, + + after: function() { + return this.domManip(arguments, false, true, function(elem){ + this.parentNode.insertBefore( elem, this.nextSibling ); + }); + }, + + end: function() { + return this.prevObject || jQuery( [] ); + }, + + find: function( selector ) { + var elems = jQuery.map(this, function(elem){ + return jQuery.find( selector, elem ); + }); + + return this.pushStack( /[^+>] [^+>]/.test( selector ) || selector.indexOf("..") > -1 ? + jQuery.unique( elems ) : + elems ); + }, + + clone: function( events ) { + // Do the clone + var ret = this.map(function(){ + if ( jQuery.browser.msie && !jQuery.isXMLDoc(this) ) { + // IE copies events bound via attachEvent when + // using cloneNode. Calling detachEvent on the + // clone will also remove the events from the orignal + // In order to get around this, we use innerHTML. + // Unfortunately, this means some modifications to + // attributes in IE that are actually only stored + // as properties will not be copied (such as the + // the name attribute on an input). + var clone = this.cloneNode(true), + container = document.createElement("div"); + container.appendChild(clone); + return jQuery.clean([container.innerHTML])[0]; + } else + return this.cloneNode(true); + }); + + // Need to set the expando to null on the cloned set if it exists + // removeData doesn't work here, IE removes it from the original as well + // this is primarily for IE but the data expando shouldn't be copied over in any browser + var clone = ret.find("*").andSelf().each(function(){ + if ( this[ expando ] != undefined ) + this[ expando ] = null; + }); + + // Copy the events from the original to the clone + if ( events === true ) + this.find("*").andSelf().each(function(i){ + if (this.nodeType == 3) + return; + var events = jQuery.data( this, "events" ); + + for ( var type in events ) + for ( var handler in events[ type ] ) + jQuery.event.add( clone[ i ], type, events[ type ][ handler ], events[ type ][ handler ].data ); + }); + + // Return the cloned set + return ret; + }, + + filter: function( selector ) { + return this.pushStack( + jQuery.isFunction( selector ) && + jQuery.grep(this, function(elem, i){ + return selector.call( elem, i ); + }) || + + jQuery.multiFilter( selector, this ) ); + }, + + not: function( selector ) { + if ( selector.constructor == String ) + // test special case where just one selector is passed in + if ( isSimple.test( selector ) ) + return this.pushStack( jQuery.multiFilter( selector, this, true ) ); + else + selector = jQuery.multiFilter( selector, this ); + + var isArrayLike = selector.length && selector[selector.length - 1] !== undefined && !selector.nodeType; + return this.filter(function() { + return isArrayLike ? jQuery.inArray( this, selector ) < 0 : this != selector; + }); + }, + + add: function( selector ) { + return !selector ? this : this.pushStack( jQuery.merge( + this.get(), + selector.constructor == String ? + jQuery( selector ).get() : + selector.length != undefined && (!selector.nodeName || jQuery.nodeName(selector, "form")) ? + selector : [selector] ) ); + }, + + is: function( selector ) { + return selector ? + jQuery.multiFilter( selector, this ).length > 0 : + false; + }, + + hasClass: function( selector ) { + return this.is( "." + selector ); + }, + + val: function( value ) { + if ( value == undefined ) { + + if ( this.length ) { + var elem = this[0]; + + // We need to handle select boxes special + if ( jQuery.nodeName( elem, "select" ) ) { + var index = elem.selectedIndex, + values = [], + options = elem.options, + one = elem.type == "select-one"; + + // Nothing was selected + if ( index < 0 ) + return null; + + // Loop through all the selected options + for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) { + var option = options[ i ]; + + if ( option.selected ) { + // Get the specifc value for the option + value = jQuery.browser.msie && !option.attributes.value.specified ? option.text : option.value; + + // We don't need an array for one selects + if ( one ) + return value; + + // Multi-Selects return an array + values.push( value ); + } + } + + return values; + + // Everything else, we just grab the value + } else + return (this[0].value || "").replace(/\r/g, ""); + + } + + return undefined; + } + + return this.each(function(){ + if ( this.nodeType != 1 ) + return; + + if ( value.constructor == Array && /radio|checkbox/.test( this.type ) ) + this.checked = (jQuery.inArray(this.value, value) >= 0 || + jQuery.inArray(this.name, value) >= 0); + + else if ( jQuery.nodeName( this, "select" ) ) { + var values = value.constructor == Array ? + value : + [ value ]; + + jQuery( "option", this ).each(function(){ + this.selected = (jQuery.inArray( this.value, values ) >= 0 || + jQuery.inArray( this.text, values ) >= 0); + }); + + if ( !values.length ) + this.selectedIndex = -1; + + } else + this.value = value; + }); + }, + + html: function( value ) { + return value == undefined ? + (this.length ? + this[0].innerHTML : + null) : + this.empty().append( value ); + }, + + replaceWith: function( value ) { + return this.after( value ).remove(); + }, + + eq: function( i ) { + return this.slice( i, i + 1 ); + }, + + slice: function() { + return this.pushStack( Array.prototype.slice.apply( this, arguments ) ); + }, + + map: function( callback ) { + return this.pushStack( jQuery.map(this, function(elem, i){ + return callback.call( elem, i, elem ); + })); + }, + + andSelf: function() { + return this.add( this.prevObject ); + }, + + data: function( key, value ){ + var parts = key.split("."); + parts[1] = parts[1] ? "." + parts[1] : ""; + + if ( value == null ) { + var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]); + + if ( data == undefined && this.length ) + data = jQuery.data( this[0], key ); + + return data == null && parts[1] ? + this.data( parts[0] ) : + data; + } else + return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function(){ + jQuery.data( this, key, value ); + }); + }, + + removeData: function( key ){ + return this.each(function(){ + jQuery.removeData( this, key ); + }); + }, + + domManip: function( args, table, reverse, callback ) { + var clone = this.length > 1, elems; + + return this.each(function(){ + if ( !elems ) { + elems = jQuery.clean( args, this.ownerDocument ); + + if ( reverse ) + elems.reverse(); + } + + var obj = this; + + if ( table && jQuery.nodeName( this, "table" ) && jQuery.nodeName( elems[0], "tr" ) ) + obj = this.getElementsByTagName("tbody")[0] || this.appendChild( this.ownerDocument.createElement("tbody") ); + + var scripts = jQuery( [] ); + + jQuery.each(elems, function(){ + var elem = clone ? + jQuery( this ).clone( true )[0] : + this; + + // execute all scripts after the elements have been injected + if ( jQuery.nodeName( elem, "script" ) ) { + scripts = scripts.add( elem ); + } else { + // Remove any inner scripts for later evaluation + if ( elem.nodeType == 1 ) + scripts = scripts.add( jQuery( "script", elem ).remove() ); + + // Inject the elements into the document + callback.call( obj, elem ); + } + }); + + scripts.each( evalScript ); + }); + } +}; + +// Give the init function the jQuery prototype for later instantiation +jQuery.prototype.init.prototype = jQuery.prototype; + +function evalScript( i, elem ) { + if ( elem.src ) + jQuery.ajax({ + url: elem.src, + async: false, + dataType: "script" + }); + + else + jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" ); + + if ( elem.parentNode ) + elem.parentNode.removeChild( elem ); +} + +jQuery.extend = jQuery.fn.extend = function() { + // copy reference to target object + var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options; + + // Handle a deep copy situation + if ( target.constructor == Boolean ) { + deep = target; + target = arguments[1] || {}; + // skip the boolean and the target + i = 2; + } + + // Handle case when target is a string or something (possible in deep copy) + if ( typeof target != "object" && typeof target != "function" ) + target = {}; + + // extend jQuery itself if only one argument is passed + if ( length == 1 ) { + target = this; + i = 0; + } + + for ( ; i < length; i++ ) + // Only deal with non-null/undefined values + if ( (options = arguments[ i ]) != null ) + // Extend the base object + for ( var name in options ) { + // Prevent never-ending loop + if ( target === options[ name ] ) + continue; + + // Recurse if we're merging object values + if ( deep && options[ name ] && typeof options[ name ] == "object" && target[ name ] && !options[ name ].nodeType ) + target[ name ] = jQuery.extend( target[ name ], options[ name ] ); + + // Don't bring in undefined values + else if ( options[ name ] != undefined ) + target[ name ] = options[ name ]; + + } + + // Return the modified object + return target; +}; + +var expando = "jQuery" + (new Date()).getTime(), uuid = 0, windowData = {}; + +// exclude the following css properties to add px +var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i; + +jQuery.extend({ + noConflict: function( deep ) { + window.$ = _$; + + if ( deep ) + window.jQuery = _jQuery; + + return jQuery; + }, + + // See test/unit/core.js for details concerning this function. + isFunction: function( fn ) { + return !!fn && typeof fn != "string" && !fn.nodeName && + fn.constructor != Array && /function/i.test( fn + "" ); + }, + + // check if an element is in a (or is an) XML document + isXMLDoc: function( elem ) { + return elem.documentElement && !elem.body || + elem.tagName && elem.ownerDocument && !elem.ownerDocument.body; + }, + + // Evalulates a script in a global context + globalEval: function( data ) { + data = jQuery.trim( data ); + + if ( data ) { + // Inspired by code by Andrea Giammarchi + // http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html + var head = document.getElementsByTagName("head")[0] || document.documentElement, + script = document.createElement("script"); + + script.type = "text/javascript"; + if ( jQuery.browser.msie ) + script.text = data; + else + script.appendChild( document.createTextNode( data ) ); + + head.appendChild( script ); + head.removeChild( script ); + } + }, + + nodeName: function( elem, name ) { + return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase(); + }, + + cache: {}, + + data: function( elem, name, data ) { + elem = elem == window ? + windowData : + elem; + + var id = elem[ expando ]; + + // Compute a unique ID for the element + if ( !id ) + id = elem[ expando ] = ++uuid; + + // Only generate the data cache if we're + // trying to access or manipulate it + if ( name && !jQuery.cache[ id ] ) + jQuery.cache[ id ] = {}; + + // Prevent overriding the named cache with undefined values + if ( data != undefined ) + jQuery.cache[ id ][ name ] = data; + + // Return the named cache data, or the ID for the element + return name ? + jQuery.cache[ id ][ name ] : + id; + }, + + removeData: function( elem, name ) { + elem = elem == window ? + windowData : + elem; + + var id = elem[ expando ]; + + // If we want to remove a specific section of the element's data + if ( name ) { + if ( jQuery.cache[ id ] ) { + // Remove the section of cache data + delete jQuery.cache[ id ][ name ]; + + // If we've removed all the data, remove the element's cache + name = ""; + + for ( name in jQuery.cache[ id ] ) + break; + + if ( !name ) + jQuery.removeData( elem ); + } + + // Otherwise, we want to remove all of the element's data + } else { + // Clean up the element expando + try { + delete elem[ expando ]; + } catch(e){ + // IE has trouble directly removing the expando + // but it's ok with using removeAttribute + if ( elem.removeAttribute ) + elem.removeAttribute( expando ); + } + + // Completely remove the data cache + delete jQuery.cache[ id ]; + } + }, + + // args is for internal usage only + each: function( object, callback, args ) { + if ( args ) { + if ( object.length == undefined ) { + for ( var name in object ) + if ( callback.apply( object[ name ], args ) === false ) + break; + } else + for ( var i = 0, length = object.length; i < length; i++ ) + if ( callback.apply( object[ i ], args ) === false ) + break; + + // A special, fast, case for the most common use of each + } else { + if ( object.length == undefined ) { + for ( var name in object ) + if ( callback.call( object[ name ], name, object[ name ] ) === false ) + break; + } else + for ( var i = 0, length = object.length, value = object[0]; + i < length && callback.call( value, i, value ) !== false; value = object[++i] ){} + } + + return object; + }, + + prop: function( elem, value, type, i, name ) { + // Handle executable functions + if ( jQuery.isFunction( value ) ) + value = value.call( elem, i ); + + // Handle passing in a number to a CSS property + return value && value.constructor == Number && type == "curCSS" && !exclude.test( name ) ? + value + "px" : + value; + }, + + className: { + // internal only, use addClass("class") + add: function( elem, classNames ) { + jQuery.each((classNames || "").split(/\s+/), function(i, className){ + if ( elem.nodeType == 1 && !jQuery.className.has( elem.className, className ) ) + elem.className += (elem.className ? " " : "") + className; + }); + }, + + // internal only, use removeClass("class") + remove: function( elem, classNames ) { + if (elem.nodeType == 1) + elem.className = classNames != undefined ? + jQuery.grep(elem.className.split(/\s+/), function(className){ + return !jQuery.className.has( classNames, className ); + }).join(" ") : + ""; + }, + + // internal only, use is(".class") + has: function( elem, className ) { + return jQuery.inArray( className, (elem.className || elem).toString().split(/\s+/) ) > -1; + } + }, + + // A method for quickly swapping in/out CSS properties to get correct calculations + swap: function( elem, options, callback ) { + var old = {}; + // Remember the old values, and insert the new ones + for ( var name in options ) { + old[ name ] = elem.style[ name ]; + elem.style[ name ] = options[ name ]; + } + + callback.call( elem ); + + // Revert the old values + for ( var name in options ) + elem.style[ name ] = old[ name ]; + }, + + css: function( elem, name, force ) { + if ( name == "width" || name == "height" ) { + var val, props = { position: "absolute", visibility: "hidden", display:"block" }, which = name == "width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ]; + + function getWH() { + val = name == "width" ? elem.offsetWidth : elem.offsetHeight; + var padding = 0, border = 0; + jQuery.each( which, function() { + padding += parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0; + border += parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0; + }); + val -= Math.round(padding + border); + } + + if ( jQuery(elem).is(":visible") ) + getWH(); + else + jQuery.swap( elem, props, getWH ); + + return Math.max(0, val); + } + + return jQuery.curCSS( elem, name, force ); + }, + + curCSS: function( elem, name, force ) { + var ret; + + // A helper method for determining if an element's values are broken + function color( elem ) { + if ( !jQuery.browser.safari ) + return false; + + var ret = document.defaultView.getComputedStyle( elem, null ); + return !ret || ret.getPropertyValue("color") == ""; + } + + // We need to handle opacity special in IE + if ( name == "opacity" && jQuery.browser.msie ) { + ret = jQuery.attr( elem.style, "opacity" ); + + return ret == "" ? + "1" : + ret; + } + // Opera sometimes will give the wrong display answer, this fixes it, see #2037 + if ( jQuery.browser.opera && name == "display" ) { + var save = elem.style.outline; + elem.style.outline = "0 solid black"; + elem.style.outline = save; + } + + // Make sure we're using the right name for getting the float value + if ( name.match( /float/i ) ) + name = styleFloat; + + if ( !force && elem.style && elem.style[ name ] ) + ret = elem.style[ name ]; + + else if ( document.defaultView && document.defaultView.getComputedStyle ) { + + // Only "float" is needed here + if ( name.match( /float/i ) ) + name = "float"; + + name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase(); + + var getComputedStyle = document.defaultView.getComputedStyle( elem, null ); + + if ( getComputedStyle && !color( elem ) ) + ret = getComputedStyle.getPropertyValue( name ); + + // If the element isn't reporting its values properly in Safari + // then some display: none elements are involved + else { + var swap = [], stack = []; + + // Locate all of the parent display: none elements + for ( var a = elem; a && color(a); a = a.parentNode ) + stack.unshift(a); + + // Go through and make them visible, but in reverse + // (It would be better if we knew the exact display type that they had) + for ( var i = 0; i < stack.length; i++ ) + if ( color( stack[ i ] ) ) { + swap[ i ] = stack[ i ].style.display; + stack[ i ].style.display = "block"; + } + + // Since we flip the display style, we have to handle that + // one special, otherwise get the value + ret = name == "display" && swap[ stack.length - 1 ] != null ? + "none" : + ( getComputedStyle && getComputedStyle.getPropertyValue( name ) ) || ""; + + // Finally, revert the display styles back + for ( var i = 0; i < swap.length; i++ ) + if ( swap[ i ] != null ) + stack[ i ].style.display = swap[ i ]; + } + + // We should always get a number back from opacity + if ( name == "opacity" && ret == "" ) + ret = "1"; + + } else if ( elem.currentStyle ) { + var camelCase = name.replace(/\-(\w)/g, function(all, letter){ + return letter.toUpperCase(); + }); + + ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ]; + + // From the awesome hack by Dean Edwards + // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291 + + // If we're not dealing with a regular pixel number + // but a number that has a weird ending, we need to convert it to pixels + if ( !/^\d+(px)?$/i.test( ret ) && /^\d/.test( ret ) ) { + // Remember the original values + var style = elem.style.left, runtimeStyle = elem.runtimeStyle.left; + + // Put in the new values to get a computed value out + elem.runtimeStyle.left = elem.currentStyle.left; + elem.style.left = ret || 0; + ret = elem.style.pixelLeft + "px"; + + // Revert the changed values + elem.style.left = style; + elem.runtimeStyle.left = runtimeStyle; + } + } + + return ret; + }, + + clean: function( elems, context ) { + var ret = []; + context = context || document; + // !context.createElement fails in IE with an error but returns typeof 'object' + if (typeof context.createElement == 'undefined') + context = context.ownerDocument || context[0] && context[0].ownerDocument || document; + + jQuery.each(elems, function(i, elem){ + if ( !elem ) + return; + + if ( elem.constructor == Number ) + elem = elem.toString(); + + // Convert html string into DOM nodes + if ( typeof elem == "string" ) { + // Fix "XHTML"-style tags in all browsers + elem = elem.replace(/(<(\w+)[^>]*?)\/>/g, function(all, front, tag){ + return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i) ? + all : + front + ">"; + }); + + // Trim whitespace, otherwise indexOf won't work as expected + var tags = jQuery.trim( elem ).toLowerCase(), div = context.createElement("div"); + + var wrap = + // option or optgroup + !tags.indexOf("", "" ] || + + !tags.indexOf("", "" ] || + + tags.match(/^<(thead|tbody|tfoot|colg|cap)/) && + [ 1, "", "
    " ] || + + !tags.indexOf("", "" ] || + + // matched above + (!tags.indexOf("", "" ] || + + !tags.indexOf("", "" ] || + + // IE can't serialize and \ No newline at end of file diff --git a/plugins/Minify/minify.php b/plugins/Minify/minify.php new file mode 100644 index 0000000000..2de2d6d26f --- /dev/null +++ b/plugins/Minify/minify.php @@ -0,0 +1,122 @@ +. + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } + +// We bundle the minify library... +set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/extlib/minify/min/lib'); + +class MinifyAction extends Action +{ + const TYPE_CSS = 'text/css'; + const TYPE_HTML = 'text/html'; + // there is some debate over the ideal JS Content-Type, but this is the + // Apache default and what Yahoo! uses.. + const TYPE_JS = 'application/x-javascript'; + + const cacheKey = 'minify'; + + var $file; + + function isReadOnly($args) + { + return true; + } + + function prepare($args) + { + parent::prepare($args); + $this->v = $args['v']; + + $f = $this->arg('f'); + if(isset($f)) { + $this->file = INSTALLDIR.'/'.$f; + if(file_exists($this->file)) { + return true; + } else { + $this->clientError(_('f parameter is not a valid path'),404); + return false; + } + }else{ + $this->clientError(_('f parameter is required'),500); + return false; + } + } + + function etag() + { + if(isset($this->v)) { + return "\"" . crc32($this->file . $this->v) . "\""; + }else{ + $stat = stat($this->file); + return '"' . $stat['ino'] . '-' . $stat['size'] . '-' . $stat['mtime'] . '"'; + } + } + + function lastModified() + { + return filemtime($this->file); + } + + function handle($args) + { + parent::handle($args); + + $c = common_memcache(); + if (!empty($c)) { + $out = $c->get(common_cache_key(self::cacheKey . ':' . $this->file)); + } + if(empty($out)) { + $out = $this->minify($this->file); + } + if (!empty($c)) { + $c->set(common_cache_key(self::cacheKey . ':' . $this->file), $out); + } + + $sec = session_cache_expire() * 60; + header('Cache-Control: public, max-age=' . $sec); + header('Pragma: public'); + $this->raw($out); + } + + function minify($file) + { + $info = pathinfo($file); + switch(strtolower($info['extension'])){ + case 'js': + require_once('JSMin.php'); + $out = JSMin::minify(file_get_contents($file)); + header('Content-Type: ' . self::TYPE_JS); + break; + case 'css': + require_once('Minify/CSS.php'); + $options = array(); + $options['currentDir'] = dirname($file); + $options['docRoot'] = INSTALLDIR; + $out = Minify_CSS::minify(file_get_contents($file),$options); + header('Content-Type: ' . self::TYPE_CSS); + break; + default: + $this->clientError(_('File type not supported'),500); + return false; + } + return $out; + } +} + From 2c07d4a530e2e8ea6a48f08806f5026df1132152 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 4 Dec 2009 13:39:51 -0500 Subject: [PATCH 009/172] utility function to output inline JavaScript --- lib/htmloutputter.php | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php index d267526c88..3fabc4037a 100644 --- a/lib/htmloutputter.php +++ b/lib/htmloutputter.php @@ -360,6 +360,25 @@ class HTMLOutputter extends XMLOutputter ' '); } + /** + * output a script (almost always javascript) tag with inline + * code. + * + * @param string $code relative or absolute script path + * @param string $type 'type' attribute value of the tag + * + * @return void + */ + + function inlineScript($code, $type='text/javascript') + { + $this->elementStart('script', array('type' => $type)); + $this->raw('/*raw($code); + $this->raw(' /*]]>*/'); // XHTML compat for Safari + $this->elementEnd('script'); + } + /** * output a css link * @@ -414,7 +433,6 @@ class HTMLOutputter extends XMLOutputter } } - /** * Internal script to autofocus the given element on page onload. * From a92228c713c73b4015766b45eecd4769a57ae232 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 4 Dec 2009 14:31:19 -0500 Subject: [PATCH 010/172] Update Mapstraction to properly scrape data from notice-list pages Refactored the JavaScript for Mapstraction use so it scrapes data from the HTML of the page it's on, if possible, and otherwise generates a JSON array. --- plugins/Mapstraction/MapstractionPlugin.php | 22 +++++- plugins/Mapstraction/map.php | 9 +-- plugins/Mapstraction/usermap.js | 83 +++++++++++---------- 3 files changed, 65 insertions(+), 49 deletions(-) diff --git a/plugins/Mapstraction/MapstractionPlugin.php b/plugins/Mapstraction/MapstractionPlugin.php index c4f9cd77de..ba7827151b 100644 --- a/plugins/Mapstraction/MapstractionPlugin.php +++ b/plugins/Mapstraction/MapstractionPlugin.php @@ -112,6 +112,11 @@ class MapstractionPlugin extends Plugin { $actionName = $action->trimmed('action'); + if (!in_array($actionName, + array('showstream', 'all', 'usermap', 'allmap'))) { + return true; + } + switch ($this->provider) { case 'cloudmade': @@ -143,9 +148,20 @@ class MapstractionPlugin extends Plugin $action->script(common_path('plugins/Mapstraction/usermap.js')); - $action->elementStart('script', array('type' => 'text/javascript')); - $action->raw(sprintf('var _provider = "%s";', $this->provider)); - $action->elementEnd('script'); + $action->inlineScript(sprintf('var _provider = "%s";', $this->provider)); + + // usermap and allmap handle this themselves + + if (in_array($actionName, + array('showstream', 'all'))) { + $action->inlineScript('$(document).ready(function() { '. + ' var user = null; '. + (($actionName == 'showstream') ? ' user = scrapeUser(); ' : '') . + ' var notices = scrapeNotices(user); ' . + ' console.log(notices); ' . + ' showMapstraction($("#map_canvas"), notices); '. + '});'); + } return true; } diff --git a/plugins/Mapstraction/map.php b/plugins/Mapstraction/map.php index 89723f43ce..734e480884 100644 --- a/plugins/Mapstraction/map.php +++ b/plugins/Mapstraction/map.php @@ -128,12 +128,9 @@ class MapAction extends OwnerDesignAction } } - $this->elementStart('script', array('type' => 'text/javascript')); - $this->raw('/*raw('var _notices = ' . json_encode($jsonArray).'; '); - $this->raw('showMapstraction($("#map_canvas"),_notices);'); - $this->raw('/*]]>*/'); // XHTML compat for Safari - $this->elementEnd('script'); + $this->inlineScript('$(document).ready(function() { '. + ' var _notices = ' . json_encode($jsonArray).'; ' . + 'showMapstraction($("#map_canvas"), _notices); });'); return true; } diff --git a/plugins/Mapstraction/usermap.js b/plugins/Mapstraction/usermap.js index e667dd5790..4b7a6c26b4 100644 --- a/plugins/Mapstraction/usermap.js +++ b/plugins/Mapstraction/usermap.js @@ -1,40 +1,32 @@ -$(document).ready(function() { +function scrapeNotices(user) +{ var notices = []; $(".notice").each(function(){ - var notice = getNoticeFromElement($(this)); - if(notice['geo']) - notices.push(notice); + var notice = getNoticeFromElement($(this)); + if (user) { + notice['user'] = user; + } else { + notice['user'] = getUserFromElement($(this)); + } + if(notice['geo']) + notices.push(notice); }); - if($("#map_canvas").length && notices.length>0) - { - showMapstraction($("#map_canvas"), notices); - } - $('.geo').click(function(){ - var noticeElement = $(this).closest(".notice"); - notice = getNoticeFromElement(noticeElement); + return notices; +} - $.fn.jOverlay.options = { - color : '#000', - opacity : '0.6', - zIndex : 99, - center : false, - bgClickToClose : true, - autoHide : true, - css : {'max-width':'542px', 'top':'5%', 'left':'32.5%'} - }; - var html="
    "; - html+=""; - html+=$("
    ").append($(this).clone()).html(); - $().jOverlay({ "html": html }); - $('#jOverlayContent').show(); - $('#jOverlayContent button').click($.closeOverlay); - - showMapstraction($("#map_canvas_popup"), notice); +function scrapeUser() +{ + var avatarURL = $(".entity_profile .entity_depiction img.avatar").attr('src'); + var profileURL = $(".entity_profile .entity_nickname .url").attr('href'); + var nickname = $(".entity_profile .entity_nickname .nickname").text(); - return false; - }); -}); + return { + 'profile_image_url': avatarURL, + 'profile_url': profileURL, + 'screen_name': nickname + }; +} function getMicroformatValue(element) { @@ -48,23 +40,34 @@ function getMicroformatValue(element) function getNoticeFromElement(noticeElement) { var notice = {}; - if(noticeElement.find(".geo").length){ + + if(noticeElement.find(".geo").length) { var latlon = noticeElement.find(".geo").attr('title').split(";"); notice['geo']={'coordinates': [ parseFloat(latlon[0]), parseFloat(latlon[1])] }; } - notice['user']={ - 'profile_image_url': noticeElement.find("img.avatar").attr('src'), - 'profile_url': noticeElement.find(".author a.url").attr('href'), - 'screen_name': noticeElement.find(".author .nickname").text() - }; - notice['html']=noticeElement.find(".entry-content").html(); - notice['url']=noticeElement.find("a.timestamp").attr('href'); - notice['created_at']=noticeElement.find("abbr.published").text(); + + notice['html'] = noticeElement.find(".entry-content").html(); + notice['url'] = noticeElement.find("a.timestamp").attr('href'); + notice['created_at'] = noticeElement.find("abbr.published").text(); + return notice; } +function getUserFromElement(noticeElement) +{ + var avatarURL = noticeElement.find("img.avatar").attr('src'); + var profileURL = noticeElement.find(".author a.url").attr('href'); + var nickname = noticeElement.find(".author .nickname").text(); + + return { + 'profile_image_url': avatarURL, + 'profile_url': profileURL, + 'screen_name': nickname + }; +} + function showMapstraction(element, notices) { if(element instanceof jQuery) element = element[0]; if(! $.isArray(notices)) notices = [notices]; From e7e9dfceb4fd6db81bf266d71a3ec0b1933fbd02 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 4 Dec 2009 14:36:24 -0500 Subject: [PATCH 011/172] remove unnecessary debugging code from mapstraction output --- plugins/Mapstraction/MapstractionPlugin.php | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/Mapstraction/MapstractionPlugin.php b/plugins/Mapstraction/MapstractionPlugin.php index ba7827151b..f20e81b0ea 100644 --- a/plugins/Mapstraction/MapstractionPlugin.php +++ b/plugins/Mapstraction/MapstractionPlugin.php @@ -158,7 +158,6 @@ class MapstractionPlugin extends Plugin ' var user = null; '. (($actionName == 'showstream') ? ' user = scrapeUser(); ' : '') . ' var notices = scrapeNotices(user); ' . - ' console.log(notices); ' . ' showMapstraction($("#map_canvas"), notices); '. '});'); } From cff12603cf13ddde59f82597cdf896bf0deaf596 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 4 Dec 2009 20:17:42 +0000 Subject: [PATCH 012/172] Make imported Twitter notices show up via real time plugins. --- plugins/TwitterBridge/TwitterBridgePlugin.php | 7 ++++++- .../daemons/twitterstatusfetcher.php | 18 +++++++++++++++--- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/plugins/TwitterBridge/TwitterBridgePlugin.php b/plugins/TwitterBridge/TwitterBridgePlugin.php index ad3c2e551c..adf9ceda34 100644 --- a/plugins/TwitterBridge/TwitterBridgePlugin.php +++ b/plugins/TwitterBridge/TwitterBridgePlugin.php @@ -127,7 +127,12 @@ class TwitterBridgePlugin extends Plugin */ function onStartEnqueueNotice($notice, &$transports) { - array_push($transports, 'twitter'); + // Avoid a possible loop + + if ($notice->source != 'twitter') { + array_push($transports, 'twitter'); + } + return true; } diff --git a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php index eba1d563b3..d8901f47ba 100755 --- a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php +++ b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php @@ -209,7 +209,11 @@ class TwitterStatusFetcher extends ParallelizingDaemon continue; } - $this->saveStatus($status, $flink); + $notice = null; + + $notice = $this->saveStatus($status, $flink); + + common_broadcast_notice($notice); } // Okay, record the time we synced with Twitter for posterity @@ -235,12 +239,14 @@ class TwitterStatusFetcher extends ParallelizingDaemon $uri = 'http://twitter.com/' . $status->user->screen_name . '/status/' . $status->id; - $notice = Notice::staticGet('uri', $uri); - // check to see if we've already imported the status + $notice = Notice::staticGet('uri', $uri); + if (empty($notice)) { + // XXX: transaction here? + $notice = new Notice(); $notice->profile_id = $id; @@ -257,6 +263,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon $id = $notice->insert(); Event::handle('EndNoticeSave', array($notice)); } + } if (!Notice_inbox::pkeyGet(array('notice_id' => $notice->id, @@ -270,7 +277,12 @@ class TwitterStatusFetcher extends ParallelizingDaemon $inbox->source = NOTICE_INBOX_SOURCE_GATEWAY; // From a private source $inbox->insert(); + } + + $notice->blowCaches(); + + return $notice; } function ensureProfile($user) From 99b23782ef871d774e0c4abffc3632ea70ee149a Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 4 Dec 2009 15:30:43 -0500 Subject: [PATCH 013/172] let Geonames clients use commercial Web service --- plugins/GeonamesPlugin.php | 59 ++++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 22 deletions(-) diff --git a/plugins/GeonamesPlugin.php b/plugins/GeonamesPlugin.php index 340a6f0bfa..fdbf79e413 100644 --- a/plugins/GeonamesPlugin.php +++ b/plugins/GeonamesPlugin.php @@ -51,6 +51,10 @@ class GeonamesPlugin extends Plugin { const LOCATION_NS = 1; + public $host = 'ws.geonames.org'; + public $username = null; + public $token = null; + /** * convert a name into a Location object * @@ -75,12 +79,11 @@ class GeonamesPlugin extends Plugin // XXX: break down a name by commas, narrow by each - $str = http_build_query(array('maxRows' => 1, - 'q' => $name, - 'lang' => $language, - 'type' => 'json')); - - $result = $client->get('http://ws.geonames.org/search?'.$str); + $result = $client->get($this->wsUrl('search', + array('maxRows' => 1, + 'q' => $name, + 'lang' => $language, + 'type' => 'json'))); if ($result->isOk()) { $rj = json_decode($result->getBody()); @@ -135,10 +138,9 @@ class GeonamesPlugin extends Plugin $client = HTTPClient::start(); - $str = http_build_query(array('geonameId' => $id, - 'lang' => $language)); - - $result = $client->get('http://ws.geonames.org/hierarchyJSON?'.$str); + $result = $client->get($this->wsUrl('hierarchyJSON', + array('geonameId' => $id, + 'lang' => $language))); if ($result->isOk()) { @@ -205,12 +207,11 @@ class GeonamesPlugin extends Plugin $client = HTTPClient::start(); - $str = http_build_query(array('lat' => $lat, - 'lng' => $lon, - 'lang' => $language)); - $result = - $client->get('http://ws.geonames.org/findNearbyPlaceNameJSON?'.$str); + $client->get($this->wsUrl('findNearbyPlaceNameJSON', + array('lat' => $lat, + 'lng' => $lon, + 'lang' => $language))); if ($result->isOk()) { @@ -286,10 +287,9 @@ class GeonamesPlugin extends Plugin $client = HTTPClient::start(); - $str = http_build_query(array('geonameId' => $location->location_id, - 'lang' => $language)); - - $result = $client->get('http://ws.geonames.org/hierarchyJSON?'.$str); + $result = $client->get($this->wsUrl('hierarchyJSON', + array('geonameId' => $location->location_id, + 'lang' => $language))); if ($result->isOk()) { @@ -376,7 +376,7 @@ class GeonamesPlugin extends Plugin { $c = common_memcache(); - if (!$c) { + if (empty($c)) { return null; } @@ -387,7 +387,7 @@ class GeonamesPlugin extends Plugin { $c = common_memcache(); - if (!$c) { + if (empty($c)) { return null; } @@ -398,7 +398,7 @@ class GeonamesPlugin extends Plugin { $c = common_memcache(); - if (!$c) { + if (empty($c)) { return null; } @@ -411,4 +411,19 @@ class GeonamesPlugin extends Plugin implode(',', array_keys($attrs)) . ':'. common_keyize(implode(',', array_values($attrs)))); } + + function wsUrl($method, $params) + { + if (!empty($this->username)) { + $params['username'] = $this->username; + } + + if (!empty($this->token)) { + $params['token'] = $this->token; + } + + $str = http_build_query($params); + + return 'http://'.$this->host.'/'.$method.'?'.$str; + } } From e074fe659903cb6cbd3dace96889f34a8c8796c9 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 4 Dec 2009 15:34:25 -0500 Subject: [PATCH 014/172] add logging utilities to Plugin class --- lib/plugin.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/plugin.php b/lib/plugin.php index 87d7be5a75..2c77c3e120 100644 --- a/lib/plugin.php +++ b/lib/plugin.php @@ -76,4 +76,14 @@ class Plugin { return true; } + + protected function log($level, $msg) + { + common_log($level, get_class($this) . ': '.$msg); + } + + protected function debug($msg) + { + $this->log(LOG_DEBUG, $msg); + } } From 41f10b742c4c3c21a8783050c6bb55dad17f050d Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 4 Dec 2009 15:34:41 -0500 Subject: [PATCH 015/172] remove duplicate log() function from RealtimePlugin --- plugins/Realtime/RealtimePlugin.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php index cbfa6bae00..030df405b0 100644 --- a/plugins/Realtime/RealtimePlugin.php +++ b/plugins/Realtime/RealtimePlugin.php @@ -120,7 +120,7 @@ class RealtimePlugin extends Plugin function onEndShowStatusNetStyles($action) { - $action->cssLink(common_path('plugins/Realtime/realtimeupdate.css'), + $action->cssLink(common_path('plugins/Realtime/realtimeupdate.css'), null, 'screen, projection, tv'); return true; } @@ -293,13 +293,6 @@ class RealtimePlugin extends Plugin return $tags; } - // Push this up to Plugin - - function log($level, $msg) - { - common_log($level, get_class($this) . ': '.$msg); - } - function _getScripts() { return array('plugins/Realtime/realtimeupdate.js', From eb0a5977ff7e325022d460ae3cf540f3415bd33d Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 4 Dec 2009 20:39:50 +0000 Subject: [PATCH 016/172] Don't try to broadcast the notice if something went wrong. --- plugins/TwitterBridge/daemons/twitterstatusfetcher.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php index d8901f47ba..b4ca12be23 100755 --- a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php +++ b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php @@ -213,7 +213,9 @@ class TwitterStatusFetcher extends ParallelizingDaemon $notice = $this->saveStatus($status, $flink); - common_broadcast_notice($notice); + if (!empty($notice)) { + common_broadcast_notice($notice); + } } // Okay, record the time we synced with Twitter for posterity From 098426cee901d264332c0ad0dd2155d30487d35f Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 4 Dec 2009 16:25:05 -0500 Subject: [PATCH 017/172] configurable expiry for cached Geonames data defaults to 90 days --- plugins/GeonamesPlugin.php | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/plugins/GeonamesPlugin.php b/plugins/GeonamesPlugin.php index fdbf79e413..a750f12426 100644 --- a/plugins/GeonamesPlugin.php +++ b/plugins/GeonamesPlugin.php @@ -54,6 +54,7 @@ class GeonamesPlugin extends Plugin public $host = 'ws.geonames.org'; public $username = null; public $token = null; + public $expiry = 7776000; // 90-day expiry /** * convert a name into a Location object @@ -197,6 +198,9 @@ class GeonamesPlugin extends Plugin function onLocationFromLatLon($lat, $lon, $language, &$location) { + $lat = rtrim($lat, "0"); + $lon = rtrim($lon, "0"); + $loc = $this->getCache(array('lat' => $lat, 'lon' => $lon)); @@ -380,7 +384,11 @@ class GeonamesPlugin extends Plugin return null; } - return $c->get($this->cacheKey($attrs)); + $key = $this->cacheKey($attrs); + + $value = $c->get($key); + + return $value; } function setCache($attrs, $loc) @@ -391,18 +399,11 @@ class GeonamesPlugin extends Plugin return null; } - $c->set($this->cacheKey($attrs), $loc); - } + $key = $this->cacheKey($attrs); - function clearCache($attrs) - { - $c = common_memcache(); + $result = $c->set($key, $loc, 0, time() + $this->expiry); - if (empty($c)) { - return null; - } - - $c->delete($this->cacheKey($attrs)); + return $result; } function cacheKey($attrs) From 4881be47c798688c3ae20f621d06e15adbc9c17e Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 4 Dec 2009 22:40:07 +0000 Subject: [PATCH 018/172] Don't depend on a User being available when looking up Design and timezone for a profile (because some profiles are remote, etc.) --- lib/api.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/api.php b/lib/api.php index 5a3bb5ee45..eacb80dbea 100644 --- a/lib/api.php +++ b/lib/api.php @@ -134,19 +134,17 @@ class ApiAction extends Action $twitter_user['protected'] = false; # not supported by StatusNet yet $twitter_user['followers_count'] = $profile->subscriberCount(); - $design = null; $user = $profile->getUser(); + $design = null; // Note: some profiles don't have an associated user + $defaultDesign = Design::siteDesign(); + if (!empty($user)) { $design = $user->getDesign(); } - if (empty($design)) { - $design = Design::siteDesign(); - } - $color = Design::toWebColor(empty($design->backgroundcolor) ? $defaultDesign->backgroundcolor : $design->backgroundcolor); $twitter_user['profile_background_color'] = ($color == null) ? '' : '#'.$color->hexValue(); $color = Design::toWebColor(empty($design->textcolor) ? $defaultDesign->textcolor : $design->textcolor); @@ -165,7 +163,7 @@ class ApiAction extends Action $timezone = 'UTC'; - if ($user->timezone) { + if (!empty($user) && !empty($user->timezone)) { $timezone = $user->timezone; } From 4c8bed8ba0558c5834621331f253e05029fa4e43 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Fri, 4 Dec 2009 19:41:51 -0500 Subject: [PATCH 019/172] Use inlineScript() everywhere inline scripts are written --- lib/messageform.php | 3 +-- lib/noticeform.php | 3 +-- plugins/Facebook/FacebookPlugin.php | 4 +--- plugins/GoogleAnalyticsPlugin.php | 8 ++------ plugins/PiwikAnalyticsPlugin.php | 15 +++++---------- plugins/Realtime/RealtimePlugin.php | 6 +----- plugins/UserFlag/UserFlagPlugin.php | 4 +--- 7 files changed, 12 insertions(+), 31 deletions(-) diff --git a/lib/messageform.php b/lib/messageform.php index b034be3122..4df193c6d1 100644 --- a/lib/messageform.php +++ b/lib/messageform.php @@ -154,8 +154,7 @@ class MessageForm extends Form $contentLimit = Message::maxContent(); - $this->out->element('script', array('type' => 'text/javascript'), - 'maxLength = ' . $contentLimit . ';'); + $this->out->inlineScript('maxLength = ' . $contentLimit . ';'); if ($contentLimit > 0) { $this->out->elementStart('dl', 'form_note'); diff --git a/lib/noticeform.php b/lib/noticeform.php index ec8624597e..0dd3f2d777 100644 --- a/lib/noticeform.php +++ b/lib/noticeform.php @@ -178,8 +178,7 @@ class NoticeForm extends Form $contentLimit = Notice::maxContent(); - $this->out->element('script', array('type' => 'text/javascript'), - 'maxLength = ' . $contentLimit . ';'); + $this->out->inlineScript('maxLength = ' . $contentLimit . ';'); if ($contentLimit > 0) { $this->out->elementStart('dl', 'form_note'); diff --git a/plugins/Facebook/FacebookPlugin.php b/plugins/Facebook/FacebookPlugin.php index 047477d9cb..40c911cce3 100644 --- a/plugins/Facebook/FacebookPlugin.php +++ b/plugins/Facebook/FacebookPlugin.php @@ -185,7 +185,6 @@ class FacebookPlugin extends Plugin // XXX: Facebook says we don't need this FB_RequireFeatures(), // but we actually do, for IE and Safari. Gar. - $js = ''; $js = sprintf($js, $apikey, $login_url, $logout_url); @@ -227,7 +225,7 @@ class FacebookPlugin extends Plugin $js = str_replace(' ', '', $js); - $action->raw(" $js"); // leading two spaces to make it line up + $action->inlineScript($js); } } diff --git a/plugins/GoogleAnalyticsPlugin.php b/plugins/GoogleAnalyticsPlugin.php index 7f3d209ee6..6891ee6a7b 100644 --- a/plugins/GoogleAnalyticsPlugin.php +++ b/plugins/GoogleAnalyticsPlugin.php @@ -67,11 +67,7 @@ class GoogleAnalyticsPlugin extends Plugin 'pageTracker._trackPageview();'. '} catch(err) {}', $this->code); - $action->elementStart('script', array('type' => 'text/javascript')); - $action->raw($js1); - $action->elementEnd('script'); - $action->elementStart('script', array('type' => 'text/javascript')); - $action->raw($js2); - $action->elementEnd('script'); + $action->inlineScript($js1); + $action->inlineScript($js2); } } diff --git a/plugins/PiwikAnalyticsPlugin.php b/plugins/PiwikAnalyticsPlugin.php index 54faa0bdbe..fefd098671 100644 --- a/plugins/PiwikAnalyticsPlugin.php +++ b/plugins/PiwikAnalyticsPlugin.php @@ -81,25 +81,20 @@ class PiwikAnalyticsPlugin extends Plugin function onEndShowScripts($action) { - $piwikCode = << - - - - ENDOFPIWIK; - $action->raw($piwikCode); + $action->inlineScript($piwikCode1); + $action->inlineScript($piwikCode2); return true; } } diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php index 030df405b0..3e33fdaf19 100644 --- a/plugins/Realtime/RealtimePlugin.php +++ b/plugins/Realtime/RealtimePlugin.php @@ -105,15 +105,11 @@ class RealtimePlugin extends Plugin $realtimeUI = ' RealtimeUpdate.initActions("'.$url.'", "'.$timeline.'", "'. $pluginPath .'");'; } - $action->elementStart('script', array('type' => 'text/javascript')); - $script = ' $(document).ready(function() { '. $realtimeUI. $this->_updateInitialize($timeline, $user_id). '}); '; - $action->raw($script); - - $action->elementEnd('script'); + $action->inlineScript($script); return true; } diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php index e13c2555aa..75dcca4fcb 100644 --- a/plugins/UserFlag/UserFlagPlugin.php +++ b/plugins/UserFlag/UserFlagPlugin.php @@ -145,9 +145,7 @@ class UserFlagPlugin extends Plugin function onEndShowScripts($action) { - $action->elementStart('script', array('type' => 'text/javascript')); - $action->raw('/* 0) { SN.U.FormXHR($(".form_entity_flag")); } /*]]>*/'); - $action->elementEnd('script'); + $action->inlineScript('if ($(".form_entity_flag").length > 0) { SN.U.FormXHR($(".form_entity_flag")); }'); return true; } } From 847013db692303cde10f5f161d9fedd787421a37 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Fri, 4 Dec 2009 19:44:45 -0500 Subject: [PATCH 020/172] only write the javascript CDATA blocks if the type is javascript (it's not the correct syntax for other languages) --- lib/htmloutputter.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php index a0066594f2..539e356e82 100644 --- a/lib/htmloutputter.php +++ b/lib/htmloutputter.php @@ -367,7 +367,7 @@ class HTMLOutputter extends XMLOutputter * output a script (almost always javascript) tag with inline * code. * - * @param string $code relative or absolute script path + * @param string $code code to put in the script tag * @param string $type 'type' attribute value of the tag * * @return void @@ -376,9 +376,13 @@ class HTMLOutputter extends XMLOutputter function inlineScript($code, $type='text/javascript') { $this->elementStart('script', array('type' => $type)); - $this->raw('/*raw('/*raw($code); - $this->raw(' /*]]>*/'); // XHTML compat for Safari + if($type == 'text/javascript') { + $this->raw(' /*]]>*/'); // XHTML compat + } $this->elementEnd('script'); } From 7ddf911f5d54ba4997b3d237ae7cd1effb74a120 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Fri, 4 Dec 2009 19:51:44 -0500 Subject: [PATCH 021/172] Add 2 new events: StartInlineScriptElement and EndInlineScriptElement --- EVENTS.txt | 10 ++++++++++ lib/htmloutputter.php | 19 +++++++++++-------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/EVENTS.txt b/EVENTS.txt index f4ec620338..678df8b0ae 100644 --- a/EVENTS.txt +++ b/EVENTS.txt @@ -595,3 +595,13 @@ EndScriptElement: After a element is written - $action - $src - $type + +StartInlineScriptElement: Before a element is written +- $action +- &$code +- &$type + +EndInlineScriptElement: After a element is written +- $action +- $code +- $type diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php index 539e356e82..0c2d18da32 100644 --- a/lib/htmloutputter.php +++ b/lib/htmloutputter.php @@ -375,15 +375,18 @@ class HTMLOutputter extends XMLOutputter function inlineScript($code, $type='text/javascript') { - $this->elementStart('script', array('type' => $type)); - if($type == 'text/javascript') { - $this->raw('/*elementStart('script', array('type' => $type)); + if($type == 'text/javascript') { + $this->raw('/*raw($code); + if($type == 'text/javascript') { + $this->raw(' /*]]>*/'); // XHTML compat + } + $this->elementEnd('script'); + Event::handle('EndInlineScriptElement', array($this,$code,$type)); } - $this->raw($code); - if($type == 'text/javascript') { - $this->raw(' /*]]>*/'); // XHTML compat - } - $this->elementEnd('script'); } /** From b3086d3c68ed2d3ceff3ce8fc91a867fc07c441a Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Fri, 4 Dec 2009 20:19:55 -0500 Subject: [PATCH 022/172] Add style function to output style() tags Add 2 new events: StartStyleElement and EndStyleElement --- EVENTS.txt | 12 ++++++++++++ lib/htmloutputter.php | 21 +++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/EVENTS.txt b/EVENTS.txt index 678df8b0ae..a056aa0a1e 100644 --- a/EVENTS.txt +++ b/EVENTS.txt @@ -586,6 +586,18 @@ EndCssLinkElement: After a element is written - $theme - $media +StartStyleElement: Before a element is written +- $action +- &$code +- &$type +- &$media + +EndStyleElement: After a element is written +- $action +- $code +- $type +- $media + StartScriptElement: Before a element is written - $action - &$src diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php index 0c2d18da32..a88a5b82c5 100644 --- a/lib/htmloutputter.php +++ b/lib/htmloutputter.php @@ -418,6 +418,27 @@ class HTMLOutputter extends XMLOutputter } } + /** + * output a style (almost always css) tag with inline + * code. + * + * @param string $code code to put in the style tag + * @param string $type 'type' attribute value of the tag + * @param string $media 'media' attribute value of the tag + * + * @return void + */ + + function style($code, $type = 'text/css', $media = null) + { + if(Event::handle('StartStyleElement', array($this,&$code,&$type,&$media))) { + $this->elementStart('style', array('type' => $type, 'media' => $media)); + $this->raw($code); + $this->elementEnd('style'); + Event::handle('EndStyleElement', array($this,$code,$type,$media)); + } + } + /** * output an HTML textarea and associated elements * From d31b1d774e5fcbb424ec60688ff4c76badc2b136 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Fri, 4 Dec 2009 20:20:44 -0500 Subject: [PATCH 023/172] use the new htmloutputter->style() function --- classes/Design.php | 2 +- plugins/Recaptcha/RecaptchaPlugin.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/Design.php b/classes/Design.php index 89ae50c8cb..4e7d7dfb25 100644 --- a/classes/Design.php +++ b/classes/Design.php @@ -101,7 +101,7 @@ class Design extends Memcached_DataObject } if (0 != mb_strlen($css)) { - $out->element('style', array('type' => 'text/css'), $css); + $out->style($css); } } diff --git a/plugins/Recaptcha/RecaptchaPlugin.php b/plugins/Recaptcha/RecaptchaPlugin.php index 1a51b16beb..3a510ef11c 100644 --- a/plugins/Recaptcha/RecaptchaPlugin.php +++ b/plugins/Recaptcha/RecaptchaPlugin.php @@ -69,7 +69,7 @@ class RecaptchaPlugin extends Plugin $action->startXML('html'); - $action->raw(''); + $action->style('#recaptcha_area{float:left;}'); return false; } From 675e32ac9ac1bdcfbb6e293eb363d2b592140ae7 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Fri, 4 Dec 2009 20:21:05 -0500 Subject: [PATCH 024/172] use cssLink() instead of element() to write out references to CSS --- plugins/MobileProfile/MobileProfilePlugin.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php index 0b1e4de286..8b5e5f31da 100644 --- a/plugins/MobileProfile/MobileProfilePlugin.php +++ b/plugins/MobileProfile/MobileProfilePlugin.php @@ -243,19 +243,13 @@ class MobileProfilePlugin extends WAP20Plugin if (file_exists(Theme::file('css/mp-screen.css'))) { $action->cssLink('css/mp-screen.css', null, 'screen'); } else { - $action->element('link', array('rel' => 'stylesheet', - 'type' => 'text/css', - 'href' => common_path('plugins/MobileProfile/mp-screen.css') . '?version=' . STATUSNET_VERSION, - 'media' => 'screen')); + $action->cssLink('plugins/MobileProfile/mp-screen.css',null,'screen'); } if (file_exists(Theme::file('css/mp-handheld.css'))) { $action->cssLink('css/mp-handheld.css', null, 'handheld'); } else { - $action->element('link', array('rel' => 'stylesheet', - 'type' => 'text/css', - 'href' => common_path('plugins/MobileProfile/mp-handheld.css') . '?version=' . STATUSNET_VERSION, - 'media' => 'handheld')); + $action->cssLink('plugins/MobileProfile/mp-handheld.css',null,'handheld'); } return false; From d41a0a5ed03b2f4bbf8e8b3984960103383090d1 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Fri, 4 Dec 2009 20:33:41 -0500 Subject: [PATCH 025/172] Use inlineScript() instead of element() to write inline javascript --- lib/htmloutputter.php | 7 ++----- plugins/MobileProfile/MobileProfilePlugin.php | 3 +-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php index a88a5b82c5..cf93944e76 100644 --- a/lib/htmloutputter.php +++ b/lib/htmloutputter.php @@ -477,13 +477,10 @@ class HTMLOutputter extends XMLOutputter */ function autofocus($id) { - $this->elementStart('script', array('type' => 'text/javascript')); - $this->raw('/*inlineScript( ' $(document).ready(function() {'. ' var el = $("#' . $id . '");'. ' if (el.length) { el.focus(); }'. - ' });'. - ' /*]]>*/'); - $this->elementEnd('script'); + ' });'); } } diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php index 8b5e5f31da..35678bedd3 100644 --- a/plugins/MobileProfile/MobileProfilePlugin.php +++ b/plugins/MobileProfile/MobileProfilePlugin.php @@ -352,8 +352,7 @@ class MobileProfilePlugin extends WAP20Plugin $contentLimit = Notice::maxContent(); - $form->out->element('script', array('type' => 'text/javascript'), - 'maxLength = ' . $contentLimit . ';'); + $form->out->inlineScript('maxLength = ' . $contentLimit . ';'); if ($contentLimit > 0) { $form->out->element('div', array('id' => 'notice_text-count'), From fa6675550885e005f6a69dfd317320dff6c4a3cd Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Fri, 4 Dec 2009 22:05:18 -0500 Subject: [PATCH 026/172] Append the StatusNet version to all local, static CSS references --- lib/htmloutputter.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php index cf93944e76..fd448ced5e 100644 --- a/lib/htmloutputter.php +++ b/lib/htmloutputter.php @@ -405,10 +405,11 @@ class HTMLOutputter extends XMLOutputter if( empty($url->scheme) && empty($url->host) && empty($url->query) && empty($url->fragment)) { if(file_exists(Theme::file($src,$theme))){ - $src = Theme::path($src, $theme) . '?version=' . STATUSNET_VERSION; + $src = Theme::path($src, $theme); }else{ $src = common_path($src); } + $src.= '?version=' . STATUSNET_VERSION; } $this->element('link', array('rel' => 'stylesheet', 'type' => 'text/css', From f4fc8481e24ce4bd7714022109d75b2a22198fdf Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Fri, 4 Dec 2009 23:17:19 -0500 Subject: [PATCH 027/172] Separate out some common code --- plugins/Minify/minify.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/Minify/minify.php b/plugins/Minify/minify.php index 2de2d6d26f..f8c17767c3 100644 --- a/plugins/Minify/minify.php +++ b/plugins/Minify/minify.php @@ -33,6 +33,7 @@ class MinifyAction extends Action const cacheKey = 'minify'; var $file; + var $v; function isReadOnly($args) { @@ -80,13 +81,14 @@ class MinifyAction extends Action $c = common_memcache(); if (!empty($c)) { - $out = $c->get(common_cache_key(self::cacheKey . ':' . $this->file)); + $cacheKey = common_cache_key(self::cacheKey . ':' . $this->file . '?v=' . empty($this->v)?'':$this->v); + $out = $c->get($cacheKey); } if(empty($out)) { $out = $this->minify($this->file); } if (!empty($c)) { - $c->set(common_cache_key(self::cacheKey . ':' . $this->file), $out); + $c->set($cacheKey, $out); } $sec = session_cache_expire() * 60; From 88e50003ae7840358c2a520c6cb808231b958769 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Fri, 4 Dec 2009 23:17:46 -0500 Subject: [PATCH 028/172] If a theme server is being used, do not minify theme CSS (as doing so could cause 404s) --- plugins/Minify/MinifyPlugin.php | 26 ++++++++++++++++++-------- plugins/Minify/README | 5 +++-- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/plugins/Minify/MinifyPlugin.php b/plugins/Minify/MinifyPlugin.php index 4d37fbc708..77fd76a849 100644 --- a/plugins/Minify/MinifyPlugin.php +++ b/plugins/Minify/MinifyPlugin.php @@ -79,23 +79,33 @@ class MinifyPlugin extends Plugin $url = parse_url($src); if( empty($url->scheme) && empty($url->host) && empty($url->query) && empty($url->fragment)) { - $src = common_path('main/min?f='.$src.'&v=' . STATUSNET_VERSION); + $src = $this->minifyUrl($src); } } function onStartCssLinkElement($action,&$src,&$theme,&$media) { + $allowThemeMinification = + is_null(common_config('theme', 'dir')) + && is_null(common_config('theme', 'path')) + && is_null(common_config('theme', 'server')); $url = parse_url($src); if( empty($url->scheme) && empty($url->host) && empty($url->query) && empty($url->fragment)) { - if(file_exists(Theme::file($src,$theme))){ - //src is a relative path, so we can do minification - if(isset($theme)) { - $src = common_path('main/min?f=theme/'.$theme.'/'.$src.'&v=' . STATUSNET_VERSION); - } else { - $src = common_path('main/min?f=theme/default/'.$src.'&v=' . STATUSNET_VERSION); - } + if(!isset($theme)) { + $theme = common_config('site', 'theme'); + } + if($allowThemeMinification && file_exists(INSTALLDIR.'/local/theme/'.$theme.'/'.$src)) { + $src = $this->minifyUrl('local/theme/'.$theme.'/'.$src); + } else if($allowThemeMinification && file_exists(INSTALLDIR.'/theme/'.$theme.'/'.$src)) { + $src = $this->minifyUrl('theme/'.$theme.'/'.$src); + }else if(file_exists(INSTALLDIR.'/'.$src)){ + $src = $this->minifyUrl($src); } } } + + function minifyUrl($src) { + return common_local_url('minify',null,array('f' => $src ,v => STATUSNET_VERSION)); + } } diff --git a/plugins/Minify/README b/plugins/Minify/README index 7fb7e239a3..8f2eefa2c7 100644 --- a/plugins/Minify/README +++ b/plugins/Minify/README @@ -1,7 +1,8 @@ The Minify plugin minifies your CSS and Javascript, removing whitespace and comments. -Note that if enabled this plugin and use a theme server - ($config['theme']['server']), your theme server will not be used. +Note that if enabled this plugin and use a theme server, + (if any of $config['theme']['server'], $config['theme']['path'], + $config['theme']['dir'] are set) theme CSS will not be minified. Installation ============ From c08d7f1aa4ac235f524da3994c2f1aef3b0fd079 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Sat, 5 Dec 2009 00:41:22 -0500 Subject: [PATCH 029/172] Minify inline JS and CSS (can be disable in configuration) --- plugins/Minify/MinifyPlugin.php | 57 +++++++++++++++++++++++++++++++++ plugins/Minify/README | 15 ++++++++- plugins/Minify/minify.php | 13 ++------ 3 files changed, 74 insertions(+), 11 deletions(-) diff --git a/plugins/Minify/MinifyPlugin.php b/plugins/Minify/MinifyPlugin.php index 77fd76a849..71fade19a5 100644 --- a/plugins/Minify/MinifyPlugin.php +++ b/plugins/Minify/MinifyPlugin.php @@ -33,8 +33,15 @@ Author URI: http://candrews.integralblue.com/ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } +// We bundle the minify library... +set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/extlib/minify/min/lib'); + class MinifyPlugin extends Plugin { + private $minifyInlineJs = true; + private $minifyInlineCss = true; + + const cacheKey = 'minify'; /** * Add Minification related paths to the router table @@ -104,8 +111,58 @@ class MinifyPlugin extends Plugin } } + function onStartInlineScriptElement($action,&$code,&$type) + { + if($this->minifyInlineJs && $type=='text/javascript'){ + $c = common_memcache(); + if (!empty($c)) { + $cacheKey = common_cache_key(self::cacheKey . ':' . crc32($code)); + $out = $c->get($cacheKey); + } + if(empty($out)) { + $out = $this->minifyJs($code); + } + if (!empty($c)) { + $c->set($cacheKey, $out); + } + if(!empty($out)) { + $code = $out; + } + } + } + + function onStartStyleElement($action,&$code,&$type,&$media) + { + if($this->minifyInlineCss && $type=='text/css'){ + $c = common_memcache(); + if (!empty($c)) { + $cacheKey = common_cache_key(self::cacheKey . ':' . crc32($code)); + $out = $c->get($cacheKey); + } + if(empty($out)) { + $out = $this->minifyCss($code); + } + if (!empty($c)) { + $c->set($cacheKey, $out); + } + if(!empty($out)) { + $code = $out; + } + } + } + function minifyUrl($src) { return common_local_url('minify',null,array('f' => $src ,v => STATUSNET_VERSION)); } + + static function minifyJs($code) { + require_once('JSMin.php'); + return JSMin::minify($code); + } + + static function minifyCss($code, $options = array()) { + require_once('Minify/CSS.php'); + return Minify_CSS::minify($code,$options); + } } diff --git a/plugins/Minify/README b/plugins/Minify/README index 8f2eefa2c7..f7763735ed 100644 --- a/plugins/Minify/README +++ b/plugins/Minify/README @@ -4,6 +4,10 @@ Note that if enabled this plugin and use a theme server, (if any of $config['theme']['server'], $config['theme']['path'], $config['theme']['dir'] are set) theme CSS will not be minified. +This plugin will use memcache, if it is available, for storing minified inline + and file javascript and css. Because minification is non-trivial, using + memcache is recommended. + Installation ============ add "addPlugin('minify', @@ -12,7 +16,16 @@ to the bottom of your config.php Settings ======== -None at the moment +minifyInlineJs (true): Minify inline javascript. + Because caching isn'tas effective for inline resources (due to its more + dynamic nature) than static files, minifying inline resources may adversely + affect performance for higher volume sites. Testing (and memcache usage) + are highly recommended. +minifyInlineCss (true): Minify inline CSS. + Because caching isn'tas effective for inline resources (due to its more + dynamic nature) than static files, minifying inline resources may adversely + affect performance for higher volume sites. Testing (and memcache usage) + are highly recommended. Example ======= diff --git a/plugins/Minify/minify.php b/plugins/Minify/minify.php index f8c17767c3..64727f5e7e 100644 --- a/plugins/Minify/minify.php +++ b/plugins/Minify/minify.php @@ -19,9 +19,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -// We bundle the minify library... -set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/extlib/minify/min/lib'); - class MinifyAction extends Action { const TYPE_CSS = 'text/css'; @@ -30,8 +27,6 @@ class MinifyAction extends Action // Apache default and what Yahoo! uses.. const TYPE_JS = 'application/x-javascript'; - const cacheKey = 'minify'; - var $file; var $v; @@ -81,7 +76,7 @@ class MinifyAction extends Action $c = common_memcache(); if (!empty($c)) { - $cacheKey = common_cache_key(self::cacheKey . ':' . $this->file . '?v=' . empty($this->v)?'':$this->v); + $cacheKey = common_cache_key(MinifyPlugin::cacheKey . ':' . $this->file . '?v=' . empty($this->v)?'':$this->v); $out = $c->get($cacheKey); } if(empty($out)) { @@ -102,16 +97,14 @@ class MinifyAction extends Action $info = pathinfo($file); switch(strtolower($info['extension'])){ case 'js': - require_once('JSMin.php'); - $out = JSMin::minify(file_get_contents($file)); + $out = MinifyPlugin::minifyJs(file_get_contents($file)); header('Content-Type: ' . self::TYPE_JS); break; case 'css': - require_once('Minify/CSS.php'); $options = array(); $options['currentDir'] = dirname($file); $options['docRoot'] = INSTALLDIR; - $out = Minify_CSS::minify(file_get_contents($file),$options); + $out = MinifyPlugin::minifyCss(file_get_contents($file),$options); header('Content-Type: ' . self::TYPE_CSS); break; default: From 51f0dd5e37db0e8d2a8690655555d399249942df Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Sat, 5 Dec 2009 01:03:04 -0500 Subject: [PATCH 030/172] Add configuration option to toggle the indenting of the output HTML. Defaults to indent enabled. --- actions/twitapisearchatom.php | 2 +- config.php.sample | 5 +++++ lib/action.php | 2 +- lib/default.php | 1 + lib/error.php | 2 +- lib/htmloutputter.php | 2 +- lib/rssaction.php | 2 +- lib/xmloutputter.php | 5 ++++- plugins/Facebook/facebookaction.php | 2 +- plugins/Facebook/facebookutil.php | 2 +- 10 files changed, 17 insertions(+), 8 deletions(-) diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php index 526ca2ae8b..1cb8d7efe6 100644 --- a/actions/twitapisearchatom.php +++ b/actions/twitapisearchatom.php @@ -71,7 +71,7 @@ class TwitapisearchatomAction extends ApiAction * @see Action::__construct */ - function __construct($output='php://output', $indent=true) + function __construct($output='php://output', $indent=null) { parent::__construct($output, $indent); } diff --git a/config.php.sample b/config.php.sample index 9fccb84f3b..473eb74e2c 100644 --- a/config.php.sample +++ b/config.php.sample @@ -236,6 +236,11 @@ $config['sphinx']['port'] = 3312; // Use a different hostname for SSL-encrypted pages // $config['site']['sslserver'] = 'secure.example.org'; +// Indent HTML and XML +// Enable (default) for easier to read markup for developers, +// disable to save some bandwidth. +// $config['site']['indent'] = true; + // If you have a lot of status networks on the same server, you can // store the site data in a database and switch as follows // Status_network::setupDB('localhost', 'statusnet', 'statuspass', 'statusnet'); diff --git a/lib/action.php b/lib/action.php index 8ad3917550..87d8a43993 100644 --- a/lib/action.php +++ b/lib/action.php @@ -68,7 +68,7 @@ class Action extends HTMLOutputter // lawsuit * @see XMLOutputter::__construct * @see HTMLOutputter::__construct */ - function __construct($output='php://output', $indent=true) + function __construct($output='php://output', $indent=null) { parent::__construct($output, $indent); } diff --git a/lib/default.php b/lib/default.php index d4ef045ea5..db90aeca3e 100644 --- a/lib/default.php +++ b/lib/default.php @@ -53,6 +53,7 @@ $default = 'shorturllength' => 30, 'dupelimit' => 60, # default for same person saying the same thing 'textlimit' => 140, + 'indent' => true, ), 'db' => array('database' => 'YOU HAVE TO SET THIS IN config.php', diff --git a/lib/error.php b/lib/error.php index 3162cfe656..87a4d913b4 100644 --- a/lib/error.php +++ b/lib/error.php @@ -50,7 +50,7 @@ class ErrorAction extends Action var $message = null; var $default = null; - function __construct($message, $code, $output='php://output', $indent=true) + function __construct($message, $code, $output='php://output', $indent=null) { parent::__construct($output, $indent); diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php index fd448ced5e..2091c6e2ca 100644 --- a/lib/htmloutputter.php +++ b/lib/htmloutputter.php @@ -67,7 +67,7 @@ class HTMLOutputter extends XMLOutputter * @param boolean $indent Whether to indent output, default true */ - function __construct($output='php://output', $indent=true) + function __construct($output='php://output', $indent=null) { parent::__construct($output, $indent); } diff --git a/lib/rssaction.php b/lib/rssaction.php index d591c99ed8..62e3f21b61 100644 --- a/lib/rssaction.php +++ b/lib/rssaction.php @@ -52,7 +52,7 @@ class Rss10Action extends Action * @see Action::__construct */ - function __construct($output='php://output', $indent=true) + function __construct($output='php://output', $indent=null) { parent::__construct($output, $indent); } diff --git a/lib/xmloutputter.php b/lib/xmloutputter.php index 5f06e491df..15b18e7d90 100644 --- a/lib/xmloutputter.php +++ b/lib/xmloutputter.php @@ -67,10 +67,13 @@ class XMLOutputter * @param boolean $indent Whether to indent output, default true */ - function __construct($output='php://output', $indent=true) + function __construct($output='php://output', $indent=null) { $this->xw = new XMLWriter(); $this->xw->openURI($output); + if(is_null($indent)) { + $indent = common_config('site', 'indent'); + } $this->xw->setIndent($indent); } diff --git a/plugins/Facebook/facebookaction.php b/plugins/Facebook/facebookaction.php index c852bbf5e6..b090e9bd9a 100644 --- a/plugins/Facebook/facebookaction.php +++ b/plugins/Facebook/facebookaction.php @@ -44,7 +44,7 @@ class FacebookAction extends Action var $app_uri = null; var $app_name = null; - function __construct($output='php://output', $indent=true, $facebook=null, $flink=null) + function __construct($output='php://output', $indent=null, $facebook=null, $flink=null) { parent::__construct($output, $indent); diff --git a/plugins/Facebook/facebookutil.php b/plugins/Facebook/facebookutil.php index 6f50c173ad..2abcbb14e2 100644 --- a/plugins/Facebook/facebookutil.php +++ b/plugins/Facebook/facebookutil.php @@ -168,7 +168,7 @@ function facebookBroadcastNotice($notice) function updateProfileBox($facebook, $flink, $notice) { $fbaction = new FacebookAction($output = 'php://output', - $indent = true, $facebook, $flink); + $indent = null, $facebook, $flink); $fbaction->updateProfileBox($notice); } From 2ab01e040e224943b1b15131a6e51fe6b5d6e580 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Sat, 5 Dec 2009 02:11:27 -0500 Subject: [PATCH 031/172] Add 2 new events to enable logger pluginization: StartLog and EndLog --- EVENTS.txt | 11 +++++++++++ lib/util.php | 25 ++++++++++++++----------- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/EVENTS.txt b/EVENTS.txt index a056aa0a1e..e0516f8f45 100644 --- a/EVENTS.txt +++ b/EVENTS.txt @@ -617,3 +617,14 @@ EndInlineScriptElement: After a element is written - $action - $code - $type + +StartLog: Before writing to the logs +- &$priority +- &$msg +- &$filename + +EndLog: After writing to the logs +- $priority +- $msg +- $filename + diff --git a/lib/util.php b/lib/util.php index ab046e871d..14d6665037 100644 --- a/lib/util.php +++ b/lib/util.php @@ -1070,18 +1070,21 @@ function common_request_id() function common_log($priority, $msg, $filename=null) { - $msg = '[' . common_request_id() . '] ' . $msg; - $logfile = common_config('site', 'logfile'); - if ($logfile) { - $log = fopen($logfile, "a"); - if ($log) { - $output = common_log_line($priority, $msg); - fwrite($log, $output); - fclose($log); + if(Event::handle('StartLog', array(&$priority, &$msg, &$filename))){ + $msg = '[' . common_request_id() . '] ' . $msg; + $logfile = common_config('site', 'logfile'); + if ($logfile) { + $log = fopen($logfile, "a"); + if ($log) { + $output = common_log_line($priority, $msg); + fwrite($log, $output); + fclose($log); + } + } else { + common_ensure_syslog(); + syslog($priority, $msg); } - } else { - common_ensure_syslog(); - syslog($priority, $msg); + Event::handle('EndLog', array($priority, $msg, $filename)); } } From 9349d823ee744f4f2f7b9f36c00fc605acb728fd Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Sat, 5 Dec 2009 02:13:40 -0500 Subject: [PATCH 032/172] Add FirePHP plugin - uses FirePHP as an output method for logging --- plugins/FirePHP/FirePHPPlugin.php | 59 + plugins/FirePHP/README | 21 + plugins/FirePHP/extlib/FirePHP/CHANGELOG | 110 ++ plugins/FirePHP/extlib/FirePHP/CREDITS | 12 + plugins/FirePHP/extlib/FirePHP/README | 32 + .../FirePHP/lib/FirePHPCore/FirePHP.class.php | 1529 +++++++++++++++++ .../lib/FirePHPCore/FirePHP.class.php4 | 1292 ++++++++++++++ .../extlib/FirePHP/lib/FirePHPCore/LICENSE | 29 + .../extlib/FirePHP/lib/FirePHPCore/fb.php | 261 +++ .../extlib/FirePHP/lib/FirePHPCore/fb.php4 | 251 +++ 10 files changed, 3596 insertions(+) create mode 100644 plugins/FirePHP/FirePHPPlugin.php create mode 100644 plugins/FirePHP/README create mode 100644 plugins/FirePHP/extlib/FirePHP/CHANGELOG create mode 100644 plugins/FirePHP/extlib/FirePHP/CREDITS create mode 100644 plugins/FirePHP/extlib/FirePHP/README create mode 100644 plugins/FirePHP/extlib/FirePHP/lib/FirePHPCore/FirePHP.class.php create mode 100644 plugins/FirePHP/extlib/FirePHP/lib/FirePHPCore/FirePHP.class.php4 create mode 100644 plugins/FirePHP/extlib/FirePHP/lib/FirePHPCore/LICENSE create mode 100644 plugins/FirePHP/extlib/FirePHP/lib/FirePHPCore/fb.php create mode 100644 plugins/FirePHP/extlib/FirePHP/lib/FirePHPCore/fb.php4 diff --git a/plugins/FirePHP/FirePHPPlugin.php b/plugins/FirePHP/FirePHPPlugin.php new file mode 100644 index 0000000000..37b397796e --- /dev/null +++ b/plugins/FirePHP/FirePHPPlugin.php @@ -0,0 +1,59 @@ + +Author URI: http://candrews.integralblue.com/ +*/ + +/* + * StatusNet - the distributed open-source microblogging tool + * Copyright (C) 2009, StatusNet, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +/** + * @package MinifyPlugin + * @maintainer Craig Andrews + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } + +// We bundle the FirePHP library... +set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/extlib/FirePHP/lib'); + +class FirePHPPlugin extends Plugin +{ + private $firephp; + + function onInitializePlugin() + { + //Output buffering has to be enabled so FirePHP can send the HTTP headers it needs + ob_start(); + require_once('FirePHPCore/FirePHP.class.php'); + $this->firephp = FirePHP::getInstance(true); + } + + function onStartLog(&$priority, &$msg, &$filename) + { + static $firephp_priorities = array(FirePHP::ERROR, FirePHP::ERROR, FirePHP::ERROR, FirePHP::ERROR, + FirePHP::WARN, FirePHP::LOG, FirePHP::LOG, FirePHP::INFO); + $priority = $firephp_priorities[$priority]; + $this->firephp->fb($msg, $priority); + } +} + diff --git a/plugins/FirePHP/README b/plugins/FirePHP/README new file mode 100644 index 0000000000..ee22794d51 --- /dev/null +++ b/plugins/FirePHP/README @@ -0,0 +1,21 @@ +The FirePHP writes StatusNet's log output to FirePHP. + +Using FirePHP on production sites can expose sensitive information. + You must protect the security of your application by disabling FirePHP + logging on your live site. + +Installation +============ +add "addPlugin('FirePHP', + array('setting'=>'value', 'setting2'=>'value2', ...);" +to the bottom of your config.php + +Settings +======== +None at the moment. + +Example +======= + +addPlugin('FirePHP', array()); + diff --git a/plugins/FirePHP/extlib/FirePHP/CHANGELOG b/plugins/FirePHP/extlib/FirePHP/CHANGELOG new file mode 100644 index 0000000000..6191980795 --- /dev/null +++ b/plugins/FirePHP/extlib/FirePHP/CHANGELOG @@ -0,0 +1,110 @@ + +2008-06-14 - Release Version: 0.3.1 + + - (Issue 108) ignore class name case in object filter + +2009-05-11 - Release Version: 0.3 +2009-05-01 - Release Version: 0.3.rc.1 + + - (Issue 90) PHP4 compatible version of FirePHPCore + - (Issue 98) Thrown exceptions don't send an HTTP 500 if the FirePHP exception handler is enabled + - (Issue 85) Support associative arrays in encodeTable method in FirePHP.class.php + - (Issue 66) Add a new getOptions() public method in API + - (Issue 82) Define $this->options outside of __construct + - (Issue 72) Message error if group name is null + - (Issue 68) registerErrorHandler() and registerExceptionHandler() should returns previous handlers defined + - (Issue 69) Add the missing register handler in the triumvirate (error, exception, assert) + - (Issue 75) [Error & Exception Handling] Option to not exit script execution + - (Issue 83) Exception handler can't throw exceptions + - (Issue 80) Auto/Pre collapsing groups AND Custom group row colors + +2008-11-09 - Release Version: 0.2.1 + + - (Issue 70) Problem when logging resources + +2008-10-21 - Release Version: 0.2.0 + + - Updated version to 0.2.0 + - Switched to using __sleep instead of __wakeup + - Added support to exclude object members when encoding + - Add support to enable/disable logging + +2008-10-17 - Release Version: 0.2.b.8 + + - New implementation for is_utf8() + - (Issue 55) maxObjectDepth Option not working correctly when using TABLE and EXCEPTION Type + - Bugfix for max[Object|Array]Depth when encoding nested array/object graphs + - Bugfix for FB::setOptions() + +2008-10-16 - Release Version: 0.2.b.7 + + - (Issue 45) Truncate dump when string have non utf8 cars + - (Issue 52) logging will not work when firephp object gets stored in the session. + +2008-10-16 - Release Version: 0.2.b.6 + + - (Issue 37) Display file and line information for each log message + - (Issue 51) Limit output of object graphs + - Bugfix for encoding object members set to NULL|false|'' + +2008-10-14 - Release Version: 0.2.b.5 + + - Updated JsonStream wildfire protocol to be more robust + - (Issue 33) PHP error notices running demos + - (Issue 48) Warning: ReflectionProperty::getValue() expects exactly 1 parameter, 0 given + +2008-10-08 - Release Version: 0.2.b.4 + + - Bugfix for logging objects with recursion + +2008-10-08 - Release Version: 0.2.b.3 + + - (Issue 43) Notice message in 0.2b2 + - Added support for PHP's native json_encode() if available + - Revised object encoder to detect object recursion + +2008-10-07 - Release Version: 0.2.b.2 + + - (Issue 28) Need solution for logging private and protected object variables + - Added trace() and table() aliases in FirePHP class + - (Issue 41) Use PHP doc in FirePHP + - (Issue 39) Static logging method for object oriented API + +2008-10-01 - Release Version: 0.2.b.1 + + - Added support for error and exception handling + - Updated min PHP version for PEAR package to 5.2 + - Added version constant for library + - Gave server library it's own wildfire plugin namespace + - Migrated communication protocol to Wildfire JsonStream + - Added support for console groups using "group" and "groupEnd" + - Added support for log, info, warn and error logging aliases + - (Issue 29) problem with TRACE when using with error_handler + - (Issue 33) PHP error notices running demos + - (Issue 12) undefined index php notice + - Removed closing ?> php tags + - (Issue 13) the code in the fb() function has a second return statement that will never be reached + +2008-07-30 - Release Version: 0.1.1.3 + + - Include __className property in JSON string if variable was an object + - Bugfix - Mis-spelt "Exception" in JSON encoding code + +2008-06-13 - Release Version: 0.1.1.1 + + - Bugfix - Standardize windows paths in stack traces + - Bugfix - Display correct stack trace info in windows environments + - Bugfix - Check $_SERVER['HTTP_USER_AGENT'] before returning + +2008-06-13 - Release Version: 0.1.1 + + - Added support for FirePHP::TRACE log style + - Changed license to New BSD License + +2008-06-06 - Release Version: 0.0.2 + + - Bugfix - Added usleep() to header writing loop to ensure unique index + - Bugfix - Ensure chunk_split does not generate trailing "\n" with empty data header + - Added support for FirePHP::TABLE log style + + \ No newline at end of file diff --git a/plugins/FirePHP/extlib/FirePHP/CREDITS b/plugins/FirePHP/extlib/FirePHP/CREDITS new file mode 100644 index 0000000000..5f0d463d16 --- /dev/null +++ b/plugins/FirePHP/extlib/FirePHP/CREDITS @@ -0,0 +1,12 @@ + _______________________________ + F i r e P H P C o r e + + Current Development + ------------------- + + Christoph Dorn + Michael Day + + If you've done work on FirePHPCore and you are not listed here, + please feel free to add yourself. + diff --git a/plugins/FirePHP/extlib/FirePHP/README b/plugins/FirePHP/extlib/FirePHP/README new file mode 100644 index 0000000000..033719fae2 --- /dev/null +++ b/plugins/FirePHP/extlib/FirePHP/README @@ -0,0 +1,32 @@ + +Version: 0.3.1 + +------------------------------------------------------ + Requirements +------------------------------------------------------ + +Client Side: + + - Firefox - http://www.getfirefox.com/ + - Firebug - http://www.getfirebug.com/ + - FirePHP - http://www.firephp.org/ + +Server Side: + + - PHP 5 (complete functionality) + - PHP 4 (most functionality) + + +------------------------------------------------------ + Install Tutorial +------------------------------------------------------ + + http://www.firephp.org/HQ/Install.htm + + +------------------------------------------------------ + Support +------------------------------------------------------ + + http://forum.firephp.org/ + diff --git a/plugins/FirePHP/extlib/FirePHP/lib/FirePHPCore/FirePHP.class.php b/plugins/FirePHP/extlib/FirePHP/lib/FirePHPCore/FirePHP.class.php new file mode 100644 index 0000000000..d8ae13f349 --- /dev/null +++ b/plugins/FirePHP/extlib/FirePHP/lib/FirePHPCore/FirePHP.class.php @@ -0,0 +1,1529 @@ + + * @license http://www.opensource.org/licenses/bsd-license.php + * @package FirePHP + */ + + +/** + * Sends the given data to the FirePHP Firefox Extension. + * The data can be displayed in the Firebug Console or in the + * "Server" request tab. + * + * For more information see: http://www.firephp.org/ + * + * @copyright Copyright (C) 2007-2009 Christoph Dorn + * @author Christoph Dorn + * @license http://www.opensource.org/licenses/bsd-license.php + * @package FirePHP + */ +class FirePHP { + + /** + * FirePHP version + * + * @var string + */ + const VERSION = '0.3'; + + /** + * Firebug LOG level + * + * Logs a message to firebug console. + * + * @var string + */ + const LOG = 'LOG'; + + /** + * Firebug INFO level + * + * Logs a message to firebug console and displays an info icon before the message. + * + * @var string + */ + const INFO = 'INFO'; + + /** + * Firebug WARN level + * + * Logs a message to firebug console, displays an warning icon before the message and colors the line turquoise. + * + * @var string + */ + const WARN = 'WARN'; + + /** + * Firebug ERROR level + * + * Logs a message to firebug console, displays an error icon before the message and colors the line yellow. Also increments the firebug error count. + * + * @var string + */ + const ERROR = 'ERROR'; + + /** + * Dumps a variable to firebug's server panel + * + * @var string + */ + const DUMP = 'DUMP'; + + /** + * Displays a stack trace in firebug console + * + * @var string + */ + const TRACE = 'TRACE'; + + /** + * Displays an exception in firebug console + * + * Increments the firebug error count. + * + * @var string + */ + const EXCEPTION = 'EXCEPTION'; + + /** + * Displays an table in firebug console + * + * @var string + */ + const TABLE = 'TABLE'; + + /** + * Starts a group in firebug console + * + * @var string + */ + const GROUP_START = 'GROUP_START'; + + /** + * Ends a group in firebug console + * + * @var string + */ + const GROUP_END = 'GROUP_END'; + + /** + * Singleton instance of FirePHP + * + * @var FirePHP + */ + protected static $instance = null; + + /** + * Flag whether we are logging from within the exception handler + * + * @var boolean + */ + protected $inExceptionHandler = false; + + /** + * Flag whether to throw PHP errors that have been converted to ErrorExceptions + * + * @var boolean + */ + protected $throwErrorExceptions = true; + + /** + * Flag whether to convert PHP assertion errors to Exceptions + * + * @var boolean + */ + protected $convertAssertionErrorsToExceptions = true; + + /** + * Flag whether to throw PHP assertion errors that have been converted to Exceptions + * + * @var boolean + */ + protected $throwAssertionExceptions = false; + + /** + * Wildfire protocol message index + * + * @var int + */ + protected $messageIndex = 1; + + /** + * Options for the library + * + * @var array + */ + protected $options = array('maxObjectDepth' => 10, + 'maxArrayDepth' => 20, + 'useNativeJsonEncode' => true, + 'includeLineNumbers' => true); + + /** + * Filters used to exclude object members when encoding + * + * @var array + */ + protected $objectFilters = array(); + + /** + * A stack of objects used to detect recursion during object encoding + * + * @var object + */ + protected $objectStack = array(); + + /** + * Flag to enable/disable logging + * + * @var boolean + */ + protected $enabled = true; + + /** + * The object constructor + */ + function __construct() { + } + + /** + * When the object gets serialized only include specific object members. + * + * @return array + */ + public function __sleep() { + return array('options','objectFilters','enabled'); + } + + /** + * Gets singleton instance of FirePHP + * + * @param boolean $AutoCreate + * @return FirePHP + */ + public static function getInstance($AutoCreate=false) { + if($AutoCreate===true && !self::$instance) { + self::init(); + } + return self::$instance; + } + + /** + * Creates FirePHP object and stores it for singleton access + * + * @return FirePHP + */ + public static function init() { + return self::$instance = new self(); + } + + /** + * Enable and disable logging to Firebug + * + * @param boolean $Enabled TRUE to enable, FALSE to disable + * @return void + */ + public function setEnabled($Enabled) { + $this->enabled = $Enabled; + } + + /** + * Check if logging is enabled + * + * @return boolean TRUE if enabled + */ + public function getEnabled() { + return $this->enabled; + } + + /** + * Specify a filter to be used when encoding an object + * + * Filters are used to exclude object members. + * + * @param string $Class The class name of the object + * @param array $Filter An array of members to exclude + * @return void + */ + public function setObjectFilter($Class, $Filter) { + $this->objectFilters[strtolower($Class)] = $Filter; + } + + /** + * Set some options for the library + * + * Options: + * - maxObjectDepth: The maximum depth to traverse objects (default: 10) + * - maxArrayDepth: The maximum depth to traverse arrays (default: 20) + * - useNativeJsonEncode: If true will use json_encode() (default: true) + * - includeLineNumbers: If true will include line numbers and filenames (default: true) + * + * @param array $Options The options to be set + * @return void + */ + public function setOptions($Options) { + $this->options = array_merge($this->options,$Options); + } + + /** + * Get options from the library + * + * @return array The currently set options + */ + public function getOptions() { + return $this->options; + } + + /** + * Register FirePHP as your error handler + * + * Will throw exceptions for each php error. + * + * @return mixed Returns a string containing the previously defined error handler (if any) + */ + public function registerErrorHandler($throwErrorExceptions=true) + { + //NOTE: The following errors will not be caught by this error handler: + // E_ERROR, E_PARSE, E_CORE_ERROR, + // E_CORE_WARNING, E_COMPILE_ERROR, + // E_COMPILE_WARNING, E_STRICT + + $this->throwErrorExceptions = $throwErrorExceptions; + + return set_error_handler(array($this,'errorHandler')); + } + + /** + * FirePHP's error handler + * + * Throws exception for each php error that will occur. + * + * @param int $errno + * @param string $errstr + * @param string $errfile + * @param int $errline + * @param array $errcontext + */ + public function errorHandler($errno, $errstr, $errfile, $errline, $errcontext) + { + // Don't throw exception if error reporting is switched off + if (error_reporting() == 0) { + return; + } + // Only throw exceptions for errors we are asking for + if (error_reporting() & $errno) { + + $exception = new ErrorException($errstr, 0, $errno, $errfile, $errline); + if($this->throwErrorExceptions) { + throw $exception; + } else { + $this->fb($exception); + } + } + } + + /** + * Register FirePHP as your exception handler + * + * @return mixed Returns the name of the previously defined exception handler, + * or NULL on error. + * If no previous handler was defined, NULL is also returned. + */ + public function registerExceptionHandler() + { + return set_exception_handler(array($this,'exceptionHandler')); + } + + /** + * FirePHP's exception handler + * + * Logs all exceptions to your firebug console and then stops the script. + * + * @param Exception $Exception + * @throws Exception + */ + function exceptionHandler($Exception) { + + $this->inExceptionHandler = true; + + header('HTTP/1.1 500 Internal Server Error'); + + $this->fb($Exception); + + $this->inExceptionHandler = false; + } + + /** + * Register FirePHP driver as your assert callback + * + * @param boolean $convertAssertionErrorsToExceptions + * @param boolean $throwAssertionExceptions + * @return mixed Returns the original setting or FALSE on errors + */ + public function registerAssertionHandler($convertAssertionErrorsToExceptions=true, $throwAssertionExceptions=false) + { + $this->convertAssertionErrorsToExceptions = $convertAssertionErrorsToExceptions; + $this->throwAssertionExceptions = $throwAssertionExceptions; + + if($throwAssertionExceptions && !$convertAssertionErrorsToExceptions) { + throw $this->newException('Cannot throw assertion exceptions as assertion errors are not being converted to exceptions!'); + } + + return assert_options(ASSERT_CALLBACK, array($this, 'assertionHandler')); + } + + /** + * FirePHP's assertion handler + * + * Logs all assertions to your firebug console and then stops the script. + * + * @param string $file File source of assertion + * @param int $line Line source of assertion + * @param mixed $code Assertion code + */ + public function assertionHandler($file, $line, $code) + { + + if($this->convertAssertionErrorsToExceptions) { + + $exception = new ErrorException('Assertion Failed - Code[ '.$code.' ]', 0, null, $file, $line); + + if($this->throwAssertionExceptions) { + throw $exception; + } else { + $this->fb($exception); + } + + } else { + + $this->fb($code, 'Assertion Failed', FirePHP::ERROR, array('File'=>$file,'Line'=>$line)); + + } + } + + /** + * Set custom processor url for FirePHP + * + * @param string $URL + */ + public function setProcessorUrl($URL) + { + $this->setHeader('X-FirePHP-ProcessorURL', $URL); + } + + /** + * Set custom renderer url for FirePHP + * + * @param string $URL + */ + public function setRendererUrl($URL) + { + $this->setHeader('X-FirePHP-RendererURL', $URL); + } + + /** + * Start a group for following messages. + * + * Options: + * Collapsed: [true|false] + * Color: [#RRGGBB|ColorName] + * + * @param string $Name + * @param array $Options OPTIONAL Instructions on how to log the group + * @return true + * @throws Exception + */ + public function group($Name, $Options=null) { + + if(!$Name) { + throw $this->newException('You must specify a label for the group!'); + } + + if($Options) { + if(!is_array($Options)) { + throw $this->newException('Options must be defined as an array!'); + } + if(array_key_exists('Collapsed', $Options)) { + $Options['Collapsed'] = ($Options['Collapsed'])?'true':'false'; + } + } + + return $this->fb(null, $Name, FirePHP::GROUP_START, $Options); + } + + /** + * Ends a group you have started before + * + * @return true + * @throws Exception + */ + public function groupEnd() { + return $this->fb(null, null, FirePHP::GROUP_END); + } + + /** + * Log object with label to firebug console + * + * @see FirePHP::LOG + * @param mixes $Object + * @param string $Label + * @return true + * @throws Exception + */ + public function log($Object, $Label=null) { + return $this->fb($Object, $Label, FirePHP::LOG); + } + + /** + * Log object with label to firebug console + * + * @see FirePHP::INFO + * @param mixes $Object + * @param string $Label + * @return true + * @throws Exception + */ + public function info($Object, $Label=null) { + return $this->fb($Object, $Label, FirePHP::INFO); + } + + /** + * Log object with label to firebug console + * + * @see FirePHP::WARN + * @param mixes $Object + * @param string $Label + * @return true + * @throws Exception + */ + public function warn($Object, $Label=null) { + return $this->fb($Object, $Label, FirePHP::WARN); + } + + /** + * Log object with label to firebug console + * + * @see FirePHP::ERROR + * @param mixes $Object + * @param string $Label + * @return true + * @throws Exception + */ + public function error($Object, $Label=null) { + return $this->fb($Object, $Label, FirePHP::ERROR); + } + + /** + * Dumps key and variable to firebug server panel + * + * @see FirePHP::DUMP + * @param string $Key + * @param mixed $Variable + * @return true + * @throws Exception + */ + public function dump($Key, $Variable) { + return $this->fb($Variable, $Key, FirePHP::DUMP); + } + + /** + * Log a trace in the firebug console + * + * @see FirePHP::TRACE + * @param string $Label + * @return true + * @throws Exception + */ + public function trace($Label) { + return $this->fb($Label, FirePHP::TRACE); + } + + /** + * Log a table in the firebug console + * + * @see FirePHP::TABLE + * @param string $Label + * @param string $Table + * @return true + * @throws Exception + */ + public function table($Label, $Table) { + return $this->fb($Table, $Label, FirePHP::TABLE); + } + + /** + * Check if FirePHP is installed on client + * + * @return boolean + */ + public function detectClientExtension() { + /* Check if FirePHP is installed on client */ + if(!@preg_match_all('/\sFirePHP\/([\.|\d]*)\s?/si',$this->getUserAgent(),$m) || + !version_compare($m[1][0],'0.0.6','>=')) { + return false; + } + return true; + } + + /** + * Log varible to Firebug + * + * @see http://www.firephp.org/Wiki/Reference/Fb + * @param mixed $Object The variable to be logged + * @return true Return TRUE if message was added to headers, FALSE otherwise + * @throws Exception + */ + public function fb($Object) { + + if(!$this->enabled) { + return false; + } + + if (headers_sent($filename, $linenum)) { + // If we are logging from within the exception handler we cannot throw another exception + if($this->inExceptionHandler) { + // Simply echo the error out to the page + echo '
    FirePHP ERROR: Headers already sent in '.$filename.' on line '.$linenum.'. Cannot send log data to FirePHP. You must have Output Buffering enabled via ob_start() or output_buffering ini directive.
    '; + } else { + throw $this->newException('Headers already sent in '.$filename.' on line '.$linenum.'. Cannot send log data to FirePHP. You must have Output Buffering enabled via ob_start() or output_buffering ini directive.'); + } + } + + $Type = null; + $Label = null; + $Options = array(); + + if(func_num_args()==1) { + } else + if(func_num_args()==2) { + switch(func_get_arg(1)) { + case self::LOG: + case self::INFO: + case self::WARN: + case self::ERROR: + case self::DUMP: + case self::TRACE: + case self::EXCEPTION: + case self::TABLE: + case self::GROUP_START: + case self::GROUP_END: + $Type = func_get_arg(1); + break; + default: + $Label = func_get_arg(1); + break; + } + } else + if(func_num_args()==3) { + $Type = func_get_arg(2); + $Label = func_get_arg(1); + } else + if(func_num_args()==4) { + $Type = func_get_arg(2); + $Label = func_get_arg(1); + $Options = func_get_arg(3); + } else { + throw $this->newException('Wrong number of arguments to fb() function!'); + } + + + if(!$this->detectClientExtension()) { + return false; + } + + $meta = array(); + $skipFinalObjectEncode = false; + + if($Object instanceof Exception) { + + $meta['file'] = $this->_escapeTraceFile($Object->getFile()); + $meta['line'] = $Object->getLine(); + + $trace = $Object->getTrace(); + if($Object instanceof ErrorException + && isset($trace[0]['function']) + && $trace[0]['function']=='errorHandler' + && isset($trace[0]['class']) + && $trace[0]['class']=='FirePHP') { + + $severity = false; + switch($Object->getSeverity()) { + case E_WARNING: $severity = 'E_WARNING'; break; + case E_NOTICE: $severity = 'E_NOTICE'; break; + case E_USER_ERROR: $severity = 'E_USER_ERROR'; break; + case E_USER_WARNING: $severity = 'E_USER_WARNING'; break; + case E_USER_NOTICE: $severity = 'E_USER_NOTICE'; break; + case E_STRICT: $severity = 'E_STRICT'; break; + case E_RECOVERABLE_ERROR: $severity = 'E_RECOVERABLE_ERROR'; break; + case E_DEPRECATED: $severity = 'E_DEPRECATED'; break; + case E_USER_DEPRECATED: $severity = 'E_USER_DEPRECATED'; break; + } + + $Object = array('Class'=>get_class($Object), + 'Message'=>$severity.': '.$Object->getMessage(), + 'File'=>$this->_escapeTraceFile($Object->getFile()), + 'Line'=>$Object->getLine(), + 'Type'=>'trigger', + 'Trace'=>$this->_escapeTrace(array_splice($trace,2))); + $skipFinalObjectEncode = true; + } else { + $Object = array('Class'=>get_class($Object), + 'Message'=>$Object->getMessage(), + 'File'=>$this->_escapeTraceFile($Object->getFile()), + 'Line'=>$Object->getLine(), + 'Type'=>'throw', + 'Trace'=>$this->_escapeTrace($trace)); + $skipFinalObjectEncode = true; + } + $Type = self::EXCEPTION; + + } else + if($Type==self::TRACE) { + + $trace = debug_backtrace(); + if(!$trace) return false; + for( $i=0 ; $i_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php' + || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) { + /* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */ + } else + if(isset($trace[$i]['class']) + && isset($trace[$i+1]['file']) + && $trace[$i]['class']=='FirePHP' + && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') { + /* Skip fb() */ + } else + if($trace[$i]['function']=='fb' + || $trace[$i]['function']=='trace' + || $trace[$i]['function']=='send') { + $Object = array('Class'=>isset($trace[$i]['class'])?$trace[$i]['class']:'', + 'Type'=>isset($trace[$i]['type'])?$trace[$i]['type']:'', + 'Function'=>isset($trace[$i]['function'])?$trace[$i]['function']:'', + 'Message'=>$trace[$i]['args'][0], + 'File'=>isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'', + 'Line'=>isset($trace[$i]['line'])?$trace[$i]['line']:'', + 'Args'=>isset($trace[$i]['args'])?$this->encodeObject($trace[$i]['args']):'', + 'Trace'=>$this->_escapeTrace(array_splice($trace,$i+1))); + + $skipFinalObjectEncode = true; + $meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):''; + $meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:''; + break; + } + } + + } else + if($Type==self::TABLE) { + + if(isset($Object[0]) && is_string($Object[0])) { + $Object[1] = $this->encodeTable($Object[1]); + } else { + $Object = $this->encodeTable($Object); + } + + $skipFinalObjectEncode = true; + + } else + if($Type==self::GROUP_START) { + + if(!$Label) { + throw $this->newException('You must specify a label for the group!'); + } + + } else { + if($Type===null) { + $Type = self::LOG; + } + } + + if($this->options['includeLineNumbers']) { + if(!isset($meta['file']) || !isset($meta['line'])) { + + $trace = debug_backtrace(); + for( $i=0 ; $trace && $i_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php' + || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) { + /* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */ + } else + if(isset($trace[$i]['class']) + && isset($trace[$i+1]['file']) + && $trace[$i]['class']=='FirePHP' + && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') { + /* Skip fb() */ + } else + if(isset($trace[$i]['file']) + && substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php') { + /* Skip FB::fb() */ + } else { + $meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):''; + $meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:''; + break; + } + } + + } + } else { + unset($meta['file']); + unset($meta['line']); + } + + $this->setHeader('X-Wf-Protocol-1','http://meta.wildfirehq.org/Protocol/JsonStream/0.2'); + $this->setHeader('X-Wf-1-Plugin-1','http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/'.self::VERSION); + + $structure_index = 1; + if($Type==self::DUMP) { + $structure_index = 2; + $this->setHeader('X-Wf-1-Structure-2','http://meta.firephp.org/Wildfire/Structure/FirePHP/Dump/0.1'); + } else { + $this->setHeader('X-Wf-1-Structure-1','http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1'); + } + + if($Type==self::DUMP) { + $msg = '{"'.$Label.'":'.$this->jsonEncode($Object, $skipFinalObjectEncode).'}'; + } else { + $msg_meta = $Options; + $msg_meta['Type'] = $Type; + if($Label!==null) { + $msg_meta['Label'] = $Label; + } + if(isset($meta['file']) && !isset($msg_meta['File'])) { + $msg_meta['File'] = $meta['file']; + } + if(isset($meta['line']) && !isset($msg_meta['Line'])) { + $msg_meta['Line'] = $meta['line']; + } + $msg = '['.$this->jsonEncode($msg_meta).','.$this->jsonEncode($Object, $skipFinalObjectEncode).']'; + } + + $parts = explode("\n",chunk_split($msg, 5000, "\n")); + + for( $i=0 ; $i2) { + // Message needs to be split into multiple parts + $this->setHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex, + (($i==0)?strlen($msg):'') + . '|' . $part . '|' + . (($isetHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex, + strlen($part) . '|' . $part . '|'); + } + + $this->messageIndex++; + + if ($this->messageIndex > 99999) { + throw $this->newException('Maximum number (99,999) of messages reached!'); + } + } + } + + $this->setHeader('X-Wf-1-Index',$this->messageIndex-1); + + return true; + } + + /** + * Standardizes path for windows systems. + * + * @param string $Path + * @return string + */ + protected function _standardizePath($Path) { + return preg_replace('/\\\\+/','/',$Path); + } + + /** + * Escape trace path for windows systems + * + * @param array $Trace + * @return array + */ + protected function _escapeTrace($Trace) { + if(!$Trace) return $Trace; + for( $i=0 ; $i_escapeTraceFile($Trace[$i]['file']); + } + if(isset($Trace[$i]['args'])) { + $Trace[$i]['args'] = $this->encodeObject($Trace[$i]['args']); + } + } + return $Trace; + } + + /** + * Escape file information of trace for windows systems + * + * @param string $File + * @return string + */ + protected function _escapeTraceFile($File) { + /* Check if we have a windows filepath */ + if(strpos($File,'\\')) { + /* First strip down to single \ */ + + $file = preg_replace('/\\\\+/','\\',$File); + + return $file; + } + return $File; + } + + /** + * Send header + * + * @param string $Name + * @param string_type $Value + */ + protected function setHeader($Name, $Value) { + return header($Name.': '.$Value); + } + + /** + * Get user agent + * + * @return string|false + */ + protected function getUserAgent() { + if(!isset($_SERVER['HTTP_USER_AGENT'])) return false; + return $_SERVER['HTTP_USER_AGENT']; + } + + /** + * Returns a new exception + * + * @param string $Message + * @return Exception + */ + protected function newException($Message) { + return new Exception($Message); + } + + /** + * Encode an object into a JSON string + * + * Uses PHP's jeson_encode() if available + * + * @param object $Object The object to be encoded + * @return string The JSON string + */ + public function jsonEncode($Object, $skipObjectEncode=false) + { + if(!$skipObjectEncode) { + $Object = $this->encodeObject($Object); + } + + if(function_exists('json_encode') + && $this->options['useNativeJsonEncode']!=false) { + + return json_encode($Object); + } else { + return $this->json_encode($Object); + } + } + + /** + * Encodes a table by encoding each row and column with encodeObject() + * + * @param array $Table The table to be encoded + * @return array + */ + protected function encodeTable($Table) { + + if(!$Table) return $Table; + + $new_table = array(); + foreach($Table as $row) { + + if(is_array($row)) { + $new_row = array(); + + foreach($row as $item) { + $new_row[] = $this->encodeObject($item); + } + + $new_table[] = $new_row; + } + } + + return $new_table; + } + + /** + * Encodes an object including members with + * protected and private visibility + * + * @param Object $Object The object to be encoded + * @param int $Depth The current traversal depth + * @return array All members of the object + */ + protected function encodeObject($Object, $ObjectDepth = 1, $ArrayDepth = 1) + { + $return = array(); + + if (is_resource($Object)) { + + return '** '.(string)$Object.' **'; + + } else + if (is_object($Object)) { + + if ($ObjectDepth > $this->options['maxObjectDepth']) { + return '** Max Object Depth ('.$this->options['maxObjectDepth'].') **'; + } + + foreach ($this->objectStack as $refVal) { + if ($refVal === $Object) { + return '** Recursion ('.get_class($Object).') **'; + } + } + array_push($this->objectStack, $Object); + + $return['__className'] = $class = get_class($Object); + $class_lower = strtolower($class); + + $reflectionClass = new ReflectionClass($class); + $properties = array(); + foreach( $reflectionClass->getProperties() as $property) { + $properties[$property->getName()] = $property; + } + + $members = (array)$Object; + + foreach( $properties as $raw_name => $property ) { + + $name = $raw_name; + if($property->isStatic()) { + $name = 'static:'.$name; + } + if($property->isPublic()) { + $name = 'public:'.$name; + } else + if($property->isPrivate()) { + $name = 'private:'.$name; + $raw_name = "\0".$class."\0".$raw_name; + } else + if($property->isProtected()) { + $name = 'protected:'.$name; + $raw_name = "\0".'*'."\0".$raw_name; + } + + if(!(isset($this->objectFilters[$class_lower]) + && is_array($this->objectFilters[$class_lower]) + && in_array($raw_name,$this->objectFilters[$class_lower]))) { + + if(array_key_exists($raw_name,$members) + && !$property->isStatic()) { + + $return[$name] = $this->encodeObject($members[$raw_name], $ObjectDepth + 1, 1); + + } else { + if(method_exists($property,'setAccessible')) { + $property->setAccessible(true); + $return[$name] = $this->encodeObject($property->getValue($Object), $ObjectDepth + 1, 1); + } else + if($property->isPublic()) { + $return[$name] = $this->encodeObject($property->getValue($Object), $ObjectDepth + 1, 1); + } else { + $return[$name] = '** Need PHP 5.3 to get value **'; + } + } + } else { + $return[$name] = '** Excluded by Filter **'; + } + } + + // Include all members that are not defined in the class + // but exist in the object + foreach( $members as $raw_name => $value ) { + + $name = $raw_name; + + if ($name{0} == "\0") { + $parts = explode("\0", $name); + $name = $parts[2]; + } + + if(!isset($properties[$name])) { + $name = 'undeclared:'.$name; + + if(!(isset($this->objectFilters[$class_lower]) + && is_array($this->objectFilters[$class_lower]) + && in_array($raw_name,$this->objectFilters[$class_lower]))) { + + $return[$name] = $this->encodeObject($value, $ObjectDepth + 1, 1); + } else { + $return[$name] = '** Excluded by Filter **'; + } + } + } + + array_pop($this->objectStack); + + } elseif (is_array($Object)) { + + if ($ArrayDepth > $this->options['maxArrayDepth']) { + return '** Max Array Depth ('.$this->options['maxArrayDepth'].') **'; + } + + foreach ($Object as $key => $val) { + + // Encoding the $GLOBALS PHP array causes an infinite loop + // if the recursion is not reset here as it contains + // a reference to itself. This is the only way I have come up + // with to stop infinite recursion in this case. + if($key=='GLOBALS' + && is_array($val) + && array_key_exists('GLOBALS',$val)) { + $val['GLOBALS'] = '** Recursion (GLOBALS) **'; + } + + $return[$key] = $this->encodeObject($val, 1, $ArrayDepth + 1); + } + } else { + if(self::is_utf8($Object)) { + return $Object; + } else { + return utf8_encode($Object); + } + } + return $return; + } + + /** + * Returns true if $string is valid UTF-8 and false otherwise. + * + * @param mixed $str String to be tested + * @return boolean + */ + protected static function is_utf8($str) { + $c=0; $b=0; + $bits=0; + $len=strlen($str); + for($i=0; $i<$len; $i++){ + $c=ord($str[$i]); + if($c > 128){ + if(($c >= 254)) return false; + elseif($c >= 252) $bits=6; + elseif($c >= 248) $bits=5; + elseif($c >= 240) $bits=4; + elseif($c >= 224) $bits=3; + elseif($c >= 192) $bits=2; + else return false; + if(($i+$bits) > $len) return false; + while($bits > 1){ + $i++; + $b=ord($str[$i]); + if($b < 128 || $b > 191) return false; + $bits--; + } + } + } + return true; + } + + /** + * Converts to and from JSON format. + * + * JSON (JavaScript Object Notation) is a lightweight data-interchange + * format. It is easy for humans to read and write. It is easy for machines + * to parse and generate. It is based on a subset of the JavaScript + * Programming Language, Standard ECMA-262 3rd Edition - December 1999. + * This feature can also be found in Python. JSON is a text format that is + * completely language independent but uses conventions that are familiar + * to programmers of the C-family of languages, including C, C++, C#, Java, + * JavaScript, Perl, TCL, and many others. These properties make JSON an + * ideal data-interchange language. + * + * This package provides a simple encoder and decoder for JSON notation. It + * is intended for use with client-side Javascript applications that make + * use of HTTPRequest to perform server communication functions - data can + * be encoded into JSON notation for use in a client-side javascript, or + * decoded from incoming Javascript requests. JSON format is native to + * Javascript, and can be directly eval()'ed with no further parsing + * overhead + * + * All strings should be in ASCII or UTF-8 format! + * + * LICENSE: Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: Redistributions of source code must retain the + * above copyright notice, this list of conditions and the following + * disclaimer. Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN + * NO EVENT SHALL CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * @category + * @package Services_JSON + * @author Michal Migurski + * @author Matt Knapp + * @author Brett Stimmerman + * @author Christoph Dorn + * @copyright 2005 Michal Migurski + * @version CVS: $Id: JSON.php,v 1.31 2006/06/28 05:54:17 migurski Exp $ + * @license http://www.opensource.org/licenses/bsd-license.php + * @link http://pear.php.net/pepr/pepr-proposal-show.php?id=198 + */ + + + /** + * Keep a list of objects as we descend into the array so we can detect recursion. + */ + private $json_objectStack = array(); + + + /** + * convert a string from one UTF-8 char to one UTF-16 char + * + * Normally should be handled by mb_convert_encoding, but + * provides a slower PHP-only method for installations + * that lack the multibye string extension. + * + * @param string $utf8 UTF-8 character + * @return string UTF-16 character + * @access private + */ + private function json_utf82utf16($utf8) + { + // oh please oh please oh please oh please oh please + if(function_exists('mb_convert_encoding')) { + return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8'); + } + + switch(strlen($utf8)) { + case 1: + // this case should never be reached, because we are in ASCII range + // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + return $utf8; + + case 2: + // return a UTF-16 character from a 2-byte UTF-8 char + // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + return chr(0x07 & (ord($utf8{0}) >> 2)) + . chr((0xC0 & (ord($utf8{0}) << 6)) + | (0x3F & ord($utf8{1}))); + + case 3: + // return a UTF-16 character from a 3-byte UTF-8 char + // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + return chr((0xF0 & (ord($utf8{0}) << 4)) + | (0x0F & (ord($utf8{1}) >> 2))) + . chr((0xC0 & (ord($utf8{1}) << 6)) + | (0x7F & ord($utf8{2}))); + } + + // ignoring UTF-32 for now, sorry + return ''; + } + + /** + * encodes an arbitrary variable into JSON format + * + * @param mixed $var any number, boolean, string, array, or object to be encoded. + * see argument 1 to Services_JSON() above for array-parsing behavior. + * if var is a strng, note that encode() always expects it + * to be in ASCII or UTF-8 format! + * + * @return mixed JSON string representation of input var or an error if a problem occurs + * @access public + */ + private function json_encode($var) + { + + if(is_object($var)) { + if(in_array($var,$this->json_objectStack)) { + return '"** Recursion **"'; + } + } + + switch (gettype($var)) { + case 'boolean': + return $var ? 'true' : 'false'; + + case 'NULL': + return 'null'; + + case 'integer': + return (int) $var; + + case 'double': + case 'float': + return (float) $var; + + case 'string': + // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT + $ascii = ''; + $strlen_var = strlen($var); + + /* + * Iterate over every character in the string, + * escaping with a slash or encoding to UTF-8 where necessary + */ + for ($c = 0; $c < $strlen_var; ++$c) { + + $ord_var_c = ord($var{$c}); + + switch (true) { + case $ord_var_c == 0x08: + $ascii .= '\b'; + break; + case $ord_var_c == 0x09: + $ascii .= '\t'; + break; + case $ord_var_c == 0x0A: + $ascii .= '\n'; + break; + case $ord_var_c == 0x0C: + $ascii .= '\f'; + break; + case $ord_var_c == 0x0D: + $ascii .= '\r'; + break; + + case $ord_var_c == 0x22: + case $ord_var_c == 0x2F: + case $ord_var_c == 0x5C: + // double quote, slash, slosh + $ascii .= '\\'.$var{$c}; + break; + + case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)): + // characters U-00000000 - U-0000007F (same as ASCII) + $ascii .= $var{$c}; + break; + + case (($ord_var_c & 0xE0) == 0xC0): + // characters U-00000080 - U-000007FF, mask 110XXXXX + // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + $char = pack('C*', $ord_var_c, ord($var{$c + 1})); + $c += 1; + $utf16 = $this->json_utf82utf16($char); + $ascii .= sprintf('\u%04s', bin2hex($utf16)); + break; + + case (($ord_var_c & 0xF0) == 0xE0): + // characters U-00000800 - U-0000FFFF, mask 1110XXXX + // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + $char = pack('C*', $ord_var_c, + ord($var{$c + 1}), + ord($var{$c + 2})); + $c += 2; + $utf16 = $this->json_utf82utf16($char); + $ascii .= sprintf('\u%04s', bin2hex($utf16)); + break; + + case (($ord_var_c & 0xF8) == 0xF0): + // characters U-00010000 - U-001FFFFF, mask 11110XXX + // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + $char = pack('C*', $ord_var_c, + ord($var{$c + 1}), + ord($var{$c + 2}), + ord($var{$c + 3})); + $c += 3; + $utf16 = $this->json_utf82utf16($char); + $ascii .= sprintf('\u%04s', bin2hex($utf16)); + break; + + case (($ord_var_c & 0xFC) == 0xF8): + // characters U-00200000 - U-03FFFFFF, mask 111110XX + // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + $char = pack('C*', $ord_var_c, + ord($var{$c + 1}), + ord($var{$c + 2}), + ord($var{$c + 3}), + ord($var{$c + 4})); + $c += 4; + $utf16 = $this->json_utf82utf16($char); + $ascii .= sprintf('\u%04s', bin2hex($utf16)); + break; + + case (($ord_var_c & 0xFE) == 0xFC): + // characters U-04000000 - U-7FFFFFFF, mask 1111110X + // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + $char = pack('C*', $ord_var_c, + ord($var{$c + 1}), + ord($var{$c + 2}), + ord($var{$c + 3}), + ord($var{$c + 4}), + ord($var{$c + 5})); + $c += 5; + $utf16 = $this->json_utf82utf16($char); + $ascii .= sprintf('\u%04s', bin2hex($utf16)); + break; + } + } + + return '"'.$ascii.'"'; + + case 'array': + /* + * As per JSON spec if any array key is not an integer + * we must treat the the whole array as an object. We + * also try to catch a sparsely populated associative + * array with numeric keys here because some JS engines + * will create an array with empty indexes up to + * max_index which can cause memory issues and because + * the keys, which may be relevant, will be remapped + * otherwise. + * + * As per the ECMA and JSON specification an object may + * have any string as a property. Unfortunately due to + * a hole in the ECMA specification if the key is a + * ECMA reserved word or starts with a digit the + * parameter is only accessible using ECMAScript's + * bracket notation. + */ + + // treat as a JSON object + if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) { + + $this->json_objectStack[] = $var; + + $properties = array_map(array($this, 'json_name_value'), + array_keys($var), + array_values($var)); + + array_pop($this->json_objectStack); + + foreach($properties as $property) { + if($property instanceof Exception) { + return $property; + } + } + + return '{' . join(',', $properties) . '}'; + } + + $this->json_objectStack[] = $var; + + // treat it like a regular array + $elements = array_map(array($this, 'json_encode'), $var); + + array_pop($this->json_objectStack); + + foreach($elements as $element) { + if($element instanceof Exception) { + return $element; + } + } + + return '[' . join(',', $elements) . ']'; + + case 'object': + $vars = self::encodeObject($var); + + $this->json_objectStack[] = $var; + + $properties = array_map(array($this, 'json_name_value'), + array_keys($vars), + array_values($vars)); + + array_pop($this->json_objectStack); + + foreach($properties as $property) { + if($property instanceof Exception) { + return $property; + } + } + + return '{' . join(',', $properties) . '}'; + + default: + return null; + } + } + + /** + * array-walking function for use in generating JSON-formatted name-value pairs + * + * @param string $name name of key to use + * @param mixed $value reference to an array element to be encoded + * + * @return string JSON-formatted name-value pair, like '"name":value' + * @access private + */ + private function json_name_value($name, $value) + { + // Encoding the $GLOBALS PHP array causes an infinite loop + // if the recursion is not reset here as it contains + // a reference to itself. This is the only way I have come up + // with to stop infinite recursion in this case. + if($name=='GLOBALS' + && is_array($value) + && array_key_exists('GLOBALS',$value)) { + $value['GLOBALS'] = '** Recursion **'; + } + + $encoded_value = $this->json_encode($value); + + if($encoded_value instanceof Exception) { + return $encoded_value; + } + + return $this->json_encode(strval($name)) . ':' . $encoded_value; + } +} diff --git a/plugins/FirePHP/extlib/FirePHP/lib/FirePHPCore/FirePHP.class.php4 b/plugins/FirePHP/extlib/FirePHP/lib/FirePHPCore/FirePHP.class.php4 new file mode 100644 index 0000000000..7cc4bfb04e --- /dev/null +++ b/plugins/FirePHP/extlib/FirePHP/lib/FirePHPCore/FirePHP.class.php4 @@ -0,0 +1,1292 @@ + + * @author Michael Day + * @license http://www.opensource.org/licenses/bsd-license.php + * @package FirePHP + */ + +/** + * FirePHP version + * + * @var string + */ +define('FirePHP_VERSION', '0.3'); + +/** + * Firebug LOG level + * + * Logs a message to firebug console + * + * @var string + */ +define('FirePHP_LOG', 'LOG'); + +/** + * Firebug INFO level + * + * Logs a message to firebug console and displays an info icon before the message + * + * @var string + */ +define('FirePHP_INFO', 'INFO'); + +/** + * Firebug WARN level + * + * Logs a message to firebug console, displays a warning icon before the message and colors the line turquoise + * + * @var string + */ +define('FirePHP_WARN', 'WARN'); + +/** + * Firebug ERROR level + * + * Logs a message to firebug console, displays an error icon before the message and colors the line yellow. Also increments the firebug error count. + * + * @var string + */ +define('FirePHP_ERROR', 'ERROR'); + +/** + * Dumps a variable to firebug's server panel + * + * @var string + */ +define('FirePHP_DUMP', 'DUMP'); + +/** + * Displays a stack trace in firebug console + * + * @var string + */ +define('FirePHP_TRACE', 'TRACE'); + +/** + * Displays a table in firebug console + * + * @var string + */ +define('FirePHP_TABLE', 'TABLE'); + +/** + * Starts a group in firebug console + * + * @var string + */ +define('FirePHP_GROUP_START', 'GROUP_START'); + +/** + * Ends a group in firebug console + * + * @var string + */ +define('FirePHP_GROUP_END', 'GROUP_END'); + +/** + * Sends the given data to the FirePHP Firefox Extension. + * The data can be displayed in the Firebug Console or in the + * "Server" request tab. + * + * For more information see: http://www.firephp.org/ + * + * @copyright Copyright (C) 2007-2009 Christoph Dorn + * @author Christoph Dorn + * @author Michael Day + * @license http://www.opensource.org/licenses/bsd-license.php + * @package FirePHP + */ +class FirePHP { + /** + * Wildfire protocol message index + * + * @var int + */ + var $messageIndex = 1; + + /** + * Options for the library + * + * @var array + */ + var $options = array('maxObjectDepth' => 10, + 'maxArrayDepth' => 20, + 'useNativeJsonEncode' => true, + 'includeLineNumbers' => true); + + /** + * Filters used to exclude object members when encoding + * + * @var array + */ + var $objectFilters = array(); + + /** + * A stack of objects used to detect recursion during object encoding + * + * @var object + */ + var $objectStack = array(); + + /** + * Flag to enable/disable logging + * + * @var boolean + */ + var $enabled = true; + + /** + * The object constructor + */ + function FirePHP() { + } + + + /** + * When the object gets serialized only include specific object members. + * + * @return array + */ + function __sleep() { + return array('options','objectFilters','enabled'); + } + + /** + * Gets singleton instance of FirePHP + * + * @param boolean $AutoCreate + * @return FirePHP + */ + function &getInstance($AutoCreate=false) { + global $FirePHP_Instance; + + if($AutoCreate===true && !$FirePHP_Instance) { + $FirePHP_Instance = new FirePHP(); + } + + return $FirePHP_Instance; + } + + /** + * Enable and disable logging to Firebug + * + * @param boolean $Enabled TRUE to enable, FALSE to disable + * @return void + */ + function setEnabled($Enabled) { + $this->enabled = $Enabled; + } + + /** + * Check if logging is enabled + * + * @return boolean TRUE if enabled + */ + function getEnabled() { + return $this->enabled; + } + + /** + * Specify a filter to be used when encoding an object + * + * Filters are used to exclude object members. + * + * @param string $Class The class name of the object + * @param array $Filter An array of members to exclude + * @return void + */ + function setObjectFilter($Class, $Filter) { + $this->objectFilters[strtolower($Class)] = $Filter; + } + + /** + * Set some options for the library + * + * Options: + * - maxObjectDepth: The maximum depth to traverse objects (default: 10) + * - maxArrayDepth: The maximum depth to traverse arrays (default: 20) + * - useNativeJsonEncode: If true will use json_encode() (default: true) + * - includeLineNumbers: If true will include line numbers and filenames (default: true) + * + * @param array $Options The options to be set + * @return void + */ + function setOptions($Options) { + $this->options = array_merge($this->options,$Options); + } + + /** + * Get options from the library + * + * @return array The currently set options + */ + function getOptions() { + return $this->options; + } + + /** + * Register FirePHP as your error handler + * + * Will use FirePHP to log each php error. + * + * @return mixed Returns a string containing the previously defined error handler (if any) + */ + function registerErrorHandler() + { + //NOTE: The following errors will not be caught by this error handler: + // E_ERROR, E_PARSE, E_CORE_ERROR, + // E_CORE_WARNING, E_COMPILE_ERROR, + // E_COMPILE_WARNING, E_STRICT + + return set_error_handler(array($this,'errorHandler')); + } + + /** + * FirePHP's error handler + * + * Logs each php error that will occur. + * + * @param int $errno + * @param string $errstr + * @param string $errfile + * @param int $errline + * @param array $errcontext + */ + function errorHandler($errno, $errstr, $errfile, $errline, $errcontext) + { + global $FirePHP_Instance; + // Don't log error if error reporting is switched off + if (error_reporting() == 0) { + return; + } + // Only log error for errors we are asking for + if (error_reporting() & $errno) { + $FirePHP_Instance->group($errstr); + $FirePHP_Instance->error("{$errfile}, line $errline"); + $FirePHP_Instance->groupEnd(); + } + } + + /** + * Register FirePHP driver as your assert callback + * + * @return mixed Returns the original setting + */ + function registerAssertionHandler() + { + return assert_options(ASSERT_CALLBACK, array($this, 'assertionHandler')); + } + + /** + * FirePHP's assertion handler + * + * Logs all assertions to your firebug console and then stops the script. + * + * @param string $file File source of assertion + * @param int $line Line source of assertion + * @param mixed $code Assertion code + */ + function assertionHandler($file, $line, $code) + { + $this->fb($code, 'Assertion Failed', FirePHP_ERROR, array('File'=>$file,'Line'=>$line)); + } + + /** + * Set custom processor url for FirePHP + * + * @param string $URL + */ + function setProcessorUrl($URL) + { + $this->setHeader('X-FirePHP-ProcessorURL', $URL); + } + + /** + * Set custom renderer url for FirePHP + * + * @param string $URL + */ + function setRendererUrl($URL) + { + $this->setHeader('X-FirePHP-RendererURL', $URL); + } + + /** + * Start a group for following messages. + * + * Options: + * Collapsed: [true|false] + * Color: [#RRGGBB|ColorName] + * + * @param string $Name + * @param array $Options OPTIONAL Instructions on how to log the group + * @return true + * @throws Exception + */ + function group($Name, $Options=null) { + + if(!$Name) { + trigger_error('You must specify a label for the group!'); + } + + if($Options) { + if(!is_array($Options)) { + trigger_error('Options must be defined as an array!'); + } + if(array_key_exists('Collapsed', $Options)) { + $Options['Collapsed'] = ($Options['Collapsed'])?'true':'false'; + } + } + + return $this->fb(null, $Name, FirePHP_GROUP_START, $Options); + } + + /** + * Ends a group you have started before + * + * @return true + * @throws Exception + */ + function groupEnd() { + return $this->fb(null, null, FirePHP_GROUP_END); + } + + /** + * Log object with label to firebug console + * + * @see FirePHP::LOG + * @param mixes $Object + * @param string $Label + * @return true + * @throws Exception + */ + function log($Object, $Label=null) { + return $this->fb($Object, $Label, FirePHP_LOG); + } + + /** + * Log object with label to firebug console + * + * @see FirePHP::INFO + * @param mixes $Object + * @param string $Label + * @return true + * @throws Exception + */ + function info($Object, $Label=null) { + return $this->fb($Object, $Label, FirePHP_INFO); + } + + /** + * Log object with label to firebug console + * + * @see FirePHP::WARN + * @param mixes $Object + * @param string $Label + * @return true + * @throws Exception + */ + function warn($Object, $Label=null) { + return $this->fb($Object, $Label, FirePHP_WARN); + } + + /** + * Log object with label to firebug console + * + * @see FirePHP::ERROR + * @param mixes $Object + * @param string $Label + * @return true + * @throws Exception + */ + function error($Object, $Label=null) { + return $this->fb($Object, $Label, FirePHP_ERROR); + } + + /** + * Dumps key and variable to firebug server panel + * + * @see FirePHP::DUMP + * @param string $Key + * @param mixed $Variable + * @return true + * @throws Exception + */ + function dump($Key, $Variable) { + return $this->fb($Variable, $Key, FirePHP_DUMP); + } + + /** + * Log a trace in the firebug console + * + * @see FirePHP::TRACE + * @param string $Label + * @return true + * @throws Exception + */ + function trace($Label) { + return $this->fb($Label, FirePHP_TRACE); + } + + /** + * Log a table in the firebug console + * + * @see FirePHP::TABLE + * @param string $Label + * @param string $Table + * @return true + * @throws Exception + */ + function table($Label, $Table) { + return $this->fb($Table, $Label, FirePHP_TABLE); + } + + /** + * Check if FirePHP is installed on client + * + * @return boolean + */ + function detectClientExtension() { + /* Check if FirePHP is installed on client */ + if(!@preg_match_all('/\sFirePHP\/([\.|\d]*)\s?/si',$this->getUserAgent(),$m) || + !version_compare($m[1][0],'0.0.6','>=')) { + return false; + } + return true; + } + + /** + * Log varible to Firebug + * + * @see http://www.firephp.org/Wiki/Reference/Fb + * @param mixed $Object The variable to be logged + * @return true Return TRUE if message was added to headers, FALSE otherwise + * @throws Exception + */ + function fb($Object) { + + if(!$this->enabled) { + return false; + } + + if (headers_sent($filename, $linenum)) { + trigger_error('Headers already sent in '.$filename.' on line '.$linenum.'. Cannot send log data to FirePHP. You must have Output Buffering enabled via ob_start() or output_buffering ini directive.'); + } + + $Type = null; + $Label = null; + $Options = array(); + + if(func_num_args()==1) { + } else + if(func_num_args()==2) { + switch(func_get_arg(1)) { + case FirePHP_LOG: + case FirePHP_INFO: + case FirePHP_WARN: + case FirePHP_ERROR: + case FirePHP_DUMP: + case FirePHP_TRACE: + case FirePHP_TABLE: + case FirePHP_GROUP_START: + case FirePHP_GROUP_END: + $Type = func_get_arg(1); + break; + default: + $Label = func_get_arg(1); + break; + } + } else + if(func_num_args()==3) { + $Type = func_get_arg(2); + $Label = func_get_arg(1); + } else + if(func_num_args()==4) { + $Type = func_get_arg(2); + $Label = func_get_arg(1); + $Options = func_get_arg(3); + } else { + trigger_error('Wrong number of arguments to fb() function!'); + } + + + if(!$this->detectClientExtension()) { + return false; + } + + $meta = array(); + $skipFinalObjectEncode = false; + + if($Type==FirePHP_TRACE) { + + $trace = debug_backtrace(); + if(!$trace) return false; + for( $i=0 ; $i_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php' + || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) { + /* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */ + } else + if(isset($trace[$i]['class']) + && isset($trace[$i+1]['file']) + && $trace[$i]['class']=='FirePHP' + && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') { + /* Skip fb() */ + } else + if($trace[$i]['function']=='fb' + || $trace[$i]['function']=='trace' + || $trace[$i]['function']=='send') { + $Object = array('Class'=>isset($trace[$i]['class'])?$trace[$i]['class']:'', + 'Type'=>isset($trace[$i]['type'])?$trace[$i]['type']:'', + 'Function'=>isset($trace[$i]['function'])?$trace[$i]['function']:'', + 'Message'=>$trace[$i]['args'][0], + 'File'=>isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'', + 'Line'=>isset($trace[$i]['line'])?$trace[$i]['line']:'', + 'Args'=>isset($trace[$i]['args'])?$this->encodeObject($trace[$i]['args']):'', + 'Trace'=>$this->_escapeTrace(array_splice($trace,$i+1))); + + $skipFinalObjectEncode = true; + $meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):''; + $meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:''; + break; + } + } + + } else + if($Type==FirePHP_TABLE) { + + if(isset($Object[0]) && is_string($Object[0])) { + $Object[1] = $this->encodeTable($Object[1]); + } else { + $Object = $this->encodeTable($Object); + } + + $skipFinalObjectEncode = true; + + } else + if($Type==FirePHP_GROUP_START) { + + if(!$Label) { + trigger_error('You must specify a label for the group!'); + } + } else { + if($Type===null) { + $Type = FirePHP_LOG; + } + } + + if($this->options['includeLineNumbers']) { + if(!isset($meta['file']) || !isset($meta['line'])) { + + $trace = debug_backtrace(); + for( $i=0 ; $trace && $i_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php' + || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) { + /* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */ + } else + if(isset($trace[$i]['class']) + && isset($trace[$i+1]['file']) + && $trace[$i]['class']=='FirePHP' + && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') { + /* Skip fb() */ + } else + if(isset($trace[$i]['file']) + && substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php') { + /* Skip FB::fb() */ + } else { + $meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):''; + $meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:''; + break; + } + } + + } + } else { + unset($meta['file']); + unset($meta['line']); + } + + $this->setHeader('X-Wf-Protocol-1','http://meta.wildfirehq.org/Protocol/JsonStream/0.2'); + $this->setHeader('X-Wf-1-Plugin-1','http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/'.FirePHP_VERSION); + + $structure_index = 1; + if($Type==FirePHP_DUMP) { + $structure_index = 2; + $this->setHeader('X-Wf-1-Structure-2','http://meta.firephp.org/Wildfire/Structure/FirePHP/Dump/0.1'); + } else { + $this->setHeader('X-Wf-1-Structure-1','http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1'); + } + + if($Type==FirePHP_DUMP) { + $msg = '{"'.$Label.'":'.$this->jsonEncode($Object, $skipFinalObjectEncode).'}'; + } else { + $msg_meta = $Options; + $msg_meta['Type'] = $Type; + if($Label!==null) { + $msg_meta['Label'] = $Label; + } + if(isset($meta['file']) && !isset($msg_meta['File'])) { + $msg_meta['File'] = $meta['file']; + } + if(isset($meta['line']) && !isset($msg_meta['Line'])) { + $msg_meta['Line'] = $meta['line']; + } + $msg = '['.$this->jsonEncode($msg_meta).','.$this->jsonEncode($Object, $skipFinalObjectEncode).']'; + } + + $parts = explode("\n",chunk_split($msg, 5000, "\n")); + + for( $i=0 ; $i2) { + // Message needs to be split into multiple parts + $this->setHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex, + (($i==0)?strlen($msg):'') + . '|' . $part . '|' + . (($isetHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex, + strlen($part) . '|' . $part . '|'); + } + + $this->messageIndex++; + + if ($this->messageIndex > 99999) { + trigger_error('Maximum number (99,999) of messages reached!'); + } + } + } + + $this->setHeader('X-Wf-1-Index',$this->messageIndex-1); + + return true; + } + + + /** + * Standardizes path for windows systems. + * + * @param string $Path + * @return string + */ + function _standardizePath($Path) { + return preg_replace('/\\\\+/','/',$Path); + } + + /** + * Escape trace path for windows systems + * + * @param array $Trace + * @return array + */ + function _escapeTrace($Trace) { + if(!$Trace) return $Trace; + for( $i=0 ; $i_escapeTraceFile($Trace[$i]['file']); + } + if(isset($Trace[$i]['args'])) { + $Trace[$i]['args'] = $this->encodeObject($Trace[$i]['args']); + } + } + return $Trace; + } + + /** + * Escape file information of trace for windows systems + * + * @param string $File + * @return string + */ + function _escapeTraceFile($File) { + /* Check if we have a windows filepath */ + if(strpos($File,'\\')) { + /* First strip down to single \ */ + + $file = preg_replace('/\\\\+/','\\',$File); + + return $file; + } + return $File; + } + + /** + * Send header + * + * @param string $Name + * @param string_type $Value + */ + function setHeader($Name, $Value) { + return header($Name.': '.$Value); + } + + /** + * Get user agent + * + * @return string|false + */ + function getUserAgent() { + if(!isset($_SERVER['HTTP_USER_AGENT'])) return false; + return $_SERVER['HTTP_USER_AGENT']; + } + + /** + * Encode an object into a JSON string + * + * Uses PHP's jeson_encode() if available + * + * @param object $Object The object to be encoded + * @return string The JSON string + */ + function jsonEncode($Object, $skipObjectEncode=false) + { + if(!$skipObjectEncode) { + $Object = $this->encodeObject($Object); + } + + if(function_exists('json_encode') + && $this->options['useNativeJsonEncode']!=false) { + + return json_encode($Object); + } else { + return $this->json_encode($Object); + } + } + + /** + * Encodes a table by encoding each row and column with encodeObject() + * + * @param array $Table The table to be encoded + * @return array + */ + function encodeTable($Table) { + + if(!$Table) return $Table; + + $new_table = array(); + foreach($Table as $row) { + + if(is_array($row)) { + $new_row = array(); + + foreach($row as $item) { + $new_row[] = $this->encodeObject($item); + } + + $new_table[] = $new_row; + } + } + + return $new_table; + } + + /** + * Encodes an object + * + * @param Object $Object The object to be encoded + * @param int $Depth The current traversal depth + * @return array All members of the object + */ + function encodeObject($Object, $ObjectDepth = 1, $ArrayDepth = 1) + { + $return = array(); + + if (is_resource($Object)) { + + return '** '.(string)$Object.' **'; + + } else + if (is_object($Object)) { + + if ($ObjectDepth > $this->options['maxObjectDepth']) { + return '** Max Object Depth ('.$this->options['maxObjectDepth'].') **'; + } + + foreach ($this->objectStack as $refVal) { + if ($refVal === $Object) { + return '** Recursion ('.get_class($Object).') **'; + } + } + array_push($this->objectStack, $Object); + + $return['__className'] = $class = get_class($Object); + $class_lower = strtolower($class); + + $members = (array)$Object; + + // Include all members that are not defined in the class + // but exist in the object + foreach( $members as $raw_name => $value ) { + + $name = $raw_name; + + if ($name{0} == "\0") { + $parts = explode("\0", $name); + $name = $parts[2]; + } + + if(!isset($properties[$name])) { + $name = 'undeclared:'.$name; + + if(!(isset($this->objectFilters[$class_lower]) + && is_array($this->objectFilters[$class_lower]) + && in_array($raw_name,$this->objectFilters[$class_lower]))) { + + $return[$name] = $this->encodeObject($value, $ObjectDepth + 1, 1); + } else { + $return[$name] = '** Excluded by Filter **'; + } + } + } + + array_pop($this->objectStack); + + } elseif (is_array($Object)) { + + if ($ArrayDepth > $this->options['maxArrayDepth']) { + return '** Max Array Depth ('.$this->options['maxArrayDepth'].') **'; + } + + foreach ($Object as $key => $val) { + + // Encoding the $GLOBALS PHP array causes an infinite loop + // if the recursion is not reset here as it contains + // a reference to itself. This is the only way I have come up + // with to stop infinite recursion in this case. + if($key=='GLOBALS' + && is_array($val) + && array_key_exists('GLOBALS',$val)) { + $val['GLOBALS'] = '** Recursion (GLOBALS) **'; + } + + $return[$key] = $this->encodeObject($val, 1, $ArrayDepth + 1); + } + } else { + if($this->is_utf8($Object)) { + return $Object; + } else { + return utf8_encode($Object); + } + } + return $return; + + } + + /** + * Returns true if $string is valid UTF-8 and false otherwise. + * + * @param mixed $str String to be tested + * @return boolean + */ + function is_utf8($str) { + $c=0; $b=0; + $bits=0; + $len=strlen($str); + for($i=0; $i<$len; $i++){ + $c=ord($str[$i]); + if($c > 128){ + if(($c >= 254)) return false; + elseif($c >= 252) $bits=6; + elseif($c >= 248) $bits=5; + elseif($c >= 240) $bits=4; + elseif($c >= 224) $bits=3; + elseif($c >= 192) $bits=2; + else return false; + if(($i+$bits) > $len) return false; + while($bits > 1){ + $i++; + $b=ord($str[$i]); + if($b < 128 || $b > 191) return false; + $bits--; + } + } + } + return true; + } + + /** + * Converts to and from JSON format. + * + * JSON (JavaScript Object Notation) is a lightweight data-interchange + * format. It is easy for humans to read and write. It is easy for machines + * to parse and generate. It is based on a subset of the JavaScript + * Programming Language, Standard ECMA-262 3rd Edition - December 1999. + * This feature can also be found in Python. JSON is a text format that is + * completely language independent but uses conventions that are familiar + * to programmers of the C-family of languages, including C, C++, C#, Java, + * JavaScript, Perl, TCL, and many others. These properties make JSON an + * ideal data-interchange language. + * + * This package provides a simple encoder and decoder for JSON notation. It + * is intended for use with client-side Javascript applications that make + * use of HTTPRequest to perform server communication functions - data can + * be encoded into JSON notation for use in a client-side javascript, or + * decoded from incoming Javascript requests. JSON format is native to + * Javascript, and can be directly eval()'ed with no further parsing + * overhead + * + * All strings should be in ASCII or UTF-8 format! + * + * LICENSE: Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: Redistributions of source code must retain the + * above copyright notice, this list of conditions and the following + * disclaimer. Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN + * NO EVENT SHALL CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * @category + * @package Services_JSON + * @author Michal Migurski + * @author Matt Knapp + * @author Brett Stimmerman + * @author Christoph Dorn + * @copyright 2005 Michal Migurski + * @version CVS: $Id: JSON.php,v 1.31 2006/06/28 05:54:17 migurski Exp $ + * @license http://www.opensource.org/licenses/bsd-license.php + * @link http://pear.php.net/pepr/pepr-proposal-show.php?id=198 + */ + + + /** + * Keep a list of objects as we descend into the array so we can detect recursion. + */ + var $json_objectStack = array(); + + + /** + * convert a string from one UTF-8 char to one UTF-16 char + * + * Normally should be handled by mb_convert_encoding, but + * provides a slower PHP-only method for installations + * that lack the multibye string extension. + * + * @param string $utf8 UTF-8 character + * @return string UTF-16 character + * @access private + */ + function json_utf82utf16($utf8) + { + // oh please oh please oh please oh please oh please + if(function_exists('mb_convert_encoding')) { + return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8'); + } + + switch(strlen($utf8)) { + case 1: + // this case should never be reached, because we are in ASCII range + // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + return $utf8; + + case 2: + // return a UTF-16 character from a 2-byte UTF-8 char + // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + return chr(0x07 & (ord($utf8{0}) >> 2)) + . chr((0xC0 & (ord($utf8{0}) << 6)) + | (0x3F & ord($utf8{1}))); + + case 3: + // return a UTF-16 character from a 3-byte UTF-8 char + // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + return chr((0xF0 & (ord($utf8{0}) << 4)) + | (0x0F & (ord($utf8{1}) >> 2))) + . chr((0xC0 & (ord($utf8{1}) << 6)) + | (0x7F & ord($utf8{2}))); + } + + // ignoring UTF-32 for now, sorry + return ''; + } + + /** + * encodes an arbitrary variable into JSON format + * + * @param mixed $var any number, boolean, string, array, or object to be encoded. + * see argument 1 to Services_JSON() above for array-parsing behavior. + * if var is a strng, note that encode() always expects it + * to be in ASCII or UTF-8 format! + * + * @return mixed JSON string representation of input var or an error if a problem occurs + * @access public + */ + function json_encode($var) + { + + if(is_object($var)) { + if(in_array($var,$this->json_objectStack)) { + return '"** Recursion **"'; + } + } + + switch (gettype($var)) { + case 'boolean': + return $var ? 'true' : 'false'; + + case 'NULL': + return 'null'; + + case 'integer': + return (int) $var; + + case 'double': + case 'float': + return (float) $var; + + case 'string': + // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT + $ascii = ''; + $strlen_var = strlen($var); + + /* + * Iterate over every character in the string, + * escaping with a slash or encoding to UTF-8 where necessary + */ + for ($c = 0; $c < $strlen_var; ++$c) { + + $ord_var_c = ord($var{$c}); + + switch (true) { + case $ord_var_c == 0x08: + $ascii .= '\b'; + break; + case $ord_var_c == 0x09: + $ascii .= '\t'; + break; + case $ord_var_c == 0x0A: + $ascii .= '\n'; + break; + case $ord_var_c == 0x0C: + $ascii .= '\f'; + break; + case $ord_var_c == 0x0D: + $ascii .= '\r'; + break; + + case $ord_var_c == 0x22: + case $ord_var_c == 0x2F: + case $ord_var_c == 0x5C: + // double quote, slash, slosh + $ascii .= '\\'.$var{$c}; + break; + + case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)): + // characters U-00000000 - U-0000007F (same as ASCII) + $ascii .= $var{$c}; + break; + + case (($ord_var_c & 0xE0) == 0xC0): + // characters U-00000080 - U-000007FF, mask 110XXXXX + // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + $char = pack('C*', $ord_var_c, ord($var{$c + 1})); + $c += 1; + $utf16 = $this->json_utf82utf16($char); + $ascii .= sprintf('\u%04s', bin2hex($utf16)); + break; + + case (($ord_var_c & 0xF0) == 0xE0): + // characters U-00000800 - U-0000FFFF, mask 1110XXXX + // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + $char = pack('C*', $ord_var_c, + ord($var{$c + 1}), + ord($var{$c + 2})); + $c += 2; + $utf16 = $this->json_utf82utf16($char); + $ascii .= sprintf('\u%04s', bin2hex($utf16)); + break; + + case (($ord_var_c & 0xF8) == 0xF0): + // characters U-00010000 - U-001FFFFF, mask 11110XXX + // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + $char = pack('C*', $ord_var_c, + ord($var{$c + 1}), + ord($var{$c + 2}), + ord($var{$c + 3})); + $c += 3; + $utf16 = $this->json_utf82utf16($char); + $ascii .= sprintf('\u%04s', bin2hex($utf16)); + break; + + case (($ord_var_c & 0xFC) == 0xF8): + // characters U-00200000 - U-03FFFFFF, mask 111110XX + // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + $char = pack('C*', $ord_var_c, + ord($var{$c + 1}), + ord($var{$c + 2}), + ord($var{$c + 3}), + ord($var{$c + 4})); + $c += 4; + $utf16 = $this->json_utf82utf16($char); + $ascii .= sprintf('\u%04s', bin2hex($utf16)); + break; + + case (($ord_var_c & 0xFE) == 0xFC): + // characters U-04000000 - U-7FFFFFFF, mask 1111110X + // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + $char = pack('C*', $ord_var_c, + ord($var{$c + 1}), + ord($var{$c + 2}), + ord($var{$c + 3}), + ord($var{$c + 4}), + ord($var{$c + 5})); + $c += 5; + $utf16 = $this->json_utf82utf16($char); + $ascii .= sprintf('\u%04s', bin2hex($utf16)); + break; + } + } + + return '"'.$ascii.'"'; + + case 'array': + /* + * As per JSON spec if any array key is not an integer + * we must treat the the whole array as an object. We + * also try to catch a sparsely populated associative + * array with numeric keys here because some JS engines + * will create an array with empty indexes up to + * max_index which can cause memory issues and because + * the keys, which may be relevant, will be remapped + * otherwise. + * + * As per the ECMA and JSON specification an object may + * have any string as a property. Unfortunately due to + * a hole in the ECMA specification if the key is a + * ECMA reserved word or starts with a digit the + * parameter is only accessible using ECMAScript's + * bracket notation. + */ + + // treat as a JSON object + if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) { + + $this->json_objectStack[] = $var; + + $properties = array_map(array($this, 'json_name_value'), + array_keys($var), + array_values($var)); + + array_pop($this->json_objectStack); + + return '{' . join(',', $properties) . '}'; + } + + $this->json_objectStack[] = $var; + + // treat it like a regular array + $elements = array_map(array($this, 'json_encode'), $var); + + array_pop($this->json_objectStack); + + return '[' . join(',', $elements) . ']'; + + case 'object': + $vars = FirePHP::encodeObject($var); + + $this->json_objectStack[] = $var; + + $properties = array_map(array($this, 'json_name_value'), + array_keys($vars), + array_values($vars)); + + array_pop($this->json_objectStack); + + return '{' . join(',', $properties) . '}'; + + default: + return null; + } + } + + /** + * array-walking function for use in generating JSON-formatted name-value pairs + * + * @param string $name name of key to use + * @param mixed $value reference to an array element to be encoded + * + * @return string JSON-formatted name-value pair, like '"name":value' + * @access private + */ + function json_name_value($name, $value) + { + // Encoding the $GLOBALS PHP array causes an infinite loop + // if the recursion is not reset here as it contains + // a reference to itself. This is the only way I have come up + // with to stop infinite recursion in this case. + if($name=='GLOBALS' + && is_array($value) + && array_key_exists('GLOBALS',$value)) { + $value['GLOBALS'] = '** Recursion **'; + } + + $encoded_value = $this->json_encode($value); + + return $this->json_encode(strval($name)) . ':' . $encoded_value; + } +} + diff --git a/plugins/FirePHP/extlib/FirePHP/lib/FirePHPCore/LICENSE b/plugins/FirePHP/extlib/FirePHP/lib/FirePHPCore/LICENSE new file mode 100644 index 0000000000..3e390f9d96 --- /dev/null +++ b/plugins/FirePHP/extlib/FirePHP/lib/FirePHPCore/LICENSE @@ -0,0 +1,29 @@ +Software License Agreement (New BSD License) + +Copyright (c) 2006-2009, Christoph Dorn +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + * Neither the name of Christoph Dorn nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/plugins/FirePHP/extlib/FirePHP/lib/FirePHPCore/fb.php b/plugins/FirePHP/extlib/FirePHP/lib/FirePHPCore/fb.php new file mode 100644 index 0000000000..9d1857cbc9 --- /dev/null +++ b/plugins/FirePHP/extlib/FirePHP/lib/FirePHPCore/fb.php @@ -0,0 +1,261 @@ + + * @license http://www.opensource.org/licenses/bsd-license.php + * @package FirePHP + */ + +require_once dirname(__FILE__).'/FirePHP.class.php'; + +/** + * Sends the given data to the FirePHP Firefox Extension. + * The data can be displayed in the Firebug Console or in the + * "Server" request tab. + * + * @see http://www.firephp.org/Wiki/Reference/Fb + * @param mixed $Object + * @return true + * @throws Exception + */ +function fb() +{ + $instance = FirePHP::getInstance(true); + + $args = func_get_args(); + return call_user_func_array(array($instance,'fb'),$args); +} + + +class FB +{ + /** + * Enable and disable logging to Firebug + * + * @see FirePHP->setEnabled() + * @param boolean $Enabled TRUE to enable, FALSE to disable + * @return void + */ + public static function setEnabled($Enabled) { + $instance = FirePHP::getInstance(true); + $instance->setEnabled($Enabled); + } + + /** + * Check if logging is enabled + * + * @see FirePHP->getEnabled() + * @return boolean TRUE if enabled + */ + public static function getEnabled() { + $instance = FirePHP::getInstance(true); + return $instance->getEnabled(); + } + + /** + * Specify a filter to be used when encoding an object + * + * Filters are used to exclude object members. + * + * @see FirePHP->setObjectFilter() + * @param string $Class The class name of the object + * @param array $Filter An array or members to exclude + * @return void + */ + public static function setObjectFilter($Class, $Filter) { + $instance = FirePHP::getInstance(true); + $instance->setObjectFilter($Class, $Filter); + } + + /** + * Set some options for the library + * + * @see FirePHP->setOptions() + * @param array $Options The options to be set + * @return void + */ + public static function setOptions($Options) { + $instance = FirePHP::getInstance(true); + $instance->setOptions($Options); + } + + /** + * Get options for the library + * + * @see FirePHP->getOptions() + * @return array The options + */ + public static function getOptions() { + $instance = FirePHP::getInstance(true); + return $instance->getOptions(); + } + + /** + * Log object to firebug + * + * @see http://www.firephp.org/Wiki/Reference/Fb + * @param mixed $Object + * @return true + * @throws Exception + */ + public static function send() + { + $instance = FirePHP::getInstance(true); + $args = func_get_args(); + return call_user_func_array(array($instance,'fb'),$args); + } + + /** + * Start a group for following messages + * + * Options: + * Collapsed: [true|false] + * Color: [#RRGGBB|ColorName] + * + * @param string $Name + * @param array $Options OPTIONAL Instructions on how to log the group + * @return true + */ + public static function group($Name, $Options=null) { + $instance = FirePHP::getInstance(true); + return $instance->group($Name, $Options); + } + + /** + * Ends a group you have started before + * + * @return true + * @throws Exception + */ + public static function groupEnd() { + return self::send(null, null, FirePHP::GROUP_END); + } + + /** + * Log object with label to firebug console + * + * @see FirePHP::LOG + * @param mixes $Object + * @param string $Label + * @return true + * @throws Exception + */ + public static function log($Object, $Label=null) { + return self::send($Object, $Label, FirePHP::LOG); + } + + /** + * Log object with label to firebug console + * + * @see FirePHP::INFO + * @param mixes $Object + * @param string $Label + * @return true + * @throws Exception + */ + public static function info($Object, $Label=null) { + return self::send($Object, $Label, FirePHP::INFO); + } + + /** + * Log object with label to firebug console + * + * @see FirePHP::WARN + * @param mixes $Object + * @param string $Label + * @return true + * @throws Exception + */ + public static function warn($Object, $Label=null) { + return self::send($Object, $Label, FirePHP::WARN); + } + + /** + * Log object with label to firebug console + * + * @see FirePHP::ERROR + * @param mixes $Object + * @param string $Label + * @return true + * @throws Exception + */ + public static function error($Object, $Label=null) { + return self::send($Object, $Label, FirePHP::ERROR); + } + + /** + * Dumps key and variable to firebug server panel + * + * @see FirePHP::DUMP + * @param string $Key + * @param mixed $Variable + * @return true + * @throws Exception + */ + public static function dump($Key, $Variable) { + return self::send($Variable, $Key, FirePHP::DUMP); + } + + /** + * Log a trace in the firebug console + * + * @see FirePHP::TRACE + * @param string $Label + * @return true + * @throws Exception + */ + public static function trace($Label) { + return self::send($Label, FirePHP::TRACE); + } + + /** + * Log a table in the firebug console + * + * @see FirePHP::TABLE + * @param string $Label + * @param string $Table + * @return true + * @throws Exception + */ + public static function table($Label, $Table) { + return self::send($Table, $Label, FirePHP::TABLE); + } + +} + diff --git a/plugins/FirePHP/extlib/FirePHP/lib/FirePHPCore/fb.php4 b/plugins/FirePHP/extlib/FirePHP/lib/FirePHPCore/fb.php4 new file mode 100644 index 0000000000..5b69e34873 --- /dev/null +++ b/plugins/FirePHP/extlib/FirePHP/lib/FirePHPCore/fb.php4 @@ -0,0 +1,251 @@ + + * @author Michael Day + * @license http://www.opensource.org/licenses/bsd-license.php + * @package FirePHP + */ + +require_once dirname(__FILE__).'/FirePHP.class.php4'; + +/** + * Sends the given data to the FirePHP Firefox Extension. + * The data can be displayed in the Firebug Console or in the + * "Server" request tab. + * + * @see http://www.firephp.org/Wiki/Reference/Fb + * @param mixed $Object + * @return true + * @throws Exception + */ +function fb() +{ + $instance =& FirePHP::getInstance(true); + + $args = func_get_args(); + return call_user_func_array(array(&$instance,'fb'),$args); +} + + +class FB +{ + /** + * Enable and disable logging to Firebug + * + * @see FirePHP->setEnabled() + * @param boolean $Enabled TRUE to enable, FALSE to disable + * @return void + */ + function setEnabled($Enabled) { + $instance =& FirePHP::getInstance(true); + $instance->setEnabled($Enabled); + } + + /** + * Check if logging is enabled + * + * @see FirePHP->getEnabled() + * @return boolean TRUE if enabled + */ + function getEnabled() { + $instance =& FirePHP::getInstance(true); + return $instance->getEnabled(); + } + + /** + * Specify a filter to be used when encoding an object + * + * Filters are used to exclude object members. + * + * @see FirePHP->setObjectFilter() + * @param string $Class The class name of the object + * @param array $Filter An array or members to exclude + * @return void + */ + function setObjectFilter($Class, $Filter) { + $instance =& FirePHP::getInstance(true); + $instance->setObjectFilter($Class, $Filter); + } + + /** + * Set some options for the library + * + * @see FirePHP->setOptions() + * @param array $Options The options to be set + * @return void + */ + function setOptions($Options) { + $instance =& FirePHP::getInstance(true); + $instance->setOptions($Options); + } + + /** + * Get options for the library + * + * @see FirePHP->getOptions() + * @return array The options + */ + function getOptions() { + $instance =& FirePHP::getInstance(true); + return $instance->getOptions(); + } + + /** + * Log object to firebug + * + * @see http://www.firephp.org/Wiki/Reference/Fb + * @param mixed $Object + * @return true + */ + function send() + { + $instance =& FirePHP::getInstance(true); + $args = func_get_args(); + return call_user_func_array(array(&$instance,'fb'),$args); + } + + /** + * Start a group for following messages + * + * Options: + * Collapsed: [true|false] + * Color: [#RRGGBB|ColorName] + * + * @param string $Name + * @param array $Options OPTIONAL Instructions on how to log the group + * @return true + */ + function group($Name, $Options=null) { + $instance =& FirePHP::getInstance(true); + return $instance->group($Name, $Options); + } + + /** + * Ends a group you have started before + * + * @return true + */ + function groupEnd() { + return FB::send(null, null, FirePHP_GROUP_END); + } + + /** + * Log object with label to firebug console + * + * @see FirePHP::LOG + * @param mixes $Object + * @param string $Label + * @return true + */ + function log($Object, $Label=null) { + return FB::send($Object, $Label, FirePHP_LOG); + } + + /** + * Log object with label to firebug console + * + * @see FirePHP::INFO + * @param mixes $Object + * @param string $Label + * @return true + */ + function info($Object, $Label=null) { + return FB::send($Object, $Label, FirePHP_INFO); + } + + /** + * Log object with label to firebug console + * + * @see FirePHP::WARN + * @param mixes $Object + * @param string $Label + * @return true + */ + function warn($Object, $Label=null) { + return FB::send($Object, $Label, FirePHP_WARN); + } + + /** + * Log object with label to firebug console + * + * @see FirePHP::ERROR + * @param mixes $Object + * @param string $Label + * @return true + */ + function error($Object, $Label=null) { + return FB::send($Object, $Label, FirePHP_ERROR); + } + + /** + * Dumps key and variable to firebug server panel + * + * @see FirePHP::DUMP + * @param string $Key + * @param mixed $Variable + * @return true + */ + function dump($Key, $Variable) { + return FB::send($Variable, $Key, FirePHP_DUMP); + } + + /** + * Log a trace in the firebug console + * + * @see FirePHP::TRACE + * @param string $Label + * @return true + */ + function trace($Label) { + return FB::send($Label, FirePHP_TRACE); + } + + /** + * Log a table in the firebug console + * + * @see FirePHP::TABLE + * @param string $Label + * @param string $Table + * @return true + */ + function table($Label, $Table) { + return FB::send($Table, $Label, FirePHP_TABLE); + } +} From c9fcd73798ffb7ac050af510d65771aa1020a438 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sat, 5 Dec 2009 18:47:44 +0100 Subject: [PATCH 033/172] Changed input.submit style --- .../images/illustrations/illu_pattern-01.png | Bin 0 -> 538 bytes theme/default/css/display.css | 22 +++++++++++++++++- theme/identica/css/display.css | 22 +++++++++++++++++- 3 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 theme/base/images/illustrations/illu_pattern-01.png diff --git a/theme/base/images/illustrations/illu_pattern-01.png b/theme/base/images/illustrations/illu_pattern-01.png new file mode 100644 index 0000000000000000000000000000000000000000..833309e587081595bc549479a656b7dc29f0ddd4 GIT binary patch literal 538 zcmV+#0_FXQP)Px$)Ja4^RA}DqSV3;XFbt!B{r^RK*t#CL!~Sis`%|0qz#hGX6Ue4a4DBqB^? zx4KvaY=pr)+lZGN75dNE;{uxxj6@SDlPZ#m%;9p7Mn-0meMZyjA}x^k*?Y!k2S%!8 zv#S3nm}dcEwvlLYii~ERYuWb4jb#2!p-5IUsN@t!*LwD1D9A<1g@}=xSkzXH;F4ri z2i+K1?U_~`NntFiZHIt*ElNd{5VSN9I)y32P^7hzjMXg)m5tmlE}+W2EMO*TUJs1? zYm7OPMMJg9X9dNaTDEt;GmOkGG;1!iyrbHUSNB>7tdqgmnQq~9%$V%n1e|a!6v<6x z4AqRN8)j16GN*DSw&jR2`Ro{T`l&028*ae7I>JQDRfeFnCmsu_wEpaD>S`Ui6;SIr z)+-M6%#&922b6k>B6qr89k~@O4x(*G24E9GJlyx}S2=5%sTa@u*xEm=?&2Z96^TWs zCCZU(+5uEZ3k%6zac=f7)&PK{0f3p2q?y?svGMnI?cE#S5nUH|3`C>RXfzs)Mx)Va cG#Wd;04~J|s*~4%!~g&Q07*qoM6N<$g12b(N&o-= literal 0 HcmV?d00001 diff --git a/theme/default/css/display.css b/theme/default/css/display.css index ad64b4198f..d11bbe15e3 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -55,7 +55,6 @@ border-color:#DDDDDD; background:none; } -input.submit, .form_notice.warning #notice_text-count, .form_settings .form_note, .entity_remote_subscribe, @@ -92,6 +91,27 @@ input.submit, .entity_actions .form_notice input.submit { color:#FFFFFF; } +input.submit { +background:#AAAAAA url(../../base/images/illustrations/illu_pattern-01.png) 0 0 repeat-x; +text-shadow:0 1px 0 #FFFFFF; +color:#000000; +border-color:#AAAAAA; +border-top-color:#CCCCCC; +border-left-color:#CCCCCC; +} +input.submit:hover { +background-position:0 -5px; +} +input.submit:focus { +background-position:0 -15px; +box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1); +-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1); +-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1); +text-shadow:none; +} +.entity_actions input.submit { +text-shadow:none; +} a, .form_settings input.form_action-primary, diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index d5a5d38dee..d65ea2ef63 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -55,7 +55,6 @@ border-color:#DDDDDD; background:none; } -input.submit, .form_notice.warning #notice_text-count, .form_settings .form_note, .entity_remote_subscribe, @@ -92,6 +91,27 @@ input.submit, .entity_actions .form_notice input.submit { color:#FFFFFF; } +input.submit { +background:#AAAAAA url(../../base/images/illustrations/illu_pattern-01.png) 0 0 repeat-x; +text-shadow:0 1px 0 #FFFFFF; +color:#000000; +border-color:#AAAAAA; +border-top-color:#CCCCCC; +border-left-color:#CCCCCC; +} +input.submit:hover { +background-position:0 -5px; +} +input.submit:focus { +background-position:0 -15px; +box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1); +-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1); +-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1); +text-shadow:none; +} +.entity_actions input.submit { +text-shadow:none; +} a, .form_settings input.form_action-primary, From 197a823be4713d4644491ec99cf00a70454c3086 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sat, 5 Dec 2009 21:01:18 +0100 Subject: [PATCH 034/172] Localisation updates for !StatusNet from !translatewiki.net !sntrans --- locale/ar/LC_MESSAGES/statusnet.po | 121 +- locale/bg/LC_MESSAGES/statusnet.po | 94 +- locale/ca/LC_MESSAGES/statusnet.po | 122 +- locale/cs/LC_MESSAGES/statusnet.po | 196 +- locale/de/LC_MESSAGES/statusnet.po | 296 ++- locale/el/LC_MESSAGES/statusnet.po | 130 +- locale/en_GB/LC_MESSAGES/statusnet.po | 94 +- locale/es/LC_MESSAGES/statusnet.po | 94 +- locale/fi/LC_MESSAGES/statusnet.po | 94 +- locale/fr/LC_MESSAGES/statusnet.po | 369 +-- locale/ga/LC_MESSAGES/statusnet.po | 94 +- locale/he/LC_MESSAGES/statusnet.po | 94 +- locale/hsb/LC_MESSAGES/statusnet.po | 3139 ++++++++++++++++++++++++- locale/is/LC_MESSAGES/statusnet.po | 94 +- locale/it/LC_MESSAGES/statusnet.po | 94 +- locale/ja/LC_MESSAGES/statusnet.po | 94 +- locale/ko/LC_MESSAGES/statusnet.po | 94 +- locale/mk/LC_MESSAGES/statusnet.po | 94 +- locale/nb/LC_MESSAGES/statusnet.po | 94 +- locale/nl/LC_MESSAGES/statusnet.po | 101 +- locale/nn/LC_MESSAGES/statusnet.po | 94 +- locale/pl/LC_MESSAGES/statusnet.po | 94 +- locale/pt/LC_MESSAGES/statusnet.po | 188 +- locale/pt_BR/LC_MESSAGES/statusnet.po | 98 +- locale/ru/LC_MESSAGES/statusnet.po | 101 +- locale/statusnet.po | 88 +- locale/sv/LC_MESSAGES/statusnet.po | 1086 ++++----- locale/te/LC_MESSAGES/statusnet.po | 94 +- locale/tr/LC_MESSAGES/statusnet.po | 94 +- locale/uk/LC_MESSAGES/statusnet.po | 167 +- locale/vi/LC_MESSAGES/statusnet.po | 94 +- locale/zh_CN/LC_MESSAGES/statusnet.po | 94 +- locale/zh_TW/LC_MESSAGES/statusnet.po | 94 +- 33 files changed, 5507 insertions(+), 2481 deletions(-) diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index 2b8f80bdc8..1cffffcf3d 100644 --- a/locale/ar/LC_MESSAGES/statusnet.po +++ b/locale/ar/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-02 23:18+0000\n" -"PO-Revision-Date: 2009-12-02 23:19:01+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"PO-Revision-Date: 2009-12-05 19:53:47+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ar\n" "X-Message-Group: out-statusnet\n" @@ -181,7 +181,12 @@ msgstr "ليس للمستخدم ملف شخصي." msgid "Could not save profile." msgstr "تعذّر حفظ الملف الشخصي." -#: actions/apiblockcreate.php:108 +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "لا يمكنك حذف المستخدمين." + +#: actions/apiblockcreate.php:119 msgid "Block user failed." msgstr "فشل منع المستخدم." @@ -805,100 +810,100 @@ msgstr "التصميم" msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:270 +#: actions/designadminpanel.php:275 msgid "Invalid logo URL." msgstr "مسار شعار غير صالح." -#: actions/designadminpanel.php:274 +#: actions/designadminpanel.php:279 #, php-format msgid "Theme not available: %s" msgstr "السمة غير متوفرة: %s" -#: actions/designadminpanel.php:370 +#: actions/designadminpanel.php:375 msgid "Change logo" msgstr "غيّر الشعار" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:380 msgid "Site logo" msgstr "شعار الموقع" -#: actions/designadminpanel.php:382 +#: actions/designadminpanel.php:387 msgid "Change theme" msgstr "غيّر السمة" -#: actions/designadminpanel.php:399 +#: actions/designadminpanel.php:404 msgid "Site theme" msgstr "سمة الموقع" -#: actions/designadminpanel.php:400 +#: actions/designadminpanel.php:405 msgid "Theme for the site." msgstr "سمة الموقع." -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" msgstr "تغيير صورة الخلفية" -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" msgstr "الخلفية" -#: actions/designadminpanel.php:422 +#: actions/designadminpanel.php:427 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "" -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" msgstr "مكّن" -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" msgstr "عطّل" -#: actions/designadminpanel.php:469 lib/designsettings.php:156 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "مكّن صورة الخلفية أو عطّلها." -#: actions/designadminpanel.php:474 lib/designsettings.php:161 +#: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 +#: actions/designadminpanel.php:488 lib/designsettings.php:170 msgid "Change colours" msgstr "تغيير الألوان" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 +#: actions/designadminpanel.php:510 lib/designsettings.php:191 msgid "Content" msgstr "المحتوى" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 +#: actions/designadminpanel.php:523 lib/designsettings.php:204 msgid "Sidebar" msgstr "الشريط الجانبي" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "النص" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 +#: actions/designadminpanel.php:549 lib/designsettings.php:230 msgid "Links" msgstr "وصلات" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" msgstr "استخدم المبدئيات" -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" msgstr "استعد التصميمات المبدئية" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" msgstr "ارجع إلى المبدئي" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -908,7 +913,7 @@ msgstr "ارجع إلى المبدئي" msgid "Save" msgstr "أرسل" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "احفظ التصميم" @@ -1135,16 +1140,16 @@ msgstr "" #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 msgid "Popular notices" -msgstr "" +msgstr "إشعارات مشهورة" #: actions/favorited.php:67 #, php-format msgid "Popular notices, page %d" -msgstr "" +msgstr "إشعارات مشهورة، الصفحة %d" #: actions/favorited.php:79 msgid "The most popular notices on the site right now." -msgstr "" +msgstr "أشهر الإشعارات على الموقع حاليًا." #: actions/favorited.php:150 msgid "Favorite notices appear on this page but no one has favorited one yet." @@ -1306,11 +1311,11 @@ msgstr "لا تمنع هذا المستخدم من هذه المجموعة" #: actions/groupblock.php:179 msgid "Block this user from this group" -msgstr "" +msgstr "امنع هذا المستخدم من هذه المجموعة" #: actions/groupblock.php:196 msgid "Database error blocking user from group." -msgstr "" +msgstr "خطأ في قاعدة البيانات أثناء منع المستخدم من المجموعة." #: actions/groupbyid.php:74 msgid "No ID" @@ -1330,18 +1335,18 @@ msgid "" "palette of your choice." msgstr "" -#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 -#: lib/designsettings.php:434 lib/designsettings.php:464 +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 msgid "Couldn't update your design." msgstr "تعذّر تحديث تصميمك." -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings!" msgstr "" -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "" @@ -1637,7 +1642,7 @@ msgstr "رسالة شخصية" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" msgstr "أرسل" @@ -1922,8 +1927,8 @@ msgstr "نوع المحتوى " msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." msgstr "ليس نسق بيانات مدعوم." @@ -2500,7 +2505,7 @@ msgstr "" #: actions/recoverpassword.php:352 msgid "Password must be 6 chars or more." -msgstr "" +msgstr "يجب أن تكون كلمة السر 6 محارف أو أكثر." #: actions/recoverpassword.php:356 msgid "Password and confirmation do not match." @@ -2516,7 +2521,7 @@ msgstr "" #: actions/register.php:85 actions/register.php:189 actions/register.php:404 msgid "Sorry, only invited people can register." -msgstr "" +msgstr "عذرًا، الأشخاص المدعوون وحدهم يستطيعون التسجيل." #: actions/register.php:92 msgid "Sorry, invalid invitation code." @@ -3062,9 +3067,8 @@ msgid "Contact email address for your site" msgstr "عنوان البريد الإلكتروني للاتصال بموقعك" #: actions/siteadminpanel.php:290 -#, fuzzy msgid "Local" -msgstr "الموقع" +msgstr "محلي" #: actions/siteadminpanel.php:301 msgid "Default timezone" @@ -3103,13 +3107,12 @@ msgid "Access" msgstr "نفاذ" #: actions/siteadminpanel.php:334 -#, fuzzy msgid "Private" -msgstr "خصوصية" +msgstr "خاص" #: actions/siteadminpanel.php:336 msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" +msgstr "أأمنع المستخدمين المجهولين (غير الوالجين) من عرض الموقع؟" #: actions/siteadminpanel.php:340 #, fuzzy @@ -4320,16 +4323,11 @@ msgid "Upload file" msgstr "ارفع ملفًا" #: lib/designsettings.php:109 -#, fuzzy msgid "" "You can upload your personal background image. The maximum file size is 2MB." -msgstr "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %s." +msgstr "تستطيع رفع صورتك الشخصية. أقصى حجم للملف هو 2 م.ب." -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "" - -#: lib/designsettings.php:468 +#: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "استعيدت مبدئيات التصميم." @@ -4773,7 +4771,7 @@ msgstr "أرسل إشعارًا مباشرًا" msgid "To" msgstr "إلى" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 msgid "Available characters" msgstr "المحارف المتوفرة" @@ -4786,11 +4784,11 @@ msgstr "أرسل إشعارًا" msgid "What's up, %s?" msgstr "ما الأخبار يا %s؟" -#: lib/noticeform.php:193 +#: lib/noticeform.php:192 msgid "Attach" msgstr "أرفق" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "أرفق ملفًا" @@ -4955,7 +4953,7 @@ msgstr "مُختارون" #: lib/publicgroupnav.php:92 msgid "Popular" -msgstr "" +msgstr "مشهورة" #: lib/sandboxform.php:67 msgid "Sandbox" @@ -5060,7 +5058,12 @@ msgstr "" msgid "Not subscribed!" msgstr "لست مُشتركًا!" -#: lib/subs.php:140 +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "تعذّر حذف الاشتراك." + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "تعذّر حذف الاشتراك." diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index 8d020e0849..e5656cb5f2 100644 --- a/locale/bg/LC_MESSAGES/statusnet.po +++ b/locale/bg/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-02 23:18+0000\n" -"PO-Revision-Date: 2009-12-02 23:19:07+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"PO-Revision-Date: 2009-12-05 19:53:50+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: bg\n" "X-Message-Group: out-statusnet\n" @@ -180,7 +180,12 @@ msgstr "Потребителят няма профил." msgid "Could not save profile." msgstr "Грешка при запазване на профила." -#: actions/apiblockcreate.php:108 +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "Не можете да спрете да следите себе си!" + +#: actions/apiblockcreate.php:119 msgid "Block user failed." msgstr "" @@ -818,106 +823,106 @@ msgstr "" msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:270 +#: actions/designadminpanel.php:275 #, fuzzy msgid "Invalid logo URL." msgstr "Неправилен размер." -#: actions/designadminpanel.php:274 +#: actions/designadminpanel.php:279 #, fuzzy, php-format msgid "Theme not available: %s" msgstr "Страницата не е достъпна във вида медия, който приемате" -#: actions/designadminpanel.php:370 +#: actions/designadminpanel.php:375 msgid "Change logo" msgstr "Смяна на логото" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:380 #, fuzzy msgid "Site logo" msgstr "Покани" -#: actions/designadminpanel.php:382 +#: actions/designadminpanel.php:387 #, fuzzy msgid "Change theme" msgstr "Промяна" -#: actions/designadminpanel.php:399 +#: actions/designadminpanel.php:404 #, fuzzy msgid "Site theme" msgstr "Нова бележка" -#: actions/designadminpanel.php:400 +#: actions/designadminpanel.php:405 #, fuzzy msgid "Theme for the site." msgstr "Излизане от сайта" -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" msgstr "Смяна на изображението за фон" -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" msgstr "Фон" -#: actions/designadminpanel.php:422 +#: actions/designadminpanel.php:427 #, fuzzy, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "Може да качите лого за групата ви." -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" msgstr "Вкл." -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" msgstr "Изкл." -#: actions/designadminpanel.php:469 lib/designsettings.php:156 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:161 +#: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 +#: actions/designadminpanel.php:488 lib/designsettings.php:170 msgid "Change colours" msgstr "Смяна на цветовете" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 +#: actions/designadminpanel.php:510 lib/designsettings.php:191 msgid "Content" msgstr "Съдържание" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 +#: actions/designadminpanel.php:523 lib/designsettings.php:204 msgid "Sidebar" msgstr "Страничен панел" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "Текст" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 +#: actions/designadminpanel.php:549 lib/designsettings.php:230 #, fuzzy msgid "Links" msgstr "Списък" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -927,7 +932,7 @@ msgstr "" msgid "Save" msgstr "Запазване" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1370,20 +1375,20 @@ msgid "" "palette of your choice." msgstr "" -#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 -#: lib/designsettings.php:434 lib/designsettings.php:464 +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 #, fuzzy msgid "Couldn't update your design." msgstr "Грешка при обновяване на потребителя." -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 #, fuzzy msgid "Unable to save your design settings!" msgstr "Грешка при записване настройките за Twitter" -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 #, fuzzy msgid "Design preferences saved." msgstr "Настройките са запазени." @@ -1699,7 +1704,7 @@ msgstr "Лично съобщение" msgid "Optionally add a personal message to the invitation." msgstr "Може да добавите и лично съобщение към поканата." -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" msgstr "Прати" @@ -2022,8 +2027,8 @@ msgstr "Свързване" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." msgstr "Неподдържан формат на данните" @@ -4516,11 +4521,7 @@ msgid "" "You can upload your personal background image. The maximum file size is 2MB." msgstr "Можете да качите личен аватар тук." -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "" - -#: lib/designsettings.php:468 +#: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "" @@ -4978,7 +4979,7 @@ msgstr "Изпращане на пряко съобщеие" msgid "To" msgstr "До" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 msgid "Available characters" msgstr "Налични знаци" @@ -4991,11 +4992,11 @@ msgstr "Изпращане на бележка" msgid "What's up, %s?" msgstr "Какво става, %s?" -#: lib/noticeform.php:193 +#: lib/noticeform.php:192 msgid "Attach" msgstr "" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "" @@ -5272,7 +5273,12 @@ msgstr "Грешка при абониране на друг потребите msgid "Not subscribed!" msgstr "Не сте абонирани!" -#: lib/subs.php:140 +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "Грешка при изтриване на абонамента." + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "Грешка при изтриване на абонамента." diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index 23102cfb12..b4e2f70370 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-02 23:18+0000\n" -"PO-Revision-Date: 2009-12-02 23:19:11+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"PO-Revision-Date: 2009-12-05 19:53:53+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: out-statusnet\n" @@ -183,7 +183,12 @@ msgstr "L'usuari no té perfil." msgid "Could not save profile." msgstr "No s'ha pogut guardar el perfil." -#: actions/apiblockcreate.php:108 +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "No podeu suprimir els usuaris." + +#: actions/apiblockcreate.php:119 msgid "Block user failed." msgstr "Ha fallat el bloqueig d'usuari." @@ -266,7 +271,7 @@ msgstr "Aquesta notificació no és un favorit!" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 msgid "Could not delete favorite." -msgstr "No pots eliminar favorits." +msgstr "No s'ha pogut suprimir el preferit." #: actions/apifriendshipscreate.php:109 msgid "Could not follow user: User not found." @@ -834,102 +839,102 @@ msgstr "Disseny" msgid "Design settings for this StatusNet site." msgstr "Paràmetres de disseny d'aquest lloc StatusNet." -#: actions/designadminpanel.php:270 +#: actions/designadminpanel.php:275 #, fuzzy msgid "Invalid logo URL." msgstr "Mida invàlida." -#: actions/designadminpanel.php:274 +#: actions/designadminpanel.php:279 #, fuzzy, php-format msgid "Theme not available: %s" msgstr "Aquesta pàgina no està disponible en " -#: actions/designadminpanel.php:370 +#: actions/designadminpanel.php:375 msgid "Change logo" msgstr "Canvia el logotip" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:380 msgid "Site logo" msgstr "Logotip del lloc" -#: actions/designadminpanel.php:382 +#: actions/designadminpanel.php:387 msgid "Change theme" msgstr "Canvia el tema" -#: actions/designadminpanel.php:399 +#: actions/designadminpanel.php:404 #, fuzzy msgid "Site theme" msgstr "Avís del lloc" -#: actions/designadminpanel.php:400 +#: actions/designadminpanel.php:405 msgid "Theme for the site." msgstr "Tema del lloc." -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" msgstr "Canvia la imatge de fons" -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" msgstr "Fons" -#: actions/designadminpanel.php:422 +#: actions/designadminpanel.php:427 #, fuzzy, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "Pots pujar una imatge de logo per al grup." -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" msgstr "" -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:469 lib/designsettings.php:156 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:161 +#: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 +#: actions/designadminpanel.php:488 lib/designsettings.php:170 msgid "Change colours" msgstr "Canvia els colors" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 +#: actions/designadminpanel.php:510 lib/designsettings.php:191 msgid "Content" msgstr "Contingut" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 +#: actions/designadminpanel.php:523 lib/designsettings.php:204 msgid "Sidebar" msgstr "Barra lateral" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "Text" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 +#: actions/designadminpanel.php:549 lib/designsettings.php:230 msgid "Links" msgstr "Enllaços" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -939,7 +944,7 @@ msgstr "" msgid "Save" msgstr "Guardar" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "Desa el disseny" @@ -949,7 +954,7 @@ msgstr "Aquesta notificació no és un favorit!" #: actions/disfavor.php:94 msgid "Add to favorites" -msgstr "Afegir a favorits" +msgstr "Afegeix als preferits" #: actions/doc.php:69 msgid "No such document." @@ -1007,13 +1012,13 @@ msgstr "Adreça" #: actions/emailsettings.php:105 msgid "Current confirmed email address." -msgstr "Correu electrònic confirmat actualment." +msgstr "Adreça electrònica confirmada actualment." #: actions/emailsettings.php:107 actions/emailsettings.php:140 #: actions/imsettings.php:108 actions/smssettings.php:115 #: actions/smssettings.php:158 msgid "Remove" -msgstr "Eliminar" +msgstr "Suprimeix" #: actions/emailsettings.php:113 msgid "" @@ -1026,7 +1031,7 @@ msgstr "" #: actions/emailsettings.php:117 actions/imsettings.php:120 #: actions/smssettings.php:126 msgid "Cancel" -msgstr "Cancel·lar" +msgstr "Cancel·la" #: actions/emailsettings.php:121 msgid "Email Address" @@ -1039,7 +1044,7 @@ msgstr "Correu electrònic, com Email address, like \"UserName@example.org\"" #: actions/emailsettings.php:126 actions/imsettings.php:133 #: actions/smssettings.php:145 msgid "Add" -msgstr "Afegir" +msgstr "Afegeix" #: actions/emailsettings.php:133 actions/smssettings.php:152 msgid "Incoming email" @@ -1048,7 +1053,7 @@ msgstr "Correu electrònic entrant" #: actions/emailsettings.php:138 actions/smssettings.php:157 msgid "Send email to this address to post new notices." msgstr "" -"Enviar correu electrònic a aquesta direcció per publicar noves notificacions." +"Envia correu electrònic a aquesta adreça per publicar noves notificacions." #: actions/emailsettings.php:145 actions/smssettings.php:162 msgid "Make a new email address for posting to; cancels the old one." @@ -1384,20 +1389,20 @@ msgid "" "palette of your choice." msgstr "" -#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 -#: lib/designsettings.php:434 lib/designsettings.php:464 +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 #, fuzzy msgid "Couldn't update your design." msgstr "No s'ha pogut actualitzar l'usuari." -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 #, fuzzy msgid "Unable to save your design settings!" msgstr "No s'ha pogut guardar la teva configuració de Twitter!" -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 #, fuzzy msgid "Design preferences saved." msgstr "Preferències de sincronització guardades." @@ -1447,7 +1452,7 @@ msgstr "Admin" #: actions/groupmembers.php:346 lib/blockform.php:69 msgid "Block" -msgstr "Bloquejar" +msgstr "Bloca" #: actions/groupmembers.php:441 #, fuzzy @@ -1724,9 +1729,9 @@ msgstr "Missatge personal" msgid "Optionally add a personal message to the invitation." msgstr "Opcionalment pots afegir un missatge a la invitació." -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" -msgstr "Enviar" +msgstr "Envia" #: actions/invite.php:226 #, php-format @@ -1937,7 +1942,7 @@ msgstr "Nou missatge" #: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 msgid "You can't send a message to this user." -msgstr "No pots enviar un missatge a aquest usuari." +msgstr "No podeu enviar un misssatge a aquest usuari." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 #: lib/command.php:424 @@ -2048,8 +2053,8 @@ msgstr "tipus de contingut " msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." msgstr "Format de data no suportat." @@ -4514,9 +4519,8 @@ msgid "" msgstr "" #: lib/common.php:199 -#, fuzzy msgid "No configuration file found. " -msgstr "Cap codi de confirmació." +msgstr "No s'ha trobat cap fitxer de configuració. " #: lib/common.php:200 msgid "I looked for configuration files in the following places: " @@ -4527,9 +4531,8 @@ msgid "You may wish to run the installer to fix this." msgstr "" #: lib/common.php:202 -#, fuzzy msgid "Go to the installer." -msgstr "Accedir a aquest lloc" +msgstr "Vés a l'instal·lador." #: lib/connectsettingsaction.php:110 msgid "IM" @@ -4558,11 +4561,7 @@ msgid "" "You can upload your personal background image. The maximum file size is 2MB." msgstr "Pots pujar el teu avatar personal." -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "" - -#: lib/designsettings.php:468 +#: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "" @@ -5027,7 +5026,7 @@ msgstr "Enviar notificació directa" msgid "To" msgstr "A" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 msgid "Available characters" msgstr "Caràcters disponibles" @@ -5040,11 +5039,11 @@ msgstr "Enviar notificació" msgid "What's up, %s?" msgstr "Què tal, %s?" -#: lib/noticeform.php:193 +#: lib/noticeform.php:192 msgid "Attach" msgstr "" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "" @@ -5135,7 +5134,7 @@ msgstr "Respostes" #: lib/personalgroupnav.php:114 msgid "Favorites" -msgstr "Favorits" +msgstr "Preferits" #: lib/personalgroupnav.php:124 msgid "Inbox" @@ -5322,7 +5321,12 @@ msgstr "No pots subscriure a un altre a tu mateix." msgid "Not subscribed!" msgstr "No estàs subscrit!" -#: lib/subs.php:140 +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "No s'ha pogut eliminar la subscripció." + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "No s'ha pogut eliminar la subscripció." diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index f1e002a9d6..8501aacfa8 100644 --- a/locale/cs/LC_MESSAGES/statusnet.po +++ b/locale/cs/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-02 23:18+0000\n" -"PO-Revision-Date: 2009-12-02 23:19:14+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"PO-Revision-Date: 2009-12-05 19:53:56+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: cs\n" "X-Message-Group: out-statusnet\n" @@ -184,7 +184,12 @@ msgstr "Uživatel nemá profil." msgid "Could not save profile." msgstr "Nelze uložit profil" -#: actions/apiblockcreate.php:108 +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "Nelze aktualizovat uživatele" + +#: actions/apiblockcreate.php:119 msgid "Block user failed." msgstr "" @@ -265,7 +270,7 @@ msgstr "" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 msgid "Could not delete favorite." -msgstr "" +msgstr "Nelze smazat oblíbenou položku." #: actions/apifriendshipscreate.php:109 msgid "Could not follow user: User not found." @@ -609,25 +614,22 @@ msgid "Failed updating avatar." msgstr "Nahrávání obrázku selhalo." #: actions/avatarsettings.php:387 -#, fuzzy msgid "Avatar deleted." -msgstr "Obrázek nahrán" +msgstr "Avatar smazán." #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 #: actions/groupmembers.php:76 actions/grouprss.php:91 #: actions/joingroup.php:76 actions/showgroup.php:121 -#, fuzzy msgid "No nickname" -msgstr "Žádná přezdívka." +msgstr "Žádná přezdívka" #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 -#, fuzzy msgid "No such group" -msgstr "Žádné takové oznámení." +msgstr "Žádná taková skupina" #: actions/blockedfromgroup.php:90 #, fuzzy, php-format @@ -677,7 +679,7 @@ msgstr "" #: actions/block.php:143 actions/deletenotice.php:145 #: actions/deleteuser.php:147 actions/groupblock.php:178 msgid "No" -msgstr "" +msgstr "Ne" #: actions/block.php:143 actions/deleteuser.php:147 #, fuzzy @@ -687,12 +689,11 @@ msgstr "Žádný takový uživatel." #: actions/block.php:144 actions/deletenotice.php:146 #: actions/deleteuser.php:148 actions/groupblock.php:179 msgid "Yes" -msgstr "" +msgstr "Ano" #: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 -#, fuzzy msgid "Block this user" -msgstr "Žádný takový uživatel." +msgstr "Zablokovat tohoto uživatele" #: actions/block.php:162 msgid "Failed to save block information." @@ -770,7 +771,7 @@ msgstr "Nepřihlášen" #: actions/deletenotice.php:71 msgid "Can't delete this notice." -msgstr "" +msgstr "Toto oznámení nelze odstranit." #: actions/deletenotice.php:103 msgid "" @@ -793,7 +794,7 @@ msgstr "Žádné takové oznámení." #: actions/deletenotice.php:146 lib/noticelist.php:550 msgid "Delete this notice" -msgstr "" +msgstr "Odstranit toto oznámení" #: actions/deletenotice.php:157 msgid "There was a problem with your session token. Try again, please." @@ -820,122 +821,118 @@ msgid "" msgstr "" #: actions/deleteuser.php:148 lib/deleteuserform.php:77 -#, fuzzy msgid "Delete this user" -msgstr "Žádný takový uživatel." +msgstr "Odstranit tohoto uživatele" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 #: lib/adminpanelaction.php:302 lib/groupnav.php:119 msgid "Design" -msgstr "" +msgstr "Vzhled" #: actions/designadminpanel.php:73 msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:270 +#: actions/designadminpanel.php:275 #, fuzzy msgid "Invalid logo URL." msgstr "Neplatná velikost" -#: actions/designadminpanel.php:274 +#: actions/designadminpanel.php:279 #, fuzzy, php-format msgid "Theme not available: %s" msgstr "Tato stránka není k dispozici v typu média která přijímáte." -#: actions/designadminpanel.php:370 +#: actions/designadminpanel.php:375 #, fuzzy msgid "Change logo" msgstr "Změnit heslo" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:380 #, fuzzy msgid "Site logo" msgstr "Nové sdělení" -#: actions/designadminpanel.php:382 +#: actions/designadminpanel.php:387 #, fuzzy msgid "Change theme" msgstr "Změnit" -#: actions/designadminpanel.php:399 +#: actions/designadminpanel.php:404 #, fuzzy msgid "Site theme" msgstr "Nové sdělení" -#: actions/designadminpanel.php:400 +#: actions/designadminpanel.php:405 msgid "Theme for the site." msgstr "" -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" msgstr "" -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" -msgstr "" +msgstr "Pozadí" -#: actions/designadminpanel.php:422 +#: actions/designadminpanel.php:427 #, fuzzy, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků" -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" msgstr "" -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:469 lib/designsettings.php:156 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:161 +#: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 -#, fuzzy +#: actions/designadminpanel.php:488 lib/designsettings.php:170 msgid "Change colours" -msgstr "Změnit heslo" +msgstr "Změnit barvy" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 -#, fuzzy +#: actions/designadminpanel.php:510 lib/designsettings.php:191 msgid "Content" -msgstr "Připojit" +msgstr "Obsah" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 +#: actions/designadminpanel.php:523 lib/designsettings.php:204 #, fuzzy msgid "Sidebar" msgstr "Hledat" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 -#, fuzzy +#: actions/designadminpanel.php:549 lib/designsettings.php:230 msgid "Links" -msgstr "Přihlásit" +msgstr "Odkazy" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -945,7 +942,7 @@ msgstr "" msgid "Save" msgstr "Uložit" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -955,7 +952,7 @@ msgstr "" #: actions/disfavor.php:94 msgid "Add to favorites" -msgstr "" +msgstr "Přidat do oblíbených" #: actions/doc.php:69 msgid "No such document." @@ -964,7 +961,7 @@ msgstr "Žádný takový dokument." #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" -msgstr "" +msgstr "Upravit %s skupinu" #: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65 msgid "You must be logged in to create a group." @@ -995,13 +992,12 @@ msgid "Could not create aliases." msgstr "Nelze uložin informace o obrázku" #: actions/editgroup.php:269 -#, fuzzy msgid "Options saved." -msgstr "Nastavení uloženo" +msgstr "Nastavení uloženo." #: actions/emailsettings.php:60 msgid "Email Settings" -msgstr "" +msgstr "Nastavení E-mailu" #: actions/emailsettings.php:71 #, php-format @@ -1061,7 +1057,7 @@ msgstr "" #: actions/emailsettings.php:148 actions/smssettings.php:164 msgid "New" -msgstr "" +msgstr "Nový" #: actions/emailsettings.php:153 actions/imsettings.php:139 #: actions/smssettings.php:169 @@ -1244,9 +1240,8 @@ msgid "No notice id" msgstr "Nové sdělení" #: actions/file.php:38 -#, fuzzy msgid "No notice" -msgstr "Nové sdělení" +msgstr "Žádné oznámení" #: actions/file.php:42 msgid "No attachments" @@ -1385,26 +1380,26 @@ msgid "" "palette of your choice." msgstr "" -#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 -#: lib/designsettings.php:434 lib/designsettings.php:464 +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 #, fuzzy msgid "Couldn't update your design." msgstr "Nelze aktualizovat uživatele" -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings!" msgstr "" -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 #, fuzzy msgid "Design preferences saved." msgstr "Nastavení uloženo" #: actions/grouplogo.php:139 actions/grouplogo.php:192 msgid "Group logo" -msgstr "" +msgstr "Logo skupiny" #: actions/grouplogo.php:150 #, php-format @@ -1502,7 +1497,7 @@ msgstr "" #: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" -msgstr "" +msgstr "Skupiny" #: actions/groups.php:64 #, php-format @@ -1712,7 +1707,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" msgstr "Odeslat" @@ -1885,7 +1880,7 @@ msgstr "" #: actions/newgroup.php:53 msgid "New group" -msgstr "" +msgstr "Nová skupina" #: actions/newgroup.php:110 msgid "Use this form to create a new group." @@ -2008,8 +2003,8 @@ msgstr "Připojit" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." msgstr "" @@ -2313,9 +2308,8 @@ msgid "Describe yourself and your interests in %d chars" msgstr "Popiš sebe a své zájmy ve 140 znacích" #: actions/profilesettings.php:125 actions/register.php:463 -#, fuzzy msgid "Describe yourself and your interests" -msgstr "Popiš sebe a své zájmy ve 140 znacích" +msgstr "Popište sebe a své zájmy" #: actions/profilesettings.php:127 actions/register.php:465 msgid "Bio" @@ -2345,7 +2339,7 @@ msgstr "" #: actions/profilesettings.php:144 actions/siteadminpanel.php:307 msgid "Language" -msgstr "" +msgstr "Jazyk" #: actions/profilesettings.php:145 msgid "Preferred language" @@ -2629,7 +2623,7 @@ msgstr "Chyba v ověřovacím kódu" #: actions/register.php:112 msgid "Registration successful" -msgstr "" +msgstr "Registrace úspěšná" #: actions/register.php:114 actions/register.php:502 lib/action.php:455 #: lib/logingroupnav.php:85 @@ -2921,9 +2915,8 @@ msgstr "" #: actions/showgroup.php:274 actions/tagother.php:128 #: actions/userauthorization.php:179 lib/userprofile.php:194 -#, fuzzy msgid "Note" -msgstr "Sdělení" +msgstr "Poznámka" #: actions/showgroup.php:284 lib/groupeditform.php:184 msgid "Aliases" @@ -3392,7 +3385,7 @@ msgstr "" #: actions/smssettings.php:306 msgid "No phone number." -msgstr "" +msgstr "Žádné telefonní číslo." #: actions/smssettings.php:311 msgid "No carrier selected." @@ -3759,7 +3752,7 @@ msgstr "" #: actions/userauthorization.php:188 msgid "License" -msgstr "" +msgstr "Licence" #: actions/userauthorization.php:209 msgid "Accept" @@ -4074,9 +4067,8 @@ msgid "Help" msgstr "Nápověda" #: lib/action.php:461 -#, fuzzy msgid "Help me!" -msgstr "Nápověda" +msgstr "Pomoci mi!" #: lib/action.php:464 lib/searchaction.php:127 msgid "Search" @@ -4233,9 +4225,8 @@ msgid "Author" msgstr "" #: lib/attachmentlist.php:278 -#, fuzzy msgid "Provider" -msgstr "Profil" +msgstr "Poskytovatel" #: lib/attachmentnoticesection.php:67 msgid "Notices where this attachment appears" @@ -4500,11 +4491,7 @@ msgid "" "You can upload your personal background image. The maximum file size is 2MB." msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků" -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "" - -#: lib/designsettings.php:468 +#: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "" @@ -4616,9 +4603,8 @@ msgid "Edit %s group properties" msgstr "" #: lib/groupnav.php:113 -#, fuzzy msgid "Logo" -msgstr "Odhlásit" +msgstr "Logo" #: lib/groupnav.php:114 #, php-format @@ -4691,9 +4677,8 @@ msgid "[%s]" msgstr "" #: lib/joinform.php:114 -#, fuzzy msgid "Join" -msgstr "Přihlásit" +msgstr "Přidat se" #: lib/leaveform.php:114 #, fuzzy @@ -4773,9 +4758,9 @@ msgstr "" "%4$s.\n" #: lib/mail.php:254 -#, fuzzy, php-format +#, php-format msgid "Location: %s\n" -msgstr "Umístění %s\n" +msgstr "Umístění: %s\n" #: lib/mail.php:256 #, fuzzy, php-format @@ -4968,7 +4953,7 @@ msgstr "" msgid "To" msgstr "" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 #, fuzzy msgid "Available characters" msgstr "6 a více znaků" @@ -4983,11 +4968,11 @@ msgstr "Nové sdělení" msgid "What's up, %s?" msgstr "Co se děje %s?" -#: lib/noticeform.php:193 +#: lib/noticeform.php:192 msgid "Attach" msgstr "" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "" @@ -5077,7 +5062,7 @@ msgstr "Odpovědi" #: lib/personalgroupnav.php:114 msgid "Favorites" -msgstr "" +msgstr "Oblíbené" #: lib/personalgroupnav.php:124 msgid "Inbox" @@ -5113,9 +5098,8 @@ msgid "Subscribers" msgstr "Odběratelé" #: lib/profileaction.php:157 -#, fuzzy msgid "All subscribers" -msgstr "Odběratelé" +msgstr "Všichni odběratelé" #: lib/profileaction.php:178 msgid "User ID" @@ -5267,7 +5251,12 @@ msgstr "" msgid "Not subscribed!" msgstr "Nepřihlášen!" -#: lib/subs.php:140 +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "Nelze smazat odebírání" + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "Nelze smazat odebírání" @@ -5306,13 +5295,12 @@ msgid "Unsubscribe" msgstr "Odhlásit" #: lib/userprofile.php:116 -#, fuzzy msgid "Edit Avatar" -msgstr "Obrázek" +msgstr "Upravit avatar" #: lib/userprofile.php:236 msgid "User actions" -msgstr "" +msgstr "Akce uživatele" #: lib/userprofile.php:248 #, fuzzy @@ -5329,7 +5317,7 @@ msgstr "" #: lib/userprofile.php:273 msgid "Message" -msgstr "" +msgstr "Zpráva" #: lib/userprofile.php:311 msgid "Moderate" @@ -5395,7 +5383,7 @@ msgstr "" #: scripts/maildaemon.php:53 msgid "Not a registered user." -msgstr "" +msgstr "Není registrovaný uživatel." #: scripts/maildaemon.php:57 msgid "Sorry, that is not your incoming email address." diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index e68bc1fd48..2bc9805d97 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-02 23:18+0000\n" -"PO-Revision-Date: 2009-12-02 23:19:18+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"PO-Revision-Date: 2009-12-05 19:54:00+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: out-statusnet\n" @@ -180,7 +180,12 @@ msgstr "Benutzer hat kein Profil." msgid "Could not save profile." msgstr "Konnte Profil nicht speichern." -#: actions/apiblockcreate.php:108 +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "Du kannst dich nicht selbst entfolgen!" + +#: actions/apiblockcreate.php:119 msgid "Block user failed." msgstr "Blockieren des Benutzers fehlgeschlagen." @@ -320,13 +325,13 @@ msgstr "Ungültiger Nutzername." #: actions/register.php:217 msgid "Homepage is not a valid URL." msgstr "" -"Homepage ist kein gültiger URL. URL´s müssen ein Präfix wie http enthalten." +"Homepage ist keine gültige URL. URL’s müssen ein Präfix wie http enthalten." #: actions/apigroupcreate.php:205 actions/editgroup.php:198 #: actions/newgroup.php:142 actions/profilesettings.php:218 #: actions/register.php:220 msgid "Full name is too long (max 255 chars)." -msgstr "Ihr vollständiger Name ist zu lang (maximal 255 Zeichen)." +msgstr "Der vollständige Name ist zu lang (maximal 255 Zeichen)." #: actions/apigroupcreate.php:213 #, php-format @@ -374,7 +379,7 @@ msgstr "Du bist bereits Mitglied dieser Gruppe" #: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221 msgid "You have been blocked from that group by the admin." -msgstr "Der Admin dieser Gruppe hat Sie gesperrt." +msgstr "Der Admin dieser Gruppe hat dich gesperrt." #: actions/apigroupjoin.php:138 #, php-format @@ -498,7 +503,7 @@ msgstr "Nachrichten, die mit %s getagt sind" #: actions/apitimelinetag.php:107 actions/tagrss.php:64 #, php-format msgid "Updates tagged with %1$s on %2$s!" -msgstr "Updates mit %1$s getagt auf %2$s!" +msgstr "Aktualisierungen mit %1$s getagt auf %2$s!" #: actions/apiusershow.php:96 msgid "Not found." @@ -686,9 +691,8 @@ msgid "Failed to save block information." msgstr "Konnte Blockierungsdaten nicht speichern." #: actions/bookmarklet.php:50 -#, fuzzy msgid "Post to " -msgstr "Foto" +msgstr "Versenden an " #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -731,7 +735,7 @@ msgstr "Adresse bestätigen" #: actions/confirmaddress.php:159 #, php-format msgid "The address \"%s\" has been confirmed for your account." -msgstr "Die Adresse „%s“\" wurde für dein Konto bestätigt." +msgstr "Die Adresse „%s“ wurde für dein Konto bestätigt." #: actions/conversation.php:99 msgid "Conversation" @@ -773,7 +777,7 @@ msgstr "Notiz löschen" #: actions/deletenotice.php:144 msgid "Are you sure you want to delete this notice?" -msgstr "Sind sie sicher, dass sie diese Nachricht löschen wollen?" +msgstr "Bist du sicher, dass du diese Nachricht löschen möchtest?" #: actions/deletenotice.php:145 msgid "Do not delete this notice" @@ -816,107 +820,104 @@ msgstr "" #: actions/designadminpanel.php:73 msgid "Design settings for this StatusNet site." -msgstr "" +msgstr "Design-Einstellungen für diese StatusNet-Website." -#: actions/designadminpanel.php:270 +#: actions/designadminpanel.php:275 msgid "Invalid logo URL." msgstr "Ungültige URL für das Logo" -#: actions/designadminpanel.php:274 +#: actions/designadminpanel.php:279 #, php-format msgid "Theme not available: %s" msgstr "Theme nicht verfügbar: %s" -#: actions/designadminpanel.php:370 +#: actions/designadminpanel.php:375 msgid "Change logo" msgstr "Logo ändern" -#: actions/designadminpanel.php:375 -#, fuzzy +#: actions/designadminpanel.php:380 msgid "Site logo" -msgstr "Einladen" +msgstr "Seitenlogo" -#: actions/designadminpanel.php:382 -#, fuzzy +#: actions/designadminpanel.php:387 msgid "Change theme" -msgstr "Ändern" +msgstr "Theme ändern" -#: actions/designadminpanel.php:399 -#, fuzzy +#: actions/designadminpanel.php:404 msgid "Site theme" -msgstr "Seitennachricht" +msgstr "Seitentheme" -#: actions/designadminpanel.php:400 -#, fuzzy +#: actions/designadminpanel.php:405 msgid "Theme for the site." -msgstr "Von der Seite abmelden" +msgstr "Theme dieser Seite." -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" msgstr "Hintergrundbild ändern" -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" msgstr "Hintergrund" -#: actions/designadminpanel.php:422 -#, fuzzy, php-format +#: actions/designadminpanel.php:427 +#, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." -msgstr "Du kannst ein Logo für Deine Gruppe hochladen." +msgstr "" +"Du kannst ein Hintergrundbild für Deine Gruppe hochladen. Die maximale " +"Dateigröße beträgt %1$s." -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" msgstr "An" -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" msgstr "Aus" -#: actions/designadminpanel.php:469 lib/designsettings.php:156 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." -msgstr "" +msgstr "Hintergrundbild ein- oder ausschalten." -#: actions/designadminpanel.php:474 lib/designsettings.php:161 +#: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 +#: actions/designadminpanel.php:488 lib/designsettings.php:170 msgid "Change colours" msgstr "Farben ändern" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 +#: actions/designadminpanel.php:510 lib/designsettings.php:191 msgid "Content" msgstr "Inhalt" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 -#, fuzzy +#: actions/designadminpanel.php:523 lib/designsettings.php:204 msgid "Sidebar" -msgstr "Suchen" +msgstr "Seitenleiste" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "Text" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 +#: actions/designadminpanel.php:549 lib/designsettings.php:230 msgid "Links" msgstr "Links" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" msgstr "Standard-Design wiederherstellen" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" msgstr "Standard wiederherstellen" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -926,7 +927,7 @@ msgstr "Standard wiederherstellen" msgid "Save" msgstr "Speichern" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "Design speichern" @@ -993,7 +994,7 @@ msgstr "Adresse" #: actions/emailsettings.php:105 msgid "Current confirmed email address." -msgstr "Aktuelle bestätigte E-Mail Adresse" +msgstr "Aktuelle bestätigte E-Mail-Adresse." #: actions/emailsettings.php:107 actions/emailsettings.php:140 #: actions/imsettings.php:108 actions/smssettings.php:115 @@ -1115,8 +1116,8 @@ msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." msgstr "" -"Ein Bestätigungscode wurde an die angegebene E-Mail Adresse geschickt. " -"Überprüfen Sie Ihren Posteingang (auch den Spamordner!) für den Code und " +"Ein Bestätigungscode wurde an die angegebene E-Mail-Adresse geschickt. " +"Überprüfe deinen Posteingang (auch den Spamordner!) für den Code und " "Anweisungen, wie dieser benutzt wird." #: actions/emailsettings.php:379 actions/imsettings.php:351 @@ -1126,7 +1127,7 @@ msgstr "Keine ausstehende Bestätigung, die abgebrochen werden kann." #: actions/emailsettings.php:383 actions/imsettings.php:355 msgid "That is the wrong IM address." -msgstr "Das ist die falsche IM Adresse." +msgstr "Das ist die falsche IM-Adresse." #: actions/emailsettings.php:395 actions/imsettings.php:367 #: actions/smssettings.php:386 @@ -1245,7 +1246,6 @@ msgid "Not expecting this response!" msgstr "Unerwartete Antwort!" #: actions/finishremotesubscribe.php:80 -#, fuzzy msgid "User being listened to does not exist." msgstr "Aufgeführte Nutzer existiert nicht." @@ -1258,19 +1258,16 @@ msgid "That user has blocked you from subscribing." msgstr "Dieser Benutzer erlaubt dir nicht ihn zu abonnieren." #: actions/finishremotesubscribe.php:110 -#, fuzzy msgid "You are not authorized." -msgstr "Nicht autorisiert." +msgstr "Du bist nicht autorisiert." #: actions/finishremotesubscribe.php:113 -#, fuzzy msgid "Could not convert request token to access token." msgstr "Konnte Anfrage-Token nicht in Zugriffs-Token umwandeln." #: actions/finishremotesubscribe.php:118 -#, fuzzy msgid "Remote service uses unknown version of OMB protocol." -msgstr "Unbekannte OMB-Protokollversion." +msgstr "Service nutzt unbekannte OMB-Protokollversion." #: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 msgid "Error updating remote profile" @@ -1287,9 +1284,8 @@ msgid "No such file." msgstr "Datei nicht gefunden." #: actions/getfile.php:79 -#, fuzzy msgid "Cannot read file." -msgstr "Daten verloren." +msgstr "Datei konnte nicht gelesen werden." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 @@ -1321,9 +1317,8 @@ msgid "User is not a member of group." msgstr "Nutzer ist kein Mitglied dieser Gruppe." #: actions/groupblock.php:136 actions/groupmembers.php:314 -#, fuzzy msgid "Block user from group" -msgstr "Benutzer blockieren" +msgstr "Benutzerzugang zu der Gruppe blockieren" #: actions/groupblock.php:162 #, php-format @@ -1334,9 +1329,8 @@ msgid "" msgstr "" #: actions/groupblock.php:178 -#, fuzzy msgid "Do not block this user from this group" -msgstr "Liste der Benutzer in dieser Gruppe." +msgstr "Diesen Benutzerzugang nicht für diese Gruppe blockieren." #: actions/groupblock.php:179 msgid "Block this user from this group" @@ -1344,7 +1338,7 @@ msgstr "Diesen Nutzer von der Gruppe sperren" #: actions/groupblock.php:196 msgid "Database error blocking user from group." -msgstr "" +msgstr "Datenbank Fehler beim Versuch den Nutzer aus der Gruppe zu blockieren." #: actions/groupbyid.php:74 msgid "No ID" @@ -1356,7 +1350,7 @@ msgstr "Du musst angemeldet sein, um eine Gruppe zu bearbeiten." #: actions/groupdesignsettings.php:141 msgid "Group design" -msgstr "Gruppen Design" +msgstr "Gruppen-Design" #: actions/groupdesignsettings.php:152 msgid "" @@ -1364,38 +1358,36 @@ msgid "" "palette of your choice." msgstr "" -#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 -#: lib/designsettings.php:434 lib/designsettings.php:464 -#, fuzzy +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 msgid "Couldn't update your design." -msgstr "Konnte Benutzerdaten nicht aktualisieren." +msgstr "Konnte dein Design nicht aktualisieren." -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -#, fuzzy msgid "Unable to save your design settings!" -msgstr "Konnte Twitter Einstellungen nicht speichern!" +msgstr "Konnte die Design-Einstellungen nicht speichern!" -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." -msgstr "Design Einstellungen gespeichert." +msgstr "Design-Einstellungen gespeichert." #: actions/grouplogo.php:139 actions/grouplogo.php:192 msgid "Group logo" msgstr "Gruppen-Logo" #: actions/grouplogo.php:150 -#, fuzzy, php-format +#, php-format msgid "" "You can upload a logo image for your group. The maximum file size is %s." -msgstr "Du kannst ein Logo für Deine Gruppe hochladen." +msgstr "" +"Du kannst ein Logo für Deine Gruppe hochladen. Die maximale Dateigröße ist %" +"s." #: actions/grouplogo.php:362 -#, fuzzy msgid "Pick a square area of the image to be the logo." -msgstr "" -"Wähle eine quadratische Fläche aus dem Bild, um dein Avatar zu speichern" +msgstr "Wähle eine quadratische Fläche aus dem Bild, um das Logo zu speichern." #: actions/grouplogo.php:396 msgid "Logo updated." @@ -1445,12 +1437,12 @@ msgid "Updates from members of %1$s on %2$s!" msgstr "Aktualisierungen von %1$s auf %2$s!" #: actions/groupsearch.php:52 -#, fuzzy, php-format +#, php-format msgid "" "Search for groups on %%site.name%% by their name, location, or description. " "Separate the terms by spaces; they must be 3 characters or more." msgstr "" -"Durchsuche die Namen, Orten oder Interessen der Nutzer von %%site.name%%. " +"Durchsuche die Namen, Orte oder Interessen der Nutzer von %%site.name%%. " "Trenne mehrere Suchbegriffe durch Leerzeichen. Ein Suchbegriff muss aus " "mindestens 3 Zeichen bestehen." @@ -1469,6 +1461,8 @@ msgid "" "If you can't find the group you're looking for, you can [create it](%%action." "newgroup%%) yourself." msgstr "" +"Wenn du die Gruppe die dich interessiert nicht finden kannst, dann [erstelle " +"sie](%%action.newgroup%%) doch einfach." #: actions/groupsearch.php:85 #, php-format @@ -1503,7 +1497,7 @@ msgstr "Neue Gruppe erstellen" #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." -msgstr "Nur Gruppen Administratoren können die Sperrung von Nutzern aufheben." +msgstr "Nur Administratoren können Gruppenmitglieder entsperren." #: actions/groupunblock.php:95 msgid "User is not blocked from group." @@ -1515,7 +1509,7 @@ msgstr "Fehler beim Freigeben des Benutzers." #: actions/imsettings.php:59 msgid "IM Settings" -msgstr "IM Einstellungen" +msgstr "IM-Einstellungen" #: actions/imsettings.php:70 #, php-format @@ -1527,9 +1521,8 @@ msgstr "" "senden. Stelle deine Adresse und Einstellungen unten ein." #: actions/imsettings.php:89 -#, fuzzy msgid "IM is not available." -msgstr "Diese Seite liegt in nicht verfügbar in einem " +msgstr "IM ist nicht verfügbar." #: actions/imsettings.php:106 msgid "Current confirmed Jabber/GTalk address." @@ -1542,12 +1535,12 @@ msgid "" "message with further instructions. (Did you add %s to your buddy list?)" msgstr "" "Warte auf Bestätigung dieser Adresse. Eine Nachricht mit weiteren Anweisung " -"sollte in deinem Jabber/GTalk Konto eingehen. (Hast du %s zu deiner " -"Freundeliste hinzugefügt?)" +"sollte in deinem Jabber/GTalk-Konto eingehen. (Hast du %s zu deiner " +"Freundesliste hinzugefügt?)" #: actions/imsettings.php:124 msgid "IM Address" -msgstr "IM Adresse" +msgstr "IM-Adresse" #: actions/imsettings.php:126 #, php-format @@ -1555,8 +1548,8 @@ msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." msgstr "" -"Jabber- oder GoogleTalk-Adresse, z.B. \"UserName@example.org\". Aber " -"versichere dich zuerst, dass du %s in deine Kontaktliste in deinem IM " +"Jabber- oder GoogleTalk-Adresse, beispielsweise „Benutzername@example.org“. " +"Aber versichere dich zuerst, dass du %s in deine Kontaktliste in deinem IM-" "Programm oder GTalk aufgenommen hast." #: actions/imsettings.php:143 @@ -1565,7 +1558,7 @@ msgstr "Schicke mir Nachrichten mittels Jabber/GTalk." #: actions/imsettings.php:148 msgid "Post a notice when my Jabber/GTalk status changes." -msgstr "Schicke eine Nachricht, wenn sich mein Jabber/GTalk Status verändert." +msgstr "Schicke eine Nachricht, wenn sich mein Jabber/GTalk-Status verändert." #: actions/imsettings.php:153 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." @@ -1603,7 +1596,7 @@ msgid "" "A confirmation code was sent to the IM address you added. You must approve %" "s for sending messages to you." msgstr "" -"Ein Bestätigungscode wurde an die IM Adresse geschickt, die du hinzugefügt " +"Ein Bestätigungscode wurde an die IM-Adresse geschickt, die du hinzugefügt " "hast. Du musst zulassen, dass %s dir Nachrichten schicken darf." #: actions/imsettings.php:387 @@ -1689,7 +1682,7 @@ msgstr "E-Mail-Adressen" #: actions/invite.php:189 msgid "Addresses of friends to invite (one per line)" msgstr "" -"Addressen von Freunden, die Du einladen möchtest. (Jeweils eine Addresse pro " +"Adressen von Freunden, die Du einladen möchtest. (Jeweils eine Adresse pro " "Zeile)" #: actions/invite.php:192 @@ -1702,7 +1695,7 @@ msgstr "" "Wenn du möchtest kannst du zu der Einladung eine persönliche Nachricht " "anfügen." -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" msgstr "Senden" @@ -1812,23 +1805,22 @@ msgid "Already logged in." msgstr "Bereits angemeldet." #: actions/login.php:108 actions/login.php:118 -#, fuzzy msgid "Invalid or expired token." -msgstr "Ungültiger Nachrichteninhalt" +msgstr "Token ungültig oder abgelaufen." #: actions/login.php:146 msgid "Incorrect username or password." msgstr "Falscher Benutzername oder Passwort." #: actions/login.php:152 -#, fuzzy msgid "Error setting user. You are probably not authorized." -msgstr "Nicht autorisiert." +msgstr "" +"Fehler beim setzen des Benutzers. Du bist vermutlich nicht autorisiert." #: actions/login.php:207 actions/login.php:260 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" -msgstr "Einloggen" +msgstr "Anmelden" #: actions/login.php:246 msgid "Login to site" @@ -1862,18 +1854,17 @@ msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "" -"Bitte geben Sie aus Sicherheitsgründen ihren Benutzernamen und ihr Passwort " -"ein, bevor die Änderungen an ihren Einstellungen übernommen werden." +"Bitte gebe aus Sicherheitsgründen deinen Benutzernamen und dein Passwort " +"ein, bevor die Änderungen an deinen Einstellungen übernommen werden." #: actions/login.php:289 -#, fuzzy, php-format +#, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" "(%%action.register%%) a new account." msgstr "" "Melde dich mit Nutzernamen und Passwort an. Du hast noch keinen Nutzernamen? " -"[Registriere](%%action.register%%) ein neues Konto oder versuche es mit " -"[OpenID](%%action.openidlogin%%)." +"[Registriere](%%action.register%%) ein neues Konto." #: actions/makeadmin.php:91 msgid "Only an admin can make another user an admin." @@ -1882,7 +1873,7 @@ msgstr "Nur Administratoren können andere Nutzer zu Administratoren ernennen." #: actions/makeadmin.php:95 #, php-format msgid "%s is already an admin for group \"%s\"." -msgstr "%s ist bereits ein Administrator der Gruppe "%s"." +msgstr "%s ist bereits ein Administrator der Gruppe „%s“." #: actions/makeadmin.php:132 #, php-format @@ -1892,7 +1883,7 @@ msgstr "" #: actions/makeadmin.php:145 #, php-format msgid "Can't make %s an admin for group %s" -msgstr "" +msgstr "Konnte %s nicht zum Administrator der Gruppe %s machen" #: actions/microsummary.php:69 msgid "No current status" @@ -1965,9 +1956,9 @@ msgid "Text search" msgstr "Volltextsuche" #: actions/noticesearch.php:91 -#, fuzzy, php-format +#, php-format msgid "Search results for \"%s\" on %s" -msgstr "Suche im Stream nach \"%s\"" +msgstr "Suchergebnisse für „%s“ auf %s" #: actions/noticesearch.php:121 #, php-format @@ -1984,9 +1975,9 @@ msgid "" msgstr "" #: actions/noticesearchrss.php:96 -#, fuzzy, php-format +#, php-format msgid "Updates with \"%s\"" -msgstr "Updates von %1$s auf %2$s!" +msgstr "Aktualisierungen mit „%s“" #: actions/noticesearchrss.php:98 #, php-format @@ -2018,16 +2009,15 @@ msgid "%1$s's status on %2$s" msgstr "%1$s Status auf %2$s" #: actions/oembed.php:157 -#, fuzzy msgid "content type " -msgstr "Verbinden" +msgstr "Content-Typ " #: actions/oembed.php:160 msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." msgstr "Kein unterstütztes Datenformat." @@ -2060,9 +2050,8 @@ msgid "Automatic shortening service to use." msgstr "URL-Auto-Kürzungs-Dienst." #: actions/othersettings.php:122 -#, fuzzy msgid "View profile designs" -msgstr "Profil Einstellungen" +msgstr "Profil-Einstellungen ansehen" #: actions/othersettings.php:123 msgid "Show or hide profile designs." @@ -2070,7 +2059,7 @@ msgstr "" #: actions/othersettings.php:153 msgid "URL shortening service is too long (max 50 chars)." -msgstr "URL-Auto-Kürzungs-Dienst ist zu lange (max. 50 Zeichen)" +msgstr "URL-Auto-Kürzungs-Dienst ist zu lang (max. 50 Zeichen)." #: actions/outbox.php:58 #, php-format @@ -2157,9 +2146,9 @@ msgid "Path and server settings for this StatusNet site." msgstr "" #: actions/pathsadminpanel.php:140 -#, fuzzy, php-format +#, php-format msgid "Theme directory not readable: %s" -msgstr "Diese Seite liegt in nicht verfügbar in einem " +msgstr "Theme-Verzeichnis nicht lesbar: %s" #: actions/pathsadminpanel.php:146 #, php-format @@ -2178,18 +2167,16 @@ msgstr "" #: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:299 -#, fuzzy msgid "Site" -msgstr "Einladen" +msgstr "Seite" #: actions/pathsadminpanel.php:216 msgid "Path" msgstr "" #: actions/pathsadminpanel.php:216 -#, fuzzy msgid "Site path" -msgstr "Seitennachricht" +msgstr "Seitenpfad" #: actions/pathsadminpanel.php:220 msgid "Path to locales" @@ -2216,24 +2203,20 @@ msgid "Theme directory" msgstr "" #: actions/pathsadminpanel.php:247 -#, fuzzy msgid "Avatars" -msgstr "Avatar" +msgstr "Avatare" #: actions/pathsadminpanel.php:252 -#, fuzzy msgid "Avatar server" -msgstr "Avatar-Einstellungen" +msgstr "Avatar-Server" #: actions/pathsadminpanel.php:256 -#, fuzzy msgid "Avatar path" -msgstr "Avatar aktualisiert." +msgstr "Avatarpfad" #: actions/pathsadminpanel.php:260 -#, fuzzy msgid "Avatar directory" -msgstr "Avatar aktualisiert." +msgstr "Avatarverzeichnis" #: actions/pathsadminpanel.php:269 msgid "Backgrounds" @@ -2252,9 +2235,8 @@ msgid "Background directory" msgstr "" #: actions/pathsadminpanel.php:297 -#, fuzzy msgid "Save paths" -msgstr "Seitennachricht" +msgstr "Speicherpfade" #: actions/peoplesearch.php:52 #, php-format @@ -2262,7 +2244,7 @@ msgid "" "Search for people on %%site.name%% by their name, location, or interests. " "Separate the terms by spaces; they must be 3 characters or more." msgstr "" -"Durchsuche die Namen, Orten oder Interessen der Nutzer von %%site.name%%. " +"Durchsuche die Namen, Orte oder Interessen der Nutzer von %%site.name%%. " "Trenne mehrere Suchbegriffe durch Leerzeichen. Ein Suchbegriff muss aus " "mindestens 3 Zeichen bestehen." @@ -2375,7 +2357,7 @@ msgstr "Zeitzone" #: actions/profilesettings.php:155 msgid "What timezone are you normally in?" -msgstr "In welcher Zeitzone befinden Sie sich üblicherweise?" +msgstr "In welcher Zeitzone befindest du dich üblicherweise?" #: actions/profilesettings.php:160 msgid "" @@ -2437,19 +2419,16 @@ msgid "Public timeline" msgstr "Öffentliche Zeitleiste" #: actions/public.php:151 -#, fuzzy msgid "Public Stream Feed (RSS 1.0)" -msgstr "Feed des öffentlichen Streams" +msgstr "Feed des öffentlichen Streams (RSS 1.0)" #: actions/public.php:155 -#, fuzzy msgid "Public Stream Feed (RSS 2.0)" -msgstr "Feed des öffentlichen Streams" +msgstr "Feed des öffentlichen Streams (RSS 2.0)" #: actions/public.php:159 -#, fuzzy msgid "Public Stream Feed (Atom)" -msgstr "Feed des öffentlichen Streams" +msgstr "Feed des öffentlichen Streams (Atom)" #: actions/public.php:179 #, php-format @@ -2478,14 +2457,15 @@ msgid "" msgstr "" #: actions/public.php:238 -#, fuzzy, php-format +#, php-format msgid "" "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-" "blogging) service based on the Free Software [StatusNet](http://status.net/) " "tool." msgstr "" -"Dies ist %%site.name%%, ein [mikro-blogging] (http://de.wikipedia.org/wiki/" -"Mikro-blogging) Dienst " +"Dies ist %%site.name%%, ein [Mikro-blogging-Dienst](http://de.wikipedia.org/" +"wiki/Mikro-blogging) basierend auf der freien Software [StatusNet](http://" +"status.net/)." #: actions/publictagcloud.php:57 msgid "Public tag cloud" @@ -2643,9 +2623,8 @@ msgid "Sorry, only invited people can register." msgstr "Es tut uns leid, zum Registrieren benötigst du eine Einladung." #: actions/register.php:92 -#, fuzzy msgid "Sorry, invalid invitation code." -msgstr "Fehler beim Bestätigungscode." +msgstr "Entschuldigung, ungültiger Bestätigungscode." #: actions/register.php:112 msgid "Registration successful" @@ -4545,11 +4524,7 @@ msgid "" msgstr "" "Du kannst dein persönliches Avatar hochladen. Die maximale Dateigröße ist %s." -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "" - -#: lib/designsettings.php:468 +#: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "" @@ -5026,7 +5001,7 @@ msgstr "Versende eine direkte Nachricht" msgid "To" msgstr "An" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 #, fuzzy msgid "Available characters" msgstr "Verfügbare Zeichen" @@ -5041,11 +5016,11 @@ msgstr "Nachricht versenden" msgid "What's up, %s?" msgstr "Was ist los, %s?" -#: lib/noticeform.php:193 +#: lib/noticeform.php:192 msgid "Attach" msgstr "" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "" @@ -5327,7 +5302,12 @@ msgstr "Die Gegenseite konnte Dich nicht abonnieren." msgid "Not subscribed!" msgstr "Nicht abonniert!" -#: lib/subs.php:140 +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "Konnte Abonnement nicht löschen." + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "Konnte Abonnement nicht löschen." diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index 6ab4721c21..07384974dc 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -1,5 +1,6 @@ # Translation of StatusNet to Greek # +# Author@translatewiki.net: Omnipaedista # -- # This file is distributed under the same license as the StatusNet package. # @@ -7,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-02 23:18+0000\n" -"PO-Revision-Date: 2009-12-02 23:19:21+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"PO-Revision-Date: 2009-12-05 19:54:03+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: el\n" "X-Message-Group: out-statusnet\n" @@ -47,7 +48,7 @@ msgstr "Αδύνατη η αποθήκευση του προφίλ." #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." -msgstr "" +msgstr "Κανένας τέτοιος χρήστης." #: actions/all.php:84 #, fuzzy, php-format @@ -183,7 +184,12 @@ msgstr "" msgid "Could not save profile." msgstr "Απέτυχε η αποθήκευση του προφίλ." -#: actions/apiblockcreate.php:108 +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "Απέτυχε η ενημέρωση του χρήστη." + +#: actions/apiblockcreate.php:119 msgid "Block user failed." msgstr "" @@ -398,14 +404,14 @@ msgid "%s groups" msgstr "" #: actions/apigrouplistall.php:94 -#, fuzzy, php-format +#, php-format msgid "groups on %s" -msgstr "Βρες ομάδες στο site" +msgstr "ομάδες του χρήστη %s" #: actions/apigrouplist.php:95 -#, fuzzy, php-format +#, php-format msgid "%s's groups" -msgstr "Ομάδες χρηστών" +msgstr "ομάδες των χρηστών %s" #: actions/apigrouplist.php:103 #, fuzzy, php-format @@ -460,9 +466,9 @@ msgstr "" #: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 #: actions/grouprss.php:131 actions/userrss.php:90 -#, fuzzy, php-format +#, php-format msgid "%s timeline" -msgstr "Χρονοδιάγραμμα του χρήστη %s" +msgstr "χρονοδιάγραμμα του χρήστη %s" #: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 #: actions/userrss.php:92 @@ -538,9 +544,8 @@ msgstr "" #: actions/avatarsettings.php:119 actions/avatarsettings.php:194 #: actions/grouplogo.php:251 -#, fuzzy msgid "Avatar settings" -msgstr "Ρυθμίσεις OpenID" +msgstr "Ρυθμίσεις του άβαταρ" #: actions/avatarsettings.php:126 actions/avatarsettings.php:202 #: actions/grouplogo.php:199 actions/grouplogo.php:259 @@ -612,9 +617,8 @@ msgstr "Ρυθμίσεις OpenID" #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 #: actions/groupmembers.php:76 actions/grouprss.php:91 #: actions/joingroup.php:76 actions/showgroup.php:121 -#, fuzzy msgid "No nickname" -msgstr "Νέο ψευδώνυμο" +msgstr "Κανένα ψευδώνυμο" #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 @@ -669,7 +673,7 @@ msgstr "" #: actions/block.php:143 actions/deletenotice.php:145 #: actions/deleteuser.php:147 actions/groupblock.php:178 msgid "No" -msgstr "" +msgstr "Όχι" #: actions/block.php:143 actions/deleteuser.php:147 #, fuzzy @@ -737,9 +741,8 @@ msgid "The address \"%s\" has been confirmed for your account." msgstr "" #: actions/conversation.php:99 -#, fuzzy msgid "Conversation" -msgstr "Τοποθεσία" +msgstr "Συζήτηση" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 #: lib/profileaction.php:216 lib/searchgroupnav.php:82 @@ -825,106 +828,106 @@ msgstr "" msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:270 +#: actions/designadminpanel.php:275 msgid "Invalid logo URL." msgstr "" -#: actions/designadminpanel.php:274 +#: actions/designadminpanel.php:279 #, fuzzy, php-format msgid "Theme not available: %s" msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL." -#: actions/designadminpanel.php:370 +#: actions/designadminpanel.php:375 #, fuzzy msgid "Change logo" msgstr "Αλλάξτε τον κωδικό σας" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:380 msgid "Site logo" msgstr "" -#: actions/designadminpanel.php:382 +#: actions/designadminpanel.php:387 #, fuzzy msgid "Change theme" msgstr "Αλλαγή" -#: actions/designadminpanel.php:399 +#: actions/designadminpanel.php:404 #, fuzzy msgid "Site theme" msgstr "Αλλαγή" -#: actions/designadminpanel.php:400 +#: actions/designadminpanel.php:405 msgid "Theme for the site." msgstr "" -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" msgstr "" -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" msgstr "" -#: actions/designadminpanel.php:422 +#: actions/designadminpanel.php:427 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "" -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" msgstr "" -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:469 lib/designsettings.php:156 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:161 +#: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 +#: actions/designadminpanel.php:488 lib/designsettings.php:170 #, fuzzy msgid "Change colours" msgstr "Αλλάξτε τον κωδικό σας" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 +#: actions/designadminpanel.php:510 lib/designsettings.php:191 #, fuzzy msgid "Content" msgstr "Σύνδεση" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 +#: actions/designadminpanel.php:523 lib/designsettings.php:204 msgid "Sidebar" msgstr "" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 +#: actions/designadminpanel.php:549 lib/designsettings.php:230 #, fuzzy msgid "Links" msgstr "Σύνδεση" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -934,7 +937,7 @@ msgstr "" msgid "Save" msgstr "" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1370,19 +1373,19 @@ msgid "" "palette of your choice." msgstr "" -#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 -#: lib/designsettings.php:434 lib/designsettings.php:464 +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 #, fuzzy msgid "Couldn't update your design." msgstr "Απέτυχε η ενημέρωση του χρήστη." -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings!" msgstr "" -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 #, fuzzy msgid "Design preferences saved." msgstr "Οι προτιμήσεις αποθηκεύτηκαν" @@ -1688,7 +1691,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" msgstr "" @@ -1979,8 +1982,8 @@ msgstr "Σύνδεση" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." msgstr "" @@ -2969,9 +2972,8 @@ msgid "" msgstr "" #: actions/showgroup.php:482 -#, fuzzy msgid "Admins" -msgstr "Διαχειριστής" +msgstr "Διαχειριστές" #: actions/showmessage.php:81 msgid "No such message." @@ -3192,9 +3194,8 @@ msgid "Use fancy (more readable and memorable) URLs?" msgstr "" #: actions/siteadminpanel.php:331 -#, fuzzy msgid "Access" -msgstr "Αποδοχή" +msgstr "Πρόσβαση" #: actions/siteadminpanel.php:334 msgid "Private" @@ -4431,11 +4432,7 @@ msgid "" "You can upload your personal background image. The maximum file size is 2MB." msgstr "" -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "" - -#: lib/designsettings.php:468 +#: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "" @@ -4690,12 +4687,12 @@ msgid "" msgstr "" #: lib/mail.php:254 -#, fuzzy, php-format +#, php-format msgid "Location: %s\n" msgstr "Τοποθεσία: %s\n" #: lib/mail.php:256 -#, fuzzy, php-format +#, php-format msgid "Homepage: %s\n" msgstr "Αρχική σελίδα: %s\n" @@ -4887,7 +4884,7 @@ msgstr "" msgid "To" msgstr "" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 #, fuzzy msgid "Available characters" msgstr "6 ή περισσότεροι χαρακτήρες" @@ -4901,11 +4898,11 @@ msgstr "" msgid "What's up, %s?" msgstr "" -#: lib/noticeform.php:193 +#: lib/noticeform.php:192 msgid "Attach" msgstr "" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "" @@ -5177,7 +5174,12 @@ msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές msgid "Not subscribed!" msgstr "Απέτυχε η συνδρομή." -#: lib/subs.php:140 +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "Απέτυχε η διαγραφή συνδρομής." + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "Απέτυχε η διαγραφή συνδρομής." diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index fb598943c8..d31e8a7ed6 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-02 23:18+0000\n" -"PO-Revision-Date: 2009-12-02 23:19:24+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"PO-Revision-Date: 2009-12-05 19:54:06+0000\n" "Language-Team: British English\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" "X-Message-Group: out-statusnet\n" @@ -181,7 +181,12 @@ msgstr "User has no profile." msgid "Could not save profile." msgstr "Couldn't save profile." -#: actions/apiblockcreate.php:108 +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "Couldn't update user." + +#: actions/apiblockcreate.php:119 msgid "Block user failed." msgstr "Block user failed." @@ -818,106 +823,106 @@ msgstr "" msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:270 +#: actions/designadminpanel.php:275 #, fuzzy msgid "Invalid logo URL." msgstr "Invalid size." -#: actions/designadminpanel.php:274 +#: actions/designadminpanel.php:279 #, fuzzy, php-format msgid "Theme not available: %s" msgstr "This page is not available in a " -#: actions/designadminpanel.php:370 +#: actions/designadminpanel.php:375 msgid "Change logo" msgstr "Change logo" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:380 #, fuzzy msgid "Site logo" msgstr "Invite" -#: actions/designadminpanel.php:382 +#: actions/designadminpanel.php:387 #, fuzzy msgid "Change theme" msgstr "Change" -#: actions/designadminpanel.php:399 +#: actions/designadminpanel.php:404 msgid "Site theme" msgstr "Site theme" -#: actions/designadminpanel.php:400 +#: actions/designadminpanel.php:405 #, fuzzy msgid "Theme for the site." msgstr "Logout from the site" -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" msgstr "" -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" msgstr "" -#: actions/designadminpanel.php:422 +#: actions/designadminpanel.php:427 #, fuzzy, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "You can upload a logo image for your group." -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" msgstr "" -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:469 lib/designsettings.php:156 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:161 +#: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 +#: actions/designadminpanel.php:488 lib/designsettings.php:170 msgid "Change colours" msgstr "Change colours" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 +#: actions/designadminpanel.php:510 lib/designsettings.php:191 #, fuzzy msgid "Content" msgstr "Connect" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 +#: actions/designadminpanel.php:523 lib/designsettings.php:204 #, fuzzy msgid "Sidebar" msgstr "Search" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "Text" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 +#: actions/designadminpanel.php:549 lib/designsettings.php:230 msgid "Links" msgstr "Links" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -927,7 +932,7 @@ msgstr "" msgid "Save" msgstr "Save" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1365,20 +1370,20 @@ msgid "" "palette of your choice." msgstr "" -#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 -#: lib/designsettings.php:434 lib/designsettings.php:464 +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 #, fuzzy msgid "Couldn't update your design." msgstr "Couldn't update user." -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 #, fuzzy msgid "Unable to save your design settings!" msgstr "Unable to save your Twitter settings!" -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 #, fuzzy msgid "Design preferences saved." msgstr "Sync preferences saved." @@ -1694,7 +1699,7 @@ msgstr "Personal message" msgid "Optionally add a personal message to the invitation." msgstr "Optionally add a personal message to the invitation." -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" msgstr "Send" @@ -2016,8 +2021,8 @@ msgstr "Connect" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." msgstr "Not a supported data format." @@ -4501,11 +4506,7 @@ msgid "" "You can upload your personal background image. The maximum file size is 2MB." msgstr "You can upload your personal avatar. The maximum file size is %s." -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "Bad default colour settings: " - -#: lib/designsettings.php:468 +#: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "" @@ -4971,7 +4972,7 @@ msgstr "Send a direct notice" msgid "To" msgstr "To" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 msgid "Available characters" msgstr "Available characters" @@ -4984,11 +4985,11 @@ msgstr "Send a notice" msgid "What's up, %s?" msgstr "What's up, %s?" -#: lib/noticeform.php:193 +#: lib/noticeform.php:192 msgid "Attach" msgstr "" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "" @@ -5259,7 +5260,12 @@ msgstr "Could not subscribe other to you." msgid "Not subscribed!" msgstr "Not subscribed!" -#: lib/subs.php:140 +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "Couldn't delete subscription." + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "Couldn't delete subscription." diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index 393a3c602a..2493b24bc6 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -11,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-02 23:18+0000\n" -"PO-Revision-Date: 2009-12-02 23:19:28+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"PO-Revision-Date: 2009-12-05 19:54:09+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: es\n" "X-Message-Group: out-statusnet\n" @@ -188,7 +188,12 @@ msgstr "El usuario no tiene un perfil." msgid "Could not save profile." msgstr "No se pudo guardar el perfil." -#: actions/apiblockcreate.php:108 +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "No se pudo actualizar el usuario." + +#: actions/apiblockcreate.php:119 msgid "Block user failed." msgstr "Falló bloquear usuario." @@ -840,107 +845,107 @@ msgstr "" msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:270 +#: actions/designadminpanel.php:275 #, fuzzy msgid "Invalid logo URL." msgstr "Tamaño inválido." -#: actions/designadminpanel.php:274 +#: actions/designadminpanel.php:279 #, fuzzy, php-format msgid "Theme not available: %s" msgstr "Esta página no está disponible en un " -#: actions/designadminpanel.php:370 +#: actions/designadminpanel.php:375 #, fuzzy msgid "Change logo" msgstr "Cambiar colores" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:380 #, fuzzy msgid "Site logo" msgstr "Invitar" -#: actions/designadminpanel.php:382 +#: actions/designadminpanel.php:387 #, fuzzy msgid "Change theme" msgstr "Cambiar" -#: actions/designadminpanel.php:399 +#: actions/designadminpanel.php:404 #, fuzzy msgid "Site theme" msgstr "Aviso de sitio" -#: actions/designadminpanel.php:400 +#: actions/designadminpanel.php:405 #, fuzzy msgid "Theme for the site." msgstr "Salir de sitio" -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" msgstr "" -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" msgstr "" -#: actions/designadminpanel.php:422 +#: actions/designadminpanel.php:427 #, fuzzy, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "Puedes cargar una imagen de logo para tu grupo." -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" msgstr "" -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:469 lib/designsettings.php:156 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:161 +#: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 +#: actions/designadminpanel.php:488 lib/designsettings.php:170 msgid "Change colours" msgstr "Cambiar colores" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 +#: actions/designadminpanel.php:510 lib/designsettings.php:191 msgid "Content" msgstr "Contenido" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 +#: actions/designadminpanel.php:523 lib/designsettings.php:204 #, fuzzy msgid "Sidebar" msgstr "Buscar" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "Texto" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 +#: actions/designadminpanel.php:549 lib/designsettings.php:230 msgid "Links" msgstr "Vínculos" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -950,7 +955,7 @@ msgstr "" msgid "Save" msgstr "Guardar" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1401,20 +1406,20 @@ msgid "" "palette of your choice." msgstr "" -#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 -#: lib/designsettings.php:434 lib/designsettings.php:464 +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 #, fuzzy msgid "Couldn't update your design." msgstr "No se pudo actualizar el usuario." -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 #, fuzzy msgid "Unable to save your design settings!" msgstr "¡No se pudo guardar tu configuración de Twitter!" -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 #, fuzzy msgid "Design preferences saved." msgstr "Preferencias de sincronización guardadas." @@ -1740,7 +1745,7 @@ msgstr "Mensaje Personal" msgid "Optionally add a personal message to the invitation." msgstr "Opcionalmente añada un mensaje personalizado a su invitación." -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" msgstr "Enviar" @@ -2071,8 +2076,8 @@ msgstr "Conectarse" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." msgstr "No es un formato de dato soportado" @@ -4620,11 +4625,7 @@ msgid "" "You can upload your personal background image. The maximum file size is 2MB." msgstr "Puedes cargar tu avatar personal." -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "" - -#: lib/designsettings.php:468 +#: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "" @@ -5092,7 +5093,7 @@ msgstr "Enviar un aviso directo" msgid "To" msgstr "Para" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 #, fuzzy msgid "Available characters" msgstr "Caracteres disponibles" @@ -5107,11 +5108,11 @@ msgstr "Enviar un aviso" msgid "What's up, %s?" msgstr "¿Qué tal, %s?" -#: lib/noticeform.php:193 +#: lib/noticeform.php:192 msgid "Attach" msgstr "" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "" @@ -5388,7 +5389,12 @@ msgstr "No se pudo suscribir otro a ti." msgid "Not subscribed!" msgstr "¡No estás suscrito!" -#: lib/subs.php:140 +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "No se pudo eliminar la suscripción." + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "No se pudo eliminar la suscripción." diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index e5e8af7958..dbc8f1f4b3 100644 --- a/locale/fi/LC_MESSAGES/statusnet.po +++ b/locale/fi/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-02 23:18+0000\n" -"PO-Revision-Date: 2009-12-02 23:19:32+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"PO-Revision-Date: 2009-12-05 19:54:12+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fi\n" "X-Message-Group: out-statusnet\n" @@ -188,7 +188,12 @@ msgstr "Käyttäjällä ei ole profiilia." msgid "Could not save profile." msgstr "Ei voitu tallentaa profiilia." -#: actions/apiblockcreate.php:108 +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "Et voi lopettaa itsesi tilausta!" + +#: actions/apiblockcreate.php:119 msgid "Block user failed." msgstr "Käyttäjän esto epäonnistui." @@ -828,107 +833,107 @@ msgstr "Ulkoasu" msgid "Design settings for this StatusNet site." msgstr "Ulkoasuasetukset tälle StatusNet palvelulle." -#: actions/designadminpanel.php:270 +#: actions/designadminpanel.php:275 #, fuzzy msgid "Invalid logo URL." msgstr "Koko ei kelpaa." -#: actions/designadminpanel.php:274 +#: actions/designadminpanel.php:279 #, fuzzy, php-format msgid "Theme not available: %s" msgstr "Pikaviestin ei ole käytettävissä." -#: actions/designadminpanel.php:370 +#: actions/designadminpanel.php:375 #, fuzzy msgid "Change logo" msgstr "Vaihda salasanasi" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:380 #, fuzzy msgid "Site logo" msgstr "Kutsu" -#: actions/designadminpanel.php:382 +#: actions/designadminpanel.php:387 #, fuzzy msgid "Change theme" msgstr "Vaihda" -#: actions/designadminpanel.php:399 +#: actions/designadminpanel.php:404 #, fuzzy msgid "Site theme" msgstr "Palvelun ilmoitus" -#: actions/designadminpanel.php:400 +#: actions/designadminpanel.php:405 #, fuzzy msgid "Theme for the site." msgstr "Kirjaudu ulos palvelusta" -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" msgstr "Vaihda tautakuva" -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" msgstr "Tausta" -#: actions/designadminpanel.php:422 +#: actions/designadminpanel.php:427 #, fuzzy, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "Voit ladata ryhmälle logokuvan. Maksimikoko on %s." -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" msgstr "On" -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" msgstr "Off" -#: actions/designadminpanel.php:469 lib/designsettings.php:156 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:161 +#: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 +#: actions/designadminpanel.php:488 lib/designsettings.php:170 msgid "Change colours" msgstr "Vaihda väriä" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 +#: actions/designadminpanel.php:510 lib/designsettings.php:191 msgid "Content" msgstr "Sisältö" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 +#: actions/designadminpanel.php:523 lib/designsettings.php:204 #, fuzzy msgid "Sidebar" msgstr "Haku" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "Teksti" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 +#: actions/designadminpanel.php:549 lib/designsettings.php:230 msgid "Links" msgstr "Linkit" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" msgstr "Käytä oletusasetuksia" -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -938,7 +943,7 @@ msgstr "" msgid "Save" msgstr "Tallenna" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1373,18 +1378,18 @@ msgid "" "palette of your choice." msgstr "" -#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 -#: lib/designsettings.php:434 lib/designsettings.php:464 +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 msgid "Couldn't update your design." msgstr "Ei voitu päivittää sinun sivusi ulkoasua." -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings!" msgstr "Ei voitu tallentaa sinun ulkoasuasetuksia!" -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "Ulkoasuasetukset tallennettu." @@ -1703,7 +1708,7 @@ msgstr "Henkilökohtainen viesti" msgid "Optionally add a personal message to the invitation." msgstr "Voit myös lisätä oman viestisi kutsuun" -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" msgstr "Lähetä" @@ -2029,8 +2034,8 @@ msgstr "Yhdistä" msgid "Only " msgstr "Vain " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." msgstr "Tuo ei ole tuettu tietomuoto." @@ -4551,11 +4556,7 @@ msgid "" "You can upload your personal background image. The maximum file size is 2MB." msgstr "Voit ladata oman profiilikuvasi. Maksimikoko on %s." -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "" - -#: lib/designsettings.php:468 +#: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "" @@ -5025,7 +5026,7 @@ msgstr "Lähetä suora viesti" msgid "To" msgstr "Vastaanottaja" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 msgid "Available characters" msgstr "Sallitut merkit" @@ -5038,11 +5039,11 @@ msgstr "Lähetä päivitys" msgid "What's up, %s?" msgstr "Mitä teet juuri nyt, %s?" -#: lib/noticeform.php:193 +#: lib/noticeform.php:192 msgid "Attach" msgstr "" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "" @@ -5322,7 +5323,12 @@ msgstr "Toista ei voitu asettaa tilaamaan sinua." msgid "Not subscribed!" msgstr "Ei ole tilattu!." -#: lib/subs.php:140 +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "Ei voitu poistaa tilausta." + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "Ei voitu poistaa tilausta." diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index cb3c85af5f..a3e47142e6 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -6,7 +6,6 @@ # Author@translatewiki.net: Jean-Frédéric # Author@translatewiki.net: McDutchie # Author@translatewiki.net: Peter17 -# Author@translatewiki.net: Zetud # -- # This file is distributed under the same license as the StatusNet package. # @@ -14,12 +13,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-02 23:18+0000\n" -"PO-Revision-Date: 2009-12-02 23:19:36+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"PO-Revision-Date: 2009-12-05 19:54:15+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" "X-Message-Group: out-statusnet\n" @@ -96,7 +95,7 @@ msgid "" "something yourself." msgstr "" "Essayez de vous abonner à plus d’utilisateurs, de vous [inscrire à un groupe]" -"(%%action.groups%%) ou de publier quelque chose vous-même." +"(%%action.groups%%) ou de poster quelque chose vous-même." #: actions/all.php:134 #, php-format @@ -104,8 +103,8 @@ msgid "" "You can try to [nudge %s](../%s) from his profile or [post something to his " "or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." msgstr "" -"Vous pouvez essayer de [donner un coup de coude à %s](../%s) depuis son " -"profil ou [poster quelque chose à son intention](%%%%action.newnotice%%%%?" +"Vous pouvez essayer de [faire un clin d’œil à %s](../%s) depuis son profil " +"ou [poster quelque chose à son intention](%%%%action.newnotice%%%%?" "status_textarea=%s)." #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 @@ -114,8 +113,8 @@ msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " "post a notice to his or her attention." msgstr "" -"Pourquoi ne pas [créer un compte](%%%%action.register%%%%) et ensuite " -"envoyer un coup de coude à %s ou poster quelque chose à son intention." +"Pourquoi ne pas [créer un compte](%%%%action.register%%%%) et ensuite faire " +"un clin d’œil à %s ou poster un avis à son intention." #: actions/all.php:165 msgid "You and friends" @@ -197,7 +196,12 @@ msgstr "Aucun profil ne correspond à cet utilisateur." msgid "Could not save profile." msgstr "Impossible d’enregistrer le profil." -#: actions/apiblockcreate.php:108 +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "Vous ne pouvez pas ne plus vous suivre vous-même !" + +#: actions/apiblockcreate.php:119 msgid "Block user failed." msgstr "Le blocage de l’utilisateur a échoué." @@ -268,7 +272,7 @@ msgstr "Aucun statut trouvé avec cet identifiant. " #: actions/apifavoritecreate.php:119 msgid "This status is already a favorite!" -msgstr "Ce statut a déjà été ajouté à vos favoris !" +msgstr "Cet avis a déjà été ajouté à vos favoris !" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 msgid "Could not create favorite." @@ -276,7 +280,7 @@ msgstr "Impossible de créer le favori." #: actions/apifavoritedestroy.php:122 msgid "That status is not a favorite!" -msgstr "Ce statut n’est pas un favori !" +msgstr "Cet avis n’est pas un favori !" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 msgid "Could not delete favorite." @@ -455,7 +459,7 @@ msgstr "Non trouvé" #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" -"La taille maximale du statut est de %d caractères, en incluant l’URL de la " +"La taille maximale de l’avis est de %d caractères, en incluant l’URL de la " "pièce jointe." #: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261 @@ -502,12 +506,12 @@ msgstr "Activité publique %s" #: actions/apitimelinepublic.php:110 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" -msgstr "%s statuts " +msgstr "%s statuts de tout le monde !" #: actions/apitimelinetag.php:101 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" -msgstr "Statuts marqués avec %s" +msgstr "Avis marqués avec %s" #: actions/apitimelinetag.php:107 actions/tagrss.php:64 #, php-format @@ -758,11 +762,11 @@ msgstr "Conversation" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 #: lib/profileaction.php:216 lib/searchgroupnav.php:82 msgid "Notices" -msgstr "Statuts" +msgstr "Avis" #: actions/deletenotice.php:52 actions/shownotice.php:92 msgid "No such notice." -msgstr "Statut non trouvé." +msgstr "Avis non trouvé." #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 @@ -775,7 +779,7 @@ msgstr "Non connecté." #: actions/deletenotice.php:71 msgid "Can't delete this notice." -msgstr "Impossible de supprimer ce statut." +msgstr "Impossible de supprimer cet avis." #: actions/deletenotice.php:103 msgid "" @@ -787,11 +791,11 @@ msgstr "" #: actions/deletenotice.php:109 actions/deletenotice.php:141 msgid "Delete notice" -msgstr "Supprimer ce statut" +msgstr "Supprimer cet avis" #: actions/deletenotice.php:144 msgid "Are you sure you want to delete this notice?" -msgstr "Êtes-vous sûr(e) de vouloir supprimer ce statut ?" +msgstr "Êtes-vous sûr(e) de vouloir supprimer cet avis ?" #: actions/deletenotice.php:145 msgid "Do not delete this notice" @@ -799,7 +803,7 @@ msgstr "Ne pas supprimer cet avis" #: actions/deletenotice.php:146 lib/noticelist.php:550 msgid "Delete this notice" -msgstr "Supprimer ce statut" +msgstr "Supprimer cet avis" #: actions/deletenotice.php:157 msgid "There was a problem with your session token. Try again, please." @@ -840,45 +844,45 @@ msgstr "Conception" msgid "Design settings for this StatusNet site." msgstr "Paramètres de conception pour ce site StatusNet." -#: actions/designadminpanel.php:270 +#: actions/designadminpanel.php:275 msgid "Invalid logo URL." msgstr "URL du logo invalide." -#: actions/designadminpanel.php:274 +#: actions/designadminpanel.php:279 #, php-format msgid "Theme not available: %s" msgstr "Le thème n'est pas disponible : %s" -#: actions/designadminpanel.php:370 +#: actions/designadminpanel.php:375 msgid "Change logo" msgstr "Modifier le logo" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:380 msgid "Site logo" msgstr "Logo du site" -#: actions/designadminpanel.php:382 +#: actions/designadminpanel.php:387 msgid "Change theme" msgstr "Modifier le thème" -#: actions/designadminpanel.php:399 +#: actions/designadminpanel.php:404 msgid "Site theme" msgstr "Thème du site" -#: actions/designadminpanel.php:400 +#: actions/designadminpanel.php:405 msgid "Theme for the site." msgstr "Thème pour le site." -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" msgstr "Changer l’image d’arrière plan" -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" msgstr "Arrière plan" -#: actions/designadminpanel.php:422 +#: actions/designadminpanel.php:427 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" @@ -887,55 +891,55 @@ msgstr "" "Vous pouvez importer une image d'arrière plan pour ce site. La taille " "maximale du fichier est de %1$s." -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" msgstr "Activé" -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" msgstr "Désactivé" -#: actions/designadminpanel.php:469 lib/designsettings.php:156 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "Activer ou désactiver l’image d’arrière plan." -#: actions/designadminpanel.php:474 lib/designsettings.php:161 +#: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" msgstr "Répéter l’image d’arrière plan" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 +#: actions/designadminpanel.php:488 lib/designsettings.php:170 msgid "Change colours" msgstr "Modifier les couleurs" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 +#: actions/designadminpanel.php:510 lib/designsettings.php:191 msgid "Content" msgstr "Contenu" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 +#: actions/designadminpanel.php:523 lib/designsettings.php:204 msgid "Sidebar" msgstr "Barre latérale" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "Texte" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 +#: actions/designadminpanel.php:549 lib/designsettings.php:230 msgid "Links" msgstr "Liens" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" msgstr "Utiliser les valeurs par défaut" -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" msgstr "Restaurer les conceptions par défaut" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" msgstr "Revenir aux valeurs par défaut" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -945,13 +949,13 @@ msgstr "Revenir aux valeurs par défaut" msgid "Save" msgstr "Enregistrer" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "Sauvegarder la conception" #: actions/disfavor.php:81 msgid "This notice is not a favorite!" -msgstr "Ce statut n’est pas un favori !" +msgstr "Cet avis n’est pas un favori !" #: actions/disfavor.php:94 msgid "Add to favorites" @@ -1052,7 +1056,7 @@ msgstr "Courriel entrant" #: actions/emailsettings.php:138 actions/smssettings.php:157 msgid "Send email to this address to post new notices." -msgstr "Écrivez à cette adresse courriel pour publier de nouveaux statuts. " +msgstr "Écrivez à cette adresse courriel pour poster de nouveaux avis. " #: actions/emailsettings.php:145 actions/smssettings.php:162 msgid "Make a new email address for posting to; cancels the old one." @@ -1074,7 +1078,7 @@ msgstr "Avertissez-moi par courriel des nouveaux abonnements." #: actions/emailsettings.php:163 msgid "Send me email when someone adds my notice as a favorite." msgstr "" -"Envoyez-moi un courriel quand un utilisateur ajoute un de mes statuts à ses " +"Envoyez-moi un courriel quand un utilisateur ajoute un de mes avis à ses " "favoris." #: actions/emailsettings.php:169 @@ -1091,7 +1095,7 @@ msgstr "Autoriser mes amis à m’envoyer des courriels et des clins d’œil." #: actions/emailsettings.php:185 msgid "I want to post notices by email." -msgstr "Je veux envoyer mes statuts par courriel." +msgstr "Je veux envoyer mes avis par courriel." #: actions/emailsettings.php:191 msgid "Publish a MicroID for my email address." @@ -1178,30 +1182,30 @@ msgstr "Nouvelle adresse courriel ajoutée." #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 msgid "Popular notices" -msgstr "Statuts populaires" +msgstr "Avis populaires" #: actions/favorited.php:67 #, php-format msgid "Popular notices, page %d" -msgstr "Statuts populaires - page %d" +msgstr "Avis populaires - page %d" #: actions/favorited.php:79 msgid "The most popular notices on the site right now." -msgstr "Statuts les plus populaires sur le site en ce moment." +msgstr "Les avis les plus populaires sur le site en ce moment." #: actions/favorited.php:150 msgid "Favorite notices appear on this page but no one has favorited one yet." msgstr "" -"Les statuts favoris apparaissent sur cette page mais personne ne n’en a mis " -"un en favori actuellement." +"Les avis favoris apparaissent sur cette page mais personne n’a mis d’avis en " +"favori pour le moment." #: actions/favorited.php:153 msgid "" "Be the first to add a notice to your favorites by clicking the fave button " "next to any notice you like." msgstr "" -"Soyez le premier à un statut dans vos favoris en cliquant sur le bouton " -"favori à côté d’un statut que vous aimez." +"Soyez le premier à ajouter un avis dans vos favoris en cliquant sur le " +"bouton favori à côté d’un avis que vous aimez." #: actions/favorited.php:156 #, php-format @@ -1216,7 +1220,7 @@ msgstr "" #: lib/personalgroupnav.php:115 #, php-format msgid "%s's favorite notices" -msgstr "Statuts favoris de %s" +msgstr "Avis favoris de %s" #: actions/favoritesrss.php:115 #, php-format @@ -1225,7 +1229,7 @@ msgstr "Mises à jour privilégiées par %1$s sur %2$s !" #: actions/favor.php:79 msgid "This notice is already a favorite!" -msgstr "Ce statut a déjà été ajouté à vos favoris !" +msgstr "Cet avis a déjà été ajouté à vos favoris !" #: actions/favor.php:92 lib/disfavorform.php:140 msgid "Disfavor favorite" @@ -1248,11 +1252,11 @@ msgstr "Les utilisateurs à ne pas manquer dans %s" #: actions/file.php:34 msgid "No notice id" -msgstr "Pas d’identifiant de statut" +msgstr "Pas d’identifiant d’avis" #: actions/file.php:38 msgid "No notice" -msgstr "Aucun statut" +msgstr "Aucun avis" #: actions/file.php:42 msgid "No attachments" @@ -1349,7 +1353,7 @@ msgid "" "group in the future." msgstr "" "Êtes-vous sûr(e) de vouloir bloquer l’utilisateur \"%s\" du groupe \"%s\"? " -"Ils seront supprimés du groupe, il leur sera interdit d’y publier, et de s’y " +"Ils seront supprimés du groupe, il leur sera interdit d’y poster, et de s’y " "abonner à l’avenir." #: actions/groupblock.php:178 @@ -1382,21 +1386,21 @@ msgid "" "Customize the way your group looks with a background image and a colour " "palette of your choice." msgstr "" -"Personnalisez le style de votre groupe avec une image de fond et une palette " -"de couleur de votre choix." +"Personnalisez l’apparence de votre groupe avec une image d’arrière plan et " +"une palette de couleurs de votre choix" -#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 -#: lib/designsettings.php:434 lib/designsettings.php:464 +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 msgid "Couldn't update your design." msgstr "Impossible de mettre à jour votre conception." -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings!" msgstr "Impossible de sauvegarder les préférences de conception !" -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "Préférences de conception enregistrées." @@ -1520,11 +1524,11 @@ msgid "" "%%%%)" msgstr "" "Les groupes de %%%%site.name%%%% permettent de trouver et de parler avec des " -"personnes qui ont le même intérêt. Après avoir rejoint un groupe vous pouvez " -"envoyer des messages à tous les autres membres en utilisant la syntaxe « !" -"nomdugroupe ». Vous ne voyez aucun groupe qui vous intéresse ? Essayer d'en " -"[rechercher un](%%%%action.groupsearch%%%%) ou [commencez le votre !](%%%%" -"action.newgroup%%%%)" +"personnes qui ont des intérêts en commun avec vous. Après avoir rejoint un " +"groupe, vous pouvez envoyer des messages à tous les autres membres en " +"utilisant la syntaxe « !nomdugroupe ». Vous ne voyez aucun groupe qui vous " +"intéresse ? Essayez d’en [rechercher un](%%%%action.groupsearch%%%%) ou de " +"[créer le vôtre !](%%%%action.newgroup%%%%)" #: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 msgid "Create a new group" @@ -1590,12 +1594,12 @@ msgstr "" #: actions/imsettings.php:143 msgid "Send me notices through Jabber/GTalk." -msgstr "Envoyez-moi les statuts par Jabber/GTalk." +msgstr "Envoyez-moi les avis par Jabber/GTalk." #: actions/imsettings.php:148 msgid "Post a notice when my Jabber/GTalk status changes." msgstr "" -"Publier un statut chaque fois que mon statut est modifié dans Jabber/GTalk" +"Poster un avis chaque fois que mon statut est modifié dans Jabber/GTalk" #: actions/imsettings.php:153 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." @@ -1729,7 +1733,7 @@ msgstr "Message personnel" msgid "Optionally add a personal message to the invitation." msgstr "Ajouter un message personnel à l’invitation (optionnel)." -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" msgstr "Envoyer" @@ -1977,11 +1981,11 @@ msgstr "Erreur Ajax" #: actions/newnotice.php:69 msgid "New notice" -msgstr "Nouveau statut" +msgstr "Nouvel avis" #: actions/newnotice.php:206 msgid "Notice posted" -msgstr "Statut publié" +msgstr "Avis publié" #: actions/noticesearch.php:68 #, php-format @@ -1989,7 +1993,7 @@ msgid "" "Search for notices on %%site.name%% by their contents. Separate search terms " "by spaces; they must be 3 characters or more." msgstr "" -"Recherchez les statuts %%site.name%% par leur contenu. Séparez les termes de " +"Recherchez les avis %%site.name%% par leur contenu. Séparez les termes de " "recherche par des espaces. Ils doivent contenir au moins 3 caractères." #: actions/noticesearch.php:78 @@ -2047,7 +2051,7 @@ msgstr "Clin d’œil envoyé !" #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" -msgstr "Le statut n’a pas de profil" +msgstr "L’avis n’a pas de profil" #: actions/oembed.php:86 actions/shownotice.php:180 #, php-format @@ -2062,8 +2066,8 @@ msgstr "type de contenu " msgid "Only " msgstr "Seulement " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." msgstr "Format de données non supporté." @@ -2073,7 +2077,7 @@ msgstr "Recherche de personnes" #: actions/opensearch.php:67 msgid "Notice Search" -msgstr "Recherche de statut" +msgstr "Recherche d’avis" #: actions/othersettings.php:60 msgid "Other Settings" @@ -2302,12 +2306,12 @@ msgstr "Recherche de personnes" #: actions/peopletag.php:70 #, php-format msgid "Not a valid people tag: %s" -msgstr "Ce marquage est invalide : %s" +msgstr "Cette marque est invalide : %s" #: actions/peopletag.php:144 #, php-format msgid "Users self-tagged with %s - page %d" -msgstr "Utilisateurs marqués &s - page %d" +msgstr "Utilisateurs marqués par eux-mêmes %s - page %d" #: actions/postnotice.php:84 msgid "Invalid notice content" @@ -2317,8 +2321,7 @@ msgstr "Contenu invalide" #, php-format msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." msgstr "" -"La licence des statuts « %s » n'est pas compatible avec la licence du site « %" -"s »." +"La licence des avis « %s » n'est pas compatible avec la licence du site « %s »." #: actions/profilesettings.php:60 msgid "Profile settings" @@ -2382,13 +2385,14 @@ msgstr "Indiquez votre emplacement, ex.: « Ville, État (ou région), Pays »" #: actions/tagother.php:209 lib/subscriptionlist.php:106 #: lib/subscriptionlist.php:108 lib/userprofile.php:209 msgid "Tags" -msgstr "Marquages" +msgstr "Marques" #: actions/profilesettings.php:140 msgid "" "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" msgstr "" -"Marquages (tags) pour votre profil, séparés par des virgules ou des espaces" +"Marques pour vous-même (lettres, chiffres, -, ., et _), séparées par des " +"virgules ou des espaces" #: actions/profilesettings.php:144 actions/siteadminpanel.php:307 msgid "Language" @@ -2429,7 +2433,7 @@ msgstr "La langue est trop longue (255 caractères maximum)." #: actions/profilesettings.php:246 actions/tagother.php:178 #, php-format msgid "Invalid tag: \"%s\"" -msgstr "Marquage invalide : « %s »" +msgstr "Marque invalide : « %s »" #: actions/profilesettings.php:295 msgid "Couldn't update user for autosubscribe." @@ -2441,7 +2445,7 @@ msgstr "Impossible d’enregistrer le profil." #: actions/profilesettings.php:336 msgid "Couldn't save tags." -msgstr "Impossible d’enregistrer les marquages." +msgstr "Impossible d’enregistrer les marques." #: actions/profilesettings.php:344 lib/adminpanelaction.php:126 msgid "Settings saved." @@ -2524,17 +2528,18 @@ msgstr "" #: actions/publictagcloud.php:57 msgid "Public tag cloud" -msgstr "Nuage de mots clefs public" +msgstr "Nuage de marques public" #: actions/publictagcloud.php:63 #, php-format msgid "These are most popular recent tags on %s " -msgstr "Derniers marquages les plus populaires dans %s " +msgstr "Dernières marques les plus populaires sur %s " #: actions/publictagcloud.php:69 #, php-format msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet." -msgstr "Personne n'a encore posté un statuts avec une [marque](%%doc.tags%%)." +msgstr "" +"Personne n'a encore posté d’avis avec une [marque (hashtag)](%%doc.tags%%)." #: actions/publictagcloud.php:72 msgid "Be the first to post one!" @@ -2551,7 +2556,7 @@ msgstr "" #: actions/publictagcloud.php:135 msgid "Tag cloud" -msgstr "Nuage de mots clefs" +msgstr "Nuage de marques" #: actions/recoverpassword.php:36 msgid "You are already logged in!" @@ -2724,7 +2729,7 @@ msgid "" "link up to friends and colleagues. " msgstr "" "Avec ce formulaire vous pouvez créer un nouveau compte. Vous pourrez ensuite " -"poster des statuts and et vous relier avec des amis et collègues. " +"poster des avis and et vous relier à des amis et collègues. " #: actions/register.php:424 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." @@ -2747,8 +2752,8 @@ msgstr "Courriel" #: actions/register.php:438 actions/register.php:442 msgid "Used only for updates, announcements, and password recovery" msgstr "" -"Utilisé uniquement pour les mises à jour de statut, les avertissements, et " -"la récupération de mot de passe" +"Utilisé uniquement pour les mises à jour, les notifications, et la " +"récupération de mot de passe" #: actions/register.php:449 msgid "Longer name, preferably your \"real\" name" @@ -2791,9 +2796,9 @@ msgstr "" "Félicitations, %s! Bienvenue dans %%%%site.name%%%%. Vous pouvez " "maintenant :\n" "\n" -"* Visiter [votre profil](%s) et publier votre premier statut.\n" +"* Visiter [votre profil](%s) et poster votre premier message.\n" "* Ajouter une adresse [Jabber/GTalk](%%%%action.imsettings%%%%) afin " -"d’envoyer et recevoir vos statuts par messagerie instantanée.\n" +"d’envoyer et recevoir vos avis par messagerie instantanée.\n" "* [Chercher des personnes](%%%%action.peoplesearch%%%%) que vous pourriez " "connaître ou qui partagent vos intêrets.\n" "* Mettre votre [profil](%%%%action.profilesettings%%%%) à jour pour en dire " @@ -2858,7 +2863,6 @@ msgid "Invalid profile URL (bad format)" msgstr "URL du profil invalide (mauvais format)" #: actions/remotesubscribe.php:168 -#, fuzzy msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)." msgstr "" "URL de profil invalide (aucun document YADIS ou définition XRDS invalide)." @@ -2903,8 +2907,8 @@ msgid "" "This is the timeline showing replies to %s but %s hasn't received a notice " "to his attention yet." msgstr "" -"Ceci est la chronologie des réponses à %s mais %s n'a encore reçu aucun " -"statut à son intention." +"Ceci est la chronologie des réponses à %s mais %s n’a encore reçu aucun avis " +"à son intention." #: actions/replies.php:203 #, php-format @@ -2912,8 +2916,9 @@ msgid "" "You can engage other users in a conversation, subscribe to more people or " "[join groups](%%action.groups%%)." msgstr "" -"Vous pouvez vous engager dans une conversation avec d'autres personnes, vous " -"abonner à plus de gens ou [joindre des groupes](%%action.groups%%)." +"Vous pouvez entamer une conversation avec d’autres utilisateurs, vous " +"abonner à plus de personnes ou vous [inscrire à des groupes](%%action.groups%" +"%)." #: actions/replies.php:205 #, php-format @@ -2921,8 +2926,8 @@ msgid "" "You can try to [nudge %s](../%s) or [post something to his or her attention]" "(%%%%action.newnotice%%%%?status_textarea=%s)." msgstr "" -"Vous pouvez essayer de [faire un clin d’œil à %s](../%s) ou de [publier " -"quelque chose à son attention](%%%%action.newnotice%%%%?status_textarea=%s)" +"Vous pouvez essayer de [faire un clin d’œil à %s](../%s) ou de [poster " +"quelque chose à son intention](%%%%action.newnotice%%%%?status_textarea=%s)" #: actions/repliesrss.php:72 #, php-format @@ -2988,7 +2993,7 @@ msgid "" "would add to their favorites :)" msgstr "" "%s n’a pas ajouté d’avis à ses favoris pour le moment. Vous pourriez [créer " -"un compte](%%%%action.register%%%%), puis publier quelque chose " +"un compte](%%%%action.register%%%%), puis poster quelque chose " "d’intéressant, qui serait ajouté à ses favoris :)" #: actions/showfavorites.php:242 @@ -3139,22 +3144,22 @@ msgstr "%s - page %d" #: actions/showstream.php:122 #, php-format msgid "Notice feed for %s tagged %s (RSS 1.0)" -msgstr "Fil des statuts pour %s marqués %s (RSS 1.0)" +msgstr "Fil des avis pour %s marqués %s (RSS 1.0)" #: actions/showstream.php:129 #, php-format msgid "Notice feed for %s (RSS 1.0)" -msgstr "Flux des statuts de %s (RSS 1.0)" +msgstr "Flux des avis de %s (RSS 1.0)" #: actions/showstream.php:136 #, php-format msgid "Notice feed for %s (RSS 2.0)" -msgstr "Flux des statuts de %s (RSS 2.0)" +msgstr "Flux des avis de %s (RSS 2.0)" #: actions/showstream.php:143 #, php-format msgid "Notice feed for %s (Atom)" -msgstr "Flux des statuts de %s (Atom)" +msgstr "Flux des avis de %s (Atom)" #: actions/showstream.php:148 #, php-format @@ -3180,8 +3185,8 @@ msgid "" "You can try to nudge %s or [post something to his or her attention](%%%%" "action.newnotice%%%%?status_textarea=%s)." msgstr "" -"Vous pouvez essayer de faire un clin d’œil à %s ou de [publier quelque chose " -"à son attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"Vous pouvez essayer de faire un clin d’œil à %s ou de [poster quelque chose " +"à son intention](%%%%action.newnotice%%%%?status_textarea=%s)." #: actions/showstream.php:234 #, php-format @@ -3194,8 +3199,8 @@ msgstr "" "**%s** possède un compte sur %%%%site.name%%%%, un service de [microblogging]" "(http://fr.wikipedia.org/wiki/Microblog) basé sur le logiciel libre " "[StatusNet](http://status.net/). [Inscrivez-vous maintenant](%%%%action." -"register%%%%) pour suivre les statuts de **%s** et bien plus ! ([En lire " -"plus](%%%%doc.help%%%%))" +"register%%%%) pour suivre les avis de **%s** et bien plus ! ([En lire plus](%" +"%%%doc.help%%%%))" #: actions/showstream.php:239 #, php-format @@ -3291,7 +3296,7 @@ msgstr "URL utilisée pour le lien de crédits au bas de chaque page" #: actions/siteadminpanel.php:284 msgid "Contact email address for your site" -msgstr "adresse de courriel de contact de votre site" +msgstr "Adresse de courriel de contact de votre site" #: actions/siteadminpanel.php:290 msgid "Local" @@ -3435,7 +3440,7 @@ msgstr "Limite de texte" #: actions/siteadminpanel.php:403 msgid "Maximum number of characters for notices." -msgstr "Nombre maximal de caractères pour les statuts." +msgstr "Nombre maximal de caractères pour les avis." #: actions/siteadminpanel.php:407 msgid "Dupe limit" @@ -3496,7 +3501,7 @@ msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." msgstr "" -"Envoyez-moi les statuts par SMS ; je comprends que cela pourrait affecter ma " +"Envoyez-moi les avis par SMS ; je comprends que cela pourrait affecter ma " "facture de téléphonie mobile." #: actions/smssettings.php:306 @@ -3568,7 +3573,7 @@ msgstr "Ceci n’est pas un utilisateur local." #: actions/subscribe.php:69 msgid "Subscribed" -msgstr "Souscrit" +msgstr "Abonné" #: actions/subscribers.php:50 #, php-format @@ -3582,12 +3587,12 @@ msgstr "Abonnés à %s - page &d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." -msgstr "Ces personnes suivent vos statuts." +msgstr "Ces personnes suivent vos avis." #: actions/subscribers.php:67 #, php-format msgid "These are the people who listen to %s's notices." -msgstr "Ces personnes suivent les statuts de %s." +msgstr "Ces personnes suivent les avis de %s." #: actions/subscribers.php:108 msgid "" @@ -3623,12 +3628,12 @@ msgstr "Abonnements de %s - page %d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." -msgstr "Vous suivez les statuts de ces personnes. " +msgstr "Vous suivez les avis de ces personnes." #: actions/subscriptions.php:69 #, php-format msgid "These are the people whose notices %s listens to." -msgstr "Les statuts de ces personnes sont suivis par %s." +msgstr "Les avis de ces personnes sont suivis par %s." #: actions/subscriptions.php:121 #, php-format @@ -3670,7 +3675,7 @@ msgstr "Aucun argument d’identification." #: actions/tagother.php:65 #, php-format msgid "Tag %s" -msgstr "Marquage %s" +msgstr "Marque %s" #: actions/tagother.php:77 lib/userprofile.php:75 msgid "User profile" @@ -3688,7 +3693,9 @@ msgstr "Marquer l’utilisateur" msgid "" "Tags for this user (letters, numbers, -, ., and _), comma- or space- " "separated" -msgstr "Marquer cet utilisateur (séparer par des espaces ou des virgules)" +msgstr "" +"Marques pour cet utilisateur (lettres, chiffres, -, ., et _), séparées par " +"des virgules ou des espaces" #: actions/tagother.php:193 msgid "" @@ -3699,7 +3706,7 @@ msgstr "" #: actions/tagother.php:200 msgid "Could not save tags." -msgstr "Impossible d’enregistrer les marquages." +msgstr "Impossible d’enregistrer les marques." #: actions/tagother.php:236 msgid "Use this form to add tags to your subscribers or subscriptions." @@ -3709,26 +3716,26 @@ msgstr "" #: actions/tag.php:68 #, php-format msgid "Notices tagged with %s, page %d" -msgstr "Statuts marqués %s - page %d" +msgstr "Avis marqués %s - page %d" #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "Flux des statuts pour le marquage %s (RSS 1.0)" +msgstr "Flux des avis pour la marque %s (RSS 1.0)" #: actions/tag.php:92 #, php-format msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "Flux des statuts pour le marquage %s (RSS 2.0)" +msgstr "Flux des avis pour la marque %s (RSS 2.0)" #: actions/tag.php:98 #, php-format msgid "Notice feed for tag %s (Atom)" -msgstr "Flux des statuts pour le marquage %s (Atom)" +msgstr "Flux des avis pour la marque %s (Atom)" #: actions/tagrss.php:35 msgid "No such tag." -msgstr "Aucun marquage trouvé." +msgstr "Cette marque n’existe pas." #: actions/twitapitrends.php:87 msgid "API method under construction." @@ -3762,7 +3769,7 @@ msgstr "Désabonné" #, php-format msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." msgstr "" -"La licence du flux auquel vous avez souscrit ‘%s’ n’est pas compatible avec " +"La licence du flux auquel vous êtes abonné(e) ‘%s’ n’est pas compatible avec " "la licence du site ‘%s’." #: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 @@ -3865,8 +3872,8 @@ msgid "" "click “Reject”." msgstr "" "Veuillez vérifier ces détails pour vous assurer que vous souhaitez vous " -"abonner aux statuts de cet utilisateur. Si vous n’avez pas demandé à vous " -"abonner aux statuts de quelqu’un, cliquez « Rejeter »." +"abonner aux avis de cet utilisateur. Si vous n’avez pas demandé à vous " +"abonner aux avis de quelqu’un, cliquez « Rejeter »." #: actions/userauthorization.php:188 msgid "License" @@ -3887,7 +3894,7 @@ msgstr "Refuser" #: actions/userauthorization.php:212 msgid "Reject this subscription" -msgstr "Rejeter cette souscription" +msgstr "Rejeter cet abonnement" #: actions/userauthorization.php:225 msgid "No authorization request!" @@ -3929,12 +3936,13 @@ msgstr "L’URI de l’auditeur ‘%s’ n’a pas été trouvée" #: actions/userauthorization.php:301 #, php-format msgid "Listenee URI ‘%s’ is too long." -msgstr "L’URI à laquelle vous avez souscrit ‘%s’ est trop longue." +msgstr "L’URI à laquelle vous vous êtes abonné(e) ‘%s’ est trop longue." #: actions/userauthorization.php:307 #, php-format msgid "Listenee URI ‘%s’ is a local user." -msgstr "L’URI à laquelle vous avez souscrit ‘%s’ est un utilisateur local." +msgstr "" +"L’URI à laquelle vous vous êtes abonné(e) ‘%s’ est un utilisateur local." #: actions/userauthorization.php:322 #, php-format @@ -4031,7 +4039,7 @@ msgstr "Impossible de mettre à jour le message avec un nouvel URI." #: classes/Notice.php:164 #, php-format msgid "DB error inserting hashtag: %s" -msgstr "Erreur de base de donnée en insérant le hashtag : %s" +msgstr "Erreur de base de donnée en insérant la marque (hashtag) : %s" #: classes/Notice.php:179 msgid "Problem saving notice. Too long." @@ -4039,14 +4047,14 @@ msgstr "Problème lors de l’enregistrement de l’avis ; trop long." #: classes/Notice.php:183 msgid "Problem saving notice. Unknown user." -msgstr "Erreur lors de l’enregistrement du statut. Utilisateur inconnu." +msgstr "Erreur lors de l’enregistrement de l’avis. Utilisateur inconnu." #: classes/Notice.php:188 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -"Trop de statuts, trop vite ! Prenez une pause et publiez à nouveau dans " -"quelques minutes." +"Trop d’avis, trop vite ! Faites une pause et publiez à nouveau dans quelques " +"minutes." #: classes/Notice.php:194 msgid "" @@ -4058,11 +4066,11 @@ msgstr "" #: classes/Notice.php:200 msgid "You are banned from posting notices on this site." -msgstr "Il vous est interdit de publier des statuts dans ce site." +msgstr "Il vous est interdit de poster des avis sur ce site." #: classes/Notice.php:265 classes/Notice.php:290 msgid "Problem saving notice." -msgstr "Problème lors de l’enregistrement du statut." +msgstr "Problème lors de l’enregistrement de l’avis." #: classes/Notice.php:1124 #, php-format @@ -4335,7 +4343,7 @@ msgstr "Fournisseur" #: lib/attachmentnoticesection.php:67 msgid "Notices where this attachment appears" -msgstr "Statuts sur lesquels cette pièce jointe apparait." +msgstr "Avis sur lesquels cette pièce jointe apparaît." #: lib/attachmenttagcloudsection.php:48 msgid "Tags for this attachment" @@ -4384,15 +4392,15 @@ msgstr "" #: lib/command.php:152 lib/command.php:400 msgid "Notice with that id does not exist" -msgstr "Aucun statut avec cet identifiant n’existe" +msgstr "Aucun avis avec cet identifiant n’existe" #: lib/command.php:168 lib/command.php:416 lib/command.php:471 msgid "User has no last notice" -msgstr "Aucun statut récent pour cet utilisateur" +msgstr "Aucun avis récent pour cet utilisateur" #: lib/command.php:190 msgid "Notice marked as fave." -msgstr "Statut ajouté aux favoris." +msgstr "Avis ajouté aux favoris." #: lib/command.php:315 #, php-format @@ -4515,7 +4523,6 @@ msgstr[0] "Vous êtes membre de ce groupe :" msgstr[1] "Vous êtes membre de ces groupes :" #: lib/command.php:652 -#, fuzzy msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4579,7 +4586,7 @@ msgstr "" "last - même effet que 'get'\n" "on - pas encore implémenté.\n" "off - pas encore implémenté.\n" -"nudge - rappeler à un utilisateur de publier.\n" +"nudge - clin d’œil : rappeler à un utilisateur de poster.\n" "invite - pas encore implémenté.\n" "track - pas encore implémenté.\n" "untrack - pas encore implémenté.\n" @@ -4611,11 +4618,11 @@ msgstr "IM" #: lib/connectsettingsaction.php:111 msgid "Updates by instant messenger (IM)" -msgstr "Suivi des statuts par messagerie instantanée" +msgstr "Suivi des avis par messagerie instantanée" #: lib/connectsettingsaction.php:116 msgid "Updates by SMS" -msgstr "Suivi des statuts par SMS" +msgstr "Suivi des avis par SMS" #: lib/dberroraction.php:60 msgid "Database error" @@ -4632,11 +4639,7 @@ msgstr "" "Vous pouvez importer votre image d’arrière plan personnelle. La taille " "maximale du fichier est de 2 Mo." -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "Mauvais paramètres de couleur par défaut : " - -#: lib/designsettings.php:468 +#: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "Les paramètre par défaut de la conception ont été restaurés." @@ -4674,7 +4677,7 @@ msgstr "Ami d’un ami" #: lib/galleryaction.php:121 msgid "Filter tags" -msgstr "Filtrer les balises" +msgstr "Filtrer les marques" #: lib/galleryaction.php:131 msgid "All" @@ -4686,11 +4689,11 @@ msgstr "Sélectionner une marque à filtrer" #: lib/galleryaction.php:140 msgid "Tag" -msgstr "Marquer" +msgstr "Marque" #: lib/galleryaction.php:141 msgid "Choose a tag to narrow list" -msgstr "Choissez un marquage pour réduire la liste" +msgstr "Choissez une marque pour réduire la liste" #: lib/galleryaction.php:143 msgid "Go" @@ -4770,7 +4773,7 @@ msgstr "Groupes avec le plus d'éléments publiés" #: lib/grouptagcloudsection.php:56 #, php-format msgid "Tags in %s group's notices" -msgstr "Marquages des statuts du groupe %s" +msgstr "Marques dans les avis du groupe %s" #: lib/htmloutputter.php:103 msgid "This page is not available in a media type you accept" @@ -4889,7 +4892,7 @@ msgstr "" #: lib/mail.php:236 #, php-format msgid "%1$s is now listening to your notices on %2$s." -msgstr "%1$s suit maintenant vos statuts dans %2$s." +msgstr "%1$s suit maintenant vos avis sur %2$s." #: lib/mail.php:241 #, php-format @@ -4905,7 +4908,7 @@ msgid "" "----\n" "Change your email address or notification options at %8$s\n" msgstr "" -"%1$s suit maintenant vos statuts sur %2$s.\n" +"%1$s suit maintenant vos avis sur %2$s.\n" "\n" "%3$s\n" "\n" @@ -4952,14 +4955,13 @@ msgid "" "Faithfully yours,\n" "%4$s" msgstr "" -"Une nouvelle adresse vous a été attribuée pour publier vos statuts dans %1" -"$s.\n" +"Une nouvelle adresse vous a été attribuée pour poster vos avis sur %1$s.\n" "\n" -"Écrivez à %2$s pour mettre à jour votre statut.\n" +"Écrivez à %2$s pour poster un nouvel avis.\n" "\n" "Plus d’info : %3$s.\n" "\n" -"Amicalement vôtre,\n" +"Cordialement,\n" "%4$s" #: lib/mail.php:413 @@ -4992,7 +4994,7 @@ msgid "" "%4$s\n" msgstr "" "%1$s (%2$s) se demande ce que vous devenez ces temps-ci et vous invite à " -"publier des nouvelles.\n" +"poster des nouvelles.\n" "\n" "Donc on vous écoute :)\n" "\n" @@ -5044,7 +5046,7 @@ msgstr "" #: lib/mail.php:559 #, php-format msgid "%s (@%s) added your notice as a favorite" -msgstr "%s (@%s) a ajouté un de vos statut à ses favoris" +msgstr "%s (@%s) a ajouté un de vos avis à ses favoris" #: lib/mail.php:561 #, php-format @@ -5178,24 +5180,24 @@ msgstr "Envoyer un message direct" msgid "To" msgstr "À" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 msgid "Available characters" msgstr "Caractères restants" #: lib/noticeform.php:158 msgid "Send a notice" -msgstr "Envoyer un statut" +msgstr "Envoyer un avis" #: lib/noticeform.php:171 #, php-format msgid "What's up, %s?" msgstr "Quoi de neuf, %s ?" -#: lib/noticeform.php:193 +#: lib/noticeform.php:192 msgid "Attach" msgstr "Attacher" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "Attacher un fichier" @@ -5230,7 +5232,7 @@ msgstr "dans le contexte" #: lib/noticelist.php:526 msgid "Reply to this notice" -msgstr "Répondre à ce statut" +msgstr "Répondre à cet avis" #: lib/noticelist.php:527 msgid "Reply" @@ -5303,7 +5305,7 @@ msgstr "Vos messages envoyés" #: lib/personaltagcloudsection.php:56 #, php-format msgid "Tags in %s's notices" -msgstr "Marquages des statuts de %s" +msgstr "Marques dans les avis de %s" #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" @@ -5351,7 +5353,7 @@ msgstr "Groupes d’utilisateurs" #: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85 msgid "Recent tags" -msgstr "Marquages récents" +msgstr "Marques récentes" #: lib/publicgroupnav.php:88 msgid "Featured" @@ -5375,7 +5377,7 @@ msgstr "Rechercher sur le site" #: lib/searchaction.php:126 msgid "Keyword(s)" -msgstr "Mot(s) celf(s)" +msgstr "Mot(s) clef(s)" #: lib/searchaction.php:162 msgid "Search help" @@ -5391,7 +5393,7 @@ msgstr "Chercher des personnes sur ce site" #: lib/searchgroupnav.php:83 msgid "Find content of notices" -msgstr "Chercher dans le contenu des statuts" +msgstr "Chercher dans le contenu des avis" #: lib/searchgroupnav.php:85 msgid "Find groups on this site" @@ -5431,12 +5433,12 @@ msgstr "Groupes de %s" #: lib/subscriberspeopleselftagcloudsection.php:48 #: lib/subscriptionspeopleselftagcloudsection.php:48 msgid "People Tagcloud as self-tagged" -msgstr "Nuage de mots clefs des personnes tel que définis par eux-même" +msgstr "Nuage de marques pour une personne (ajoutées par eux-même)" #: lib/subscriberspeopletagcloudsection.php:48 #: lib/subscriptionspeopletagcloudsection.php:48 msgid "People Tagcloud as tagged" -msgstr "Nuage de mots clefs des personnes" +msgstr "Nuage de marques pour une personne" #: lib/subscriptionlist.php:126 msgid "(none)" @@ -5444,7 +5446,7 @@ msgstr "(aucun)" #: lib/subs.php:52 msgid "Already subscribed!" -msgstr "Déjà souscrit !" +msgstr "Déjà abonné !" #: lib/subs.php:56 msgid "User has blocked you." @@ -5462,7 +5464,12 @@ msgstr "Impossible d’abonner une autre personne à votre profil." msgid "Not subscribed!" msgstr "Pas abonné !" -#: lib/subs.php:140 +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "Impossible de cesser l’abonnement" + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "Impossible de cesser l’abonnement" diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index 445e580bbb..d809f92341 100644 --- a/locale/ga/LC_MESSAGES/statusnet.po +++ b/locale/ga/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-02 23:18+0000\n" -"PO-Revision-Date: 2009-12-02 23:19:42+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"PO-Revision-Date: 2009-12-05 19:54:19+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ga\n" "X-Message-Group: out-statusnet\n" @@ -185,7 +185,12 @@ msgstr "O usuario non ten perfil." msgid "Could not save profile." msgstr "Non se puido gardar o perfil." -#: actions/apiblockcreate.php:108 +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "Non se puido actualizar o usuario." + +#: actions/apiblockcreate.php:119 msgid "Block user failed." msgstr "Bloqueo de usuario fallido." @@ -848,109 +853,109 @@ msgstr "" msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:270 +#: actions/designadminpanel.php:275 #, fuzzy msgid "Invalid logo URL." msgstr "Tamaño inválido." -#: actions/designadminpanel.php:274 +#: actions/designadminpanel.php:279 #, fuzzy, php-format msgid "Theme not available: %s" msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas" -#: actions/designadminpanel.php:370 +#: actions/designadminpanel.php:375 #, fuzzy msgid "Change logo" msgstr "Cambiar contrasinal" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:380 #, fuzzy msgid "Site logo" msgstr "Invitar" -#: actions/designadminpanel.php:382 +#: actions/designadminpanel.php:387 #, fuzzy msgid "Change theme" msgstr "Modificado" -#: actions/designadminpanel.php:399 +#: actions/designadminpanel.php:404 #, fuzzy msgid "Site theme" msgstr "Novo chío" -#: actions/designadminpanel.php:400 +#: actions/designadminpanel.php:405 msgid "Theme for the site." msgstr "" -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" msgstr "" -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" msgstr "" -#: actions/designadminpanel.php:422 +#: actions/designadminpanel.php:427 #, fuzzy, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "Podes actualizar a túa información do perfil persoal aquí" -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" msgstr "" -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:469 lib/designsettings.php:156 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:161 +#: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 +#: actions/designadminpanel.php:488 lib/designsettings.php:170 #, fuzzy msgid "Change colours" msgstr "Cambiar contrasinal" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 +#: actions/designadminpanel.php:510 lib/designsettings.php:191 #, fuzzy msgid "Content" msgstr "Conectar" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 +#: actions/designadminpanel.php:523 lib/designsettings.php:204 #, fuzzy msgid "Sidebar" msgstr "Buscar" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "Texto" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 +#: actions/designadminpanel.php:549 lib/designsettings.php:230 #, fuzzy msgid "Links" msgstr "Lista" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -960,7 +965,7 @@ msgstr "" msgid "Save" msgstr "Gardar" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1410,20 +1415,20 @@ msgid "" "palette of your choice." msgstr "" -#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 -#: lib/designsettings.php:434 lib/designsettings.php:464 +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 #, fuzzy msgid "Couldn't update your design." msgstr "Non se puido actualizar o usuario." -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 #, fuzzy msgid "Unable to save your design settings!" msgstr "Non se puideron gardar os teus axustes de Twitter!" -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 #, fuzzy msgid "Design preferences saved." msgstr "Preferencias gardadas." @@ -1743,7 +1748,7 @@ msgstr "Mensaxe persoal" msgid "Optionally add a personal message to the invitation." msgstr "Opcionalmente engadir unha mensaxe persoal á invitación." -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" msgstr "Enviar" @@ -2072,8 +2077,8 @@ msgstr "Conectar" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." msgstr "Non é un formato de datos soportado." @@ -4679,11 +4684,7 @@ msgid "" "You can upload your personal background image. The maximum file size is 2MB." msgstr "Podes actualizar a túa información do perfil persoal aquí" -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "" - -#: lib/designsettings.php:468 +#: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "" @@ -5206,7 +5207,7 @@ msgstr "Eliminar chío" msgid "To" msgstr "A" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 #, fuzzy msgid "Available characters" msgstr "6 ou máis caracteres" @@ -5221,11 +5222,11 @@ msgstr "Dar un toque" msgid "What's up, %s?" msgstr "¿Que pasa, %s?" -#: lib/noticeform.php:193 +#: lib/noticeform.php:192 msgid "Attach" msgstr "" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "" @@ -5514,7 +5515,12 @@ msgstr "Outro usuario non se puido suscribir a ti." msgid "Not subscribed!" msgstr "Non está suscrito!" -#: lib/subs.php:140 +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "Non se pode eliminar a subscrición." + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "Non se pode eliminar a subscrición." diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index c481313070..8ff8672800 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: 2009-12-02 23:18+0000\n" -"PO-Revision-Date: 2009-12-02 23:19:46+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"PO-Revision-Date: 2009-12-05 19:54:22+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: he\n" "X-Message-Group: out-statusnet\n" @@ -183,7 +183,12 @@ msgstr "למשתמש אין פרופיל." msgid "Could not save profile." msgstr "שמירת הפרופיל נכשלה." -#: actions/apiblockcreate.php:108 +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "עידכון המשתמש נכשל." + +#: actions/apiblockcreate.php:119 msgid "Block user failed." msgstr "" @@ -834,109 +839,109 @@ msgstr "" msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:270 +#: actions/designadminpanel.php:275 #, fuzzy msgid "Invalid logo URL." msgstr "גודל לא חוקי." -#: actions/designadminpanel.php:274 +#: actions/designadminpanel.php:279 #, fuzzy, php-format msgid "Theme not available: %s" msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל" -#: actions/designadminpanel.php:370 +#: actions/designadminpanel.php:375 #, fuzzy msgid "Change logo" msgstr "שנה סיסמה" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:380 #, fuzzy msgid "Site logo" msgstr "הודעה חדשה" -#: actions/designadminpanel.php:382 +#: actions/designadminpanel.php:387 #, fuzzy msgid "Change theme" msgstr "שנה" -#: actions/designadminpanel.php:399 +#: actions/designadminpanel.php:404 #, fuzzy msgid "Site theme" msgstr "הודעה חדשה" -#: actions/designadminpanel.php:400 +#: actions/designadminpanel.php:405 msgid "Theme for the site." msgstr "" -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" msgstr "" -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" msgstr "" -#: actions/designadminpanel.php:422 +#: actions/designadminpanel.php:427 #, fuzzy, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות." -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" msgstr "" -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:469 lib/designsettings.php:156 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:161 +#: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 +#: actions/designadminpanel.php:488 lib/designsettings.php:170 #, fuzzy msgid "Change colours" msgstr "שנה סיסמה" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 +#: actions/designadminpanel.php:510 lib/designsettings.php:191 #, fuzzy msgid "Content" msgstr "התחבר" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 +#: actions/designadminpanel.php:523 lib/designsettings.php:204 #, fuzzy msgid "Sidebar" msgstr "חיפוש" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "טקסט" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 +#: actions/designadminpanel.php:549 lib/designsettings.php:230 #, fuzzy msgid "Links" msgstr "היכנס" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -946,7 +951,7 @@ msgstr "" msgid "Save" msgstr "שמור" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1388,19 +1393,19 @@ msgid "" "palette of your choice." msgstr "" -#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 -#: lib/designsettings.php:434 lib/designsettings.php:464 +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 #, fuzzy msgid "Couldn't update your design." msgstr "עידכון המשתמש נכשל." -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings!" msgstr "" -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 #, fuzzy msgid "Design preferences saved." msgstr "העדפות נשמרו." @@ -1715,7 +1720,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" msgstr "שלח" @@ -2011,8 +2016,8 @@ msgstr "התחבר" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." msgstr "" @@ -4490,11 +4495,7 @@ msgid "" "You can upload your personal background image. The maximum file size is 2MB." msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות." -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "" - -#: lib/designsettings.php:468 +#: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "" @@ -4956,7 +4957,7 @@ msgstr "" msgid "To" msgstr "אל" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 #, fuzzy msgid "Available characters" msgstr "לפחות 6 אותיות" @@ -4971,11 +4972,11 @@ msgstr "הודעה חדשה" msgid "What's up, %s?" msgstr "מה המצב %s?" -#: lib/noticeform.php:193 +#: lib/noticeform.php:192 msgid "Attach" msgstr "" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "" @@ -5257,7 +5258,12 @@ msgstr "" msgid "Not subscribed!" msgstr "לא מנוי!" -#: lib/subs.php:140 +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "מחיקת המנוי לא הצליחה." + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "מחיקת המנוי לא הצליחה." diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index c22ee263de..6a0ff37b46 100644 --- a/locale/hsb/LC_MESSAGES/statusnet.po +++ b/locale/hsb/LC_MESSAGES/statusnet.po @@ -6,19 +6,19 @@ # msgid "" msgstr "" -"" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-27 23:50+0000\n" -"PO-Revision-Date: 2009-12-02 23:32:10+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"PO-Revision-Date: 2009-12-05 19:54:27+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: hsb\n" "X-Message-Group: out-statusnet\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : (n%100==3 || n%100==4) ? 2 : 3)\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : (n%100==3 || " +"n%100==4) ? 2 : 3)\n" #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 @@ -76,10 +76,42 @@ msgstr "Kanal za přećelow wužiwarja %s (RSS 2.0)" msgid "Feed for friends of %s (Atom)" msgstr "Kanal za přećelow wužiwarja %s (Atom)" +#: actions/all.php:127 +#, php-format +msgid "" +"This is the timeline for %s and friends but no one has posted anything yet." +msgstr "" + +#: actions/all.php:132 +#, php-format +msgid "" +"Try subscribing to more people, [join a group](%%action.groups%%) or post " +"something yourself." +msgstr "" + +#: actions/all.php:134 +#, php-format +msgid "" +"You can try to [nudge %s](../%s) from his profile or [post something to his " +"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +msgstr "" + +#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 +#, php-format +msgid "" +"Why not [register an account](%%%%action.register%%%%) and then nudge %s or " +"post a notice to his or her attention." +msgstr "" + #: actions/all.php:165 msgid "You and friends" msgstr "Ty a přećeljo" +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#, php-format +msgid "Updates from %1$s and friends on %2$s!" +msgstr "" + #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 #: actions/apiaccountupdateprofilebackgroundimage.php:94 @@ -101,10 +133,34 @@ msgstr "API-metoda njenamakana." msgid "This method requires a POST." msgstr "Tuta metoda wužaduje sej POST." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + #: actions/apiaccountupdatedeliverydevice.php:132 msgid "Could not update user." msgstr "Wužiwar njeje so dał aktualizować." +#: actions/apiaccountupdateprofilebackgroundimage.php:108 +#: actions/apiaccountupdateprofileimage.php:97 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: lib/designsettings.php:283 +#, php-format +msgid "" +"The server was unable to handle that much POST data (%s bytes) due to its " +"current configuration." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "" + #: actions/apiaccountupdateprofilebackgroundimage.php:187 #: actions/apiaccountupdateprofilecolors.php:142 msgid "Could not update your design." @@ -123,6 +179,19 @@ msgstr "Wužiwar nima profil." msgid "Could not save profile." msgstr "Profil njeje so składować dał." +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "Njemóžeš wužiwarjow wušmórnyć." + +#: actions/apiblockcreate.php:119 +msgid "Block user failed." +msgstr "" + +#: actions/apiblockdestroy.php:107 +msgid "Unblock user failed." +msgstr "" + #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "Žadyn powěsćowy tekst!" @@ -136,6 +205,10 @@ msgstr "To je předołho. Maksimalna powěsćowa wulkosć je %d znamješkow." msgid "Recipient user not found." msgstr "Přijimowar njenamakany." +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "" + #: actions/apidirectmessage.php:89 #, php-format msgid "Direct messages from %s" @@ -182,10 +255,53 @@ msgstr "Status z tym ID njenamakany." msgid "This status is already a favorite!" msgstr "Tutón status je hižo faworit!" +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +msgid "Could not create favorite." +msgstr "" + #: actions/apifavoritedestroy.php:122 msgid "That status is not a favorite!" msgstr "Tón status faworit njeje!" +#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +msgid "Could not delete favorite." +msgstr "" + +#: actions/apifriendshipscreate.php:109 +msgid "Could not follow user: User not found." +msgstr "" + +#: actions/apifriendshipscreate.php:118 +#, php-format +msgid "Could not follow user: %s is already on your list." +msgstr "" + +#: actions/apifriendshipsdestroy.php:109 +msgid "Could not unfollow user: User not found." +msgstr "" + +#: actions/apifriendshipsdestroy.php:120 +msgid "You cannot unfollow yourself!" +msgstr "" + +#: actions/apifriendshipsexists.php:94 +msgid "Two user ids or screen_names must be supplied." +msgstr "" + +#: actions/apifriendshipsshow.php:135 +msgid "Could not determine source user." +msgstr "" + +#: actions/apifriendshipsshow.php:143 +msgid "Could not find target user." +msgstr "" + +#: actions/apigroupcreate.php:164 actions/editgroup.php:182 +#: actions/newgroup.php:126 actions/profilesettings.php:208 +#: actions/register.php:205 +msgid "Nickname must have only lowercase letters and numbers and no spaces." +msgstr "" + #: actions/apigroupcreate.php:173 actions/editgroup.php:186 #: actions/newgroup.php:130 actions/profilesettings.php:231 #: actions/register.php:208 @@ -254,15 +370,44 @@ msgstr "Skupina njenamakana!" msgid "You are already a member of that group." msgstr "Sy hižo čłon teje skupiny." +#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221 +msgid "You have been blocked from that group by the admin." +msgstr "" + +#: actions/apigroupjoin.php:138 +#, php-format +msgid "Could not join user %s to group %s." +msgstr "" + #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "Njejsy čłon tuteje skupiny." +#: actions/apigroupleave.php:124 +#, php-format +msgid "Could not remove user %s to group %s." +msgstr "" + +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "" + #: actions/apigrouplistall.php:94 #, php-format msgid "groups on %s" msgstr "skupiny na %s" +#: actions/apigrouplist.php:95 +#, php-format +msgid "%s's groups" +msgstr "" + +#: actions/apigrouplist.php:103 +#, php-format +msgid "Groups %s is a member of on %s." +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Tuta metoda wužaduje sej POST abo DELETE." @@ -289,10 +434,67 @@ msgstr "To je předołho. Maksimalna wulkosć zdźělenki je %d znamješkow." msgid "Not found" msgstr "Njenamakany" +#: actions/apistatusesupdate.php:227 actions/newnotice.php:183 +#, php-format +msgid "Max notice size is %d chars, including attachment URL." +msgstr "" + #: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261 msgid "Unsupported format." msgstr "Njepodpěrany format." +#: actions/apitimelinefavorites.php:107 +#, php-format +msgid "%s / Favorites from %s" +msgstr "" + +#: actions/apitimelinefavorites.php:119 +#, php-format +msgid "%s updates favorited by %s / %s." +msgstr "" + +#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/grouprss.php:131 actions/userrss.php:90 +#, php-format +msgid "%s timeline" +msgstr "" + +#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/userrss.php:92 +#, php-format +msgid "Updates from %1$s on %2$s!" +msgstr "" + +#: actions/apitimelinementions.php:116 +#, php-format +msgid "%1$s / Updates mentioning %2$s" +msgstr "" + +#: actions/apitimelinementions.php:126 +#, php-format +msgid "%1$s updates that reply to updates from %2$s / %3$s." +msgstr "" + +#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#, php-format +msgid "%s public timeline" +msgstr "" + +#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#, php-format +msgid "%s updates from everyone!" +msgstr "" + +#: actions/apitimelinetag.php:101 actions/tag.php:66 +#, php-format +msgid "Notices tagged with %s" +msgstr "" + +#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#, php-format +msgid "Updates tagged with %1$s on %2$s!" +msgstr "" + #: actions/apiusershow.php:96 msgid "Not found." msgstr "Njenamakany." @@ -321,7 +523,8 @@ msgstr "Awatar" #: actions/avatarsettings.php:78 #, php-format msgid "You can upload your personal avatar. The maximum file size is %s." -msgstr "Móžeš swój wosobinski awatar nahrać. Maksimalna datajowa wulkosć je %s." +msgstr "" +"Móžeš swój wosobinski awatar nahrać. Maksimalna datajowa wulkosć je %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:182 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 @@ -353,10 +556,48 @@ msgstr "Zničić" msgid "Upload" msgstr "Nahrać" +#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +msgid "Crop" +msgstr "" + +#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/emailsettings.php:238 actions/favor.php:75 +#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:187 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 +#: actions/tagother.php:166 actions/unsubscribe.php:69 +#: actions/userauthorization.php:52 lib/designsettings.php:294 +msgid "There was a problem with your session token. Try again, please." +msgstr "" + +#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "" + +#: actions/avatarsettings.php:322 +msgid "Pick a square area of the image to be your avatar" +msgstr "" + +#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +msgid "Lost our file data." +msgstr "" + #: actions/avatarsettings.php:360 msgid "Avatar updated." msgstr "Awatar zaktualizowany." +#: actions/avatarsettings.php:363 +msgid "Failed updating avatar." +msgstr "" + #: actions/avatarsettings.php:387 msgid "Avatar deleted." msgstr "Awatar zničeny." @@ -375,6 +616,32 @@ msgstr "Žane přimjeno" msgid "No such group" msgstr "Skupina njeeksistuje" +#: actions/blockedfromgroup.php:90 +#, php-format +msgid "%s blocked profiles" +msgstr "" + +#: actions/blockedfromgroup.php:93 +#, php-format +msgid "%s blocked profiles, page %d" +msgstr "" + +#: actions/blockedfromgroup.php:108 +msgid "A list of the users blocked from joining this group." +msgstr "" + +#: actions/blockedfromgroup.php:281 +msgid "Unblock user from group" +msgstr "" + +#: actions/blockedfromgroup.php:313 lib/unblockform.php:69 +msgid "Unblock" +msgstr "" + +#: actions/blockedfromgroup.php:313 lib/unblockform.php:80 +msgid "Unblock this user" +msgstr "" + #: actions/block.php:69 msgid "You already blocked that user." msgstr "Sy tutoho wužiwarja hižo zablokował." @@ -383,6 +650,13 @@ msgstr "Sy tutoho wužiwarja hižo zablokował." msgid "Block user" msgstr "Wužiwarja blokować" +#: actions/block.php:130 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" + #: actions/block.php:143 actions/deletenotice.php:145 #: actions/deleteuser.php:147 actions/groupblock.php:178 msgid "No" @@ -401,6 +675,14 @@ msgstr "Haj" msgid "Block this user" msgstr "Tutoho wužiwarja blokować" +#: actions/block.php:162 +msgid "Failed to save block information." +msgstr "" + +#: actions/bookmarklet.php:50 +msgid "Post to " +msgstr "" + #: actions/confirmaddress.php:75 msgid "No confirmation code." msgstr "Žadyn wobkrućenski kod." @@ -422,6 +704,19 @@ msgstr "Njespóznany adresowy typ %s" msgid "That address has already been confirmed." msgstr "Tuta adresa bu hižo wobkrućena." +#: actions/confirmaddress.php:114 actions/emailsettings.php:296 +#: actions/emailsettings.php:427 actions/imsettings.php:258 +#: actions/imsettings.php:401 actions/othersettings.php:174 +#: actions/profilesettings.php:276 actions/smssettings.php:278 +#: actions/smssettings.php:420 +msgid "Couldn't update user." +msgstr "" + +#: actions/confirmaddress.php:126 actions/emailsettings.php:391 +#: actions/imsettings.php:363 actions/smssettings.php:382 +msgid "Couldn't delete email confirmation." +msgstr "" + #: actions/confirmaddress.php:144 msgid "Confirm Address" msgstr "Adresu wobkrućić" @@ -436,7 +731,7 @@ msgid "Conversation" msgstr "Konwersacija" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:206 lib/searchgroupnav.php:82 +#: lib/profileaction.php:216 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Zdźělenki" @@ -457,6 +752,12 @@ msgstr "Njepřizjewjeny." msgid "Can't delete this notice." msgstr "Tuta zdźělenka njeda so zničić." +#: actions/deletenotice.php:103 +msgid "" +"You are about to permanently delete a notice. Once this is done, it cannot " +"be undone." +msgstr "" + #: actions/deletenotice.php:109 actions/deletenotice.php:141 msgid "Delete notice" msgstr "Zdźělenku wušmórnyć" @@ -473,6 +774,10 @@ msgstr "Tutu zdźělenku njewušmórnyć" msgid "Delete this notice" msgstr "Tutu zdźělenku wušmórnyć" +#: actions/deletenotice.php:157 +msgid "There was a problem with your session token. Try again, please." +msgstr "" + #: actions/deleteuser.php:67 msgid "You cannot delete users." msgstr "Njemóžeš wužiwarjow wušmórnyć." @@ -485,6 +790,12 @@ msgstr "Móžeš jenož lokalnych wužiwarjow wušmórnyć." msgid "Delete user" msgstr "Wužiwarja wušmórnyć" +#: actions/deleteuser.php:135 +msgid "" +"Are you sure you want to delete this user? This will clear all data about " +"the user from the database, without a backup." +msgstr "" + #: actions/deleteuser.php:148 lib/deleteuserform.php:77 msgid "Delete this user" msgstr "Tutoho wužiwarja wušmórnyć" @@ -498,90 +809,101 @@ msgstr "Design" msgid "Design settings for this StatusNet site." msgstr "Designowe nastajenja za tute sydło StatusNet." -#: actions/designadminpanel.php:270 +#: actions/designadminpanel.php:275 msgid "Invalid logo URL." msgstr "Njepłaćiwy logowy URL." -#: actions/designadminpanel.php:274 +#: actions/designadminpanel.php:279 #, php-format msgid "Theme not available: %s" msgstr "Šat njesteji k dispoziciji: %s" -#: actions/designadminpanel.php:370 +#: actions/designadminpanel.php:375 msgid "Change logo" msgstr "Logo změnić" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:380 msgid "Site logo" msgstr "Logo sydła" -#: actions/designadminpanel.php:382 +#: actions/designadminpanel.php:387 msgid "Change theme" msgstr "Šat změnić" -#: actions/designadminpanel.php:399 +#: actions/designadminpanel.php:404 msgid "Site theme" msgstr "Šat sydła" -#: actions/designadminpanel.php:400 +#: actions/designadminpanel.php:405 msgid "Theme for the site." msgstr "Šat za sydło." -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" msgstr "Pozadkowy wobraz změnić" -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" msgstr "Pozadk" -#: actions/designadminpanel.php:422 +#: actions/designadminpanel.php:427 #, php-format -msgid "You can upload a background image for the site. The maximum file size is %1$s." -msgstr "Móžeš pozadkowy wobraz za sydło nahrać. Maksimalna datajowa wulkosć je %1$s." +msgid "" +"You can upload a background image for the site. The maximum file size is %1" +"$s." +msgstr "" +"Móžeš pozadkowy wobraz za sydło nahrać. Maksimalna datajowa wulkosć je %1$s." -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" msgstr "Zapinjeny" -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" msgstr "Wupinjeny" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 +msgid "Turn background image on or off." +msgstr "" + +#: actions/designadminpanel.php:479 lib/designsettings.php:161 +msgid "Tile background image" +msgstr "" + +#: actions/designadminpanel.php:488 lib/designsettings.php:170 msgid "Change colours" msgstr "Barby změnić" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 +#: actions/designadminpanel.php:510 lib/designsettings.php:191 msgid "Content" msgstr "Wobsah" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 +#: actions/designadminpanel.php:523 lib/designsettings.php:204 msgid "Sidebar" msgstr "Bóčnica" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "Tekst" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 +#: actions/designadminpanel.php:549 lib/designsettings.php:230 msgid "Links" msgstr "Wotkazy" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" msgstr "Standardne hódnoty wužiwać" -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" msgstr "Standardne designy wobnowić" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" msgstr "Na standard wróćo stajić" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -591,7 +913,7 @@ msgstr "Na standard wróćo stajić" msgid "Save" msgstr "Składować" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "Design składować" @@ -607,6 +929,11 @@ msgstr "K faworitam přidać" msgid "No such document." msgstr "Dokument njeeksistuje." +#: actions/editgroup.php:56 +#, php-format +msgid "Edit %s group" +msgstr "" + #: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65 msgid "You must be logged in to create a group." msgstr "Dyrbiš přizjewjeny być, zo by skupinu wutworił." @@ -641,6 +968,11 @@ msgstr "Opcije składowane." msgid "Email Settings" msgstr "E-mejlowe nastajenja" +#: actions/emailsettings.php:71 +#, php-format +msgid "Manage how you get email from %%site.name%%." +msgstr "" + #: actions/emailsettings.php:100 actions/imsettings.php:100 #: actions/smssettings.php:104 msgid "Address" @@ -656,6 +988,12 @@ msgstr "Aktualna wobkrućena e-mejlowa adresa." msgid "Remove" msgstr "Wotstronić" +#: actions/emailsettings.php:113 +msgid "" +"Awaiting confirmation on this address. Check your inbox (and spam box!) for " +"a message with further instructions." +msgstr "" + #: actions/emailsettings.php:117 actions/imsettings.php:120 #: actions/smssettings.php:126 msgid "Cancel" @@ -678,6 +1016,14 @@ msgstr "Přidać" msgid "Incoming email" msgstr "Dochadźaca e-mejl" +#: actions/emailsettings.php:138 actions/smssettings.php:157 +msgid "Send email to this address to post new notices." +msgstr "" + +#: actions/emailsettings.php:145 actions/smssettings.php:162 +msgid "Make a new email address for posting to; cancels the old one." +msgstr "" + #: actions/emailsettings.php:148 actions/smssettings.php:164 msgid "New" msgstr "Nowy" @@ -687,6 +1033,26 @@ msgstr "Nowy" msgid "Preferences" msgstr "Nastajenja" +#: actions/emailsettings.php:158 +msgid "Send me notices of new subscriptions through email." +msgstr "" + +#: actions/emailsettings.php:163 +msgid "Send me email when someone adds my notice as a favorite." +msgstr "" + +#: actions/emailsettings.php:169 +msgid "Send me email when someone sends me a private message." +msgstr "" + +#: actions/emailsettings.php:174 +msgid "Send me email when someone sends me an \"@-reply\"." +msgstr "" + +#: actions/emailsettings.php:179 +msgid "Allow friends to nudge me and send me an email." +msgstr "" + #: actions/emailsettings.php:185 msgid "I want to post notices by email." msgstr "Chcu zdźělenki přez e-mejl pósłać." @@ -704,6 +1070,10 @@ msgstr "Nastajenja składowane." msgid "No email address." msgstr "Žana e-mejlowa adresa." +#: actions/emailsettings.php:327 +msgid "Cannot normalize that email address" +msgstr "" + #: actions/emailsettings.php:331 actions/siteadminpanel.php:158 msgid "Not a valid email address" msgstr "Njeje płaćiwa e-mejlowa adresa" @@ -716,6 +1086,22 @@ msgstr "To je hižo twoja e-mejlowa adresa." msgid "That email address already belongs to another user." msgstr "Ta e-mejlowa adresa hižo słuša k druhemu wužiwarjej." +#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/smssettings.php:337 +msgid "Couldn't insert confirmation code." +msgstr "" + +#: actions/emailsettings.php:359 +msgid "" +"A confirmation code was sent to the email address you added. Check your " +"inbox (and spam box!) for the code and instructions on how to use it." +msgstr "" + +#: actions/emailsettings.php:379 actions/imsettings.php:351 +#: actions/smssettings.php:370 +msgid "No pending confirmation to cancel." +msgstr "" + #: actions/emailsettings.php:383 actions/imsettings.php:355 msgid "That is the wrong IM address." msgstr "to je wopačna IM-adresa." @@ -738,6 +1124,11 @@ msgstr "Adresa bu wotstronjena." msgid "No incoming email address." msgstr "Žana adresa za dochadźace e-mejle." +#: actions/emailsettings.php:456 actions/emailsettings.php:478 +#: actions/smssettings.php:528 actions/smssettings.php:552 +msgid "Couldn't update user record." +msgstr "" + #: actions/emailsettings.php:459 actions/smssettings.php:531 msgid "Incoming email address removed." msgstr "Adresa za dochadźaće e-mejle wotstronjena." @@ -756,10 +1147,61 @@ msgstr "Woblubowane zdźělenki" msgid "Popular notices, page %d" msgstr "Woblubowane zdźělenki, strona %d" +#: actions/favorited.php:79 +msgid "The most popular notices on the site right now." +msgstr "" + +#: actions/favorited.php:150 +msgid "Favorite notices appear on this page but no one has favorited one yet." +msgstr "" + +#: 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 "" + +#: actions/favorited.php:156 +#, php-format +msgid "" +"Why not [register an account](%%action.register%%) and be the first to add a " +"notice to your favorites!" +msgstr "" + +#: actions/favoritesrss.php:111 actions/showfavorites.php:77 +#: lib/personalgroupnav.php:115 +#, php-format +msgid "%s's favorite notices" +msgstr "" + +#: actions/favoritesrss.php:115 +#, php-format +msgid "Updates favored by %1$s on %2$s!" +msgstr "" + #: actions/favor.php:79 msgid "This notice is already a favorite!" msgstr "Tuta zdźělenka je hižo faworit!" +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "" + +#: actions/featured.php:69 lib/featureduserssection.php:87 +#: lib/publicgroupnav.php:89 +msgid "Featured users" +msgstr "" + +#: actions/featured.php:71 +#, php-format +msgid "Featured users, page %d" +msgstr "" + +#: actions/featured.php:99 +#, php-format +msgid "A selection of some of the great users on %s" +msgstr "" + #: actions/file.php:34 msgid "No notice id" msgstr "Žadyn ID zdźělenki" @@ -780,10 +1222,34 @@ msgstr "Žane nahrate přiwěški" msgid "Not expecting this response!" msgstr "Njewočakowana wotmołwa!" -#: actions/finishremotesubscribe.php:106 +#: actions/finishremotesubscribe.php:80 +msgid "User being listened to does not exist." +msgstr "" + +#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59 +msgid "You can use the local subscription!" +msgstr "" + +#: actions/finishremotesubscribe.php:99 +msgid "That user has blocked you from subscribing." +msgstr "" + +#: actions/finishremotesubscribe.php:110 msgid "You are not authorized." msgstr "Njejsy awtorizowany." +#: actions/finishremotesubscribe.php:113 +msgid "Could not convert request token to access token." +msgstr "" + +#: actions/finishremotesubscribe.php:118 +msgid "Remote service uses unknown version of OMB protocol." +msgstr "" + +#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "" + #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupunblock.php:86 actions/leavegroup.php:83 #: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 @@ -831,6 +1297,14 @@ msgstr "Wužiwar njeje čłon skupiny." msgid "Block user from group" msgstr "Wužiwarja za skupinu blokować" +#: actions/groupblock.php:162 +#, php-format +msgid "" +"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " +"be removed from the group, unable to post, and unable to subscribe to the " +"group in the future." +msgstr "" + #: actions/groupblock.php:178 msgid "Do not block this user from this group" msgstr "Tutoho wužiwarja za tutu skupinu blokować" @@ -839,6 +1313,10 @@ msgstr "Tutoho wužiwarja za tutu skupinu blokować" msgid "Block this user from this group" msgstr "Tutoho wužiwarja za tutu skupinu blokować" +#: actions/groupblock.php:196 +msgid "Database error blocking user from group." +msgstr "" + #: actions/groupbyid.php:74 msgid "No ID" msgstr "Žadyn ID" @@ -851,7 +1329,24 @@ msgstr "Dyrbiš přizjewjeny być, zo by skupinu wobdźěłał." msgid "Group design" msgstr "Skupinski design" -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:152 +msgid "" +"Customize the way your group looks with a background image and a colour " +"palette of your choice." +msgstr "" + +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 +msgid "Couldn't update your design." +msgstr "" + +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 +msgid "Unable to save your design settings!" +msgstr "" + +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "Designowe nastajenja składowane." @@ -861,13 +1356,34 @@ msgstr "Skupinske logo" #: actions/grouplogo.php:150 #, php-format -msgid "You can upload a logo image for your group. The maximum file size is %s." -msgstr "Móžeš logowy wobraz za swoju skupinu nahrać. Maksimalna datajowa wulkosć je %s." +msgid "" +"You can upload a logo image for your group. The maximum file size is %s." +msgstr "" +"Móžeš logowy wobraz za swoju skupinu nahrać. Maksimalna datajowa wulkosć je %" +"s." + +#: actions/grouplogo.php:362 +msgid "Pick a square area of the image to be the logo." +msgstr "" #: actions/grouplogo.php:396 msgid "Logo updated." msgstr "Logo zaktualizowane." +#: actions/grouplogo.php:398 +msgid "Failed updating logo." +msgstr "" + +#: actions/groupmembers.php:93 lib/groupnav.php:92 +#, php-format +msgid "%s group members" +msgstr "" + +#: actions/groupmembers.php:96 +#, php-format +msgid "%s group members, page %d" +msgstr "" + #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "Lisćina wužiwarjow w tutej skupinje." @@ -880,10 +1396,30 @@ msgstr "Administrator" msgid "Block" msgstr "Blokować" +#: actions/groupmembers.php:441 +msgid "Make user an admin of the group" +msgstr "" + +#: actions/groupmembers.php:473 +msgid "Make Admin" +msgstr "" + #: actions/groupmembers.php:473 msgid "Make this user an admin" msgstr "Tutoho wužiwarja k administratorej činić" +#: actions/grouprss.php:133 +#, php-format +msgid "Updates from members of %1$s on %2$s!" +msgstr "" + +#: actions/groupsearch.php:52 +#, php-format +msgid "" +"Search for groups on %%site.name%% by their name, location, or description. " +"Separate the terms by spaces; they must be 3 characters or more." +msgstr "" + #: actions/groupsearch.php:58 msgid "Group search" msgstr "Skupinske pytanje" @@ -893,8 +1429,22 @@ msgstr "Skupinske pytanje" msgid "No results." msgstr "Žane wuslědki." -#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81 -#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +#: actions/groupsearch.php:82 +#, php-format +msgid "" +"If you can't find the group you're looking for, you can [create it](%%action." +"newgroup%%) yourself." +msgstr "" + +#: actions/groupsearch.php:85 +#, php-format +msgid "" +"Why not [register an account](%%action.register%%) and [create the group](%%" +"action.newgroup%%) yourself!" +msgstr "" + +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Skupiny" @@ -903,26 +1453,93 @@ msgstr "Skupiny" msgid "Groups, page %d" msgstr "Skupiny, strona %d" +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" + #: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 msgid "Create a new group" msgstr "Nowu skupinu wutworić" +#: actions/groupunblock.php:91 +msgid "Only an admin can unblock group members." +msgstr "" + +#: actions/groupunblock.php:95 +msgid "User is not blocked from group." +msgstr "" + +#: actions/groupunblock.php:128 actions/unblock.php:77 +msgid "Error removing the block." +msgstr "" + #: actions/imsettings.php:59 msgid "IM Settings" msgstr "IM-nastajenja" +#: actions/imsettings.php:70 +#, php-format +msgid "" +"You can send and receive notices through Jabber/GTalk [instant messages](%%" +"doc.im%%). Configure your address and settings below." +msgstr "" + #: actions/imsettings.php:89 msgid "IM is not available." msgstr "IM k dispoziciji njesteji." +#: actions/imsettings.php:106 +msgid "Current confirmed Jabber/GTalk address." +msgstr "" + +#: actions/imsettings.php:114 +#, php-format +msgid "" +"Awaiting confirmation on this address. Check your Jabber/GTalk account for a " +"message with further instructions. (Did you add %s to your buddy list?)" +msgstr "" + #: actions/imsettings.php:124 msgid "IM Address" msgstr "IM-adresa" +#: actions/imsettings.php:126 +#, php-format +msgid "" +"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " +"add %s to your buddy list in your IM client or on GTalk." +msgstr "" + +#: actions/imsettings.php:143 +msgid "Send me notices through Jabber/GTalk." +msgstr "" + +#: actions/imsettings.php:148 +msgid "Post a notice when my Jabber/GTalk status changes." +msgstr "" + +#: actions/imsettings.php:153 +msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." +msgstr "" + +#: actions/imsettings.php:159 +msgid "Publish a MicroID for my Jabber/GTalk address." +msgstr "" + #: actions/imsettings.php:285 msgid "No Jabber ID." msgstr "Žadyn ID Jabber." +#: actions/imsettings.php:292 +msgid "Cannot normalize that Jabber ID" +msgstr "" + #: actions/imsettings.php:296 msgid "Not a valid Jabber ID" msgstr "Njepłaćiwy ID Jabber" @@ -931,14 +1548,44 @@ msgstr "Njepłaćiwy ID Jabber" msgid "That is already your Jabber ID." msgstr "To je hižo twój ID Jabber." +#: actions/imsettings.php:302 +msgid "Jabber ID already belongs to another user." +msgstr "" + +#: actions/imsettings.php:327 +#, php-format +msgid "" +"A confirmation code was sent to the IM address you added. You must approve %" +"s for sending messages to you." +msgstr "" + #: actions/imsettings.php:387 msgid "That is not your Jabber ID." msgstr "To njeje twój ID Jabber." +#: actions/inbox.php:59 +#, php-format +msgid "Inbox for %s - page %d" +msgstr "" + +#: actions/inbox.php:62 +#, php-format +msgid "Inbox for %s" +msgstr "" + +#: actions/inbox.php:115 +msgid "This is your inbox, which lists your incoming private messages." +msgstr "" + #: actions/invite.php:39 msgid "Invites have been disabled." msgstr "Přeprošenja buchu znjemóžnjene." +#: actions/invite.php:41 +#, php-format +msgid "You must be logged in to invite other users to use %s" +msgstr "" + #: actions/invite.php:72 #, php-format msgid "Invalid email address: %s" @@ -961,9 +1608,27 @@ msgstr "Sy tutych wužiwarjow hižo abonował:" msgid "%s (%s)" msgstr "%s (%s)" +#: actions/invite.php:136 +msgid "" +"These people are already users and you were automatically subscribed to them:" +msgstr "" + +#: actions/invite.php:144 +msgid "Invitation(s) sent to the following people:" +msgstr "" + +#: actions/invite.php:150 +msgid "" +"You will be notified when your invitees accept the invitation and register " +"on the site. Thanks for growing the community!" +msgstr "" + #: actions/invite.php:162 -msgid "Use this form to invite your friends and colleagues to use this service." -msgstr "Wužij tutón formular, zo by swojich přećelow a kolegow přeprosył, zo bychu tutu słužbu wužiwali." +msgid "" +"Use this form to invite your friends and colleagues to use this service." +msgstr "" +"Wužij tutón formular, zo by swojich přećelow a kolegow přeprosył, zo bychu " +"tutu słužbu wužiwali." #: actions/invite.php:187 msgid "Email addresses" @@ -981,10 +1646,64 @@ msgstr "Wosobinska powěsć" msgid "Optionally add a personal message to the invitation." msgstr "Wosobinsku powěsć po dobrozdaću přeprošenju přidać." -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" msgstr "Pósłać" +#: actions/invite.php:226 +#, php-format +msgid "%1$s has invited you to join them on %2$s" +msgstr "" + +#: actions/invite.php:228 +#, php-format +msgid "" +"%1$s has invited you to join them on %2$s (%3$s).\n" +"\n" +"%2$s is a micro-blogging service that lets you keep up-to-date with people " +"you know and people who interest you.\n" +"\n" +"You can also share news about yourself, your thoughts, or your life online " +"with people who know about you. It's also great for meeting new people who " +"share your interests.\n" +"\n" +"%1$s said:\n" +"\n" +"%4$s\n" +"\n" +"You can see %1$s's profile page on %2$s here:\n" +"\n" +"%5$s\n" +"\n" +"If you'd like to try the service, click on the link below to accept the " +"invitation.\n" +"\n" +"%6$s\n" +"\n" +"If not, you can ignore this message. Thanks for your patience and your " +"time.\n" +"\n" +"Sincerely, %2$s\n" +msgstr "" + +#: actions/joingroup.php:60 +msgid "You must be logged in to join a group." +msgstr "" + +#: actions/joingroup.php:90 lib/command.php:217 +msgid "You are already a member of that group" +msgstr "" + +#: actions/joingroup.php:128 lib/command.php:234 +#, php-format +msgid "Could not join user %s to group %s" +msgstr "" + +#: actions/joingroup.php:135 lib/command.php:239 +#, php-format +msgid "%s joined group %s" +msgstr "" + #: actions/leavegroup.php:60 msgid "You must be logged in to leave a group." msgstr "Dyrbiš přizjewjeny być, zo by skupinu wopušćił." @@ -993,46 +1712,81 @@ msgstr "Dyrbiš přizjewjeny być, zo by skupinu wopušćił." msgid "You are not a member of that group." msgstr "Njejsy čłon teje skupiny." +#: actions/leavegroup.php:119 lib/command.php:278 +msgid "Could not find membership record." +msgstr "" + +#: actions/leavegroup.php:127 lib/command.php:284 +#, php-format +msgid "Could not remove user %s to group %s" +msgstr "" + +#: actions/leavegroup.php:134 lib/command.php:289 +#, php-format +msgid "%s left group %s" +msgstr "" + #: actions/login.php:79 actions/register.php:137 msgid "Already logged in." msgstr "Hižo přizjewjeny." -#: actions/login.php:143 +#: actions/login.php:108 actions/login.php:118 +msgid "Invalid or expired token." +msgstr "" + +#: actions/login.php:146 msgid "Incorrect username or password." msgstr "Wopačne wužiwarske mjeno abo hesło." -#: actions/login.php:149 +#: actions/login.php:152 msgid "Error setting user. You are probably not authorized." msgstr "Zmylk při nastajenju wužiwarja. Snano njejsy awtorizowany." -#: actions/login.php:204 actions/login.php:257 lib/action.php:458 +#: actions/login.php:207 actions/login.php:260 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Přizjewić" -#: actions/login.php:243 +#: actions/login.php:246 msgid "Login to site" msgstr "Při sydle přizjewić" -#: actions/login.php:246 actions/profilesettings.php:106 +#: actions/login.php:249 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Přimjeno" -#: actions/login.php:249 actions/register.php:428 +#: actions/login.php:252 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Hesło" -#: actions/login.php:252 actions/register.php:477 +#: actions/login.php:255 actions/register.php:477 msgid "Remember me" msgstr "Składować" -#: actions/login.php:263 +#: actions/login.php:256 actions/register.php:479 +msgid "Automatically login in the future; not for shared computers!" +msgstr "" + +#: actions/login.php:266 msgid "Lost or forgotten password?" msgstr "Hesło zhubjene abo zabyte?" +#: actions/login.php:285 +msgid "" +"For security reasons, please re-enter your user name and password before " +"changing your settings." +msgstr "" + +#: actions/login.php:289 +#, php-format +msgid "" +"Login with your username and password. Don't have a username yet? [Register]" +"(%%action.register%%) a new account." +msgstr "" + #: actions/makeadmin.php:91 msgid "Only an admin can make another user an admin." msgstr "Jenož administrator móže druheho wužiwarja k administratorej činić." @@ -1042,6 +1796,16 @@ msgstr "Jenož administrator móže druheho wužiwarja k administratorej činić msgid "%s is already an admin for group \"%s\"." msgstr "%s je hižo administrator za skupinu \"%s\"." +#: actions/makeadmin.php:132 +#, php-format +msgid "Can't get membership record for %s in group %s" +msgstr "" + +#: actions/makeadmin.php:145 +#, php-format +msgid "Can't make %s an admin for group %s" +msgstr "" + #: actions/microsummary.php:69 msgid "No current status" msgstr "Žadyn aktualny status" @@ -1071,10 +1835,20 @@ msgstr "Žadyn wobsah!" msgid "No recipient specified." msgstr "Žadyn přijimowar podaty." +#: actions/newmessage.php:164 lib/command.php:370 +msgid "" +"Don't send a message to yourself; just say it to yourself quietly instead." +msgstr "" + #: actions/newmessage.php:181 msgid "Message sent" msgstr "Powěsć pósłana" +#: actions/newmessage.php:185 lib/command.php:375 +#, php-format +msgid "Direct message to %s sent" +msgstr "" + #: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 msgid "Ajax Error" msgstr "Zmylk Ajax" @@ -1087,20 +1861,78 @@ msgstr "Nowa zdźělenka" msgid "Notice posted" msgstr "Zdźělenka wotpósłana" +#: actions/noticesearch.php:68 +#, php-format +msgid "" +"Search for notices on %%site.name%% by their contents. Separate search terms " +"by spaces; they must be 3 characters or more." +msgstr "" + #: actions/noticesearch.php:78 msgid "Text search" msgstr "Tekstowe pytanje" +#: actions/noticesearch.php:91 +#, php-format +msgid "Search results for \"%s\" on %s" +msgstr "" + +#: actions/noticesearch.php:121 +#, php-format +msgid "" +"Be the first to [post on this topic](%%%%action.newnotice%%%%?" +"status_textarea=%s)!" +msgstr "" + +#: actions/noticesearch.php:124 +#, php-format +msgid "" +"Why not [register an account](%%%%action.register%%%%) and be the first to " +"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" +msgstr "" + +#: actions/noticesearchrss.php:96 +#, php-format +msgid "Updates with \"%s\"" +msgstr "" + +#: actions/noticesearchrss.php:98 +#, php-format +msgid "Updates matching search term \"%1$s\" on %2$s!" +msgstr "" + +#: actions/nudge.php:85 +msgid "" +"This user doesn't allow nudges or hasn't confirmed or set his email yet." +msgstr "" + +#: actions/nudge.php:94 +msgid "Nudge sent" +msgstr "" + +#: actions/nudge.php:97 +msgid "Nudge sent!" +msgstr "" + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "Zdźělenka nima profil" +#: actions/oembed.php:86 actions/shownotice.php:180 +#, php-format +msgid "%1$s's status on %2$s" +msgstr "" + +#: actions/oembed.php:157 +msgid "content type " +msgstr "" + #: actions/oembed.php:160 msgid "Only " msgstr "Jenož " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." msgstr "Njeje podpěrany datowy format." @@ -1124,6 +1956,40 @@ msgstr "Wšelake druhe opcije zrjadować." msgid " (free service)" msgstr " (swobodna słužba)" +#: actions/othersettings.php:116 +msgid "Shorten URLs with" +msgstr "" + +#: actions/othersettings.php:117 +msgid "Automatic shortening service to use." +msgstr "" + +#: actions/othersettings.php:122 +msgid "View profile designs" +msgstr "" + +#: actions/othersettings.php:123 +msgid "Show or hide profile designs." +msgstr "" + +#: actions/othersettings.php:153 +msgid "URL shortening service is too long (max 50 chars)." +msgstr "" + +#: actions/outbox.php:58 +#, php-format +msgid "Outbox for %s - page %d" +msgstr "" + +#: actions/outbox.php:61 +#, php-format +msgid "Outbox for %s" +msgstr "" + +#: actions/outbox.php:116 +msgid "This is your outbox, which lists private messages you have sent." +msgstr "" + #: actions/passwordsettings.php:58 msgid "Change password" msgstr "Hesło změnić" @@ -1153,6 +2019,10 @@ msgstr "6 abo wjace znamješkow" msgid "Confirm" msgstr "Wobkrućić" +#: actions/passwordsettings.php:113 actions/recoverpassword.php:240 +msgid "Same as password above" +msgstr "" + #: actions/passwordsettings.php:117 msgid "Change" msgstr "Změnić" @@ -1169,6 +2039,14 @@ msgstr "Hesle so njekryjetej." msgid "Incorrect old password" msgstr "Wopačne stare hesło" +#: actions/passwordsettings.php:181 +msgid "Error saving user; invalid." +msgstr "" + +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +msgid "Can't save new password." +msgstr "" + #: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Hesło składowane." @@ -1181,6 +2059,26 @@ msgstr "Šćežki" msgid "Path and server settings for this StatusNet site." msgstr "Šćežka a serwerowe nastajenja za tute sydło StatusNet." +#: actions/pathsadminpanel.php:140 +#, php-format +msgid "Theme directory not readable: %s" +msgstr "" + +#: actions/pathsadminpanel.php:146 +#, php-format +msgid "Avatar directory not writable: %s" +msgstr "" + +#: actions/pathsadminpanel.php:152 +#, php-format +msgid "Background directory not writable: %s" +msgstr "" + +#: actions/pathsadminpanel.php:160 +#, php-format +msgid "Locales directory not readable: %s" +msgstr "" + #: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:299 msgid "Site" @@ -1254,22 +2152,53 @@ msgstr "Pozadkowy zapis" msgid "Save paths" msgstr "Šćežki składować" +#: actions/peoplesearch.php:52 +#, php-format +msgid "" +"Search for people on %%site.name%% by their name, location, or interests. " +"Separate the terms by spaces; they must be 3 characters or more." +msgstr "" + #: actions/peoplesearch.php:58 msgid "People search" msgstr "Za ludźimi pytać" +#: actions/peopletag.php:70 +#, php-format +msgid "Not a valid people tag: %s" +msgstr "" + +#: actions/peopletag.php:144 +#, php-format +msgid "Users self-tagged with %s - page %d" +msgstr "" + #: actions/postnotice.php:84 msgid "Invalid notice content" msgstr "Njepłaćiwy wobsah zdźělenki" +#: actions/postnotice.php:90 +#, php-format +msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +msgstr "" + #: actions/profilesettings.php:60 msgid "Profile settings" msgstr "Profilowe nastajenja" +#: actions/profilesettings.php:71 +msgid "" +"You can update your personal profile info here so people know more about you." +msgstr "" + #: actions/profilesettings.php:99 msgid "Profile information" msgstr "Profilowe informacije" +#: actions/profilesettings.php:108 lib/groupeditform.php:154 +msgid "1-64 lowercase letters or numbers, no punctuation or spaces" +msgstr "" + #: actions/profilesettings.php:111 actions/register.php:447 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 @@ -1281,6 +2210,19 @@ msgstr "Dospołne mjeno" msgid "Homepage" msgstr "Startowa strona" +#: actions/profilesettings.php:117 actions/register.php:454 +msgid "URL of your homepage, blog, or profile on another site" +msgstr "" + +#: actions/profilesettings.php:122 actions/register.php:460 +#, php-format +msgid "Describe yourself and your interests in %d chars" +msgstr "" + +#: actions/profilesettings.php:125 actions/register.php:463 +msgid "Describe yourself and your interests" +msgstr "" + #: actions/profilesettings.php:127 actions/register.php:465 msgid "Bio" msgstr "Biografija" @@ -1292,6 +2234,21 @@ msgstr "Biografija" msgid "Location" msgstr "Městno" +#: actions/profilesettings.php:134 actions/register.php:472 +msgid "Where you are, like \"City, State (or Region), Country\"" +msgstr "" + +#: actions/profilesettings.php:138 actions/tagother.php:149 +#: actions/tagother.php:209 lib/subscriptionlist.php:106 +#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +msgid "Tags" +msgstr "" + +#: actions/profilesettings.php:140 +msgid "" +"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" +msgstr "" + #: actions/profilesettings.php:144 actions/siteadminpanel.php:307 msgid "Language" msgstr "Rěč" @@ -1304,6 +2261,15 @@ msgstr "Preferowana rěč" msgid "Timezone" msgstr "Časowe pasmo" +#: actions/profilesettings.php:155 +msgid "What timezone are you normally in?" +msgstr "" + +#: actions/profilesettings.php:160 +msgid "" +"Automatically subscribe to whoever subscribes to me (best for non-humans)" +msgstr "" + #: actions/profilesettings.php:221 actions/register.php:223 #, php-format msgid "Bio is too long (max %d chars)." @@ -1317,22 +2283,186 @@ msgstr "Časowe pasmo njeje wubrane." msgid "Language is too long (max 50 chars)." msgstr "Mjeno rěče je předołhe (maks. 50 znamješkow)." +#: actions/profilesettings.php:246 actions/tagother.php:178 +#, php-format +msgid "Invalid tag: \"%s\"" +msgstr "" + +#: actions/profilesettings.php:295 +msgid "Couldn't update user for autosubscribe." +msgstr "" + +#: actions/profilesettings.php:328 +msgid "Couldn't save profile." +msgstr "" + +#: actions/profilesettings.php:336 +msgid "Couldn't save tags." +msgstr "" + #: actions/profilesettings.php:344 lib/adminpanelaction.php:126 msgid "Settings saved." msgstr "Nastajenja składowane." +#: actions/public.php:83 +#, php-format +msgid "Beyond the page limit (%s)" +msgstr "" + +#: actions/public.php:92 +msgid "Could not retrieve public stream." +msgstr "" + +#: actions/public.php:129 +#, php-format +msgid "Public timeline, page %d" +msgstr "" + +#: actions/public.php:131 lib/publicgroupnav.php:79 +msgid "Public timeline" +msgstr "" + +#: actions/public.php:151 +msgid "Public Stream Feed (RSS 1.0)" +msgstr "" + +#: actions/public.php:155 +msgid "Public Stream Feed (RSS 2.0)" +msgstr "" + +#: actions/public.php:159 +msgid "Public Stream Feed (Atom)" +msgstr "" + +#: actions/public.php:179 +#, php-format +msgid "" +"This is the public timeline for %%site.name%% but no one has posted anything " +"yet." +msgstr "" + +#: actions/public.php:182 +msgid "Be the first to post!" +msgstr "" + +#: actions/public.php:186 +#, php-format +msgid "" +"Why not [register an account](%%action.register%%) and be the first to post!" +msgstr "" + +#: actions/public.php:233 +#, php-format +msgid "" +"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-" +"blogging) service based on the Free Software [StatusNet](http://status.net/) " +"tool. [Join now](%%action.register%%) to share notices about yourself with " +"friends, family, and colleagues! ([Read more](%%doc.help%%))" +msgstr "" + +#: actions/public.php:238 +#, php-format +msgid "" +"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-" +"blogging) service based on the Free Software [StatusNet](http://status.net/) " +"tool." +msgstr "" + +#: actions/publictagcloud.php:57 +msgid "Public tag cloud" +msgstr "" + +#: actions/publictagcloud.php:63 +#, php-format +msgid "These are most popular recent tags on %s " +msgstr "" + +#: actions/publictagcloud.php:69 +#, php-format +msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet." +msgstr "" + +#: actions/publictagcloud.php:72 +msgid "Be the first to post one!" +msgstr "" + +#: actions/publictagcloud.php:75 +#, php-format +msgid "" +"Why not [register an account](%%action.register%%) and be the first to post " +"one!" +msgstr "" + +#: actions/publictagcloud.php:135 +msgid "Tag cloud" +msgstr "" + #: actions/recoverpassword.php:36 msgid "You are already logged in!" msgstr "Sy hižo přizjewjeny!" +#: actions/recoverpassword.php:62 +msgid "No such recovery code." +msgstr "" + +#: actions/recoverpassword.php:66 +msgid "Not a recovery code." +msgstr "" + +#: actions/recoverpassword.php:73 +msgid "Recovery code for unknown user." +msgstr "" + +#: actions/recoverpassword.php:86 +msgid "Error with confirmation code." +msgstr "" + +#: actions/recoverpassword.php:97 +msgid "This confirmation code is too old. Please start again." +msgstr "" + +#: actions/recoverpassword.php:111 +msgid "Could not update user with confirmed email address." +msgstr "" + +#: actions/recoverpassword.php:152 +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 "" + #: actions/recoverpassword.php:158 msgid "You have been identified. Enter a new password below. " msgstr "Sy so identifikował. Zapodaj deleka nowe hesło. " +#: actions/recoverpassword.php:188 +msgid "Password recovery" +msgstr "" + +#: actions/recoverpassword.php:191 +msgid "Nickname or email address" +msgstr "" + +#: actions/recoverpassword.php:193 +msgid "Your nickname on this server, or your registered email address." +msgstr "" + +#: actions/recoverpassword.php:199 actions/recoverpassword.php:200 +msgid "Recover" +msgstr "" + #: actions/recoverpassword.php:208 msgid "Reset password" msgstr "Hesło wróćo stajić" +#: actions/recoverpassword.php:209 +msgid "Recover password" +msgstr "" + +#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +msgid "Password recovery requested" +msgstr "" + #: actions/recoverpassword.php:213 msgid "Unknown action" msgstr "Njeznata akcija" @@ -1351,16 +2481,43 @@ msgstr "Zapodaj přimjeno abo e-mejlowu adresu." #: actions/recoverpassword.php:272 msgid "No user with that email address or username." -msgstr "Wužiwar z tej e-mejlowej adresu abo tym wužiwarskim mjenom njeeksistuje." +msgstr "" +"Wužiwar z tej e-mejlowej adresu abo tym wužiwarskim mjenom njeeksistuje." #: actions/recoverpassword.php:287 msgid "No registered email address for that user." msgstr "Wužiwar nima žanu zregistrowanu e-mejlowu adresu." +#: actions/recoverpassword.php:301 +msgid "Error saving address confirmation." +msgstr "" + +#: actions/recoverpassword.php:325 +msgid "" +"Instructions for recovering your password have been sent to the email " +"address registered to your account." +msgstr "" + +#: actions/recoverpassword.php:344 +msgid "Unexpected password reset." +msgstr "" + #: actions/recoverpassword.php:352 msgid "Password must be 6 chars or more." msgstr "Hesło dyrbi 6 znamješkow abo wjace měć." +#: actions/recoverpassword.php:356 +msgid "Password and confirmation do not match." +msgstr "" + +#: actions/recoverpassword.php:375 actions/register.php:248 +msgid "Error setting user." +msgstr "" + +#: actions/recoverpassword.php:382 +msgid "New password successfully saved. You are now logged in." +msgstr "" + #: actions/register.php:85 actions/register.php:189 actions/register.php:404 msgid "Sorry, only invited people can register." msgstr "Wodaj, jenož přeprošeni ludźo móžeja so registrować." @@ -1382,6 +2539,10 @@ msgstr "Registrować" msgid "Registration not allowed." msgstr "Registracija njedowolena." +#: actions/register.php:198 +msgid "You can't register if you don't agree to the license." +msgstr "" + #: actions/register.php:201 msgid "Not a valid email address." msgstr "Njepłaćiwa e-mejlowa adresa." @@ -1394,6 +2555,16 @@ msgstr "E-mejlowa adresa hižo eksistuje." msgid "Invalid username or password." msgstr "Njepłaćiwe wužiwarske mjeno abo hesło." +#: actions/register.php:342 +msgid "" +"With this form you can create a new account. You can then post notices and " +"link up to friends and colleagues. " +msgstr "" + +#: actions/register.php:424 +msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." +msgstr "" + #: actions/register.php:429 msgid "6 or more characters. Required." msgstr "6 abo wjace znamješkow. Trěbne." @@ -1407,6 +2578,10 @@ msgstr "Jenake kaž hesło horjeka. Trěbne." msgid "Email" msgstr "E-mejl" +#: actions/register.php:438 actions/register.php:442 +msgid "Used only for updates, announcements, and password recovery" +msgstr "" + #: actions/register.php:449 msgid "Longer name, preferably your \"real\" name" msgstr "Dlěše mjeno, wosebje twoje \"woprawdźite\" mjeno" @@ -1419,14 +2594,69 @@ msgstr "Mój tekst a moje dataje steja k dispoziciji pod " msgid "Creative Commons Attribution 3.0" msgstr "Creative Commons Attribution 3.0" +#: actions/register.php:496 +msgid "" +" except this private data: password, email address, IM address, and phone " +"number." +msgstr "" + +#: actions/register.php:537 +#, php-format +msgid "" +"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"want to...\n" +"\n" +"* Go to [your profile](%s) and post your first message.\n" +"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " +"notices through instant messages.\n" +"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " +"share your interests. \n" +"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell " +"others more about you. \n" +"* Read over the [online docs](%%%%doc.help%%%%) for features you may have " +"missed. \n" +"\n" +"Thanks for signing up and we hope you enjoy using this service." +msgstr "" + +#: actions/register.php:561 +msgid "" +"(You should receive a message by email momentarily, with instructions on how " +"to confirm your email address.)" +msgstr "" + +#: actions/remotesubscribe.php:98 +#, php-format +msgid "" +"To subscribe, you can [login](%%action.login%%), or [register](%%action." +"register%%) a new account. If you already have an account on a [compatible " +"microblogging site](%%doc.openmublog%%), enter your profile URL below." +msgstr "" + +#: actions/remotesubscribe.php:112 +msgid "Remote subscribe" +msgstr "" + +#: actions/remotesubscribe.php:124 +msgid "Subscribe to a remote user" +msgstr "" + #: actions/remotesubscribe.php:129 msgid "User nickname" msgstr "Wužiwarske přimjeno" +#: actions/remotesubscribe.php:130 +msgid "Nickname of the user you want to follow" +msgstr "" + #: actions/remotesubscribe.php:133 msgid "Profile URL" msgstr "URL profila" +#: actions/remotesubscribe.php:134 +msgid "URL of your profile on another compatible microblogging service" +msgstr "" + #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 #: lib/userprofile.php:365 msgid "Subscribe" @@ -1436,6 +2666,137 @@ msgstr "Abonować" msgid "Invalid profile URL (bad format)" msgstr "Njepłaćiwy profilowy URL (wopačny format)" +#: actions/remotesubscribe.php:168 +msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)." +msgstr "" + +#: actions/remotesubscribe.php:176 +msgid "That’s a local profile! Login to subscribe." +msgstr "" + +#: actions/remotesubscribe.php:183 +msgid "Couldn’t get a request token." +msgstr "" + +#: actions/replies.php:125 actions/repliesrss.php:68 +#: lib/personalgroupnav.php:105 +#, php-format +msgid "Replies to %s" +msgstr "" + +#: actions/replies.php:127 +#, php-format +msgid "Replies to %s, page %d" +msgstr "" + +#: actions/replies.php:144 +#, php-format +msgid "Replies feed for %s (RSS 1.0)" +msgstr "" + +#: actions/replies.php:151 +#, php-format +msgid "Replies feed for %s (RSS 2.0)" +msgstr "" + +#: actions/replies.php:158 +#, php-format +msgid "Replies feed for %s (Atom)" +msgstr "" + +#: actions/replies.php:198 +#, php-format +msgid "" +"This is the timeline showing replies to %s but %s hasn't received a notice " +"to his attention yet." +msgstr "" + +#: actions/replies.php:203 +#, php-format +msgid "" +"You can engage other users in a conversation, subscribe to more people or " +"[join groups](%%action.groups%%)." +msgstr "" + +#: actions/replies.php:205 +#, php-format +msgid "" +"You can try to [nudge %s](../%s) or [post something to his or her attention]" +"(%%%%action.newnotice%%%%?status_textarea=%s)." +msgstr "" + +#: actions/repliesrss.php:72 +#, php-format +msgid "Replies to %1$s on %2$s!" +msgstr "" + +#: actions/sandbox.php:65 actions/unsandbox.php:65 +msgid "You cannot sandbox users on this site." +msgstr "" + +#: actions/sandbox.php:72 +msgid "User is already sandboxed." +msgstr "" + +#: actions/showfavorites.php:79 +#, php-format +msgid "%s's favorite notices, page %d" +msgstr "" + +#: actions/showfavorites.php:132 +msgid "Could not retrieve favorite notices." +msgstr "" + +#: actions/showfavorites.php:170 +#, php-format +msgid "Feed for favorites of %s (RSS 1.0)" +msgstr "" + +#: actions/showfavorites.php:177 +#, php-format +msgid "Feed for favorites of %s (RSS 2.0)" +msgstr "" + +#: actions/showfavorites.php:184 +#, php-format +msgid "Feed for favorites of %s (Atom)" +msgstr "" + +#: actions/showfavorites.php:205 +msgid "" +"You haven't chosen any favorite notices yet. Click the fave button on " +"notices you like to bookmark them for later or shed a spotlight on them." +msgstr "" + +#: actions/showfavorites.php:207 +#, php-format +msgid "" +"%s hasn't added any notices to his favorites yet. Post something interesting " +"they would add to their favorites :)" +msgstr "" + +#: actions/showfavorites.php:211 +#, php-format +msgid "" +"%s hasn't added any notices to his favorites yet. Why not [register an " +"account](%%%%action.register%%%%) and then post something interesting they " +"would add to their favorites :)" +msgstr "" + +#: actions/showfavorites.php:242 +msgid "This is a way to share what you like." +msgstr "" + +#: actions/showgroup.php:82 lib/groupnav.php:86 +#, php-format +msgid "%s group" +msgstr "" + +#: actions/showgroup.php:84 +#, php-format +msgid "%s group, page %d" +msgstr "" + #: actions/showgroup.php:218 msgid "Group profile" msgstr "Skupinski profil" @@ -1445,6 +2806,11 @@ msgstr "Skupinski profil" msgid "URL" msgstr "URL" +#: actions/showgroup.php:274 actions/tagother.php:128 +#: actions/userauthorization.php:179 lib/userprofile.php:194 +msgid "Note" +msgstr "" + #: actions/showgroup.php:284 lib/groupeditform.php:184 msgid "Aliases" msgstr "Aliasy" @@ -1453,12 +2819,32 @@ msgstr "Aliasy" msgid "Group actions" msgstr "Skupinske akcije" +#: actions/showgroup.php:328 +#, php-format +msgid "Notice feed for %s group (RSS 1.0)" +msgstr "" + +#: actions/showgroup.php:334 +#, php-format +msgid "Notice feed for %s group (RSS 2.0)" +msgstr "" + +#: actions/showgroup.php:340 +#, php-format +msgid "Notice feed for %s group (Atom)" +msgstr "" + +#: actions/showgroup.php:345 +#, php-format +msgid "FOAF for %s group" +msgstr "" + #: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "Čłonojo" #: actions/showgroup.php:386 lib/profileaction.php:117 -#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95 +#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 #: lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Žadyn)" @@ -1467,7 +2853,7 @@ msgstr "(Žadyn)" msgid "All members" msgstr "Wšitcy čłonojo" -#: actions/showgroup.php:429 lib/profileaction.php:173 +#: actions/showgroup.php:429 lib/profileaction.php:174 msgid "Statistics" msgstr "Statistika" @@ -1475,6 +2861,25 @@ msgstr "Statistika" msgid "Created" msgstr "Wutworjeny" +#: actions/showgroup.php:448 +#, php-format +msgid "" +"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." +"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " +"[StatusNet](http://status.net/) tool. Its members share short messages about " +"their life and interests. [Join now](%%%%action.register%%%%) to become part " +"of this group and many more! ([Read more](%%%%doc.help%%%%))" +msgstr "" + +#: actions/showgroup.php:454 +#, php-format +msgid "" +"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." +"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " +"[StatusNet](http://status.net/) tool. Its members share short messages about " +"their life and interests. " +msgstr "" + #: actions/showgroup.php:482 msgid "Admins" msgstr "Administratorojo" @@ -1483,20 +2888,147 @@ msgstr "Administratorojo" msgid "No such message." msgstr "Powěsć njeeksistuje." +#: actions/showmessage.php:98 +msgid "Only the sender and recipient may read this message." +msgstr "" + +#: actions/showmessage.php:108 +#, php-format +msgid "Message to %1$s on %2$s" +msgstr "" + +#: actions/showmessage.php:113 +#, php-format +msgid "Message from %1$s on %2$s" +msgstr "" + #: actions/shownotice.php:90 msgid "Notice deleted." msgstr "Zdźělenka zničena." +#: actions/showstream.php:73 +#, php-format +msgid " tagged %s" +msgstr "" + +#: actions/showstream.php:79 +#, php-format +msgid "%s, page %d" +msgstr "" + +#: actions/showstream.php:122 +#, php-format +msgid "Notice feed for %s tagged %s (RSS 1.0)" +msgstr "" + +#: actions/showstream.php:129 +#, php-format +msgid "Notice feed for %s (RSS 1.0)" +msgstr "" + +#: actions/showstream.php:136 +#, php-format +msgid "Notice feed for %s (RSS 2.0)" +msgstr "" + +#: actions/showstream.php:143 +#, php-format +msgid "Notice feed for %s (Atom)" +msgstr "" + #: actions/showstream.php:148 #, php-format msgid "FOAF for %s" msgstr "FOAF za %s" +#: actions/showstream.php:191 +#, php-format +msgid "This is the timeline for %s but %s hasn't posted anything yet." +msgstr "" + +#: actions/showstream.php:196 +msgid "" +"Seen anything interesting recently? You haven't posted any notices yet, now " +"would be a good time to start :)" +msgstr "" + +#: actions/showstream.php:198 +#, php-format +msgid "" +"You can try to nudge %s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%s)." +msgstr "" + +#: actions/showstream.php:234 +#, php-format +msgid "" +"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en." +"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " +"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to " +"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))" +msgstr "" + +#: actions/showstream.php:239 +#, php-format +msgid "" +"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en." +"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " +"[StatusNet](http://status.net/) tool. " +msgstr "" + +#: actions/silence.php:65 actions/unsilence.php:65 +msgid "You cannot silence users on this site." +msgstr "" + +#: actions/silence.php:72 +msgid "User is already silenced." +msgstr "" + +#: actions/siteadminpanel.php:69 +msgid "Basic settings for this StatusNet site." +msgstr "" + +#: actions/siteadminpanel.php:147 +msgid "Site name must have non-zero length." +msgstr "" + +#: actions/siteadminpanel.php:155 +msgid "You must have a valid contact email address" +msgstr "" + #: actions/siteadminpanel.php:173 #, php-format msgid "Unknown language \"%s\"" msgstr "Njeznata rěč \"%s\"" +#: actions/siteadminpanel.php:180 +msgid "Invalid snapshot report URL." +msgstr "" + +#: actions/siteadminpanel.php:186 +msgid "Invalid snapshot run value." +msgstr "" + +#: actions/siteadminpanel.php:192 +msgid "Snapshot frequency must be a number." +msgstr "" + +#: actions/siteadminpanel.php:199 +msgid "You must set an SSL server when enabling SSL." +msgstr "" + +#: actions/siteadminpanel.php:204 +msgid "Invalid SSL server. The maximum length is 255 characters." +msgstr "" + +#: actions/siteadminpanel.php:210 +msgid "Minimum text limit is 140 characters." +msgstr "" + +#: actions/siteadminpanel.php:216 +msgid "Dupe limit must 1 or more seconds." +msgstr "" + #: actions/siteadminpanel.php:266 msgid "General" msgstr "Powšitkowny" @@ -1505,6 +3037,30 @@ msgstr "Powšitkowny" msgid "Site name" msgstr "Sydłowe mjeno" +#: actions/siteadminpanel.php:270 +msgid "The name of your site, like \"Yourcompany Microblog\"" +msgstr "" + +#: actions/siteadminpanel.php:274 +msgid "Brought by" +msgstr "" + +#: actions/siteadminpanel.php:275 +msgid "Text used for credits link in footer of each page" +msgstr "" + +#: actions/siteadminpanel.php:279 +msgid "Brought by URL" +msgstr "" + +#: actions/siteadminpanel.php:280 +msgid "URL used for credits link in footer of each page" +msgstr "" + +#: actions/siteadminpanel.php:284 +msgid "Contact email address for your site" +msgstr "" + #: actions/siteadminpanel.php:290 msgid "Local" msgstr "Lokalny" @@ -1513,6 +3069,10 @@ msgstr "Lokalny" msgid "Default timezone" msgstr "Standardne časowe pasmo" +#: actions/siteadminpanel.php:302 +msgid "Default timezone for the site; usually UTC." +msgstr "" + #: actions/siteadminpanel.php:308 msgid "Default site language" msgstr "Standardna sydłowa rěč" @@ -1525,6 +3085,18 @@ msgstr "URL" msgid "Server" msgstr "Serwer" +#: actions/siteadminpanel.php:319 +msgid "Site's server hostname." +msgstr "" + +#: actions/siteadminpanel.php:323 +msgid "Fancy URLs" +msgstr "" + +#: actions/siteadminpanel.php:325 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "" + #: actions/siteadminpanel.php:331 msgid "Access" msgstr "Přistup" @@ -1533,10 +3105,18 @@ msgstr "Přistup" msgid "Private" msgstr "Priwatny" +#: actions/siteadminpanel.php:336 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "" + #: actions/siteadminpanel.php:340 msgid "Invite only" msgstr "Jenož přeprosyć" +#: actions/siteadminpanel.php:342 +msgid "Make registration invitation only." +msgstr "" + #: actions/siteadminpanel.php:346 msgid "Closed" msgstr "Začinjeny" @@ -1545,14 +3125,46 @@ msgstr "Začinjeny" msgid "Disable new registrations." msgstr "Nowe registrowanja znjemóžnić." +#: actions/siteadminpanel.php:354 +msgid "Snapshots" +msgstr "" + +#: actions/siteadminpanel.php:357 +msgid "Randomly during Web hit" +msgstr "" + +#: actions/siteadminpanel.php:358 +msgid "In a scheduled job" +msgstr "" + #: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383 msgid "Never" msgstr "Ženje" +#: actions/siteadminpanel.php:360 +msgid "Data snapshots" +msgstr "" + +#: actions/siteadminpanel.php:361 +msgid "When to send statistical data to status.net servers" +msgstr "" + #: actions/siteadminpanel.php:366 msgid "Frequency" msgstr "Frekwenca" +#: actions/siteadminpanel.php:367 +msgid "Snapshots will be sent once every N web hits" +msgstr "" + +#: actions/siteadminpanel.php:372 +msgid "Report URL" +msgstr "" + +#: actions/siteadminpanel.php:373 +msgid "Snapshots will be sent to this URL" +msgstr "" + #: actions/siteadminpanel.php:380 msgid "SSL" msgstr "SSL" @@ -1569,10 +3181,18 @@ msgstr "Přeco" msgid "Use SSL" msgstr "SSL wužiwać" +#: actions/siteadminpanel.php:388 +msgid "When to use SSL" +msgstr "" + #: actions/siteadminpanel.php:393 msgid "SSL Server" msgstr "SSL-serwer" +#: actions/siteadminpanel.php:394 +msgid "Server to direct SSL requests to" +msgstr "" + #: actions/siteadminpanel.php:400 msgid "Limits" msgstr "Limity" @@ -1585,18 +3205,69 @@ msgstr "Tekstowy limit" msgid "Maximum number of characters for notices." msgstr "Maksimalna ličba znamješkow za zdźělenki." +#: actions/siteadminpanel.php:407 +msgid "Dupe limit" +msgstr "" + +#: actions/siteadminpanel.php:407 +msgid "How long users must wait (in seconds) to post the same thing again." +msgstr "" + #: actions/siteadminpanel.php:421 actions/useradminpanel.php:313 msgid "Save site settings" msgstr "Sydłowe nastajenja składować" +#: actions/smssettings.php:58 +msgid "SMS Settings" +msgstr "" + +#: actions/smssettings.php:69 +#, php-format +msgid "You can receive SMS messages through email from %%site.name%%." +msgstr "" + #: actions/smssettings.php:91 msgid "SMS is not available." msgstr "SMS k dispoziciji njesteji." +#: actions/smssettings.php:112 +msgid "Current confirmed SMS-enabled phone number." +msgstr "" + +#: actions/smssettings.php:123 +msgid "Awaiting confirmation on this phone number." +msgstr "" + +#: actions/smssettings.php:130 +msgid "Confirmation code" +msgstr "" + +#: actions/smssettings.php:131 +msgid "Enter the code you received on your phone." +msgstr "" + +#: actions/smssettings.php:138 +msgid "SMS Phone number" +msgstr "" + +#: actions/smssettings.php:140 +msgid "Phone number, no punctuation or spaces, with area code" +msgstr "" + +#: actions/smssettings.php:174 +msgid "" +"Send me notices through SMS; I understand I may incur exorbitant charges " +"from my carrier." +msgstr "" + #: actions/smssettings.php:306 msgid "No phone number." msgstr "Žane telefonowe čisło." +#: actions/smssettings.php:311 +msgid "No carrier selected." +msgstr "" + #: actions/smssettings.php:318 msgid "That is already your phone number." msgstr "To je hižo twoje telefonowe čisło." @@ -1605,6 +3276,35 @@ msgstr "To je hižo twoje telefonowe čisło." msgid "That phone number already belongs to another user." msgstr "Te telefonowe čisło hižo druhemu wužiwarjej słuša." +#: actions/smssettings.php:347 +msgid "" +"A confirmation code was sent to the phone number you added. Check your phone " +"for the code and instructions on how to use it." +msgstr "" + +#: actions/smssettings.php:374 +msgid "That is the wrong confirmation number." +msgstr "" + +#: actions/smssettings.php:405 +msgid "That is not your phone number." +msgstr "" + +#: actions/smssettings.php:465 +msgid "Mobile carrier" +msgstr "" + +#: actions/smssettings.php:469 +msgid "Select a carrier" +msgstr "" + +#: actions/smssettings.php:476 +#, php-format +msgid "" +"Mobile carrier for your phone. If you know a carrier that accepts SMS over " +"email but isn't listed here, send email to let us know at %s." +msgstr "" + #: actions/smssettings.php:498 msgid "No code entered" msgstr "Žadyn kod zapodaty" @@ -1613,6 +3313,10 @@ msgstr "Žadyn kod zapodaty" msgid "You are not subscribed to that profile." msgstr "Njejsy tón profil abonował." +#: actions/subedit.php:83 +msgid "Could not save subscription." +msgstr "" + #: actions/subscribe.php:55 msgid "Not a local user." msgstr "Njeje lokalny wužiwar." @@ -1631,6 +3335,33 @@ msgstr "%s abonentow" msgid "%s subscribers, page %d" msgstr "%s abonentow, strona %d" +#: actions/subscribers.php:63 +msgid "These are the people who listen to your notices." +msgstr "" + +#: actions/subscribers.php:67 +#, php-format +msgid "These are the people who listen to %s's notices." +msgstr "" + +#: actions/subscribers.php:108 +msgid "" +"You have no subscribers. Try subscribing to people you know and they might " +"return the favor" +msgstr "" + +#: actions/subscribers.php:110 +#, php-format +msgid "%s has no subscribers. Want to be the first?" +msgstr "" + +#: actions/subscribers.php:114 +#, php-format +msgid "" +"%s has no subscribers. Why not [register an account](%%%%action.register%%%" +"%) and be the first?" +msgstr "" + #: actions/subscriptions.php:52 #, php-format msgid "%s subscriptions" @@ -1641,6 +3372,30 @@ msgstr "%s abonementow" msgid "%s subscriptions, page %d" msgstr "%s abonementow, strona %d" +#: actions/subscriptions.php:65 +msgid "These are the people whose notices you listen to." +msgstr "" + +#: actions/subscriptions.php:69 +#, php-format +msgid "These are the people whose notices %s listens to." +msgstr "" + +#: actions/subscriptions.php:121 +#, php-format +msgid "" +"You're not listening to anyone's notices right now, try subscribing to " +"people you know. Try [people search](%%action.peoplesearch%%), look for " +"members in groups you're interested in and in our [featured users](%%action." +"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can " +"automatically subscribe to people you already follow there." +msgstr "" + +#: actions/subscriptions.php:123 actions/subscriptions.php:127 +#, php-format +msgid "%s is not listening to anyone." +msgstr "" + #: actions/subscriptions.php:194 msgid "Jabber" msgstr "Jabber" @@ -1657,6 +3412,11 @@ msgstr "Njepřizjewjeny" msgid "No id argument." msgstr "Žadyn argument ID." +#: actions/tagother.php:65 +#, php-format +msgid "Tag %s" +msgstr "" + #: actions/tagother.php:77 lib/userprofile.php:75 msgid "User profile" msgstr "Wužiwarski profil" @@ -1665,14 +3425,86 @@ msgstr "Wužiwarski profil" msgid "Photo" msgstr "Foto" +#: actions/tagother.php:141 +msgid "Tag user" +msgstr "" + +#: actions/tagother.php:151 +msgid "" +"Tags for this user (letters, numbers, -, ., and _), comma- or space- " +"separated" +msgstr "" + +#: actions/tagother.php:193 +msgid "" +"You can only tag people you are subscribed to or who are subscribed to you." +msgstr "" + +#: actions/tagother.php:200 +msgid "Could not save tags." +msgstr "" + +#: actions/tagother.php:236 +msgid "Use this form to add tags to your subscribers or subscriptions." +msgstr "" + +#: actions/tag.php:68 +#, php-format +msgid "Notices tagged with %s, page %d" +msgstr "" + +#: actions/tag.php:86 +#, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "" + +#: actions/tag.php:92 +#, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "" + +#: actions/tag.php:98 +#, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "" + +#: actions/tagrss.php:35 +msgid "No such tag." +msgstr "" + +#: actions/twitapitrends.php:87 +msgid "API method under construction." +msgstr "" + #: actions/unblock.php:59 msgid "You haven't blocked that user." msgstr "Njejsy toho wužiwarja zablokował." +#: actions/unsandbox.php:72 +msgid "User is not sandboxed." +msgstr "" + +#: actions/unsilence.php:72 +msgid "User is not silenced." +msgstr "" + +#: actions/unsubscribe.php:77 +msgid "No profile id in request." +msgstr "" + +#: actions/unsubscribe.php:84 +msgid "No profile with that id." +msgstr "" + #: actions/unsubscribe.php:98 msgid "Unsubscribed" msgstr "Wotskazany" +#: actions/updateprofile.php:62 actions/userauthorization.php:330 +#, php-format +msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +msgstr "" + #: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 #: lib/personalgroupnav.php:115 msgid "User" @@ -1682,11 +3514,32 @@ msgstr "Wužiwar" msgid "User settings for this StatusNet site." msgstr "Wužiwarske nastajenja za sydło StatusNet." +#: actions/useradminpanel.php:149 +msgid "Invalid bio limit. Must be numeric." +msgstr "" + +#: actions/useradminpanel.php:155 +msgid "Invalid welcome text. Max length is 255 characters." +msgstr "" + +#: actions/useradminpanel.php:165 +#, php-format +msgid "Invalid default subscripton: '%1$s' is not user." +msgstr "" + #: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" +#: actions/useradminpanel.php:222 +msgid "Bio Limit" +msgstr "" + +#: actions/useradminpanel.php:223 +msgid "Maximum length of a profile bio in characters." +msgstr "" + #: actions/useradminpanel.php:231 msgid "New users" msgstr "Nowi wužiwarjo" @@ -1703,6 +3556,10 @@ msgstr "Powitanski tekst za nowych wužiwarjow (maks. 255 znamješkow)." msgid "Default subscription" msgstr "Standardny abonement" +#: actions/useradminpanel.php:242 +msgid "Automatically subscribe new users to this user." +msgstr "" + #: actions/useradminpanel.php:251 msgid "Invitations" msgstr "Přeprošenja" @@ -1711,6 +3568,10 @@ msgstr "Přeprošenja" msgid "Invitations enabled" msgstr "Přeprošenja zmóžnjene" +#: actions/useradminpanel.php:258 +msgid "Whether to allow users to invite new users." +msgstr "" + #: actions/useradminpanel.php:265 msgid "Sessions" msgstr "Posedźenja" @@ -1719,6 +3580,29 @@ msgstr "Posedźenja" msgid "Handle sessions" msgstr "Z posedźenjemi wobchadźeć" +#: actions/useradminpanel.php:272 +msgid "Whether to handle sessions ourselves." +msgstr "" + +#: actions/useradminpanel.php:276 +msgid "Session debugging" +msgstr "" + +#: actions/useradminpanel.php:278 +msgid "Turn on debugging output for sessions." +msgstr "" + +#: actions/userauthorization.php:105 +msgid "Authorize subscription" +msgstr "" + +#: actions/userauthorization.php:110 +msgid "" +"Please check these details to make sure that you want to subscribe to this " +"user’s notices. If you didn’t just ask to subscribe to someone’s notices, " +"click “Reject”." +msgstr "" + #: actions/userauthorization.php:188 msgid "License" msgstr "Licenca" @@ -1740,31 +3624,707 @@ msgstr "Wotpokazać" msgid "Reject this subscription" msgstr "Tutón abonement wotpokazać" +#: actions/userauthorization.php:225 +msgid "No authorization request!" +msgstr "" + #: actions/userauthorization.php:247 msgid "Subscription authorized" msgstr "Abonement awtorizowany" +#: actions/userauthorization.php:249 +msgid "" +"The subscription has been authorized, but no callback URL was passed. Check " +"with the site’s instructions for details on how to authorize the " +"subscription. Your subscription token is:" +msgstr "" + #: actions/userauthorization.php:259 msgid "Subscription rejected" msgstr "Abonement wotpokazany" -#: lib/command.php:620 -#, fuzzy +#: actions/userauthorization.php:261 +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 "" + +#: actions/userauthorization.php:296 +#, php-format +msgid "Listener URI ‘%s’ not found here" +msgstr "" + +#: actions/userauthorization.php:301 +#, php-format +msgid "Listenee URI ‘%s’ is too long." +msgstr "" + +#: actions/userauthorization.php:307 +#, php-format +msgid "Listenee URI ‘%s’ is a local user." +msgstr "" + +#: actions/userauthorization.php:322 +#, php-format +msgid "Profile URL ‘%s’ is for a local user." +msgstr "" + +#: actions/userauthorization.php:338 +#, php-format +msgid "Avatar URL ‘%s’ is not valid." +msgstr "" + +#: actions/userauthorization.php:343 +#, php-format +msgid "Can’t read avatar URL ‘%s’." +msgstr "" + +#: actions/userauthorization.php:348 +#, php-format +msgid "Wrong image type for avatar URL ‘%s’." +msgstr "" + +#: actions/userbyid.php:70 +msgid "No id." +msgstr "" + +#: actions/userdesignsettings.php:76 lib/designsettings.php:65 +msgid "Profile design" +msgstr "" + +#: actions/userdesignsettings.php:87 lib/designsettings.php:76 +msgid "" +"Customize the way your profile looks with a background image and a colour " +"palette of your choice." +msgstr "" + +#: actions/userdesignsettings.php:282 +msgid "Enjoy your hotdog!" +msgstr "" + +#: actions/usergroups.php:64 +#, php-format +msgid "%s groups, page %d" +msgstr "" + +#: actions/usergroups.php:130 +msgid "Search for more groups" +msgstr "" + +#: actions/usergroups.php:153 +#, php-format +msgid "%s is not a member of any group." +msgstr "" + +#: actions/usergroups.php:158 +#, php-format +msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." +msgstr "" + +#: classes/File.php:137 +#, php-format +msgid "" +"No file may be larger than %d bytes and the file you sent was %d bytes. Try " +"to upload a smaller version." +msgstr "" + +#: classes/File.php:147 +#, php-format +msgid "A file this large would exceed your user quota of %d bytes." +msgstr "" + +#: classes/File.php:154 +#, php-format +msgid "A file this large would exceed your monthly quota of %d bytes." +msgstr "" + +#: classes/Message.php:45 +msgid "You are banned from sending direct messages." +msgstr "" + +#: classes/Message.php:61 +msgid "Could not insert message." +msgstr "" + +#: classes/Message.php:71 +msgid "Could not update message with new URI." +msgstr "" + +#: classes/Notice.php:164 +#, php-format +msgid "DB error inserting hashtag: %s" +msgstr "" + +#: classes/Notice.php:179 +msgid "Problem saving notice. Too long." +msgstr "" + +#: classes/Notice.php:183 +msgid "Problem saving notice. Unknown user." +msgstr "" + +#: classes/Notice.php:188 +msgid "" +"Too many notices too fast; take a breather and post again in a few minutes." +msgstr "" + +#: classes/Notice.php:194 +msgid "" +"Too many duplicate messages too quickly; take a breather and post again in a " +"few minutes." +msgstr "" + +#: classes/Notice.php:200 +msgid "You are banned from posting notices on this site." +msgstr "" + +#: classes/Notice.php:265 classes/Notice.php:290 +msgid "Problem saving notice." +msgstr "" + +#: classes/Notice.php:1124 +#, php-format +msgid "DB error inserting reply: %s" +msgstr "" + +#: classes/User_group.php:380 +msgid "Could not create group." +msgstr "" + +#: classes/User_group.php:409 +msgid "Could not set group membership." +msgstr "" + +#: classes/User.php:347 +#, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "" + +#: lib/accountsettingsaction.php:108 +msgid "Change your profile settings" +msgstr "" + +#: lib/accountsettingsaction.php:112 +msgid "Upload an avatar" +msgstr "" + +#: lib/accountsettingsaction.php:116 +msgid "Change your password" +msgstr "" + +#: lib/accountsettingsaction.php:120 +msgid "Change email handling" +msgstr "" + +#: lib/accountsettingsaction.php:124 +msgid "Design your profile" +msgstr "" + +#: lib/accountsettingsaction.php:128 +msgid "Other" +msgstr "" + +#: lib/accountsettingsaction.php:128 +msgid "Other options" +msgstr "" + +#: lib/action.php:144 +#, php-format +msgid "%s - %s" +msgstr "" + +#: lib/action.php:159 +msgid "Untitled page" +msgstr "" + +#: lib/action.php:425 +msgid "Primary site navigation" +msgstr "" + +#: lib/action.php:431 +msgid "Home" +msgstr "" + +#: lib/action.php:431 +msgid "Personal profile and friends timeline" +msgstr "" + +#: lib/action.php:433 +msgid "Account" +msgstr "" + +#: lib/action.php:433 +msgid "Change your email, avatar, password, profile" +msgstr "" + +#: lib/action.php:436 +msgid "Connect" +msgstr "" + +#: lib/action.php:436 +msgid "Connect to services" +msgstr "" + +#: lib/action.php:440 +msgid "Change site configuration" +msgstr "" + +#: lib/action.php:444 lib/subgroupnav.php:105 +msgid "Invite" +msgstr "" + +#: lib/action.php:445 lib/subgroupnav.php:106 +#, php-format +msgid "Invite friends and colleagues to join you on %s" +msgstr "" + +#: lib/action.php:450 +msgid "Logout" +msgstr "" + +#: lib/action.php:450 +msgid "Logout from the site" +msgstr "" + +#: lib/action.php:455 +msgid "Create an account" +msgstr "" + +#: lib/action.php:458 +msgid "Login to the site" +msgstr "" + +#: lib/action.php:461 lib/action.php:724 +msgid "Help" +msgstr "" + +#: lib/action.php:461 +msgid "Help me!" +msgstr "" + +#: lib/action.php:464 lib/searchaction.php:127 +msgid "Search" +msgstr "" + +#: lib/action.php:464 +msgid "Search for people or text" +msgstr "" + +#: lib/action.php:485 +msgid "Site notice" +msgstr "" + +#: lib/action.php:551 +msgid "Local views" +msgstr "" + +#: lib/action.php:617 +msgid "Page notice" +msgstr "" + +#: lib/action.php:719 +msgid "Secondary site navigation" +msgstr "" + +#: lib/action.php:726 +msgid "About" +msgstr "" + +#: lib/action.php:728 +msgid "FAQ" +msgstr "" + +#: lib/action.php:732 +msgid "TOS" +msgstr "" + +#: lib/action.php:735 +msgid "Privacy" +msgstr "" + +#: lib/action.php:737 +msgid "Source" +msgstr "" + +#: lib/action.php:739 +msgid "Contact" +msgstr "" + +#: lib/action.php:741 +msgid "Badge" +msgstr "" + +#: lib/action.php:769 +msgid "StatusNet software license" +msgstr "" + +#: lib/action.php:772 +#, php-format +msgid "" +"**%%site.name%%** is a microblogging service brought to you by [%%site." +"broughtby%%](%%site.broughtbyurl%%). " +msgstr "" + +#: lib/action.php:774 +#, php-format +msgid "**%%site.name%%** is a microblogging service. " +msgstr "" + +#: lib/action.php:776 +#, php-format +msgid "" +"It runs the [StatusNet](http://status.net/) microblogging software, version %" +"s, available under the [GNU Affero General Public License](http://www.fsf." +"org/licensing/licenses/agpl-3.0.html)." +msgstr "" + +#: lib/action.php:790 +msgid "Site content license" +msgstr "" + +#: lib/action.php:799 +msgid "All " +msgstr "" + +#: lib/action.php:804 +msgid "license." +msgstr "" + +#: lib/action.php:1068 +msgid "Pagination" +msgstr "" + +#: lib/action.php:1077 +msgid "After" +msgstr "" + +#: lib/action.php:1085 +msgid "Before" +msgstr "" + +#: lib/action.php:1133 +msgid "There was a problem with your session token." +msgstr "" + +#: lib/adminpanelaction.php:96 +msgid "You cannot make changes to this site." +msgstr "" + +#: lib/adminpanelaction.php:195 +msgid "showForm() not implemented." +msgstr "" + +#: lib/adminpanelaction.php:224 +msgid "saveSettings() not implemented." +msgstr "" + +#: lib/adminpanelaction.php:247 +msgid "Unable to delete design setting." +msgstr "" + +#: lib/adminpanelaction.php:300 +msgid "Basic site configuration" +msgstr "" + +#: lib/adminpanelaction.php:303 +msgid "Design configuration" +msgstr "" + +#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +msgid "Paths configuration" +msgstr "" + +#: lib/attachmentlist.php:87 +msgid "Attachments" +msgstr "" + +#: lib/attachmentlist.php:265 +msgid "Author" +msgstr "" + +#: lib/attachmentlist.php:278 +msgid "Provider" +msgstr "" + +#: lib/attachmentnoticesection.php:67 +msgid "Notices where this attachment appears" +msgstr "" + +#: lib/attachmenttagcloudsection.php:48 +msgid "Tags for this attachment" +msgstr "" + +#: lib/channel.php:138 lib/channel.php:158 +msgid "Command results" +msgstr "" + +#: lib/channel.php:210 +msgid "Command complete" +msgstr "" + +#: lib/channel.php:221 +msgid "Command failed" +msgstr "" + +#: lib/command.php:44 +msgid "Sorry, this command is not yet implemented." +msgstr "" + +#: lib/command.php:88 +#, php-format +msgid "Could not find a user with nickname %s" +msgstr "" + +#: lib/command.php:92 +msgid "It does not make a lot of sense to nudge yourself!" +msgstr "" + +#: lib/command.php:99 +#, php-format +msgid "Nudge sent to %s" +msgstr "" + +#: lib/command.php:126 +#, php-format +msgid "" +"Subscriptions: %1$s\n" +"Subscribers: %2$s\n" +"Notices: %3$s" +msgstr "" + +#: lib/command.php:152 lib/command.php:400 +msgid "Notice with that id does not exist" +msgstr "" + +#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +msgid "User has no last notice" +msgstr "" + +#: lib/command.php:190 +msgid "Notice marked as fave." +msgstr "" + +#: lib/command.php:315 +#, php-format +msgid "%1$s (%2$s)" +msgstr "" + +#: lib/command.php:318 +#, php-format +msgid "Fullname: %s" +msgstr "" + +#: lib/command.php:321 +#, php-format +msgid "Location: %s" +msgstr "" + +#: lib/command.php:324 +#, php-format +msgid "Homepage: %s" +msgstr "" + +#: lib/command.php:327 +#, php-format +msgid "About: %s" +msgstr "" + +#: lib/command.php:358 scripts/xmppdaemon.php:321 +#, php-format +msgid "Message too long - maximum is %d characters, you sent %d" +msgstr "" + +#: lib/command.php:377 +msgid "Error sending direct message." +msgstr "" + +#: lib/command.php:431 +#, php-format +msgid "Notice too long - maximum is %d characters, you sent %d" +msgstr "" + +#: lib/command.php:439 +#, php-format +msgid "Reply to %s sent" +msgstr "" + +#: lib/command.php:441 +msgid "Error saving notice." +msgstr "" + +#: lib/command.php:495 +msgid "Specify the name of the user to subscribe to" +msgstr "" + +#: lib/command.php:502 +#, php-format +msgid "Subscribed to %s" +msgstr "" + +#: lib/command.php:523 +msgid "Specify the name of the user to unsubscribe from" +msgstr "" + +#: lib/command.php:530 +#, php-format +msgid "Unsubscribed from %s" +msgstr "" + +#: lib/command.php:548 lib/command.php:571 +msgid "Command not yet implemented." +msgstr "" + +#: lib/command.php:551 +msgid "Notification off." +msgstr "" + +#: lib/command.php:553 +msgid "Can't turn off notification." +msgstr "" + +#: lib/command.php:574 +msgid "Notification on." +msgstr "" + +#: lib/command.php:576 +msgid "Can't turn on notification." +msgstr "" + +#: lib/command.php:592 +msgid "You are not subscribed to anyone." +msgstr "" + +#: lib/command.php:594 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" -# Plural problem +msgstr[0] "Sy tutu wosobu abonował:" +msgstr[1] "Sy tutej wosobje abonował:" +msgstr[2] "Sy tute wosoby abonował:" +msgstr[3] "Sy tute wosoby abonował:" -#: lib/command.php:642 -#, fuzzy +#: lib/command.php:614 +msgid "No one is subscribed to you." +msgstr "" + +#: lib/command.php:616 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" -# Plural problem +msgstr[0] "Tuta wosoba je će abonowała:" +msgstr[1] "Tutej wosobje stej će abonowałoj:" +msgstr[2] "Tute wosoby su će abonowali:" +msgstr[3] "Tute wosoby su će abonowali:" -#: lib/command.php:664 -#, fuzzy +#: lib/command.php:636 +msgid "You are not a member of any groups." +msgstr "" + +#: lib/command.php:638 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" -# Plural problem +msgstr[0] "Sy čłon tuteje skupiny:" +msgstr[1] "Sy čłon tuteju skupinow:" +msgstr[2] "Sy čłon tutych skupinow:" +msgstr[3] "Sy čłon tutych skupinow:" + +#: lib/command.php:652 +msgid "" +"Commands:\n" +"on - turn on notifications\n" +"off - turn off notifications\n" +"help - show this help\n" +"follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" +"leave - unsubscribe from user\n" +"d - direct message to user\n" +"get - get last notice from user\n" +"whois - get profile info on user\n" +"fav - add user's last notice as a 'fave'\n" +"fav # - add notice with the given id as a 'fave'\n" +"reply # - reply to notice with a given id\n" +"reply - reply to the last notice from user\n" +"join - join group\n" +"drop - leave group\n" +"stats - get your stats\n" +"stop - same as 'off'\n" +"quit - same as 'off'\n" +"sub - same as 'follow'\n" +"unsub - same as 'leave'\n" +"last - same as 'get'\n" +"on - not yet implemented.\n" +"off - not yet implemented.\n" +"nudge - remind a user to update.\n" +"invite - not yet implemented.\n" +"track - not yet implemented.\n" +"untrack - not yet implemented.\n" +"track off - not yet implemented.\n" +"untrack all - not yet implemented.\n" +"tracks - not yet implemented.\n" +"tracking - not yet implemented.\n" +msgstr "" + +#: lib/common.php:199 +msgid "No configuration file found. " +msgstr "" + +#: lib/common.php:200 +msgid "I looked for configuration files in the following places: " +msgstr "" + +#: lib/common.php:201 +msgid "You may wish to run the installer to fix this." +msgstr "" + +#: lib/common.php:202 +msgid "Go to the installer." +msgstr "" + +#: lib/connectsettingsaction.php:110 +msgid "IM" +msgstr "" + +#: lib/connectsettingsaction.php:111 +msgid "Updates by instant messenger (IM)" +msgstr "" + +#: lib/connectsettingsaction.php:116 +msgid "Updates by SMS" +msgstr "" + +#: lib/dberroraction.php:60 +msgid "Database error" +msgstr "" + +#: lib/designsettings.php:105 +msgid "Upload file" +msgstr "" + +#: lib/designsettings.php:109 +msgid "" +"You can upload your personal background image. The maximum file size is 2MB." +msgstr "" + +#: lib/designsettings.php:418 +msgid "Design defaults restored." +msgstr "" + +#: lib/disfavorform.php:114 lib/disfavorform.php:140 +msgid "Disfavor this notice" +msgstr "" + +#: lib/favorform.php:114 lib/favorform.php:140 +msgid "Favor this notice" +msgstr "" + +#: lib/favorform.php:140 +msgid "Favor" +msgstr "" + +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "" #: lib/feed.php:85 msgid "RSS 1.0" @@ -1782,10 +4342,34 @@ msgstr "Atom" msgid "FOAF" msgstr "FOAF" +#: lib/galleryaction.php:121 +msgid "Filter tags" +msgstr "" + #: lib/galleryaction.php:131 msgid "All" msgstr "Wšě" +#: lib/galleryaction.php:139 +msgid "Select tag to filter" +msgstr "" + +#: lib/galleryaction.php:140 +msgid "Tag" +msgstr "" + +#: lib/galleryaction.php:141 +msgid "Choose a tag to narrow list" +msgstr "" + +#: lib/galleryaction.php:143 +msgid "Go" +msgstr "" + +#: lib/groupeditform.php:163 +msgid "URL of the homepage or blog of the group or topic" +msgstr "" + #: lib/groupeditform.php:168 msgid "Describe the group or topic" msgstr "Skupinu abo temu wopisać" @@ -1799,6 +4383,16 @@ msgstr "Skupinu abo temu w %d znamješkach wopisać" msgid "Description" msgstr "Wopisanje" +#: lib/groupeditform.php:179 +msgid "" +"Location for the group, if any, like \"City, State (or Region), Country\"" +msgstr "" + +#: lib/groupeditform.php:187 +#, php-format +msgid "Extra nicknames for the group, comma- or space- separated, max %d" +msgstr "" + #: lib/groupnav.php:85 msgid "Group" msgstr "Skupina" @@ -1807,10 +4401,30 @@ msgstr "Skupina" msgid "Blocked" msgstr "Blokowany" +#: lib/groupnav.php:102 +#, php-format +msgid "%s blocked users" +msgstr "" + +#: lib/groupnav.php:108 +#, php-format +msgid "Edit %s group properties" +msgstr "" + #: lib/groupnav.php:113 msgid "Logo" msgstr "Logo" +#: lib/groupnav.php:114 +#, php-format +msgid "Add or edit %s logo" +msgstr "" + +#: lib/groupnav.php:120 +#, php-format +msgid "Add or edit %s design" +msgstr "" + #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" msgstr "Skupiny z najwjace čłonami" @@ -1819,10 +4433,36 @@ msgstr "Skupiny z najwjace čłonami" msgid "Groups with most posts" msgstr "Skupiny z njawjace powěsćemi" +#: lib/grouptagcloudsection.php:56 +#, php-format +msgid "Tags in %s group's notices" +msgstr "" + +#: lib/htmloutputter.php:103 +msgid "This page is not available in a media type you accept" +msgstr "" + +#: lib/imagefile.php:75 +#, php-format +msgid "That file is too big. The maximum file size is %s." +msgstr "" + #: lib/imagefile.php:80 msgid "Partial upload." msgstr "Dźělne nahraće." +#: lib/imagefile.php:88 lib/mediafile.php:170 +msgid "System error uploading file." +msgstr "" + +#: lib/imagefile.php:96 +msgid "Not an image or corrupt file." +msgstr "" + +#: lib/imagefile.php:105 +msgid "Unsupported image file format." +msgstr "" + #: lib/imagefile.php:118 msgid "Lost our file." msgstr "Naša dataja je so zhubiła." @@ -1831,11 +4471,23 @@ msgstr "Naša dataja je so zhubiła." msgid "Unknown file type" msgstr "Njeznaty datajowy typ" -#: lib/jabber.php:192 +#: lib/imagefile.php:217 +msgid "MB" +msgstr "" + +#: lib/imagefile.php:219 +msgid "kB" +msgstr "" + +#: lib/jabber.php:191 #, php-format msgid "[%s]" msgstr "[%s]" +#: lib/joinform.php:114 +msgid "Join" +msgstr "" + #: lib/leaveform.php:114 msgid "Leave" msgstr "Wopušćić" @@ -1848,6 +4500,16 @@ msgstr "Přizjewjenje z wužiwarskim mjenom a hesłom" msgid "Sign up for a new account" msgstr "Nowe konto registrować" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "" + +#: 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 "" + #: lib/mailbox.php:227 lib/noticelist.php:452 msgid "from" msgstr "wot" @@ -1856,6 +4518,43 @@ msgstr "wot" msgid "Email address confirmation" msgstr "Wobkrućenje e-mejloweje adresy" +#: lib/mail.php:174 +#, php-format +msgid "" +"Hey, %s.\n" +"\n" +"Someone just entered this email address on %s.\n" +"\n" +"If it was you, and you want to confirm your entry, use the URL below:\n" +"\n" +"\t%s\n" +"\n" +"If not, just ignore this message.\n" +"\n" +"Thanks for your time, \n" +"%s\n" +msgstr "" + +#: lib/mail.php:236 +#, php-format +msgid "%1$s is now listening to your notices on %2$s." +msgstr "" + +#: lib/mail.php:241 +#, php-format +msgid "" +"%1$s is now listening to your notices on %2$s.\n" +"\n" +"\t%3$s\n" +"\n" +"%4$s%5$s%6$s\n" +"Faithfully yours,\n" +"%7$s.\n" +"\n" +"----\n" +"Change your email address or notification options at %8$s\n" +msgstr "" + #: lib/mail.php:254 #, php-format msgid "Location: %s\n" @@ -1868,23 +4567,145 @@ msgstr "Startowa strona: %s\n" #: lib/mail.php:258 #, php-format -msgid "Bio: %s\n\n" -msgstr "Biografija: %s\n\n" +msgid "" +"Bio: %s\n" +"\n" +msgstr "" +"Biografija: %s\n" +"\n" + +#: lib/mail.php:286 +#, php-format +msgid "New email address for posting to %s" +msgstr "" + +#: lib/mail.php:289 +#, php-format +msgid "" +"You have a new posting address on %1$s.\n" +"\n" +"Send email to %2$s to post new messages.\n" +"\n" +"More email instructions at %3$s.\n" +"\n" +"Faithfully yours,\n" +"%4$s" +msgstr "" + +#: lib/mail.php:413 +#, php-format +msgid "%s status" +msgstr "" #: lib/mail.php:439 msgid "SMS confirmation" msgstr "SMS-wobkrućenje" +#: lib/mail.php:463 +#, php-format +msgid "You've been nudged by %s" +msgstr "" + +#: lib/mail.php:467 +#, php-format +msgid "" +"%1$s (%2$s) is wondering what you are up to these days and is inviting you " +"to post some news.\n" +"\n" +"So let's hear from you :)\n" +"\n" +"%3$s\n" +"\n" +"Don't reply to this email; it won't get to them.\n" +"\n" +"With kind regards,\n" +"%4$s\n" +msgstr "" + #: lib/mail.php:510 #, php-format msgid "New private message from %s" msgstr "Nowa priwatna powěsć wot %s" +#: lib/mail.php:514 +#, php-format +msgid "" +"%1$s (%2$s) sent you a private message:\n" +"\n" +"------------------------------------------------------\n" +"%3$s\n" +"------------------------------------------------------\n" +"\n" +"You can reply to their message here:\n" +"\n" +"%4$s\n" +"\n" +"Don't reply to this email; it won't get to them.\n" +"\n" +"With kind regards,\n" +"%5$s\n" +msgstr "" + #: lib/mail.php:559 #, 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 +#, php-format +msgid "" +"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" +"\n" +"The URL of your notice is:\n" +"\n" +"%3$s\n" +"\n" +"The text of your notice is:\n" +"\n" +"%4$s\n" +"\n" +"You can see the list of %1$s's favorites here:\n" +"\n" +"%5$s\n" +"\n" +"Faithfully yours,\n" +"%6$s\n" +msgstr "" + +#: lib/mail.php:620 +#, php-format +msgid "%s (@%s) sent a notice to your attention" +msgstr "" + +#: lib/mail.php:622 +#, php-format +msgid "" +"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" +"\n" +"The notice is here:\n" +"\n" +"\t%3$s\n" +"\n" +"It reads:\n" +"\n" +"\t%4$s\n" +"\n" +msgstr "" + +#: lib/mediafile.php:98 lib/mediafile.php:123 +msgid "There was a database error while saving your file. Please try again." +msgstr "" + +#: lib/mediafile.php:142 +msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." +msgstr "" + +#: lib/mediafile.php:147 +msgid "" +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " +"the HTML form." +msgstr "" + #: lib/mediafile.php:152 msgid "The uploaded file was only partially uploaded." msgstr "Nahrata dataja bu jenož zdźěla nahrata." @@ -1893,6 +4714,31 @@ msgstr "Nahrata dataja bu jenož zdźěla nahrata." msgid "Missing a temporary folder." msgstr "Temporerny rjadowka faluje." +#: lib/mediafile.php:162 +msgid "Failed to write file to disk." +msgstr "" + +#: lib/mediafile.php:165 +msgid "File upload stopped by extension." +msgstr "" + +#: lib/mediafile.php:179 lib/mediafile.php:216 +msgid "File exceeds user's quota!" +msgstr "" + +#: lib/mediafile.php:196 lib/mediafile.php:233 +msgid "File could not be moved to destination directory." +msgstr "" + +#: lib/mediafile.php:201 lib/mediafile.php:237 +msgid "Could not determine file's mime-type!" +msgstr "" + +#: lib/mediafile.php:270 +#, php-format +msgid " Try using another %s format." +msgstr "" + #: lib/mediafile.php:275 #, php-format msgid "%s is not a supported filetype on this server." @@ -1906,7 +4752,7 @@ msgstr "Direktnu zdźělenku pósłać" msgid "To" msgstr "Komu" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 msgid "Available characters" msgstr "K dispoziciji stejace znamješka" @@ -1914,11 +4760,16 @@ msgstr "K dispoziciji stejace znamješka" msgid "Send a notice" msgstr "Zdźělenku pósłać" -#: lib/noticeform.php:193 +#: lib/noticeform.php:171 +#, php-format +msgid "What's up, %s?" +msgstr "" + +#: lib/noticeform.php:192 msgid "Attach" msgstr "Připowěsnyć" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "Dataju připowěsnyć" @@ -1943,6 +4794,14 @@ msgstr "W" msgid "W" msgstr "Z" +#: lib/noticelist.php:411 +msgid "at" +msgstr "" + +#: lib/noticelist.php:506 +msgid "in context" +msgstr "" + #: lib/noticelist.php:526 msgid "Reply to this notice" msgstr "Na tutu zdźělenku wotmołwić" @@ -1951,6 +4810,18 @@ msgstr "Na tutu zdźělenku wotmołwić" msgid "Reply" msgstr "Wotmołwić" +#: lib/nudgeform.php:116 +msgid "Nudge this user" +msgstr "" + +#: lib/nudgeform.php:128 +msgid "Nudge" +msgstr "" + +#: lib/nudgeform.php:128 +msgid "Send a nudge to this user" +msgstr "" + #: lib/oauthstore.php:283 msgid "Error inserting new profile" msgstr "Zmylk při zasunjenju noweho profila" @@ -1967,6 +4838,14 @@ msgstr "Zmylk při zasunjenju zdaleneho profila" msgid "Duplicate notice" msgstr "Dwójna zdźělenka" +#: lib/oauthstore.php:467 lib/subs.php:48 +msgid "You have been banned from subscribing." +msgstr "" + +#: lib/oauthstore.php:492 +msgid "Couldn't insert new subscription." +msgstr "" + #: lib/personalgroupnav.php:99 msgid "Personal" msgstr "Wosobinski" @@ -1979,15 +4858,28 @@ msgstr "Wotmołwy" msgid "Favorites" msgstr "Fawority" +#: lib/personalgroupnav.php:124 +msgid "Inbox" +msgstr "" + #: lib/personalgroupnav.php:125 msgid "Your incoming messages" msgstr "Twoje dochadźace powěsće" +#: lib/personalgroupnav.php:129 +msgid "Outbox" +msgstr "" + #: lib/personalgroupnav.php:130 msgid "Your sent messages" msgstr "Twoje pósłane powěsće" -#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82 +#: lib/personaltagcloudsection.php:56 +#, php-format +msgid "Tags in %s's notices" +msgstr "" + +#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Abonementy" @@ -1995,7 +4887,7 @@ msgstr "Abonementy" msgid "All subscriptions" msgstr "Wšě abonementy" -#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90 +#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Abonenća" @@ -2003,18 +4895,26 @@ msgstr "Abonenća" msgid "All subscribers" msgstr "Wšitcy abonenća" -#: lib/profileaction.php:177 +#: lib/profileaction.php:178 msgid "User ID" msgstr "Wužiwarski ID" -#: lib/profileaction.php:182 +#: lib/profileaction.php:183 msgid "Member since" msgstr "Čłon wot" -#: lib/profileaction.php:235 +#: lib/profileaction.php:245 msgid "All groups" msgstr "Wšě skupiny" +#: lib/profileformaction.php:123 +msgid "No return-to arguments" +msgstr "" + +#: lib/profileformaction.php:137 +msgid "unimplemented method" +msgstr "" + #: lib/publicgroupnav.php:78 msgid "Public" msgstr "Zjawny" @@ -2023,10 +4923,26 @@ msgstr "Zjawny" msgid "User groups" msgstr "Wužiwarske skupiny" +#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85 +msgid "Recent tags" +msgstr "" + +#: lib/publicgroupnav.php:88 +msgid "Featured" +msgstr "" + #: lib/publicgroupnav.php:92 msgid "Popular" msgstr "Woblubowany" +#: lib/sandboxform.php:67 +msgid "Sandbox" +msgstr "" + +#: lib/sandboxform.php:78 +msgid "Sandbox this user" +msgstr "" + #: lib/searchaction.php:120 msgid "Search site" msgstr "Pytanske sydło" @@ -2063,6 +4979,39 @@ msgstr "Wotrězk bjez titula" msgid "More..." msgstr "Wjace..." +#: lib/silenceform.php:67 +msgid "Silence" +msgstr "" + +#: lib/silenceform.php:78 +msgid "Silence this user" +msgstr "" + +#: lib/subgroupnav.php:83 +#, php-format +msgid "People %s subscribes to" +msgstr "" + +#: lib/subgroupnav.php:91 +#, php-format +msgid "People subscribed to %s" +msgstr "" + +#: lib/subgroupnav.php:99 +#, php-format +msgid "Groups %s is a member of" +msgstr "" + +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "" + #: lib/subscriptionlist.php:126 msgid "(none)" msgstr "(žadyn)" @@ -2079,11 +5028,20 @@ msgstr "Wužiwar je će zablokował." msgid "Could not subscribe." msgstr "Abonowanje njebě móžno" +#: lib/subs.php:79 +msgid "Could not subscribe other to you." +msgstr "" + #: lib/subs.php:128 msgid "Not subscribed!" msgstr "Njeje abonowany!" -#: lib/subs.php:140 +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "Abonoment njeje so dał zničić." + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "Abonoment njeje so dał zničić." @@ -2091,6 +5049,26 @@ msgstr "Abonoment njeje so dał zničić." msgid "None" msgstr "Žadyn" +#: lib/topposterssection.php:74 +msgid "Top posters" +msgstr "" + +#: lib/unsandboxform.php:69 +msgid "Unsandbox" +msgstr "" + +#: lib/unsandboxform.php:80 +msgid "Unsandbox this user" +msgstr "" + +#: lib/unsilenceform.php:67 +msgid "Unsilence" +msgstr "" + +#: lib/unsilenceform.php:78 +msgid "Unsilence this user" +msgstr "" + #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137 msgid "Unsubscribe from this user" msgstr "Tutoho wužiwarja wotskazać" @@ -2123,6 +5101,10 @@ msgstr "Tutomu wužiwarja direktnu powěsć pósłać" msgid "Message" msgstr "Powěsć" +#: lib/userprofile.php:311 +msgid "Moderate" +msgstr "" + #: lib/util.php:825 msgid "a few seconds ago" msgstr "před něšto sekundami" @@ -2175,7 +5157,13 @@ msgstr "%s płaćiwa barba njeje!" #: lib/webcolor.php:123 #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." -msgstr "%s płaćiwa barba njeje! Wužij 3 heksadecimalne znamješka abo 6 heksadecimalnych znamješkow." +msgstr "" +"%s płaćiwa barba njeje! Wužij 3 heksadecimalne znamješka abo 6 " +"heksadecimalnych znamješkow." + +#: scripts/maildaemon.php:48 +msgid "Could not parse message." +msgstr "" #: scripts/maildaemon.php:53 msgid "Not a registered user." @@ -2188,4 +5176,3 @@ msgstr "Wodaj, to twoja adresa za dochadźace e-mejle njeje." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Wodaj, dochadźaće e-mejle njejsu dowolene." - diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index 5cb39db107..e27212ed11 100644 --- a/locale/is/LC_MESSAGES/statusnet.po +++ b/locale/is/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-02 23:18+0000\n" -"PO-Revision-Date: 2009-12-02 23:19:52+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"PO-Revision-Date: 2009-12-05 19:54:31+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: is\n" "X-Message-Group: out-statusnet\n" @@ -184,7 +184,12 @@ msgstr "Notandi hefur enga persónulega síðu." msgid "Could not save profile." msgstr "Gat ekki vistað persónulega síðu." -#: actions/apiblockcreate.php:108 +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "Gat ekki uppfært notanda." + +#: actions/apiblockcreate.php:119 msgid "Block user failed." msgstr "Mistókst að loka á notanda." @@ -823,106 +828,106 @@ msgstr "" msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:270 +#: actions/designadminpanel.php:275 #, fuzzy msgid "Invalid logo URL." msgstr "Ótæk stærð." -#: actions/designadminpanel.php:274 +#: actions/designadminpanel.php:279 #, fuzzy, php-format msgid "Theme not available: %s" msgstr "Þessi síða er ekki aðgengileg í " -#: actions/designadminpanel.php:370 +#: actions/designadminpanel.php:375 #, fuzzy msgid "Change logo" msgstr "Breyta" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:380 #, fuzzy msgid "Site logo" msgstr "Bjóða" -#: actions/designadminpanel.php:382 +#: actions/designadminpanel.php:387 #, fuzzy msgid "Change theme" msgstr "Breyta" -#: actions/designadminpanel.php:399 +#: actions/designadminpanel.php:404 #, fuzzy msgid "Site theme" msgstr "Babl vefsíðunnar" -#: actions/designadminpanel.php:400 +#: actions/designadminpanel.php:405 #, fuzzy msgid "Theme for the site." msgstr "Skrá þig út af síðunni" -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" msgstr "" -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" msgstr "" -#: actions/designadminpanel.php:422 +#: actions/designadminpanel.php:427 #, fuzzy, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn." -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" msgstr "" -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:469 lib/designsettings.php:156 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:161 +#: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 +#: actions/designadminpanel.php:488 lib/designsettings.php:170 msgid "Change colours" msgstr "" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 +#: actions/designadminpanel.php:510 lib/designsettings.php:191 msgid "Content" msgstr "" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 +#: actions/designadminpanel.php:523 lib/designsettings.php:204 msgid "Sidebar" msgstr "" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "Texti" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 +#: actions/designadminpanel.php:549 lib/designsettings.php:230 msgid "Links" msgstr "" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -932,7 +937,7 @@ msgstr "" msgid "Save" msgstr "Vista" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1365,18 +1370,18 @@ msgid "" "palette of your choice." msgstr "" -#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 -#: lib/designsettings.php:434 lib/designsettings.php:464 +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 msgid "Couldn't update your design." msgstr "" -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings!" msgstr "" -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "" @@ -1691,7 +1696,7 @@ msgstr "Persónuleg skilaboð" msgid "Optionally add a personal message to the invitation." msgstr "Bættu persónulegum skilaboðum við boðskortið ef þú vilt." -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" msgstr "Senda" @@ -2017,8 +2022,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." msgstr "Enginn stuðningur við gagnasnið." @@ -4511,11 +4516,7 @@ msgid "" "You can upload your personal background image. The maximum file size is 2MB." msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn." -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "" - -#: lib/designsettings.php:468 +#: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "" @@ -4974,7 +4975,7 @@ msgstr "Senda bein skilaboð" msgid "To" msgstr "Til" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 msgid "Available characters" msgstr "Leyfileg tákn" @@ -4987,11 +4988,11 @@ msgstr "Senda babl" msgid "What's up, %s?" msgstr "Hvað er að frétta %s?" -#: lib/noticeform.php:193 +#: lib/noticeform.php:192 msgid "Attach" msgstr "" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "" @@ -5267,7 +5268,12 @@ msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér." msgid "Not subscribed!" msgstr "Ekki í áskrift!" -#: lib/subs.php:140 +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "Gat ekki eytt áskrift." + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "Gat ekki eytt áskrift." diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index 79b6ef8c09..da538e1a27 100644 --- a/locale/it/LC_MESSAGES/statusnet.po +++ b/locale/it/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-02 23:18+0000\n" -"PO-Revision-Date: 2009-12-02 23:19:56+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"PO-Revision-Date: 2009-12-05 19:54:34+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: it\n" "X-Message-Group: out-statusnet\n" @@ -185,7 +185,12 @@ msgstr "L'utente non ha un profilo." msgid "Could not save profile." msgstr "Impossibile salvare il profilo." -#: actions/apiblockcreate.php:108 +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "Impossibile aggiornare l'utente." + +#: actions/apiblockcreate.php:119 msgid "Block user failed." msgstr "Blocco dell'utente non riuscito." @@ -838,110 +843,110 @@ msgstr "" msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:270 +#: actions/designadminpanel.php:275 #, fuzzy msgid "Invalid logo URL." msgstr "Dimensione non valida." -#: actions/designadminpanel.php:274 +#: actions/designadminpanel.php:279 #, fuzzy, php-format msgid "Theme not available: %s" msgstr "Questa pagina non è disponibile in un " -#: actions/designadminpanel.php:370 +#: actions/designadminpanel.php:375 #, fuzzy msgid "Change logo" msgstr "Modifica la tua password" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:380 #, fuzzy msgid "Site logo" msgstr "Invita" -#: actions/designadminpanel.php:382 +#: actions/designadminpanel.php:387 #, fuzzy msgid "Change theme" msgstr "Modifica" -#: actions/designadminpanel.php:399 +#: actions/designadminpanel.php:404 #, fuzzy msgid "Site theme" msgstr "Messaggio del sito" -#: actions/designadminpanel.php:400 +#: actions/designadminpanel.php:405 #, fuzzy msgid "Theme for the site." msgstr "Sconnettiti dal sito" -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" msgstr "" -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" msgstr "" -#: actions/designadminpanel.php:422 +#: actions/designadminpanel.php:427 #, fuzzy, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "Puoi caricare un'immagine per il logo del tuo gruppo." -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" msgstr "" -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:469 lib/designsettings.php:156 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:161 +#: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 +#: actions/designadminpanel.php:488 lib/designsettings.php:170 #, fuzzy msgid "Change colours" msgstr "Modifica la tua password" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 +#: actions/designadminpanel.php:510 lib/designsettings.php:191 #, fuzzy msgid "Content" msgstr "Connetti" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 +#: actions/designadminpanel.php:523 lib/designsettings.php:204 #, fuzzy msgid "Sidebar" msgstr "Ricerca" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "Testo" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 +#: actions/designadminpanel.php:549 lib/designsettings.php:230 #, fuzzy msgid "Links" msgstr "Elenco" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -951,7 +956,7 @@ msgstr "" msgid "Save" msgstr "Salva" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1400,20 +1405,20 @@ msgid "" "palette of your choice." msgstr "" -#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 -#: lib/designsettings.php:434 lib/designsettings.php:464 +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 #, fuzzy msgid "Couldn't update your design." msgstr "Impossibile aggiornare l'utente." -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 #, fuzzy msgid "Unable to save your design settings!" msgstr "Impossibile salvare le tue impostazioni di Twitter!" -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 #, fuzzy msgid "Design preferences saved." msgstr "Preferenze di sincronizzazione salvate." @@ -1736,7 +1741,7 @@ msgstr "Messaggio personale" msgid "Optionally add a personal message to the invitation." msgstr "Puoi aggiungere un messaggio personale agli inviti." -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" msgstr "Invia" @@ -2060,8 +2065,8 @@ msgstr "Connetti" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." msgstr "Non è un formato di dati supportato." @@ -4582,11 +4587,7 @@ msgid "" "You can upload your personal background image. The maximum file size is 2MB." msgstr "Qui puoi caricare la tua immagine personale." -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "" - -#: lib/designsettings.php:468 +#: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "" @@ -5050,7 +5051,7 @@ msgstr "Invia un messaggio diretto" msgid "To" msgstr "A" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 msgid "Available characters" msgstr "Caratteri disponibili" @@ -5063,11 +5064,11 @@ msgstr "Invia un messaggio" msgid "What's up, %s?" msgstr "Cosa succede, %s?" -#: lib/noticeform.php:193 +#: lib/noticeform.php:192 msgid "Attach" msgstr "" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "" @@ -5347,7 +5348,12 @@ msgstr "Impossibile abbonare altri a te." msgid "Not subscribed!" msgstr "Non abbonato!" -#: lib/subs.php:140 +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "Impossibile eliminare l'abbonamento." + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "Impossibile eliminare l'abbonamento." diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index 5317bc7a3a..43f6fcec79 100644 --- a/locale/ja/LC_MESSAGES/statusnet.po +++ b/locale/ja/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-02 23:18+0000\n" -"PO-Revision-Date: 2009-12-02 23:19:59+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"PO-Revision-Date: 2009-12-05 19:54:37+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ja\n" "X-Message-Group: out-statusnet\n" @@ -189,7 +189,12 @@ msgstr "プロファイルがありません。" msgid "Could not save profile." msgstr "プロファイルを保存できません" -#: actions/apiblockcreate.php:108 +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "ユーザを更新できません" + +#: actions/apiblockcreate.php:119 msgid "Block user failed." msgstr "ユーザのブロックに失敗しました。" @@ -839,109 +844,109 @@ msgstr "" msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:270 +#: actions/designadminpanel.php:275 #, fuzzy msgid "Invalid logo URL." msgstr "不正なサイズ。" -#: actions/designadminpanel.php:274 +#: actions/designadminpanel.php:279 #, fuzzy, php-format msgid "Theme not available: %s" msgstr "このページはあなたが承認したメディアタイプでは利用できません。" -#: actions/designadminpanel.php:370 +#: actions/designadminpanel.php:375 #, fuzzy msgid "Change logo" msgstr "パスワードの変更" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:380 #, fuzzy msgid "Site logo" msgstr "新しい通知" -#: actions/designadminpanel.php:382 +#: actions/designadminpanel.php:387 #, fuzzy msgid "Change theme" msgstr "変更" -#: actions/designadminpanel.php:399 +#: actions/designadminpanel.php:404 #, fuzzy msgid "Site theme" msgstr "新しい通知" -#: actions/designadminpanel.php:400 +#: actions/designadminpanel.php:405 #, fuzzy msgid "Theme for the site." msgstr "サイトからログアウト" -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" msgstr "" -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" msgstr "" -#: actions/designadminpanel.php:422 +#: actions/designadminpanel.php:427 #, fuzzy, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "長すぎます。通知は最大 140 字までです。" -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" msgstr "" -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:469 lib/designsettings.php:156 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:161 +#: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 +#: actions/designadminpanel.php:488 lib/designsettings.php:170 #, fuzzy msgid "Change colours" msgstr "パスワードの変更" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 +#: actions/designadminpanel.php:510 lib/designsettings.php:191 msgid "Content" msgstr "内容" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 +#: actions/designadminpanel.php:523 lib/designsettings.php:204 #, fuzzy msgid "Sidebar" msgstr "検索" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 +#: actions/designadminpanel.php:549 lib/designsettings.php:230 #, fuzzy msgid "Links" msgstr "ログイン" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -951,7 +956,7 @@ msgstr "" msgid "Save" msgstr "保存" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1396,19 +1401,19 @@ msgid "" "palette of your choice." msgstr "" -#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 -#: lib/designsettings.php:434 lib/designsettings.php:464 +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 #, fuzzy msgid "Couldn't update your design." msgstr "ユーザを更新できません" -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings!" msgstr "" -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 #, fuzzy msgid "Design preferences saved." msgstr "設定が保存されました。" @@ -1722,7 +1727,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" msgstr "送る" @@ -2040,8 +2045,8 @@ msgstr "内容種別 " msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." msgstr "" @@ -4530,11 +4535,7 @@ msgid "" "You can upload your personal background image. The maximum file size is 2MB." msgstr "長すぎます。通知は最大 140 字までです。" -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "" - -#: lib/designsettings.php:468 +#: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "" @@ -4989,7 +4990,7 @@ msgstr "直接通知を送る" msgid "To" msgstr "" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 msgid "Available characters" msgstr "利用可能な文字" @@ -5002,11 +5003,11 @@ msgstr "通知を送る" msgid "What's up, %s?" msgstr "最近どう %s?" -#: lib/noticeform.php:193 +#: lib/noticeform.php:192 msgid "Attach" msgstr "" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "" @@ -5284,7 +5285,12 @@ msgstr "" msgid "Not subscribed!" msgstr "購読していません！" -#: lib/subs.php:140 +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "サブスクリプションを削除できません" + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "サブスクリプションを削除できません" diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index 60ac94a30b..2de8e46d53 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: 2009-12-02 23:18+0000\n" -"PO-Revision-Date: 2009-12-02 23:20:03+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"PO-Revision-Date: 2009-12-05 19:54:40+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ko\n" "X-Message-Group: out-statusnet\n" @@ -184,7 +184,12 @@ msgstr "이용자가 프로필을 가지고 있지 않습니다." msgid "Could not save profile." msgstr "프로필을 저장 할 수 없습니다." -#: actions/apiblockcreate.php:108 +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "사용자를 업데이트 할 수 없습니다." + +#: actions/apiblockcreate.php:119 msgid "Block user failed." msgstr "사용자 차단에 실패했습니다." @@ -836,110 +841,110 @@ msgstr "" msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:270 +#: actions/designadminpanel.php:275 #, fuzzy msgid "Invalid logo URL." msgstr "옳지 않은 크기" -#: actions/designadminpanel.php:274 +#: actions/designadminpanel.php:279 #, fuzzy, php-format msgid "Theme not available: %s" msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다." -#: actions/designadminpanel.php:370 +#: actions/designadminpanel.php:375 #, fuzzy msgid "Change logo" msgstr "비밀번호 바꾸기" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:380 #, fuzzy msgid "Site logo" msgstr "초대" -#: actions/designadminpanel.php:382 +#: actions/designadminpanel.php:387 #, fuzzy msgid "Change theme" msgstr "변환" -#: actions/designadminpanel.php:399 +#: actions/designadminpanel.php:404 #, fuzzy msgid "Site theme" msgstr "사이트 공지" -#: actions/designadminpanel.php:400 +#: actions/designadminpanel.php:405 #, fuzzy msgid "Theme for the site." msgstr "이 사이트로부터 로그아웃" -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" msgstr "" -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" msgstr "" -#: actions/designadminpanel.php:422 +#: actions/designadminpanel.php:427 #, fuzzy, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "당신그룹의 로고 이미지를 업로드할 수 있습니다." -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" msgstr "" -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:469 lib/designsettings.php:156 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:161 +#: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 +#: actions/designadminpanel.php:488 lib/designsettings.php:170 #, fuzzy msgid "Change colours" msgstr "비밀번호 바꾸기" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 +#: actions/designadminpanel.php:510 lib/designsettings.php:191 #, fuzzy msgid "Content" msgstr "연결" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 +#: actions/designadminpanel.php:523 lib/designsettings.php:204 #, fuzzy msgid "Sidebar" msgstr "검색" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "문자" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 +#: actions/designadminpanel.php:549 lib/designsettings.php:230 #, fuzzy msgid "Links" msgstr "로그인" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -949,7 +954,7 @@ msgstr "" msgid "Save" msgstr "저장" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1393,20 +1398,20 @@ msgid "" "palette of your choice." msgstr "" -#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 -#: lib/designsettings.php:434 lib/designsettings.php:464 +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 #, fuzzy msgid "Couldn't update your design." msgstr "사용자를 업데이트 할 수 없습니다." -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 #, fuzzy msgid "Unable to save your design settings!" msgstr "트위터 환경설정을 저장할 수 없습니다." -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 #, fuzzy msgid "Design preferences saved." msgstr "싱크설정이 저장되었습니다." @@ -1722,7 +1727,7 @@ msgstr "개인적인 메시지" msgid "Optionally add a personal message to the invitation." msgstr "초대장에 메시지 첨부하기." -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" msgstr "보내기" @@ -2040,8 +2045,8 @@ msgstr "연결" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." msgstr "지원하는 형식의 데이터가 아닙니다." @@ -4541,11 +4546,7 @@ msgid "" "You can upload your personal background image. The maximum file size is 2MB." msgstr "당신의 개인적인 아바타를 업로드할 수 있습니다." -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "" - -#: lib/designsettings.php:468 +#: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "" @@ -5001,7 +5002,7 @@ msgstr "직접 메시지 보내기" msgid "To" msgstr "에게" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 msgid "Available characters" msgstr "사용 가능한 글자" @@ -5014,11 +5015,11 @@ msgstr "게시글 보내기" msgid "What's up, %s?" msgstr "뭐하세요? %?" -#: lib/noticeform.php:193 +#: lib/noticeform.php:192 msgid "Attach" msgstr "" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "" @@ -5298,7 +5299,12 @@ msgstr "다른 사람을 구독 하실 수 없습니다." msgid "Not subscribed!" msgstr "구독하고 있지 않습니다!" -#: lib/subs.php:140 +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "예약 구독을 삭제 할 수 없습니다." + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "예약 구독을 삭제 할 수 없습니다." diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 94511070d3..011c434cac 100644 --- a/locale/mk/LC_MESSAGES/statusnet.po +++ b/locale/mk/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-02 23:18+0000\n" -"PO-Revision-Date: 2009-12-02 23:20:07+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"PO-Revision-Date: 2009-12-05 19:54:43+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: mk\n" "X-Message-Group: out-statusnet\n" @@ -184,7 +184,12 @@ msgstr "Корисникот нема профил." msgid "Could not save profile." msgstr "Профилот не може да се сними." -#: actions/apiblockcreate.php:108 +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "Корисникот не може да се освежи/" + +#: actions/apiblockcreate.php:119 msgid "Block user failed." msgstr "" @@ -832,109 +837,109 @@ msgstr "" msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:270 +#: actions/designadminpanel.php:275 #, fuzzy msgid "Invalid logo URL." msgstr "Погрешна големина." -#: actions/designadminpanel.php:274 +#: actions/designadminpanel.php:279 #, fuzzy, php-format msgid "Theme not available: %s" msgstr "Оваа страница не е достапна во форматот кој Вие го прифаќате." -#: actions/designadminpanel.php:370 +#: actions/designadminpanel.php:375 #, fuzzy msgid "Change logo" msgstr "Промени ја лозинката" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:380 #, fuzzy msgid "Site logo" msgstr "Ново известување" -#: actions/designadminpanel.php:382 +#: actions/designadminpanel.php:387 #, fuzzy msgid "Change theme" msgstr "Промени" -#: actions/designadminpanel.php:399 +#: actions/designadminpanel.php:404 #, fuzzy msgid "Site theme" msgstr "Ново известување" -#: actions/designadminpanel.php:400 +#: actions/designadminpanel.php:405 msgid "Theme for the site." msgstr "" -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" msgstr "" -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" msgstr "" -#: actions/designadminpanel.php:422 +#: actions/designadminpanel.php:427 #, fuzzy, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "Ова е предолго. Максималната должина е 140 знаци." -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" msgstr "" -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:469 lib/designsettings.php:156 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:161 +#: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 +#: actions/designadminpanel.php:488 lib/designsettings.php:170 #, fuzzy msgid "Change colours" msgstr "Промени ја лозинката" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 +#: actions/designadminpanel.php:510 lib/designsettings.php:191 #, fuzzy msgid "Content" msgstr "Поврзи се" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 +#: actions/designadminpanel.php:523 lib/designsettings.php:204 #, fuzzy msgid "Sidebar" msgstr "Барај" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 +#: actions/designadminpanel.php:549 lib/designsettings.php:230 #, fuzzy msgid "Links" msgstr "Пријави се" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -944,7 +949,7 @@ msgstr "" msgid "Save" msgstr "Сними" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1384,19 +1389,19 @@ msgid "" "palette of your choice." msgstr "" -#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 -#: lib/designsettings.php:434 lib/designsettings.php:464 +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 #, fuzzy msgid "Couldn't update your design." msgstr "Корисникот не може да се освежи/" -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings!" msgstr "" -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 #, fuzzy msgid "Design preferences saved." msgstr "Преференциите се снимени." @@ -1712,7 +1717,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" msgstr "Испрати" @@ -2010,8 +2015,8 @@ msgstr "Поврзи се" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." msgstr "" @@ -4501,11 +4506,7 @@ msgid "" "You can upload your personal background image. The maximum file size is 2MB." msgstr "Ова е предолго. Максималната должина е 140 знаци." -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "" - -#: lib/designsettings.php:468 +#: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "" @@ -4968,7 +4969,7 @@ msgstr "" msgid "To" msgstr "" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 #, fuzzy msgid "Available characters" msgstr "6 или повеќе знаци" @@ -4983,11 +4984,11 @@ msgstr "Ново известување" msgid "What's up, %s?" msgstr "Што има %s?" -#: lib/noticeform.php:193 +#: lib/noticeform.php:192 msgid "Attach" msgstr "" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "" @@ -5266,7 +5267,12 @@ msgstr "" msgid "Not subscribed!" msgstr "Не сте претплатени!" -#: lib/subs.php:140 +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "Претплата не може да се избрише." + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "Претплата не може да се избрише." diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index e6eb1e5d17..4a8ed64274 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-02 23:18+0000\n" -"PO-Revision-Date: 2009-12-02 23:20:10+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"PO-Revision-Date: 2009-12-05 19:54:46+0000\n" "Language-Team: Norwegian (bokmål)‬\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: no\n" "X-Message-Group: out-statusnet\n" @@ -183,7 +183,12 @@ msgstr "" msgid "Could not save profile." msgstr "Klarte ikke å lagre profil." -#: actions/apiblockcreate.php:108 +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "Klarte ikke å oppdatere bruker." + +#: actions/apiblockcreate.php:119 msgid "Block user failed." msgstr "" @@ -828,108 +833,108 @@ msgstr "" msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:270 +#: actions/designadminpanel.php:275 #, fuzzy msgid "Invalid logo URL." msgstr "Ugyldig størrelse" -#: actions/designadminpanel.php:274 +#: actions/designadminpanel.php:279 #, php-format msgid "Theme not available: %s" msgstr "" -#: actions/designadminpanel.php:370 +#: actions/designadminpanel.php:375 #, fuzzy msgid "Change logo" msgstr "Endre passordet ditt" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:380 msgid "Site logo" msgstr "" -#: actions/designadminpanel.php:382 +#: actions/designadminpanel.php:387 #, fuzzy msgid "Change theme" msgstr "Endre" -#: actions/designadminpanel.php:399 +#: actions/designadminpanel.php:404 #, fuzzy msgid "Site theme" msgstr "Endre" -#: actions/designadminpanel.php:400 +#: actions/designadminpanel.php:405 msgid "Theme for the site." msgstr "" -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" msgstr "" -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" msgstr "" -#: actions/designadminpanel.php:422 +#: actions/designadminpanel.php:427 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "" -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" msgstr "" -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:469 lib/designsettings.php:156 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:161 +#: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 +#: actions/designadminpanel.php:488 lib/designsettings.php:170 #, fuzzy msgid "Change colours" msgstr "Endre passordet ditt" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 +#: actions/designadminpanel.php:510 lib/designsettings.php:191 #, fuzzy msgid "Content" msgstr "Koble til" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 +#: actions/designadminpanel.php:523 lib/designsettings.php:204 #, fuzzy msgid "Sidebar" msgstr "Søk" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "Tekst" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 +#: actions/designadminpanel.php:549 lib/designsettings.php:230 #, fuzzy msgid "Links" msgstr "Logg inn" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -939,7 +944,7 @@ msgstr "" msgid "Save" msgstr "Lagre" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1374,19 +1379,19 @@ msgid "" "palette of your choice." msgstr "" -#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 -#: lib/designsettings.php:434 lib/designsettings.php:464 +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 #, fuzzy msgid "Couldn't update your design." msgstr "Klarte ikke å oppdatere bruker." -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings!" msgstr "" -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "" @@ -1689,7 +1694,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" msgstr "Send" @@ -1998,8 +2003,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." msgstr "" @@ -4444,11 +4449,7 @@ msgid "" "You can upload your personal background image. The maximum file size is 2MB." msgstr "" -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "" - -#: lib/designsettings.php:468 +#: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "" @@ -4910,7 +4911,7 @@ msgstr "" msgid "To" msgstr "" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 #, fuzzy msgid "Available characters" msgstr "6 eller flere tegn" @@ -4924,11 +4925,11 @@ msgstr "" msgid "What's up, %s?" msgstr "" -#: lib/noticeform.php:193 +#: lib/noticeform.php:192 msgid "Attach" msgstr "" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "" @@ -5204,7 +5205,12 @@ msgstr "" msgid "Not subscribed!" msgstr "Alle abonnementer" -#: lib/subs.php:140 +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "Klarte ikke å lagre avatar-informasjonen" + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "" diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index e9c4ef9e79..85f3cb655e 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-02 23:18+0000\n" -"PO-Revision-Date: 2009-12-02 23:20:26+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"PO-Revision-Date: 2009-12-05 19:54:52+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: out-statusnet\n" @@ -192,7 +192,12 @@ msgstr "Deze gebruiker heeft geen profiel." msgid "Could not save profile." msgstr "Het was niet mogelijk het profiel op te slaan." -#: actions/apiblockcreate.php:108 +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "U kunt het abonnement op uzelf niet opzeggen." + +#: actions/apiblockcreate.php:119 msgid "Block user failed." msgstr "Het blokkeren van de gebruiker is mislukt." @@ -839,45 +844,45 @@ msgstr "Ontwerp" msgid "Design settings for this StatusNet site." msgstr "Instellingen voor de vormgeving van deze StatusNet-website." -#: actions/designadminpanel.php:270 +#: actions/designadminpanel.php:275 msgid "Invalid logo URL." msgstr "De logo-URL is ongeldig." -#: actions/designadminpanel.php:274 +#: actions/designadminpanel.php:279 #, php-format msgid "Theme not available: %s" msgstr "De vormgeving is niet beschikbaar: %s" -#: actions/designadminpanel.php:370 +#: actions/designadminpanel.php:375 msgid "Change logo" msgstr "Logo wijzigen" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:380 msgid "Site logo" msgstr "Websitelogo" -#: actions/designadminpanel.php:382 +#: actions/designadminpanel.php:387 msgid "Change theme" msgstr "Vormgeving wijzigen" -#: actions/designadminpanel.php:399 +#: actions/designadminpanel.php:404 msgid "Site theme" msgstr "Vormgeving website" -#: actions/designadminpanel.php:400 +#: actions/designadminpanel.php:405 msgid "Theme for the site." msgstr "Mogelijke vormgevingen voor deze website." -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" msgstr "Achtergrondafbeelding wijzigen" -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" msgstr "Achtergrond" -#: actions/designadminpanel.php:422 +#: actions/designadminpanel.php:427 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" @@ -886,55 +891,55 @@ msgstr "" "Hier kunt u een achtergrondafbeelding voor de website uploaden. De maximale " "bestandsgrootte is %1$s." -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" msgstr "Aan" -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" msgstr "Uit" -#: actions/designadminpanel.php:469 lib/designsettings.php:156 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "Achtergrondafbeelding inschakelen of uitschakelen." -#: actions/designadminpanel.php:474 lib/designsettings.php:161 +#: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" msgstr "Achtergrondafbeelding naast elkaar" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 +#: actions/designadminpanel.php:488 lib/designsettings.php:170 msgid "Change colours" msgstr "Kleuren wijzigen" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 +#: actions/designadminpanel.php:510 lib/designsettings.php:191 msgid "Content" msgstr "Inhoud" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 +#: actions/designadminpanel.php:523 lib/designsettings.php:204 msgid "Sidebar" msgstr "Menubalk" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "Tekst" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 +#: actions/designadminpanel.php:549 lib/designsettings.php:230 msgid "Links" msgstr "Verwijzingen" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" msgstr "Standaardinstellingen gebruiken" -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" msgstr "Standaardontwerp toepassen" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" msgstr "Standaardinstellingen toepassen" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -944,7 +949,7 @@ msgstr "Standaardinstellingen toepassen" msgid "Save" msgstr "Opslaan" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "Ontwerp opslaan" @@ -1391,18 +1396,18 @@ msgstr "" "De vormgeving van uw groep aanpassen met een achtergrondafbeeldingen en een " "kleurenpalet van uw keuze." -#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 -#: lib/designsettings.php:434 lib/designsettings.php:464 +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 msgid "Couldn't update your design." msgstr "Het was niet mogelijk uw ontwerp bij te werken." -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings!" msgstr "Het was niet mogelijk om uw ontwerpinstellingen op te slaan!" -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "De ontwerpvoorkeuren zijn opgeslagen." @@ -1732,7 +1737,7 @@ msgstr "Persoonlijk bericht" msgid "Optionally add a personal message to the invitation." msgstr "Persoonlijk bericht bij de uitnodiging (optioneel)." -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" msgstr "Verzenden" @@ -2058,8 +2063,8 @@ msgstr "inhoudstype " msgid "Only " msgstr "Alleen " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." msgstr "Geen ondersteund gegevensformaat." @@ -2854,11 +2859,10 @@ msgid "Invalid profile URL (bad format)" msgstr "Ongeldige profiel-URL (foutieve opmaak)" #: actions/remotesubscribe.php:168 -#, fuzzy msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)." msgstr "" -"De URL voor het profiel is niet geldig (het is geen YADIS-document of er is " -"geen of ongeldige XRDS gedefinieerd)." +"De URL is niet geldig (het is geen YADIS-document of er een ongeldige XRDS " +"gedefinieerd)." #: actions/remotesubscribe.php:176 msgid "That’s a local profile! Login to subscribe." @@ -4523,7 +4527,6 @@ msgstr[0] "U bent lid van deze groep:" msgstr[1] "U bent lid van deze groepen:" #: lib/command.php:652 -#, fuzzy msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4579,7 +4582,6 @@ msgstr "" "reply # - antwoorden op de mededeling met het aangegeven ID\n" "reply - antwoorden op de laatste mededeling van gebruiker\n" "join - lid worden van groep\n" -"login - verwijzing opvragen naar de webpagina voor aanmelden\n" "drop - groepslidmaatschap opzeggen\n" "stats - uw statistieken opvragen\n" "stop - zelfde als 'off'\n" @@ -4642,11 +4644,7 @@ msgstr "" "U kunt een persoonlijke achtergrondafbeelding uploaden. De maximale " "bestandsgrootte is 2 megabyte." -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "Foutieve standaard kleurinstellingen: " - -#: lib/designsettings.php:468 +#: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "Het standaardontwerp is weer ingesteld." @@ -5187,7 +5185,7 @@ msgstr "Directe mededeling verzenden" msgid "To" msgstr "Aan" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 msgid "Available characters" msgstr "Beschikbare tekens" @@ -5200,11 +5198,11 @@ msgstr "Mededeling verzenden" msgid "What's up, %s?" msgstr "Hallo, %s." -#: lib/noticeform.php:193 +#: lib/noticeform.php:192 msgid "Attach" msgstr "Toevoegen" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "Bestand toevoegen" @@ -5472,7 +5470,12 @@ msgstr "Het was niet mogelijk om een ander op u te laten abonneren" msgid "Not subscribed!" msgstr "Niet geabonneerd!" -#: lib/subs.php:140 +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "Kon abonnement niet verwijderen." + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "Kon abonnement niet verwijderen." diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index fdae960a36..6ce0460ca3 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: 2009-12-02 23:18+0000\n" -"PO-Revision-Date: 2009-12-02 23:20:13+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"PO-Revision-Date: 2009-12-05 19:54:49+0000\n" "Language-Team: Norwegian Nynorsk\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nn\n" "X-Message-Group: out-statusnet\n" @@ -184,7 +184,12 @@ msgstr "Brukaren har inga profil." msgid "Could not save profile." msgstr "Kan ikkje lagra profil." -#: actions/apiblockcreate.php:108 +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "Kan ikkje oppdatera brukar." + +#: actions/apiblockcreate.php:119 msgid "Block user failed." msgstr "Blokkering av brukar feila." @@ -835,110 +840,110 @@ msgstr "" msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:270 +#: actions/designadminpanel.php:275 #, fuzzy msgid "Invalid logo URL." msgstr "Ugyldig storleik." -#: actions/designadminpanel.php:274 +#: actions/designadminpanel.php:279 #, fuzzy, php-format msgid "Theme not available: %s" msgstr "Denne sida er ikkje tilgjengleg i eit" -#: actions/designadminpanel.php:370 +#: actions/designadminpanel.php:375 #, fuzzy msgid "Change logo" msgstr "Endra passordet ditt" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:380 #, fuzzy msgid "Site logo" msgstr "Invitér" -#: actions/designadminpanel.php:382 +#: actions/designadminpanel.php:387 #, fuzzy msgid "Change theme" msgstr "Endra" -#: actions/designadminpanel.php:399 +#: actions/designadminpanel.php:404 #, fuzzy msgid "Site theme" msgstr "Statusmelding" -#: actions/designadminpanel.php:400 +#: actions/designadminpanel.php:405 #, fuzzy msgid "Theme for the site." msgstr "Logg ut or sida" -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" msgstr "" -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" msgstr "" -#: actions/designadminpanel.php:422 +#: actions/designadminpanel.php:427 #, fuzzy, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "Du kan lasta opp ein logo for gruppa." -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" msgstr "" -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:469 lib/designsettings.php:156 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:161 +#: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 +#: actions/designadminpanel.php:488 lib/designsettings.php:170 #, fuzzy msgid "Change colours" msgstr "Endra passordet ditt" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 +#: actions/designadminpanel.php:510 lib/designsettings.php:191 #, fuzzy msgid "Content" msgstr "Kopla til" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 +#: actions/designadminpanel.php:523 lib/designsettings.php:204 #, fuzzy msgid "Sidebar" msgstr "Søk" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "Tekst" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 +#: actions/designadminpanel.php:549 lib/designsettings.php:230 #, fuzzy msgid "Links" msgstr "Logg inn" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -948,7 +953,7 @@ msgstr "" msgid "Save" msgstr "Lagra" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1393,20 +1398,20 @@ msgid "" "palette of your choice." msgstr "" -#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 -#: lib/designsettings.php:434 lib/designsettings.php:464 +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 #, fuzzy msgid "Couldn't update your design." msgstr "Kan ikkje oppdatera brukar." -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 #, fuzzy msgid "Unable to save your design settings!" msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!" -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 #, fuzzy msgid "Design preferences saved." msgstr "Synkroniserings innstillingar blei lagra." @@ -1724,7 +1729,7 @@ msgstr "Personleg melding" msgid "Optionally add a personal message to the invitation." msgstr "Eventuelt legg til ei personleg melding til invitasjonen." -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" msgstr "Send" @@ -2045,8 +2050,8 @@ msgstr "Kopla til" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." msgstr "Ikkje eit støtta dataformat." @@ -4561,11 +4566,7 @@ msgid "" "You can upload your personal background image. The maximum file size is 2MB." msgstr "Du kan laste opp ein personleg avatar." -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "" - -#: lib/designsettings.php:468 +#: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "" @@ -5028,7 +5029,7 @@ msgstr "Send ei direkte melding" msgid "To" msgstr "Til" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 msgid "Available characters" msgstr "Tilgjenglege teikn" @@ -5041,11 +5042,11 @@ msgstr "Send ei melding" msgid "What's up, %s?" msgstr "Kva skjer, %s?" -#: lib/noticeform.php:193 +#: lib/noticeform.php:192 msgid "Attach" msgstr "" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "" @@ -5325,7 +5326,12 @@ msgstr "Kan ikkje tinga andre til deg." msgid "Not subscribed!" msgstr "Ikkje tinga." -#: lib/subs.php:140 +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "Kan ikkje sletta tinging." + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "Kan ikkje sletta tinging." diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index 62d92064cc..33013c7af8 100644 --- a/locale/pl/LC_MESSAGES/statusnet.po +++ b/locale/pl/LC_MESSAGES/statusnet.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-02 23:18+0000\n" -"PO-Revision-Date: 2009-12-02 23:20:31+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"PO-Revision-Date: 2009-12-05 19:54:56+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pl\n" "X-Message-Group: out-statusnet\n" @@ -194,7 +194,12 @@ msgstr "Użytkownik nie posiada profilu." msgid "Could not save profile." msgstr "Nie można zapisać profilu." -#: actions/apiblockcreate.php:108 +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "Nie można zrezygnować z obserwacji samego siebie." + +#: actions/apiblockcreate.php:119 msgid "Block user failed." msgstr "Zablokowanie użytkownika nie powiodło się." @@ -828,100 +833,100 @@ msgstr "Wygląd" msgid "Design settings for this StatusNet site." msgstr "Ustawienia wyglądu tej strony StatusNet." -#: actions/designadminpanel.php:270 +#: actions/designadminpanel.php:275 msgid "Invalid logo URL." msgstr "Nieprawidłowy adres URL logo." -#: actions/designadminpanel.php:274 +#: actions/designadminpanel.php:279 #, php-format msgid "Theme not available: %s" msgstr "Motyw nie jest dostępny: %s" -#: actions/designadminpanel.php:370 +#: actions/designadminpanel.php:375 msgid "Change logo" msgstr "Zmień logo" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:380 msgid "Site logo" msgstr "Logo strony" -#: actions/designadminpanel.php:382 +#: actions/designadminpanel.php:387 msgid "Change theme" msgstr "Zmień motyw" -#: actions/designadminpanel.php:399 +#: actions/designadminpanel.php:404 msgid "Site theme" msgstr "Motyw strony" -#: actions/designadminpanel.php:400 +#: actions/designadminpanel.php:405 msgid "Theme for the site." msgstr "Motyw strony." -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" msgstr "Zmień obraz tła" -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" msgstr "Tło" -#: actions/designadminpanel.php:422 +#: actions/designadminpanel.php:427 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "Można wysłać obraz tła dla strony. Maksymalny rozmiar pliku to %1$s." -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" msgstr "Włączone" -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" msgstr "Wyłączone" -#: actions/designadminpanel.php:469 lib/designsettings.php:156 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "Włącz lub wyłącz obraz tła." -#: actions/designadminpanel.php:474 lib/designsettings.php:161 +#: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" msgstr "Kafelkowy obraz tła" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 +#: actions/designadminpanel.php:488 lib/designsettings.php:170 msgid "Change colours" msgstr "Zmień kolory" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 +#: actions/designadminpanel.php:510 lib/designsettings.php:191 msgid "Content" msgstr "Zawartość" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 +#: actions/designadminpanel.php:523 lib/designsettings.php:204 msgid "Sidebar" msgstr "Panel boczny" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "Tekst" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 +#: actions/designadminpanel.php:549 lib/designsettings.php:230 msgid "Links" msgstr "Odnośniki" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" msgstr "Użycie domyślnych" -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" msgstr "Przywróć domyślny wygląd" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" msgstr "Przywróć domyślne ustawienia" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -931,7 +936,7 @@ msgstr "Przywróć domyślne ustawienia" msgid "Save" msgstr "Zapisz" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "Zapisz wygląd" @@ -1368,18 +1373,18 @@ msgid "" "palette of your choice." msgstr "Dostosuj wygląd grupy za pomocą wybranego obrazu tła i palety kolorów." -#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 -#: lib/designsettings.php:434 lib/designsettings.php:464 +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 msgid "Couldn't update your design." msgstr "Nie można zaktualizować wyglądu." -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings!" msgstr "Nie można zapisać ustawień wyglądu." -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "Zapisano preferencje wyglądu." @@ -1703,7 +1708,7 @@ msgstr "Osobista wiadomość" msgid "Optionally add a personal message to the invitation." msgstr "Opcjonalnie dodaj osobistą wiadomość do zaproszenia." -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" msgstr "Wyślij" @@ -2029,8 +2034,8 @@ msgstr "typ zawartości " msgid "Only " msgstr "Tylko " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." msgstr "To nie jest obsługiwany format danych." @@ -4581,11 +4586,7 @@ msgid "" "You can upload your personal background image. The maximum file size is 2MB." msgstr "Można wysłać osobisty obraz tła. Maksymalny rozmiar pliku to 2 MB." -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "Błędne domyślne ustawienia koloru: " - -#: lib/designsettings.php:468 +#: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "Przywrócono domyślny wygląd." @@ -5123,7 +5124,7 @@ msgstr "Wyślij bezpośredni wpis" msgid "To" msgstr "Do" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 msgid "Available characters" msgstr "Dostępne znaki" @@ -5136,11 +5137,11 @@ msgstr "Wyślij wpis" msgid "What's up, %s?" msgstr "Co słychać, %s?" -#: lib/noticeform.php:193 +#: lib/noticeform.php:192 msgid "Attach" msgstr "Załącz" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "Załącz plik" @@ -5407,7 +5408,12 @@ msgstr "Nie można subskrybować innych do ciebie." msgid "Not subscribed!" msgstr "Niesubskrybowane." -#: lib/subs.php:140 +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "Nie można usunąć subskrypcji." + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "Nie można usunąć subskrypcji." diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index c5b3c9515c..01d8c5f63c 100644 --- a/locale/pt/LC_MESSAGES/statusnet.po +++ b/locale/pt/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-02 23:18+0000\n" -"PO-Revision-Date: 2009-12-02 23:20:35+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"PO-Revision-Date: 2009-12-05 19:54:59+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt\n" "X-Message-Group: out-statusnet\n" @@ -96,8 +96,8 @@ msgid "" "You can try to [nudge %s](../%s) from his profile or [post something to his " "or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." msgstr "" -"Tente [acotovelar o(a) %s](../%s) a partir do perfil ou [publicar qualquer " -"coisa à sua atenção](%%%%action.newnotice%%%%?status_textarea=%s)." +"Tente [acotovelar %s](../%s) a partir do perfil ou [publicar qualquer coisa " +"à sua atenção](%%%%action.newnotice%%%%?status_textarea=%s)." #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 #, php-format @@ -105,8 +105,8 @@ msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " "post a notice to his or her attention." msgstr "" -"Podia [registar uma conta](%%%%action.register%%%%) e depois acotovelar o(a) " -"%s ou publicar uma nota à sua atenção." +"Podia [registar uma conta](%%%%action.register%%%%) e depois acotovelar %s " +"ou publicar uma nota à sua atenção." #: actions/all.php:165 msgid "You and friends" @@ -115,7 +115,7 @@ msgstr "Você e amigos" #: actions/allrss.php:119 actions/apitimelinefriends.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" -msgstr "Actualizações do(a) %1$s e amigos no %2$s!" +msgstr "Actualizações de %1$s e amigos no %2$s!" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 @@ -187,7 +187,12 @@ msgstr "Utilizador não tem perfil." msgid "Could not save profile." msgstr "Não foi possível gravar o perfil." -#: actions/apiblockcreate.php:108 +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "Não pode deixar de seguir-se a si próprio!" + +#: actions/apiblockcreate.php:119 msgid "Block user failed." msgstr "Bloqueio do utilizador falhou." @@ -216,7 +221,7 @@ msgstr "" #: actions/apidirectmessage.php:89 #, php-format msgid "Direct messages from %s" -msgstr "Mensagens directas do(a) %s" +msgstr "Mensagens directas de %s" #: actions/apidirectmessage.php:93 #, php-format @@ -396,7 +401,7 @@ msgstr "Não foi possível remover %s do grupo %s." #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" -msgstr "Grupos do(a) %s" +msgstr "Grupos de %s" #: actions/apigrouplistall.php:94 #, php-format @@ -549,7 +554,7 @@ msgstr "Original" #: actions/avatarsettings.php:141 actions/avatarsettings.php:214 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" -msgstr "Antever" +msgstr "Antevisão" #: actions/avatarsettings.php:148 lib/deleteuserform.php:66 #: lib/noticelist.php:550 @@ -822,45 +827,45 @@ msgstr "Design" msgid "Design settings for this StatusNet site." msgstr "Configurações do design deste site StatusNet." -#: actions/designadminpanel.php:270 +#: actions/designadminpanel.php:275 msgid "Invalid logo URL." msgstr "URL do logótipo inválida." -#: actions/designadminpanel.php:274 +#: actions/designadminpanel.php:279 #, php-format msgid "Theme not available: %s" msgstr "Tema não está disponível: %s" -#: actions/designadminpanel.php:370 +#: actions/designadminpanel.php:375 msgid "Change logo" msgstr "Alterar logótipo" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:380 msgid "Site logo" msgstr "Logótipo do site" -#: actions/designadminpanel.php:382 +#: actions/designadminpanel.php:387 msgid "Change theme" msgstr "Alterar tema" -#: actions/designadminpanel.php:399 +#: actions/designadminpanel.php:404 msgid "Site theme" msgstr "Tema do site" -#: actions/designadminpanel.php:400 +#: actions/designadminpanel.php:405 msgid "Theme for the site." msgstr "O tema para o site." -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" msgstr "Alterar imagem de fundo" -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" -msgstr "Imagem de fundo" +msgstr "Fundo" -#: actions/designadminpanel.php:422 +#: actions/designadminpanel.php:427 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" @@ -869,55 +874,55 @@ msgstr "" "Pode carregar uma imagem de fundo para o site. O tamanho máximo do ficheiro " "é %1$s." -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" -msgstr "" +msgstr "Ligar" -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" -msgstr "" +msgstr "Desligar" -#: actions/designadminpanel.php:469 lib/designsettings.php:156 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." -msgstr "" +msgstr "Ligar ou desligar a imagem de fundo." -#: actions/designadminpanel.php:474 lib/designsettings.php:161 +#: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" msgstr "Repetir imagem de fundo em mosaico" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 +#: actions/designadminpanel.php:488 lib/designsettings.php:170 msgid "Change colours" msgstr "Alterar cores" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 +#: actions/designadminpanel.php:510 lib/designsettings.php:191 msgid "Content" msgstr "Conteúdo" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 +#: actions/designadminpanel.php:523 lib/designsettings.php:204 msgid "Sidebar" -msgstr "Barra lateral" +msgstr "Lateral" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "Texto" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 +#: actions/designadminpanel.php:549 lib/designsettings.php:230 msgid "Links" msgstr "Ligações" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" msgstr "Usar predefinições" -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" msgstr "Repor designs predefinidos" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" msgstr "Repor predefinição" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -927,7 +932,7 @@ msgstr "Repor predefinição" msgid "Save" msgstr "Gravar" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "Gravar o design" @@ -1201,7 +1206,7 @@ msgstr "" #: lib/personalgroupnav.php:115 #, php-format msgid "%s's favorite notices" -msgstr "Notas favoritas do(a) %s" +msgstr "Notas favoritas de %s" #: actions/favoritesrss.php:115 #, php-format @@ -1369,18 +1374,18 @@ msgstr "" "Personalize o aspecto do seu grupo com uma imagem de fundo e uma paleta de " "cores à sua escolha." -#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 -#: lib/designsettings.php:434 lib/designsettings.php:464 +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 msgid "Couldn't update your design." msgstr "Não foi possível actualizar o design." -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings!" msgstr "Não foi possível actualizar as suas configurações do design!" -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "Preferências do design foram gravadas." @@ -1453,8 +1458,8 @@ msgid "" "Search for groups on %%site.name%% by their name, location, or description. " "Separate the terms by spaces; they must be 3 characters or more." msgstr "" -"Procure grupos em %%site.name%% pelo seu nome, localização ou descrição. " -"Separe os termos de busca com espaços; precisam de ter 3 ou mais caracteres." +"Procure grupos neste site pesquisando o nome, localização ou descrição. Os " +"termos de busca devem ter 3 ou mais caracteres e ser separados por espaços." #: actions/groupsearch.php:58 msgid "Group search" @@ -1631,7 +1636,8 @@ msgstr "Caixa de entrada de %s" #: actions/inbox.php:115 msgid "This is your inbox, which lists your incoming private messages." msgstr "" -"Esta é a sua caixa de entrada, que apresenta as mensagens privadas recebidas." +"Esta é a sua caixa de entrada, que apresenta as mensagens privadas que " +"recebeu." #: actions/invite.php:39 msgid "Invites have been disabled." @@ -1704,9 +1710,9 @@ msgstr "Mensagem pessoal" #: actions/invite.php:194 msgid "Optionally add a personal message to the invitation." -msgstr "Pode optar por acrescentar uma mensagem pessoal ao convite." +msgstr "Pode optar por acrescentar uma mensagem pessoal ao convite" -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" msgstr "Enviar" @@ -1958,8 +1964,8 @@ msgid "" "Search for notices on %%site.name%% by their contents. Separate search terms " "by spaces; they must be 3 characters or more." msgstr "" -"Procure notas em %%site.name%% pelo seu conteúdo. Separe os termos de busca " -"com espaços; precisam de ter 3 ou mais caracteres." +"Procure notas neste site pesquisando o seu conteúdo. Os termos de busca " +"devem ter 3 ou mais caracteres e ser separados por espaços." #: actions/noticesearch.php:78 msgid "Text search" @@ -2028,10 +2034,10 @@ msgstr "tipo de conteúdo " #: actions/oembed.php:160 msgid "Only " -msgstr "" +msgstr "Apenas " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." msgstr "Formato de dados não suportado." @@ -2061,15 +2067,15 @@ msgstr "Compactar URLs com" #: actions/othersettings.php:117 msgid "Automatic shortening service to use." -msgstr "Serviço de compactação automático a utilizar." +msgstr "Serviço de compactação automática que será usado" #: actions/othersettings.php:122 msgid "View profile designs" -msgstr "Ver designs de perfis" +msgstr "Ver o design dos perfis" #: actions/othersettings.php:123 msgid "Show or hide profile designs." -msgstr "Mostrar ou esconder designs de perfis" +msgstr "Mostrar ou esconder o design dos perfis" #: actions/othersettings.php:153 msgid "URL shortening service is too long (max 50 chars)." @@ -2088,7 +2094,7 @@ msgstr "Caixa de saída de %s" #: actions/outbox.php:116 msgid "This is your outbox, which lists private messages you have sent." msgstr "" -"Esta é a sua caixa de saída, que apresenta as mensagens privadas enviadas." +"Esta é a sua caixa de saída, que apresenta as mensagens privadas que enviou." #: actions/passwordsettings.php:58 msgid "Change password" @@ -2258,8 +2264,8 @@ msgid "" "Search for people on %%site.name%% by their name, location, or interests. " "Separate the terms by spaces; they must be 3 characters or more." msgstr "" -"Procure pessoas em %%site.name%% pelo seu nome, localidade ou interesses. " -"Separe os termos de busca com espaços; precisam de ter 3 ou mais caracteres." +"Procure pessoas neste site pesquisando o nome, localidade ou interesses. Os " +"termos de busca devem ter 3 ou mais caracteres e ser separados por espaços." #: actions/peoplesearch.php:58 msgid "People search" @@ -2316,7 +2322,8 @@ msgstr "Página de acolhimento" #: actions/profilesettings.php:117 actions/register.php:454 msgid "URL of your homepage, blog, or profile on another site" -msgstr "URL da uma página sua, blogue ou perfil noutro sítio na internet" +msgstr "" +"URL da sua página de acolhimento, blogue ou perfil noutro site na internet" #: actions/profilesettings.php:122 actions/register.php:460 #, php-format @@ -2708,7 +2715,7 @@ msgstr "Repita a palavra-chave acima. Obrigatório." #: actions/register.php:437 actions/register.php:441 #: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120 msgid "Email" -msgstr "Correio electrónico" +msgstr "Correio" #: actions/register.php:438 actions/register.php:442 msgid "Used only for updates, announcements, and password recovery" @@ -2753,7 +2760,8 @@ msgid "" "\n" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -"Parabéns, %s! Bem-vindo(a) ao %%%%site.name%%%%. A partir daqui, pode...\n" +"Parabéns, %s! Bem-vindo(a) ao site %%%%site.name%%%%. A partir daqui, " +"pode...\n" "\n" "* Visitar o [seu perfil](%s) e enviar a primeira mensagem.\n" "* Adicionar um [endereço Jabber/GTalk](%%%%action.imsettings%%%%) de forma a " @@ -2821,11 +2829,10 @@ msgid "Invalid profile URL (bad format)" msgstr "URL de perfil inválido (formato incorrecto)" #: actions/remotesubscribe.php:168 -#, fuzzy msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)." msgstr "" -"URL de perfil não é válida (nenhum documento Yadis ou nenhum XRDS inválido " -"definidos)." +"URL do perfil não é válida (não há um documento Yadis, ou foi definido um " +"XRDS inválido)." #: actions/remotesubscribe.php:176 msgid "That’s a local profile! Login to subscribe." @@ -3041,7 +3048,7 @@ msgid "" "their life and interests. [Join now](%%%%action.register%%%%) to become part " "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -"**%s** é um grupo de utilizadores em %%%%site.name%%%%, um serviço de " +"**%s** é um grupo de utilizadores no site %%%%site.name%%%%, um serviço de " "[microblogues](http://en.wikipedia.org/wiki/Micro-blogging) baseado na " "aplicação de Software Livre [StatusNet](http://status.net/). Os membros " "deste grupo partilham mensagens curtas acerca das suas vidas e interesses. " @@ -3056,7 +3063,7 @@ msgid "" "[StatusNet](http://status.net/) tool. Its members share short messages about " "their life and interests. " msgstr "" -"**%s** é um grupo de utilizadores em %%%%site.name%%%%, um serviço de " +"**%s** é um grupo de utilizadores no site %%%%site.name%%%%, um serviço de " "[microblogues](http://en.wikipedia.org/wiki/Micro-blogging) baseado na " "aplicação de Software Livre [StatusNet](http://status.net/). Os membros " "deste grupo partilham mensagens curtas acerca das suas vidas e interesses. " @@ -3152,7 +3159,7 @@ msgid "" "[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to " "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -"**%s** tem uma conta em %%%%site.name%%%%, um serviço de [microblogues]" +"**%s** tem uma conta no site %%%%site.name%%%%, um serviço de [microblogues]" "(http://en.wikipedia.org/wiki/Micro-blogging) baseado na aplicação de " "Software Livre [StatusNet](http://status.net/). [Registe-se agora](%%%%" "action.register%%%%) para seguir as notas de **%s** e de muitos mais! " @@ -3165,7 +3172,7 @@ msgid "" "wikipedia.org/wiki/Micro-blogging) service based on the Free Software " "[StatusNet](http://status.net/) tool. " msgstr "" -"**%s** tem uma conta em %%%%site.name%%%%, um serviço de [microblogues]" +"**%s** tem uma conta no site %%%%site.name%%%%, um serviço de [microblogues]" "(http://en.wikipedia.org/wiki/Micro-blogging) baseado na aplicação de " "Software Livre [StatusNet](http://status.net/). " @@ -3914,7 +3921,7 @@ msgstr "Tipo de imagem incorrecto para o avatar da URL ‘%s’." #: actions/userbyid.php:70 msgid "No id." -msgstr "" +msgstr "Nenhuma identificação." #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" @@ -4141,7 +4148,7 @@ msgstr "Ajudem-me!" #: lib/action.php:464 lib/searchaction.php:127 msgid "Search" -msgstr "Pesquisar" +msgstr "Pesquisa" #: lib/action.php:464 msgid "Search for people or text" @@ -4181,7 +4188,7 @@ msgstr "Privacidade" #: lib/action.php:737 msgid "Source" -msgstr "Fonte" +msgstr "Código" #: lib/action.php:739 msgid "Contact" @@ -4201,8 +4208,8 @@ msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." "broughtby%%](%%site.broughtbyurl%%). " msgstr "" -"**%%site.name%%*** é um serviço de microblogues disponibilizado por [%%site." -"broughtby%%](%%site.broughtbyurl%%)." +"**%%site.name%%** é um serviço de microblogues disponibilizado por [%%site." +"broughtby%%](%%site.broughtbyurl%%). " #: lib/action.php:774 #, php-format @@ -4226,7 +4233,7 @@ msgstr "Licença de conteúdos do site" #: lib/action.php:799 msgid "All " -msgstr "" +msgstr "Tudo " #: lib/action.php:804 msgid "license." @@ -4404,7 +4411,7 @@ msgstr "Introduza o nome do utilizador para subscrever" #: lib/command.php:502 #, php-format msgid "Subscribed to %s" -msgstr "Subscreveu o(a) %s" +msgstr "Subscreveu %s" #: lib/command.php:523 msgid "Specify the name of the user to unsubscribe from" @@ -4413,7 +4420,7 @@ msgstr "Introduza o nome do utilizador para deixar de subscrever" #: lib/command.php:530 #, php-format msgid "Unsubscribed from %s" -msgstr "Deixou de subscrever o(a) %s" +msgstr "Deixou de subscrever %s" #: lib/command.php:548 lib/command.php:571 msgid "Command not yet implemented." @@ -4466,7 +4473,6 @@ msgstr[0] "Está no grupo:" msgstr[1] "Está nos grupos:" #: lib/command.php:652 -#, fuzzy msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4520,7 +4526,6 @@ msgstr "" "reply # - responder à nota com esta identificação\n" "reply - responder à última nota do utilizador\n" "join - juntar-se ao grupo\n" -"login - Receber uma ligação para iniciar sessão na interface web\n" "drop - afastar-se do grupo\n" "stats - receber as suas estatísticas\n" "stop - o mesmo que 'off'\n" @@ -4582,11 +4587,7 @@ msgstr "" "Pode carregar uma imagem de fundo pessoal. O tamanho máximo do ficheiro é " "2MB." -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "Configurações inadequadas das cores por omissão: " - -#: lib/designsettings.php:468 +#: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "Predefinições do design repostas" @@ -5124,7 +5125,7 @@ msgstr "Enviar uma nota directa" msgid "To" msgstr "Para" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 msgid "Available characters" msgstr "Caracteres disponíveis" @@ -5137,11 +5138,11 @@ msgstr "Enviar uma nota" msgid "What's up, %s?" msgstr "Novidades, %s?" -#: lib/noticeform.php:193 +#: lib/noticeform.php:192 msgid "Attach" msgstr "Anexar" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "Anexar um ficheiro" @@ -5408,7 +5409,12 @@ msgstr "Não foi possível que outro o subscrevesse." msgid "Not subscribed!" msgstr "Não subscrito!" -#: lib/subs.php:140 +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "Não foi possível apagar a subscrição." + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "Não foi possível apagar a subscrição." diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index 31068710e5..71e51e35b0 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-02 23:18+0000\n" -"PO-Revision-Date: 2009-12-02 23:20:38+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"PO-Revision-Date: 2009-12-05 19:55:02+0000\n" "Language-Team: Brazilian Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt-br\n" "X-Message-Group: out-statusnet\n" @@ -184,7 +184,12 @@ msgstr "O usuário não tem perfil." msgid "Could not save profile." msgstr "Não foi possível salvar o perfil." -#: actions/apiblockcreate.php:108 +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "Não foi possível atualizar o usuário." + +#: actions/apiblockcreate.php:119 msgid "Block user failed." msgstr "Não foi possível bloquear o usuário." @@ -254,16 +259,14 @@ msgid "No status found with that ID." msgstr "Não foi encontrado nenhum status com esse ID." #: actions/apifavoritecreate.php:119 -#, fuzzy msgid "This status is already a favorite!" -msgstr "Essa mensagem já é uma favorita!" +msgstr "Esta mensagem já é favorita!" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 msgid "Could not create favorite." msgstr "Não foi possível criar a favorita." #: actions/apifavoritedestroy.php:122 -#, fuzzy msgid "That status is not a favorite!" msgstr "Essa mensagem não é uma favorita!" @@ -833,51 +836,51 @@ msgstr "" msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:270 +#: actions/designadminpanel.php:275 #, fuzzy msgid "Invalid logo URL." msgstr "Tamanho inválido." -#: actions/designadminpanel.php:274 +#: actions/designadminpanel.php:279 #, fuzzy, php-format msgid "Theme not available: %s" msgstr "Esta página não está disponível em um " -#: actions/designadminpanel.php:370 +#: actions/designadminpanel.php:375 #, fuzzy msgid "Change logo" msgstr "Altere a sua senha" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:380 #, fuzzy msgid "Site logo" msgstr "Convidar" -#: actions/designadminpanel.php:382 +#: actions/designadminpanel.php:387 #, fuzzy msgid "Change theme" msgstr "Alterar" -#: actions/designadminpanel.php:399 +#: actions/designadminpanel.php:404 #, fuzzy msgid "Site theme" msgstr "Nova mensagem" -#: actions/designadminpanel.php:400 +#: actions/designadminpanel.php:405 #, fuzzy msgid "Theme for the site." msgstr "Sair deste site" -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" msgstr "Alterar imagem de plano de fundo." -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" msgstr "" -#: actions/designadminpanel.php:422 +#: actions/designadminpanel.php:427 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" @@ -886,58 +889,58 @@ msgstr "" "Você pode enviar uma imagem de plano de fundo para o site. O tamanho máximo " "do arquivo é %l$s" -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" msgstr "Ligado" -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:469 lib/designsettings.php:156 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:161 +#: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 +#: actions/designadminpanel.php:488 lib/designsettings.php:170 #, fuzzy msgid "Change colours" msgstr "Altere a sua senha" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 +#: actions/designadminpanel.php:510 lib/designsettings.php:191 msgid "Content" msgstr "Conteúdo" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 +#: actions/designadminpanel.php:523 lib/designsettings.php:204 #, fuzzy msgid "Sidebar" msgstr "Procurar" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "Texto" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 +#: actions/designadminpanel.php:549 lib/designsettings.php:230 #, fuzzy msgid "Links" msgstr "Lista" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" msgstr "Usar o padrão." -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -947,7 +950,7 @@ msgstr "" msgid "Save" msgstr "Salvar" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1395,20 +1398,20 @@ msgid "" "palette of your choice." msgstr "" -#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 -#: lib/designsettings.php:434 lib/designsettings.php:464 +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 #, fuzzy msgid "Couldn't update your design." msgstr "Não foi possível atualizar o usuário." -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 #, fuzzy msgid "Unable to save your design settings!" msgstr "Não foi possível salvar suas configurações do Twitter!" -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 #, fuzzy msgid "Design preferences saved." msgstr "As preferências de sincronização foram salvas." @@ -1734,7 +1737,7 @@ msgstr "Mensagem pessoal" msgid "Optionally add a personal message to the invitation." msgstr "Você pode, opcionalmente, adicionar uma mensagem pessoal ao convite." -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" msgstr "Enviar" @@ -2069,8 +2072,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." msgstr "Formato de dados não suportado." @@ -4611,11 +4614,7 @@ msgid "" "You can upload your personal background image. The maximum file size is 2MB." msgstr "Você pode enviar seu avatar pessoal. O tamanho máximo do arquivo é %s" -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "" - -#: lib/designsettings.php:468 +#: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "" @@ -5080,7 +5079,7 @@ msgstr "Enviar uma mensagem direta" msgid "To" msgstr "Para" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 msgid "Available characters" msgstr "Caracteres disponíveis" @@ -5093,11 +5092,11 @@ msgstr "Enviar uma mensagem" msgid "What's up, %s?" msgstr "E aí, %s?" -#: lib/noticeform.php:193 +#: lib/noticeform.php:192 msgid "Attach" msgstr "" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "" @@ -5378,7 +5377,12 @@ msgstr "Não foi possível fazer com que o outros o sigam." msgid "Not subscribed!" msgstr "Não é seguido!" -#: lib/subs.php:140 +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "Não foi possível excluir a assinatura." + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "Não foi possível excluir a assinatura." diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index 25e8d8e7cb..9fe47e65d4 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-02 23:18+0000\n" -"PO-Revision-Date: 2009-12-02 23:20:42+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"PO-Revision-Date: 2009-12-05 19:55:05+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ru\n" "X-Message-Group: out-statusnet\n" @@ -190,7 +190,12 @@ msgstr "У пользователя нет профиля." msgid "Could not save profile." msgstr "Не удаётся сохранить профиль." -#: actions/apiblockcreate.php:108 +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "Вы не можете перестать следовать за собой!" + +#: actions/apiblockcreate.php:119 msgid "Block user failed." msgstr "Неудача при блокировке пользователя." @@ -829,45 +834,45 @@ msgstr "Оформление" msgid "Design settings for this StatusNet site." msgstr "Настройки оформления для этого сайта StatusNet." -#: actions/designadminpanel.php:270 +#: actions/designadminpanel.php:275 msgid "Invalid logo URL." msgstr "Неверный URL логотипа." -#: actions/designadminpanel.php:274 +#: actions/designadminpanel.php:279 #, php-format msgid "Theme not available: %s" msgstr "Тема не доступна: %s" -#: actions/designadminpanel.php:370 +#: actions/designadminpanel.php:375 msgid "Change logo" msgstr "Изменить логотип" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:380 msgid "Site logo" msgstr "Логотип сайта" -#: actions/designadminpanel.php:382 +#: actions/designadminpanel.php:387 msgid "Change theme" msgstr "Изменить тему" -#: actions/designadminpanel.php:399 +#: actions/designadminpanel.php:404 msgid "Site theme" msgstr "Тема сайта" -#: actions/designadminpanel.php:400 +#: actions/designadminpanel.php:405 msgid "Theme for the site." msgstr "Тема для сайта." -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" msgstr "Изменение фонового изображения" -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" msgstr "Фон" -#: actions/designadminpanel.php:422 +#: actions/designadminpanel.php:427 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" @@ -876,55 +881,55 @@ msgstr "" "Вы можете загрузить фоновое изображение для сайта. Максимальный размер файла " "составляет %1$s." -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" msgstr "Включить" -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" msgstr "Отключить" -#: actions/designadminpanel.php:469 lib/designsettings.php:156 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "Включить или отключить показ фонового изображения." -#: actions/designadminpanel.php:474 lib/designsettings.php:161 +#: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" msgstr "Растянуть фоновое изображение" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 +#: actions/designadminpanel.php:488 lib/designsettings.php:170 msgid "Change colours" msgstr "Изменение цветовой гаммы" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 +#: actions/designadminpanel.php:510 lib/designsettings.php:191 msgid "Content" msgstr "Содержание" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 +#: actions/designadminpanel.php:523 lib/designsettings.php:204 msgid "Sidebar" msgstr "Боковая панель" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "Текст" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 +#: actions/designadminpanel.php:549 lib/designsettings.php:230 msgid "Links" msgstr "Ссылки" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" msgstr "Использовать значения по умолчанию" -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" msgstr "Восстановить оформление по умолчанию" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" msgstr "Восстановить значения по умолчанию" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -934,7 +939,7 @@ msgstr "Восстановить значения по умолчанию" msgid "Save" msgstr "Сохранить" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "Сохранить оформление" @@ -1381,18 +1386,18 @@ msgstr "" "Настройте внешний вид группы, установив фоновое изображение и цветовую гамму " "на ваш выбор." -#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 -#: lib/designsettings.php:434 lib/designsettings.php:464 +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 msgid "Couldn't update your design." msgstr "Не удаётся обновить ваше оформление." -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings!" msgstr "Не удаётся сохранить ваши настройки оформления!" -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "Настройки оформления сохранены." @@ -1719,7 +1724,7 @@ msgstr "Личное сообщение" msgid "Optionally add a personal message to the invitation." msgstr "Можно добавить к приглашению личное сообщение." -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" msgstr "ОК" @@ -2043,8 +2048,8 @@ msgstr "тип содержимого " msgid "Only " msgstr "Только " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." msgstr "Неподдерживаемый формат данных." @@ -2830,11 +2835,8 @@ msgid "Invalid profile URL (bad format)" msgstr "Неверный URL профиля (плохой формат)" #: actions/remotesubscribe.php:168 -#, fuzzy msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)." -msgstr "" -"Неверный URL профиля (не YADIS-документ либо не указан или указан неверный " -"XRDS)." +msgstr "Неправильный URL-профиль (нет YADIS-документа, либо неверный XRDS)." #: actions/remotesubscribe.php:176 msgid "That’s a local profile! Login to subscribe." @@ -4484,7 +4486,6 @@ msgstr[1] "Вы являетесь участником следующих гр msgstr[2] "Вы являетесь участником следующих групп:" #: lib/command.php:652 -#, fuzzy msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4538,7 +4539,6 @@ msgstr "" "reply # — ответить на запись с заданным id\n" "reply — ответить на последнюю запись пользователя\n" "join — присоединиться к группе\n" -"login — получить ссылку на вход в веб-интерфейс\n" "drop — покинуть группу\n" "stats — получить свою статистику\n" "stop — то же, что и 'off'\n" @@ -4600,11 +4600,7 @@ msgstr "" "Вы можете загрузить собственное фоновое изображение. Максимальный размер " "файла составляет 2МБ." -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "Плохие настройки цвета по умолчанию: " - -#: lib/designsettings.php:468 +#: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "Оформление по умолчанию восстановлено." @@ -5141,7 +5137,7 @@ msgstr "Послать прямую запись" msgid "To" msgstr "Для" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 msgid "Available characters" msgstr "6 или больше знаков" @@ -5154,11 +5150,11 @@ msgstr "Послать запись" msgid "What's up, %s?" msgstr "Что нового, %s?" -#: lib/noticeform.php:193 +#: lib/noticeform.php:192 msgid "Attach" msgstr "Прикрепить" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "Прикрепить файл" @@ -5425,7 +5421,12 @@ msgstr "Не удаётся подписать других на вашу лен msgid "Not subscribed!" msgstr "Не подписаны!" -#: lib/subs.php:140 +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "Не удаётся удалить подписку." + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "Не удаётся удалить подписку." diff --git a/locale/statusnet.po b/locale/statusnet.po index 0ab702ae5a..ea65870d57 100644 --- a/locale/statusnet.po +++ b/locale/statusnet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-02 23:18+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -176,7 +176,11 @@ msgstr "" msgid "Could not save profile." msgstr "" -#: actions/apiblockcreate.php:108 +#: actions/apiblockcreate.php:105 +msgid "You cannot block yourself!" +msgstr "" + +#: actions/apiblockcreate.php:119 msgid "Block user failed." msgstr "" @@ -800,100 +804,100 @@ msgstr "" msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:270 +#: actions/designadminpanel.php:275 msgid "Invalid logo URL." msgstr "" -#: actions/designadminpanel.php:274 +#: actions/designadminpanel.php:279 #, php-format msgid "Theme not available: %s" msgstr "" -#: actions/designadminpanel.php:370 +#: actions/designadminpanel.php:375 msgid "Change logo" msgstr "" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:380 msgid "Site logo" msgstr "" -#: actions/designadminpanel.php:382 +#: actions/designadminpanel.php:387 msgid "Change theme" msgstr "" -#: actions/designadminpanel.php:399 +#: actions/designadminpanel.php:404 msgid "Site theme" msgstr "" -#: actions/designadminpanel.php:400 +#: actions/designadminpanel.php:405 msgid "Theme for the site." msgstr "" -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" msgstr "" -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" msgstr "" -#: actions/designadminpanel.php:422 +#: actions/designadminpanel.php:427 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "" -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" msgstr "" -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:469 lib/designsettings.php:156 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:161 +#: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 +#: actions/designadminpanel.php:488 lib/designsettings.php:170 msgid "Change colours" msgstr "" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 +#: actions/designadminpanel.php:510 lib/designsettings.php:191 msgid "Content" msgstr "" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 +#: actions/designadminpanel.php:523 lib/designsettings.php:204 msgid "Sidebar" msgstr "" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 +#: actions/designadminpanel.php:549 lib/designsettings.php:230 msgid "Links" msgstr "" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -903,7 +907,7 @@ msgstr "" msgid "Save" msgstr "" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1325,18 +1329,18 @@ msgid "" "palette of your choice." msgstr "" -#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 -#: lib/designsettings.php:434 lib/designsettings.php:464 +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 msgid "Couldn't update your design." msgstr "" -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings!" msgstr "" -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "" @@ -1632,7 +1636,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" msgstr "" @@ -1917,8 +1921,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." msgstr "" @@ -4285,11 +4289,7 @@ msgid "" "You can upload your personal background image. The maximum file size is 2MB." msgstr "" -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "" - -#: lib/designsettings.php:468 +#: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "" @@ -4733,7 +4733,7 @@ msgstr "" msgid "To" msgstr "" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 msgid "Available characters" msgstr "" @@ -4746,11 +4746,11 @@ msgstr "" msgid "What's up, %s?" msgstr "" -#: lib/noticeform.php:193 +#: lib/noticeform.php:192 msgid "Attach" msgstr "" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "" @@ -5017,7 +5017,11 @@ msgstr "" msgid "Not subscribed!" msgstr "" -#: lib/subs.php:140 +#: lib/subs.php:133 +msgid "Couldn't delete self-subscription." +msgstr "" + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "" diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index 8421ccdb03..a059ce87b5 100644 --- a/locale/sv/LC_MESSAGES/statusnet.po +++ b/locale/sv/LC_MESSAGES/statusnet.po @@ -1,5 +1,6 @@ # Translation of StatusNet to Swedish # +# Author@translatewiki.net: Jamminjohn # Author@translatewiki.net: McDutchie # -- # This file is distributed under the same license as the StatusNet package. @@ -8,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-02 23:18+0000\n" -"PO-Revision-Date: 2009-12-02 23:20:46+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"PO-Revision-Date: 2009-12-05 19:55:08+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: sv\n" "X-Message-Group: out-statusnet\n" @@ -21,9 +22,8 @@ msgstr "" #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 -#, fuzzy msgid "No such page" -msgstr "Inget sådant meddelande." +msgstr "Ingen sådan sida" #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 @@ -48,39 +48,39 @@ msgstr "Inget sådant meddelande." #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." -msgstr "Ingen sådan användare" +msgstr "Ingen sådan användare." #: actions/all.php:84 -#, fuzzy, php-format +#, php-format msgid "%s and friends, page %d" -msgstr "%s med vänner" +msgstr "%s och vänner, sida %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" -msgstr "%s med vänner" +msgstr "%s och vänner" #: actions/all.php:99 -#, fuzzy, php-format +#, php-format msgid "Feed for friends of %s (RSS 1.0)" -msgstr "Flöden för $s vänner" +msgstr "Flöden för %ss vänner (RSS 1.0)" #: actions/all.php:107 -#, fuzzy, php-format +#, php-format msgid "Feed for friends of %s (RSS 2.0)" -msgstr "Flöden för $s vänner" +msgstr "Flöden för %ss vänner (RSS 2.0)" #: actions/all.php:115 -#, fuzzy, php-format +#, php-format msgid "Feed for friends of %s (Atom)" -msgstr "Flöden för $s vänner" +msgstr "Flöden för %ss vänner (Atom)" #: actions/all.php:127 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." -msgstr "" +msgstr "Detta är tidslinjen för %s och vänner men ingen har postat något än." #: actions/all.php:132 #, php-format @@ -88,6 +88,8 @@ msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " "something yourself." msgstr "" +"Prova att prenumerera på fler personer, [gå med i en grupp](%%action.groups%" +"%) eller posta något själv." #: actions/all.php:134 #, php-format @@ -95,6 +97,9 @@ msgid "" "You can try to [nudge %s](../%s) from his profile or [post something to his " "or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." msgstr "" +"Du kan prova att [knuffa %s](../%s) från dennes profil eller [posta " +"någonting för hans eller hennes uppmärksamhet](%%%%action.newnotice%%%%?" +"status_textarea=%s)." #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 #, php-format @@ -102,11 +107,12 @@ msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " "post a notice to his or her attention." msgstr "" +"Varför inte [registrera ett konto](%%%%action.register%%%%) och sedan knuffa " +"%s eller posta en notis för hans eller hennes uppmärksamhet." #: actions/all.php:165 -#, fuzzy msgid "You and friends" -msgstr "%s med vänner" +msgstr "Du och vänner" #: actions/allrss.php:119 actions/apitimelinefriends.php:121 #, php-format @@ -118,9 +124,8 @@ msgstr "Uppdateringar från %1$s och vänner på %2$s!" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountupdateprofile.php:97 -#, fuzzy msgid "API method not found." -msgstr "API-metoden hittades inte!" +msgstr "API-metoden hittades inte" #: actions/apiaccountupdatedeliverydevice.php:85 #: actions/apiaccountupdateprofilebackgroundimage.php:86 @@ -139,10 +144,9 @@ msgstr "Denna metod kräver en POST." msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " "none" -msgstr "" +msgstr "Du måste ange ett värdet på parametern 'device': sms, im, none" #: actions/apiaccountupdatedeliverydevice.php:132 -#, fuzzy msgid "Could not update user." msgstr "Kunde inte uppdatera användare." @@ -156,20 +160,20 @@ msgid "" "The server was unable to handle that much POST data (%s bytes) due to its " "current configuration." msgstr "" +"Servern kunde inte hantera så mycket POST-data (%s byte) på grund av sin " +"nuvarande konfiguration." #: actions/apiaccountupdateprofilebackgroundimage.php:136 #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 -#, fuzzy msgid "Unable to save your design settings." -msgstr "Kunde inte spara dina Twitter inställningar!" +msgstr "Kunde inte spara dina utseendeinställningar." #: actions/apiaccountupdateprofilebackgroundimage.php:187 #: actions/apiaccountupdateprofilecolors.php:142 -#, fuzzy msgid "Could not update your design." -msgstr "Kunde inte uppdatera användare." +msgstr "Kunde inte uppdatera din profils utseende." #: actions/apiaccountupdateprofilebackgroundimage.php:194 #: actions/apiaccountupdateprofilecolors.php:185 @@ -181,45 +185,48 @@ msgid "User has no profile." msgstr "Användaren har ingen profil." #: actions/apiaccountupdateprofile.php:147 -#, fuzzy msgid "Could not save profile." msgstr "Kunde inte spara profil." -#: actions/apiblockcreate.php:108 +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "Du kan inte sluta följa dig själv!" + +#: actions/apiblockcreate.php:119 msgid "Block user failed." -msgstr "" +msgstr "Blockering av användare misslyckades." #: actions/apiblockdestroy.php:107 msgid "Unblock user failed." -msgstr "" +msgstr "Hävning av blockering av användare misslyckades." #: actions/apidirectmessagenew.php:126 msgid "No message text!" -msgstr "Ingen meddelande text!" +msgstr "Ingen meddelandetext!" #: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, fuzzy, php-format +#, php-format msgid "That's too long. Max message size is %d chars." -msgstr "Det är för långt. Max är 140 tecken. " +msgstr "Detta är för långt. Maximal meddelandestorlek är %d tecken." #: actions/apidirectmessagenew.php:146 msgid "Recipient user not found." -msgstr "Mottagaren kunde inte hittas." +msgstr "Mottagare hittades inte." #: actions/apidirectmessagenew.php:150 msgid "Can't send direct messages to users who aren't your friend." -msgstr "" -"Kan inte skicka direktmeddelanden till användare som inte är dina vänner." +msgstr "Kan inte skicka direktmeddelanden till användare som inte är din vän." #: actions/apidirectmessage.php:89 -#, fuzzy, php-format +#, php-format msgid "Direct messages from %s" -msgstr "Direktmeddelande till %s" +msgstr "Direktmeddelande från %s" #: actions/apidirectmessage.php:93 #, php-format msgid "All the direct messages sent from %s" -msgstr "Alla direktmeddelanden skickade ifrån %s" +msgstr "Alla direktmeddelanden skickade från %s" #: actions/apidirectmessage.php:101 #, php-format @@ -251,57 +258,52 @@ msgstr "API-metoden hittades inte!" #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." -msgstr "Ingen status hittad med det ID" +msgstr "Ingen status hittad med det ID:t." #: actions/apifavoritecreate.php:119 -#, fuzzy msgid "This status is already a favorite!" -msgstr "Detta inlägg är redan en favorit!" +msgstr "Denna status är redan en favorit!" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 msgid "Could not create favorite." msgstr "Kunde inte skapa favorit." #: actions/apifavoritedestroy.php:122 -#, fuzzy msgid "That status is not a favorite!" -msgstr "Det inlägget är ingen favorit!" +msgstr "Denna status är inte en favorit!" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 msgid "Could not delete favorite." -msgstr "Kunde inte tabort favoriten." +msgstr "Kunde inte ta bort favoriten." #: actions/apifriendshipscreate.php:109 msgid "Could not follow user: User not found." -msgstr "Kunde inte följa användaren: Användaren kunde inte hittas." +msgstr "Kunde inte följa användare: användare hittades inte." #: actions/apifriendshipscreate.php:118 #, php-format msgid "Could not follow user: %s is already on your list." -msgstr "Kunde inte följa användaren: %s finns redan i din lista." +msgstr "Kunde inte följa användare: %s finns redan i din lista." #: actions/apifriendshipsdestroy.php:109 -#, fuzzy msgid "Could not unfollow user: User not found." -msgstr "Kunde inte följa användaren: Användaren kunde inte hittas." +msgstr "Kunde inte sluta följa användaren: användaren hittades inte." #: actions/apifriendshipsdestroy.php:120 msgid "You cannot unfollow yourself!" -msgstr "" +msgstr "Du kan inte sluta följa dig själv!" #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." -msgstr "Två användarid eller namn måste läggas till." +msgstr "Två användar-ID:n eller screen_names måste tillhandahållas." #: actions/apifriendshipsshow.php:135 -#, fuzzy msgid "Could not determine source user." -msgstr "Kunde inte ta emot favoritinläggen." +msgstr "" #: actions/apifriendshipsshow.php:143 -#, fuzzy msgid "Could not find target user." -msgstr "Kunde inte få fram status." +msgstr "" #: actions/apigroupcreate.php:164 actions/editgroup.php:182 #: actions/newgroup.php:126 actions/profilesettings.php:208 @@ -314,133 +316,129 @@ msgstr "" #: actions/newgroup.php:130 actions/profilesettings.php:231 #: actions/register.php:208 msgid "Nickname already in use. Try another one." -msgstr "Användarnamnet används redan, försök med ett annat." +msgstr "Smeknamnet används redan. Försök med ett annat." #: actions/apigroupcreate.php:180 actions/editgroup.php:189 #: actions/newgroup.php:133 actions/profilesettings.php:211 #: actions/register.php:210 msgid "Not a valid nickname." -msgstr "Det är inget giltigt användarnamn." +msgstr "Inte ett giltigt smeknamn." #: actions/apigroupcreate.php:196 actions/editgroup.php:195 #: actions/newgroup.php:139 actions/profilesettings.php:215 #: actions/register.php:217 msgid "Homepage is not a valid URL." -msgstr "Hemsidan har ingen giltig URL" +msgstr "Hemsida är inte en giltig URL." #: actions/apigroupcreate.php:205 actions/editgroup.php:198 #: actions/newgroup.php:142 actions/profilesettings.php:218 #: actions/register.php:220 msgid "Full name is too long (max 255 chars)." -msgstr "Ditt namn är för långt (max 255 tecken)." +msgstr "Fullständigt namn är för långt (max 255 tecken)." #: actions/apigroupcreate.php:213 -#, fuzzy, php-format +#, php-format msgid "Description is too long (max %d chars)." -msgstr "Biografin är för lång (max 140 tecken)" +msgstr "Beskrivning är för lång (max 140 tecken)" #: actions/apigroupcreate.php:224 actions/editgroup.php:204 #: actions/newgroup.php:148 actions/profilesettings.php:225 #: actions/register.php:227 msgid "Location is too long (max 255 chars)." -msgstr "Platse är för lång (max 255 tecken)." +msgstr "Beskrivning av plats är för lång (max 255 tecken)." #: actions/apigroupcreate.php:243 actions/editgroup.php:215 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." -msgstr "" +msgstr "För många alias! Maximum %d." #: actions/apigroupcreate.php:264 actions/editgroup.php:224 #: actions/newgroup.php:168 -#, fuzzy, php-format +#, php-format msgid "Invalid alias: \"%s\"" -msgstr "Ogiltig hemsideadress '%s'" +msgstr "Ogiltigt alias: \"%s\"" #: actions/apigroupcreate.php:273 actions/editgroup.php:228 #: actions/newgroup.php:172 -#, fuzzy, php-format +#, php-format msgid "Alias \"%s\" already in use. Try another one." -msgstr "Användarnamnet används redan, försök med ett annat." +msgstr "Alias \"%s\" används redan. Försök med ett annat." #: actions/apigroupcreate.php:286 actions/editgroup.php:234 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." -msgstr "" +msgstr "Alias kan inte vara samma som smeknamn." #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91 -#, fuzzy msgid "Group not found!" -msgstr "API-metoden hittades inte!" +msgstr "Grupp hittades inte!" #: actions/apigroupjoin.php:110 -#, fuzzy msgid "You are already a member of that group." -msgstr "Du prenumererar redan på dessa användare:" +msgstr "Du är redan en medlem i denna grupp." #: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221 msgid "You have been blocked from that group by the admin." -msgstr "" +msgstr "Du har blivit blockerad från denna grupp av administratören. " #: actions/apigroupjoin.php:138 -#, fuzzy, php-format +#, php-format msgid "Could not join user %s to group %s." -msgstr "Kunde inte följa användaren: Användaren kunde inte hittas." +msgstr "Kunde inte ansluta användare % till grupp %s." #: actions/apigroupleave.php:114 -#, fuzzy msgid "You are not a member of this group." -msgstr "Du skickade inte oss den profilen" +msgstr "Du är inte en medlem i denna grupp." #: actions/apigroupleave.php:124 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %s to group %s." -msgstr "Kunde inte följa användaren: Användaren kunde inte hittas." +msgstr "Kunde inte ta bort användare %s från grupp %s." #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" -msgstr "" +msgstr "%s grupper" #: actions/apigrouplistall.php:94 -#, fuzzy, php-format +#, php-format msgid "groups on %s" -msgstr "Sök personer på denna sida" +msgstr "grupper på %s" #: actions/apigrouplist.php:95 -#, fuzzy, php-format +#, php-format msgid "%s's groups" -msgstr "%s / Favoriter från %s" +msgstr "%ss grupper" #: actions/apigrouplist.php:103 -#, fuzzy, php-format +#, php-format msgid "Groups %s is a member of on %s." -msgstr "Du skickade inte oss den profilen" +msgstr "Grupper %s är en medlem i på %s." #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." -msgstr "Denna metod kräver antingen skicka eller tabort." +msgstr "Denna metod kräver en POST eller en DELETE." #: actions/apistatusesdestroy.php:130 msgid "You may not delete another user's status." -msgstr "Du kan inte tabort nån annan användares status." +msgstr "Du kan inte ta bort en annan användares status." #: actions/apistatusesshow.php:138 -#, fuzzy msgid "Status deleted." -msgstr "Användarbilden uppdaterad." +msgstr "Status borttagen." #: actions/apistatusesshow.php:144 msgid "No status with that ID found." -msgstr "Ingen status med det ID hittades." +msgstr "Ingen status med det ID:t hittades." #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 -#, fuzzy, php-format +#, php-format msgid "That's too long. Max notice size is %d chars." -msgstr "För långt. Maximalt 140 tecken" +msgstr "Det är för långt. Maximal notisstorlek är %d tecken." #: actions/apistatusesupdate.php:198 msgid "Not found" @@ -449,12 +447,11 @@ msgstr "Hittades inte" #: actions/apistatusesupdate.php:227 actions/newnotice.php:183 #, php-format msgid "Max notice size is %d chars, including attachment URL." -msgstr "" +msgstr "Maximal notisstorlek är %d tecken, inklusive bilage-URL." #: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261 -#, fuzzy msgid "Unsupported format." -msgstr "Bildfilens format stödjs inte." +msgstr "Format som inte stödjs." #: actions/apitimelinefavorites.php:107 #, php-format @@ -464,7 +461,7 @@ msgstr "%s / Favoriter från %s" #: actions/apitimelinefavorites.php:119 #, php-format msgid "%s updates favorited by %s / %s." -msgstr "%s uppdaterade favoriter av %s / %s." +msgstr "%s uppdateringar markerade som favorit av %s / %s." #: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 #: actions/grouprss.php:131 actions/userrss.php:90 @@ -479,14 +476,14 @@ msgid "Updates from %1$s on %2$s!" msgstr "Uppdateringar från %1$s på %2$s!" #: actions/apitimelinementions.php:116 -#, fuzzy, php-format +#, php-format msgid "%1$s / Updates mentioning %2$s" -msgstr "%1$s / Uppdateringar med svar till %2$s" +msgstr "%1$s / Uppdateringar som nämner %2$s" #: actions/apitimelinementions.php:126 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." -msgstr "%1$s uppdateringar med svar till uppdatering från %2$s / %3$s." +msgstr "%1$s uppdateringar med svar på uppdatering från %2$s / %3$s." #: actions/apitimelinepublic.php:106 actions/publicrss.php:103 #, php-format @@ -496,49 +493,48 @@ msgstr "%s publika tidslinje" #: actions/apitimelinepublic.php:110 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" -msgstr "%s uppdateringar ifrån allihop!" +msgstr "%s uppdateringar från alla!" #: actions/apitimelinetag.php:101 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" -msgstr "Inlägg taggade med %s" +msgstr "Notiser taggade med %s" #: actions/apitimelinetag.php:107 actions/tagrss.php:64 -#, fuzzy, php-format +#, php-format msgid "Updates tagged with %1$s on %2$s!" -msgstr "Uppdateringar från %1$s på %2$s!" +msgstr "Uppdateringar taggade med %1$s på %2$s!" #: actions/apiusershow.php:96 -#, fuzzy msgid "Not found." -msgstr "Hittades inte" +msgstr "Hittades inte." #: actions/attachment.php:73 -#, fuzzy msgid "No such attachment." -msgstr "Inget sådant dokument." +msgstr "Ingen sådan bilaga." #: actions/avatarbynickname.php:59 actions/leavegroup.php:76 msgid "No nickname." -msgstr "Inget användarnamn" +msgstr "Inget smeknamn." #: actions/avatarbynickname.php:64 msgid "No size." -msgstr "Ingen storlek" +msgstr "Ingen storlek." #: actions/avatarbynickname.php:69 msgid "Invalid size." -msgstr "Felaktig storlek" +msgstr "Ogiltig storlek." #: actions/avatarsettings.php:67 actions/showgroup.php:221 #: lib/accountsettingsaction.php:112 msgid "Avatar" -msgstr "Användarbild" +msgstr "Avatar" #: actions/avatarsettings.php:78 -#, fuzzy, php-format +#, php-format msgid "You can upload your personal avatar. The maximum file size is %s." -msgstr "Du kan uppdatera din personliga profil här" +msgstr "" +"Du kan ladda upp din personliga avatar. Den maximala filstorleken är %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:182 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 @@ -548,23 +544,21 @@ msgstr "Användare utan matchande profil" #: actions/avatarsettings.php:119 actions/avatarsettings.php:194 #: actions/grouplogo.php:251 -#, fuzzy msgid "Avatar settings" -msgstr "Twitter inställningar" +msgstr "Avatarinställningar" #: actions/avatarsettings.php:126 actions/avatarsettings.php:202 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" -msgstr "" +msgstr "Orginal" #: actions/avatarsettings.php:141 actions/avatarsettings.php:214 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" -msgstr "" +msgstr "Förhandsgranska" #: actions/avatarsettings.php:148 lib/deleteuserform.php:66 #: lib/noticelist.php:550 -#, fuzzy msgid "Delete" msgstr "Ta bort" @@ -574,7 +568,7 @@ msgstr "Ladda upp" #: actions/avatarsettings.php:228 actions/grouplogo.php:286 msgid "Crop" -msgstr "" +msgstr "Beskär" #: actions/avatarsettings.php:265 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 @@ -589,89 +583,83 @@ msgstr "" #: actions/tagother.php:166 actions/unsubscribe.php:69 #: actions/userauthorization.php:52 lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." -msgstr "Det var något problem med din session. Försök igen, tack." +msgstr "Det var ett problem med din sessions-token. Var vänlig försök igen." #: actions/avatarsettings.php:277 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." -msgstr "Oväntat utskick av formuläret." +msgstr "Oväntat inskick av formulär." #: actions/avatarsettings.php:322 msgid "Pick a square area of the image to be your avatar" -msgstr "" +msgstr "Välj ett kvadratiskt område i bilden som din avatar" #: actions/avatarsettings.php:337 actions/grouplogo.php:377 msgid "Lost our file data." -msgstr "" +msgstr "Förlorade vår fildata." #: actions/avatarsettings.php:360 msgid "Avatar updated." -msgstr "Användarbilden uppdaterad." +msgstr "Avatar uppdaterad." #: actions/avatarsettings.php:363 msgid "Failed updating avatar." -msgstr "Uppdatering av profilbild misslyckades." +msgstr "Misslyckades uppdatera avatar." #: actions/avatarsettings.php:387 -#, fuzzy msgid "Avatar deleted." -msgstr "Användarbilden uppdaterad." +msgstr "Avatar borttagen." #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 #: actions/groupmembers.php:76 actions/grouprss.php:91 #: actions/joingroup.php:76 actions/showgroup.php:121 -#, fuzzy msgid "No nickname" -msgstr "Inget användarnamn" +msgstr "Inget smeknamn" #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 -#, fuzzy msgid "No such group" -msgstr "Ingen sådan användare" +msgstr "Ingen sådan grupp" #: actions/blockedfromgroup.php:90 -#, fuzzy, php-format +#, php-format msgid "%s blocked profiles" -msgstr "Användaren har ingen profil." +msgstr "%s blockerade profiler" #: actions/blockedfromgroup.php:93 -#, fuzzy, php-format +#, php-format msgid "%s blocked profiles, page %d" -msgstr "%s med vänner" +msgstr "%s blockerade profiler, sida %d" #: actions/blockedfromgroup.php:108 msgid "A list of the users blocked from joining this group." msgstr "" +"En lista med de användare som blockerats från att gå med i denna grupp." #: actions/blockedfromgroup.php:281 -#, fuzzy msgid "Unblock user from group" -msgstr "Ingen sådan användare" +msgstr "Häv blockering av användare från grupp" #: actions/blockedfromgroup.php:313 lib/unblockform.php:69 msgid "Unblock" -msgstr "" +msgstr "Häv blockering" #: actions/blockedfromgroup.php:313 lib/unblockform.php:80 -#, fuzzy msgid "Unblock this user" -msgstr "Ingen sådan användare" +msgstr "Häv blockering av denna användare" #: actions/block.php:69 -#, fuzzy msgid "You already blocked that user." -msgstr "Du prenumererar redan på dessa användare:" +msgstr "Du har redan blockerat denna användare." #: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 -#, fuzzy msgid "Block user" -msgstr "Ingen sådan användare" +msgstr "Blockera användare" #: actions/block.php:130 msgid "" @@ -679,6 +667,9 @@ msgid "" "unsubscribed from you, unable to subscribe to you in the future, and you " "will not be notified of any @-replies from them." msgstr "" +"Är du säker på att du vill blockera denna användare? Efteråt kommer deras " +"prenumeration på dig tas bort, de kommer inte kunna prenumerera på dig i " +"framtiden och du kommer inte bli underrättad om några @-svar från dem." #: actions/block.php:143 actions/deletenotice.php:145 #: actions/deleteuser.php:147 actions/groupblock.php:178 @@ -686,9 +677,8 @@ msgid "No" msgstr "Nej" #: actions/block.php:143 actions/deleteuser.php:147 -#, fuzzy msgid "Do not block this user" -msgstr "Ingen sådan användare" +msgstr "Blockera inte denna användare" #: actions/block.php:144 actions/deletenotice.php:146 #: actions/deleteuser.php:148 actions/groupblock.php:179 @@ -696,17 +686,16 @@ msgid "Yes" msgstr "Ja" #: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 -#, fuzzy msgid "Block this user" -msgstr "Ingen sådan användare" +msgstr "Blockera denna användare" #: actions/block.php:162 msgid "Failed to save block information." -msgstr "" +msgstr "Misslyckades att spara blockeringsinformation." #: actions/bookmarklet.php:50 msgid "Post to " -msgstr "" +msgstr "Posta till " #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -714,20 +703,20 @@ msgstr "Ingen bekräftelsekod." #: actions/confirmaddress.php:80 msgid "Confirmation code not found." -msgstr "Bekräftelsekoden kunde inte hittas." +msgstr "Bekräftelsekod kunde inte hittas." #: actions/confirmaddress.php:85 msgid "That confirmation code is not for you!" -msgstr "Den bekräftelsekoden är inte för dig!" +msgstr "Denna bekräftelsekod är inte för dig!" #: actions/confirmaddress.php:90 #, php-format msgid "Unrecognized address type %s" -msgstr "Adresstypen känns inte igen %s" +msgstr "Adresstypen %s känns inte igen" #: actions/confirmaddress.php:94 msgid "That address has already been confirmed." -msgstr "Den adressen har redan blivit bekräftad en gång." +msgstr "Denna adress har redan blivit bekräftad." #: actions/confirmaddress.php:114 actions/emailsettings.php:296 #: actions/emailsettings.php:427 actions/imsettings.php:258 @@ -740,7 +729,7 @@ msgstr "Kunde inte uppdatera användare." #: actions/confirmaddress.php:126 actions/emailsettings.php:391 #: actions/imsettings.php:363 actions/smssettings.php:382 msgid "Couldn't delete email confirmation." -msgstr "Kunde inte radera epost bekräftelsen." +msgstr "Kunde inte ta bort e-postbekräftelse." #: actions/confirmaddress.php:144 msgid "Confirm Address" @@ -752,18 +741,17 @@ msgid "The address \"%s\" has been confirmed for your account." msgstr "Adressen \"%s\" har blivit bekräftad för ditt konto." #: actions/conversation.php:99 -#, fuzzy msgid "Conversation" -msgstr "Bekräftelsekod" +msgstr "Konversationer" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 #: lib/profileaction.php:216 lib/searchgroupnav.php:82 msgid "Notices" -msgstr "Inlägg" +msgstr "Notiser" #: actions/deletenotice.php:52 actions/shownotice.php:92 msgid "No such notice." -msgstr "Inget sådant inlägg." +msgstr "Ingen sådan notis." #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 @@ -776,178 +764,165 @@ msgstr "Inte inloggad." #: actions/deletenotice.php:71 msgid "Can't delete this notice." -msgstr "Kan inte ta bort detta inlägg." +msgstr "Kan inte ta bort denna notis." #: actions/deletenotice.php:103 -#, fuzzy msgid "" "You are about to permanently delete a notice. Once this is done, it cannot " "be undone." msgstr "" -"Du håller på att tabort inlägget permanent. När det väl är gjort kan du inte " -"ångra dig." +"Du håller på att ta bort en notis permanent. När det väl är gjort kan du " +"inte ångra dig." #: actions/deletenotice.php:109 actions/deletenotice.php:141 msgid "Delete notice" -msgstr "Tabort inlägg" +msgstr "Ta bort notis" #: actions/deletenotice.php:144 msgid "Are you sure you want to delete this notice?" -msgstr "Är du säker på att du vill tabort detta inlägg?" +msgstr "Är du säker på att du vill ta bort denna notis?" #: actions/deletenotice.php:145 -#, fuzzy msgid "Do not delete this notice" -msgstr "Kan inte ta bort detta inlägg." +msgstr "Ta inte bort denna notis" #: actions/deletenotice.php:146 lib/noticelist.php:550 -#, fuzzy msgid "Delete this notice" -msgstr "Ta bort inlägg" +msgstr "Ta bort denna notis" #: actions/deletenotice.php:157 -#, fuzzy msgid "There was a problem with your session token. Try again, please." -msgstr "Det var något problem med din session. Försök igen, tack." +msgstr "Det var något problem med din sessions-token. Var vänlig försök igen." #: actions/deleteuser.php:67 -#, fuzzy msgid "You cannot delete users." -msgstr "Kunde inte uppdatera användare." +msgstr "Du kan inte ta bort användare." #: actions/deleteuser.php:74 -#, fuzzy msgid "You can only delete local users." -msgstr "Du kan inte tabort nån annan användares status." +msgstr "Du kan bara ta bort lokala användare." #: actions/deleteuser.php:110 actions/deleteuser.php:133 -#, fuzzy msgid "Delete user" -msgstr "Ta bort" +msgstr "Ta bort användare" #: actions/deleteuser.php:135 msgid "" "Are you sure you want to delete this user? This will clear all data about " "the user from the database, without a backup." msgstr "" +"Är du säker på att du vill ta bort denna användare? Det kommer rensa all " +"data om användaren från databasen, utan en säkerhetskopia." #: actions/deleteuser.php:148 lib/deleteuserform.php:77 -#, fuzzy msgid "Delete this user" -msgstr "Ta bort inlägg" +msgstr "Ta bort denna användare" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 #: lib/adminpanelaction.php:302 lib/groupnav.php:119 msgid "Design" -msgstr "" +msgstr "Utseende" #: actions/designadminpanel.php:73 msgid "Design settings for this StatusNet site." -msgstr "" +msgstr "Utseendeinställningar för denna StatusNet-webbplats." -#: actions/designadminpanel.php:270 -#, fuzzy +#: actions/designadminpanel.php:275 msgid "Invalid logo URL." -msgstr "Felaktig storlek" +msgstr "Ogiltig logtyp-URL." -#: actions/designadminpanel.php:274 -#, fuzzy, php-format +#: actions/designadminpanel.php:279 +#, php-format msgid "Theme not available: %s" -msgstr "Denna sida är inte tillgänglig i den mediatyp du accepterat" - -#: actions/designadminpanel.php:370 -#, fuzzy -msgid "Change logo" -msgstr "Ändra ditt lösenord" +msgstr "Tema inte tillgängligt: %s" #: actions/designadminpanel.php:375 -#, fuzzy +msgid "Change logo" +msgstr "Byt logotyp" + +#: actions/designadminpanel.php:380 msgid "Site logo" -msgstr "Bjud in" +msgstr "Webbplatslogotyp" -#: actions/designadminpanel.php:382 -#, fuzzy +#: actions/designadminpanel.php:387 msgid "Change theme" -msgstr "Ändra" +msgstr "Byt tema" -#: actions/designadminpanel.php:399 -#, fuzzy +#: actions/designadminpanel.php:404 msgid "Site theme" -msgstr "Nytt inlägg" +msgstr "Webbplatstema" -#: actions/designadminpanel.php:400 +#: actions/designadminpanel.php:405 msgid "Theme for the site." -msgstr "" +msgstr "Tema för webbplatsen." -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" -msgstr "" +msgstr "Ändra bakgrundsbild" -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" -msgstr "" +msgstr "Bakgrund" -#: actions/designadminpanel.php:422 -#, fuzzy, php-format +#: actions/designadminpanel.php:427 +#, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." -msgstr "Du kan uppdatera din personliga profil här" +msgstr "" +"Du kan ladda upp en bakgrundsbild för denna webbplats. Den maximala " +"filstorleken är %1$s." -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" -msgstr "" +msgstr "På" -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" -msgstr "" +msgstr "Av" -#: actions/designadminpanel.php:469 lib/designsettings.php:156 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." -msgstr "" +msgstr "Sätt på eller stäng av bakgrundsbild." -#: actions/designadminpanel.php:474 lib/designsettings.php:161 +#: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" -msgstr "" +msgstr "Upprepa bakgrundsbild" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 -#, fuzzy +#: actions/designadminpanel.php:488 lib/designsettings.php:170 msgid "Change colours" -msgstr "Ändra ditt lösenord" +msgstr "Byt färger" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 -#, fuzzy +#: actions/designadminpanel.php:510 lib/designsettings.php:191 msgid "Content" -msgstr "Anslut" +msgstr "Innehåll" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 -#, fuzzy +#: actions/designadminpanel.php:523 lib/designsettings.php:204 msgid "Sidebar" -msgstr "Sök" +msgstr "Sidofält" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "Text" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 -#, fuzzy +#: actions/designadminpanel.php:549 lib/designsettings.php:230 msgid "Links" -msgstr "Logga in" +msgstr "Länkar" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" -msgstr "" +msgstr "Använd standardvärden" -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" -msgstr "" +msgstr "Återställ standardutseende" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" -msgstr "" +msgstr "Återställ till standardvärde" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -957,18 +932,17 @@ msgstr "" msgid "Save" msgstr "Spara" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" -msgstr "" +msgstr "Spara utseende" #: actions/disfavor.php:81 msgid "This notice is not a favorite!" -msgstr "Det inlägget är ingen favorit!" +msgstr "Denna notis är inte en favorit!" #: actions/disfavor.php:94 -#, fuzzy msgid "Add to favorites" -msgstr "Feed för %s favoriter" +msgstr "Lägg till i favoriter" #: actions/doc.php:69 msgid "No such document." @@ -977,51 +951,46 @@ msgstr "Inget sådant dokument." #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" -msgstr "" +msgstr "Redigera %s grupp" #: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65 -#, fuzzy msgid "You must be logged in to create a group." -msgstr "du måste vara inloggad för att kunna bjuda in andra användare till %s" +msgstr "Du måste vara inloggad för att skapa en grupp." #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -#, fuzzy msgid "You must be an admin to edit the group" -msgstr "du måste vara inloggad för att kunna bjuda in andra användare till %s" +msgstr "Du måste vara inloggad för att redigera gruppen" #: actions/editgroup.php:154 msgid "Use this form to edit the group." -msgstr "" +msgstr "Använd detta formulär för att redigera gruppen." #: actions/editgroup.php:201 actions/newgroup.php:145 -#, fuzzy, php-format +#, php-format msgid "description is too long (max %d chars)." -msgstr "Biografin är för lång (max 140 tecken)" +msgstr "beskrivning är för lång (max %d tecken)." #: actions/editgroup.php:253 -#, fuzzy msgid "Could not update group." -msgstr "Kunde inte uppdatera användare." +msgstr "Kunde inte uppdatera grupp." #: actions/editgroup.php:259 classes/User_group.php:390 -#, fuzzy msgid "Could not create aliases." -msgstr "Kunde inte skapa favorit." +msgstr "Kunde inte skapa alias." #: actions/editgroup.php:269 -#, fuzzy msgid "Options saved." -msgstr "Inställningar sparade." +msgstr "Alternativ sparade." #: actions/emailsettings.php:60 msgid "Email Settings" -msgstr "Email inställningar" +msgstr "E-postinställningar" #: actions/emailsettings.php:71 #, php-format msgid "Manage how you get email from %%site.name%%." -msgstr "Ställ in hur du tar emot email ifrån %%site.name%%" +msgstr "Hantera hur du får e-post från %%site.name%%" #: actions/emailsettings.php:100 actions/imsettings.php:100 #: actions/smssettings.php:104 @@ -1030,7 +999,7 @@ msgstr "Adress" #: actions/emailsettings.php:105 msgid "Current confirmed email address." -msgstr "Nuvarande bekräftade emailadress." +msgstr "Aktuell, bekräftad e-postadress." #: actions/emailsettings.php:107 actions/emailsettings.php:140 #: actions/imsettings.php:108 actions/smssettings.php:115 @@ -1043,8 +1012,8 @@ msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." msgstr "" -"Väntar bekräftelse på denna adress. Kontrollera din inbox (och spamlådan!) " -"efter meddelande om vidare instruktioner." +"Väntar bekräftelse av denna adress. Kontrollera din inkorg (och " +"skräppostkorg!) efter ett meddelande med vidare instruktioner." #: actions/emailsettings.php:117 actions/imsettings.php:120 #: actions/smssettings.php:126 @@ -1053,11 +1022,11 @@ msgstr "Avbryt" #: actions/emailsettings.php:121 msgid "Email Address" -msgstr "Emailadress" +msgstr "E-postadress" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" -msgstr "Emailadress såsom \"användare@example.org\"" +msgstr "E-postadress, såsom \"användarnamn@exempel.se\"" #: actions/emailsettings.php:126 actions/imsettings.php:133 #: actions/smssettings.php:145 @@ -1066,15 +1035,16 @@ msgstr "Lägg till" #: actions/emailsettings.php:133 actions/smssettings.php:152 msgid "Incoming email" -msgstr "Inkommande email" +msgstr "Inkommande e-post" #: actions/emailsettings.php:138 actions/smssettings.php:157 msgid "Send email to this address to post new notices." -msgstr "Skicka email till denna adress för att posta ett nya inlägg." +msgstr "Skicka e-post till denna adress för att posta nya notiser." #: actions/emailsettings.php:145 actions/smssettings.php:162 msgid "Make a new email address for posting to; cancels the old one." -msgstr "Skapa en ny emailadress för att posta till, avaktiverar den gamla" +msgstr "" +"Ange en ny e-postadress för att posta till; detta inaktiverar den gamla." #: actions/emailsettings.php:148 actions/smssettings.php:164 msgid "New" @@ -1087,7 +1057,7 @@ msgstr "Inställningar" #: actions/emailsettings.php:158 msgid "Send me notices of new subscriptions through email." -msgstr "Skicka meddelande till mig via email vid nya prenumerationer." +msgstr "Skicka notiser om nya prenumerationer till mig genom e-post." #: actions/emailsettings.php:163 msgid "Send me email when someone adds my notice as a favorite." @@ -1095,24 +1065,23 @@ msgstr "Skicka mig ett email när någon lägger till mitt inlägg som favorit." #: actions/emailsettings.php:169 msgid "Send me email when someone sends me a private message." -msgstr "Skicka mig ett email när någon sänder ett privat meddelande." +msgstr "Skicka mig e-post när någon skickar mig ett privat meddelande." #: actions/emailsettings.php:174 -#, fuzzy msgid "Send me email when someone sends me an \"@-reply\"." -msgstr "Skicka mig ett email när någon sänder ett privat meddelande." +msgstr "Skicka mig e-post när någon skickar ett \"@-svar\"." #: actions/emailsettings.php:179 msgid "Allow friends to nudge me and send me an email." -msgstr "" +msgstr "Tillåt vänner att knuffa mig och skicka e-post till mig." #: actions/emailsettings.php:185 msgid "I want to post notices by email." -msgstr "Jag vill posta inlägg via min email." +msgstr "Jag vill posta notiser genom min e-post." #: actions/emailsettings.php:191 msgid "Publish a MicroID for my email address." -msgstr "Publicera ett MicroID för min emailadress." +msgstr "Publicera ett MicroID för min e-postadress." #: actions/emailsettings.php:302 actions/imsettings.php:264 #: actions/othersettings.php:180 actions/smssettings.php:284 @@ -1121,37 +1090,37 @@ msgstr "Inställningar sparade." #: actions/emailsettings.php:320 msgid "No email address." -msgstr "Ingen emailadress." +msgstr "Ingen e-postadress." #: actions/emailsettings.php:327 msgid "Cannot normalize that email address" -msgstr "Kan inte normalisera den emailadressen" +msgstr "Kan inte normalisera den e-postadressen" #: actions/emailsettings.php:331 actions/siteadminpanel.php:158 msgid "Not a valid email address" -msgstr "Ingen giltig emailadress" +msgstr "Inte en giltig e-postadress" #: actions/emailsettings.php:334 msgid "That is already your email address." -msgstr "Det är redan din emailadress." +msgstr "Detta är redan din e-postadress." #: actions/emailsettings.php:337 msgid "That email address already belongs to another user." -msgstr "Den emailadressen tillhör redan en annan användare." +msgstr "Den e-postadressen tillhör redan en annan användare." #: actions/emailsettings.php:353 actions/imsettings.php:317 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." -msgstr "Kunde inte lägga till bekräftelsekoden." +msgstr "Kunde inte infoga bekräftelsekod." #: actions/emailsettings.php:359 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." msgstr "" -"En bekräftelsekod har skickats ut till email adressen du fyllde i. " -"Kontrollera din inbox (och spamlådan!) efter kod och instruktioner hur du " -"använder den." +"En bekräftelsekod har skickats till e-postadressen du lade till. Kontrollera " +"din inkorg (och skräppostkorg!) för koden och instruktioner hur du använder " +"den." #: actions/emailsettings.php:379 actions/imsettings.php:351 #: actions/smssettings.php:370 @@ -1160,58 +1129,58 @@ msgstr "Ingen väntande bekräftelse att avbryta." #: actions/emailsettings.php:383 actions/imsettings.php:355 msgid "That is the wrong IM address." -msgstr "Det är fel IM adress." +msgstr "Detta är fel IM-adress." #: actions/emailsettings.php:395 actions/imsettings.php:367 #: actions/smssettings.php:386 msgid "Confirmation cancelled." -msgstr "Verifikation avbruten" +msgstr "Bekräftelse avbruten." #: actions/emailsettings.php:413 msgid "That is not your email address." -msgstr "Det är inte din emailadress." +msgstr "Detta är inte din e-postadress." #: actions/emailsettings.php:432 actions/imsettings.php:408 #: actions/smssettings.php:425 msgid "The address was removed." -msgstr "Adressen är borttagen." +msgstr "Adressen togs bort." #: actions/emailsettings.php:446 actions/smssettings.php:518 msgid "No incoming email address." -msgstr "Ingen inkommande emailadress." +msgstr "Ingen inkommande e-postadress." #: actions/emailsettings.php:456 actions/emailsettings.php:478 #: actions/smssettings.php:528 actions/smssettings.php:552 msgid "Couldn't update user record." -msgstr "Kunde inte uppdatera användarens inställningar." +msgstr "Kunde inte uppdatera användaruppgift." #: actions/emailsettings.php:459 actions/smssettings.php:531 msgid "Incoming email address removed." -msgstr "Inkommande emailadress borttagen." +msgstr "Inkommande e-postadress borttagen." #: actions/emailsettings.php:481 actions/smssettings.php:555 msgid "New incoming email address added." -msgstr "Ny inkommande emailadress inlagd." +msgstr "Ny inkommande e-postadress tillagd." #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 -#, fuzzy msgid "Popular notices" -msgstr "Inget sådant inlägg." +msgstr "Populära notiser" #: actions/favorited.php:67 -#, fuzzy, php-format +#, php-format msgid "Popular notices, page %d" -msgstr "Inget sådant inlägg." +msgstr "Populära notiser, sida %d" #: actions/favorited.php:79 -#, fuzzy msgid "The most popular notices on the site right now." -msgstr "Visar dom populäraste taggarna ifrån den senaste veckan." +msgstr "De mest populära notiserna på webbplatsen just nu." #: actions/favorited.php:150 msgid "Favorite notices appear on this page but no one has favorited one yet." msgstr "" +"Favoritnotiser kommer upp på denna sida, men ingen har markerat några " +"favoriter än." #: actions/favorited.php:153 msgid "" @@ -1225,26 +1194,27 @@ msgid "" "Why not [register an account](%%action.register%%) and be the first to add a " "notice to your favorites!" msgstr "" +"Varför inte [registrera ett konto](%%action.register%%) och bli först att " +"lägga en notis till dina favoriter!" #: actions/favoritesrss.php:111 actions/showfavorites.php:77 #: lib/personalgroupnav.php:115 #, php-format msgid "%s's favorite notices" -msgstr "" +msgstr "%ss favoritnotiser" #: actions/favoritesrss.php:115 -#, fuzzy, php-format +#, php-format msgid "Updates favored by %1$s on %2$s!" -msgstr "Uppdateringar från %1$s på %2$s!" +msgstr "Uppdateringar markerade som favorit av %1$s på %2$s!" #: actions/favor.php:79 msgid "This notice is already a favorite!" -msgstr "Detta inlägg är redan en favorit!" +msgstr "Denna notis är redan en favorit!" #: actions/favor.php:92 lib/disfavorform.php:140 -#, fuzzy msgid "Disfavor favorite" -msgstr "Avfavorisera" +msgstr "Ta bort märkning som favorit" #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 @@ -1262,114 +1232,99 @@ msgid "A selection of some of the great users on %s" msgstr "" #: actions/file.php:34 -#, fuzzy msgid "No notice id" -msgstr "Nytt inlägg" +msgstr "Ingen notis-ID" #: actions/file.php:38 -#, fuzzy msgid "No notice" -msgstr "Nytt inlägg" +msgstr "Ingen notis" #: actions/file.php:42 msgid "No attachments" -msgstr "" +msgstr "Inga bilagor" #: actions/file.php:51 msgid "No uploaded attachments" -msgstr "" +msgstr "Inga uppladdade bilagor" #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" -msgstr "Väntade mig inte detta svar!" +msgstr "Väntade mig inte denna respons!" #: actions/finishremotesubscribe.php:80 -#, fuzzy msgid "User being listened to does not exist." -msgstr "Användaren som avlyssnas existerar inte." +msgstr "Användaren som lyssnas på existerar inte." #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59 msgid "You can use the local subscription!" -msgstr "Du kan använda lokala prenumerationer!" +msgstr "Du kan använda den lokala prenumerationen!" #: actions/finishremotesubscribe.php:99 msgid "That user has blocked you from subscribing." -msgstr "" +msgstr "Denna användaren har blockerat dig från att prenumerera." #: actions/finishremotesubscribe.php:110 -#, fuzzy msgid "You are not authorized." -msgstr "Inte tillstånd ännu." +msgstr "Du har inte tillstånd." #: actions/finishremotesubscribe.php:113 -#, fuzzy msgid "Could not convert request token to access token." -msgstr "Kunde inte konvertera förfrågan tokens till Access tokens." +msgstr "Kunde inte konvertera förfrågnings-token till access-token." #: actions/finishremotesubscribe.php:118 -#, fuzzy msgid "Remote service uses unknown version of OMB protocol." -msgstr "Okänd version av OMB protokollet." +msgstr "Fjärrtjänsten använder en okänd version av OMB-protokollet." #: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 msgid "Error updating remote profile" -msgstr "Fel uppstog under uppdatering av fjärranvändare" +msgstr "Fel vid uppdatering av fjärrprofil" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupunblock.php:86 actions/leavegroup.php:83 #: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 -#, fuzzy msgid "No such group." -msgstr "Inget sådant meddelande." +msgstr "Ingen sådan grupp." #: actions/getfile.php:75 -#, fuzzy msgid "No such file." -msgstr "Inget sådant inlägg." +msgstr "Ingen sådan fil." #: actions/getfile.php:79 -#, fuzzy msgid "Cannot read file." -msgstr "Inget sådant inlägg." +msgstr "Kan inte läsa fil." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 #: lib/profileformaction.php:70 -#, fuzzy msgid "No profile specified." -msgstr "Ingen mottagare tillagd." +msgstr "Ingen profil angiven." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 #: lib/profileformaction.php:77 -#, fuzzy msgid "No profile with that ID." -msgstr "Ingen status hittad med det ID" +msgstr "Ingen profil med det ID:t." #: actions/groupblock.php:81 actions/groupunblock.php:81 #: actions/makeadmin.php:81 -#, fuzzy msgid "No group specified." -msgstr "Ingen mottagare tillagd." +msgstr "Ingen grupp angiven." #: actions/groupblock.php:91 msgid "Only an admin can block group members." -msgstr "" +msgstr "Bara en administratör kan blockera gruppmedlemmar." #: actions/groupblock.php:95 -#, fuzzy msgid "User is already blocked from group." -msgstr "Användaren har ingen profil." +msgstr "Användaren är redan blockerad från grupp." #: actions/groupblock.php:100 -#, fuzzy msgid "User is not a member of group." -msgstr "Du skickade inte oss den profilen" +msgstr "Användare är inte en gruppmedlem." #: actions/groupblock.php:136 actions/groupmembers.php:314 -#, fuzzy msgid "Block user from group" -msgstr "Ingen sådan användare" +msgstr "Blockera användare från grupp" #: actions/groupblock.php:162 #, php-format @@ -1378,141 +1333,137 @@ msgid "" "be removed from the group, unable to post, and unable to subscribe to the " "group in the future." msgstr "" +"Är du säker på att du vill blockera användare \"%s\" från gruppen \"%s\"? De " +"kommer bli borttagna från gruppen, inte kunna posta och inte kunna " +"prenumerera på gruppen i framtiden." #: actions/groupblock.php:178 -#, fuzzy msgid "Do not block this user from this group" -msgstr "Kunde inte följa användaren: Användaren kunde inte hittas." +msgstr "Blockera inte denna användare från denna grupp" #: actions/groupblock.php:179 -#, fuzzy msgid "Block this user from this group" -msgstr "Ingen sådan användare" +msgstr "Blockera denna användare från denna grupp" #: actions/groupblock.php:196 msgid "Database error blocking user from group." -msgstr "" +msgstr "Databasfel vid blockering av användare från grupp." #: actions/groupbyid.php:74 msgid "No ID" -msgstr "" +msgstr "Ingen ID" #: actions/groupdesignsettings.php:68 -#, fuzzy msgid "You must be logged in to edit a group." -msgstr "du måste vara inloggad för att kunna bjuda in andra användare till %s" +msgstr "Du måste vara inloggad för att redigera en grupp." #: actions/groupdesignsettings.php:141 msgid "Group design" -msgstr "" +msgstr "Gruppens utseende" #: actions/groupdesignsettings.php:152 msgid "" "Customize the way your group looks with a background image and a colour " "palette of your choice." msgstr "" +"Anpassa hur din grupp ser ut genom att välja bakgrundbild och färgpalett. " -#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 -#: lib/designsettings.php:434 lib/designsettings.php:464 -#, fuzzy +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 msgid "Couldn't update your design." -msgstr "Kunde inte uppdatera användare." +msgstr "Kunde inte uppdatera dina utseendeinställningar." -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -#, fuzzy msgid "Unable to save your design settings!" -msgstr "Kunde inte spara dina Twitter inställningar!" +msgstr "Kunde inte spara dina utseendeinställningar!" -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 -#, fuzzy +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." -msgstr "Inställningar sparade." +msgstr "Utseendeinställningar sparade." #: actions/grouplogo.php:139 actions/grouplogo.php:192 msgid "Group logo" -msgstr "" +msgstr "Gruppens logotyp" #: actions/grouplogo.php:150 #, php-format msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "" +"Du kan ladda upp en logotypbild för din grupp. Den maximala filstorleken är %" +"s." #: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." -msgstr "" +msgstr "Välj ett kvadratiskt område i bilden som logotyp" #: actions/grouplogo.php:396 -#, fuzzy msgid "Logo updated." -msgstr "Användarbilden uppdaterad." +msgstr "Logtyp uppdaterad." #: actions/grouplogo.php:398 -#, fuzzy msgid "Failed updating logo." -msgstr "Uppdatering av profilbild misslyckades." +msgstr "Misslyckades uppdatera logtyp." #: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" -msgstr "" +msgstr "%s " #: actions/groupmembers.php:96 #, php-format msgid "%s group members, page %d" -msgstr "" +msgstr "%s gruppmedlemmar, sida %d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." -msgstr "" +msgstr "En lista av användarna i denna grupp." #: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107 msgid "Admin" -msgstr "" +msgstr "Administratör" #: actions/groupmembers.php:346 lib/blockform.php:69 msgid "Block" -msgstr "" +msgstr "Blockera" #: actions/groupmembers.php:441 -#, fuzzy msgid "Make user an admin of the group" -msgstr "du måste vara inloggad för att kunna bjuda in andra användare till %s" +msgstr "Gör användare till en administratör för gruppen" #: actions/groupmembers.php:473 msgid "Make Admin" -msgstr "" +msgstr "Gör till administratör" #: actions/groupmembers.php:473 msgid "Make this user an admin" -msgstr "" +msgstr "Gör denna användare till administratör" #: actions/grouprss.php:133 -#, fuzzy, php-format +#, php-format msgid "Updates from members of %1$s on %2$s!" -msgstr "Uppdateringar från %1$s på %2$s!" +msgstr "Uppdateringar från medlemmar i %1$s på %2$s!" #: actions/groupsearch.php:52 -#, fuzzy, php-format +#, php-format msgid "" "Search for groups on %%site.name%% by their name, location, or description. " "Separate the terms by spaces; they must be 3 characters or more." msgstr "" -"Sök efter personer på %%site.name%% efter deras namn, plats eller intressen. " -"Skilj söktermerna åt med mellanslag; de måste vara minst tre tecken långa. " +"Sök efter grupper på %%site.name%% efter deras namn, plats eller " +"beskrivning. Skilj söktermerna åt med mellanslag; de måste vara minst tre " +"tecken långa." #: actions/groupsearch.php:58 -#, fuzzy msgid "Group search" -msgstr "Sökning personer" +msgstr "Gruppsökning" #: actions/groupsearch.php:79 actions/noticesearch.php:117 #: actions/peoplesearch.php:83 -#, fuzzy msgid "No results." -msgstr "Inget resultat" +msgstr "Inga resultat." #: actions/groupsearch.php:82 #, php-format @@ -1520,6 +1471,8 @@ msgid "" "If you can't find the group you're looking for, you can [create it](%%action." "newgroup%%) yourself." msgstr "" +"Om du inte kan hitta gruppen du söker efter kan du [skapa den](%%action." +"newgroup%%) själv." #: actions/groupsearch.php:85 #, php-format @@ -1527,16 +1480,18 @@ msgid "" "Why not [register an account](%%action.register%%) and [create the group](%%" "action.newgroup%%) yourself!" msgstr "" +"Varför inte [registrera ett konto](%%action.register%%) och [skapa gruppen](%" +"%action.newgroup%%) själv!" #: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" -msgstr "" +msgstr "Grupper" #: actions/groups.php:64 #, php-format msgid "Groups, page %d" -msgstr "" +msgstr "Grupper, sida %d" #: actions/groups.php:90 #, php-format @@ -1547,29 +1502,31 @@ msgid "" "for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" "%%%%)" msgstr "" +"%%%%site.name%%%% grupper låter dig hitta och prata med personer med " +"liknande intressen. Efter att ha gått med i en grupp kan du skicka " +"meddelanden till alla andra medlemmar mha. syntaxen \"!gruppnamn\". Ser du " +"inte någon grupp du gillar? Prova att [söka efter en](%%%%action.groupsearch%" +"%%%) eller [starta din egen!](%%%%action.newgroup%%%%)" #: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -#, fuzzy msgid "Create a new group" -msgstr "Skapa ett nytt konto" +msgstr "Skapa en ny grupp" #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." -msgstr "" +msgstr "Bara en administratör kan häva blockering av gruppmedlemmar." #: actions/groupunblock.php:95 -#, fuzzy msgid "User is not blocked from group." -msgstr "Användaren har ingen profil." +msgstr "Användare är inte blockerad från grupp." #: actions/groupunblock.php:128 actions/unblock.php:77 -#, fuzzy msgid "Error removing the block." -msgstr "Fel uppstog när användaren skulle sparas." +msgstr "Fel vid hävning av blockering." #: actions/imsettings.php:59 msgid "IM Settings" -msgstr "IM inställningar" +msgstr "IM-inställningar" #: actions/imsettings.php:70 #, php-format @@ -1577,13 +1534,12 @@ msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" "doc.im%%). Configure your address and settings below." msgstr "" -"Du kan skicka och ta emot inlägg genom Jabber/GTalk [instant messages](%%doc." -"im%%). Konfigurera din adress och inställningar nedan. " +"Du kan skicka och ta emot notiser genom Jabber/GTalk [snabbmeddelanden](%%" +"doc.im%%). Konfigurera din adress och dina inställningar nedan." #: actions/imsettings.php:89 -#, fuzzy msgid "IM is not available." -msgstr "Denna sida är inte tillgänglig i den mediatyp du accepterat" +msgstr "IM är inte tillgänglig." #: actions/imsettings.php:106 msgid "Current confirmed Jabber/GTalk address." @@ -1595,12 +1551,12 @@ msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " "message with further instructions. (Did you add %s to your buddy list?)" msgstr "" -"Väntar bekräftelse på denna adress. Kontrollera ditt Jabber/GTalk konto för " -"vidare instruktioner. (La du till %s i din vännerlista?)" +"Väntar bekräftelse av denna adress. Kontrollera ditt Jabber/GTalk-konto för " +"vidare instruktioner. (La du till %s i din kompislista?)" #: actions/imsettings.php:124 msgid "IM Address" -msgstr "IM adress" +msgstr "IM-adress" #: actions/imsettings.php:126 #, php-format @@ -1608,46 +1564,46 @@ msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." msgstr "" -"Jabber eller GTalk adress liknande \"användare@exempel.se\". Först se till " -"att lägga till %s i din vännerlista i IM klienten eller GTalk." +"Jabber- eller GTalk-adress liknande \"användare@exempel.se\". Se först till " +"att lägga till %s i din kompislista i din IM-klient eller hos GTalk." #: actions/imsettings.php:143 msgid "Send me notices through Jabber/GTalk." -msgstr "Skicka inlägg till mig via Jabber/GTalk." +msgstr "Skicka notiser till mig genom Jabber/GTalk." #: actions/imsettings.php:148 msgid "Post a notice when my Jabber/GTalk status changes." -msgstr "Posta ett inlägg när min Jabber/GTalk status ändras." +msgstr "Posta en notis när min Jabber/GTalk-status ändras." #: actions/imsettings.php:153 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" -"Skicka svar till mig via Jabber/GTalk från personer som inte jag " +"Skicka svar till mig genom Jabber/GTalk från personer som jag inte " "prenumererar på." #: actions/imsettings.php:159 msgid "Publish a MicroID for my Jabber/GTalk address." -msgstr "Publicera ett MicroID för min Jabber/GTalk adress." +msgstr "Publicera ett MicroID för min Jabber/GTalk-adress." #: actions/imsettings.php:285 msgid "No Jabber ID." -msgstr "Inget Jabber ID." +msgstr "Inget Jabber-ID." #: actions/imsettings.php:292 msgid "Cannot normalize that Jabber ID" -msgstr "Kan inte normalisera det Jabber ID" +msgstr "Kan inte normalisera detta Jabber-ID" #: actions/imsettings.php:296 msgid "Not a valid Jabber ID" -msgstr "Det är inget giltigt Jabber ID" +msgstr "Inte ett giltigt Jabber-ID" #: actions/imsettings.php:299 msgid "That is already your Jabber ID." -msgstr "Det är redan din Jabber ID." +msgstr "Detta är redan ditt Jabber-ID" #: actions/imsettings.php:302 msgid "Jabber ID already belongs to another user." -msgstr "Jabber ID används redan utav en annan användare." +msgstr "Jabber-ID:t tillhör redan en annan användare." #: actions/imsettings.php:327 #, php-format @@ -1655,44 +1611,45 @@ msgid "" "A confirmation code was sent to the IM address you added. You must approve %" "s for sending messages to you." msgstr "" -"En bekräftelsekod har skickats till den IM-adress som du angav. Du måste " +"En bekräftelsekod har skickats till den IM-adress du angav. Du måste " "godkänna att %s får skicka meddelanden till dig." #: actions/imsettings.php:387 msgid "That is not your Jabber ID." -msgstr "Det är inte ditt Jabber ID." +msgstr "Detta är inte ditt Jabber-ID." #: actions/inbox.php:59 #, php-format msgid "Inbox for %s - page %d" -msgstr "Inbox för %s - sida %d" +msgstr "Inkorg för %s - sida %d" #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" -msgstr "Inbox för %s" +msgstr "Inkorg för %s" #: actions/inbox.php:115 msgid "This is your inbox, which lists your incoming private messages." -msgstr "Detta är din inbox som innehåller dina privata meddelanden." +msgstr "" +"Detta är din inkorg som innehåller dina inkommande privata meddelanden." #: actions/invite.php:39 msgid "Invites have been disabled." -msgstr "" +msgstr "Inbjudningar har blivit inaktiverade." #: actions/invite.php:41 #, php-format msgid "You must be logged in to invite other users to use %s" -msgstr "du måste vara inloggad för att kunna bjuda in andra användare till %s" +msgstr "Du måste vara inloggad för att kunna bjuda in andra användare till %s" #: actions/invite.php:72 #, php-format msgid "Invalid email address: %s" -msgstr "Ogiltig emailadress: %s" +msgstr "Ogiltig e-postadress: %s" #: actions/invite.php:110 msgid "Invitation(s) sent" -msgstr "Inbjudan(ar) skickad" +msgstr "Inbjudan(ar) skickad(e)" #: actions/invite.php:112 msgid "Invite new users" @@ -1705,25 +1662,25 @@ msgstr "Du prenumererar redan på dessa användare:" #: actions/invite.php:131 actions/invite.php:139 #, php-format msgid "%s (%s)" -msgstr "%s(%s)" +msgstr "%s (%s)" #: actions/invite.php:136 msgid "" "These people are already users and you were automatically subscribed to them:" msgstr "" -"Dom personerna är redan registrerade användare och du blev nu automatiskt " -"prenumerant till dom:" +"Dessa personer är redan registrerade användare och du blev automatiskt " +"prenumerat hos dem:" #: actions/invite.php:144 msgid "Invitation(s) sent to the following people:" -msgstr "Inbjudan(ar) är skickade till följande personer:" +msgstr "Inbjudning(ar) har skickats till följande personer:" #: actions/invite.php:150 msgid "" "You will be notified when your invitees accept the invitation and register " "on the site. Thanks for growing the community!" msgstr "" -"du kommer bli meddelad när någon du bjudit in accepterar inbjudan och " +"Du kommer bli meddelad när någon du bjudit in accepterar inbjudan och " "registrerar sig. Tack för att du hjälper oss växa!" #: actions/invite.php:162 @@ -1731,11 +1688,11 @@ msgid "" "Use this form to invite your friends and colleagues to use this service." msgstr "" "Använd detta formulär för att bjuda in dina vänner och kollegor till denna " -"sida." +"webbplats." #: actions/invite.php:187 msgid "Email addresses" -msgstr "Emailadresser" +msgstr "E-postadresser" #: actions/invite.php:189 msgid "Addresses of friends to invite (one per line)" @@ -1747,16 +1704,16 @@ msgstr "Personligt meddelande" #: actions/invite.php:194 msgid "Optionally add a personal message to the invitation." -msgstr "Om du vill, skriv ett personligt meddelande med inbjudan." +msgstr "Om du vill, skriv ett personligt meddelande till inbjudan." -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" msgstr "Skicka" #: actions/invite.php:226 #, php-format msgid "%1$s has invited you to join them on %2$s" -msgstr "%1$s har bjudit in dig till %2$s" +msgstr "%1$s har bjudit in dig att gå med dem på %2$s" #: actions/invite.php:228 #, php-format @@ -1788,92 +1745,62 @@ msgid "" "\n" "Sincerely, %2$s\n" msgstr "" -"%1$s har bjudit in dig till %2$s (%3$s).\n" -"\n" -"%2$s är en mikroblogg service som låter dig via sidan hålla direktkontakt " -"med människor du känner eller intresserar dig.\n" -"\n" -"Du kan även dela med dig utav nyheter om dig själv, dina tankar, eller ditt " -"liv online som känner igen dig. Det är också perfekt för att möta nya " -"personer som delar ditt intresse.\n" -"\n" -"%1$s sa:\n" -"\n" -"%4$s\n" -"\n" -"Du kan se %1$s's profilsida på %2$s här:\n" -"\n" -"%5$s\n" -"\n" -"Om du vill prova på denna service, klicka på länken nedan för att acceptera " -"denna inbjudan.\n" -"\n" -"%6$s\n" -"\n" -"Om inte, då kan du ignorera detta meddelande. Tack för att du tog dig\n" #: actions/joingroup.php:60 -#, fuzzy msgid "You must be logged in to join a group." -msgstr "du måste vara inloggad för att kunna bjuda in andra användare till %s" +msgstr "Du måste vara inloggad för att kunna gå med i en grupp." #: actions/joingroup.php:90 lib/command.php:217 -#, fuzzy msgid "You are already a member of that group" -msgstr "Du prenumererar redan på dessa användare:" +msgstr "Du är redan en medlem i denna grupp" #: actions/joingroup.php:128 lib/command.php:234 -#, fuzzy, php-format +#, php-format msgid "Could not join user %s to group %s" -msgstr "Kunde inte följa användaren: Användaren kunde inte hittas." +msgstr "Kunde inte ansluta användare %s till groupp %s" #: actions/joingroup.php:135 lib/command.php:239 -#, fuzzy, php-format +#, php-format msgid "%s joined group %s" -msgstr "%s / Favoriter från %s" +msgstr "%s gick med i grupp %s" #: actions/leavegroup.php:60 -#, fuzzy msgid "You must be logged in to leave a group." -msgstr "du måste vara inloggad för att kunna bjuda in andra användare till %s" +msgstr "Du måste vara inloggad för att lämna en grupp." #: actions/leavegroup.php:90 lib/command.php:268 -#, fuzzy msgid "You are not a member of that group." -msgstr "Du skickade inte oss den profilen" +msgstr "Du är inte en medlem i den gruppen." #: actions/leavegroup.php:119 lib/command.php:278 -#, fuzzy msgid "Could not find membership record." -msgstr "Kunde inte uppdatera användarens inställningar." +msgstr "Kunde inte hitta uppgift om medlemskap." #: actions/leavegroup.php:127 lib/command.php:284 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %s to group %s" -msgstr "Kunde inte följa användaren: Användaren kunde inte hittas." +msgstr "Kunde inte ta bort användare %s från grupp %s" #: actions/leavegroup.php:134 lib/command.php:289 #, php-format msgid "%s left group %s" -msgstr "" +msgstr "%s lämnade grupp %s" #: actions/login.php:79 actions/register.php:137 msgid "Already logged in." msgstr "Redan inloggad." #: actions/login.php:108 actions/login.php:118 -#, fuzzy msgid "Invalid or expired token." -msgstr "Ogiltig innehåll i inlägget " +msgstr "Ogiltig eller utgången token." #: actions/login.php:146 msgid "Incorrect username or password." msgstr "Felaktigt användarnamn eller lösenord." #: actions/login.php:152 -#, fuzzy msgid "Error setting user. You are probably not authorized." -msgstr "Inte tillstånd ännu." +msgstr "Fel vid inställning av användare. Du har sannolikt inte tillstånd." #: actions/login.php:207 actions/login.php:260 lib/action.php:458 #: lib/logingroupnav.php:79 @@ -1882,7 +1809,7 @@ msgstr "Logga in" #: actions/login.php:246 msgid "Login to site" -msgstr "" +msgstr "Logga in på webbplatsen" #: actions/login.php:249 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 @@ -1901,60 +1828,59 @@ msgstr "Kom ihåg mig" #: actions/login.php:256 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" -msgstr "Logga in automatiskt i framtiden; Ej för publika datorer!" +msgstr "Logga in automatiskt i framtiden; inte för delade datorer!" #: actions/login.php:266 msgid "Lost or forgotten password?" -msgstr "Glömt bort lösenord?" +msgstr "Tappat bort eller glömt ditt lösenord?" #: actions/login.php:285 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "" -"Av säkerhetsskäl, var vänlig skriv in ditt användarnamn och lösenord innan " -"du ändrar dina inställningar." +"Av säkerhetsskäl, var vänlig och skriv in ditt användarnamn och lösenord " +"igen innan du ändrar dina inställningar." #: actions/login.php:289 -#, fuzzy, php-format +#, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" "(%%action.register%%) a new account." msgstr "" "Logga in med ditt användarnamn och lösenord. Har du inget användarnamn ännu? " -"[Registrera](%%action.register%%) ett nytt konto, eller testa [OpenID](%%" -"action.openidlogin%%)." +"[Registrera](%%action.register%%) ett nytt konto." #: actions/makeadmin.php:91 msgid "Only an admin can make another user an admin." -msgstr "" +msgstr "Bara en administratör kan göra en annan användare till administratör." #: actions/makeadmin.php:95 #, php-format msgid "%s is already an admin for group \"%s\"." -msgstr "" +msgstr "%s är redan en administratör för grupp \"%s\"." #: actions/makeadmin.php:132 #, php-format msgid "Can't get membership record for %s in group %s" -msgstr "" +msgstr "Kan inte hämta uppgift om medlemskap för %s i grupp %s" #: actions/makeadmin.php:145 #, php-format msgid "Can't make %s an admin for group %s" -msgstr "" +msgstr "Kan inte göra %s till en administratör för grupp %s" #: actions/microsummary.php:69 msgid "No current status" -msgstr "" +msgstr "Ingen aktuell status" #: actions/newgroup.php:53 msgid "New group" -msgstr "" +msgstr "Ny grupp" #: actions/newgroup.php:110 msgid "Use this form to create a new group." -msgstr "" +msgstr "Använd detta formulär för att skapa en ny grupp." #: actions/newmessage.php:71 actions/newmessage.php:231 msgid "New message" @@ -1962,7 +1888,7 @@ msgstr "Nytt meddelande" #: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 msgid "You can't send a message to this user." -msgstr "Du kan inte skicka meddelande till den användaren." +msgstr "Du kan inte skicka ett meddelande till den användaren." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 #: lib/command.php:424 @@ -1971,35 +1897,35 @@ msgstr "Inget innehåll!" #: actions/newmessage.php:158 msgid "No recipient specified." -msgstr "Ingen mottagare tillagd." +msgstr "Ingen mottagare angiven." #: actions/newmessage.php:164 lib/command.php:370 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." -msgstr "Skicka inte meddelande till dig själv, viska lite tyst istället." +msgstr "" +"Skicka inte meddelande till dig själv; viska lite tyst till dig själv " +"istället." #: actions/newmessage.php:181 -#, fuzzy msgid "Message sent" -msgstr "Nytt meddelande" +msgstr "Meddelande skickat" #: actions/newmessage.php:185 lib/command.php:375 #, php-format msgid "Direct message to %s sent" -msgstr "" +msgstr "Direktmeddelande till %s skickat" #: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 msgid "Ajax Error" -msgstr "" +msgstr "AJAX-fel" #: actions/newnotice.php:69 msgid "New notice" -msgstr "Nytt inlägg" +msgstr "Ny notis" #: actions/newnotice.php:206 -#, fuzzy msgid "Notice posted" -msgstr "Inlägg" +msgstr "Notis postad" #: actions/noticesearch.php:68 #, php-format @@ -2007,17 +1933,17 @@ msgid "" "Search for notices on %%site.name%% by their contents. Separate search terms " "by spaces; they must be 3 characters or more." msgstr "" -"Sök efter innehåll i inlägg på %%site.name%%. Skilj söktermerna åt med " -"mellanslag; dom måste vara minst tre tecken långa." +"Sök efter innehåll i notiser på %%site.name%%. Skilj söktermerna åt med " +"mellanslag; de måste vara minst tre tecken långa." #: actions/noticesearch.php:78 msgid "Text search" -msgstr "Text sökning" +msgstr "Textsökning" #: actions/noticesearch.php:91 -#, fuzzy, php-format +#, php-format msgid "Search results for \"%s\" on %s" -msgstr "Sök i strömmen efter \"%s\"" +msgstr "Sökresultat för \"%s\" på %s" #: actions/noticesearch.php:121 #, php-format @@ -2025,6 +1951,8 @@ msgid "" "Be the first to [post on this topic](%%%%action.newnotice%%%%?" "status_textarea=%s)!" msgstr "" +"Bli först att [posta i detta ämne](%%%%action.newnotice%%%%?status_textarea=%" +"s)!" #: actions/noticesearch.php:124 #, php-format @@ -2032,123 +1960,121 @@ msgid "" "Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" +"Varför inte [registrera ett konto](%%%%action.register%%%%) och bli först " +"att [posta i detta ämne](%%%%action.newnotice%%%%?status_textarea=%s)!" #: actions/noticesearchrss.php:96 -#, fuzzy, php-format +#, php-format msgid "Updates with \"%s\"" -msgstr "Uppdateringar från %1$s på %2$s!" +msgstr "Uppdateringar med \"%s\"" #: actions/noticesearchrss.php:98 -#, fuzzy, php-format +#, php-format msgid "Updates matching search term \"%1$s\" on %2$s!" -msgstr "Alla uppdateringar som matchar söksträngen \"%s\"" +msgstr "Uppdateringar som matchar söksträngen \"%1$s\" på %2$s!" #: actions/nudge.php:85 msgid "" "This user doesn't allow nudges or hasn't confirmed or set his email yet." msgstr "" +"Denna användare har inte tillåtit knuffar eller har inte bekräftat eller " +"angett sitt e-post än." #: actions/nudge.php:94 msgid "Nudge sent" -msgstr "" +msgstr "Knuff sänd" #: actions/nudge.php:97 msgid "Nudge sent!" -msgstr "" +msgstr "Knuff sänd!" #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" -msgstr "Inlägget har ingen profil" +msgstr "Notisen har ingen profil" #: actions/oembed.php:86 actions/shownotice.php:180 #, php-format msgid "%1$s's status on %2$s" -msgstr "%1$s's status den %2$s" +msgstr "%1$ss status den %2$s" #: actions/oembed.php:157 -#, fuzzy msgid "content type " -msgstr "Anslut" +msgstr "innehållstyp " #: actions/oembed.php:160 msgid "Only " -msgstr "" +msgstr "Bara " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." -msgstr "Ingen support för det formatet." +msgstr "Ett dataformat som inte stödjs" #: actions/opensearch.php:64 msgid "People Search" -msgstr "Personer sökning" +msgstr "Personsökning" #: actions/opensearch.php:67 msgid "Notice Search" -msgstr "Inlägg sökning" +msgstr "Notissökning" #: actions/othersettings.php:60 -#, fuzzy msgid "Other Settings" -msgstr "Twitter inställningar" +msgstr "Övriga inställningar" #: actions/othersettings.php:71 msgid "Manage various other options." -msgstr "" +msgstr "Hantera diverse andra alternativ. " #: actions/othersettings.php:108 msgid " (free service)" -msgstr "" +msgstr "(fri tjänst)" #: actions/othersettings.php:116 msgid "Shorten URLs with" -msgstr "" +msgstr "Förkorta URL:er med" #: actions/othersettings.php:117 msgid "Automatic shortening service to use." -msgstr "" +msgstr "Automatiska förkortningstjänster att använda." #: actions/othersettings.php:122 -#, fuzzy msgid "View profile designs" -msgstr "Profil inställningar" +msgstr "Visa profilutseenden" #: actions/othersettings.php:123 msgid "Show or hide profile designs." -msgstr "" +msgstr "Visa eller göm profilutseenden." #: actions/othersettings.php:153 -#, fuzzy msgid "URL shortening service is too long (max 50 chars)." -msgstr "Språket är för långt(max 50 tecken)." +msgstr "Namnet på URL-förkortningstjänsen är för långt (max 50 tecken). " #: actions/outbox.php:58 #, php-format msgid "Outbox for %s - page %d" -msgstr "Outbox för %s - sida %d" +msgstr "Utkorg för %s - sida %d" #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" -msgstr "Outbox för %s" +msgstr "Utkorg för %s" #: actions/outbox.php:116 msgid "This is your outbox, which lists private messages you have sent." -msgstr "Detta är din outbox som innehåller meddelanden som du skickat." +msgstr "Detta är din utkorg som innehåller privata meddelanden du har skickat." #: actions/passwordsettings.php:58 msgid "Change password" msgstr "Byt lösenord" #: actions/passwordsettings.php:69 -#, fuzzy msgid "Change your password." -msgstr "Ändra ditt lösenord" +msgstr "Byt ditt lösenord." #: actions/passwordsettings.php:96 actions/recoverpassword.php:231 -#, fuzzy msgid "Password change" -msgstr "Lösenord är sparat." +msgstr "Byte av lösenord" #: actions/passwordsettings.php:104 msgid "Old password" @@ -2185,127 +2111,120 @@ msgstr "Lösenorden matchar inte." #: actions/passwordsettings.php:165 msgid "Incorrect old password" -msgstr "Felaktigt, gammalt lösenord" +msgstr "Felaktigt gammalt lösenord" #: actions/passwordsettings.php:181 msgid "Error saving user; invalid." -msgstr "Fel uppstog när användare skulle sparas." +msgstr "Fel vid sparande av användare; ogiltig." #: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." -msgstr "Kan inte spara det nya lösenordet." +msgstr "Kan inte spara nytt lösenord." #: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." -msgstr "Lösenord är sparat." +msgstr "Lösenord sparat." #: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 msgid "Paths" -msgstr "" +msgstr "Sökvägar" #: actions/pathsadminpanel.php:70 msgid "Path and server settings for this StatusNet site." -msgstr "" +msgstr "Sökvägs- och serverinställningar för denna StatusNet-webbplats." #: actions/pathsadminpanel.php:140 -#, fuzzy, php-format +#, php-format msgid "Theme directory not readable: %s" -msgstr "Denna sida är inte tillgänglig i den mediatyp du accepterat" +msgstr "Katalog med teman är inte läsbar: %s" #: actions/pathsadminpanel.php:146 #, php-format msgid "Avatar directory not writable: %s" -msgstr "" +msgstr "Katalog med avatarer är inte skrivbar: %s" #: actions/pathsadminpanel.php:152 #, php-format msgid "Background directory not writable: %s" -msgstr "" +msgstr "Katalog med bakgrunder är inte skrivbar: %s" #: actions/pathsadminpanel.php:160 #, php-format msgid "Locales directory not readable: %s" -msgstr "" +msgstr "Katalog med lokaliseringfiler (locales) är inte läsbar. %s" #: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:299 -#, fuzzy msgid "Site" -msgstr "Bjud in" +msgstr "Webbplats" #: actions/pathsadminpanel.php:216 msgid "Path" -msgstr "" +msgstr "Sökväg" #: actions/pathsadminpanel.php:216 -#, fuzzy msgid "Site path" -msgstr "Nytt inlägg" +msgstr "Sökväg till webbplats" #: actions/pathsadminpanel.php:220 msgid "Path to locales" -msgstr "" +msgstr "Sökväg till lokaliseringfiler (locales)" #: actions/pathsadminpanel.php:220 msgid "Directory path to locales" -msgstr "" +msgstr "Katalogsökväg till lokaliseringfiler (locales)" #: actions/pathsadminpanel.php:227 msgid "Theme" -msgstr "" +msgstr "Teman" #: actions/pathsadminpanel.php:232 msgid "Theme server" -msgstr "" +msgstr "Server med teman" #: actions/pathsadminpanel.php:236 msgid "Theme path" -msgstr "" +msgstr "Sökväg till teman" #: actions/pathsadminpanel.php:240 msgid "Theme directory" -msgstr "" +msgstr "Katalog med teman" #: actions/pathsadminpanel.php:247 -#, fuzzy msgid "Avatars" -msgstr "Användarbild" +msgstr "Avatarer" #: actions/pathsadminpanel.php:252 -#, fuzzy msgid "Avatar server" -msgstr "Twitter inställningar" +msgstr "Server med avatarer" #: actions/pathsadminpanel.php:256 -#, fuzzy msgid "Avatar path" -msgstr "Användarbilden uppdaterad." +msgstr "Sökväg till avatarer" #: actions/pathsadminpanel.php:260 -#, fuzzy msgid "Avatar directory" -msgstr "Användarbilden uppdaterad." +msgstr "Katalog med avatarer" #: actions/pathsadminpanel.php:269 msgid "Backgrounds" -msgstr "" +msgstr "Bakgrunder" #: actions/pathsadminpanel.php:273 msgid "Background server" -msgstr "" +msgstr "Server med bakgrunder" #: actions/pathsadminpanel.php:277 msgid "Background path" -msgstr "" +msgstr "Sökväg till bakgrunder" #: actions/pathsadminpanel.php:281 msgid "Background directory" -msgstr "" +msgstr "Katalog med bakgrunder" #: actions/pathsadminpanel.php:297 -#, fuzzy msgid "Save paths" -msgstr "Nytt inlägg" +msgstr "Spara sökvägar" #: actions/peoplesearch.php:52 #, php-format @@ -4610,11 +4529,7 @@ msgid "" "You can upload your personal background image. The maximum file size is 2MB." msgstr "Du kan uppdatera din personliga profil här" -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "" - -#: lib/designsettings.php:468 +#: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "" @@ -5089,7 +5004,7 @@ msgstr "Tabort inlägg" msgid "To" msgstr "" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 #, fuzzy msgid "Available characters" msgstr "Minst 6 tecken" @@ -5104,11 +5019,11 @@ msgstr "Skicka ett meddelande" msgid "What's up, %s?" msgstr "Vad är på gång, %s?" -#: lib/noticeform.php:193 +#: lib/noticeform.php:192 msgid "Attach" msgstr "" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "" @@ -5393,7 +5308,12 @@ msgstr "Kunde inte prenumerera på annat åt dig." msgid "Not subscribed!" msgstr "Ingen prenumerant!" -#: lib/subs.php:140 +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "Kunde inte radera prenumerationen. " + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "Kunde inte radera prenumerationen. " diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index fd36953430..b9461933d5 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-02 23:18+0000\n" -"PO-Revision-Date: 2009-12-02 23:20:50+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"PO-Revision-Date: 2009-12-05 19:55:11+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: te\n" "X-Message-Group: out-statusnet\n" @@ -182,7 +182,12 @@ msgstr "వాడుకరికి ప్రొఫైలు లేదు." msgid "Could not save profile." msgstr "ప్రొఫైలుని భద్రపరచలేకున్నాం." -#: actions/apiblockcreate.php:108 +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "వాడుకరిని తాజాకరించలేకున్నాం." + +#: actions/apiblockcreate.php:119 msgid "Block user failed." msgstr "వాడుకరి నిరోధం విఫలమైంది." @@ -818,101 +823,101 @@ msgstr "రూపురేఖలు" msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:270 +#: actions/designadminpanel.php:275 #, fuzzy msgid "Invalid logo URL." msgstr "తప్పుడు పరిమాణం." -#: actions/designadminpanel.php:274 +#: actions/designadminpanel.php:279 #, php-format msgid "Theme not available: %s" msgstr "అలంకారం అందుబాటులో లేదు: %s" -#: actions/designadminpanel.php:370 +#: actions/designadminpanel.php:375 msgid "Change logo" msgstr "చిహ్నాన్ని మార్చు" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:380 msgid "Site logo" msgstr "సైటు చిహ్నం" -#: actions/designadminpanel.php:382 +#: actions/designadminpanel.php:387 msgid "Change theme" msgstr "అలంకారాన్ని మార్చు" -#: actions/designadminpanel.php:399 +#: actions/designadminpanel.php:404 msgid "Site theme" msgstr "సైటు అలంకారం" -#: actions/designadminpanel.php:400 +#: actions/designadminpanel.php:405 msgid "Theme for the site." msgstr "సైటుకి అలంకారం." -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" msgstr "నేపథ్య చిత్రాన్ని మార్చు" -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" msgstr "నేపథ్యం" -#: actions/designadminpanel.php:422 +#: actions/designadminpanel.php:427 #, fuzzy, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "మీ స్వంత నేపథ్యపు చిత్రాన్ని మీరు ఎక్కించవచ్చు. గరిష్ఠ ఫైలు పరిమాణం 2మెబై." -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" msgstr "" -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:469 lib/designsettings.php:156 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:161 +#: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 +#: actions/designadminpanel.php:488 lib/designsettings.php:170 msgid "Change colours" msgstr "రంగులను మార్చు" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 +#: actions/designadminpanel.php:510 lib/designsettings.php:191 msgid "Content" msgstr "విషయం" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 +#: actions/designadminpanel.php:523 lib/designsettings.php:204 msgid "Sidebar" msgstr "పక్కపట్టీ" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "పాఠ్యం" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 +#: actions/designadminpanel.php:549 lib/designsettings.php:230 msgid "Links" msgstr "లంకెలు" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -922,7 +927,7 @@ msgstr "" msgid "Save" msgstr "భద్రపరచు" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "రూపురేఖలని భద్రపరచు" @@ -1346,19 +1351,19 @@ msgid "" "palette of your choice." msgstr "" -#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 -#: lib/designsettings.php:434 lib/designsettings.php:464 +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 #, fuzzy msgid "Couldn't update your design." msgstr "వాడుకరిని తాజాకరించలేకున్నాం." -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings!" msgstr "" -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 #, fuzzy msgid "Design preferences saved." msgstr "అభిరుచులు భద్రమయ్యాయి." @@ -1659,7 +1664,7 @@ msgstr "వ్యక్తిగత సందేశం" msgid "Optionally add a personal message to the invitation." msgstr "ఐచ్ఛికంగా ఆహ్వానానికి వ్యక్తిగత సందేశం చేర్చండి." -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" msgstr "పంపించు" @@ -1949,8 +1954,8 @@ msgstr "విషయ రకం " msgid "Only " msgstr "మాత్రమే " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." msgstr "" @@ -4394,11 +4399,7 @@ msgid "" "You can upload your personal background image. The maximum file size is 2MB." msgstr "మీ స్వంత నేపథ్యపు చిత్రాన్ని మీరు ఎక్కించవచ్చు. గరిష్ఠ ఫైలు పరిమాణం 2మెబై." -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "" - -#: lib/designsettings.php:468 +#: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "" @@ -4850,7 +4851,7 @@ msgstr "" msgid "To" msgstr "" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 msgid "Available characters" msgstr "అందుబాటులో ఉన్న అక్షరాలు" @@ -4864,11 +4865,11 @@ msgstr "కొత్త సందేశం" msgid "What's up, %s?" msgstr "%s, సంగతులేమిటి?" -#: lib/noticeform.php:193 +#: lib/noticeform.php:192 msgid "Attach" msgstr "జోడించు" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "ఒక ఫైలుని జోడించు" @@ -5145,7 +5146,12 @@ msgstr "" msgid "Not subscribed!" msgstr "చందాదార్లు" -#: lib/subs.php:140 +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "చందాని తొలగించలేకపోయాం." + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "చందాని తొలగించలేకపోయాం." diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index bbb9c2df96..e7ae86b4e7 100644 --- a/locale/tr/LC_MESSAGES/statusnet.po +++ b/locale/tr/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-02 23:18+0000\n" -"PO-Revision-Date: 2009-12-02 23:20:53+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"PO-Revision-Date: 2009-12-05 19:55:14+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: tr\n" "X-Message-Group: out-statusnet\n" @@ -183,7 +183,12 @@ msgstr "Kullanıcının profili yok." msgid "Could not save profile." msgstr "Profil kaydedilemedi." -#: actions/apiblockcreate.php:108 +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "Kullanıcı güncellenemedi." + +#: actions/apiblockcreate.php:119 msgid "Block user failed." msgstr "" @@ -836,50 +841,50 @@ msgstr "" msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:270 +#: actions/designadminpanel.php:275 #, fuzzy msgid "Invalid logo URL." msgstr "Geçersiz büyüklük." -#: actions/designadminpanel.php:274 +#: actions/designadminpanel.php:279 #, fuzzy, php-format msgid "Theme not available: %s" msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil" -#: actions/designadminpanel.php:370 +#: actions/designadminpanel.php:375 #, fuzzy msgid "Change logo" msgstr "Parolayı değiştir" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:380 #, fuzzy msgid "Site logo" msgstr "Yeni durum mesajı" -#: actions/designadminpanel.php:382 +#: actions/designadminpanel.php:387 #, fuzzy msgid "Change theme" msgstr "Değiştir" -#: actions/designadminpanel.php:399 +#: actions/designadminpanel.php:404 #, fuzzy msgid "Site theme" msgstr "Yeni durum mesajı" -#: actions/designadminpanel.php:400 +#: actions/designadminpanel.php:405 msgid "Theme for the site." msgstr "" -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" msgstr "" -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" msgstr "" -#: actions/designadminpanel.php:422 +#: actions/designadminpanel.php:427 #, fuzzy, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" @@ -887,59 +892,59 @@ msgid "" msgstr "" "Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?" -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" msgstr "" -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:469 lib/designsettings.php:156 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:161 +#: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 +#: actions/designadminpanel.php:488 lib/designsettings.php:170 #, fuzzy msgid "Change colours" msgstr "Parolayı değiştir" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 +#: actions/designadminpanel.php:510 lib/designsettings.php:191 #, fuzzy msgid "Content" msgstr "Bağlan" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 +#: actions/designadminpanel.php:523 lib/designsettings.php:204 #, fuzzy msgid "Sidebar" msgstr "Ara" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 +#: actions/designadminpanel.php:549 lib/designsettings.php:230 #, fuzzy msgid "Links" msgstr "Giriş" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -949,7 +954,7 @@ msgstr "" msgid "Save" msgstr "Kaydet" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1387,19 +1392,19 @@ msgid "" "palette of your choice." msgstr "" -#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 -#: lib/designsettings.php:434 lib/designsettings.php:464 +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 #, fuzzy msgid "Couldn't update your design." msgstr "Kullanıcı güncellenemedi." -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings!" msgstr "" -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 #, fuzzy msgid "Design preferences saved." msgstr "Tercihler kaydedildi." @@ -1716,7 +1721,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" msgstr "Gönder" @@ -2015,8 +2020,8 @@ msgstr "Bağlan" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." msgstr "" @@ -4495,11 +4500,7 @@ msgid "" msgstr "" "Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?" -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "" - -#: lib/designsettings.php:468 +#: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "" @@ -4964,7 +4965,7 @@ msgstr "" msgid "To" msgstr "" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 #, fuzzy msgid "Available characters" msgstr "6 veya daha fazla karakter" @@ -4979,11 +4980,11 @@ msgstr "Yeni durum mesajı" msgid "What's up, %s?" msgstr "N'aber %s?" -#: lib/noticeform.php:193 +#: lib/noticeform.php:192 msgid "Attach" msgstr "" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "" @@ -5263,7 +5264,12 @@ msgstr "" msgid "Not subscribed!" msgstr "Bu kullanıcıyı zaten takip etmiyorsunuz!" -#: lib/subs.php:140 +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "Abonelik silinemedi." + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "Abonelik silinemedi." diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index b3fb434654..165e56bca3 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-02 23:18+0000\n" -"PO-Revision-Date: 2009-12-02 23:20:56+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"PO-Revision-Date: 2009-12-05 19:55:17+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: out-statusnet\n" @@ -189,7 +189,12 @@ msgstr "Користувач не має профілю." msgid "Could not save profile." msgstr "Не вдалося зберегти профіль." -#: actions/apiblockcreate.php:108 +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "Не можна відписатись від самого себе!" + +#: actions/apiblockcreate.php:119 msgid "Block user failed." msgstr "Спроба заблокувати користувача невдала." @@ -825,45 +830,45 @@ msgstr "Дизайн" msgid "Design settings for this StatusNet site." msgstr "Налаштування дизайну для цього сайту StatusNet." -#: actions/designadminpanel.php:270 +#: actions/designadminpanel.php:275 msgid "Invalid logo URL." msgstr "Помилкова URL-адреса логотипу." -#: actions/designadminpanel.php:274 +#: actions/designadminpanel.php:279 #, php-format msgid "Theme not available: %s" msgstr "Тема не доступна: %s" -#: actions/designadminpanel.php:370 +#: actions/designadminpanel.php:375 msgid "Change logo" msgstr "Змінити логотип" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:380 msgid "Site logo" msgstr "Логотип сайту" -#: actions/designadminpanel.php:382 +#: actions/designadminpanel.php:387 msgid "Change theme" msgstr "Змінити тему" -#: actions/designadminpanel.php:399 +#: actions/designadminpanel.php:404 msgid "Site theme" msgstr "Тема сайту" -#: actions/designadminpanel.php:400 +#: actions/designadminpanel.php:405 msgid "Theme for the site." msgstr "Тема для цього сайту." -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" msgstr "Змінити фонове зображення" -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" msgstr "Фон" -#: actions/designadminpanel.php:422 +#: actions/designadminpanel.php:427 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" @@ -872,55 +877,55 @@ msgstr "" "Ви можете завантажити фонове зображення для сайту. Максимальний розмір файлу " "%1$s." -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" msgstr "Увімк." -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" msgstr "Вимк." -#: actions/designadminpanel.php:469 lib/designsettings.php:156 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "Увімкнути або вимкнути фонове зображення." -#: actions/designadminpanel.php:474 lib/designsettings.php:161 +#: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" msgstr "Замостити фон" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 +#: actions/designadminpanel.php:488 lib/designsettings.php:170 msgid "Change colours" msgstr "Змінити кольори" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 +#: actions/designadminpanel.php:510 lib/designsettings.php:191 msgid "Content" msgstr "Зміст" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 +#: actions/designadminpanel.php:523 lib/designsettings.php:204 msgid "Sidebar" msgstr "Бічна панель" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "Текст" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 +#: actions/designadminpanel.php:549 lib/designsettings.php:230 msgid "Links" msgstr "Посилання" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" msgstr "За замовч." -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" msgstr "Оновити налаштування за замовчуванням" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" msgstr "Повернутись до початкових налаштувань" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -930,7 +935,7 @@ msgstr "Повернутись до початкових налаштувань" msgid "Save" msgstr "Зберегти" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "Зберегти дизайн" @@ -1366,18 +1371,18 @@ msgstr "" "Налаштуйте вигляд сторінки групи, використовуючи фонове зображення і кольори " "на свій смак." -#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 -#: lib/designsettings.php:434 lib/designsettings.php:464 +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 msgid "Couldn't update your design." msgstr "Не вдалося оновити дизайн." -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings!" msgstr "Не маю можливості зберегти Ваші налаштування дизайну!" -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "Преференції дизайну збережно." @@ -1705,7 +1710,7 @@ msgstr "Особисті повідомлення" msgid "Optionally add a personal message to the invitation." msgstr "Можна додати персональне повідомлення до запрошення (опціонально)." -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" msgstr "Так!" @@ -2033,8 +2038,8 @@ msgstr "тип змісту " msgid "Only " msgstr "Лише " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." msgstr "Такий формат даних не підтримується." @@ -2823,11 +2828,9 @@ msgid "Invalid profile URL (bad format)" msgstr "Недійсна URL-адреса профілю (неправильний формат)" #: actions/remotesubscribe.php:168 -#, fuzzy msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)." msgstr "" -"Це недійсна URL-адреса профілю (немає документа YADIS; немає або помилкове " -"визначення XRDS)." +"Неправильна URL-адреса профілю (немає документа YADIS, або помилковий XRDS)." #: actions/remotesubscribe.php:176 msgid "That’s a local profile! Login to subscribe." @@ -4473,7 +4476,6 @@ msgstr[1] "Ви є учасником таких груп:" msgstr[2] "Ви є учасником таких груп:" #: lib/command.php:652 -#, fuzzy msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4511,40 +4513,40 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" "Команди:\n" -"on - увімкнути сповіщення\n" -"off - вимкнути сповіщення\n" -"help - список команд\n" -"follow - підписатись до користувача\n" -"groups - групи, до яких Ви входите\n" -"subscriptions - користувачі, до яких Ви підписані\n" -"subscribers - користувачі, які підписані до Вас\n" -"leave - відписатись від користувача\n" -"d - надіслати особисте повідомлення\n" -"get - отримати останній допис користувача\n" -"whois - інфо про користувача\n" -"fav - додати останній допис користувача до обраних\n" -"fav # - додати допис #номер до обраних\n" -"reply # - відповісти на допис #номер\n" -"reply - відповісти на останній допис користувача\n" -"join - приєднатися до групи\n" -"login - отримати посилання для входу у веб-інтерфейс\n" -"drop - залишити групу\n" -"stats - отримати статистику\n" -"stop - те саме що і 'off'\n" -"quit - те саме що і 'off'\n" -"sub - те саме що і 'follow'\n" -"unsub - те саме що і 'leave'\n" -"last - те саме що і 'get'\n" -"on - наразі не виконується\n" -"off - наразі не виконується\n" -"nudge - «розштовхати»\n" -"invite - наразі не виконується\n" -"track - наразі не виконується\n" -"untrack - наразі не виконується\n" -"track off - наразі не виконується\n" -"untrack all - наразі не виконується\n" -"tracks - наразі не виконується\n" -"tracking - наразі не виконується\n" +"on — увімкнути сповіщення\n" +"off — вимкнути сповіщення\n" +"help — список команд\n" +"follow — підписатись до користувача\n" +"groups — групи, до яких Ви входите\n" +"subscriptions — користувачі, до яких Ви підписані\n" +"subscribers — користувачі, які підписані до Вас\n" +"leave — відписатись від користувача\n" +"d — надіслати особисте повідомлення\n" +"get — отримати останній допис користувача\n" +"whois — інфо про користувача\n" +"fav — додати останній допис користувача до обраних\n" +"fav # — додати допис до обраних\n" +"reply # — відповісти на допис\n" +"reply — відповісти на останній допис користувача\n" +"join — приєднатися до групи\n" +"login — отримати посилання для входу у веб-інтерфейс\n" +"drop — залишити групу\n" +"stats — отримати статистику\n" +"stop — те саме що і 'off'\n" +"quit — те саме що і 'off'\n" +"sub — те саме що і 'follow'\n" +"unsub — те саме що і 'leave'\n" +"last — те саме що і 'get'\n" +"on — наразі не виконується\n" +"off — наразі не виконується\n" +"nudge — «розштовхати»\n" +"invite — наразі не виконується\n" +"track — наразі не виконується\n" +"untrack — наразі не виконується\n" +"track off — наразі не виконується\n" +"untrack all — наразі не виконується\n" +"tracks — наразі не виконується\n" +"tracking — наразі не виконується\n" #: lib/common.php:199 msgid "No configuration file found. " @@ -4589,11 +4591,7 @@ msgstr "" "Ви можете завантажити власне фонове зображення. Максимальний розмір файлу " "становить 2Мб." -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "Помилка кольорів за замовчуванням: " - -#: lib/designsettings.php:468 +#: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "Дизайн за замовчуванням відновлено." @@ -5128,7 +5126,7 @@ msgstr "Надіслати прямий допис" msgid "To" msgstr "До" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 msgid "Available characters" msgstr "Лишилось знаків" @@ -5141,11 +5139,11 @@ msgstr "Надіслати допис" msgid "What's up, %s?" msgstr "Що нового, %s?" -#: lib/noticeform.php:193 +#: lib/noticeform.php:192 msgid "Attach" msgstr "Вкласти" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "Вкласти файл" @@ -5412,7 +5410,12 @@ msgstr "Не вдалося підписати інших до Вас." msgid "Not subscribed!" msgstr "Не підписано!" -#: lib/subs.php:140 +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "Не вдалося видалити підписку." + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "Не вдалося видалити підписку." diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index b77e2e8fc4..bf323467cb 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: 2009-12-02 23:18+0000\n" -"PO-Revision-Date: 2009-12-02 23:21:00+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"PO-Revision-Date: 2009-12-05 19:55:19+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: vi\n" "X-Message-Group: out-statusnet\n" @@ -184,7 +184,12 @@ msgstr "Người dùng không có thông tin." msgid "Could not save profile." msgstr "Không thể lưu hồ sơ cá nhân." -#: actions/apiblockcreate.php:108 +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "Không thể cập nhật thành viên." + +#: actions/apiblockcreate.php:119 msgid "Block user failed." msgstr "" @@ -846,52 +851,52 @@ msgstr "" msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:270 +#: actions/designadminpanel.php:275 #, fuzzy msgid "Invalid logo URL." msgstr "Kích thước không hợp lệ." -#: actions/designadminpanel.php:274 +#: actions/designadminpanel.php:279 #, fuzzy, php-format msgid "Theme not available: %s" msgstr "Trang này không phải là phương tiện truyền thông mà bạn chấp nhận." -#: actions/designadminpanel.php:370 +#: actions/designadminpanel.php:375 #, fuzzy msgid "Change logo" msgstr "Thay đổi mật khẩu của bạn" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:380 #, fuzzy msgid "Site logo" msgstr "Thư mời" -#: actions/designadminpanel.php:382 +#: actions/designadminpanel.php:387 #, fuzzy msgid "Change theme" msgstr "Thay đổi" -#: actions/designadminpanel.php:399 +#: actions/designadminpanel.php:404 #, fuzzy msgid "Site theme" msgstr "Thông báo mới" -#: actions/designadminpanel.php:400 +#: actions/designadminpanel.php:405 msgid "Theme for the site." msgstr "" -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 #, fuzzy msgid "Change background image" msgstr "Background Theme:" -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 #, fuzzy msgid "Background" msgstr "Background Theme:" -#: actions/designadminpanel.php:422 +#: actions/designadminpanel.php:427 #, fuzzy, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" @@ -900,60 +905,60 @@ msgstr "" "Bạn có thể cập nhật hồ sơ cá nhân tại đây để mọi người có thể biết thông tin " "về bạn." -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" msgstr "" -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:469 lib/designsettings.php:156 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:161 +#: actions/designadminpanel.php:479 lib/designsettings.php:161 #, fuzzy msgid "Tile background image" msgstr "Background Theme:" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 +#: actions/designadminpanel.php:488 lib/designsettings.php:170 #, fuzzy msgid "Change colours" msgstr "Thay đổi mật khẩu của bạn" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 +#: actions/designadminpanel.php:510 lib/designsettings.php:191 #, fuzzy msgid "Content" msgstr "Kết nối" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 +#: actions/designadminpanel.php:523 lib/designsettings.php:204 #, fuzzy msgid "Sidebar" msgstr "Tìm kiếm" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "Chuỗi bất kỳ" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 +#: actions/designadminpanel.php:549 lib/designsettings.php:230 #, fuzzy msgid "Links" msgstr "Đăng nhập" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -963,7 +968,7 @@ msgstr "" msgid "Save" msgstr "Lưu" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 #, fuzzy msgid "Save design" msgstr "Lưu" @@ -1431,20 +1436,20 @@ msgid "" "palette of your choice." msgstr "" -#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 -#: lib/designsettings.php:434 lib/designsettings.php:464 +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 #, fuzzy msgid "Couldn't update your design." msgstr "Không thể cập nhật thành viên." -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 #, fuzzy msgid "Unable to save your design settings!" msgstr "Không thể lưu thông tin Twitter của bạn!" -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 #, fuzzy msgid "Design preferences saved." msgstr "Các tính năng đã được lưu." @@ -1772,7 +1777,7 @@ msgstr "Tin nhắn cá nhân" msgid "Optionally add a personal message to the invitation." msgstr "Không bắt buộc phải thêm thông điệp vào thư mời." -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" msgstr "Gửi" @@ -2106,8 +2111,8 @@ msgstr "Kết nối" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." msgstr "Không hỗ trợ định dạng dữ liệu này." @@ -4664,11 +4669,7 @@ msgstr "" "Bạn có thể cập nhật hồ sơ cá nhân tại đây để mọi người có thể biết thông tin " "về bạn." -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "" - -#: lib/designsettings.php:468 +#: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "" @@ -5189,7 +5190,7 @@ msgstr "Xóa tin nhắn" msgid "To" msgstr "" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 #, fuzzy msgid "Available characters" msgstr "Nhiều hơn 6 ký tự" @@ -5204,11 +5205,11 @@ msgstr "Thông báo mới" msgid "What's up, %s?" msgstr "Bạn đang làm gì thế, %s?" -#: lib/noticeform.php:193 +#: lib/noticeform.php:192 msgid "Attach" msgstr "" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "" @@ -5499,7 +5500,12 @@ msgstr "Không thể tạo favorite." msgid "Not subscribed!" msgstr "Chưa đăng nhận!" -#: lib/subs.php:140 +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "Không thể xóa đăng nhận." + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "Không thể xóa đăng nhận." diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index 2d0853339c..041b4402e9 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.po +++ b/locale/zh_CN/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-02 23:18+0000\n" -"PO-Revision-Date: 2009-12-02 23:21:03+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"PO-Revision-Date: 2009-12-05 19:55:23+0000\n" "Language-Team: Simplified Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hans\n" "X-Message-Group: out-statusnet\n" @@ -186,7 +186,12 @@ msgstr "用户没有个人信息。" msgid "Could not save profile." msgstr "无法保存个人信息。" -#: actions/apiblockcreate.php:108 +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "无法更新用户。" + +#: actions/apiblockcreate.php:119 msgid "Block user failed." msgstr "阻止用户失败。" @@ -842,110 +847,110 @@ msgstr "" msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:270 +#: actions/designadminpanel.php:275 #, fuzzy msgid "Invalid logo URL." msgstr "大小不正确。" -#: actions/designadminpanel.php:274 +#: actions/designadminpanel.php:279 #, fuzzy, php-format msgid "Theme not available: %s" msgstr "这个页面不提供您想要的媒体类型" -#: actions/designadminpanel.php:370 +#: actions/designadminpanel.php:375 #, fuzzy msgid "Change logo" msgstr "修改密码" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:380 #, fuzzy msgid "Site logo" msgstr "邀请" -#: actions/designadminpanel.php:382 +#: actions/designadminpanel.php:387 #, fuzzy msgid "Change theme" msgstr "修改" -#: actions/designadminpanel.php:399 +#: actions/designadminpanel.php:404 #, fuzzy msgid "Site theme" msgstr "新通告" -#: actions/designadminpanel.php:400 +#: actions/designadminpanel.php:405 #, fuzzy msgid "Theme for the site." msgstr "登出本站" -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" msgstr "" -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" msgstr "" -#: actions/designadminpanel.php:422 +#: actions/designadminpanel.php:427 #, fuzzy, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "你可以给你的组上载一个logo图。" -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" msgstr "" -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:469 lib/designsettings.php:156 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:161 +#: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 +#: actions/designadminpanel.php:488 lib/designsettings.php:170 #, fuzzy msgid "Change colours" msgstr "修改密码" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 +#: actions/designadminpanel.php:510 lib/designsettings.php:191 #, fuzzy msgid "Content" msgstr "连接" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 +#: actions/designadminpanel.php:523 lib/designsettings.php:204 #, fuzzy msgid "Sidebar" msgstr "搜索" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "文本" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 +#: actions/designadminpanel.php:549 lib/designsettings.php:230 #, fuzzy msgid "Links" msgstr "登录" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -955,7 +960,7 @@ msgstr "" msgid "Save" msgstr "保存" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1404,20 +1409,20 @@ msgid "" "palette of your choice." msgstr "" -#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 -#: lib/designsettings.php:434 lib/designsettings.php:464 +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 #, fuzzy msgid "Couldn't update your design." msgstr "无法更新用户。" -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 #, fuzzy msgid "Unable to save your design settings!" msgstr "无法保存 Twitter 设置！" -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 #, fuzzy msgid "Design preferences saved." msgstr "同步选项已保存。" @@ -1731,7 +1736,7 @@ msgstr "个人消息" msgid "Optionally add a personal message to the invitation." msgstr "在邀请中加几句话(可选)。" -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" msgstr "发送" @@ -2048,8 +2053,8 @@ msgstr "连接" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." msgstr "不支持的数据格式。" @@ -4568,11 +4573,7 @@ msgid "" "You can upload your personal background image. The maximum file size is 2MB." msgstr "您可以在这里上传个人头像。" -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "" - -#: lib/designsettings.php:468 +#: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "" @@ -5048,7 +5049,7 @@ msgstr "删除通告" msgid "To" msgstr "到" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 #, fuzzy msgid "Available characters" msgstr "6 个或更多字符" @@ -5063,11 +5064,11 @@ msgstr "发送消息" msgid "What's up, %s?" msgstr "怎么样，%s？" -#: lib/noticeform.php:193 +#: lib/noticeform.php:192 msgid "Attach" msgstr "" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "" @@ -5355,7 +5356,12 @@ msgstr "无法订阅他人更新。" msgid "Not subscribed!" msgstr "未订阅！" -#: lib/subs.php:140 +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "无法删除订阅。" + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "无法删除订阅。" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index 17a54af33a..4325d5cde6 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: 2009-12-02 23:18+0000\n" -"PO-Revision-Date: 2009-12-02 23:21:06+0000\n" +"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"PO-Revision-Date: 2009-12-05 19:55:27+0000\n" "Language-Team: Traditional Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hant\n" "X-Message-Group: out-statusnet\n" @@ -183,7 +183,12 @@ msgstr "" msgid "Could not save profile." msgstr "無法儲存個人資料" -#: actions/apiblockcreate.php:108 +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "無法更新使用者" + +#: actions/apiblockcreate.php:119 msgid "Block user failed." msgstr "" @@ -830,108 +835,108 @@ msgstr "" msgid "Design settings for this StatusNet site." msgstr "" -#: actions/designadminpanel.php:270 +#: actions/designadminpanel.php:275 #, fuzzy msgid "Invalid logo URL." msgstr "尺寸錯誤" -#: actions/designadminpanel.php:274 +#: actions/designadminpanel.php:279 #, fuzzy, php-format msgid "Theme not available: %s" msgstr "個人首頁位址錯誤" -#: actions/designadminpanel.php:370 +#: actions/designadminpanel.php:375 #, fuzzy msgid "Change logo" msgstr "更改密碼" -#: actions/designadminpanel.php:375 +#: actions/designadminpanel.php:380 #, fuzzy msgid "Site logo" msgstr "新訊息" -#: actions/designadminpanel.php:382 +#: actions/designadminpanel.php:387 #, fuzzy msgid "Change theme" msgstr "更改" -#: actions/designadminpanel.php:399 +#: actions/designadminpanel.php:404 #, fuzzy msgid "Site theme" msgstr "新訊息" -#: actions/designadminpanel.php:400 +#: actions/designadminpanel.php:405 msgid "Theme for the site." msgstr "" -#: actions/designadminpanel.php:412 lib/designsettings.php:101 +#: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" msgstr "" -#: actions/designadminpanel.php:417 actions/designadminpanel.php:492 +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" msgstr "" -#: actions/designadminpanel.php:422 +#: actions/designadminpanel.php:427 #, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "" -#: actions/designadminpanel.php:452 lib/designsettings.php:139 +#: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" msgstr "" -#: actions/designadminpanel.php:468 lib/designsettings.php:155 +#: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" msgstr "" -#: actions/designadminpanel.php:469 lib/designsettings.php:156 +#: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." msgstr "" -#: actions/designadminpanel.php:474 lib/designsettings.php:161 +#: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" msgstr "" -#: actions/designadminpanel.php:483 lib/designsettings.php:170 +#: actions/designadminpanel.php:488 lib/designsettings.php:170 #, fuzzy msgid "Change colours" msgstr "更改密碼" -#: actions/designadminpanel.php:505 lib/designsettings.php:191 +#: actions/designadminpanel.php:510 lib/designsettings.php:191 #, fuzzy msgid "Content" msgstr "連結" -#: actions/designadminpanel.php:518 lib/designsettings.php:204 +#: actions/designadminpanel.php:523 lib/designsettings.php:204 msgid "Sidebar" msgstr "" -#: actions/designadminpanel.php:531 lib/designsettings.php:217 +#: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "" -#: actions/designadminpanel.php:544 lib/designsettings.php:230 +#: actions/designadminpanel.php:549 lib/designsettings.php:230 #, fuzzy msgid "Links" msgstr "登入" -#: actions/designadminpanel.php:572 lib/designsettings.php:247 +#: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" msgstr "" -#: actions/designadminpanel.php:573 lib/designsettings.php:248 +#: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" msgstr "" -#: actions/designadminpanel.php:579 lib/designsettings.php:254 +#: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" msgstr "" -#: actions/designadminpanel.php:581 actions/emailsettings.php:195 +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 #: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 #: actions/siteadminpanel.php:421 actions/smssettings.php:181 @@ -941,7 +946,7 @@ msgstr "" msgid "Save" msgstr "" -#: actions/designadminpanel.php:582 lib/designsettings.php:257 +#: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1375,19 +1380,19 @@ msgid "" "palette of your choice." msgstr "" -#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 -#: lib/designsettings.php:434 lib/designsettings.php:464 +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 #, fuzzy msgid "Couldn't update your design." msgstr "無法更新使用者" -#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings!" msgstr "" -#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "" @@ -1691,7 +1696,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225 +#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 msgid "Send" msgstr "" @@ -1977,8 +1982,8 @@ msgstr "連結" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 -#: lib/api.php:1027 lib/api.php:1137 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 +#: lib/api.php:1024 lib/api.php:1134 msgid "Not a supported data format." msgstr "" @@ -4410,11 +4415,7 @@ msgid "" "You can upload your personal background image. The maximum file size is 2MB." msgstr "" -#: lib/designsettings.php:372 -msgid "Bad default color settings: " -msgstr "" - -#: lib/designsettings.php:468 +#: lib/designsettings.php:418 msgid "Design defaults restored." msgstr "" @@ -4875,7 +4876,7 @@ msgstr "" msgid "To" msgstr "" -#: lib/messageform.php:162 lib/noticeform.php:186 +#: lib/messageform.php:161 lib/noticeform.php:185 #, fuzzy msgid "Available characters" msgstr "6個以上字元" @@ -4890,11 +4891,11 @@ msgstr "新訊息" msgid "What's up, %s?" msgstr "" -#: lib/noticeform.php:193 +#: lib/noticeform.php:192 msgid "Attach" msgstr "" -#: lib/noticeform.php:197 +#: lib/noticeform.php:196 msgid "Attach a file" msgstr "" @@ -5169,7 +5170,12 @@ msgstr "" msgid "Not subscribed!" msgstr "此帳號已註冊" -#: lib/subs.php:140 +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "無法刪除帳號" + +#: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "無法刪除帳號" From a555963f979a26e1276e28b56f2cab048155d7fd Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sat, 5 Dec 2009 23:12:56 +0000 Subject: [PATCH 035/172] Preliminary UI for Play/Pause behaviour on hover state for notices --- plugins/Realtime/realtimeupdate.js | 57 +++++++++++++++++++----------- 1 file changed, 36 insertions(+), 21 deletions(-) diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js index ce0297339d..a760158b02 100644 --- a/plugins/Realtime/realtimeupdate.js +++ b/plugins/Realtime/realtimeupdate.js @@ -191,13 +191,13 @@ RealtimeUpdate = { initActions: function(url, timeline, path) { - var NP = $('#notices_primary'); - NP.prepend('
    '); + $('#notices_primary').prepend('
    '); RealtimeUpdate._pluginPath = path; RealtimeUpdate.initPlayPause(); RealtimeUpdate.initAddPopup(url, timeline, RealtimeUpdate._pluginPath); + RealtimeUpdate.addNoticesHover(); }, initPlayPause: function() @@ -207,14 +207,14 @@ RealtimeUpdate = { showPause: function() { - RT_PP = $('#realtime_playpause'); - RT_PP.empty(); - RT_PP.append(''); + RealtimeUpdate._paused = false; + RealtimeUpdate.showQueuedNotices(); - RT_P = $('#realtime_pause'); - RT_P.bind('click', function() { - RealtimeUpdate._paused = true; + $('#realtime_playpause').remove(); + $('#realtime_actions').prepend('
    • '); + $('#realtime_pause').bind('click', function() { + RealtimeUpdate.removeNoticesHover(); RealtimeUpdate.showPlay(); return false; }); @@ -222,18 +222,14 @@ RealtimeUpdate = { showPlay: function() { - RT_PP = $('#realtime_playpause'); - RT_PP.empty(); - RT_PP.append(' '); + RealtimeUpdate._paused = true; - RT_P = $('#realtime_play'); - RT_P.bind('click', function() { - RealtimeUpdate._paused = false; + $('#realtime_playpause').remove(); + $('#realtime_actions').prepend('
    • '); + $('#realtime_play').bind('click', function() { + RealtimeUpdate.addNoticesHover(); RealtimeUpdate.showPause(); - - RealtimeUpdate.showQueuedNotices(); - return false; }); }, @@ -259,13 +255,32 @@ RealtimeUpdate = { $('#realtime_playpause #queued_counter').empty(); }, + addNoticesHover: function() + { + $('#notices_primary .notices').hover( + function() { + if (RealtimeUpdate._paused === false) { + RealtimeUpdate.showPlay(); + } + }, + function() { + if (RealtimeUpdate._paused === true) { + RealtimeUpdate.showPause(); + } + } + ); + }, + + removeNoticesHover: function() + { + $('#notices_primary .notices').unbind('hover'); + }, + initAddPopup: function(url, timeline, path) { - var NP = $('#realtime_timeline'); - NP.append(''); + $('#realtime_timeline').append(''); - var PP = $('#realtime_popup'); - PP.bind('click', function() { + $('#realtime_popup').bind('click', function() { window.open(url, '', 'toolbar=no,resizable=yes,scrollbars=yes,status=no,menubar=no,personalbar=no,location=no,width=500,height=550'); From 75cac0fd6b94f77ec8ff32ebc89ec513ee102831 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Sat, 5 Dec 2009 21:03:27 -0500 Subject: [PATCH 036/172] Added 'login' command that gives you a link that can be used to login to the website --- actions/login.php | 9 +++----- classes/Login_token.php | 42 ++++++++++++++++++++++++++++++++++++++ classes/statusnet.ini | 1 + db/08to09.sql | 11 +++++++++- db/08to09_pg.sql | 10 ++++++++- db/statusnet.sql | 10 +++++++++ db/statusnet_pg.sql | 12 ++++++++++- lib/command.php | 27 ++++++++++++++++++++++++ lib/commandinterpreter.php | 6 ++++++ lib/router.php | 2 ++ 10 files changed, 121 insertions(+), 9 deletions(-) create mode 100644 classes/Login_token.php diff --git a/actions/login.php b/actions/login.php index cd13268134..cee29fd09e 100644 --- a/actions/login.php +++ b/actions/login.php @@ -79,6 +79,8 @@ class LoginAction extends Action $this->clientError(_('Already logged in.')); } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { $this->checkLogin(); + } else if (isset($args['user_id']) && isset($args['token'])){ + $this->checkLogin($args['user_id'],$args['token']); } else { common_ensure_session(); $this->showForm(); @@ -95,7 +97,7 @@ class LoginAction extends Action * @return void */ - function checkLogin() + function checkLogin($user_id=null, $token=null) { if(isset($token) && isset($user_id)){ //Token based login (from the LoginCommand) @@ -137,11 +139,6 @@ class LoginAction extends Action $user = common_check_user($nickname, $password); } - $nickname = common_canonical_nickname($this->trimmed('nickname')); - $password = $this->arg('password'); - - $user = common_check_user($nickname, $password); - if (!$user) { $this->showForm(_('Incorrect username or password.')); return; diff --git a/classes/Login_token.php b/classes/Login_token.php new file mode 100644 index 0000000000..c172b30abc --- /dev/null +++ b/classes/Login_token.php @@ -0,0 +1,42 @@ +. + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } + +require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; + +class Login_token extends Memcached_DataObject +{ + ###START_AUTOCODE + /* the code below is auto generated do not remove the above tag */ + + public $__table = 'login_token'; // table name + public $user_id; // int(4) primary_key not_null + public $token; // char(32) not_null + public $created; // datetime() not_null + public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP + + /* Static get */ + function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Login_token',$k,$v); } + + /* the code above is auto generated do not remove the tag below */ + ###END_AUTOCODE +} diff --git a/classes/statusnet.ini b/classes/statusnet.ini index 835faeb0b4..253f458798 100644 --- a/classes/statusnet.ini +++ b/classes/statusnet.ini @@ -260,6 +260,7 @@ modified = 384 [login_token__keys] user_id = K +token = K [message] id = 129 diff --git a/db/08to09.sql b/db/08to09.sql index 8d463fab4c..64640f4ced 100644 --- a/db/08to09.sql +++ b/db/08to09.sql @@ -72,4 +72,13 @@ create table location_namespace ( created datetime not null comment 'date the record was created', modified timestamp comment 'date this record was modified' -) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; \ No newline at end of file +) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; + +create table login_token ( + user_id integer not null comment 'user owning this token' references user (id), + token char(32) not null comment 'token useable for logging in', + created datetime not null comment 'date this record was created', + modified timestamp comment 'date this record was modified', + + constraint primary key (user_id) +) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql index b312d47dd8..0bd47dea56 100644 --- a/db/08to09_pg.sql +++ b/db/08to09_pg.sql @@ -39,6 +39,15 @@ create table profile_role ( ); +create table login_token ( + user_id integer not null /* comment 'user owning this token'*/ references "user" (id), + token char(32) not null /* comment 'token useable for logging in'*/, + created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created'*/, + modified timestamp /* comment 'date this record was modified'*/, + + primary key (user_id) +); + DROP index fave_user_id_idx; CREATE index fave_user_id_idx on fave (user_id,modified); @@ -60,4 +69,3 @@ ALTER TABLE profile ADD COLUMN lat decimal(10,7) /*comment 'latitude'*/ ; ALTER TABLE profile ADD COLUMN lon decimal(10,7) /*comment 'longitude'*/; ALTER TABLE profile ADD COLUMN location_id integer /* comment 'location id if possible'*/; ALTER TABLE profile ADD COLUMN location_ns integer /* comment 'namespace for location'*/; - \ No newline at end of file diff --git a/db/statusnet.sql b/db/statusnet.sql index f7b3b113b4..18abcdfdb2 100644 --- a/db/statusnet.sql +++ b/db/statusnet.sql @@ -575,3 +575,13 @@ create table location_namespace ( modified timestamp comment 'date this record was modified' ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; + +create table login_token ( + user_id integer not null comment 'user owning this token' references user (id), + token char(32) not null comment 'token useable for logging in', + created datetime not null comment 'date this record was created', + modified timestamp comment 'date this record was modified', + + constraint primary key (user_id) +) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; + diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql index cd72d66eab..81b329d1e5 100644 --- a/db/statusnet_pg.sql +++ b/db/statusnet_pg.sql @@ -570,4 +570,14 @@ create table profile_role ( primary key (profile_id, role) -); \ No newline at end of file +); + +create table login_token ( + user_id integer not null /* comment 'user owning this token'*/ references "user" (id), + token char(32) not null /* comment 'token useable for logging in'*/, + created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created'*/, + modified timestamp /* comment 'date this record was modified'*/, + + primary key (user_id) +); + diff --git a/lib/command.php b/lib/command.php index bcc551c817..7e98156b66 100644 --- a/lib/command.php +++ b/lib/command.php @@ -579,6 +579,32 @@ class OnCommand extends Command } } +class LoginCommand extends Command +{ + function execute($channel) + { + $login_token = Login_token::staticGet('user_id',$this->user->id); + if($login_token){ + $login_token->delete(); + } + $login_token = new Login_token(); + $login_token->user_id = $this->user->id; + $login_token->token = common_good_rand(16); + $login_token->created = common_sql_now(); + $result = $login_token->insert(); + if (!$result) { + common_log_db_error($login_token, 'INSERT', __FILE__); + $channel->error($this->user, sprintf(_('Could not create login token for %s'), + $this->user->nickname)); + return; + } + $channel->output($this->user, + sprintf(_('This link is useable only once, and is good for only 2 minutes: %s'), + common_local_url('login', + array('user_id'=>$login_token->user_id, 'token'=>$login_token->token)))); + } +} + class SubscriptionsCommand extends Command { function execute($channel) @@ -666,6 +692,7 @@ class HelpCommand extends Command "reply # - reply to notice with a given id\n". "reply - reply to the last notice from user\n". "join - join group\n". + "login - Get a link to login to the web interface\n". "drop - leave group\n". "stats - get your stats\n". "stop - same as 'off'\n". diff --git a/lib/commandinterpreter.php b/lib/commandinterpreter.php index 25f2e4b3eb..665015afcc 100644 --- a/lib/commandinterpreter.php +++ b/lib/commandinterpreter.php @@ -41,6 +41,12 @@ class CommandInterpreter return null; } return new HelpCommand($user); + case 'login': + if ($arg) { + return null; + } else { + return new LoginCommand($user); + } case 'subscribers': if ($arg) { return null; diff --git a/lib/router.php b/lib/router.php index 1a090861e4..37525319f7 100644 --- a/lib/router.php +++ b/lib/router.php @@ -88,6 +88,8 @@ class Router $m->connect('doc/:title', array('action' => 'doc')); + $m->connect('main/login?user_id=:user_id&token=:token', array('action'=>'login'), array('user_id'=> '[0-9]+', 'token'=>'.+')); + // main stuff is repetitive $main = array('login', 'logout', 'register', 'subscribe', From 3b14b61fa745d4906796ac49e78ae712f61e9643 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Sat, 5 Dec 2009 21:04:20 -0500 Subject: [PATCH 037/172] Add a configuration option to disable the login command. $config['logincommand']['disabled'] = true; This commit should be reverted once the command has been sufficiently tested and trusted. --- actions/login.php | 5 ++++- lib/command.php | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/actions/login.php b/actions/login.php index cee29fd09e..a6f86c0ca1 100644 --- a/actions/login.php +++ b/actions/login.php @@ -75,11 +75,14 @@ class LoginAction extends Action function handle($args) { parent::handle($args); + + $disabled = common_config('logincommand','disabled'); + if (common_is_real_login()) { $this->clientError(_('Already logged in.')); } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { $this->checkLogin(); - } else if (isset($args['user_id']) && isset($args['token'])){ + } else if (!isset($disabled) && isset($args['user_id']) && isset($args['token'])){ $this->checkLogin($args['user_id'],$args['token']); } else { common_ensure_session(); diff --git a/lib/command.php b/lib/command.php index 7e98156b66..e2a6655111 100644 --- a/lib/command.php +++ b/lib/command.php @@ -583,6 +583,11 @@ class LoginCommand extends Command { function execute($channel) { + $disabled = common_config('logincommand','disabled'); + if(isset($disabled)) { + $channel->error($this->user, _('Login command is disabled')); + return; + } $login_token = Login_token::staticGet('user_id',$this->user->id); if($login_token){ $login_token->delete(); From 49005881bd31a022e59574277866aada41e4b76d Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 6 Dec 2009 22:07:49 +0000 Subject: [PATCH 038/172] Minor fix for play/pause mouseleave --- plugins/Realtime/realtimeupdate.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js index a760158b02..577499bf7f 100644 --- a/plugins/Realtime/realtimeupdate.js +++ b/plugins/Realtime/realtimeupdate.js @@ -197,7 +197,6 @@ RealtimeUpdate = { RealtimeUpdate.initPlayPause(); RealtimeUpdate.initAddPopup(url, timeline, RealtimeUpdate._pluginPath); - RealtimeUpdate.addNoticesHover(); }, initPlayPause: function() @@ -209,6 +208,7 @@ RealtimeUpdate = { { RealtimeUpdate._paused = false; RealtimeUpdate.showQueuedNotices(); + RealtimeUpdate.addNoticesHover(); $('#realtime_playpause').remove(); $('#realtime_actions').prepend('
    • '); @@ -228,7 +228,6 @@ RealtimeUpdate = { $('#realtime_actions').prepend('
    • '); $('#realtime_play').bind('click', function() { - RealtimeUpdate.addNoticesHover(); RealtimeUpdate.showPause(); return false; }); @@ -273,7 +272,7 @@ RealtimeUpdate = { removeNoticesHover: function() { - $('#notices_primary .notices').unbind('hover'); + $('#notices_primary .notices').unbind(); }, initAddPopup: function(url, timeline, path) From af0f905e2487bd00a0c888f1ddc704fb8ce44731 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 7 Dec 2009 09:55:12 +0000 Subject: [PATCH 039/172] If the XHR error suggests that the xhr.status is 0 (i.e., it didn't receive an XHR object as expected), threat it as a success like HTTP 20x or 30x because the notice most likely went through. jquery.form.js (for file uploads) and meteor.js both use an iframe and they (somehow) appear to be in conflict. Notice always goes through, however, xhr.status is 0. Further investigation is needed. --- js/util.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/js/util.js b/js/util.js index 73fcf37bee..259d566596 100644 --- a/js/util.js +++ b/js/util.js @@ -192,12 +192,13 @@ var SN = { // StatusNet form.append(document._importNode($('.'+SN.C.S.Error, xhr.responseXML)[0], true)); } else { - if(jQuery.inArray(parseInt(xhr.status), SN.C.I.HTTP20x30x) < 0) { - form.append('

    (Sorry! We had trouble sending your notice ('+xhr.status+' '+xhr.statusText+'). Please report the problem to the site administrator if this happens again.

    '); } } } From c9b6a90c99691089e8552fb3094e6432766233ed Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 7 Dec 2009 10:08:07 +0000 Subject: [PATCH 040/172] Use .resetForm() instead of manually setting notice form's control values to null --- js/util.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/js/util.js b/js/util.js index 259d566596..c6e546bd0e 100644 --- a/js/util.js +++ b/js/util.js @@ -249,9 +249,7 @@ var SN = { // StatusNet form.append('

    '+result_title+'

    '); } } - $('#'+form_id+' #'+SN.C.S.NoticeDataText).val(''); - $('#'+form_id+' #'+SN.C.S.NoticeDataAttach).val(''); - $('#'+form_id+' #'+SN.C.S.NoticeInReplyTo).val(''); + $('#'+form_id).resetForm(); $('#'+form_id+' #'+SN.C.S.NoticeDataAttachSelected).remove(); SN.U.FormNoticeEnhancements($('#'+form_id)); } From 5a55b5a3ce2247ae37bad840a797b00748732f47 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 7 Dec 2009 10:10:17 +0000 Subject: [PATCH 041/172] Fixed missing " for element attribute --- js/util.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/util.js b/js/util.js index c6e546bd0e..972c97d12d 100644 --- a/js/util.js +++ b/js/util.js @@ -185,7 +185,7 @@ var SN = { // StatusNet $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled); $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled, SN.C.S.Disabled); if (textStatus == 'timeout') { - form.append('

    Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.

    '); } else { if ($('.'+SN.C.S.Error, xhr.responseXML).length > 0) { @@ -198,7 +198,7 @@ var SN = { // StatusNet SN.U.FormNoticeEnhancements($('#'+form_id)); } else { - form.append('

    (Sorry! We had trouble sending your notice ('+xhr.status+' '+xhr.statusText+'). Please report the problem to the site administrator if this happens again.

    '); } } } From c4f329ed54dbaca99fe1589f0c8d715e875743e5 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 7 Dec 2009 10:26:29 +0000 Subject: [PATCH 042/172] Added form_response class to XHR notice posts --- js/util.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/js/util.js b/js/util.js index 972c97d12d..ed6a781f74 100644 --- a/js/util.js +++ b/js/util.js @@ -184,8 +184,9 @@ var SN = { // StatusNet form.removeClass(SN.C.S.Processing); $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled); $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled, SN.C.S.Disabled); + $('#'+form_id+' .form_response').remove(); if (textStatus == 'timeout') { - form.append('

    Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.

    '); + form.append('

    Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.

    '); } else { if ($('.'+SN.C.S.Error, xhr.responseXML).length > 0) { @@ -198,17 +199,18 @@ var SN = { // StatusNet SN.U.FormNoticeEnhancements($('#'+form_id)); } else { - form.append('

    (Sorry! We had trouble sending your notice ('+xhr.status+' '+xhr.statusText+'). Please report the problem to the site administrator if this happens again.

    '); + form.append('

    (Sorry! We had trouble sending your notice ('+xhr.status+' '+xhr.statusText+'). Please report the problem to the site administrator if this happens again.

    '); } } } }, success: function(data, textStatus) { + $('#'+form_id+' .form_response').remove(); var result; if ($('#'+SN.C.S.Error, data).length > 0) { result = document._importNode($('p', data)[0], true); result = result.textContent || result.innerHTML; - form.append('

    '+result+'

    '); + form.append('

    '+result+'

    '); } else { if($('body')[0].id == 'bookmarklet') { @@ -218,7 +220,7 @@ var SN = { // StatusNet if ($('#'+SN.C.S.CommandResult, data).length > 0) { result = document._importNode($('p', data)[0], true); result = result.textContent || result.innerHTML; - form.append('

    '+result+'

    '); + form.append('

    '+result+'

    '); } else { var notices = $('#notices_primary .notices'); @@ -246,7 +248,7 @@ var SN = { // StatusNet else { result = document._importNode($('title', data)[0], true); result_title = result.textContent || result.innerHTML; - form.append('

    '+result_title+'

    '); + form.append('

    '+result_title+'

    '); } } $('#'+form_id).resetForm(); From 189296c5a0130c151bed5e96367bcf33e7ac1b2f Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 7 Dec 2009 11:44:43 +0000 Subject: [PATCH 043/172] Using localStorage to keep the play/pause state of RealtimeUpdate --- plugins/Realtime/realtimeupdate.js | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js index 577499bf7f..13b7235892 100644 --- a/plugins/Realtime/realtimeupdate.js +++ b/plugins/Realtime/realtimeupdate.js @@ -201,12 +201,19 @@ RealtimeUpdate = { initPlayPause: function() { - RealtimeUpdate.showPause(); + if (typeof(localStorage) != 'undefined') { + if (localStorage.getItem('RealtimeUpdate_paused') === 'true') { + RealtimeUpdate.showPlay(); + } + else { + RealtimeUpdate.showPause(); + } + } }, showPause: function() { - RealtimeUpdate._paused = false; + RealtimeUpdate.setPause(false); RealtimeUpdate.showQueuedNotices(); RealtimeUpdate.addNoticesHover(); @@ -222,8 +229,7 @@ RealtimeUpdate = { showPlay: function() { - RealtimeUpdate._paused = true; - + RealtimeUpdate.setPause(true); $('#realtime_playpause').remove(); $('#realtime_actions').prepend('
    • '); @@ -233,6 +239,14 @@ RealtimeUpdate = { }); }, + setPause: function(state) + { + RealtimeUpdate._paused = state; + if (typeof(localStorage) != 'undefined') { + localStorage.setItem('RealtimeUpdate_paused', RealtimeUpdate._paused); + } + }, + showQueuedNotices: function() { $.each(RealtimeUpdate._queuedNotices, function(i, n) { From 11dab47e2d91c7f88819a1576609d7ef7f63ee64 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 7 Dec 2009 12:12:32 +0000 Subject: [PATCH 044/172] If localStorage is not supported, showPause as usual --- plugins/Realtime/realtimeupdate.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js index 13b7235892..56a52433f4 100644 --- a/plugins/Realtime/realtimeupdate.js +++ b/plugins/Realtime/realtimeupdate.js @@ -201,7 +201,10 @@ RealtimeUpdate = { initPlayPause: function() { - if (typeof(localStorage) != 'undefined') { + if (typeof(localStorage) == 'undefined') { + RealtimeUpdate.showPause(); + } + else { if (localStorage.getItem('RealtimeUpdate_paused') === 'true') { RealtimeUpdate.showPlay(); } From 0c955b7c88b41fa28d079eb639abb748583ab4eb Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 7 Dec 2009 12:13:42 -0500 Subject: [PATCH 045/172] remove unit tests for minify --- .../min_unit_tests/HTTP_ConditionalGet/2.php | 44 - .../min_unit_tests/HTTP_ConditionalGet/3.php | 40 - .../min_unit_tests/HTTP_ConditionalGet/4.php | 49 - .../min_unit_tests/HTTP_ConditionalGet/5.php | 27 - .../HTTP_ConditionalGet/_include.php | 64 - .../HTTP_ConditionalGet/index.php | 36 - .../min_unit_tests/HTTP_Encoder/green.png | Bin 202 -> 0 bytes .../min_unit_tests/HTTP_Encoder/index.php | 60 - .../extlib/minify/min_unit_tests/_inc.php | 50 - .../_test_files/css/comments.css | 9 - .../_test_files/css/comments.min.css | 3 - .../min_unit_tests/_test_files/css/hacks.css | 66 - .../_test_files/css/hacks.min.css | 4 - .../_test_files/css/issue62.css | 890 ----- .../_test_files/css/issue62.min.css | 25 - .../_test_files/css/paths_prepend.css | 12 - .../_test_files/css/paths_prepend.min.css | 1 - .../_test_files/css/paths_rewrite.css | 14 - .../_test_files/css/paths_rewrite.min.css | 1 - .../min_unit_tests/_test_files/css/readme.txt | 1 - .../_test_files/css/selectors.css | 42 - .../_test_files/css/selectors.min.css | 37 - .../min_unit_tests/_test_files/css/styles.css | 31 - .../_test_files/css/styles.min.css | 3 - .../_test_files/css/subsilver.css | 434 --- .../_test_files/css/subsilver.min.css | 18 - .../_test_files/css/unusual_strings.css | 10 - .../_test_files/css/unusual_strings.min.css | 2 - .../_test_files/css/vladmirated.css | 658 ---- .../_test_files/css/vladmirated.min.css | 79 - .../_test_files/css_uriRewriter/exp.css | 14 - .../_test_files/css_uriRewriter/in.css | 14 - .../_test_files/html/before.html | 96 - .../_test_files/html/before.min.html | 36 - .../_test_files/html/before2.html | 95 - .../_test_files/html/before2.min.html | 36 - .../importProcessor/1/adjacent.css | 3 - .../_test_files/importProcessor/1/tv.css | 4 - .../_test_files/importProcessor/adjacent.css | 4 - .../_test_files/importProcessor/input.css | 4 - .../_test_files/importProcessor/output.css | 48 - .../min_unit_tests/_test_files/js/before.js | 57 - .../_test_files/js/before.min.js | 22 - .../_test_files/js/before.min_plus.js | 22 - .../min_unit_tests/_test_files/js/condcomm.js | 14 - .../_test_files/js/condcomm.min_plus.js | 13 - .../min_unit_tests/_test_files/js/issue74.js | 4 - .../_test_files/js/issue74.min.js | 1 - .../_test_files/js/issue74.min_plus.js | 1 - .../_test_files/js/jquery-1.2.3.js | 3408 ----------------- .../_test_files/minify/QueryString.js | 168 - .../_test_files/minify/email.js | 24 - .../_test_files/minify/issue73_1.js | 2 - .../_test_files/minify/issue73_2.js | 3 - .../_test_files/minify/issue89_1.css | 7 - .../_test_files/minify/issue89_2.css | 7 - .../_test_files/minify/issue89_out.min.css | 1 - .../_test_files/minify/lines_bugs.js | 2 - .../_test_files/minify/lines_output.js | 280 -- .../_test_files/minify/minified.css | 5 - .../_test_files/minify/minified.js | 12 - .../test_HTTP_ConditionalGet.php | 137 - .../min_unit_tests/test_HTTP_Encoder.php | 260 -- .../minify/min_unit_tests/test_JSMin.php | 63 - .../minify/min_unit_tests/test_JSMinPlus.php | 80 - .../minify/min_unit_tests/test_Minify.php | 213 -- .../min_unit_tests/test_Minify_Build.php | 36 - .../minify/min_unit_tests/test_Minify_CSS.php | 53 - .../test_Minify_CSS_UriRewriter.php | 56 - .../min_unit_tests/test_Minify_Cache_APC.php | 33 - .../min_unit_tests/test_Minify_Cache_File.php | 54 - .../test_Minify_Cache_Memcache.php | 38 - .../test_Minify_CommentPreserver.php | 37 - .../min_unit_tests/test_Minify_HTML.php | 59 - .../test_Minify_ImportProcessor.php | 48 - .../min_unit_tests/test_Minify_Lines.php | 36 - .../extlib/minify/min_unit_tests/test_all.php | 17 - .../min_unit_tests/test_environment.php | 100 - .../min_unit_tests/test_js_in_browser.html | 4 - 79 files changed, 8441 deletions(-) delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/2.php delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/3.php delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/4.php delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/5.php delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/_include.php delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/index.php delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/HTTP_Encoder/green.png delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/HTTP_Encoder/index.php delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_inc.php delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/comments.css delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/comments.min.css delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/hacks.css delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/hacks.min.css delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/issue62.css delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/issue62.min.css delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/paths_prepend.css delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/paths_prepend.min.css delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/paths_rewrite.css delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/paths_rewrite.min.css delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/readme.txt delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/selectors.css delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/selectors.min.css delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/styles.css delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/styles.min.css delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/subsilver.css delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/subsilver.min.css delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/unusual_strings.css delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/unusual_strings.min.css delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/vladmirated.css delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/vladmirated.min.css delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css_uriRewriter/exp.css delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/css_uriRewriter/in.css delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/html/before.html delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/html/before.min.html delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/html/before2.html delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/html/before2.min.html delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/1/adjacent.css delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/1/tv.css delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/adjacent.css delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/input.css delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/output.css delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/before.js delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/before.min.js delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/before.min_plus.js delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/condcomm.js delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/condcomm.min_plus.js delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/issue74.js delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/issue74.min.js delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/issue74.min_plus.js delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/jquery-1.2.3.js delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/minify/QueryString.js delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/minify/email.js delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/minify/issue73_1.js delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/minify/issue73_2.js delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/minify/issue89_1.css delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/minify/issue89_2.css delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/minify/issue89_out.min.css delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/minify/lines_bugs.js delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/minify/lines_output.js delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/minify/minified.css delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/_test_files/minify/minified.js delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_HTTP_ConditionalGet.php delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_HTTP_Encoder.php delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_JSMin.php delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_JSMinPlus.php delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_Minify.php delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_Minify_Build.php delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_Minify_CSS.php delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_Minify_CSS_UriRewriter.php delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_Minify_Cache_APC.php delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_Minify_Cache_File.php delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_Minify_Cache_Memcache.php delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_Minify_CommentPreserver.php delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_Minify_HTML.php delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_Minify_ImportProcessor.php delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_Minify_Lines.php delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_all.php delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_environment.php delete mode 100644 plugins/Minify/extlib/minify/min_unit_tests/test_js_in_browser.html diff --git a/plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/2.php b/plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/2.php deleted file mode 100644 index 9b66f24932..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/2.php +++ /dev/null @@ -1,44 +0,0 @@ - $lastModified -)); -if ($cg->cacheIsValid) { - $cg->sendHeaders(); - // we're done - exit(); -} - -// generate content -$title = 'Last-Modified is known : add Content-Length'; -$explain = ' -

    Here, like the first example, we know the Last-Modified time, -but we also want to set the Content-Length to increase cacheability and allow -HTTP persistent connections. Instead of sending headers immediately, we first -generate our content, then use setContentLength(strlen($content)) -to add the header. Then finally call sendHeaders() and send the -content.

    -

    Note: This is not required if your PHP config buffers all -output and your script doesn\'t do any incremental flushing of the output -buffer. PHP will generally set Content-Length for you if it can.

    -

    This script emulates a document that changes every ' .$every. ' seconds. -
    This is version: ' . date('r', $lastModified) . '

    -'; - -require '_include.php'; -$content = get_content(array( - 'title' => $title - ,'explain' => $explain -)); - -$cg->setContentLength(strlen($content)); -$cg->sendHeaders(); -send_slowly($content); - diff --git a/plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/3.php b/plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/3.php deleted file mode 100644 index 8f5482ba89..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/3.php +++ /dev/null @@ -1,40 +0,0 @@ -When Last-Modified is unknown, you can still use ETags, but you need a short -string that is unique for that content. In the worst case, you have to generate -all the content first, then instantiate HTTP_ConditionalGet, setting -the array key contentHash to the output of a hash function of the -content. Since we have the full content, we might as well also use -setContentLength(strlen($content)) in the case where we need to -send it.

    -

    This script emulates a document that changes every ' .$every. ' seconds. -
    This is version: ' . date('r', $lastModified) . '

    -'; -require '_include.php'; -$content = get_content(array( - 'title' => $title - ,'explain' => $explain -)); - -$cg = new HTTP_ConditionalGet(array( - 'contentHash' => substr(md5($content), 7) -)); -if ($cg->cacheIsValid) { - $cg->sendHeaders(); - // we're done - exit(); -} -$cg->setContentLength(strlen($content)); -$cg->sendHeaders(); - -send_slowly($content); - diff --git a/plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/4.php b/plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/4.php deleted file mode 100644 index 4b77d2084b..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/4.php +++ /dev/null @@ -1,49 +0,0 @@ - $lastModified - ,'encoding' => $enc -)); -$cg->sendHeaders(); -if ($cg->cacheIsValid) { - // we're done - exit(); -} - -// output encoded content - -$title = 'ConditionalGet + Encoder'; -$explain = ' -

    Using ConditionalGet and Encoder is straightforward. First impliment the -ConditionalGet, then if the cache is not valid, encode and send the content

    -

    This script emulates a document that changes every ' .$every. ' seconds. -
    This is version: ' . date('r', $lastModified) . '

    -'; -require '_include.php'; -$content = get_content(array( - 'title' => $title - ,'explain' => $explain -)); - -$he = new HTTP_Encoder(array( - 'content' => get_content(array( - 'title' => $title - ,'explain' => $explain - )) -)); -$he->encode(); - -// usually you would just $he->sendAll(), but here we want to emulate slow -// connection -$he->sendHeaders(); -send_slowly($he->getContent()); diff --git a/plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/5.php b/plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/5.php deleted file mode 100644 index b443c19734..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/5.php +++ /dev/null @@ -1,27 +0,0 @@ - 20 - ,'lastModifiedTime' => filemtime(__FILE__) -)); -$cg->sendHeaders(); - -// generate, send content -$title = 'Last-Modified + Expires'; -$explain = ' -

    Here we set a static "lastModifiedTime" and "maxAge" to 20. The browser -will consider this document fresh for 20 seconds, then revalidate its cache. After -the 304 response, the cache will be good for another 20 seconds. Unless you force -a reload, there will only be 304 responses for this page after the initial download. -'; - -require '_include.php'; -echo get_content(array( - 'title' => $title - ,'explain' => $explain -)); - diff --git a/plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/_include.php b/plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/_include.php deleted file mode 100644 index 9b65ae12e4..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/HTTP_ConditionalGet/_include.php +++ /dev/null @@ -1,64 +0,0 @@ - - - - - -HTTP_ConditionalGet : <?php echo $data['title']; ?> - - -

    HTTP_ConditionalGet

    -

    - - -

    Notes

    -

    How to distinguish 200 and 304 responses

    -

    For these pages all 200 responses are sent in chunks a second apart, so you -should notice that 304 responses are quicker. You can also use HTTP sniffers -like Fiddler (win) and -LiveHTTPHeaders (Firefox add-on) -to verify headers and content being sent.

    -

    Browser notes

    -
    -
    Opera
    -
    Opera has a couple behaviors against the HTTP spec: Manual refreshes (F5) - prevents the ETag/If-Modified-Since headers from being sent; it only sends - them when following a link or bookmark. Also, Opera will not honor the - must-revalidate Cache-Control value unless max-age - is set. To get Opera to follow the spec, ConditionalGet will send Opera max-age=0 - (if one is not already set).
    -
    Safari
    -
    ETag validation is unsupported, but Safari supports HTTP/1.0 validation via - If-Modified-Since headers as long as the cache is explicitly marked - "public" or "private" ("private" is default in ConditionalGet).
    -
    - - - $lastModified -)); -$cg->sendHeaders(); -if ($cg->cacheIsValid) { - // we're done - exit(); -} - -$title = 'Last-Modified is known : simple usage'; -$explain = ' -

    If your content has not changed since a certain timestamp, set this via the -the lastModifiedTime array key when instantiating HTTP_ConditionalGet. -You can immediately call the method sendHeaders() to set the -Last-Modified, ETag, and Cache-Control headers. The, if cacheIsValid -property is false, you echo the content.

    -

    This script emulates a document that changes every ' .$every. ' seconds. -
    This is version: ' . date('r', $lastModified) . '

    -'; - -require '_include.php'; - -echo send_slowly(get_content(array( - 'title' => $title - ,'explain' => $explain -))); - diff --git a/plugins/Minify/extlib/minify/min_unit_tests/HTTP_Encoder/green.png b/plugins/Minify/extlib/minify/min_unit_tests/HTTP_Encoder/green.png deleted file mode 100644 index d9d3a308aec0e9c7be676a8bc5438e5c61427ff2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_{3?x-PN__%S%*9TgAsieWw;%dH0CL#^d_r6q z{xkglf9682r8`iBv%n*=n1O-o0|+xZtudJa6cj6QjVN(0N=+=u%+FH@$;?efo0^iDsNj}alv - - - -HTTP_Encoder Test - - - -

    HTTP_Encoder test

    -

    HTML

    -

    CSS

    -

    Javascript

    -

    image

    - - - - $content - ,'type' => $type -)); -$he->encode(); -$he->sendAll(); - -?> \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_inc.php b/plugins/Minify/extlib/minify/min_unit_tests/_inc.php deleted file mode 100644 index bf416d4bb9..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_inc.php +++ /dev/null @@ -1,50 +0,0 @@ -0, 'fail'=>0, 'total'=>0); - - $mode = $test ? 'pass' : 'fail'; - $outMode = $test ? 'PASS' : '!FAIL'; - printf("%s: %s (%d of %d tests run so far have %sed)\n", - $outMode, $message, ++$count[$mode], ++$count['total'], $mode); - - return (bool)$test; -} - -ob_start(); \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/comments.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/comments.css deleted file mode 100644 index 2ef9fac498..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/comments.css +++ /dev/null @@ -1,9 +0,0 @@ - -/* block comments get removed */ - -/*! YUI Compressor style comments are preserved */ - -/* but all other comments are removed */ - -/* comments that have any surrounding whitespace are replaced by a single space. */ -body{ background:#fff/*eef*/ url(/path/to/image.gif) repeat-y; } diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/comments.min.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/comments.min.css deleted file mode 100644 index 3ea5c61a69..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/comments.min.css +++ /dev/null @@ -1,3 +0,0 @@ - -/* YUI Compressor style comments are preserved */ -body{background:#fff url(/path/to/image.gif) repeat-y} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/hacks.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/hacks.css deleted file mode 100644 index fccd32166f..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/hacks.css +++ /dev/null @@ -1,66 +0,0 @@ -/* hide from ie5/mac \*/ a{} -.foo {color:red} -/* necessary comment */ - -/* comment to attempt to confuse parser */ - -/* feed to ie5/mac \*//*/ -@import "ie5mac.css"; -/* necessary comment */ - -/* comment to attempt to confuse parser */ - -/*/ hide from nav4 */ -.foo {display:block;} -/* necessary comment */ - -/* comment to attempt to confuse parser */ - -/*/ feed to nav *//*/ -.foo {display:crazy;} -/* necessary comment */ - -/* hide props from various IE/win */ -div { - width: 140px; - width/* */:/**/100px; - width: /**/100px; -} - -html>/**/body {} - -/* Tantek's box model hack */ -div { - width:400px; - voice-family: "\"}\""; - voice-family:inherit; - width:300px; -} - -/* don't minimize hex colors in filters */ -div { - filter:chroma(color=#aabbcc); - filter:mask(color=#000000) shadow(color=#9BAD71, direction=135) chroma(color=#000000); -} - -@media screen { - /* for IE 5.x-6, hidden from IE 5 Mac */ /*\*/ - * html div#page { - height: 1%; - } - /**/ /* end hidden from IE 5 Mac */ -} - -foo { /* filters for IE */ - _height : 20px; - *height : 15px; -} - -/* http://tantek.com/CSS/Examples/midpass.html */ -@media tty { - i{content:"\";/*" "*/}} @import 'midpassafter.css'; /*";} -}/* */ - -/* leave at least 1 space between these pseudo elements and "{" for IE6: http://www.crankygeek.com/ie6pebug/ */ -p:first-letter {color:red;} -p:first-line {color:red;} diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/hacks.min.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/hacks.min.css deleted file mode 100644 index 68be2ee89e..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/hacks.min.css +++ /dev/null @@ -1,4 +0,0 @@ -/*\*/a{}.foo{color:red}/**/ /*\*//*/@import "ie5mac.css";/**/ /*/*/.foo{display:block}/**/ /*/*//*/.foo{display:crazy}/**/ div{width:140px;width/**/:/**/100px;width:/**/100px}html>/**/body{}div{width:400px;voice-family:"\"}\"";voice-family:inherit;width:300px}div{filter:chroma(color=#aabbcc);filter:mask(color=#000000) shadow(color=#9BAD71, direction=135) chroma(color=#000000)}@media -screen{/*\*/* html -div#page{height:1%}/**/}foo{_height:20px;*height:15px}@media -tty{i{content:"\";/*" "*/}}@import 'midpassafter.css';/*"}}/* */ p:first-letter {color:red}p:first-line {color:red} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/issue62.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/issue62.css deleted file mode 100644 index 006c7a22fb..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/issue62.css +++ /dev/null @@ -1,890 +0,0 @@ -/* -* DEFINITION DES STYLES DE TEXTE -*/ - /*-----------------------------------------------------------------------------------*/ -h1 { - color: #339933; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 14px; - font-weight: bold; - text-decoration: none; -} - -h2 { - color: #339933; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 12px; - font-weight: bold; - text-decoration: none; -} - -h1,h2,h3,h4,h5 { - margin: 0px; - padding: 0px; -} - -.txt_10_noir { - color: black; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 10px; - text-decoration: none; -} - -.txt_10_noir:link,.txt_10_noir:visited,.txt_10_noir:active { - color: black; -} - -.txt_10_noir:hover { - color: red; -} - -.txt_11_noir { - color: black; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 11px; - text-decoration: none; -} - -.txt_11_noir:link,.txt_11_noir:visited,.txt_11_noir:active { - color: black; -} - -.txt_11_noir:hover { - color: red; -} - -.txt_12_noir { - color: black; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 12px; - text-decoration: none; -} - -.txt_12_noir:link,.txt_12_noir:visited,.txt_12_noir:active { - color: black; -} - -.txt_12_noir:hover { - color: red; -} - -.txt_14_noir { - color: black; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 14px; - text-decoration: none; -} - -.txt_14_noir:link,.txt_14_noir:visited,.txt_14_noir:active { - color: black; -} - -.txt_14_noir:hover { - color: red; -} - -/*-----------------------------------------------------------------------------------*/ -.txt_10_gris { - color: grey; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 10px; - text-decoration: none; -} - -.txt_10_gris:link,.txt_10_gris:visited,.txt_10_gris:active { - color: grey; -} - -.txt_10_gris:hover { - color: red; -} - -.txt_11_gris { - color: grey; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 11px; - text-decoration: none; -} - -.txt_11_gris:link,.txt_11_gris:visited,.txt_11_gris:active { - color: grey; -} - -.txt_11_gris:hover { - color: red; -} - -.txt_12_gris { - color: grey; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 12px; - text-decoration: none; -} - -.txt_12_gris:link,.txt_12_gris:visited,.txt_12_gris:active { - color: grey; -} - -.txt_12_gris:hover { - color: red; -} - -.txt_14_gris { - color: grey; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 14px; - text-decoration: none; -} - -.txt_14_gris:link,.txt_14_gris:visited,.txt_14_gris:active { - color: grey; -} - -.txt_14_gris:hover { - color: red; -} - -/*-----------------------------------------------------------------------------------*/ -.txt_10_blanc { - color: #FFFFFF; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 10px; - text-decoration: none; -} - -.txt_10_blanc:link,.txt_10_blanc:visited,.txt_10_blanc:active { - color: #FFFFFF; -} - -.txt_10_blanc:hover { - color: #FF8800; /*ORANGE*/ -} - -.txt_11_blanc { - color: #FFFFFF; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 11px; - text-decoration: none; -} - -.txt_11_blanc:link,.txt_11_blanc:visited,.txt_11_blanc:active { - color: #FFFFFF; -} - -.txt_11_blanc:hover { - color: #FF8800; -} - -.txt_12_blanc { - color: #FFFFFF; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 12px; - text-decoration: none; -} - -.txt_12_blanc:link,.txt_12_blanc:visited,.txt_12_blanc:active { - color: #FFFFFF; -} - -.txt_12_blanc:hover { - color: #FFAA00; -} - -.txt_14_blanc { - color: #FFFFFF; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 14px; - text-decoration: none; -} - -.txt_14_blanc:link,.txt_14_blanc:visited,.txt_14_blanc:active { - color: #FFFFFF; -} - -.txt_14_blanc:hover { - color: #FF8800; -} - -/*-----------------------------------------------------------------------------------*/ -.txt_10_orange { - color: #FF8800; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 10px; - text-decoration: none; -} - -.txt_10_orange:link,.txt_10_orange:visited,.txt_10_orange:active { - color: #FF8800; -} - -.txt_10_orange:hover { - color: darkblue -} - -.txt_11_orange { - color: #FF8800; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 11px; - text-decoration: none; -} - -.txt_11_orange:link,.txt_11_orange:visited,.txt_11_orange:active { - color: #FF8800; -} - -.txt_11_orange:hover { - color: darkblue; -} - -.txt_12_orange { - color: #FF8800; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 12px; - text-decoration: none; -} - -.txt_12_orange:link,.txt_12_orange:visited,.txt_12_orange:active { - color: #FF8800; -} - -.txt_12_orange:hover { - color: darkblue; -} - -.txt_14_orange { - color: #FF8800; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 14px; - text-decoration: none; -} - -.txt_14_orange:link,.txt_14_orange:visited,.txt_14_orange:active { - color: #FF8800; -} - -.txt_14_orange:hover { - color: darkblue; -} - -/*-----------------------------------------------------------------------------------*/ -.txt_10_rouge { - color: red; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 10px; - text-decoration: none; -} - -.txt_10_rouge:link,.txt_10_rouge:visited,.txt_10_rouge:active { - color: red; -} - -.txt_10_rouge:hover { - color: darkblue; -} - -.txt_11_rouge { - color: red; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 11px; - text-decoration: none; -} - -.txt_11_rouge:link,.txt_11_rouge:visited,.txt_11_rouge:active { - color: red; -} - -.txt_11_rouge:hover { - color: darkblue; -} - -.txt_12_rouge { - color: red; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 12px; - text-decoration: none; -} - -.txt_12_rouge:link,.txt_12_rouge:visited,.txt_12_rouge:active { - color: red; -} - -.txt_12_rouge:hover { - color: darkblue; -} - -.txt_14_rouge { - color: red; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 14px; - text-decoration: none; -} - -.txt_14_rouge:link,.txt_14_rouge:visited,.txt_14_rouge:active { - color: red; -} - -.txt_14_rouge:hover { - color: darkblue; -} - -/*-----------------------------------------------------------------------------------*/ -.txt_10_bleu { - color: blue; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 10px; - text-decoration: none; -} - -.txt_10_bleu:link,.txt_10_bleu:visited,.txt_10_bleu:active { - color: blue; -} - -.txt_10_bleu:hover { - color: red; -} - -.txt_11_bleu { - color: blue; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 11px; - text-decoration: none; -} - -.txt_11_bleu:link,.txt_11_bleu:visited,.txt_11_bleu:active { - color: blue; -} - -.txt_11_bleu:hover { - color: red; -} - -.txt_12_bleu { - color: blue; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 12px; - text-decoration: none; -} - -.txt_12_bleu:link,.txt_12_bleu:visited,.txt_12_bleu:active { - color: blue; -} - -.txt_12_bleu:hover { - color: red; -} - -.txt_14_bleu { - color: blue; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 14px; - text-decoration: none; -} - -.txt_14_bleu:link,.txt_14_bleu:visited,.txt_14_bleu:active { - color: blue; -} - -.txt_14_bleu:hover { - color: red; -} - -/*-----------------------------------------------------------------------------------*/ -.txt_10_bleu_f { - color: darkblue; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 10px; - text-decoration: none; -} - -.txt_10_bleu_f:link,.txt_10_bleu_f:visited,.txt_10_bleu_f:active { - color: darkblue; -} - -.txt_10_bleu_f:hover { - color: red; -} - -.txt_11_bleu_f { - color: darkblue; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 11px; - text-decoration: none; -} - -.txt_11_bleu_f:link,.txt_11_bleu_f:visited,.txt_11_bleu_f:active { - color: darkblue; -} - -.txt_11_bleu_f:hover { - color: red; -} - -.txt_12_bleu_f { - color: darkblue; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 12px; - text-decoration: none; -} - -.txt_12_bleu_f:link,.txt_12_bleu_f:visited,.txt_12_bleu_f:active { - color: darkblue; -} - -.txt_12_bleu_f:hover { - color: red; -} - -.txt_14_bleu_f { - color: darkblue; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 14px; - text-decoration: none; -} - -.txt_14_bleu_f:link,.txt_14_bleu_f:visited,.txt_14_bleu_f:active { - color: darkblue; -} - -.txt_14_bleu_f:hover { - color: red; -} - -/*-----------------------------------------------------------------------------------*/ -.txt_10_vert_f { - color: darkgreen; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 10px; - text-decoration: none; -} - -.txt_10_vert_f:link,.txt_10_vert_f:visited,.txt_10_vert_f:active { - color: darkgreen; -} - -.txt_10_vert_f:hover { - color: red; -} - -.txt_11_vert_f { - color: darkgreen; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 11px; - text-decoration: none; -} - -.txt_11_vert_f:link,.txt_11_vert_f:visited,.txt_11_vert_f:active { - color: darkgreen; -} - -.txt_11_vert_f:hover { - color: red; -} - -.txt_12_vert_f { - color: darkgreen; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 12px; - text-decoration: none; -} - -.txt_12_vert_f:link,.txt_12_vertf:visited,.txt_12_vert_f:active { - color: darkgreen; -} - -.txt_12_vert_f:hover { - color: red; -} - -.txt_14_vert_f { - color: darkgreen; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 14px; - text-decoration: none; -} - -.txt_14_vert_f:link,.txt_14_vert_f:visited,.txt_14_vert_f:active { - color: darkgreen; -} - -.txt_14_vert_f:hover { - color: red; -} - -/*-----------------------------------------------------------------------------------*/ -.txt_10_vert { - color: green; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 10px; - text-decoration: none; -} - -.txt_10_vert:link,.txt_10_vert:visited,.txt_10_vert:active { - color: green; -} - -.txt_10_vert:hover { - color: red; -} - -.txt_11_vert { - color: green; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 11px; - text-decoration: none; -} - -.txt_11_vert:link,.txt_11_vert:visited,.txt_11_vert:active { - color: green; -} - -.txt_11_vert:hover { - color: red; -} - -.txt_12_vert { - color: green; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 12px; - text-decoration: none; -} - -.txt_12_vert:link,.txt_12_vert:visited,.txt_12_vert:active { - color: green; -} - -.txt_12_vert:hover { - color: red; -} - -.txt_14_vert { - color: green; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 14px; - text-decoration: none; -} - -.txt_14_vert:link,.txt_14_vert:visited,.txt_14_vert:active { - color: green; -} - -.txt_14_vert:hover { - color: red; -} - -/*-----------------------------------------------------------------------------------*/ -.fond_blanc { - background-color: #FFFFFF; - color: black; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 11px; - text-decoration: none; -} - -.fond_gris_c, .fond_gris_c tr { - background-color: #FFFFFF; - color: black; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 11px; - text-decoration: none; - background-image: url(../images/fond_4.bmp); - background-repeat: repeat-x; -} - -.fond_gris_c2, .fond_gris_c2 tr { - background-color: #FBFBFB; - color: black; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 11px; - text-decoration: none; -} - -.fond_bleu_c, .fond_bleu_c tr { - background-color: #D9EEF9; - color: black; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 11px; - text-decoration: none; - background-image: url(../images/fond_1.bmp); -} - -.fond_bleu_c2 { - background-color: #ECF4FF; - color: black; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 11px; - text-decoration: none; -} - -.fond_bleu_f { - background-color: #003366; - color: black; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 11px; - text-decoration: none; -} - -.fond_orange { - background-color: #FEEFE7; - color: darkgreen; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 12px; - font-weight: bold; - text-decoration: none; - background-image: url(../images/fond_3.jpg); -} - -.fond_orange_2 { - background-color: #FFF8F4; - color: darkgreen; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 12px; - font-weight: bold; - text-decoration: none; - border: 1px solid orange; - border-collapse: collapse; -} - -.vccDlgBody { - border: 3px solid #336699; - border-collapse: collapse; - color: black; - background-color: #EEFFEE; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 11px; - text-decoration: none; -} - -/* DEFINITION DES STYLES DE TABLEAUX */ -.bordure_0 { - border: 0px solid; - color: black; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 11px; - text-decoration: none; -} - -.bordure_1_bleu { - border: 1px solid green; - border-collapse: collapse; - color: black; - background-color: #FFFFFF; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 11px; - text-decoration: none; -} - -.bordure_3_bleu { - border: 3px solid #336699; - border-collapse: collapse; - color: black; - background-color: #FFFFFF; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 11px; - text-decoration: none; -} - -.indent { - margin-left: 20px; -} - -/* DEFINITION DES STYLES D'OBJETS DE FORMULAIRE */ -.Btn { - color: #003366; - text-align: center; - font-weight: bold; - background-color: #FFFFFF; - background-image: url(../images/ongletStyle1.jpg); - background-repeat: no-repeat; - background-position: center center; -} - -.Btn:hover { - color: red; -} - -.menu1h { - background-color: #003366; - color: white; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 10px; - font-weight: bold; - text-decoration: none; - border-top: 1px solid #003366; - border-bottom: 1px solid #003366; - border-left: 1px solid #003366; - border-right: 1px solid white; - border-collapse: collapse; - display: block; -} - -.menu1h:hover { - background-color: white; - color: red; - border: 1px solid darkgreen; - border-collapse: collapse; -} - -.menu1h_f { - background-color: #003366; - color: white; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 10px; - font-weight: bold; - text-decoration: none; - border: 1px solid #003366; - display: block; -} - -.menu1h_f:hover { - background-color: white; - color: red; - border: 1px solid darkgreen; - border-collapse: collapse; -} - -.menu1v { - background-color: #003366; - color: white; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 10px; - font-weight: bold; - text-decoration: none; - border: 1px solid #003366; - border-collapse: collapse; - display: block; -} - -.menu1v:hover { - background-color: white; - color: red; - border: 1px solid darkgreen; - border-collapse: collapse; -} - -.menu2v { - background-color: #5588BB; - color: white; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 12px; - font-weight: bold; - text-decoration: none; - border: 1px solid #4277AB; - border-collapse: collapse; - float: left; - display: block; -} - -.menu2v:hover { - background-color: white; - color: red; - border: 1px solid darkgreen; - border-collapse: collapse; -} - -.menuEDF { - background-color: #003366; - color: white; - font-family: Verdana, Arial, Lucida, Tahoma; - font-size: 10px; - text-decoration: none; -} - -.menuEDF:hover { - color: #FF8800; -} - -/*bouton bleu sur blanc*/ -.Bouton { - color: #003366; - text-align: center; - font-weight: bold; - /* Ricardo cursor: hand; */ - cursor: pointer; - background-color: #FFFFFF; -} - -input { - border: 2px solid green; - color: #003366; - background-color: #FFFFFF; - background-image: url(../images/fond_4.bmp); - background-repeat: repeat-x; -} - -.disabled_input { - border: 1px solid gray; - color: grey; - background-color: #FFFFFF; - background-image: url(../images/fond_4.bmp); - background-repeat: repeat-x; -} - -.input0 { - border: 0px; - color: #003366; - background-color: #FFFFFF; - background-image: url(../images/fond_4.bmp); -} - -.input2 { - border: 1px solid green; - color: #003366; - background-color: #FFFFFF; - background-image: url(../images/fond_4.bmp); - background-repeat: repeat-x; -} - -.input3 { - border: 1px solid black; - color: #003366; - background-color: #EEEEEE; - background-image: url(); -} - -.input4 { - border: 1px solid blue; - color: #003366; - background-color: #FFFFFF; - background-image: url(../images/fond_4.bmp); - background-repeat: repeat-x; -} - -.input5 { - border: 1px solid darkblue; - color: #003366; - background-color: #FFFFFF; - background-image: url(../images/fond_4.bmp); - background-repeat: repeat-x; -} - -.input_btn { - border: 0px; - /* cursor: hand; */ - cursor: pointer; -} - -textarea { - border: 2px solid green; - color: #003366; - background-color: #FFFFFF; - background-image: url(../images/fond_5.bmp); -} - -.TEXTAREA3 { - border: 1px solid green; - color: #003366; - background-color: #FFFFFF; - background-image: url(); -} - -.TEXTAREA4 { - border: 1px solid green; - color: #003366; - background-color: #EEEEEE; - background-image: url(); -} - -.hand { - cursor: hand; - cursor: pointer; -} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/issue62.min.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/issue62.min.css deleted file mode 100644 index 5eb1982282..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/issue62.min.css +++ /dev/null @@ -1,25 +0,0 @@ -h1{color:#393;font-family:Verdana,Arial,Lucida,Tahoma;font-size:14px;font-weight:bold;text-decoration:none}h2{color:#393;font-family:Verdana,Arial,Lucida,Tahoma;font-size:12px;font-weight:bold;text-decoration:none}h1,h2,h3,h4,h5{margin:0px;padding:0px}.txt_10_noir{color:black;font-family:Verdana,Arial,Lucida,Tahoma;font-size:10px;text-decoration:none}.txt_10_noir:link,.txt_10_noir:visited,.txt_10_noir:active{color:black}.txt_10_noir:hover{color:red}.txt_11_noir{color:black;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.txt_11_noir:link,.txt_11_noir:visited,.txt_11_noir:active{color:black}.txt_11_noir:hover{color:red}.txt_12_noir{color:black;font-family:Verdana,Arial,Lucida,Tahoma;font-size:12px;text-decoration:none}.txt_12_noir:link,.txt_12_noir:visited,.txt_12_noir:active{color:black}.txt_12_noir:hover{color:red}.txt_14_noir{color:black;font-family:Verdana,Arial,Lucida,Tahoma;font-size:14px;text-decoration:none}.txt_14_noir:link,.txt_14_noir:visited,.txt_14_noir:active{color:black}.txt_14_noir:hover{color:red}.txt_10_gris{color:grey;font-family:Verdana,Arial,Lucida,Tahoma;font-size:10px;text-decoration:none}.txt_10_gris:link,.txt_10_gris:visited,.txt_10_gris:active{color:grey}.txt_10_gris:hover{color:red}.txt_11_gris{color:grey;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.txt_11_gris:link,.txt_11_gris:visited,.txt_11_gris:active{color:grey}.txt_11_gris:hover{color:red}.txt_12_gris{color:grey;font-family:Verdana,Arial,Lucida,Tahoma;font-size:12px;text-decoration:none}.txt_12_gris:link,.txt_12_gris:visited,.txt_12_gris:active{color:grey}.txt_12_gris:hover{color:red}.txt_14_gris{color:grey;font-family:Verdana,Arial,Lucida,Tahoma;font-size:14px;text-decoration:none}.txt_14_gris:link,.txt_14_gris:visited,.txt_14_gris:active{color:grey}.txt_14_gris:hover{color:red}.txt_10_blanc{color:#FFF;font-family:Verdana,Arial,Lucida,Tahoma;font-size:10px;text-decoration:none}.txt_10_blanc:link,.txt_10_blanc:visited,.txt_10_blanc:active{color:#FFF}.txt_10_blanc:hover{color:#F80}.txt_11_blanc{color:#FFF;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.txt_11_blanc:link,.txt_11_blanc:visited,.txt_11_blanc:active{color:#FFF}.txt_11_blanc:hover{color:#F80}.txt_12_blanc{color:#FFF;font-family:Verdana,Arial,Lucida,Tahoma;font-size:12px;text-decoration:none}.txt_12_blanc:link,.txt_12_blanc:visited,.txt_12_blanc:active{color:#FFF}.txt_12_blanc:hover{color:#FA0}.txt_14_blanc{color:#FFF;font-family:Verdana,Arial,Lucida,Tahoma;font-size:14px;text-decoration:none}.txt_14_blanc:link,.txt_14_blanc:visited,.txt_14_blanc:active{color:#FFF}.txt_14_blanc:hover{color:#F80}.txt_10_orange{color:#F80;font-family:Verdana,Arial,Lucida,Tahoma;font-size:10px;text-decoration:none}.txt_10_orange:link,.txt_10_orange:visited,.txt_10_orange:active{color:#F80}.txt_10_orange:hover{color:darkblue}.txt_11_orange{color:#F80;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.txt_11_orange:link,.txt_11_orange:visited,.txt_11_orange:active{color:#F80}.txt_11_orange:hover{color:darkblue}.txt_12_orange{color:#F80;font-family:Verdana,Arial,Lucida,Tahoma;font-size:12px;text-decoration:none}.txt_12_orange:link,.txt_12_orange:visited,.txt_12_orange:active{color:#F80}.txt_12_orange:hover{color:darkblue}.txt_14_orange{color:#F80;font-family:Verdana,Arial,Lucida,Tahoma;font-size:14px;text-decoration:none}.txt_14_orange:link,.txt_14_orange:visited,.txt_14_orange:active{color:#F80}.txt_14_orange:hover{color:darkblue}.txt_10_rouge{color:red;font-family:Verdana,Arial,Lucida,Tahoma;font-size:10px;text-decoration:none}.txt_10_rouge:link,.txt_10_rouge:visited,.txt_10_rouge:active{color:red}.txt_10_rouge:hover{color:darkblue}.txt_11_rouge{color:red;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.txt_11_rouge:link,.txt_11_rouge:visited,.txt_11_rouge:active{color:red}.txt_11_rouge:hover{color:darkblue}.txt_12_rouge{color:red;font-family:Verdana,Arial,Lucida,Tahoma;font-size:12px;text-decoration:none}.txt_12_rouge:link,.txt_12_rouge:visited,.txt_12_rouge:active{color:red}.txt_12_rouge:hover{color:darkblue}.txt_14_rouge{color:red;font-family:Verdana,Arial,Lucida,Tahoma;font-size:14px;text-decoration:none}.txt_14_rouge:link,.txt_14_rouge:visited,.txt_14_rouge:active{color:red}.txt_14_rouge:hover{color:darkblue}.txt_10_bleu{color:blue;font-family:Verdana,Arial,Lucida,Tahoma;font-size:10px;text-decoration:none}.txt_10_bleu:link,.txt_10_bleu:visited,.txt_10_bleu:active{color:blue}.txt_10_bleu:hover{color:red}.txt_11_bleu{color:blue;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.txt_11_bleu:link,.txt_11_bleu:visited,.txt_11_bleu:active{color:blue}.txt_11_bleu:hover{color:red}.txt_12_bleu{color:blue;font-family:Verdana,Arial,Lucida,Tahoma;font-size:12px;text-decoration:none}.txt_12_bleu:link,.txt_12_bleu:visited,.txt_12_bleu:active{color:blue}.txt_12_bleu:hover{color:red}.txt_14_bleu{color:blue;font-family:Verdana,Arial,Lucida,Tahoma;font-size:14px;text-decoration:none}.txt_14_bleu:link,.txt_14_bleu:visited,.txt_14_bleu:active{color:blue}.txt_14_bleu:hover{color:red}.txt_10_bleu_f{color:darkblue;font-family:Verdana,Arial,Lucida,Tahoma;font-size:10px;text-decoration:none}.txt_10_bleu_f:link,.txt_10_bleu_f:visited,.txt_10_bleu_f:active{color:darkblue}.txt_10_bleu_f:hover{color:red}.txt_11_bleu_f{color:darkblue;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.txt_11_bleu_f:link,.txt_11_bleu_f:visited,.txt_11_bleu_f:active{color:darkblue}.txt_11_bleu_f:hover{color:red}.txt_12_bleu_f{color:darkblue;font-family:Verdana,Arial,Lucida,Tahoma;font-size:12px;text-decoration:none}.txt_12_bleu_f:link,.txt_12_bleu_f:visited,.txt_12_bleu_f:active{color:darkblue}.txt_12_bleu_f:hover{color:red}.txt_14_bleu_f{color:darkblue;font-family:Verdana,Arial,Lucida,Tahoma;font-size:14px;text-decoration:none}.txt_14_bleu_f:link,.txt_14_bleu_f:visited,.txt_14_bleu_f:active{color:darkblue}.txt_14_bleu_f:hover{color:red}.txt_10_vert_f{color:darkgreen;font-family:Verdana,Arial,Lucida,Tahoma;font-size:10px;text-decoration:none}.txt_10_vert_f:link,.txt_10_vert_f:visited,.txt_10_vert_f:active{color:darkgreen}.txt_10_vert_f:hover{color:red}.txt_11_vert_f{color:darkgreen;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.txt_11_vert_f:link,.txt_11_vert_f:visited,.txt_11_vert_f:active{color:darkgreen}.txt_11_vert_f:hover{color:red}.txt_12_vert_f{color:darkgreen;font-family:Verdana,Arial,Lucida,Tahoma;font-size:12px;text-decoration:none}.txt_12_vert_f:link,.txt_12_vertf:visited,.txt_12_vert_f:active{color:darkgreen}.txt_12_vert_f:hover{color:red}.txt_14_vert_f{color:darkgreen;font-family:Verdana,Arial,Lucida,Tahoma;font-size:14px;text-decoration:none}.txt_14_vert_f:link,.txt_14_vert_f:visited,.txt_14_vert_f:active{color:darkgreen}.txt_14_vert_f:hover{color:red}.txt_10_vert{color:green;font-family:Verdana,Arial,Lucida,Tahoma;font-size:10px;text-decoration:none}.txt_10_vert:link,.txt_10_vert:visited,.txt_10_vert:active{color:green}.txt_10_vert:hover{color:red}.txt_11_vert{color:green;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.txt_11_vert:link,.txt_11_vert:visited,.txt_11_vert:active{color:green}.txt_11_vert:hover{color:red}.txt_12_vert{color:green;font-family:Verdana,Arial,Lucida,Tahoma;font-size:12px;text-decoration:none}.txt_12_vert:link,.txt_12_vert:visited,.txt_12_vert:active{color:green}.txt_12_vert:hover{color:red}.txt_14_vert{color:green;font-family:Verdana,Arial,Lucida,Tahoma;font-size:14px;text-decoration:none}.txt_14_vert:link,.txt_14_vert:visited,.txt_14_vert:active{color:green}.txt_14_vert:hover{color:red}.fond_blanc{background-color:#FFF;color:black;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.fond_gris_c, .fond_gris_c -tr{background-color:#FFF;color:black;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none;background-image:url(../images/fond_4.bmp);background-repeat:repeat-x}.fond_gris_c2, .fond_gris_c2 -tr{background-color:#FBFBFB;color:black;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.fond_bleu_c, .fond_bleu_c -tr{background-color:#D9EEF9;color:black;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none;background-image:url(../images/fond_1.bmp)}.fond_bleu_c2{background-color:#ECF4FF;color:black;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.fond_bleu_f{background-color:#036;color:black;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.fond_orange{background-color:#FEEFE7;color:darkgreen;font-family:Verdana,Arial,Lucida,Tahoma;font-size:12px;font-weight:bold;text-decoration:none;background-image:url(../images/fond_3.jpg)}.fond_orange_2{background-color:#FFF8F4;color:darkgreen;font-family:Verdana,Arial,Lucida,Tahoma;font-size:12px;font-weight:bold;text-decoration:none;border:1px -solid orange;border-collapse:collapse}.vccDlgBody{border:3px -solid #369;border-collapse:collapse;color:black;background-color:#EFE;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.bordure_0{border:0px -solid;color:black;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.bordure_1_bleu{border:1px -solid green;border-collapse:collapse;color:black;background-color:#FFF;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.bordure_3_bleu{border:3px -solid #369;border-collapse:collapse;color:black;background-color:#FFF;font-family:Verdana,Arial,Lucida,Tahoma;font-size:11px;text-decoration:none}.indent{margin-left:20px}.Btn{color:#036;text-align:center;font-weight:bold;background-color:#FFF;background-image:url(../images/ongletStyle1.jpg);background-repeat:no-repeat;background-position:center center}.Btn:hover{color:red}.menu1h{background-color:#036;color:white;font-family:Verdana,Arial,Lucida,Tahoma;font-size:10px;font-weight:bold;text-decoration:none;border-top:1px solid #036;border-bottom:1px solid #036;border-left:1px solid #036;border-right:1px solid white;border-collapse:collapse;display:block}.menu1h:hover{background-color:white;color:red;border:1px -solid darkgreen;border-collapse:collapse}.menu1h_f{background-color:#036;color:white;font-family:Verdana,Arial,Lucida,Tahoma;font-size:10px;font-weight:bold;text-decoration:none;border:1px -solid #036;display:block}.menu1h_f:hover{background-color:white;color:red;border:1px -solid darkgreen;border-collapse:collapse}.menu1v{background-color:#036;color:white;font-family:Verdana,Arial,Lucida,Tahoma;font-size:10px;font-weight:bold;text-decoration:none;border:1px -solid #036;border-collapse:collapse;display:block}.menu1v:hover{background-color:white;color:red;border:1px -solid darkgreen;border-collapse:collapse}.menu2v{background-color:#58B;color:white;font-family:Verdana,Arial,Lucida,Tahoma;font-size:12px;font-weight:bold;text-decoration:none;border:1px -solid #4277AB;border-collapse:collapse;float:left;display:block}.menu2v:hover{background-color:white;color:red;border:1px -solid darkgreen;border-collapse:collapse}.menuEDF{background-color:#036;color:white;font-family:Verdana,Arial,Lucida,Tahoma;font-size:10px;text-decoration:none}.menuEDF:hover{color:#F80}.Bouton{color:#036;text-align:center;font-weight:bold;cursor:pointer;background-color:#FFF}input{border:2px -solid green;color:#036;background-color:#FFF;background-image:url(../images/fond_4.bmp);background-repeat:repeat-x}.disabled_input{border:1px -solid gray;color:grey;background-color:#FFF;background-image:url(../images/fond_4.bmp);background-repeat:repeat-x}.input0{border:0px;color:#036;background-color:#FFF;background-image:url(../images/fond_4.bmp)}.input2{border:1px -solid green;color:#036;background-color:#FFF;background-image:url(../images/fond_4.bmp);background-repeat:repeat-x}.input3{border:1px -solid black;color:#036;background-color:#EEE;background-image:url()}.input4{border:1px -solid blue;color:#036;background-color:#FFF;background-image:url(../images/fond_4.bmp);background-repeat:repeat-x}.input5{border:1px -solid darkblue;color:#036;background-color:#FFF;background-image:url(../images/fond_4.bmp);background-repeat:repeat-x}.input_btn{border:0px;cursor:pointer}textarea{border:2px -solid green;color:#036;background-color:#FFF;background-image:url(../images/fond_5.bmp)}.TEXTAREA3{border:1px -solid green;color:#036;background-color:#FFF;background-image:url()}.TEXTAREA4{border:1px -solid green;color:#036;background-color:#EEE;background-image:url()}.hand{cursor:hand;cursor:pointer} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/paths_prepend.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/paths_prepend.css deleted file mode 100644 index da7cfca20c..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/paths_prepend.css +++ /dev/null @@ -1,12 +0,0 @@ -@import "foo.css"; -@import 'bar/foo.css' print; -@import '/css/foo.css'; /* abs, should not alter */ -@import 'http://foo.com/css/foo.css'; /* abs, should not alter */ -@import url(../foo.css) tv, projection; -@import url("/css/foo.css"); /* abs, should not alter */ -@import url(/css2/foo.css); /* abs, should not alter */ -@import url(data:image/gif;base64,AAAA); /* data, should not alter */ -foo {background:url('bar/foo.png')} -foo {background:url('http://foo.com/css/foo.css');} /* abs, should not alter */ -foo {background:url("//foo.com/css/foo.css");} /* protocol relative, should not alter */ -foo {background:url(data:image/gif;base64,AAAA);} /* data, should not alter */ \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/paths_prepend.min.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/paths_prepend.min.css deleted file mode 100644 index ffb94e2165..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/paths_prepend.min.css +++ /dev/null @@ -1 +0,0 @@ -@import "../foo.css";@import '../bar/foo.css' print;@import '/css/foo.css';@import 'http://foo.com/css/foo.css';@import url(../../foo.css) tv, projection;@import url("/css/foo.css");@import url(/css2/foo.css);@import url(data:image/gif;base64,AAAA);foo{background:url('../bar/foo.png')}foo{background:url('http://foo.com/css/foo.css')}foo{background:url("//foo.com/css/foo.css")}foo{background:url(data:image/gif;base64,AAAA)} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/paths_rewrite.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/paths_rewrite.css deleted file mode 100644 index aa41d0a91e..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/paths_rewrite.css +++ /dev/null @@ -1,14 +0,0 @@ -@import "foo.css"; -@import 'bar/foo.css' print; -@import '../bar/foo.css' print; -@import '../../foo.css' print; -@import '/css/foo.css'; /* abs, should not alter */ -@import 'http://foo.com/css/foo.css'; /* abs, should not alter */ -@import url(../foo.css) tv, projection; -@import url("/css/foo.css"); /* abs, should not alter */ -@import url(/css2/foo.css); /* abs, should not alter */ -@import url(data:image/gif;base64,AAAA); /* data, should not alter */ -foo {background:url('bar/foo.png')} -foo {background:url('http://foo.com/css/foo.css');} /* abs, should not alter */ -foo {background:url("//foo.com/css/foo.css");} /* protocol relative, should not alter */ -foo {background:url(data:image/gif;base64,AAAA);} /* data, should not alter */ \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/paths_rewrite.min.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/paths_rewrite.min.css deleted file mode 100644 index 34936155a0..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/paths_rewrite.min.css +++ /dev/null @@ -1 +0,0 @@ -@import "/_test_files/css/foo.css";@import '/_test_files/css/bar/foo.css' print;@import '/_test_files/bar/foo.css' print;@import '/foo.css' print;@import '/css/foo.css';@import 'http://foo.com/css/foo.css';@import url(/_test_files/foo.css) tv, projection;@import url("/css/foo.css");@import url(/css2/foo.css);@import url(data:image/gif;base64,AAAA);foo{background:url('/_test_files/css/bar/foo.png')}foo{background:url('http://foo.com/css/foo.css')}foo{background:url("//foo.com/css/foo.css")}foo{background:url(data:image/gif;base64,AAAA)} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/readme.txt b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/readme.txt deleted file mode 100644 index 0181755296..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/readme.txt +++ /dev/null @@ -1 +0,0 @@ -Test suite from http://search.cpan.org/~gtermars/CSS-Minifier-XS/ \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/selectors.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/selectors.css deleted file mode 100644 index d74c9aa02a..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/selectors.css +++ /dev/null @@ -1,42 +0,0 @@ -/* http://www.w3.org/TR/css3-selectors/ */ - -* -E[foo] -E[foo="bar"] -E[foo~="bar"] -E[foo^="bar"] -E[foo$="bar"] -E[foo*="bar"] -E[hreflang|="en"] -E:root -E:nth-child(n) -E:nth-last-child(n) -E:nth-of-type(n) -E:nth-last-of-type(n) -E:first-child -E:last-child -E:first-of-type -E:last-of-type -E:only-child -E:only-of-type -E:empty -E:link -E:visited -E:active -E:hover -E:focus -E:target -E:lang(fr) -E:enabled -E:disabled -E:checked -E::first-line -E::first-letter -E::selection -E::before -E::after -E.warning#myid -E:not(s) - > F - + F - ~ F {color: red;} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/selectors.min.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/selectors.min.css deleted file mode 100644 index 643089fcf7..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/selectors.min.css +++ /dev/null @@ -1,37 +0,0 @@ -* -E[foo] -E[foo="bar"] -E[foo~="bar"] -E[foo^="bar"] -E[foo$="bar"] -E[foo*="bar"] -E[hreflang|="en"] -E:root -E:nth-child(n) -E:nth-last-child(n) -E:nth-of-type(n) -E:nth-last-of-type(n) -E:first-child -E:last-child -E:first-of-type -E:last-of-type -E:only-child -E:only-of-type -E:empty -E:link -E:visited -E:active -E:hover -E:focus -E:target -E:lang(fr) -E:enabled -E:disabled -E:checked -E::first-line -E::first-letter -E::selection -E::before -E::after -E.warning#myid -E:not(s)>F+F~F{color:red} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/styles.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/styles.css deleted file mode 100644 index bf46c0af0e..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/styles.css +++ /dev/null @@ -1,31 +0,0 @@ -/* some CSS to try to exercise things in general */ - -@import url( /more.css ); - - body, td, th { - font-family: Verdana , "Bitstream Vera Sans" , sans-serif ; - - font-size : 12px; -} - -.nav { - margin-left: 20%; -} -#main-nav { - background-color: red; - border: 1px solid #00ff77; -} - -div#content -h1 + p { - padding-top: 0; - margin-top: 0; -} - -@media all and (min-width: 640px) { - #media-queries-1 { background-color: #0f0; } -} - -@media screen and (max-width: 2000px) { - #media-queries-2 { background-color: #0f0; } -} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/styles.min.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/styles.min.css deleted file mode 100644 index a823b0550f..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/styles.min.css +++ /dev/null @@ -1,3 +0,0 @@ -@import url(/more.css);body,td,th{font-family:Verdana,"Bitstream Vera Sans",sans-serif;font-size:12px}.nav{margin-left:20%}#main-nav{background-color:red;border:1px -solid #0f7}div#content -h1+p{padding-top:0;margin-top:0}@media all and (min-width: 640px){#media-queries-1{background-color:#0f0}}@media screen and (max-width: 2000px){#media-queries-2{background-color:#0f0}} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/subsilver.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/subsilver.css deleted file mode 100644 index 79d34ec4a8..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/subsilver.css +++ /dev/null @@ -1,434 +0,0 @@ -/* Based on the original Style Sheet for the fisubsilver v2 Theme for phpBB version 2+ -Edited by Daz - http://www.forumimages.com - last updated 26-06-03 */ -/* The content of the posts (body of text) */ -/* General page style */ - - - - /* begin suggest post */ - .float-l{ - float: left; - } - - .form-suggest{ - height:200px; - background:#DEE2D0; - vertical-align: top; - } - - .form-input input{ - font-size: 10px; - } - - .hide{ - display:none; - } - - .form-input textarea{ - font-size: 11px; - width: 350px; - } - - .form-label{ - font-size: 10px; - font-weight: bold; - line-height: 25px; - padding-right: 10px; - text-align: right; - width: 100px; - color: #39738F; - } - - .font-9{ - font-size: 9px; - } - - .form-topic{ - font-weight:bold; - - } - - .form-error{ - color:red; - } - - .inline{ - display: inline; - } - - .space-10{ - clear: both; - font-size: 10px; - height: 10px; - line-height: 10px; - } - - .suggest-success{ - color:green; - padding-left:10px; - font-size:11px; - font-weight:bold; - } - - .top{ - vertical-align: top; - } - /* end suggest post */ - -table td{ - padding:3px; -} - -a:link,a:active,a:visited,a.postlink{ - color: #006699; - text-decoration: none; -} - -a:hover{ - color: #DD6900; -} - -a.admin:hover,a.mod:hover{ - color: #DD6900; -} - -a.but,a.but:hover,a.but:visited{ - color: #000000; - text-decoration: none; -} - -a.topictitle:visited{ - color: #5493B4; -} - -a.topictitle:hover{ - color: #DD6900; -} - - - -body{ - color: #000000; - font: 11px Verdana,Arial,Helvetica,sans-serif; - margin: 0 10px 10px 10px; - padding: 0; - overflow:auto; -} - -/* General font families for common tags */ -font,th,td,p{ - font: 12px Verdana,Arial,Helvetica,sans-serif; -} - -/* Form elements */ -form{ - display: inline; -} - -hr{ - border: 0px solid #FFFFFF; - border-top-width: 1px; - height: 0px; -} - -/* Gets rid of the need for border="0" on hyperlinked images */ -img{ - border: 0 solid; -} - -input{ - font: 11px Verdana,Arial,Helvetica,sans-serif; -} - -input.button,input.liteoption,.fakebut{ - background: #FAFAFA; - border: 1px solid #000000; - font-size: 11px; -} - -input.catbutton{ - background: #FAFAFA; - border: 1px solid #000000; - font-size: 10px; -} - -input.mainoption{ - background: #FAFAFA; - border: 1px solid #000000; - font-size: 11px; - font-weight: bold; -} - -input.post,textarea.post{ - background: #FFFFFF; - border: 1px solid #000000; - font: 11px Verdana,Arial,Helvetica,sans-serif; - padding-bottom: 2px; - padding-left: 2px; -} - -select{ - background: #FFFFFF; - font: 11px Verdana,Arial,Helvetica,sans-serif; -} - -table{ - text-align: left; -} - -td{ - vertical-align: middle; -} - -/* Category gradients*/ -td.cat{ - background-color: #C2C6BA; - font-weight: bold; - height: 20px; - letter-spacing: 1px; - text-indent: 4px; -} - -td.genmed,.genmed{ - font-size: 11px; -} - -/* This is for the table cell above the Topics,Post & Last posts on the index.php */ -td.rowpic{ - background: #C2C6BA; -} - -td.spacerow{ - background: #E5E6E2; -} - -/* Table Header cells */ -th{ - background-color: #FADD31; - background-image: url(images/cellpic3.gif); - background-repeat: repeat-x; - color: #68685E; - font-size: 11px; - font-weight: bold; - line-height:16px; - height: 16px; - padding-left: 8px; - padding-right: 8px; - text-align: center; - white-space: nowrap; -} - -/* Admin & Moderator Colours MODification */ -.admin,.mod{ - font-size: 11px; - font-weight: bold; -} - -.admin,a.admin,a.admin:visited{ - color: #FFA34F; -} - -/* This is the border line & background colour round the entire page */ -.bodyline{ - background: #FFFFFF; - border: 1px solid #98AAB1; -} - -.center{ - text-align: center; -} - -/* Code blocks */ -.code{ - background: #FAFAFA; - border: 1px solid #D1D7DC; - color: #006600; - font: 12px Courier,"Courier New",sans-serif; - padding: 5px; -} - -/* This is for the error messages that pop up */ -.errorline{ - background: #E5E6E2; - border: 1px solid #8F8B8B; - color:#D92A2A; -} - -.explaintitle{ - color: #5C81B1; - font-size: 11px; - font-weight: bold; -} - -/* This is the outline round the main forum tables */ -.forumline{ - background: #FFFFFF; -} - -/* General text */ -.gensmall{ - font-size: 10px; -} - -.h1-font{ - color: #006699; - display: inline; - font: bold 13px Verdana, Arial, Helvetica, sans-serif; - margin: 0; - text-decoration: none; -} - -.h2-font{ - display: inline; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 11px; -} - -.height1{ - height: 1px; -} - -.height22{ - height: 22px; -} - -.height25{ - height: 25px; -} - -.height28{ - height: 28px; -} - -.height30{ - height: 30px; -} - -.height40{ - height: 40px; -} - -/* This is the line in the posting page which shows the rollover -help line. Colour value in row2 */ -.helpline{ - border: 0 solid; - font-size: 10px; -} - -.imgfolder{ - margin: 1px 4px 1px 4px; -} - -.imgspace{ - margin-left: 1px; - margin-right: 2px; -} - -/* Specify the space around images */ -.imgtopic,.imgicon{ - margin-left: 3px; -} - -.left{ - text-align: left; -} - -/* The largest text used in the index page title and toptic title etc. */ -.maintitle,h1,h2{ - color: #5C81B1; - font: bold 20px/120% "Trebuchet MS",Verdana,Arial,Helvetica,sans-serif; - text-decoration: none; -} - -.maxwidth{ - width: 100%; -} - -.mod,a.mod,a.mod:visited{ - color: #006600; -} - -/* Name of poster in viewmsg.php and viewtopic.php and other places */ -.name{ - font-size: 11px; - font-weight: bold; -} - -/* Used for the navigation text,(Page 1,2,3 etc) and the navigation bar when in a forum */ -.nav{ - font-size: 11px; - font-weight: bold; -} - -.nowrap{ - white-space: nowrap; -} - -.postbody{ - font-size: 12px; - line-height: 125%; -} - -.postbody a{ - text-decoration: underline; -} - -/* Location,number of posts,post date etc */ -.postdetails{ - color: #00396A; - font-size: 10px; -} - -/* Quote blocks */ -.quote{ - background: #F3F3EF; - border: 1px solid #C2C6BA; - color: #006699; - font-size: 11px; - line-height: 125%; -} - -.right{ - text-align: right; -} - -/* Main table cell colours and backgrounds */ -.row1{ - background: #F0F0EB; -} - -.row2,.helpline{ - background: #E5E6E2; -} - -.row3{ - background: #DBDBD4; -} - -.subtitle,h2{ - font: bold 18px/180% "Trebuchet MS",Verdana,Arial,Helvetica,sans-serif; - text-decoration: none; -} - -/* titles for the topics:could specify viewed link colour too */ -.topictitle { - color: #000000; - font-size: 11px; - font-weight: bold; -} - -.underline{ - text-decoration: underline; -} - -.top{ -vertical-align:top; -} - -.image-hspace{ -margin-right:3px; -} - -.clear{ -clear:both; -} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/subsilver.min.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/subsilver.min.css deleted file mode 100644 index f59b15a92e..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/subsilver.min.css +++ /dev/null @@ -1,18 +0,0 @@ -.float-l{float:left}.form-suggest{height:200px;background:#DEE2D0;vertical-align:top}.form-input -input{font-size:10px}.hide{display:none}.form-input -textarea{font-size:11px;width:350px}.form-label{font-size:10px;font-weight:bold;line-height:25px;padding-right:10px;text-align:right;width:100px;color:#39738F}.font-9{font-size:9px}.form-topic{font-weight:bold}.form-error{color:red}.inline{display:inline}.space-10{clear:both;font-size:10px;height:10px;line-height:10px}.suggest-success{color:green;padding-left:10px;font-size:11px;font-weight:bold}.top{vertical-align:top}table -td{padding:3px}a:link,a:active,a:visited,a.postlink{color:#069;text-decoration:none}a:hover{color:#DD6900}a.admin:hover,a.mod:hover{color:#DD6900}a.but,a.but:hover,a.but:visited{color:#000;text-decoration:none}a.topictitle:visited{color:#5493B4}a.topictitle:hover{color:#DD6900}body{color:#000;font:11px Verdana,Arial,Helvetica,sans-serif;margin:0 -10px 10px 10px;padding:0;overflow:auto}font,th,td,p{font:12px Verdana,Arial,Helvetica,sans-serif}form{display:inline}hr{border:0px -solid #FFF;border-top-width:1px;height:0px}img{border:0 -solid}input{font:11px Verdana,Arial,Helvetica,sans-serif}input.button,input.liteoption,.fakebut{background:#FAFAFA;border:1px -solid #000;font-size:11px}input.catbutton{background:#FAFAFA;border:1px -solid #000;font-size:10px}input.mainoption{background:#FAFAFA;border:1px -solid #000;font-size:11px;font-weight:bold}input.post,textarea.post{background:#FFF;border:1px -solid #000;font:11px Verdana,Arial,Helvetica,sans-serif;padding-bottom:2px;padding-left:2px}select{background:#FFF;font:11px Verdana,Arial,Helvetica,sans-serif}table{text-align:left}td{vertical-align:middle}td.cat{background-color:#C2C6BA;font-weight:bold;height:20px;letter-spacing:1px;text-indent:4px}td.genmed,.genmed{font-size:11px}td.rowpic{background:#C2C6BA}td.spacerow{background:#E5E6E2}th{background-color:#FADD31;background-image:url(images/cellpic3.gif);background-repeat:repeat-x;color:#68685E;font-size:11px;font-weight:bold;line-height:16px;height:16px;padding-left:8px;padding-right:8px;text-align:center;white-space:nowrap}.admin,.mod{font-size:11px;font-weight:bold}.admin,a.admin,a.admin:visited{color:#FFA34F}.bodyline{background:#FFF;border:1px -solid #98AAB1}.center{text-align:center}.code{background:#FAFAFA;border:1px -solid #D1D7DC;color:#060;font:12px Courier,"Courier New",sans-serif;padding:5px}.errorline{background:#E5E6E2;border:1px -solid #8F8B8B;color:#D92A2A}.explaintitle{color:#5C81B1;font-size:11px;font-weight:bold}.forumline{background:#FFF}.gensmall{font-size:10px}.h1-font{color:#069;display:inline;font:bold 13px Verdana,Arial,Helvetica,sans-serif;margin:0;text-decoration:none}.h2-font{display:inline;font-family:Verdana,Arial,Helvetica,sans-serif;font-size:11px}.height1{height:1px}.height22{height:22px}.height25{height:25px}.height28{height:28px}.height30{height:30px}.height40{height:40px}.helpline{border:0 -solid;font-size:10px}.imgfolder{margin:1px -4px 1px 4px}.imgspace{margin-left:1px;margin-right:2px}.imgtopic,.imgicon{margin-left:3px}.left{text-align:left}.maintitle,h1,h2{color:#5C81B1;font:bold 20px/120% "Trebuchet MS",Verdana,Arial,Helvetica,sans-serif;text-decoration:none}.maxwidth{width:100%}.mod,a.mod,a.mod:visited{color:#060}.name{font-size:11px;font-weight:bold}.nav{font-size:11px;font-weight:bold}.nowrap{white-space:nowrap}.postbody{font-size:12px;line-height:125%}.postbody -a{text-decoration:underline}.postdetails{color:#00396A;font-size:10px}.quote{background:#F3F3EF;border:1px -solid #C2C6BA;color:#069;font-size:11px;line-height:125%}.right{text-align:right}.row1{background:#F0F0EB}.row2,.helpline{background:#E5E6E2}.row3{background:#DBDBD4}.subtitle,h2{font:bold 18px/180% "Trebuchet MS",Verdana,Arial,Helvetica,sans-serif;text-decoration:none}.topictitle{color:#000;font-size:11px;font-weight:bold}.underline{text-decoration:underline}.top{vertical-align:top}.image-hspace{margin-right:3px}.clear{clear:both} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/unusual_strings.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/unusual_strings.css deleted file mode 100644 index 69fa756eb9..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/unusual_strings.css +++ /dev/null @@ -1,10 +0,0 @@ -/* test unusual, but valid strings in CSS */ - -foo[attr="multiple spaces"] { - content: "Hello World!"; -} - -foo[attr="Hel\ -lo"] { - content: " \"World\""; -} diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/unusual_strings.min.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/unusual_strings.min.css deleted file mode 100644 index 4b7d97e455..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/unusual_strings.min.css +++ /dev/null @@ -1,2 +0,0 @@ -foo[attr="multiple spaces"]{content:"Hello World!"}foo[attr="Hel\ -lo"]{content:" \"World\""} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/vladmirated.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/vladmirated.css deleted file mode 100644 index 819835e582..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/vladmirated.css +++ /dev/null @@ -1,658 +0,0 @@ -/* from http://www.vladimirated.com/web-development-minify-css-using-php-and-cssmin-class */ - - #comments_inviter #close_me { - clear: both; - text-align: center; - border-top: 1px solid #eeeeee; - padding-top: 10px; - } - - #comments_inviter #close_me span { - color: #108eed; - cursor: pointer; - font-weight: bold; - } - - #comments_inviter img { - float: left; - margin-right: 3px; - margin-bottom: 10px; - } - - #comments_inviter { - width: 200px; - background-color: #FFFFFF; - border: 4px solid #eeeeee; - font-size: 10px; - font-family: verdana; - padding: 10px; - color: #333333; - } - - .one_com { - background-color: #FAFAFA; - padding: 10px; - margin-bottom: 20px; - border: 1px solid #EEEEEE; - } - - .one_com .com_says, .one_com .com_det { - text-transform: lowercase; - color: #333333; - padding: 0px; - font-family: verdana; - margin: 0px; - font-size: 13px; - font-weight: bold; - } - - .flvPlayer { - text-align: center; - border: 5px solid #dddddd; - width: 320px; - } - - .one_com .com_det { - font-size: 10px; - font-weight: normal; - margin-bottom: 20px; - padding-bottom: 10px; - border-bottom: 8px solid #eeeeee; - } - - .one_com .com_det a { - text-decoration: none; - } - - .one_com .com_txt { - background-color: #ffffff; - margin-bottom: 10px; - border-bottom: 2px solid #eeeeee - } - - .one_com .com_txt p { - font-family: verdana; - font-size: 13px; - color: #777777; - margin: 0px; - padding: 5px; - padding-bottom: 10px; - text-transform: lowercase; - } - - .one_com .com_says a { - color: #333333; - } - - .one_com .com_det a { - color: #333333; - } - - .post_box .related_posts { - - } - - .post_box .related_posts p { - padding: 0px; - margin: 0px; - padding-bottom: 20px; - padding-left: 35px; - font-family: verdana; - - } - - .post_box .related_posts a { - color: #108eed; - } - - .post_nav_2 p { - - text-align: center; - color: #cccccc; - font-family: verdana; - } - - .post_box .related_posts h3, #comments_box #respond, .comments_posted h3 { - padding: 0px; - margin: 0px; - font-size: 18px; - color: #FF8000; - padding-top: 30px; - margin-bottom: 20px; - width: 300px; - border-bottom: 5px solid #e0e0e0; - } - - .comments_posted { - - margin-bottom: 50px; - - } - - .comments_posted h3 { - padding: 0px; - margin: 0px; - margin-bottom: 20px; - - } - - .cmt_txtarea { - width: 300px; - height: 100px; - - } - - #comments_box #respond { - - padding-top: 0px; - margin-bottom: 0px; - - } - - .pagetitle { - color: #65DA33; - text-align: center; - } - - #searchform { - padding: 0px; - margin: 0px; - } - - .si { - background-color: #FFFFEE; - border: 1px solid #e0e0e0; - } - - #rightcol #r_news, #rightcol #linksbro, #rightcol #quick_tags { - margin-top: 30px; - padding-bottom: 10px; - } - - #post_nav p { - padding: 0px; - margin: 0px; - padding-bottom: 5px; - } - - #post_nav { - text-align: left; - padding-bottom: 15px; - } - - #post_nav a, .post_nav_2 p a { - text-decoration: none; - font-family: Verdana; - font-size: 12px; - color: #108eed; - } - - #post_nav a:hover, .post_nav_2 p a:hover { - text-decoration: underline; - color: #FF8000; - } - - #rightcol #about { - padding-bottom: 10px; - } - - #rightcol #r_news input { - color: #333333; - font-size: 12px; - } - - #header { - height: 200px; - width: 100%; - background-image: url('images/header_bg.jpg'); - background-repeat: x-repeat; - } - - #header img { - - float: right; - margin-right: -3px; - z-index: 100; - - } - - .tags { - text-transform: lowercase; - color: #333333; - font-family: arial; - font-size: 12px; - border-top: 2px dotted #EEEEEE; - width: 300px; - padding-top: 20px; - padding-bottom: 0px; - margin-top: 0px; - padding-left: 20px; - padding-right: 20px; - } - - .tags a { - color: #108eed; - } - - .tags p { - text-align: left; - margin: 0px; - padding: 0px; - } - - blockquote strong { - font-family: verdana; - display: block; - margin-top: 10px; - color: #FF0000; - font-style: italic; - text-align: right; - } - - blockquote { - margin: 0px; - background-color: #eeeeee; - border: 2px solid #dddddd; - padding: 24px; - padding-top: 10px; - padding-left: 60px; - padding-bottom: 10px; - font-size: 13px; - color: #333333; - margin-bottom: 30px; - margin-top: 10px; - } - - - html>body #header img { margin-right: 0px; } - - #subscribe h3 { - color: #ff0000; - margin-top: 30px; - padding: 20px; - } - - .post_actions a{ - color: #108eed; - } - - .post_actions { - border-top: 4px solid #DDDDDD; - border-bottom: 1px solid #EEEEEE; - text-align: center; - background-color: #FFFFDd; - color: #dddddd; - white-space: no-wrap; - padding-left: 20px; - padding-bottom: 5px; - text-transform: capitalize; - } - - #subscribe td { - color: #333333; - font-size: 12px; - text-transform: lowercase; - } - - #subscribe input { - font-size: 13px; - color: #333333; - } - - .post_content { - font-size: 13px; - margin-top: 10px; - padding-bottom: 10px; - text-align: justify; - font-family: verdana; - } - - .post_content p { - margin: 0px; - padding: 0px; - padding-bottom: 20px; - line-height: 20px; - } - - #header h1 { - z-index: 200; - margin: 0px; - position: absolute; - float: left; - text-transform: lowercase; - padding: 0px; - font-size: 45px; - margin-top: 70px; - margin-left: 40px; - - } - - #header h1 a { - white-space: no-wrap; - text-decoration: none; - color: #FAFAFA; - display: block - } - - #header h1 a:hover { - color: #FAFAFA; - border-bottom: 3px dotted #FAFAFA; - } - - html>body #header h1 { margin-left: 60px; } - - body { - margin: 0px; - padding: 0px; - height: 100%; - width: 100%; - font-family: 'Lucida Sans Unicode', 'Lucida Grande', Sans-Serif, Verdana, Arial; - font-size: 12px; - } - - #leftcol { - float: left; - width: 200px; - margin-left: 0px; - margin-top: 17px; - color: #000; - padding: 3px; - height: 100%; - } - - #leftcol .box_head h3 { - text-transform: uppercase; - padding: 0px; - margin: 0px; - font-family: georgia; - font-size: 18px; - color: #dddddd; - border-top: 4px solid #dddddd; - border-bottom: 4px solid #cccccc; - padding-left: 10px; - padding-top: 10px; - padding-bottom: 10px; - background-image: url('images/stripesbg.png'); - margin-bottom: 10px; - } - - #leftcol .box_head input { - text-transform: lowercase; - color: #333333; - } - - #leftcol .box_head { - margin-left: 7px; - background-color: #ffefd4; - border-bottom: 2px solid #eeeeee; - padding-bottom: 20px; - margin-bottom: 30px; - } - - #leftcol .box_head p a { - color: #0a2d4d; - display: block; - text-decoration: none; - border-bottom: 3px solid #fefefe; - padding-top: 20px; - text-transform: lowercase; - padding-bottom: 20px; - padding-left: 5px; - padding-right: 5px; - } - - #leftcol .box_head p a:hover { - background-color: #fafafa; - border-bottom: 3px solid #eeeeee; - color: #000000; - } - - #leftcol .box_head p { - text-align: left; - margin: 0px; - width: 170px; - padding-bottom: 0px; - padding-top: 0px; - font-size: 11px; - } - - #rightcol { - position: absolute; - left: 77%; - top: 278px; - border: 3px solid #eeeeee; - width: 200px; - z-index: 3; - color: #333333; - padding: 10px; - text-transform: lowercase; - - } - - #rightcol p { - padding: 0px; - marging: 0px; - text-align: justify; - } - - #rightcol #about img, #rightcol #linksbro img { - border: 5px solid #eeeeee; - } - - #rightcol #about h3, #rightcol #r_news h3, #rightcol #linksbro h3, #rightcol #quick_tags h3 { - background-color: #fafafa; - border: 1px dotted #e0e0e0; - font-size: 14px; - color: #104bbc; - padding: 5px; - padding-top: 10px; - font-family: Arial; - padding-bottom: 10px; - } - - #rightcol #about p a, #rightcol #r_news p a, #rightcol #linksbro p a { - color: #108eed; - } - - #rightcol #about p, #rightcol #r_news p, #rightcol #linksbro p { - font-size: 12px; - text-align: left; - } - - #content_warp { - margin: 20px 25% 0 215px; - padding: 3px; - color: #000; - background-color: #ededed; - } - - #content { - margin: 5px; - background-color: #FFFFFF; - padding: 10px; - } - - - #footer { - width: 99%; - margin-top: 30px; - height: 98px; - background-color: #101b1d; - } - - #footer td a { - color: #FF8000; - } - - #footer td a img { - border: 2px solid #108eed; - } - - #footer td p { - font-family: Verdana; - font-size: 10px; - color: #c0c0c0; - padding: 0px; - margin: 0px; - text-align: center; - padding-bottom: 10px; - } - - .s_offer { - color: #65DA33; - font-size: 20px; - font-weight: bold; - font-style: normal; - } - - .post_box { - text-transform: lowercase; - margin-bottom: 40px; - } - - #newsletter_box { - text-transform: lowercase; - margin-bottom: 10px; - margin-top: 30px; - font-style: normal; - background-color: #ffffff; - border: 5px solid #dddddd; - } - - #newsletter_head { - color: #EEEEEE; - font-family: Georgia; - background-image: url('images/stripesbg.png'); - padding: 10px; - padding-left: 30px; - border-bottom: 5px solid #dddddd; - } - - #newsletter_body { - color: #333333; - font-family: Verdana; - text-align: justify; - background-color: #FFFFFF; - padding: 10px; - font-size: 13px; - } - - .s_offer { - color: #65DA33; - font-size: 26px; - font-weight: bold; - font-style: normal; - } - - .post_title a { - color: #EEEEEE; - text-decoration: none; - } - - .post_title a:hover { - color: #c0c0c0; - } - - .post_title { - background-image: url('images/stripe_post.png'); - text-transform: uppercase; - font-size: 18px; - font-family: georgia; - padding: 10px; - border-top: 4px solid #c0c0c0; - margin: 0px; - border-bottom: 2px solid #ffffdd; - } - - .post_det { - text-transform: none; - margin: 0px; - border-top: 1px solid #f0f0f0; - padding: 0px; - padding-top: 5px; - color: #999999; - font-size: 10px; - font-family: verdana; - margin-bottom: 20px; - background-color: #eeeeee; - padding-bottom: 5px; - padding-left: 10px; - text-align: left; - border-bottom: 2px solid #dddddd; - } - - .post_det a { - color: #999999; - text-decoration: none; - } - - - .subtle { - text-transform: lowercase; - font-size: 10px; - font-family: verdana; - color: #108eed; - text-align: justify; - } - - #top_menu #navlist, #top_menu #navlist li { - padding:0px; - margin: 0px; - padding-top: 14px; - text-transform: lowercase; - padding-bottom: 17px; - padding-left: 30px; - border-left: 1px solid #65cdef; - } - - #top_menu #navlist, #top_menu #navlist li #first { - - border-left: 0px; - - } - - #top_menu #navlist { - padding-left: 30px; - background-color: #1dabd9; - border-top: 5px solid #0e96c3; - border-bottom: 5px solid #0e96c3; - } - - #top_menu #navlist li { - color: #444444; - font-size: 10px; - display: inline; - list-style-type: none; - padding-right: 30px; - } - - #top_menu #navlist li a { - text-decoration: none; - font-family: Verdana; - color: #fafafa; - font-size: 12px; - font-weight: bold; - } - - #top_menu #navlist li a:hover { - color: #333333; - } - - .post_content a { - color: #108eed; - } - - ul#tagcloud { padding:0; margin:0; text-align:center; list-style:none; } - ul#tagcloud li { display:inline; font-size:70%; color:#ccc; background: none; padding: 0;} - ul#tagcloud li a, ul#tagcloud li a:link { text-decoration:none; } - ul#tagcloud li a:hover { text-decoration:underline; } - ul#tagcloud li.t1 a { color:#797979; font-size: 120%; } - ul#tagcloud li.t2 a { color:#6d6d6d; font-size: 160%; } - ul#tagcloud li.t3 a { color:#616161; font-size: 190%; } - ul#tagcloud li.t4 a { color:#555555; font-size: 210%; } - ul#tagcloud li.t5 a { color:#484848; font-size: 230%; } - ul#tagcloud li.t6 a { color:#3c3c3c; font-size: 250%; } - ul#tagcloud li.t7 a { color:#303030; font-size: 270%; } - ul#tagcloud li.t8 a { color:#242424; font-size: 290%; } - ul#tagcloud li.t9 a { color:#181818; font-size: 310%; } - ul#tagcloud li.t10 a { color:#0c0c0c; font-size: 330%; } \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/vladmirated.min.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/vladmirated.min.css deleted file mode 100644 index eaffaee38a..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css/vladmirated.min.css +++ /dev/null @@ -1,79 +0,0 @@ -#comments_inviter -#close_me{clear:both;text-align:center;border-top:1px solid #eee;padding-top:10px}#comments_inviter #close_me -span{color:#108eed;cursor:pointer;font-weight:bold}#comments_inviter -img{float:left;margin-right:3px;margin-bottom:10px}#comments_inviter{width:200px;background-color:#FFF;border:4px -solid #eee;font-size:10px;font-family:verdana;padding:10px;color:#333}.one_com{background-color:#FAFAFA;padding:10px;margin-bottom:20px;border:1px -solid #EEE}.one_com .com_says, .one_com -.com_det{text-transform:lowercase;color:#333;padding:0px;font-family:verdana;margin:0px;font-size:13px;font-weight:bold}.flvPlayer{text-align:center;border:5px -solid #ddd;width:320px}.one_com -.com_det{font-size:10px;font-weight:normal;margin-bottom:20px;padding-bottom:10px;border-bottom:8px solid #eee}.one_com .com_det -a{text-decoration:none}.one_com -.com_txt{background-color:#fff;margin-bottom:10px;border-bottom:2px solid #eee}.one_com .com_txt -p{font-family:verdana;font-size:13px;color:#777;margin:0px;padding:5px;padding-bottom:10px;text-transform:lowercase}.one_com .com_says -a{color:#333}.one_com .com_det -a{color:#333}.post_box -.related_posts{}.post_box .related_posts -p{padding:0px;margin:0px;padding-bottom:20px;padding-left:35px;font-family:verdana}.post_box .related_posts -a{color:#108eed}.post_nav_2 -p{text-align:center;color:#ccc;font-family:verdana}.post_box .related_posts h3, #comments_box #respond, .comments_posted -h3{padding:0px;margin:0px;font-size:18px;color:#FF8000;padding-top:30px;margin-bottom:20px;width:300px;border-bottom:5px solid #e0e0e0}.comments_posted{margin-bottom:50px}.comments_posted -h3{padding:0px;margin:0px;margin-bottom:20px}.cmt_txtarea{width:300px;height:100px}#comments_box -#respond{padding-top:0px;margin-bottom:0px}.pagetitle{color:#65DA33;text-align:center}#searchform{padding:0px;margin:0px}.si{background-color:#FFE;border:1px -solid #e0e0e0}#rightcol #r_news, #rightcol #linksbro, #rightcol -#quick_tags{margin-top:30px;padding-bottom:10px}#post_nav -p{padding:0px;margin:0px;padding-bottom:5px}#post_nav{text-align:left;padding-bottom:15px}#post_nav a, .post_nav_2 p -a{text-decoration:none;font-family:Verdana;font-size:12px;color:#108eed}#post_nav a:hover, .post_nav_2 p a:hover{text-decoration:underline;color:#FF8000}#rightcol -#about{padding-bottom:10px}#rightcol #r_news -input{color:#333;font-size:12px}#header{height:200px;width:100%;background-image:url('images/header_bg.jpg');background-repeat:x-repeat}#header -img{float:right;margin-right: -3px;z-index:100}.tags{text-transform:lowercase;color:#333;font-family:arial;font-size:12px;border-top:2px dotted #EEE;width:300px;padding-top:20px;padding-bottom:0px;margin-top:0px;padding-left:20px;padding-right:20px}.tags -a{color:#108eed}.tags -p{text-align:left;margin:0px;padding:0px}blockquote -strong{font-family:verdana;display:block;margin-top:10px;color:#F00;font-style:italic;text-align:right}blockquote{margin:0px;background-color:#eee;border:2px -solid #ddd;padding:24px;padding-top:10px;padding-left:60px;padding-bottom:10px;font-size:13px;color:#333;margin-bottom:30px;margin-top:10px}html>body #header -img{margin-right:0px}#subscribe -h3{color:#f00;margin-top:30px;padding:20px}.post_actions -a{color:#108eed}.post_actions{border-top:4px solid #DDD;border-bottom:1px solid #EEE;text-align:center;background-color:#FFD;color:#ddd;white-space:no-wrap;padding-left:20px;padding-bottom:5px;text-transform:capitalize}#subscribe -td{color:#333;font-size:12px;text-transform:lowercase}#subscribe -input{font-size:13px;color:#333}.post_content{font-size:13px;margin-top:10px;padding-bottom:10px;text-align:justify;font-family:verdana}.post_content -p{margin:0px;padding:0px;padding-bottom:20px;line-height:20px}#header -h1{z-index:200;margin:0px;position:absolute;float:left;text-transform:lowercase;padding:0px;font-size:45px;margin-top:70px;margin-left:40px}#header h1 -a{white-space:no-wrap;text-decoration:none;color:#FAFAFA;display:block}#header h1 a:hover{color:#FAFAFA;border-bottom:3px dotted #FAFAFA}html>body #header -h1{margin-left:60px}body{margin:0px;padding:0px;height:100%;width:100%;font-family:'Lucida Sans Unicode','Lucida Grande',Sans-Serif,Verdana,Arial;font-size:12px}#leftcol{float:left;width:200px;margin-left:0px;margin-top:17px;color:#000;padding:3px;height:100%}#leftcol .box_head -h3{text-transform:uppercase;padding:0px;margin:0px;font-family:georgia;font-size:18px;color:#ddd;border-top:4px solid #ddd;border-bottom:4px solid #ccc;padding-left:10px;padding-top:10px;padding-bottom:10px;background-image:url('images/stripesbg.png');margin-bottom:10px}#leftcol .box_head -input{text-transform:lowercase;color:#333}#leftcol -.box_head{margin-left:7px;background-color:#ffefd4;border-bottom:2px solid #eee;padding-bottom:20px;margin-bottom:30px}#leftcol .box_head p -a{color:#0a2d4d;display:block;text-decoration:none;border-bottom:3px solid #fefefe;padding-top:20px;text-transform:lowercase;padding-bottom:20px;padding-left:5px;padding-right:5px}#leftcol .box_head p a:hover{background-color:#fafafa;border-bottom:3px solid #eee;color:#000}#leftcol .box_head -p{text-align:left;margin:0px;width:170px;padding-bottom:0px;padding-top:0px;font-size:11px}#rightcol{position:absolute;left:77%;top:278px;border:3px -solid #eee;width:200px;z-index:3;color:#333;padding:10px;text-transform:lowercase}#rightcol -p{padding:0px;marging:0px;text-align:justify}#rightcol #about img, #rightcol #linksbro -img{border:5px -solid #eee}#rightcol #about h3, #rightcol #r_news h3, #rightcol #linksbro h3, #rightcol #quick_tags -h3{background-color:#fafafa;border:1px -dotted #e0e0e0;font-size:14px;color:#104bbc;padding:5px;padding-top:10px;font-family:Arial;padding-bottom:10px}#rightcol #about p a, #rightcol #r_news p a, #rightcol #linksbro p -a{color:#108eed}#rightcol #about p, #rightcol #r_news p, #rightcol #linksbro -p{font-size:12px;text-align:left}#content_warp{margin:20px -25% 0 215px;padding:3px;color:#000;background-color:#ededed}#content{margin:5px;background-color:#FFF;padding:10px}#footer{width:99%;margin-top:30px;height:98px;background-color:#101b1d}#footer td -a{color:#FF8000}#footer td a -img{border:2px -solid #108eed}#footer td -p{font-family:Verdana;font-size:10px;color:#c0c0c0;padding:0px;margin:0px;text-align:center;padding-bottom:10px}.s_offer{color:#65DA33;font-size:20px;font-weight:bold;font-style:normal}.post_box{text-transform:lowercase;margin-bottom:40px}#newsletter_box{text-transform:lowercase;margin-bottom:10px;margin-top:30px;font-style:normal;background-color:#fff;border:5px -solid #ddd}#newsletter_head{color:#EEE;font-family:Georgia;background-image:url('images/stripesbg.png');padding:10px;padding-left:30px;border-bottom:5px solid #ddd}#newsletter_body{color:#333;font-family:Verdana;text-align:justify;background-color:#FFF;padding:10px;font-size:13px}.s_offer{color:#65DA33;font-size:26px;font-weight:bold;font-style:normal}.post_title -a{color:#EEE;text-decoration:none}.post_title a:hover{color:#c0c0c0}.post_title{background-image:url('images/stripe_post.png');text-transform:uppercase;font-size:18px;font-family:georgia;padding:10px;border-top:4px solid #c0c0c0;margin:0px;border-bottom:2px solid #ffd}.post_det{text-transform:none;margin:0px;border-top:1px solid #f0f0f0;padding:0px;padding-top:5px;color:#999;font-size:10px;font-family:verdana;margin-bottom:20px;background-color:#eee;padding-bottom:5px;padding-left:10px;text-align:left;border-bottom:2px solid #ddd}.post_det -a{color:#999;text-decoration:none}.subtle{text-transform:lowercase;font-size:10px;font-family:verdana;color:#108eed;text-align:justify}#top_menu #navlist, #top_menu #navlist -li{padding:0px;margin:0px;padding-top:14px;text-transform:lowercase;padding-bottom:17px;padding-left:30px;border-left:1px solid #65cdef}#top_menu #navlist, #top_menu #navlist li -#first{border-left:0px}#top_menu -#navlist{padding-left:30px;background-color:#1dabd9;border-top:5px solid #0e96c3;border-bottom:5px solid #0e96c3}#top_menu #navlist -li{color:#444;font-size:10px;display:inline;list-style-type:none;padding-right:30px}#top_menu #navlist li -a{text-decoration:none;font-family:Verdana;color:#fafafa;font-size:12px;font-weight:bold}#top_menu #navlist li a:hover{color:#333}.post_content -a{color:#108eed}ul#tagcloud{padding:0;margin:0;text-align:center;list-style:none}ul#tagcloud -li{display:inline;font-size:70%;color:#ccc;background:none;padding:0}ul#tagcloud li a, ul#tagcloud li a:link{text-decoration:none}ul#tagcloud li a:hover{text-decoration:underline}ul#tagcloud li.t1 -a{color:#797979;font-size:120%}ul#tagcloud li.t2 -a{color:#6d6d6d;font-size:160%}ul#tagcloud li.t3 -a{color:#616161;font-size:190%}ul#tagcloud li.t4 -a{color:#555;font-size:210%}ul#tagcloud li.t5 -a{color:#484848;font-size:230%}ul#tagcloud li.t6 -a{color:#3c3c3c;font-size:250%}ul#tagcloud li.t7 -a{color:#303030;font-size:270%}ul#tagcloud li.t8 -a{color:#242424;font-size:290%}ul#tagcloud li.t9 -a{color:#181818;font-size:310%}ul#tagcloud li.t10 -a{color:#0c0c0c;font-size:330%} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css_uriRewriter/exp.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css_uriRewriter/exp.css deleted file mode 100644 index d749295b77..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css_uriRewriter/exp.css +++ /dev/null @@ -1,14 +0,0 @@ -@import "/_test_files/css_uriRewriter/foo.css"; -@import '/_test_files/css_uriRewriter/bar/foo.css' print; -@import '/_test_files/bar/foo.css' print; -@import '/foo.css' print; -@import '/css/foo.css'; /* abs, should not alter */ -@import 'http://foo.com/css/foo.css'; /* abs, should not alter */ -@import url(/_test_files/foo.css) tv, projection; -@import url("/css/foo.css"); /* abs, should not alter */ -@import url(/css2/foo.css); /* abs, should not alter */ -@import url(data:image/gif;base64,AAAA); /* data, should not alter */ -foo {background:url('/_test_files/css_uriRewriter/bar/foo.png')} -foo {background:url('http://foo.com/css/foo.css');} /* abs, should not alter */ -foo {background:url("//foo.com/css/foo.css");} /* protocol relative, should not alter */ -foo {background:url(data:image/gif;base64,AAAA);} /* data, should not alter */ \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css_uriRewriter/in.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css_uriRewriter/in.css deleted file mode 100644 index aa41d0a91e..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/css_uriRewriter/in.css +++ /dev/null @@ -1,14 +0,0 @@ -@import "foo.css"; -@import 'bar/foo.css' print; -@import '../bar/foo.css' print; -@import '../../foo.css' print; -@import '/css/foo.css'; /* abs, should not alter */ -@import 'http://foo.com/css/foo.css'; /* abs, should not alter */ -@import url(../foo.css) tv, projection; -@import url("/css/foo.css"); /* abs, should not alter */ -@import url(/css2/foo.css); /* abs, should not alter */ -@import url(data:image/gif;base64,AAAA); /* data, should not alter */ -foo {background:url('bar/foo.png')} -foo {background:url('http://foo.com/css/foo.css');} /* abs, should not alter */ -foo {background:url("//foo.com/css/foo.css");} /* protocol relative, should not alter */ -foo {background:url(data:image/gif;base64,AAAA);} /* data, should not alter */ \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/html/before.html b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/html/before.html deleted file mode 100644 index c22cc8f20d..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/html/before.html +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - css Zen Garden: The Beauty in CSS Design - - - - - - - - - - - - -

    Browser != IE

    -
    - - 
    -	White  space  is  important   here!
-
    -
    -

    A demonstration of what can be accomplished visually through CSS-based design. Select any style sheet from the list to load it into this page.

    -

    Download the sample html file and css file

    -
    - -
    - - \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/html/before.min.html b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/html/before.min.html deleted file mode 100644 index 58ba2bb988..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/html/before.min.html +++ /dev/null @@ -1,36 +0,0 @@ -css Zen Garden: The Beauty in CSS Design

    Browser != IE

    css Zen Garden

    The Beauty of CSS Design

    -	White  space  is  important   here!
-

    A demonstration of what can be accomplished visually through CSS-based design. Select any style sheet from the list to load it into this page.

    Download the sample html file and css file

    \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/html/before2.html b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/html/before2.html deleted file mode 100644 index 4ca7f199e1..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/html/before2.html +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - css Zen Garden: The Beauty in CSS Design - - - - - - - - - - - - -

    Browser != IE

    -
    - - 
    -	White  space  is  important   here!
-
    -
    -

    A demonstration of what can be accomplished visually through CSS-based design. Select any style sheet from the list to load it into this page.

    -

    Download the sample html file and css file

    -
    - -Preserve at least 1 char of whitespace near scripts in case of document.write(). -
    - - \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/html/before2.min.html b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/html/before2.min.html deleted file mode 100644 index ae28465bcd..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/html/before2.min.html +++ /dev/null @@ -1,36 +0,0 @@ -css Zen Garden: The Beauty in CSS Design

    Browser != IE

    css Zen Garden

    The Beauty of CSS Design

    -	White  space  is  important   here!
-

    A demonstration of what can be accomplished visually through CSS-based design. Select any style sheet from the list to load it into this page.

    Download the sample html file and css file

    Preserve at least 1 char of whitespace near scripts in case of document.write().
    \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/1/adjacent.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/1/adjacent.css deleted file mode 100644 index da52c69491..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/1/adjacent.css +++ /dev/null @@ -1,3 +0,0 @@ -/* @import url('bad.css' ) bad; */ -adjacent2 foo { background: red url(/red.gif); } -adjacent2 bar { background: url('../green.gif') } \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/1/tv.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/1/tv.css deleted file mode 100644 index 69fa2f5ef3..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/1/tv.css +++ /dev/null @@ -1,4 +0,0 @@ -@import url( adjacent.css ) all; -@import '../input.css'; -tv foo { background: red url(/red.gif); } -tv bar { background: url('../green.gif') } \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/adjacent.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/adjacent.css deleted file mode 100644 index b452f473e7..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/adjacent.css +++ /dev/null @@ -1,4 +0,0 @@ -@import url(../css/styles.css); -@import url(http://example.com/hello.css); -adjacent foo { background: red url(/red.gif); } -adjacent bar { background: url('../green.gif') } \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/input.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/input.css deleted file mode 100644 index bb7b959511..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/input.css +++ /dev/null @@ -1,4 +0,0 @@ -@import url( adjacent.css ) screen; -@import "1/tv.css" tv, projection; -input foo { background: red url(/red.gif); } -input bar { background: url('../green.gif') } \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/output.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/output.css deleted file mode 100644 index 1e4358c25d..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/output.css +++ /dev/null @@ -1,48 +0,0 @@ -@media screen { -/* some CSS to try to exercise things in general */ - -@import url(/more.css); - - body, td, th { - font-family: Verdana , "Bitstream Vera Sans" , sans-serif ; - - font-size : 12px; -} - -.nav { - margin-left: 20%; -} -#main-nav { - background-color: red; - border: 1px solid #00ff77; -} - -div#content -h1 + p { - padding-top: 0; - margin-top: 0; -} - -@media all and (min-width: 640px) { - #media-queries-1 { background-color: #0f0; } -} - -@media screen and (max-width: 2000px) { - #media-queries-2 { background-color: #0f0; } -} -@import url(http://example.com/hello.css); -adjacent foo { background: red url(/red.gif); } -adjacent bar { background: url('%TEST_FILES_URI%/green.gif') } -} - -@media tv,projection { -/* @import url('%TEST_FILES_URI%/importProcessor/1/bad.css') bad; */ -adjacent2 foo { background: red url(/red.gif); } -adjacent2 bar { background: url('%TEST_FILES_URI%/importProcessor/green.gif') } -@import '../input.css'; -tv foo { background: red url(/red.gif); } -tv bar { background: url('%TEST_FILES_URI%/importProcessor/green.gif') } -} - -input foo { background: red url(/red.gif); } -input bar { background: url('%TEST_FILES_URI%/green.gif') } \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/before.js b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/before.js deleted file mode 100644 index cccdb9706e..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/before.js +++ /dev/null @@ -1,57 +0,0 @@ -/*! is.js - - (c) 2001 Douglas Crockford - 2001 June 3 -*/ - -// is - -// The -is- object is used to identify the browser. Every browser edition -// identifies itself, but there is no standard way of doing it, and some of -// the identification is deceptive. This is because the authors of web -// browsers are liars. For example, Microsoft's IE browsers claim to be -// Mozilla 4. Netscape 6 claims to be version 5. - -var is = { - ie: navigator.appName == 'Microsoft Internet Explorer', - java: navigator.javaEnabled(), - ns: navigator.appName == 'Netscape', - ua: navigator.userAgent.toLowerCase(), - version: parseFloat(navigator.appVersion.substr(21)) || - parseFloat(navigator.appVersion), - win: navigator.platform == 'Win32' -} -/*!* - * preserve this comment, too - */ -is.mac = is.ua.indexOf('mac') >= 0; -if (is.ua.indexOf('opera') >= 0) { - is.ie = is.ns = false; - is.opera = true; -} -if (is.ua.indexOf('gecko') >= 0) { - is.ie = is.ns = false; - is.gecko = true; -} - -/*@cc_on - /*@if (@_win32) - if (is.ie && is.win) - document.write("PASS: IE/win honored conditional comment.
    "); - @else @*/ - if (is.ie && is.win) - document.write("FAIL: IE/win did not honor multi-line conditional comment.
    "); - else - document.write("PASS: Non-IE/win browser ignores multi-line conditional comment.
    "); - /*@end -@*/ - -var recognizesCondComm = true; -//@cc_on/* -recognizesCondComm = false; -//@cc_on*/ - -if ((is.ie && is.win) == recognizesCondComm) - document.write("PASS: IE/win honored single-line conditional comment.
    "); -else - document.write("FAIL: Non-IE/win browser did not ignore single-line conditional comment.
    "); diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/before.min.js b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/before.min.js deleted file mode 100644 index 6f06c6e6ce..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/before.min.js +++ /dev/null @@ -1,22 +0,0 @@ -/* is.js - - (c) 2001 Douglas Crockford - 2001 June 3 -*/ -var is={ie:navigator.appName=='Microsoft Internet Explorer',java:navigator.javaEnabled(),ns:navigator.appName=='Netscape',ua:navigator.userAgent.toLowerCase(),version:parseFloat(navigator.appVersion.substr(21))||parseFloat(navigator.appVersion),win:navigator.platform=='Win32'} -/** - * preserve this comment, too - */ -is.mac=is.ua.indexOf('mac')>=0;if(is.ua.indexOf('opera')>=0){is.ie=is.ns=false;is.opera=true;} -if(is.ua.indexOf('gecko')>=0){is.ie=is.ns=false;is.gecko=true;}/*@cc_on - /*@if (@_win32) - if (is.ie && is.win) - document.write("PASS: IE/win honored conditional comment.
    "); - @else @*/if(is.ie&&is.win) -document.write("FAIL: IE/win did not honor multi-line conditional comment.
    ");else -document.write("PASS: Non-IE/win browser ignores multi-line conditional comment.
    ");/*@end -@*/var recognizesCondComm=true;//@cc_on/* -recognizesCondComm=false;//@cc_on*/ -if((is.ie&&is.win)==recognizesCondComm) -document.write("PASS: IE/win honored single-line conditional comment.
    ");else -document.write("FAIL: Non-IE/win browser did not ignore single-line conditional comment.
    "); \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/before.min_plus.js b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/before.min_plus.js deleted file mode 100644 index 6f06c6e6ce..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/before.min_plus.js +++ /dev/null @@ -1,22 +0,0 @@ -/* is.js - - (c) 2001 Douglas Crockford - 2001 June 3 -*/ -var is={ie:navigator.appName=='Microsoft Internet Explorer',java:navigator.javaEnabled(),ns:navigator.appName=='Netscape',ua:navigator.userAgent.toLowerCase(),version:parseFloat(navigator.appVersion.substr(21))||parseFloat(navigator.appVersion),win:navigator.platform=='Win32'} -/** - * preserve this comment, too - */ -is.mac=is.ua.indexOf('mac')>=0;if(is.ua.indexOf('opera')>=0){is.ie=is.ns=false;is.opera=true;} -if(is.ua.indexOf('gecko')>=0){is.ie=is.ns=false;is.gecko=true;}/*@cc_on - /*@if (@_win32) - if (is.ie && is.win) - document.write("PASS: IE/win honored conditional comment.
    "); - @else @*/if(is.ie&&is.win) -document.write("FAIL: IE/win did not honor multi-line conditional comment.
    ");else -document.write("PASS: Non-IE/win browser ignores multi-line conditional comment.
    ");/*@end -@*/var recognizesCondComm=true;//@cc_on/* -recognizesCondComm=false;//@cc_on*/ -if((is.ie&&is.win)==recognizesCondComm) -document.write("PASS: IE/win honored single-line conditional comment.
    ");else -document.write("FAIL: Non-IE/win browser did not ignore single-line conditional comment.
    "); \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/condcomm.js b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/condcomm.js deleted file mode 100644 index 28aa1268be..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/condcomm.js +++ /dev/null @@ -1,14 +0,0 @@ -var isWin; -/*@cc_on - @if (@_win32) - isWin = true; - @else @*/ isWin = false; - /*@end -@*/ - -isWin = /*@cc_on!*/!1; - -var recognizesCondComm = true; -//@cc_on/* -recognizesCondComm = false; -//@cc_on*/ diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/condcomm.min_plus.js b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/condcomm.min_plus.js deleted file mode 100644 index d8c1ed3861..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/condcomm.min_plus.js +++ /dev/null @@ -1,13 +0,0 @@ -var isWin; -/*@cc_on - @if (@_win32) - isWin = true; - @else @*/ - isWin = false; - /*@end -@*/ - -var recognizesCondComm = true; -//@cc_on/* -recognizesCondComm = false; -//@cc_on*/ \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/issue74.js b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/issue74.js deleted file mode 100644 index e12eaeb487..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/issue74.js +++ /dev/null @@ -1,4 +0,0 @@ - -function testIssue74() { - return /'/; -} diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/issue74.min.js b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/issue74.min.js deleted file mode 100644 index 3442a73fcd..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/issue74.min.js +++ /dev/null @@ -1 +0,0 @@ -function testIssue74(){return /'/;} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/issue74.min_plus.js b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/issue74.min_plus.js deleted file mode 100644 index 9caaa899c9..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/issue74.min_plus.js +++ /dev/null @@ -1 +0,0 @@ -function testIssue74(){return /'/} \ No newline at end of file diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/jquery-1.2.3.js b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/jquery-1.2.3.js deleted file mode 100644 index c5a3337600..0000000000 --- a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/js/jquery-1.2.3.js +++ /dev/null @@ -1,3408 +0,0 @@ -(function(){ -/*! - * jQuery 1.2.3 - New Wave Javascript - * - * Copyright (c) 2008 John Resig (jquery.com) - * Dual licensed under the MIT (MIT-LICENSE.txt) - * and GPL (GPL-LICENSE.txt) licenses. - * - * $Date: 2008-02-06 00:21:25 -0500 (Wed, 06 Feb 2008) $ - * $Rev: 4663 $ - */ - -// Map over jQuery in case of overwrite -if ( window.jQuery ) - var _jQuery = window.jQuery; - -var jQuery = window.jQuery = function( selector, context ) { - // The jQuery object is actually just the init constructor 'enhanced' - return new jQuery.prototype.init( selector, context ); -}; - -// Map over the $ in case of overwrite -if ( window.$ ) - var _$ = window.$; - -// Map the jQuery namespace to the '$' one -window.$ = jQuery; - -// A simple way to check for HTML strings or ID strings -// (both of which we optimize for) -var quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/; - -// Is it a simple selector -var isSimple = /^.[^:#\[\.]*$/; - -jQuery.fn = jQuery.prototype = { - init: function( selector, context ) { - // Make sure that a selection was provided - selector = selector || document; - - // Handle $(DOMElement) - if ( selector.nodeType ) { - this[0] = selector; - this.length = 1; - return this; - - // Handle HTML strings - } else if ( typeof selector == "string" ) { - // Are we dealing with HTML string or an ID? - var match = quickExpr.exec( selector ); - - // Verify a match, and that no context was specified for #id - if ( match && (match[1] || !context) ) { - - // HANDLE: $(html) -> $(array) - if ( match[1] ) - selector = jQuery.clean( [ match[1] ], context ); - - // HANDLE: $("#id") - else { - var elem = document.getElementById( match[3] ); - - // Make sure an element was located - if ( elem ) - // Handle the case where IE and Opera return items - // by name instead of ID - if ( elem.id != match[3] ) - return jQuery().find( selector ); - - // Otherwise, we inject the element directly into the jQuery object - else { - this[0] = elem; - this.length = 1; - return this; - } - - else - selector = []; - } - - // HANDLE: $(expr, [context]) - // (which is just equivalent to: $(content).find(expr) - } else - return new jQuery( context ).find( selector ); - - // HANDLE: $(function) - // Shortcut for document ready - } else if ( jQuery.isFunction( selector ) ) - return new jQuery( document )[ jQuery.fn.ready ? "ready" : "load" ]( selector ); - - return this.setArray( - // HANDLE: $(array) - selector.constructor == Array && selector || - - // HANDLE: $(arraylike) - // Watch for when an array-like object, contains DOM nodes, is passed in as the selector - (selector.jquery || selector.length && selector != window && !selector.nodeType && selector[0] != undefined && selector[0].nodeType) && jQuery.makeArray( selector ) || - - // HANDLE: $(*) - [ selector ] ); - }, - - // The current version of jQuery being used - jquery: "1.2.3", - - // The number of elements contained in the matched element set - size: function() { - return this.length; - }, - - // The number of elements contained in the matched element set - length: 0, - - // Get the Nth element in the matched element set OR - // Get the whole matched element set as a clean array - get: function( num ) { - return num == undefined ? - - // Return a 'clean' array - jQuery.makeArray( this ) : - - // Return just the object - this[ num ]; - }, - - // Take an array of elements and push it onto the stack - // (returning the new matched element set) - pushStack: function( elems ) { - // Build a new jQuery matched element set - var ret = jQuery( elems ); - - // Add the old object onto the stack (as a reference) - ret.prevObject = this; - - // Return the newly-formed element set - return ret; - }, - - // Force the current matched set of elements to become - // the specified array of elements (destroying the stack in the process) - // You should use pushStack() in order to do this, but maintain the stack - setArray: function( elems ) { - // Resetting the length to 0, then using the native Array push - // is a super-fast way to populate an object with array-like properties - this.length = 0; - Array.prototype.push.apply( this, elems ); - - return this; - }, - - // Execute a callback for every element in the matched set. - // (You can seed the arguments with an array of args, but this is - // only used internally.) - each: function( callback, args ) { - return jQuery.each( this, callback, args ); - }, - - // Determine the position of an element within - // the matched set of elements - index: function( elem ) { - var ret = -1; - - // Locate the position of the desired element - this.each(function(i){ - if ( this == elem ) - ret = i; - }); - - return ret; - }, - - attr: function( name, value, type ) { - var options = name; - - // Look for the case where we're accessing a style value - if ( name.constructor == String ) - if ( value == undefined ) - return this.length && jQuery[ type || "attr" ]( this[0], name ) || undefined; - - else { - options = {}; - options[ name ] = value; - } - - // Check to see if we're setting style values - return this.each(function(i){ - // Set all the styles - for ( name in options ) - jQuery.attr( - type ? - this.style : - this, - name, jQuery.prop( this, options[ name ], type, i, name ) - ); - }); - }, - - css: function( key, value ) { - // ignore negative width and height values - if ( (key == 'width' || key == 'height') && parseFloat(value) < 0 ) - value = undefined; - return this.attr( key, value, "curCSS" ); - }, - - text: function( text ) { - if ( typeof text != "object" && text != null ) - return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) ); - - var ret = ""; - - jQuery.each( text || this, function(){ - jQuery.each( this.childNodes, function(){ - if ( this.nodeType != 8 ) - ret += this.nodeType != 1 ? - this.nodeValue : - jQuery.fn.text( [ this ] ); - }); - }); - - return ret; - }, - - wrapAll: function( html ) { - if ( this[0] ) - // The elements to wrap the target around - jQuery( html, this[0].ownerDocument ) - .clone() - .insertBefore( this[0] ) - .map(function(){ - var elem = this; - - while ( elem.firstChild ) - elem = elem.firstChild; - - return elem; - }) - .append(this); - - return this; - }, - - wrapInner: function( html ) { - return this.each(function(){ - jQuery( this ).contents().wrapAll( html ); - }); - }, - - wrap: function( html ) { - return this.each(function(){ - jQuery( this ).wrapAll( html ); - }); - }, - - append: function() { - return this.domManip(arguments, true, false, function(elem){ - if (this.nodeType == 1) - this.appendChild( elem ); - }); - }, - - prepend: function() { - return this.domManip(arguments, true, true, function(elem){ - if (this.nodeType == 1) - this.insertBefore( elem, this.firstChild ); - }); - }, - - before: function() { - return this.domManip(arguments, false, false, function(elem){ - this.parentNode.insertBefore( elem, this ); - }); - }, - - after: function() { - return this.domManip(arguments, false, true, function(elem){ - this.parentNode.insertBefore( elem, this.nextSibling ); - }); - }, - - end: function() { - return this.prevObject || jQuery( [] ); - }, - - find: function( selector ) { - var elems = jQuery.map(this, function(elem){ - return jQuery.find( selector, elem ); - }); - - return this.pushStack( /[^+>] [^+>]/.test( selector ) || selector.indexOf("..") > -1 ? - jQuery.unique( elems ) : - elems ); - }, - - clone: function( events ) { - // Do the clone - var ret = this.map(function(){ - if ( jQuery.browser.msie && !jQuery.isXMLDoc(this) ) { - // IE copies events bound via attachEvent when - // using cloneNode. Calling detachEvent on the - // clone will also remove the events from the orignal - // In order to get around this, we use innerHTML. - // Unfortunately, this means some modifications to - // attributes in IE that are actually only stored - // as properties will not be copied (such as the - // the name attribute on an input). - var clone = this.cloneNode(true), - container = document.createElement("div"); - container.appendChild(clone); - return jQuery.clean([container.innerHTML])[0]; - } else - return this.cloneNode(true); - }); - - // Need to set the expando to null on the cloned set if it exists - // removeData doesn't work here, IE removes it from the original as well - // this is primarily for IE but the data expando shouldn't be copied over in any browser - var clone = ret.find("*").andSelf().each(function(){ - if ( this[ expando ] != undefined ) - this[ expando ] = null; - }); - - // Copy the events from the original to the clone - if ( events === true ) - this.find("*").andSelf().each(function(i){ - if (this.nodeType == 3) - return; - var events = jQuery.data( this, "events" ); - - for ( var type in events ) - for ( var handler in events[ type ] ) - jQuery.event.add( clone[ i ], type, events[ type ][ handler ], events[ type ][ handler ].data ); - }); - - // Return the cloned set - return ret; - }, - - filter: function( selector ) { - return this.pushStack( - jQuery.isFunction( selector ) && - jQuery.grep(this, function(elem, i){ - return selector.call( elem, i ); - }) || - - jQuery.multiFilter( selector, this ) ); - }, - - not: function( selector ) { - if ( selector.constructor == String ) - // test special case where just one selector is passed in - if ( isSimple.test( selector ) ) - return this.pushStack( jQuery.multiFilter( selector, this, true ) ); - else - selector = jQuery.multiFilter( selector, this ); - - var isArrayLike = selector.length && selector[selector.length - 1] !== undefined && !selector.nodeType; - return this.filter(function() { - return isArrayLike ? jQuery.inArray( this, selector ) < 0 : this != selector; - }); - }, - - add: function( selector ) { - return !selector ? this : this.pushStack( jQuery.merge( - this.get(), - selector.constructor == String ? - jQuery( selector ).get() : - selector.length != undefined && (!selector.nodeName || jQuery.nodeName(selector, "form")) ? - selector : [selector] ) ); - }, - - is: function( selector ) { - return selector ? - jQuery.multiFilter( selector, this ).length > 0 : - false; - }, - - hasClass: function( selector ) { - return this.is( "." + selector ); - }, - - val: function( value ) { - if ( value == undefined ) { - - if ( this.length ) { - var elem = this[0]; - - // We need to handle select boxes special - if ( jQuery.nodeName( elem, "select" ) ) { - var index = elem.selectedIndex, - values = [], - options = elem.options, - one = elem.type == "select-one"; - - // Nothing was selected - if ( index < 0 ) - return null; - - // Loop through all the selected options - for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) { - var option = options[ i ]; - - if ( option.selected ) { - // Get the specifc value for the option - value = jQuery.browser.msie && !option.attributes.value.specified ? option.text : option.value; - - // We don't need an array for one selects - if ( one ) - return value; - - // Multi-Selects return an array - values.push( value ); - } - } - - return values; - - // Everything else, we just grab the value - } else - return (this[0].value || "").replace(/\r/g, ""); - - } - - return undefined; - } - - return this.each(function(){ - if ( this.nodeType != 1 ) - return; - - if ( value.constructor == Array && /radio|checkbox/.test( this.type ) ) - this.checked = (jQuery.inArray(this.value, value) >= 0 || - jQuery.inArray(this.name, value) >= 0); - - else if ( jQuery.nodeName( this, "select" ) ) { - var values = value.constructor == Array ? - value : - [ value ]; - - jQuery( "option", this ).each(function(){ - this.selected = (jQuery.inArray( this.value, values ) >= 0 || - jQuery.inArray( this.text, values ) >= 0); - }); - - if ( !values.length ) - this.selectedIndex = -1; - - } else - this.value = value; - }); - }, - - html: function( value ) { - return value == undefined ? - (this.length ? - this[0].innerHTML : - null) : - this.empty().append( value ); - }, - - replaceWith: function( value ) { - return this.after( value ).remove(); - }, - - eq: function( i ) { - return this.slice( i, i + 1 ); - }, - - slice: function() { - return this.pushStack( Array.prototype.slice.apply( this, arguments ) ); - }, - - map: function( callback ) { - return this.pushStack( jQuery.map(this, function(elem, i){ - return callback.call( elem, i, elem ); - })); - }, - - andSelf: function() { - return this.add( this.prevObject ); - }, - - data: function( key, value ){ - var parts = key.split("."); - parts[1] = parts[1] ? "." + parts[1] : ""; - - if ( value == null ) { - var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]); - - if ( data == undefined && this.length ) - data = jQuery.data( this[0], key ); - - return data == null && parts[1] ? - this.data( parts[0] ) : - data; - } else - return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function(){ - jQuery.data( this, key, value ); - }); - }, - - removeData: function( key ){ - return this.each(function(){ - jQuery.removeData( this, key ); - }); - }, - - domManip: function( args, table, reverse, callback ) { - var clone = this.length > 1, elems; - - return this.each(function(){ - if ( !elems ) { - elems = jQuery.clean( args, this.ownerDocument ); - - if ( reverse ) - elems.reverse(); - } - - var obj = this; - - if ( table && jQuery.nodeName( this, "table" ) && jQuery.nodeName( elems[0], "tr" ) ) - obj = this.getElementsByTagName("tbody")[0] || this.appendChild( this.ownerDocument.createElement("tbody") ); - - var scripts = jQuery( [] ); - - jQuery.each(elems, function(){ - var elem = clone ? - jQuery( this ).clone( true )[0] : - this; - - // execute all scripts after the elements have been injected - if ( jQuery.nodeName( elem, "script" ) ) { - scripts = scripts.add( elem ); - } else { - // Remove any inner scripts for later evaluation - if ( elem.nodeType == 1 ) - scripts = scripts.add( jQuery( "script", elem ).remove() ); - - // Inject the elements into the document - callback.call( obj, elem ); - } - }); - - scripts.each( evalScript ); - }); - } -}; - -// Give the init function the jQuery prototype for later instantiation -jQuery.prototype.init.prototype = jQuery.prototype; - -function evalScript( i, elem ) { - if ( elem.src ) - jQuery.ajax({ - url: elem.src, - async: false, - dataType: "script" - }); - - else - jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" ); - - if ( elem.parentNode ) - elem.parentNode.removeChild( elem ); -} - -jQuery.extend = jQuery.fn.extend = function() { - // copy reference to target object - var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options; - - // Handle a deep copy situation - if ( target.constructor == Boolean ) { - deep = target; - target = arguments[1] || {}; - // skip the boolean and the target - i = 2; - } - - // Handle case when target is a string or something (possible in deep copy) - if ( typeof target != "object" && typeof target != "function" ) - target = {}; - - // extend jQuery itself if only one argument is passed - if ( length == 1 ) { - target = this; - i = 0; - } - - for ( ; i < length; i++ ) - // Only deal with non-null/undefined values - if ( (options = arguments[ i ]) != null ) - // Extend the base object - for ( var name in options ) { - // Prevent never-ending loop - if ( target === options[ name ] ) - continue; - - // Recurse if we're merging object values - if ( deep && options[ name ] && typeof options[ name ] == "object" && target[ name ] && !options[ name ].nodeType ) - target[ name ] = jQuery.extend( target[ name ], options[ name ] ); - - // Don't bring in undefined values - else if ( options[ name ] != undefined ) - target[ name ] = options[ name ]; - - } - - // Return the modified object - return target; -}; - -var expando = "jQuery" + (new Date()).getTime(), uuid = 0, windowData = {}; - -// exclude the following css properties to add px -var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i; - -jQuery.extend({ - noConflict: function( deep ) { - window.$ = _$; - - if ( deep ) - window.jQuery = _jQuery; - - return jQuery; - }, - - // See test/unit/core.js for details concerning this function. - isFunction: function( fn ) { - return !!fn && typeof fn != "string" && !fn.nodeName && - fn.constructor != Array && /function/i.test( fn + "" ); - }, - - // check if an element is in a (or is an) XML document - isXMLDoc: function( elem ) { - return elem.documentElement && !elem.body || - elem.tagName && elem.ownerDocument && !elem.ownerDocument.body; - }, - - // Evalulates a script in a global context - globalEval: function( data ) { - data = jQuery.trim( data ); - - if ( data ) { - // Inspired by code by Andrea Giammarchi - // http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html - var head = document.getElementsByTagName("head")[0] || document.documentElement, - script = document.createElement("script"); - - script.type = "text/javascript"; - if ( jQuery.browser.msie ) - script.text = data; - else - script.appendChild( document.createTextNode( data ) ); - - head.appendChild( script ); - head.removeChild( script ); - } - }, - - nodeName: function( elem, name ) { - return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase(); - }, - - cache: {}, - - data: function( elem, name, data ) { - elem = elem == window ? - windowData : - elem; - - var id = elem[ expando ]; - - // Compute a unique ID for the element - if ( !id ) - id = elem[ expando ] = ++uuid; - - // Only generate the data cache if we're - // trying to access or manipulate it - if ( name && !jQuery.cache[ id ] ) - jQuery.cache[ id ] = {}; - - // Prevent overriding the named cache with undefined values - if ( data != undefined ) - jQuery.cache[ id ][ name ] = data; - - // Return the named cache data, or the ID for the element - return name ? - jQuery.cache[ id ][ name ] : - id; - }, - - removeData: function( elem, name ) { - elem = elem == window ? - windowData : - elem; - - var id = elem[ expando ]; - - // If we want to remove a specific section of the element's data - if ( name ) { - if ( jQuery.cache[ id ] ) { - // Remove the section of cache data - delete jQuery.cache[ id ][ name ]; - - // If we've removed all the data, remove the element's cache - name = ""; - - for ( name in jQuery.cache[ id ] ) - break; - - if ( !name ) - jQuery.removeData( elem ); - } - - // Otherwise, we want to remove all of the element's data - } else { - // Clean up the element expando - try { - delete elem[ expando ]; - } catch(e){ - // IE has trouble directly removing the expando - // but it's ok with using removeAttribute - if ( elem.removeAttribute ) - elem.removeAttribute( expando ); - } - - // Completely remove the data cache - delete jQuery.cache[ id ]; - } - }, - - // args is for internal usage only - each: function( object, callback, args ) { - if ( args ) { - if ( object.length == undefined ) { - for ( var name in object ) - if ( callback.apply( object[ name ], args ) === false ) - break; - } else - for ( var i = 0, length = object.length; i < length; i++ ) - if ( callback.apply( object[ i ], args ) === false ) - break; - - // A special, fast, case for the most common use of each - } else { - if ( object.length == undefined ) { - for ( var name in object ) - if ( callback.call( object[ name ], name, object[ name ] ) === false ) - break; - } else - for ( var i = 0, length = object.length, value = object[0]; - i < length && callback.call( value, i, value ) !== false; value = object[++i] ){} - } - - return object; - }, - - prop: function( elem, value, type, i, name ) { - // Handle executable functions - if ( jQuery.isFunction( value ) ) - value = value.call( elem, i ); - - // Handle passing in a number to a CSS property - return value && value.constructor == Number && type == "curCSS" && !exclude.test( name ) ? - value + "px" : - value; - }, - - className: { - // internal only, use addClass("class") - add: function( elem, classNames ) { - jQuery.each((classNames || "").split(/\s+/), function(i, className){ - if ( elem.nodeType == 1 && !jQuery.className.has( elem.className, className ) ) - elem.className += (elem.className ? " " : "") + className; - }); - }, - - // internal only, use removeClass("class") - remove: function( elem, classNames ) { - if (elem.nodeType == 1) - elem.className = classNames != undefined ? - jQuery.grep(elem.className.split(/\s+/), function(className){ - return !jQuery.className.has( classNames, className ); - }).join(" ") : - ""; - }, - - // internal only, use is(".class") - has: function( elem, className ) { - return jQuery.inArray( className, (elem.className || elem).toString().split(/\s+/) ) > -1; - } - }, - - // A method for quickly swapping in/out CSS properties to get correct calculations - swap: function( elem, options, callback ) { - var old = {}; - // Remember the old values, and insert the new ones - for ( var name in options ) { - old[ name ] = elem.style[ name ]; - elem.style[ name ] = options[ name ]; - } - - callback.call( elem ); - - // Revert the old values - for ( var name in options ) - elem.style[ name ] = old[ name ]; - }, - - css: function( elem, name, force ) { - if ( name == "width" || name == "height" ) { - var val, props = { position: "absolute", visibility: "hidden", display:"block" }, which = name == "width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ]; - - function getWH() { - val = name == "width" ? elem.offsetWidth : elem.offsetHeight; - var padding = 0, border = 0; - jQuery.each( which, function() { - padding += parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0; - border += parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0; - }); - val -= Math.round(padding + border); - } - - if ( jQuery(elem).is(":visible") ) - getWH(); - else - jQuery.swap( elem, props, getWH ); - - return Math.max(0, val); - } - - return jQuery.curCSS( elem, name, force ); - }, - - curCSS: function( elem, name, force ) { - var ret; - - // A helper method for determining if an element's values are broken - function color( elem ) { - if ( !jQuery.browser.safari ) - return false; - - var ret = document.defaultView.getComputedStyle( elem, null ); - return !ret || ret.getPropertyValue("color") == ""; - } - - // We need to handle opacity special in IE - if ( name == "opacity" && jQuery.browser.msie ) { - ret = jQuery.attr( elem.style, "opacity" ); - - return ret == "" ? - "1" : - ret; - } - // Opera sometimes will give the wrong display answer, this fixes it, see #2037 - if ( jQuery.browser.opera && name == "display" ) { - var save = elem.style.outline; - elem.style.outline = "0 solid black"; - elem.style.outline = save; - } - - // Make sure we're using the right name for getting the float value - if ( name.match( /float/i ) ) - name = styleFloat; - - if ( !force && elem.style && elem.style[ name ] ) - ret = elem.style[ name ]; - - else if ( document.defaultView && document.defaultView.getComputedStyle ) { - - // Only "float" is needed here - if ( name.match( /float/i ) ) - name = "float"; - - name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase(); - - var getComputedStyle = document.defaultView.getComputedStyle( elem, null ); - - if ( getComputedStyle && !color( elem ) ) - ret = getComputedStyle.getPropertyValue( name ); - - // If the element isn't reporting its values properly in Safari - // then some display: none elements are involved - else { - var swap = [], stack = []; - - // Locate all of the parent display: none elements - for ( var a = elem; a && color(a); a = a.parentNode ) - stack.unshift(a); - - // Go through and make them visible, but in reverse - // (It would be better if we knew the exact display type that they had) - for ( var i = 0; i < stack.length; i++ ) - if ( color( stack[ i ] ) ) { - swap[ i ] = stack[ i ].style.display; - stack[ i ].style.display = "block"; - } - - // Since we flip the display style, we have to handle that - // one special, otherwise get the value - ret = name == "display" && swap[ stack.length - 1 ] != null ? - "none" : - ( getComputedStyle && getComputedStyle.getPropertyValue( name ) ) || ""; - - // Finally, revert the display styles back - for ( var i = 0; i < swap.length; i++ ) - if ( swap[ i ] != null ) - stack[ i ].style.display = swap[ i ]; - } - - // We should always get a number back from opacity - if ( name == "opacity" && ret == "" ) - ret = "1"; - - } else if ( elem.currentStyle ) { - var camelCase = name.replace(/\-(\w)/g, function(all, letter){ - return letter.toUpperCase(); - }); - - ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ]; - - // From the awesome hack by Dean Edwards - // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291 - - // If we're not dealing with a regular pixel number - // but a number that has a weird ending, we need to convert it to pixels - if ( !/^\d+(px)?$/i.test( ret ) && /^\d/.test( ret ) ) { - // Remember the original values - var style = elem.style.left, runtimeStyle = elem.runtimeStyle.left; - - // Put in the new values to get a computed value out - elem.runtimeStyle.left = elem.currentStyle.left; - elem.style.left = ret || 0; - ret = elem.style.pixelLeft + "px"; - - // Revert the changed values - elem.style.left = style; - elem.runtimeStyle.left = runtimeStyle; - } - } - - return ret; - }, - - clean: function( elems, context ) { - var ret = []; - context = context || document; - // !context.createElement fails in IE with an error but returns typeof 'object' - if (typeof context.createElement == 'undefined') - context = context.ownerDocument || context[0] && context[0].ownerDocument || document; - - jQuery.each(elems, function(i, elem){ - if ( !elem ) - return; - - if ( elem.constructor == Number ) - elem = elem.toString(); - - // Convert html string into DOM nodes - if ( typeof elem == "string" ) { - // Fix "XHTML"-style tags in all browsers - elem = elem.replace(/(<(\w+)[^>]*?)\/>/g, function(all, front, tag){ - return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i) ? - all : - front + ">"; - }); - - // Trim whitespace, otherwise indexOf won't work as expected - var tags = jQuery.trim( elem ).toLowerCase(), div = context.createElement("div"); - - var wrap = - // option or optgroup - !tags.indexOf("", "" ] || - - !tags.indexOf("", "" ] || - - tags.match(/^<(thead|tbody|tfoot|colg|cap)/) && - [ 1, "", "
    " ] || - - !tags.indexOf("", "" ] || - - // matched above - (!tags.indexOf("", "" ] || - - !tags.indexOf("", "" ] || - - // IE can't serialize and \ No newline at end of file From cba114c8506d5740ca1df00711a46b6c303e2205 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 7 Dec 2009 11:29:18 -0800 Subject: [PATCH 046/172] Add a "grandfather" creation date cutoff to RequireValidatedEmail plugin; will allow us to use this for temporary emergency moderation of new registrations without affecting older accounts. --- plugins/RequireValidatedEmail/README | 21 ++++++++ .../RequireValidatedEmailPlugin.php | 52 ++++++++++++++++++- 2 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 plugins/RequireValidatedEmail/README diff --git a/plugins/RequireValidatedEmail/README b/plugins/RequireValidatedEmail/README new file mode 100644 index 0000000000..ccd94d271d --- /dev/null +++ b/plugins/RequireValidatedEmail/README @@ -0,0 +1,21 @@ +This plugin disables posting for accounts that do not have a +validated email address. + +Example: + + addPlugin('RequireValidatedEmail'); + +If you don't want to apply the validationr equirement to existing +accounts, you can specify a cutoff date to grandfather in users +registered prior to that timestamp. + + addPlugin('RequireValidatedEmail', + array('grandfatherCutoff' => 'Dec 7, 2009'); + + +Todo: +* make email field required on registration form +* add a more visible indicator that validation is still outstanding +* localization for UI strings +* test with XMPP, API posting + diff --git a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php index 4806538a04..04adbf00ee 100644 --- a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php +++ b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php @@ -21,7 +21,7 @@ * * @category Plugin * @package StatusNet - * @author Craig Andrews + * @author Craig Andrews , Brion Vibber * @copyright 2009 Craig Andrews http://candrews.integralblue.com * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ @@ -33,20 +33,68 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { class RequireValidatedEmailPlugin extends Plugin { + // Users created before this time will be grandfathered in + // without the validation requirement. + public $grandfatherCutoff=null; + function __construct() { parent::__construct(); } + /** + * Event handler for notice saves; rejects the notice + * if user's address isn't validated. + * + * @param Notice $notice + * @return bool hook result code + */ function onStartNoticeSave($notice) { $user = User::staticGet('id', $notice->profile_id); if (!empty($user)) { // it's a remote notice - if (empty($user->email)) { + if (!$this->validated($user)) { throw new ClientException(_("You must validate your email address before posting.")); } } return true; } + + /** + * Check if a user has a validated email address or has been + * otherwise grandfathered in. + * + * @param User $user + * @return bool + */ + protected function validated($user) + { + if ($this->grandfathered($user)) { + return true; + } + + // The email field is only stored after validation... + // Until then you'll find them in confirm_address. + return !empty($user->email); + } + + /** + * Check if a user was created before the grandfathering cutoff. + * If so, we won't need to check for validation. + * + * @param User $user + * @return bool + */ + protected function grandfathered($user) + { + if ($this->grandfatherCutoff) { + $created = strtotime($user->created . " GMT"); + $cutoff = strtotime($this->grandfatherCutoff); + if ($created < $cutoff) { + return true; + } + } + return false; + } } From 4eceef0dbef02f5254a7c2f901aae5b648024f30 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Mon, 7 Dec 2009 11:34:03 -0800 Subject: [PATCH 047/172] Grand ALL permissions to the DB user when setting up a new status.net site. --- scripts/setup_status_network.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/setup_status_network.sh b/scripts/setup_status_network.sh index d40d4724f2..777711fb55 100755 --- a/scripts/setup_status_network.sh +++ b/scripts/setup_status_network.sh @@ -19,8 +19,8 @@ done mysql -h $DBHOST -u $ADMIN --password=$ADMINPASS $SITEDB << ENDOFCOMMANDS -GRANT INSERT,SELECT,UPDATE,DELETE ON $database.* TO '$username'@'localhost' IDENTIFIED BY '$password'; -GRANT INSERT,SELECT,UPDATE,DELETE ON $database.* TO '$username'@'%' IDENTIFIED BY '$password'; +GRANT ALL ON $database.* TO '$username'@'localhost' IDENTIFIED BY '$password'; +GRANT ALL ON $database.* TO '$username'@'%' IDENTIFIED BY '$password'; INSERT INTO status_network (nickname, dbhost, dbuser, dbpass, dbname, sitename, created) VALUES ('$nickname', '$DBHOSTNAME', '$username', '$password', '$database', '$sitename', now()); From 684e65e3dea09fd8179f86d846b82540cc44e5dc Mon Sep 17 00:00:00 2001 From: Eric Helgeson Date: Mon, 7 Dec 2009 14:53:17 -0500 Subject: [PATCH 048/172] Cleanup of recaptcha plugin remove xhtml hack --- plugins/Recaptcha/RecaptchaPlugin.php | 32 ++++++++------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/plugins/Recaptcha/RecaptchaPlugin.php b/plugins/Recaptcha/RecaptchaPlugin.php index 3a510ef11c..db118dbb81 100644 --- a/plugins/Recaptcha/RecaptchaPlugin.php +++ b/plugins/Recaptcha/RecaptchaPlugin.php @@ -44,11 +44,11 @@ class RecaptchaPlugin extends Plugin var $ssl; function onInitializePlugin(){ - if(!isset($this->private_key)){ - common_log(LOG_ERR, "Recaptcha: Must specify private_key in config.php"); + if(!isset($this->private_key)) { + common_log(LOG_ERR, 'Recaptcha: Must specify private_key in config.php'); } - if(!isset($this->public_key)){ - common_log(LOG_ERR, "Recaptcha: Must specify public_key in config.php"); + if(!isset($this->public_key)) { + common_log(LOG_ERR, 'Recaptcha: Must specify public_key in config.php'); } } @@ -59,25 +59,13 @@ class RecaptchaPlugin extends Plugin return false; } - function onStartShowHTML($action) - { - //XXX: Horrible hack to make Safari, FF2, and Chrome work with - //reChapcha. reChapcha beaks xhtml strict - header('Content-Type: text/html'); - - $action->extraHeaders(); - - $action->startXML('html'); - - $action->style('#recaptcha_area{float:left;}'); - return false; - } function onEndRegistrationFormData($action) { + $action->style('#recaptcha_area{float:left;}'); $action->elementStart('li'); $action->raw(''); - if($this->checkssl() === true){ + if($this->checkssl() === true) { $action->raw(recaptcha_get_html($this->public_key), null, true); } else { $action->raw(recaptcha_get_html($this->public_key)); @@ -93,11 +81,9 @@ class RecaptchaPlugin extends Plugin $action->trimmed('recaptcha_challenge_field'), $action->trimmed('recaptcha_response_field')); - if (!$resp->is_valid) - { - if($this->display_errors) - { - $action->showForm ("(reCAPTCHA said: " . $resp->error . ")"); + if (!$resp->is_valid) { + if($this->display_errors) { + $action->showForm ("(reCAPTCHA error: " . $resp->error . ")"); } $action->showForm("Captcha does not match!"); return false; From 66bfb2f0e9ba5a1b1f70bbfbb53e9d5eb07f406f Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Mon, 7 Dec 2009 22:37:59 +0100 Subject: [PATCH 049/172] Localisation updates for !StatusNet from !translatewiki.net !sntrans --- locale/ar/LC_MESSAGES/statusnet.po | 41 +- locale/bg/LC_MESSAGES/statusnet.po | 41 +- locale/ca/LC_MESSAGES/statusnet.po | 154 ++- locale/cs/LC_MESSAGES/statusnet.po | 41 +- locale/de/LC_MESSAGES/statusnet.po | 116 +- locale/el/LC_MESSAGES/statusnet.po | 41 +- locale/en_GB/LC_MESSAGES/statusnet.po | 41 +- locale/es/LC_MESSAGES/statusnet.po | 73 +- locale/fi/LC_MESSAGES/statusnet.po | 41 +- locale/fr/LC_MESSAGES/statusnet.po | 48 +- locale/ga/LC_MESSAGES/statusnet.po | 41 +- locale/he/LC_MESSAGES/statusnet.po | 41 +- locale/hsb/LC_MESSAGES/statusnet.po | 44 +- locale/is/LC_MESSAGES/statusnet.po | 41 +- locale/it/LC_MESSAGES/statusnet.po | 41 +- locale/ja/LC_MESSAGES/statusnet.po | 41 +- locale/ko/LC_MESSAGES/statusnet.po | 41 +- locale/mk/LC_MESSAGES/statusnet.po | 43 +- locale/nb/LC_MESSAGES/statusnet.po | 41 +- locale/nl/LC_MESSAGES/statusnet.po | 48 +- locale/nn/LC_MESSAGES/statusnet.po | 41 +- locale/pl/LC_MESSAGES/statusnet.po | 56 +- locale/pt/LC_MESSAGES/statusnet.po | 48 +- locale/pt_BR/LC_MESSAGES/statusnet.po | 41 +- locale/ru/LC_MESSAGES/statusnet.po | 48 +- locale/statusnet.po | 37 +- locale/sv/LC_MESSAGES/statusnet.po | 1461 ++++++++++++------------- locale/te/LC_MESSAGES/statusnet.po | 41 +- locale/tr/LC_MESSAGES/statusnet.po | 41 +- locale/uk/LC_MESSAGES/statusnet.po | 48 +- locale/vi/LC_MESSAGES/statusnet.po | 41 +- locale/zh_CN/LC_MESSAGES/statusnet.po | 41 +- locale/zh_TW/LC_MESSAGES/statusnet.po | 41 +- 33 files changed, 1715 insertions(+), 1329 deletions(-) diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index 1cffffcf3d..c7bb7a5e3e 100644 --- a/locale/ar/LC_MESSAGES/statusnet.po +++ b/locale/ar/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-05 19:53+0000\n" -"PO-Revision-Date: 2009-12-05 19:53:47+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"PO-Revision-Date: 2009-12-07 21:25:58+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ar\n" "X-Message-Group: out-statusnet\n" @@ -565,7 +565,7 @@ msgstr "" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -1722,11 +1722,11 @@ msgstr "" msgid "%s left group %s" msgstr "" -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "والج بالفعل." -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 msgid "Invalid or expired token." msgstr "" @@ -4206,11 +4206,25 @@ msgstr "" msgid "Can't turn on notification." msgstr "" -#: lib/command.php:592 +#: lib/command.php:588 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:602 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "تعذّر إنشاء الكنى." + +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 msgid "You are not subscribed to anyone." msgstr "لست مُشتركًا بأي أحد." -#: lib/command.php:594 +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "لست مشتركًا بأحد." @@ -4220,11 +4234,11 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:614 +#: lib/command.php:645 msgid "No one is subscribed to you." msgstr "لا أحد مشترك بك." -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "لا أحد مشترك بك." @@ -4234,11 +4248,11 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:636 +#: lib/command.php:667 msgid "You are not a member of any groups." msgstr "لست عضوًا في أي مجموعة." -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "لست عضوًا في أي مجموعة." @@ -4248,7 +4262,7 @@ msgstr[3] "أنت عضو في هذه المجموعات:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:652 +#: lib/command.php:683 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4267,6 +4281,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index e5656cb5f2..e1d9bd7776 100644 --- a/locale/bg/LC_MESSAGES/statusnet.po +++ b/locale/bg/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-05 19:53+0000\n" -"PO-Revision-Date: 2009-12-05 19:53:50+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"PO-Revision-Date: 2009-12-07 21:26:01+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: bg\n" "X-Message-Group: out-statusnet\n" @@ -571,7 +571,7 @@ msgstr "Изрязване" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -1811,11 +1811,11 @@ msgstr "Грешка при проследяване — потребителя msgid "%s left group %s" msgstr "%s напусна групата %s" -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "Вече сте влезли." -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 #, fuzzy msgid "Invalid or expired token." msgstr "Невалидно съдържание на бележка" @@ -4408,39 +4408,53 @@ msgstr "Уведомлението е включено." msgid "Can't turn on notification." msgstr "Грешка при включване на уведомлението." -#: lib/command.php:592 +#: lib/command.php:588 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:602 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Грешка при отбелязване като любима." + +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Не сте абонирани за този профил" -#: lib/command.php:594 +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Вече сте абонирани за следните потребители:" msgstr[1] "Вече сте абонирани за следните потребители:" -#: lib/command.php:614 +#: lib/command.php:645 #, fuzzy msgid "No one is subscribed to you." msgstr "Грешка при абониране на друг потребител за вас." -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Грешка при абониране на друг потребител за вас." msgstr[1] "Грешка при абониране на друг потребител за вас." -#: lib/command.php:636 +#: lib/command.php:667 msgid "You are not a member of any groups." msgstr "Не членувате в нито една група." -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Не членувате в тази група." msgstr[1] "Не членувате в тази група." -#: lib/command.php:652 +#: lib/command.php:683 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4459,6 +4473,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index b4e2f70370..290866b5c8 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-05 19:53+0000\n" -"PO-Revision-Date: 2009-12-05 19:53:53+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"PO-Revision-Date: 2009-12-07 21:26:04+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: out-statusnet\n" @@ -80,6 +80,8 @@ msgstr "Canal dels amics de %s (Atom)" msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "" +"Aquesta és la línia temporal de %s i amics, però ningú hi ha enviat res " +"encara." #: actions/all.php:132 #, php-format @@ -201,9 +203,9 @@ msgid "No message text!" msgstr "No hi ha text al missatge!" #: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, fuzzy, php-format +#, php-format msgid "That's too long. Max message size is %d chars." -msgstr "És massa llarg. Màxim del missatge és 140 caràcters." +msgstr "És massa llarg. La mida màxima del missatge és %d caràcters." #: actions/apidirectmessagenew.php:146 msgid "Recipient user not found." @@ -256,9 +258,8 @@ msgid "No status found with that ID." msgstr "No s'ha trobat cap estatus amb aquesta ID." #: actions/apifavoritecreate.php:119 -#, fuzzy msgid "This status is already a favorite!" -msgstr "Aquesta nota ja és favorita." +msgstr "Aquest estat ja és un preferit!" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 msgid "Could not create favorite." @@ -297,9 +298,8 @@ msgid "Two user ids or screen_names must be supplied." msgstr "Dos ids d'usuari o screen_names has de ser substituïts." #: actions/apifriendshipsshow.php:135 -#, fuzzy msgid "Could not determine source user." -msgstr "No s'ha pogut recuperar la conversa pública." +msgstr "No s'ha pogut determinar l'usuari d'origen." #: actions/apifriendshipsshow.php:143 #, fuzzy @@ -357,9 +357,9 @@ msgstr "Hi ha massa àlies! Màxim %d." #: actions/apigroupcreate.php:264 actions/editgroup.php:224 #: actions/newgroup.php:168 -#, fuzzy, php-format +#, php-format msgid "Invalid alias: \"%s\"" -msgstr "Etiqueta no vàlida: \"%s\"" +msgstr "L'àlies no és vàlid «%s»" #: actions/apigroupcreate.php:273 actions/editgroup.php:228 #: actions/newgroup.php:172 @@ -453,9 +453,8 @@ msgid "Max notice size is %d chars, including attachment URL." msgstr "" #: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261 -#, fuzzy msgid "Unsupported format." -msgstr "Format d'imatge no suportat." +msgstr "El format no està implementat." #: actions/apitimelinefavorites.php:107 #, php-format @@ -578,7 +577,7 @@ msgstr "Crop" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -663,9 +662,8 @@ msgid "Unblock this user" msgstr "Desbloquejar aquest usuari" #: actions/block.php:69 -#, fuzzy msgid "You already blocked that user." -msgstr "Ja havies bloquejat aquest usuari." +msgstr "Ja heu blocat l'usuari." #: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 msgid "Block user" @@ -701,9 +699,8 @@ msgid "Failed to save block information." msgstr "Error al guardar la informació del block." #: actions/bookmarklet.php:50 -#, fuzzy msgid "Post to " -msgstr "Foto" +msgstr "Envia a " #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -840,14 +837,13 @@ msgid "Design settings for this StatusNet site." msgstr "Paràmetres de disseny d'aquest lloc StatusNet." #: actions/designadminpanel.php:275 -#, fuzzy msgid "Invalid logo URL." -msgstr "Mida invàlida." +msgstr "L'URL del logotip no és vàlid." #: actions/designadminpanel.php:279 -#, fuzzy, php-format +#, php-format msgid "Theme not available: %s" -msgstr "Aquesta pàgina no està disponible en " +msgstr "El tema no és disponible: %s" #: actions/designadminpanel.php:375 msgid "Change logo" @@ -862,9 +858,8 @@ msgid "Change theme" msgstr "Canvia el tema" #: actions/designadminpanel.php:404 -#, fuzzy msgid "Site theme" -msgstr "Avís del lloc" +msgstr "Tema del lloc" #: actions/designadminpanel.php:405 msgid "Theme for the site." @@ -888,19 +883,19 @@ msgstr "Pots pujar una imatge de logo per al grup." #: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" -msgstr "" +msgstr "Activada" #: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" -msgstr "" +msgstr "Desactivada" #: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." -msgstr "" +msgstr "Activa o desactiva la imatge de fons." #: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" -msgstr "" +msgstr "Posa en mosaic la imatge de fons" #: actions/designadminpanel.php:488 lib/designsettings.php:170 msgid "Change colours" @@ -979,18 +974,17 @@ msgid "Use this form to edit the group." msgstr "Utilitza aquest formulari per editar el grup." #: actions/editgroup.php:201 actions/newgroup.php:145 -#, fuzzy, php-format +#, php-format msgid "description is too long (max %d chars)." -msgstr "la descripció és massa llarga (màx. 140 caràcters)." +msgstr "la descripció és massa llarga (màx. %d caràcters)." #: actions/editgroup.php:253 msgid "Could not update group." msgstr "No s'ha pogut actualitzar el grup." #: actions/editgroup.php:259 classes/User_group.php:390 -#, fuzzy msgid "Could not create aliases." -msgstr "No es pot crear favorit." +msgstr "No s'han pogut crear els àlies." #: actions/editgroup.php:269 msgid "Options saved." @@ -1260,7 +1254,7 @@ msgstr "Sense adjuncions" #: actions/file.php:51 msgid "No uploaded attachments" -msgstr "" +msgstr "No s'ha pujat cap adjunció" #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1304,9 +1298,8 @@ msgid "No such group." msgstr "No s'ha trobat el grup." #: actions/getfile.php:75 -#, fuzzy msgid "No such file." -msgstr "No existeix aquest avís." +msgstr "No existeix el fitxer." #: actions/getfile.php:79 msgid "Cannot read file." @@ -1835,11 +1828,11 @@ msgstr "No s'ha pogut eliminar l'usuari %s del grup %s" msgid "%s left group %s" msgstr "%s ha abandonat el grup %s" -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "Ja estàs connectat." -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 #, fuzzy msgid "Invalid or expired token." msgstr "El contingut de l'avís és invàlid" @@ -2051,7 +2044,7 @@ msgstr "tipus de contingut " #: actions/oembed.php:160 msgid "Only " -msgstr "" +msgstr "Només " #: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 #: lib/api.php:1024 lib/api.php:1134 @@ -2076,7 +2069,7 @@ msgstr "Gestionar altres vàries opcions." #: actions/othersettings.php:108 msgid " (free service)" -msgstr "" +msgstr " (servei gratuït)" #: actions/othersettings.php:116 msgid "Shorten URLs with" @@ -2093,7 +2086,7 @@ msgstr "Configuració del perfil" #: actions/othersettings.php:123 msgid "Show or hide profile designs." -msgstr "" +msgstr "Mostra o amaga els dissenys de perfil." #: actions/othersettings.php:153 msgid "URL shortening service is too long (max 50 chars)." @@ -2215,9 +2208,8 @@ msgid "Path" msgstr "Camí" #: actions/pathsadminpanel.php:216 -#, fuzzy msgid "Site path" -msgstr "Avís del lloc" +msgstr "Camí del lloc" #: actions/pathsadminpanel.php:220 msgid "Path to locales" @@ -2233,11 +2225,11 @@ msgstr "Tema" #: actions/pathsadminpanel.php:232 msgid "Theme server" -msgstr "" +msgstr "Servidor dels temes" #: actions/pathsadminpanel.php:236 msgid "Theme path" -msgstr "" +msgstr "Camí dels temes" #: actions/pathsadminpanel.php:240 msgid "Theme directory" @@ -3794,11 +3786,11 @@ msgstr "" #: actions/useradminpanel.php:265 msgid "Sessions" -msgstr "" +msgstr "Sessions" #: actions/useradminpanel.php:270 msgid "Handle sessions" -msgstr "" +msgstr "Gestiona les sessions" #: actions/useradminpanel.php:272 msgid "Whether to handle sessions ourselves." @@ -3828,9 +3820,8 @@ msgstr "" "avisos de ningú, clica \"Cancel·lar\"." #: actions/userauthorization.php:188 -#, fuzzy msgid "License" -msgstr "llicència." +msgstr "Llicència" #: actions/userauthorization.php:209 msgid "Accept" @@ -4038,9 +4029,9 @@ msgid "Could not set group membership." msgstr "No s'ha pogut establir la pertinença d'aquest grup." #: classes/User.php:347 -#, fuzzy, php-format +#, php-format msgid "Welcome to %1$s, @%2$s!" -msgstr "Missatge per a %1$s a %2$s" +msgstr "Us donem la benvinguda a %1$s, @%2$s!" #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" @@ -4110,9 +4101,8 @@ msgid "Connect to services" msgstr "No s'ha pogut redirigir al servidor: %s" #: lib/action.php:440 -#, fuzzy msgid "Change site configuration" -msgstr "Navegació primària del lloc" +msgstr "Canvia la configuració del lloc" #: lib/action.php:444 lib/subgroupnav.php:105 msgid "Invite" @@ -4258,9 +4248,8 @@ msgid "There was a problem with your session token." msgstr "Ha ocorregut algun problema amb la teva sessió." #: lib/adminpanelaction.php:96 -#, fuzzy msgid "You cannot make changes to this site." -msgstr "No pots enviar un missatge a aquest usuari." +msgstr "No podeu fer canvis al lloc." #: lib/adminpanelaction.php:195 #, fuzzy @@ -4400,9 +4389,9 @@ msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d" #: lib/command.php:439 -#, fuzzy, php-format +#, php-format msgid "Reply to %s sent" -msgstr "respondre a aquesta nota" +msgstr "S'ha enviat la resposta a %s" #: lib/command.php:441 #, fuzzy @@ -4447,40 +4436,53 @@ msgstr "Notificacions on." msgid "Can't turn on notification." msgstr "No es poden posar en on les notificacions." -#: lib/command.php:592 +#: lib/command.php:588 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:602 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "No s'han pogut crear els àlies." + +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 #, fuzzy msgid "You are not subscribed to anyone." msgstr "No estàs subscrit a aquest perfil." -#: lib/command.php:594 +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Ja estàs subscrit a aquests usuaris:" msgstr[1] "Ja estàs subscrit a aquests usuaris:" -#: lib/command.php:614 +#: lib/command.php:645 #, fuzzy msgid "No one is subscribed to you." msgstr "No pots subscriure a un altre a tu mateix." -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "No pots subscriure a un altre a tu mateix." msgstr[1] "No pots subscriure a un altre a tu mateix." -#: lib/command.php:636 -#, fuzzy +#: lib/command.php:667 msgid "You are not a member of any groups." -msgstr "No ets membre d'aquest grup." +msgstr "No sou membre de cap grup." -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "No sou un membre del grup." msgstr[1] "No sou un membre del grup." -#: lib/command.php:652 +#: lib/command.php:683 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4499,6 +4501,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" @@ -4656,9 +4659,8 @@ msgid "Group" msgstr "Grup" #: lib/groupnav.php:101 -#, fuzzy msgid "Blocked" -msgstr "Bloquejar" +msgstr "Blocat" #: lib/groupnav.php:102 #, fuzzy, php-format @@ -4770,9 +4772,8 @@ msgid "" msgstr "" #: lib/mailbox.php:227 lib/noticelist.php:452 -#, fuzzy msgid "from" -msgstr " de " +msgstr "de" #: lib/mail.php:172 msgid "Email address confirmation" @@ -5041,11 +5042,11 @@ msgstr "Què tal, %s?" #: lib/noticeform.php:192 msgid "Attach" -msgstr "" +msgstr "Adjunta" #: lib/noticeform.php:196 msgid "Attach a file" -msgstr "" +msgstr "Adjunta un fitxer" #: lib/noticelist.php:403 #, php-format @@ -5262,14 +5263,12 @@ msgid "More..." msgstr "Més…" #: lib/silenceform.php:67 -#, fuzzy msgid "Silence" -msgstr "Avís del lloc" +msgstr "Silencia" #: lib/silenceform.php:78 -#, fuzzy msgid "Silence this user" -msgstr "Bloquejar aquest usuari" +msgstr "Silencia l'usuari" #: lib/subgroupnav.php:83 #, php-format @@ -5349,12 +5348,11 @@ msgstr "Desbloquejar aquest usuari" #: lib/unsilenceform.php:67 msgid "Unsilence" -msgstr "" +msgstr "Dessilencia" #: lib/unsilenceform.php:78 -#, fuzzy msgid "Unsilence this user" -msgstr "Desbloquejar aquest usuari" +msgstr "Dessilencia l'usuari" #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137 msgid "Unsubscribe from this user" diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index 8501aacfa8..6d74b17611 100644 --- a/locale/cs/LC_MESSAGES/statusnet.po +++ b/locale/cs/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-05 19:53+0000\n" -"PO-Revision-Date: 2009-12-05 19:53:56+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"PO-Revision-Date: 2009-12-07 21:26:08+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: cs\n" "X-Message-Group: out-statusnet\n" @@ -579,7 +579,7 @@ msgstr "" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -1789,11 +1789,11 @@ msgstr "Nelze vytvořit OpenID z: %s" msgid "%s left group %s" msgstr "" -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "Již přihlášen" -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 #, fuzzy msgid "Invalid or expired token." msgstr "Neplatný obsah sdělení" @@ -4373,43 +4373,57 @@ msgstr "" msgid "Can't turn on notification." msgstr "" -#: lib/command.php:592 +#: lib/command.php:588 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:602 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Nelze uložin informace o obrázku" + +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Neodeslal jste nám profil" -#: lib/command.php:594 +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Neodeslal jste nám profil" msgstr[1] "Neodeslal jste nám profil" msgstr[2] "" -#: lib/command.php:614 +#: lib/command.php:645 #, fuzzy msgid "No one is subscribed to you." msgstr "Vzdálený odběr" -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Vzdálený odběr" msgstr[1] "Vzdálený odběr" msgstr[2] "" -#: lib/command.php:636 +#: lib/command.php:667 #, fuzzy msgid "You are not a member of any groups." msgstr "Neodeslal jste nám profil" -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Neodeslal jste nám profil" msgstr[1] "Neodeslal jste nám profil" msgstr[2] "" -#: lib/command.php:652 +#: lib/command.php:683 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4428,6 +4442,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index 2bc9805d97..c1d24f11d2 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-05 19:53+0000\n" -"PO-Revision-Date: 2009-12-05 19:54:00+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"PO-Revision-Date: 2009-12-07 21:26:11+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: out-statusnet\n" @@ -574,7 +574,7 @@ msgstr "Zuschneiden" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -1800,11 +1800,11 @@ msgstr "Konnte Benutzer %s aus der Gruppe %s nicht entfernen" msgid "%s left group %s" msgstr "%s hat die Gruppe %s verlassen" -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "Bereits angemeldet." -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 msgid "Invalid or expired token." msgstr "Token ungültig oder abgelaufen." @@ -2700,12 +2700,11 @@ msgid "Creative Commons Attribution 3.0" msgstr "" #: actions/register.php:496 -#, fuzzy msgid "" " except this private data: password, email address, IM address, and phone " "number." msgstr "" -"außer folgende private Daten: Passwort, E-Mail, Adresse, IM Adresse, " +"außer folgende private Daten: Passwort, E-Mail-Adresse, IM-Adresse und " "Telefonnummer." #: actions/register.php:537 @@ -2726,28 +2725,27 @@ msgid "" "\n" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -"Hallo %s, herzlich willkommen auf %%%%site.name%%%%.\n" -"\n" -"Danke für deine Anmeldung, wir hoffen das dir der Service gefällt.\n" -"\n" -"Als nächstes möchtest du eventuell …\n" +"Hallo %s, herzlich willkommen auf %%%%site.name%%%%. Als nächstes möchtest " +"du eventuell …\n" "\n" "* zu [deinem Profil gehen](%s) und deine erste Nachricht schreiben\n" -"* deine [Jabber/GTalk Adresse](%%%%action.imsettings%%%%) eintragen damit du " +"* deine [Jabber/GTalk-Adresse](%%%%action.imsettings%%%%) eintragen damit du " "Nachrichten über diese Dienste schreiben kannst.\n" "* [Leute suchen](%%%%action.peoplesearch%%%%) die du kennst oder die " "gleichen Interessen wie du haben.\n" "* deine [Profildaten ergänzen](%%%%action.profilesettings%%%%) um mehr über " "dich zu veröffentlichen\n" "* die [Dokumentation](%%%%doc.help%%%%) lesen um mehr über weitere Features " -"zu erfahren" +"zu erfahren\n" +"\n" +"Danke für deine Anmeldung, wir hoffen das dir der Service gefällt." #: actions/register.php:561 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" msgstr "" -"(Sie sollten in Kürze eine E-Mail mit der Anleitung zur Überprüfung Ihrer " +"(Du solltest in Kürze eine E-Mail mit der Anleitung zur Überprüfung deiner " "Mailadresse erhalten.)" #: actions/remotesubscribe.php:98 @@ -2797,16 +2795,15 @@ msgid "Invalid profile URL (bad format)" msgstr "Ungültige Profil-URL (falsches Format)" #: actions/remotesubscribe.php:168 -#, fuzzy msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)." -msgstr "Ungültige Profil-URL (kein YADIS-Dokument)." +msgstr "" +"Ungültige Profil-URL (kein YADIS-Dokument oder ungültige XRDS definiert)." #: actions/remotesubscribe.php:176 msgid "That’s a local profile! Login to subscribe." msgstr "Das ist ein lokales Profil! Zum Abonnieren anmelden." #: actions/remotesubscribe.php:183 -#, fuzzy msgid "Couldn’t get a request token." msgstr "Konnte keinen Anfrage-Token bekommen." @@ -2834,7 +2831,7 @@ msgstr "Feed der Antworten an %s (RSS 2.0)" #: actions/replies.php:158 #, php-format msgid "Replies feed for %s (Atom)" -msgstr "Feed der Nachrichten von %s" +msgstr "Feed der Nachrichten von %s (Atom)" #: actions/replies.php:198 #, php-format @@ -2858,9 +2855,9 @@ msgid "" msgstr "" #: actions/repliesrss.php:72 -#, fuzzy, php-format +#, php-format msgid "Replies to %1$s on %2$s!" -msgstr "Nachricht an %1$s auf %2$s" +msgstr "Antworten an %1$s auf %2$s!" #: actions/sandbox.php:65 actions/unsandbox.php:65 #, fuzzy @@ -2884,17 +2881,17 @@ msgstr "Konnte Favoriten nicht abrufen." #: actions/showfavorites.php:170 #, php-format msgid "Feed for favorites of %s (RSS 1.0)" -msgstr "Feed der Freunde von %s" +msgstr "Feed der Freunde von %s (RSS 1.0)" #: actions/showfavorites.php:177 #, php-format msgid "Feed for favorites of %s (RSS 2.0)" -msgstr "Feed der Freunde von %s" +msgstr "Feed der Freunde von %s (RSS 2.0)" #: actions/showfavorites.php:184 #, php-format msgid "Feed for favorites of %s (Atom)" -msgstr "Feed der Freunde von %s" +msgstr "Feed der Freunde von %s (Atom)" #: actions/showfavorites.php:205 msgid "" @@ -2992,9 +2989,8 @@ msgid "Statistics" msgstr "Statistiken" #: actions/showgroup.php:432 -#, fuzzy msgid "Created" -msgstr "Erstellen" +msgstr "Erstellt" #: actions/showgroup.php:448 #, php-format @@ -3007,15 +3003,17 @@ msgid "" msgstr "" #: actions/showgroup.php:454 -#, fuzzy, php-format +#, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." "wikipedia.org/wiki/Micro-blogging) service based on the Free Software " "[StatusNet](http://status.net/) tool. Its members share short messages about " "their life and interests. " msgstr "" -"**%s** ist eine Benutzergruppe auf %%site.name%%, einem [mikro-blogging] " -"(http://de.wikipedia.org/wiki/Mikro-blogging) Dienst " +"**%s** ist eine Benutzergruppe auf %%%%site.name%%%%, einem [Mikro-blogging-" +"Dienst](http://de.wikipedia.org/wiki/Mikro-blogging) basierend auf der " +"Freien Software [StatusNet](http://status.net/). Seine Mitglieder erstellen " +"kurze Nachrichten über Ihr Leben und Interessen. " #: actions/showgroup.php:482 msgid "Admins" @@ -3044,7 +3042,7 @@ msgid "Notice deleted." msgstr "Nachricht gelöscht." #: actions/showstream.php:73 -#, fuzzy, php-format +#, php-format msgid " tagged %s" msgstr "Nachrichten, die mit %s getagt sind" @@ -3106,14 +3104,15 @@ msgid "" msgstr "" #: actions/showstream.php:239 -#, fuzzy, php-format +#, php-format msgid "" "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en." "wikipedia.org/wiki/Micro-blogging) service based on the Free Software " "[StatusNet](http://status.net/) tool. " msgstr "" -"**%s** hat ein Konto auf %%site.name%%, einem [mikro-blogging] (http://de." -"wikipedia.org/wiki/Mikro-blogging) Dienst " +"**%s** hat ein Konto auf %%%%site.name%%%%, einem [Mikro-blogging-Dienst]" +"(http://de.wikipedia.org/wiki/Mikro-blogging) basierend auf der Freien " +"Software [StatusNet](http://status.net/). " #: actions/silence.php:65 actions/unsilence.php:65 #, fuzzy @@ -3134,14 +3133,13 @@ msgid "Site name must have non-zero length." msgstr "" #: actions/siteadminpanel.php:155 -#, fuzzy msgid "You must have a valid contact email address" -msgstr "Ungültige E-Mail-Adresse" +msgstr "Du musst eine gültige E-Mail-Adresse haben" #: actions/siteadminpanel.php:173 #, php-format msgid "Unknown language \"%s\"" -msgstr "Unbekannte Sprache "%s"" +msgstr "Unbekannte Sprache „%s“" #: actions/siteadminpanel.php:180 msgid "Invalid snapshot report URL." @@ -3388,7 +3386,7 @@ msgstr "SMS ist nicht verfügbar." #: actions/smssettings.php:112 msgid "Current confirmed SMS-enabled phone number." -msgstr "Aktuelle für den SMS-Dienst bestätigte Telefon-Nummer." +msgstr "Aktuelle für den SMS-Dienst bestätigte Telefonnummer." #: actions/smssettings.php:123 msgid "Awaiting confirmation on this phone number." @@ -3777,7 +3775,6 @@ msgid "Authorize subscription" msgstr "Abonnement bestätigen" #: actions/userauthorization.php:110 -#, fuzzy msgid "" "Please check these details to make sure that you want to subscribe to this " "user’s notices. If you didn’t just ask to subscribe to someone’s notices, " @@ -3785,7 +3782,7 @@ msgid "" msgstr "" "Bitte überprüfe diese Angaben, um sicher zu gehen, dass du die Nachrichten " "dieses Nutzers abonnieren möchtest. Wenn du das nicht wolltest, klicke auf " -"\"Abbrechen\"." +"„Abbrechen“." #: actions/userauthorization.php:188 msgid "License" @@ -3885,7 +3882,7 @@ msgstr "Keine ID." #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" -msgstr "Profil Design Einstellungen" +msgstr "Profil-Design-Einstellungen" #: actions/userdesignsettings.php:87 lib/designsettings.php:76 msgid "" @@ -4016,7 +4013,7 @@ msgstr "Ändere dein Passwort" #: lib/accountsettingsaction.php:120 msgid "Change email handling" -msgstr "Ändere die E-Mail Verarbeitung" +msgstr "Ändere die E-Mail-Verarbeitung" #: lib/accountsettingsaction.php:124 #, fuzzy @@ -4185,7 +4182,7 @@ msgid "" "s, available under the [GNU Affero General Public License](http://www.fsf." "org/licensing/licenses/agpl-3.0.html)." msgstr "" -" Es wird mit der Microbloggingsoftware [StatusNet](http://status.net/) " +"Es wird mit der Microbloggingsoftware [StatusNet](http://status.net/) " "(Version %s) betrieben, die unter der [GNU Affero General Public License]" "(http://www.fsf.org/licensing/licenses/agpl-3.0.html) erhältlich ist." @@ -4407,40 +4404,54 @@ msgstr "Benachrichtigung aktiviert." msgid "Can't turn on notification." msgstr "Konnte Benachrichtigung nicht aktivieren." -#: lib/command.php:592 +#: lib/command.php:588 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:602 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Konnte keinen Favoriten erstellen." + +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Du hast dieses Profil nicht abonniert." -#: lib/command.php:594 +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Du hast diese Benutzer bereits abonniert:" msgstr[1] "Du hast diese Benutzer bereits abonniert:" -#: lib/command.php:614 +#: lib/command.php:645 #, fuzzy msgid "No one is subscribed to you." msgstr "Die Gegenseite konnte Dich nicht abonnieren." -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Die Gegenseite konnte Dich nicht abonnieren." msgstr[1] "Die Gegenseite konnte Dich nicht abonnieren." -#: lib/command.php:636 +#: lib/command.php:667 #, fuzzy msgid "You are not a member of any groups." msgstr "Du bist kein Mitglied dieser Gruppe." -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Du bist kein Mitglied dieser Gruppe." msgstr[1] "Du bist kein Mitglied dieser Gruppe." -#: lib/command.php:652 +#: lib/command.php:683 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4459,6 +4470,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" @@ -4610,10 +4622,10 @@ msgid "Description" msgstr "Beschreibung" #: lib/groupeditform.php:179 -#, fuzzy msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" -msgstr "Ort der Gruppe, optional, z.B. \"Stadt, Gebiet (oder Region), Land\"" +msgstr "" +"Ort der Gruppe, optional, beispielsweise „Stadt, Gebiet (oder Region), Land“" #: lib/groupeditform.php:187 #, php-format diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index 07384974dc..d6142aaa76 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-05 19:53+0000\n" -"PO-Revision-Date: 2009-12-05 19:54:03+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"PO-Revision-Date: 2009-12-07 21:26:14+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: el\n" "X-Message-Group: out-statusnet\n" @@ -574,7 +574,7 @@ msgstr "" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -1771,11 +1771,11 @@ msgstr "" msgid "%s left group %s" msgstr "" -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "Ήδη συνδεδεμένος." -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 msgid "Invalid or expired token." msgstr "" @@ -4318,40 +4318,54 @@ msgstr "" msgid "Can't turn on notification." msgstr "" -#: lib/command.php:592 +#: lib/command.php:588 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:602 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Αδύνατη η αποθήκευση του προφίλ." + +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/command.php:594 +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." msgstr[1] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/command.php:614 +#: lib/command.php:645 #, fuzzy msgid "No one is subscribed to you." msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." msgstr[1] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/command.php:636 +#: lib/command.php:667 #, fuzzy msgid "You are not a member of any groups." msgstr "Ομάδες με τα περισσότερα μέλη" -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Ομάδες με τα περισσότερα μέλη" msgstr[1] "Ομάδες με τα περισσότερα μέλη" -#: lib/command.php:652 +#: lib/command.php:683 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4370,6 +4384,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index d31e8a7ed6..782a5ec0ac 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-05 19:53+0000\n" -"PO-Revision-Date: 2009-12-05 19:54:06+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"PO-Revision-Date: 2009-12-07 21:26:19+0000\n" "Language-Team: British English\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" "X-Message-Group: out-statusnet\n" @@ -568,7 +568,7 @@ msgstr "Crop" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -1805,11 +1805,11 @@ msgstr "Could not remove user %s to group %s" msgid "%s left group %s" msgstr "%s left group %s" -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "Already logged in." -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 #, fuzzy msgid "Invalid or expired token." msgstr "Invalid notice content" @@ -4392,40 +4392,54 @@ msgstr "Notification on." msgid "Can't turn on notification." msgstr "Can't turn on notification." -#: lib/command.php:592 +#: lib/command.php:588 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:602 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Could not create aliases" + +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 #, fuzzy msgid "You are not subscribed to anyone." msgstr "You are not subscribed to that profile." -#: lib/command.php:594 +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "You are already subscribed to these users:" msgstr[1] "You are already subscribed to these users:" -#: lib/command.php:614 +#: lib/command.php:645 #, fuzzy msgid "No one is subscribed to you." msgstr "Could not subscribe other to you." -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Could not subscribe other to you." msgstr[1] "Could not subscribe other to you." -#: lib/command.php:636 +#: lib/command.php:667 #, fuzzy msgid "You are not a member of any groups." msgstr "You are not a member of that group." -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "You are not a member of that group." msgstr[1] "You are not a member of that group." -#: lib/command.php:652 +#: lib/command.php:683 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4444,6 +4458,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index 2493b24bc6..871040c9ae 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -11,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-05 19:53+0000\n" -"PO-Revision-Date: 2009-12-05 19:54:09+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"PO-Revision-Date: 2009-12-07 21:26:23+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: es\n" "X-Message-Group: out-statusnet\n" @@ -189,9 +189,8 @@ msgid "Could not save profile." msgstr "No se pudo guardar el perfil." #: actions/apiblockcreate.php:105 -#, fuzzy msgid "You cannot block yourself!" -msgstr "No se pudo actualizar el usuario." +msgstr "¡No puedes bloquearte a tí mismo!" #: actions/apiblockcreate.php:119 msgid "Block user failed." @@ -219,9 +218,9 @@ msgid "Can't send direct messages to users who aren't your friend." msgstr "No se puede enviar mensajes directos a usuarios que no son tu amigo." #: actions/apidirectmessage.php:89 -#, fuzzy, php-format +#, php-format msgid "Direct messages from %s" -msgstr "Mensajes directos a %s" +msgstr "Mensajes directos de %s" #: actions/apidirectmessage.php:93 #, php-format @@ -261,18 +260,16 @@ msgid "No status found with that ID." msgstr "No se encontró estado para ese ID" #: actions/apifavoritecreate.php:119 -#, fuzzy msgid "This status is already a favorite!" -msgstr "¡Este aviso ya está en favoritos!" +msgstr "¡Este status ya está en favoritos!" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 msgid "Could not create favorite." msgstr "No se pudo crear favorito." #: actions/apifavoritedestroy.php:122 -#, fuzzy msgid "That status is not a favorite!" -msgstr "¡Este aviso no es un favorito!" +msgstr "¡Este status no es un favorito!" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 msgid "Could not delete favorite." @@ -288,27 +285,24 @@ msgid "Could not follow user: %s is already on your list." msgstr "No puede seguir al usuario: %s ya esta en su lista." #: actions/apifriendshipsdestroy.php:109 -#, fuzzy msgid "Could not unfollow user: User not found." -msgstr "No puede seguir al usuario. Usuario no encontrado" +msgstr "No se pudo dejar de seguir al usuario. Usuario no encontrado" #: actions/apifriendshipsdestroy.php:120 msgid "You cannot unfollow yourself!" -msgstr "" +msgstr "¡No puedes dejar de seguirte a ti mismo!" #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." msgstr "Deben proveerse dos identificaciones de usuario o nombres en pantalla." #: actions/apifriendshipsshow.php:135 -#, fuzzy msgid "Could not determine source user." -msgstr "No se pudo acceder a corriente pública." +msgstr "No se pudo determinar el usuario fuente." #: actions/apifriendshipsshow.php:143 -#, fuzzy msgid "Could not find target user." -msgstr "No se pudo encontrar ningún estado." +msgstr "No se pudo encontrar ningún usuario de destino." #: actions/apigroupcreate.php:164 actions/editgroup.php:182 #: actions/newgroup.php:126 actions/profilesettings.php:208 @@ -316,7 +310,7 @@ msgstr "No se pudo encontrar ningún estado." msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" "El apodo debe tener solamente letras minúsculas y números y no puede tener " -"espacios. " +"espacios." #: actions/apigroupcreate.php:173 actions/editgroup.php:186 #: actions/newgroup.php:130 actions/profilesettings.php:231 @@ -343,9 +337,9 @@ msgid "Full name is too long (max 255 chars)." msgstr "Tu nombre es demasiado largo (max. 255 carac.)" #: actions/apigroupcreate.php:213 -#, fuzzy, php-format +#, php-format msgid "Description is too long (max %d chars)." -msgstr "Descripción es demasiado larga (máx. 140 caracteres)." +msgstr "La descripción es demasiado larga (máx. %d caracteres)." #: actions/apigroupcreate.php:224 actions/editgroup.php:204 #: actions/newgroup.php:148 actions/profilesettings.php:225 @@ -357,7 +351,7 @@ msgstr "La ubicación es demasiado larga (máx. 255 caracteres)." #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." -msgstr "" +msgstr "¡Muchos seudónimos! El máximo es %d." #: actions/apigroupcreate.php:264 actions/editgroup.php:224 #: actions/newgroup.php:168 @@ -582,7 +576,7 @@ msgstr "Cortar" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -1854,11 +1848,11 @@ msgstr "No se pudo eliminar a usuario %s de grupo %s" msgid "%s left group %s" msgstr "%s dejó grupo %s" -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "Ya estás conectado." -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 #, fuzzy msgid "Invalid or expired token." msgstr "El contenido del aviso es inválido" @@ -4512,40 +4506,54 @@ msgstr "Notificación activada." msgid "Can't turn on notification." msgstr "No se puede activar notificación." -#: lib/command.php:592 +#: lib/command.php:588 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:602 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "No se pudo crear favorito." + +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 #, fuzzy msgid "You are not subscribed to anyone." msgstr "No estás suscrito a ese perfil." -#: lib/command.php:594 +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Ya estás suscrito a estos usuarios:" msgstr[1] "Ya estás suscrito a estos usuarios:" -#: lib/command.php:614 +#: lib/command.php:645 #, fuzzy msgid "No one is subscribed to you." msgstr "No se pudo suscribir otro a ti." -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "No se pudo suscribir otro a ti." msgstr[1] "No se pudo suscribir otro a ti." -#: lib/command.php:636 +#: lib/command.php:667 #, fuzzy msgid "You are not a member of any groups." msgstr "No eres miembro de ese grupo" -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "No eres miembro de este grupo." msgstr[1] "No eres miembro de este grupo." -#: lib/command.php:652 +#: lib/command.php:683 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4564,6 +4572,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index dbc8f1f4b3..c1b9febfe2 100644 --- a/locale/fi/LC_MESSAGES/statusnet.po +++ b/locale/fi/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-05 19:53+0000\n" -"PO-Revision-Date: 2009-12-05 19:54:12+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"PO-Revision-Date: 2009-12-07 21:26:26+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fi\n" "X-Message-Group: out-statusnet\n" @@ -578,7 +578,7 @@ msgstr "Rajaa" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -1813,11 +1813,11 @@ msgstr "Ei voitu poistaa käyttäjää %s ryhmästä %s" msgid "%s left group %s" msgstr "%s erosi ryhmästä %s" -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "Olet jo kirjautunut sisään." -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 #, fuzzy msgid "Invalid or expired token." msgstr "Päivityksen sisältö ei kelpaa" @@ -4440,40 +4440,54 @@ msgstr "Ilmoitukset päällä." msgid "Can't turn on notification." msgstr "Ilmoituksia ei voi pistää päälle." -#: lib/command.php:592 +#: lib/command.php:588 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:602 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Ei voitu lisätä aliasta." + +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Et ole tilannut tämän käyttäjän päivityksiä." -#: lib/command.php:594 +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Olet jos tilannut seuraavien käyttäjien päivitykset:" msgstr[1] "Olet jos tilannut seuraavien käyttäjien päivitykset:" -#: lib/command.php:614 +#: lib/command.php:645 #, fuzzy msgid "No one is subscribed to you." msgstr "Toista ei voitu asettaa tilaamaan sinua." -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Toista ei voitu asettaa tilaamaan sinua." msgstr[1] "Toista ei voitu asettaa tilaamaan sinua." -#: lib/command.php:636 +#: lib/command.php:667 #, fuzzy msgid "You are not a member of any groups." msgstr "Sinä et kuulu tähän ryhmään." -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Sinä et kuulu tähän ryhmään." msgstr[1] "Sinä et kuulu tähän ryhmään." -#: lib/command.php:652 +#: lib/command.php:683 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4492,6 +4506,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index a3e47142e6..d667087954 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -13,12 +13,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-05 19:53+0000\n" -"PO-Revision-Date: 2009-12-05 19:54:15+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"PO-Revision-Date: 2009-12-07 21:26:29+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" "X-Message-Group: out-statusnet\n" @@ -197,9 +197,8 @@ msgid "Could not save profile." msgstr "Impossible d’enregistrer le profil." #: actions/apiblockcreate.php:105 -#, fuzzy msgid "You cannot block yourself!" -msgstr "Vous ne pouvez pas ne plus vous suivre vous-même !" +msgstr "Vous ne pouvez pas vous bloquer vous-même !" #: actions/apiblockcreate.php:119 msgid "Block user failed." @@ -588,7 +587,7 @@ msgstr "Recadrer" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -1841,11 +1840,11 @@ msgstr "Impossible de retirer l’utilisateur %s du groupe %s" msgid "%s left group %s" msgstr "%s a quitté le groupe %s" -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "Déjà connecté." -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 msgid "Invalid or expired token." msgstr "Jeton invalide ou expiré." @@ -4492,37 +4491,52 @@ msgstr "Avertissements activés." msgid "Can't turn on notification." msgstr "Impossible d’activer les avertissements." -#: lib/command.php:592 +#: lib/command.php:588 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:602 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Impossible de créer les alias." + +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 msgid "You are not subscribed to anyone." msgstr "Vous n'êtes pas abonné(e) à personne." -#: lib/command.php:594 +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Vous êtes abonné à cette personne :" msgstr[1] "Vous êtes abonné à ces personnes :" -#: lib/command.php:614 +#: lib/command.php:645 msgid "No one is subscribed to you." msgstr "Personne ne s'est abonné à vous." -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Cette personne est abonnée à vous :" msgstr[1] "Ces personnes sont abonnées à vous :" -#: lib/command.php:636 +#: lib/command.php:667 msgid "You are not a member of any groups." msgstr "Vous n'êtes pas membre d'aucun groupe." -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Vous êtes membre de ce groupe :" msgstr[1] "Vous êtes membre de ces groupes :" -#: lib/command.php:652 +#: lib/command.php:683 +#, fuzzy msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4541,6 +4555,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" @@ -5465,9 +5480,8 @@ msgid "Not subscribed!" msgstr "Pas abonné !" #: lib/subs.php:133 -#, fuzzy msgid "Couldn't delete self-subscription." -msgstr "Impossible de cesser l’abonnement" +msgstr "Impossible de supprimer l’abonnement à soi-même." #: lib/subs.php:146 msgid "Couldn't delete subscription." diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index d809f92341..b3d15c8a47 100644 --- a/locale/ga/LC_MESSAGES/statusnet.po +++ b/locale/ga/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-05 19:53+0000\n" -"PO-Revision-Date: 2009-12-05 19:54:19+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"PO-Revision-Date: 2009-12-07 21:26:33+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ga\n" "X-Message-Group: out-statusnet\n" @@ -585,7 +585,7 @@ msgstr "" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -1857,11 +1857,11 @@ msgstr "Non podes seguir a este usuario: o Usuario non se atopa." msgid "%s left group %s" msgstr "" -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "Sesión xa iniciada" -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 #, fuzzy msgid "Invalid or expired token." msgstr "Contido do chío inválido" @@ -4533,12 +4533,26 @@ msgstr "Notificación habilitada." msgid "Can't turn on notification." msgstr "Non se pode activar a notificación." -#: lib/command.php:592 +#: lib/command.php:588 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:602 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Non se puido crear o favorito." + +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Non estás suscrito a ese perfil" -#: lib/command.php:594 +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Xa estas suscrito a estes usuarios:" @@ -4547,12 +4561,12 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: lib/command.php:614 +#: lib/command.php:645 #, fuzzy msgid "No one is subscribed to you." msgstr "Outro usuario non se puido suscribir a ti." -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Outro usuario non se puido suscribir a ti." @@ -4561,12 +4575,12 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: lib/command.php:636 +#: lib/command.php:667 #, fuzzy msgid "You are not a member of any groups." msgstr "Non estás suscrito a ese perfil" -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Non estás suscrito a ese perfil" @@ -4575,7 +4589,7 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: lib/command.php:652 +#: lib/command.php:683 #, fuzzy msgid "" "Commands:\n" @@ -4595,6 +4609,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 8ff8672800..a6d463d533 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: 2009-12-05 19:53+0000\n" -"PO-Revision-Date: 2009-12-05 19:54:22+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"PO-Revision-Date: 2009-12-07 21:26:36+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: he\n" "X-Message-Group: out-statusnet\n" @@ -579,7 +579,7 @@ msgstr "" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -1802,11 +1802,11 @@ msgstr "נכשלה יצירת OpenID מתוך: %s" msgid "%s left group %s" msgstr "" -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "כבר מחובר." -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 #, fuzzy msgid "Invalid or expired token." msgstr "תוכן ההודעה לא חוקי" @@ -4380,40 +4380,54 @@ msgstr "" msgid "Can't turn on notification." msgstr "" -#: lib/command.php:592 +#: lib/command.php:588 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:602 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "שמירת מידע התמונה נכשל" + +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 #, fuzzy msgid "You are not subscribed to anyone." msgstr "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:594 +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "לא שלחנו אלינו את הפרופיל הזה" msgstr[1] "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:614 +#: lib/command.php:645 #, fuzzy msgid "No one is subscribed to you." msgstr "הרשמה מרוחקת" -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "הרשמה מרוחקת" msgstr[1] "הרשמה מרוחקת" -#: lib/command.php:636 +#: lib/command.php:667 #, fuzzy msgid "You are not a member of any groups." msgstr "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "לא שלחנו אלינו את הפרופיל הזה" msgstr[1] "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:652 +#: lib/command.php:683 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4432,6 +4446,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index 6a0ff37b46..9bea1de8fc 100644 --- a/locale/hsb/LC_MESSAGES/statusnet.po +++ b/locale/hsb/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-05 19:53+0000\n" -"PO-Revision-Date: 2009-12-05 19:54:27+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"PO-Revision-Date: 2009-12-07 21:26:39+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: hsb\n" "X-Message-Group: out-statusnet\n" @@ -180,9 +180,8 @@ msgid "Could not save profile." msgstr "Profil njeje so składować dał." #: actions/apiblockcreate.php:105 -#, fuzzy msgid "You cannot block yourself!" -msgstr "Njemóžeš wužiwarjow wušmórnyć." +msgstr "Njemóžeš so samoho blokować." #: actions/apiblockcreate.php:119 msgid "Block user failed." @@ -564,7 +563,7 @@ msgstr "" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -1726,11 +1725,11 @@ msgstr "" msgid "%s left group %s" msgstr "" -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "Hižo přizjewjeny." -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 msgid "Invalid or expired token." msgstr "" @@ -4191,11 +4190,25 @@ msgstr "" msgid "Can't turn on notification." msgstr "" -#: lib/command.php:592 +#: lib/command.php:588 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:602 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Aliasy njejsu so dali wutworić." + +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 msgid "You are not subscribed to anyone." msgstr "" -#: lib/command.php:594 +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Sy tutu wosobu abonował:" @@ -4203,11 +4216,11 @@ msgstr[1] "Sy tutej wosobje abonował:" msgstr[2] "Sy tute wosoby abonował:" msgstr[3] "Sy tute wosoby abonował:" -#: lib/command.php:614 +#: lib/command.php:645 msgid "No one is subscribed to you." msgstr "" -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Tuta wosoba je će abonowała:" @@ -4215,11 +4228,11 @@ msgstr[1] "Tutej wosobje stej će abonowałoj:" msgstr[2] "Tute wosoby su će abonowali:" msgstr[3] "Tute wosoby su će abonowali:" -#: lib/command.php:636 +#: lib/command.php:667 msgid "You are not a member of any groups." msgstr "" -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Sy čłon tuteje skupiny:" @@ -4227,7 +4240,7 @@ msgstr[1] "Sy čłon tuteju skupinow:" msgstr[2] "Sy čłon tutych skupinow:" msgstr[3] "Sy čłon tutych skupinow:" -#: lib/command.php:652 +#: lib/command.php:683 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4246,6 +4259,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index e27212ed11..16e4b7435a 100644 --- a/locale/is/LC_MESSAGES/statusnet.po +++ b/locale/is/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-05 19:53+0000\n" -"PO-Revision-Date: 2009-12-05 19:54:31+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"PO-Revision-Date: 2009-12-07 21:26:42+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: is\n" "X-Message-Group: out-statusnet\n" @@ -574,7 +574,7 @@ msgstr "Skera af" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -1802,11 +1802,11 @@ msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s" msgid "%s left group %s" msgstr "%s gekk úr hópnum %s" -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "Þú hefur nú þegar skráð þig inn." -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 #, fuzzy msgid "Invalid or expired token." msgstr "Ótækt bablinnihald" @@ -4401,40 +4401,54 @@ msgstr "Tilkynningar á." msgid "Can't turn on notification." msgstr "Get ekki kveikt á tilkynningum." -#: lib/command.php:592 +#: lib/command.php:588 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:602 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Gat ekki búið til uppáhald." + +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Þú ert ekki áskrifandi." -#: lib/command.php:594 +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Þú ert nú þegar í áskrift að þessum notendum:" msgstr[1] "Þú ert nú þegar í áskrift að þessum notendum:" -#: lib/command.php:614 +#: lib/command.php:645 #, fuzzy msgid "No one is subscribed to you." msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér." -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Gat ekki leyft öðrum að gerast áskrifandi að þér." msgstr[1] "Gat ekki leyft öðrum að gerast áskrifandi að þér." -#: lib/command.php:636 +#: lib/command.php:667 #, fuzzy msgid "You are not a member of any groups." msgstr "Þú ert ekki meðlimur í þessum hópi." -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Þú ert ekki meðlimur í þessum hópi." msgstr[1] "Þú ert ekki meðlimur í þessum hópi." -#: lib/command.php:652 +#: lib/command.php:683 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4453,6 +4467,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index da538e1a27..b86ca75b94 100644 --- a/locale/it/LC_MESSAGES/statusnet.po +++ b/locale/it/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-05 19:53+0000\n" -"PO-Revision-Date: 2009-12-05 19:54:34+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"PO-Revision-Date: 2009-12-07 21:26:45+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: it\n" "X-Message-Group: out-statusnet\n" @@ -582,7 +582,7 @@ msgstr "Ritaglia" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -1847,11 +1847,11 @@ msgstr "Impossibile rimuovere l'utente %s dal gruppo %s" msgid "%s left group %s" msgstr "%s ha lasciato il gruppo %s" -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "Accesso già effettuato." -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 #, fuzzy msgid "Invalid or expired token." msgstr "Contenuto del messaggio non valido" @@ -4471,40 +4471,54 @@ msgstr "Notifiche attivate." msgid "Can't turn on notification." msgstr "Impossibile attivare le notifiche." -#: lib/command.php:592 +#: lib/command.php:588 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:602 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Impossibile creare preferito." + +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Non sei abbonato a quel profilo." -#: lib/command.php:594 +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Sei già abbonato a questi utenti:" msgstr[1] "Sei già abbonato a questi utenti:" -#: lib/command.php:614 +#: lib/command.php:645 #, fuzzy msgid "No one is subscribed to you." msgstr "Impossibile abbonare altri a te." -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Impossibile abbonare altri a te." msgstr[1] "Impossibile abbonare altri a te." -#: lib/command.php:636 +#: lib/command.php:667 #, fuzzy msgid "You are not a member of any groups." msgstr "Non sei un membro di quel gruppo." -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Non sei un membro di quel gruppo." msgstr[1] "Non sei un membro di quel gruppo." -#: lib/command.php:652 +#: lib/command.php:683 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4523,6 +4537,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index 43f6fcec79..74baa8e281 100644 --- a/locale/ja/LC_MESSAGES/statusnet.po +++ b/locale/ja/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-05 19:53+0000\n" -"PO-Revision-Date: 2009-12-05 19:54:37+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"PO-Revision-Date: 2009-12-07 21:26:48+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ja\n" "X-Message-Group: out-statusnet\n" @@ -586,7 +586,7 @@ msgstr "" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -1835,11 +1835,11 @@ msgstr "OpenIDを作成できません : %s" msgid "%s left group %s" msgstr "" -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "既にログインしています。" -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 #, fuzzy msgid "Invalid or expired token." msgstr "不正な通知内容" @@ -4422,37 +4422,51 @@ msgstr "" msgid "Can't turn on notification." msgstr "" -#: lib/command.php:592 +#: lib/command.php:588 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:602 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "アバターを保存できません" + +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 #, fuzzy msgid "You are not subscribed to anyone." msgstr "そのプロファイルは送信されていません。" -#: lib/command.php:594 +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "そのプロファイルは送信されていません。" -#: lib/command.php:614 +#: lib/command.php:645 #, fuzzy msgid "No one is subscribed to you." msgstr "リモートサブスクライブ" -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "リモートサブスクライブ" -#: lib/command.php:636 +#: lib/command.php:667 #, fuzzy msgid "You are not a member of any groups." msgstr "そのプロファイルは送信されていません。" -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "そのプロファイルは送信されていません。" -#: lib/command.php:652 +#: lib/command.php:683 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4471,6 +4485,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index 2de8e46d53..05b20ed918 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: 2009-12-05 19:53+0000\n" -"PO-Revision-Date: 2009-12-05 19:54:40+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"PO-Revision-Date: 2009-12-07 21:26:51+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ko\n" "X-Message-Group: out-statusnet\n" @@ -581,7 +581,7 @@ msgstr "자르기" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -1828,11 +1828,11 @@ msgstr "그룹 %s에서 %s 사용자를 제거할 수 없습니다." msgid "%s left group %s" msgstr "%s가 그룹%s를 떠났습니다." -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "이미 로그인 하셨습니다." -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 #, fuzzy msgid "Invalid or expired token." msgstr "옳지 않은 통지 내용" @@ -4433,37 +4433,51 @@ msgstr "알림이 켜졌습니다." msgid "Can't turn on notification." msgstr "알림을 켤 수 없습니다." -#: lib/command.php:592 +#: lib/command.php:588 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:602 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "좋아하는 게시글을 생성할 수 없습니다." + +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 #, fuzzy msgid "You are not subscribed to anyone." msgstr "당신은 이 프로필에 구독되지 않고있습니다." -#: lib/command.php:594 +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "당신은 다음 사용자를 이미 구독하고 있습니다." -#: lib/command.php:614 +#: lib/command.php:645 #, fuzzy msgid "No one is subscribed to you." msgstr "다른 사람을 구독 하실 수 없습니다." -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "다른 사람을 구독 하실 수 없습니다." -#: lib/command.php:636 +#: lib/command.php:667 #, fuzzy msgid "You are not a member of any groups." msgstr "당신은 해당 그룹의 멤버가 아닙니다." -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "당신은 해당 그룹의 멤버가 아닙니다." -#: lib/command.php:652 +#: lib/command.php:683 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4482,6 +4496,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 011c434cac..dff5c0b431 100644 --- a/locale/mk/LC_MESSAGES/statusnet.po +++ b/locale/mk/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-05 19:53+0000\n" -"PO-Revision-Date: 2009-12-05 19:54:43+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"PO-Revision-Date: 2009-12-07 21:26:55+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: mk\n" "X-Message-Group: out-statusnet\n" @@ -579,7 +579,7 @@ msgstr "" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -681,7 +681,7 @@ msgstr "" #: actions/block.php:143 actions/deletenotice.php:145 #: actions/deleteuser.php:147 actions/groupblock.php:178 msgid "No" -msgstr "" +msgstr "Не" #: actions/block.php:143 actions/deleteuser.php:147 #, fuzzy @@ -1799,11 +1799,11 @@ msgstr "OpenID формуларот не може да се креира:%s" msgid "%s left group %s" msgstr "" -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "Веќе сте најавени." -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 #, fuzzy msgid "Invalid or expired token." msgstr "Неправилна содржина за известување" @@ -4391,40 +4391,54 @@ msgstr "" msgid "Can't turn on notification." msgstr "" -#: lib/command.php:592 +#: lib/command.php:588 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:602 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Информациите за аватарот не може да се снимат" + +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Не ни го испративте тој профил." -#: lib/command.php:594 +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Не ни го испративте тој профил." msgstr[1] "Не ни го испративте тој профил." -#: lib/command.php:614 +#: lib/command.php:645 #, fuzzy msgid "No one is subscribed to you." msgstr "Оддалечена претплата" -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Оддалечена претплата" msgstr[1] "Оддалечена претплата" -#: lib/command.php:636 +#: lib/command.php:667 #, fuzzy msgid "You are not a member of any groups." msgstr "Не ни го испративте тој профил." -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Не ни го испративте тој профил." msgstr[1] "Не ни го испративте тој профил." -#: lib/command.php:652 +#: lib/command.php:683 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4443,6 +4457,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index 4a8ed64274..12b20f3ddb 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-05 19:53+0000\n" -"PO-Revision-Date: 2009-12-05 19:54:46+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"PO-Revision-Date: 2009-12-07 21:26:58+0000\n" "Language-Team: Norwegian (bokmål)‬\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: no\n" "X-Message-Group: out-statusnet\n" @@ -577,7 +577,7 @@ msgstr "" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -1796,11 +1796,11 @@ msgstr "Klarte ikke å oppdatere bruker." msgid "%s left group %s" msgstr "" -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "Allerede innlogget." -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 msgid "Invalid or expired token." msgstr "" @@ -4335,40 +4335,54 @@ msgstr "" msgid "Can't turn on notification." msgstr "" -#: lib/command.php:592 +#: lib/command.php:588 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:602 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Klarte ikke å lagre avatar-informasjonen" + +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Ikke autorisert." -#: lib/command.php:594 +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Ikke autorisert." msgstr[1] "Ikke autorisert." -#: lib/command.php:614 +#: lib/command.php:645 #, fuzzy msgid "No one is subscribed to you." msgstr "Svar til %s" -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Svar til %s" msgstr[1] "Svar til %s" -#: lib/command.php:636 +#: lib/command.php:667 #, fuzzy msgid "You are not a member of any groups." msgstr "Du er allerede logget inn!" -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Du er allerede logget inn!" msgstr[1] "Du er allerede logget inn!" -#: lib/command.php:652 +#: lib/command.php:683 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4387,6 +4401,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index 85f3cb655e..cec42ca714 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-05 19:53+0000\n" -"PO-Revision-Date: 2009-12-05 19:54:52+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"PO-Revision-Date: 2009-12-07 21:27:06+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: out-statusnet\n" @@ -193,9 +193,8 @@ msgid "Could not save profile." msgstr "Het was niet mogelijk het profiel op te slaan." #: actions/apiblockcreate.php:105 -#, fuzzy msgid "You cannot block yourself!" -msgstr "U kunt het abonnement op uzelf niet opzeggen." +msgstr "U zichzelf niet blokkeren!" #: actions/apiblockcreate.php:119 msgid "Block user failed." @@ -587,7 +586,7 @@ msgstr "Uitsnijden" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -1843,11 +1842,11 @@ msgstr "De gebruiker %s kon niet uit de groet %s verwijderd worden" msgid "%s left group %s" msgstr "%s heeft de groep %s verlaten" -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "U bent al aangemeld." -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 msgid "Invalid or expired token." msgstr "Het token is ongeldig of verlopen." @@ -4496,37 +4495,52 @@ msgstr "Notificaties ingeschakeld." msgid "Can't turn on notification." msgstr "Het is niet mogelijk de notificatie uit te schakelen." -#: lib/command.php:592 +#: lib/command.php:588 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:602 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Het was niet mogelijk de aliassen aan te maken." + +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 msgid "You are not subscribed to anyone." msgstr "U bent op geen enkele gebruiker geabonneerd." -#: lib/command.php:594 +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "U bent geabonneerd op deze gebruiker:" msgstr[1] "U bent geabonneerd op deze gebruikers:" -#: lib/command.php:614 +#: lib/command.php:645 msgid "No one is subscribed to you." msgstr "Niemand heeft een abonnenment op u." -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Deze gebruiker is op u geabonneerd:" msgstr[1] "Deze gebruikers zijn op u geabonneerd:" -#: lib/command.php:636 +#: lib/command.php:667 msgid "You are not a member of any groups." msgstr "U bent lid van geen enkele groep." -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "U bent lid van deze groep:" msgstr[1] "U bent lid van deze groepen:" -#: lib/command.php:652 +#: lib/command.php:683 +#, fuzzy msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4545,6 +4559,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" @@ -5471,9 +5486,8 @@ msgid "Not subscribed!" msgstr "Niet geabonneerd!" #: lib/subs.php:133 -#, fuzzy msgid "Couldn't delete self-subscription." -msgstr "Kon abonnement niet verwijderen." +msgstr "Het was niet mogelijk het abonnement op uzelf te verwijderen." #: lib/subs.php:146 msgid "Couldn't delete subscription." diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index 6ce0460ca3..0703217dea 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: 2009-12-05 19:53+0000\n" -"PO-Revision-Date: 2009-12-05 19:54:49+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"PO-Revision-Date: 2009-12-07 21:27:01+0000\n" "Language-Team: Norwegian Nynorsk\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nn\n" "X-Message-Group: out-statusnet\n" @@ -579,7 +579,7 @@ msgstr "Skaler" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -1830,11 +1830,11 @@ msgstr "Kunne ikkje fjerne %s fra %s gruppa " msgid "%s left group %s" msgstr "%s forlot %s gruppa" -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "Allereie logga inn." -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 #, fuzzy msgid "Invalid or expired token." msgstr "Ugyldig notisinnhald" @@ -4450,40 +4450,54 @@ msgstr "Notifikasjon på." msgid "Can't turn on notification." msgstr "Kan ikkje slå på notifikasjon." -#: lib/command.php:592 +#: lib/command.php:588 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:602 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Kunne ikkje lagre favoritt." + +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Du tingar ikkje oppdateringar til den profilen." -#: lib/command.php:594 +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Du tingar allereie oppdatering frå desse brukarane:" msgstr[1] "Du tingar allereie oppdatering frå desse brukarane:" -#: lib/command.php:614 +#: lib/command.php:645 #, fuzzy msgid "No one is subscribed to you." msgstr "Kan ikkje tinga andre til deg." -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Kan ikkje tinga andre til deg." msgstr[1] "Kan ikkje tinga andre til deg." -#: lib/command.php:636 +#: lib/command.php:667 #, fuzzy msgid "You are not a member of any groups." msgstr "Du er ikkje medlem av den gruppa." -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Du er ikkje medlem av den gruppa." msgstr[1] "Du er ikkje medlem av den gruppa." -#: lib/command.php:652 +#: lib/command.php:683 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4502,6 +4516,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index 33013c7af8..c8363f2a38 100644 --- a/locale/pl/LC_MESSAGES/statusnet.po +++ b/locale/pl/LC_MESSAGES/statusnet.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-05 19:53+0000\n" -"PO-Revision-Date: 2009-12-05 19:54:56+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"PO-Revision-Date: 2009-12-07 21:27:09+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pl\n" "X-Message-Group: out-statusnet\n" @@ -197,7 +197,7 @@ msgstr "Nie można zapisać profilu." #: actions/apiblockcreate.php:105 #, fuzzy msgid "You cannot block yourself!" -msgstr "Nie można zrezygnować z obserwacji samego siebie." +msgstr "Nie można zablokować siebie." #: actions/apiblockcreate.php:119 msgid "Block user failed." @@ -581,7 +581,7 @@ msgstr "Przytnij" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -1814,11 +1814,11 @@ msgstr "Nie można usunąć użytkownika %s z grupy %s" msgid "%s left group %s" msgstr "Użytkownik %s opuścił grupę %s" -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "Jesteś już zalogowany." -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 msgid "Invalid or expired token." msgstr "Nieprawidłowy lub wygasły token." @@ -2823,7 +2823,7 @@ msgstr "Nieprawidłowy adres URL profilu (błędny format)" #, fuzzy msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)." msgstr "" -"To nie jest prawidłowy adres URL profilu (brak dokumentu YADIS lub określono " +"Nieprawidłowy adres URL profilu (brak dokumentu YADIS lub określono " "nieprawidłowe XRDS)." #: actions/remotesubscribe.php:176 @@ -4437,40 +4437,54 @@ msgstr "Włączono powiadomienia." msgid "Can't turn on notification." msgstr "Nie można włączyć powiadomień." -#: lib/command.php:592 +#: lib/command.php:588 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:602 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Nie można utworzyć aliasów." + +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 msgid "You are not subscribed to anyone." msgstr "Nie subskrybujesz nikogo." -#: lib/command.php:594 +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Subskrybujesz tę osobę:" msgstr[1] "Subskrybujesz te osoby:" msgstr[2] "Subskrybujesz te osoby:" -#: lib/command.php:614 +#: lib/command.php:645 msgid "No one is subscribed to you." msgstr "Nikt cię nie subskrybuje." -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Ta osoba cię subskrybuje:" msgstr[1] "Te osoby cię subskrybują:" msgstr[2] "Te osoby cię subskrybują:" -#: lib/command.php:636 +#: lib/command.php:667 msgid "You are not a member of any groups." msgstr "Nie jesteś członkiem żadnej grupy." -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Jesteś członkiem tej grupy:" msgstr[1] "Jesteś członkiem tych grup:" msgstr[2] "Jesteś członkiem tych grup:" -#: lib/command.php:652 +#: lib/command.php:683 #, fuzzy msgid "" "Commands:\n" @@ -4490,6 +4504,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" @@ -4526,9 +4541,8 @@ msgstr "" "reply # - odpowiada na wpis z podanym identyfikatorem\n" "reply - odpowiada na ostatni wpis użytkownika\n" "join - dołącza do grupy\n" -"login - uzyskuje odnośnik do zalogowania się w interfejsie WWW\n" "drop - opuszcza grupę\n" -"stats - uzyskuje twoje statystyki\n" +"stats - uzyskuje statystyki\n" "stop - to samo co \"off\"\n" "quit - to samo co \"off\"\n" "sub - to samo co \"follow\"\n" @@ -4536,10 +4550,10 @@ msgstr "" "last - to samo co \"get\"\n" "on - jeszcze nie zaimplementowano.\n" "off - jeszcze nie zaimplementowano.\n" -"nudge - jeszcze nie zaimplementowano.\n" +"nudge - przypomina użytkownikowi o aktualizacji.\n" "invite - jeszcze nie zaimplementowano.\n" -"track - jeszcze nie zaimplementowano.\n" -"untrack - jeszcze nie zaimplementowano.\n" +"track - jeszcze nie zaimplementowano.\n" +"untrack - jeszcze nie zaimplementowano.\n" "track off - jeszcze nie zaimplementowano.\n" "untrack all - jeszcze nie zaimplementowano.\n" "tracks - jeszcze nie zaimplementowano.\n" @@ -5411,7 +5425,7 @@ msgstr "Niesubskrybowane." #: lib/subs.php:133 #, fuzzy msgid "Couldn't delete self-subscription." -msgstr "Nie można usunąć subskrypcji." +msgstr "Nie można usunąć autosubskrypcji." #: lib/subs.php:146 msgid "Couldn't delete subscription." diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index 01d8c5f63c..54cc569f2f 100644 --- a/locale/pt/LC_MESSAGES/statusnet.po +++ b/locale/pt/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-05 19:53+0000\n" -"PO-Revision-Date: 2009-12-05 19:54:59+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"PO-Revision-Date: 2009-12-07 21:27:13+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt\n" "X-Message-Group: out-statusnet\n" @@ -188,9 +188,8 @@ msgid "Could not save profile." msgstr "Não foi possível gravar o perfil." #: actions/apiblockcreate.php:105 -#, fuzzy msgid "You cannot block yourself!" -msgstr "Não pode deixar de seguir-se a si próprio!" +msgstr "Os utilizadores não podem bloquear-se a si próprios!" #: actions/apiblockcreate.php:119 msgid "Block user failed." @@ -573,7 +572,7 @@ msgstr "Cortar" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -1817,11 +1816,11 @@ msgstr "Não foi possível remover o utilizador %s do grupo %s" msgid "%s left group %s" msgstr "%s deixou o grupo %s" -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "Sessão já foi iniciada." -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 msgid "Invalid or expired token." msgstr "Chave inválida ou expirada." @@ -4442,37 +4441,52 @@ msgstr "Notificação ligada." msgid "Can't turn on notification." msgstr "Não foi possível ligar a notificação." -#: lib/command.php:592 +#: lib/command.php:588 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:602 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Não foi possível criar cognomes." + +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 msgid "You are not subscribed to anyone." msgstr "Não subscreveu ninguém." -#: lib/command.php:594 +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Subscreve esta pessoa:" msgstr[1] "Subscreve estas pessoas:" -#: lib/command.php:614 +#: lib/command.php:645 msgid "No one is subscribed to you." msgstr "Ninguém subscreve as suas notas." -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Esta pessoa subscreve as suas notas:" msgstr[1] "Estas pessoas subscrevem as suas notas:" -#: lib/command.php:636 +#: lib/command.php:667 msgid "You are not a member of any groups." msgstr "Não está em nenhum grupo." -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Está no grupo:" msgstr[1] "Está nos grupos:" -#: lib/command.php:652 +#: lib/command.php:683 +#, fuzzy msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4491,6 +4505,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" @@ -5410,9 +5425,8 @@ msgid "Not subscribed!" msgstr "Não subscrito!" #: lib/subs.php:133 -#, fuzzy msgid "Couldn't delete self-subscription." -msgstr "Não foi possível apagar a subscrição." +msgstr "Não foi possível apagar a auto-subscrição." #: lib/subs.php:146 msgid "Couldn't delete subscription." diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index 71e51e35b0..535520096b 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-05 19:53+0000\n" -"PO-Revision-Date: 2009-12-05 19:55:02+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"PO-Revision-Date: 2009-12-07 21:27:16+0000\n" "Language-Team: Brazilian Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt-br\n" "X-Message-Group: out-statusnet\n" @@ -576,7 +576,7 @@ msgstr "Cortar" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -1850,11 +1850,11 @@ msgstr "Não é possível acompanhar o usuário: Usuário não encontrado." msgid "%s left group %s" msgstr "" -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "Já está logado." -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 #, fuzzy msgid "Invalid or expired token." msgstr "O conteúdo da mensagem é inválido" @@ -4498,40 +4498,54 @@ msgstr "Notificação ligada." msgid "Can't turn on notification." msgstr "Não é possível ligar a notificação." -#: lib/command.php:592 +#: lib/command.php:588 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:602 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Não foi possível criar a favorita." + +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Você não está assinando esse perfil." -#: lib/command.php:594 +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Você já está assinando esses usuários:" msgstr[1] "Você já está assinando esses usuários:" -#: lib/command.php:614 +#: lib/command.php:645 #, fuzzy msgid "No one is subscribed to you." msgstr "Não foi possível fazer com que o outros o sigam." -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Não foi possível fazer com que o outros o sigam." msgstr[1] "Não foi possível fazer com que o outros o sigam." -#: lib/command.php:636 +#: lib/command.php:667 #, fuzzy msgid "You are not a member of any groups." msgstr "Você não está assinando esse perfil." -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Você não é membro deste grupo." msgstr[1] "Você não é membro deste grupo." -#: lib/command.php:652 +#: lib/command.php:683 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4550,6 +4564,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index 9fe47e65d4..713357714c 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-05 19:53+0000\n" -"PO-Revision-Date: 2009-12-05 19:55:05+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"PO-Revision-Date: 2009-12-07 21:27:20+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ru\n" "X-Message-Group: out-statusnet\n" @@ -191,9 +191,8 @@ msgid "Could not save profile." msgstr "Не удаётся сохранить профиль." #: actions/apiblockcreate.php:105 -#, fuzzy msgid "You cannot block yourself!" -msgstr "Вы не можете перестать следовать за собой!" +msgstr "Вы не можете заблокировать самого себя!" #: actions/apiblockcreate.php:119 msgid "Block user failed." @@ -582,7 +581,7 @@ msgstr "Обрезать" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -1830,11 +1829,11 @@ msgstr "Не удаётся удалить пользователя %s из гр msgid "%s left group %s" msgstr "%s покинул группу %s" -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "Вы уже авторизовались." -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 msgid "Invalid or expired token." msgstr "Неверный или устаревший ключ." @@ -4452,40 +4451,55 @@ msgstr "Есть оповещение." msgid "Can't turn on notification." msgstr "Есть оповещение." -#: lib/command.php:592 +#: lib/command.php:588 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:602 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Не удаётся создать алиасы." + +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 msgid "You are not subscribed to anyone." msgstr "Вы ни на кого не подписаны." -#: lib/command.php:594 +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Вы подписаны на этих людей:" msgstr[1] "Вы подписаны на этих людей:" msgstr[2] "Вы подписаны на этих людей:" -#: lib/command.php:614 +#: lib/command.php:645 msgid "No one is subscribed to you." msgstr "Никто не подписан на вас." -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Эти люди подписались на вас:" msgstr[1] "Эти люди подписались на вас:" msgstr[2] "Эти люди подписались на вас:" -#: lib/command.php:636 +#: lib/command.php:667 msgid "You are not a member of any groups." msgstr "Вы не состоите ни в одной группе." -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Вы являетесь участником следующих групп:" msgstr[1] "Вы являетесь участником следующих групп:" msgstr[2] "Вы являетесь участником следующих групп:" -#: lib/command.php:652 +#: lib/command.php:683 +#, fuzzy msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4504,6 +4518,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" @@ -5422,9 +5437,8 @@ msgid "Not subscribed!" msgstr "Не подписаны!" #: lib/subs.php:133 -#, fuzzy msgid "Couldn't delete self-subscription." -msgstr "Не удаётся удалить подписку." +msgstr "Невозможно удалить самоподписку." #: lib/subs.php:146 msgid "Couldn't delete subscription." diff --git a/locale/statusnet.po b/locale/statusnet.po index ea65870d57..dce6f6551c 100644 --- a/locale/statusnet.po +++ b/locale/statusnet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-05 19:53+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -559,7 +559,7 @@ msgstr "" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -1716,11 +1716,11 @@ msgstr "" msgid "%s left group %s" msgstr "" -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "" -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 msgid "Invalid or expired token." msgstr "" @@ -4180,37 +4180,51 @@ msgstr "" msgid "Can't turn on notification." msgstr "" -#: lib/command.php:592 +#: lib/command.php:588 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:602 +#, php-format +msgid "Could not create login token for %s" +msgstr "" + +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 msgid "You are not subscribed to anyone." msgstr "" -#: lib/command.php:594 +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:614 +#: lib/command.php:645 msgid "No one is subscribed to you." msgstr "" -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:636 +#: lib/command.php:667 msgid "You are not a member of any groups." msgstr "" -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:652 +#: lib/command.php:683 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4229,6 +4243,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index a059ce87b5..01e895f8e9 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: 2009-12-05 19:53+0000\n" -"PO-Revision-Date: 2009-12-05 19:55:08+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"PO-Revision-Date: 2009-12-07 21:27:23+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: sv\n" "X-Message-Group: out-statusnet\n" @@ -189,9 +189,8 @@ msgid "Could not save profile." msgstr "Kunde inte spara profil." #: actions/apiblockcreate.php:105 -#, fuzzy msgid "You cannot block yourself!" -msgstr "Du kan inte sluta följa dig själv!" +msgstr "Du kan inte blockera dig själv!" #: actions/apiblockcreate.php:119 msgid "Block user failed." @@ -382,7 +381,7 @@ msgstr "Du är redan en medlem i denna grupp." #: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221 msgid "You have been blocked from that group by the admin." -msgstr "Du har blivit blockerad från denna grupp av administratören. " +msgstr "Du har blivit blockerad från denna grupp av administratören." #: actions/apigroupjoin.php:138 #, php-format @@ -574,7 +573,7 @@ msgstr "Beskär" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -1366,7 +1365,7 @@ msgid "" "Customize the way your group looks with a background image and a colour " "palette of your choice." msgstr "" -"Anpassa hur din grupp ser ut genom att välja bakgrundbild och färgpalett. " +"Anpassa hur din grupp ser ut genom att välja bakgrundbild och färgpalett." #: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 #: lib/designsettings.php:391 lib/designsettings.php:413 @@ -1410,7 +1409,7 @@ msgstr "Misslyckades uppdatera logtyp." #: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" -msgstr "%s " +msgstr "%s gruppmedlemmar" #: actions/groupmembers.php:96 #, php-format @@ -1786,11 +1785,11 @@ msgstr "Kunde inte ta bort användare %s från grupp %s" msgid "%s left group %s" msgstr "%s lämnade grupp %s" -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "Redan inloggad." -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 msgid "Invalid or expired token." msgstr "Ogiltig eller utgången token." @@ -2024,7 +2023,7 @@ msgstr "Övriga inställningar" #: actions/othersettings.php:71 msgid "Manage various other options." -msgstr "Hantera diverse andra alternativ. " +msgstr "Hantera diverse andra alternativ." #: actions/othersettings.php:108 msgid " (free service)" @@ -2048,7 +2047,7 @@ msgstr "Visa eller göm profilutseenden." #: actions/othersettings.php:153 msgid "URL shortening service is too long (max 50 chars)." -msgstr "Namnet på URL-förkortningstjänsen är för långt (max 50 tecken). " +msgstr "Namnet på URL-förkortningstjänsen är för långt (max 50 tecken)." #: actions/outbox.php:58 #, php-format @@ -2233,45 +2232,45 @@ msgid "" "Separate the terms by spaces; they must be 3 characters or more." msgstr "" "Sök efter personer på %%site.name%% efter deras namn, plats eller intressen. " -"Skilj söktermerna åt med mellanslag; de måste vara minst tre tecken långa. " +"Skilj söktermerna åt med mellanslag; de måste vara tre tecken långa." #: actions/peoplesearch.php:58 msgid "People search" -msgstr "Sökning personer" +msgstr "Personsökning" #: actions/peopletag.php:70 -#, fuzzy, php-format +#, php-format msgid "Not a valid people tag: %s" -msgstr "Ingen giltig emailadress" +msgstr "Inte en giltig persontagg: %s" #: actions/peopletag.php:144 #, php-format msgid "Users self-tagged with %s - page %d" -msgstr "" +msgstr "Användare som taggat sig själv med %s - sida %d" #: actions/postnotice.php:84 msgid "Invalid notice content" -msgstr "Ogiltig innehåll i inlägget " +msgstr "Ogiltigt notisinnehåll" #: actions/postnotice.php:90 #, php-format msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." -msgstr "" +msgstr "Licensen för notiser ‘%s’ är inte förenlig webbplatslicensen ‘%s’." #: actions/profilesettings.php:60 msgid "Profile settings" -msgstr "Profil inställningar" +msgstr "Profilinställningar" #: actions/profilesettings.php:71 msgid "" "You can update your personal profile info here so people know more about you." msgstr "" -"Du kan uppdatera din personliga profil här så personer får veta mer om dig." +"Du kan uppdatera din personliga profilinformation här så personer får veta " +"mer om dig." #: actions/profilesettings.php:99 -#, fuzzy msgid "Profile information" -msgstr "Okänd profil" +msgstr "Profilinformation" #: actions/profilesettings.php:108 lib/groupeditform.php:154 msgid "1-64 lowercase letters or numbers, no punctuation or spaces" @@ -2281,7 +2280,7 @@ msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag" #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" -msgstr "Ditt fulla namn." +msgstr "Fullständigt namn" #: actions/profilesettings.php:115 actions/register.php:452 #: lib/groupeditform.php:161 @@ -2290,17 +2289,16 @@ msgstr "Hemsida" #: actions/profilesettings.php:117 actions/register.php:454 msgid "URL of your homepage, blog, or profile on another site" -msgstr "URL till din hemsida, blog eller profil på en annan sida." +msgstr "URL till din hemsida, blogg eller profil på en annan webbplats." #: actions/profilesettings.php:122 actions/register.php:460 -#, fuzzy, php-format +#, php-format msgid "Describe yourself and your interests in %d chars" -msgstr "Berätta om dig själv och dina intressen inom 140 tecken" +msgstr "Beskriv dig själv och dina intressen med högst 140 tecken" #: actions/profilesettings.php:125 actions/register.php:463 -#, fuzzy msgid "Describe yourself and your interests" -msgstr "Berätta om dig själv och dina intressen inom 140 tecken" +msgstr "Beskriv dig själv och dina intressen" #: actions/profilesettings.php:127 actions/register.php:465 msgid "Bio" @@ -2327,6 +2325,8 @@ msgstr "Taggar" msgid "" "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" msgstr "" +"Taggar för dig själv (bokstäver, nummer, -, ., och _), separerade med " +"kommatecken eller mellanslag" #: actions/profilesettings.php:144 actions/siteadminpanel.php:307 msgid "Language" @@ -2334,7 +2334,7 @@ msgstr "Språk" #: actions/profilesettings.php:145 msgid "Preferred language" -msgstr "Språkval" +msgstr "Föredraget språk" #: actions/profilesettings.php:154 msgid "Timezone" @@ -2342,32 +2342,31 @@ msgstr "Tidszon" #: actions/profilesettings.php:155 msgid "What timezone are you normally in?" -msgstr "Vilken tidszon befinner du dig normalt?" +msgstr "I vilken tidszon befinner du dig normalt?" #: actions/profilesettings.php:160 msgid "" "Automatically subscribe to whoever subscribes to me (best for non-humans)" msgstr "" -"Automatisk prenummeration på den som prenumererar på mig. (Bäst för icke " -"mänsklig användare) " +"Prenumerera automatiskt på den prenumererar på mig (bäst för icke-människa) " #: actions/profilesettings.php:221 actions/register.php:223 -#, fuzzy, php-format +#, php-format msgid "Bio is too long (max %d chars)." -msgstr "Biografin är för lång (max 140 tecken)" +msgstr "Biografin är för lång (max %d tecken)." #: actions/profilesettings.php:228 actions/siteadminpanel.php:165 msgid "Timezone not selected." -msgstr "Du har inte valt tidszon" +msgstr "Tidszon inte valt." #: actions/profilesettings.php:234 msgid "Language is too long (max 50 chars)." -msgstr "Språket är för långt(max 50 tecken)." +msgstr "Språknamn är för långt (max 50 tecken)." #: actions/profilesettings.php:246 actions/tagother.php:178 -#, fuzzy, php-format +#, php-format msgid "Invalid tag: \"%s\"" -msgstr "Ogiltig hemsideadress '%s'" +msgstr "Ogiltig tagg: \"%s\"" #: actions/profilesettings.php:295 msgid "Couldn't update user for autosubscribe." @@ -2378,9 +2377,8 @@ msgid "Couldn't save profile." msgstr "Kunde inte spara profil." #: actions/profilesettings.php:336 -#, fuzzy msgid "Couldn't save tags." -msgstr "Kunde inte spara profil." +msgstr "Kunde inte spara taggar." #: actions/profilesettings.php:344 lib/adminpanelaction.php:126 msgid "Settings saved." @@ -2389,36 +2387,32 @@ msgstr "Inställningar sparade." #: actions/public.php:83 #, php-format msgid "Beyond the page limit (%s)" -msgstr "" +msgstr "Bortom sidbegränsningen (%s)" #: actions/public.php:92 -#, fuzzy msgid "Could not retrieve public stream." -msgstr "Kunde inte ta emot favoritinläggen." +msgstr "Kunde inte hämta publik ström." #: actions/public.php:129 -#, fuzzy, php-format +#, php-format msgid "Public timeline, page %d" -msgstr "Publik tidslinje" +msgstr "Publik tidslinje, sida %d" #: actions/public.php:131 lib/publicgroupnav.php:79 msgid "Public timeline" msgstr "Publik tidslinje" #: actions/public.php:151 -#, fuzzy msgid "Public Stream Feed (RSS 1.0)" -msgstr "Publik ström" +msgstr "Publikt flöde av ström (RSS 1.0)" #: actions/public.php:155 -#, fuzzy msgid "Public Stream Feed (RSS 2.0)" -msgstr "Publik ström" +msgstr "Publikt flöde av ström (RSS 2.0)" #: actions/public.php:159 -#, fuzzy msgid "Public Stream Feed (Atom)" -msgstr "Publik ström" +msgstr "Publikt flöde av ström (Atom)" #: actions/public.php:179 #, php-format @@ -2426,16 +2420,20 @@ msgid "" "This is the public timeline for %%site.name%% but no one has posted anything " "yet." msgstr "" +"Detta är den publika tidslinjen för %%site.name%% men ingen har postat något " +"än." #: actions/public.php:182 msgid "Be the first to post!" -msgstr "" +msgstr "Bli först att posta!" #: actions/public.php:186 #, php-format msgid "" "Why not [register an account](%%action.register%%) and be the first to post!" msgstr "" +"Varför inte [registrera ett konto](%%action.register%%) och bli först att " +"posta!" #: actions/public.php:233 #, php-format @@ -2445,6 +2443,10 @@ msgid "" "tool. [Join now](%%action.register%%) to share notices about yourself with " "friends, family, and colleagues! ([Read more](%%doc.help%%))" msgstr "" +"Detta är %%site.name%%, en [mikroblogg](http://en.wikipedia.org/wiki/Micro-" +"blogging)-tjänst baserad på den fria programvaran [StatusNet](http://status." +"net/). [Gå med nu](%%action.register%%) för att dela notiser om dig själv " +"med vänner, familj och kollegor! ([Läs mer](%%doc.help%%))" #: actions/public.php:238 #, php-format @@ -2453,25 +2455,27 @@ msgid "" "blogging) service based on the Free Software [StatusNet](http://status.net/) " "tool." msgstr "" +"Detta är %%site.name%%, en [mikroblogg](http://en.wikipedia.org/wiki/Micro-" +"blogging)-tjänst baserad på den fria programvaran [StatusNet](http://status." +"net/)." #: actions/publictagcloud.php:57 -#, fuzzy msgid "Public tag cloud" -msgstr "Publik ström" +msgstr "Publikt taggmoln" #: actions/publictagcloud.php:63 #, php-format msgid "These are most popular recent tags on %s " -msgstr "" +msgstr "Dessa är de populäraste senaste taggarna på %s " #: actions/publictagcloud.php:69 #, php-format msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet." -msgstr "" +msgstr "Ingen har postat en notis med en [hashtagg](%%doc.tags%%) än." #: actions/publictagcloud.php:72 msgid "Be the first to post one!" -msgstr "" +msgstr "Bli först att posta en!" #: actions/publictagcloud.php:75 #, php-format @@ -2479,10 +2483,12 @@ msgid "" "Why not [register an account](%%action.register%%) and be the first to post " "one!" msgstr "" +"Varför inte [registrera ett konto](%%action.register%%) och bli först att " +"posta en!" #: actions/publictagcloud.php:135 msgid "Tag cloud" -msgstr "" +msgstr "Taggmoln" #: actions/recoverpassword.php:36 msgid "You are already logged in!" @@ -2490,53 +2496,56 @@ msgstr "Du är redan inloggad!" #: actions/recoverpassword.php:62 msgid "No such recovery code." -msgstr "Ingen sådan återställningskod. " +msgstr "Ingen sådan återskapningskod." #: actions/recoverpassword.php:66 msgid "Not a recovery code." -msgstr "Det är ingen kod för återställning." +msgstr "Inte en återskapningskod." #: actions/recoverpassword.php:73 msgid "Recovery code for unknown user." -msgstr "Kod för återställning av okänd användare." +msgstr "Återskapningskod för okänd användare." #: actions/recoverpassword.php:86 msgid "Error with confirmation code." -msgstr "Fel uppstog med bekräftelsekoden." +msgstr "Fel med bekräftelsekod." #: actions/recoverpassword.php:97 msgid "This confirmation code is too old. Please start again." -msgstr "Denna bekräftelsekod är för gammal. Du får starta om på nytt igen." +msgstr "Denna bekräftelsekod är för gammal. Var vänlig börja om igen." #: actions/recoverpassword.php:111 msgid "Could not update user with confirmed email address." -msgstr "Kunde inte uppdatera användaren med bekräftad emailadress." +msgstr "Kunde inte uppdatera användaren med bekräftad e-postadress." #: actions/recoverpassword.php:152 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 "" +"Om du har glömt eller förlorat ditt lösenord kan du få ett nytt skickat till " +"den e-postadress du har sparat i ditt konto." #: actions/recoverpassword.php:158 msgid "You have been identified. Enter a new password below. " -msgstr "" +msgstr "Du har blivit identifierad. Ange ett nytt lösenord nedan. " #: actions/recoverpassword.php:188 msgid "Password recovery" -msgstr "" +msgstr "Återskapande av lösenord" #: actions/recoverpassword.php:191 msgid "Nickname or email address" -msgstr "" +msgstr "Smeknamn eller e-postadress" #: actions/recoverpassword.php:193 msgid "Your nickname on this server, or your registered email address." -msgstr "Ditt användarnamn på denna server eller registrerad epost adress." +msgstr "" +"Ditt användarnamn på denna server, eller din registrerade e-postadress." #: actions/recoverpassword.php:199 actions/recoverpassword.php:200 msgid "Recover" -msgstr "Återställ" +msgstr "Återskapa" #: actions/recoverpassword.php:208 msgid "Reset password" @@ -2544,11 +2553,11 @@ msgstr "Återställ lösenord" #: actions/recoverpassword.php:209 msgid "Recover password" -msgstr "Återställ lösenord" +msgstr "Återskapa lösenord" #: actions/recoverpassword.php:210 actions/recoverpassword.php:322 msgid "Password recovery requested" -msgstr "Förfrågan om återställning av lösenord" +msgstr "Återskapande av lösenord begärd" #: actions/recoverpassword.php:213 msgid "Unknown action" @@ -2556,7 +2565,7 @@ msgstr "Okänd funktion" #: actions/recoverpassword.php:236 msgid "6 or more characters, and don't forget it!" -msgstr "Minst 6 tecken och glöm inte bort det!" +msgstr "Minst 6 tecken, och glöm inte bort det!" #: actions/recoverpassword.php:243 msgid "Reset" @@ -2564,35 +2573,35 @@ msgstr "Återställ" #: actions/recoverpassword.php:252 msgid "Enter a nickname or email address." -msgstr "Skriv in ett smeknamn eller en epostadress." +msgstr "Skriv in ett smeknamn eller en e-postadress." #: actions/recoverpassword.php:272 msgid "No user with that email address or username." -msgstr "Ingen användare med den emailadressen eller användarnamn." +msgstr "Ingen användare med den e-postadressen eller användarnamn." #: actions/recoverpassword.php:287 msgid "No registered email address for that user." -msgstr "Ingen registrerad epost adress för den användaren." +msgstr "Ingen registrerad e-postadress för den användaren." #: actions/recoverpassword.php:301 msgid "Error saving address confirmation." -msgstr "Fel uppstog när adressen skulle bekräftas." +msgstr "Fel vid sparande av adressbekräftelse." #: actions/recoverpassword.php:325 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." msgstr "" -"Instruktioner om hur du återställer ditt lösenord har sänts till din e-" -"postadress " +"Instruktioner för att återställa ditt lösenord har skickats till e-" +"postadressen som är registrerat till ditt konto " #: actions/recoverpassword.php:344 msgid "Unexpected password reset." -msgstr "Oväntad rensning av lösenord." +msgstr "Oväntad återställning av lösenord." #: actions/recoverpassword.php:352 msgid "Password must be 6 chars or more." -msgstr "Lösenordet måste vara 6 tecken eller fler." +msgstr "Lösenordet måste vara minst 6 tecken." #: actions/recoverpassword.php:356 msgid "Password and confirmation do not match." @@ -2604,20 +2613,19 @@ msgstr "Fel uppstog i användarens inställning" #: actions/recoverpassword.php:382 msgid "New password successfully saved. You are now logged in." -msgstr "Nya lösenordet har blivit sparat. Du är nu även inloggad." +msgstr "Nya lösenordet sparat. Du är nu inloggad." #: actions/register.php:85 actions/register.php:189 actions/register.php:404 msgid "Sorry, only invited people can register." -msgstr "" +msgstr "Ledsen, bara inbjudna personer kan registrera sig." #: actions/register.php:92 -#, fuzzy msgid "Sorry, invalid invitation code." -msgstr "Fel uppstog med bekräftelsekoden." +msgstr "Ledsen, ogiltig inbjudningskod." #: actions/register.php:112 msgid "Registration successful" -msgstr "Registreringen är genomförd" +msgstr "Registreringen genomförd" #: actions/register.php:114 actions/register.php:502 lib/action.php:455 #: lib/logingroupnav.php:85 @@ -2626,29 +2634,31 @@ msgstr "Registrera" #: actions/register.php:135 msgid "Registration not allowed." -msgstr "Registrering är inte möjlig." +msgstr "Registrering inte tillåten." #: actions/register.php:198 msgid "You can't register if you don't agree to the license." -msgstr "Du kan inte registrera dig om du inte godkänner licensvillkor." +msgstr "Du kan inte registrera dig om du inte godkänner licensen." #: actions/register.php:201 msgid "Not a valid email address." -msgstr "Det är ingen giltig epost adress." +msgstr "Inte en giltig e-postadress." #: actions/register.php:212 msgid "Email address already exists." -msgstr "Epostadressen finns redan." +msgstr "E-postadressen finns redan." #: actions/register.php:243 actions/register.php:264 msgid "Invalid username or password." -msgstr "Felaktigt användarnamn eller lösenord." +msgstr "Ogiltigt användarnamn eller lösenord." #: actions/register.php:342 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" +"Med detta formulär kan du skapa ett nytt konto. Du kan sedan posta notiser " +"och ansluta till vänner och kollegor. " #: actions/register.php:424 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." @@ -2658,7 +2668,7 @@ msgstr "" #: actions/register.php:429 msgid "6 or more characters. Required." -msgstr "6 eller fler tecken. Måste fyllas i." +msgstr "Minst 6 tecken. Måste fyllas i." #: actions/register.php:433 msgid "Same as password above. Required." @@ -2667,32 +2677,32 @@ msgstr "Samma som lösenordet ovan. Måste fyllas i." #: actions/register.php:437 actions/register.php:441 #: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120 msgid "Email" -msgstr "Epost" +msgstr "E-post" #: actions/register.php:438 actions/register.php:442 msgid "Used only for updates, announcements, and password recovery" msgstr "" -"Används endast för uppdateringar, annonsering och återställning av lösenord" +"Används endast för uppdateringar, tillkännagivanden och återskapande av " +"lösenord" #: actions/register.php:449 msgid "Longer name, preferably your \"real\" name" -msgstr "Långt namn, förslagsvis ditt \"riktiga\" namn" +msgstr "Längre namn, förslagsvis ditt \"verkliga\" namn" #: actions/register.php:493 msgid "My text and files are available under " -msgstr "Min text och filer finns tillgängliga under" +msgstr "Min text och mina filer är tillgängliga under " #: actions/register.php:495 msgid "Creative Commons Attribution 3.0" -msgstr "" +msgstr "Creative Commons Erkännande 3.0" #: actions/register.php:496 -#, fuzzy msgid "" " except this private data: password, email address, IM address, and phone " "number." msgstr "" -"förutom det här, som är privat: lösenord, epostadress, IM-adress, " +"med undantag av den här privata datan: lösenord, e-postadress, IM-adress, " "telefonnummer." #: actions/register.php:537 @@ -2713,28 +2723,14 @@ msgid "" "\n" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -"Grattis, %s! Välkommen till %%%%site.name%%%%. Härifrån, kanske du vill...\n" -"\n" -"* Gå till [din profil](%s) och göra ditt första inlägg.\n" -"* Lägg till en [Jabber/GTalk adress](%%%%action.imsettings%%%%) så du kan " -"skicka inlägg med en IM klient.\n" -"* [Sök efter personer](%%%%action.peoplesearch%%%%) som du kanske känner " -"eller delar dina intressen. \n" -"* Uppdatera din [profil inställning](%%%%action.profilesettings%%%%) för att " -"berätta lite mer om dig själv för andra här. \n" -"* Läs igenom [online dok](%%%%doc.help%%%%) efter funktioner som du kanske " -"missat. \n" -"\n" -"Tack för att du registrerade dig och vi hoppas du kommer trivas med denna " -"service." #: actions/register.php:561 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" msgstr "" -"(Du kommer få ett meddelande med email inom kort med instruktioner hur du " -"bekräftar din emailadress)" +"(Du kommer få ett meddelande med e-post inom kort med instruktioner hur du " +"bekräftar din e-postadress.)" #: actions/remotesubscribe.php:98 #, php-format @@ -2743,9 +2739,9 @@ msgid "" "register%%) a new account. If you already have an account on a [compatible " "microblogging site](%%doc.openmublog%%), enter your profile URL below." msgstr "" -"För att prenumerera så kan du [logga in](%%action.login%%) eller [registrera]" -"(%%action.register%%) ett nytt konto. Om du redan har ett konto på en " -"[kompatibel mikroblogg sida](%%doc.openmublog%%) fyll i din profils URL " +"För att prenumerera kan du [logga in](%%action.login%%) eller [registrera](%%" +"action.register%%) ett nytt konto. Om du redan har ett konto på en " +"[kompatibel mikrobloggwebbplats](%%doc.openmublog%%), fyll i din profils URL " "nedan." #: actions/remotesubscribe.php:112 @@ -2753,9 +2749,8 @@ msgid "Remote subscribe" msgstr "Fjärrprenumerera" #: actions/remotesubscribe.php:124 -#, fuzzy msgid "Subscribe to a remote user" -msgstr "Prenumerera på mina Twitter vänner här." +msgstr "Prenumerera på en fjärranvändare" #: actions/remotesubscribe.php:129 msgid "User nickname" @@ -2767,11 +2762,11 @@ msgstr "Smeknamnet på användaren du vill följa" #: actions/remotesubscribe.php:133 msgid "Profile URL" -msgstr "Profil URL" +msgstr "Profil-URL" #: actions/remotesubscribe.php:134 msgid "URL of your profile on another compatible microblogging service" -msgstr "URL till din profil på en annan kompatibel mikroblogg" +msgstr "URL till din profil på en annan kompatibel mikrobloggtjänst" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 #: lib/userprofile.php:365 @@ -2780,21 +2775,21 @@ msgstr "Prenumerera" #: actions/remotesubscribe.php:159 msgid "Invalid profile URL (bad format)" -msgstr "Nåt är fel med profil URL (Format fel)" +msgstr "Ogiltig profil-URL (dåligt format)" #: actions/remotesubscribe.php:168 -#, fuzzy msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)." -msgstr "Det är ingen giltig profil URL (ingen YADIS angiven)." +msgstr "" +"Inte en giltig profil-URL (inget YADIS-dokument eller ogiltig XRDS " +"definerad)." #: actions/remotesubscribe.php:176 msgid "That’s a local profile! Login to subscribe." -msgstr "" +msgstr "Det där är en lokal profil! Logga in för att prenumerera." #: actions/remotesubscribe.php:183 -#, fuzzy msgid "Couldn’t get a request token." -msgstr "Kunde inte få en förfrågan token." +msgstr "Kunde inte få en förfrågnings-token." #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 @@ -2803,24 +2798,24 @@ msgid "Replies to %s" msgstr "Svarat på %s" #: actions/replies.php:127 -#, fuzzy, php-format +#, php-format msgid "Replies to %s, page %d" -msgstr "Svarat på %s" +msgstr "Svar till %s, sida %d" #: actions/replies.php:144 -#, fuzzy, php-format +#, php-format msgid "Replies feed for %s (RSS 1.0)" -msgstr "Inlägg flöde för %s" +msgstr "Flöde med svar för %s (RSS 1.0)" #: actions/replies.php:151 -#, fuzzy, php-format +#, php-format msgid "Replies feed for %s (RSS 2.0)" -msgstr "Inlägg flöde för %s" +msgstr "Flöde med svar för %s (RSS 2.0)" #: actions/replies.php:158 -#, fuzzy, php-format +#, php-format msgid "Replies feed for %s (Atom)" -msgstr "Inlägg flöde för %s" +msgstr "Flöde med svar för %s (Atom)" #: actions/replies.php:198 #, php-format @@ -2828,6 +2823,8 @@ msgid "" "This is the timeline showing replies to %s but %s hasn't received a notice " "to his attention yet." msgstr "" +"Detta är tidslinjen som visar svar till %s men %s har inte tagit emot en " +"notis för dennes uppmärksamhet än." #: actions/replies.php:203 #, php-format @@ -2835,6 +2832,8 @@ msgid "" "You can engage other users in a conversation, subscribe to more people or " "[join groups](%%action.groups%%)." msgstr "" +"Du kan engagera andra användare i en konversation, prenumerera på fler " +"personer eller [gå med i grupper](%%action.groups%%)." #: actions/replies.php:205 #, php-format @@ -2842,45 +2841,47 @@ msgid "" "You can try to [nudge %s](../%s) or [post something to his or her attention]" "(%%%%action.newnotice%%%%?status_textarea=%s)." msgstr "" +"Du kan prova att [knuffa %s](../%s) eller [posta någonting för hans eller " +"hennes uppmärksamhet](%%%%action.newnotice%%%%?status_textarea=%s)." #: actions/repliesrss.php:72 -#, fuzzy, php-format +#, php-format msgid "Replies to %1$s on %2$s!" -msgstr "Meddelande till %1$s på %2$s" +msgstr "Svar till %1$s på %2$s" #: actions/sandbox.php:65 actions/unsandbox.php:65 #, fuzzy msgid "You cannot sandbox users on this site." -msgstr "Du kan inte skicka meddelande till den användaren." +msgstr "Du kan inte flytta användare till sandlåda på denna webbplats." #: actions/sandbox.php:72 #, fuzzy msgid "User is already sandboxed." -msgstr "Användaren har ingen profil." +msgstr "Användare är redan flyttad till sandlåda." #: actions/showfavorites.php:79 -#, fuzzy, php-format +#, php-format msgid "%s's favorite notices, page %d" -msgstr "%s favoriter" +msgstr "%ss favoritnotiser, sida %d" #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." -msgstr "Kunde inte ta emot favoritinläggen." +msgstr "Kunde inte hämta favoritnotiser." #: actions/showfavorites.php:170 #, php-format msgid "Feed for favorites of %s (RSS 1.0)" -msgstr "Flöden för $s vänner" +msgstr "Flöde för %ss favoriter (RSS 1.0)" #: actions/showfavorites.php:177 #, php-format msgid "Feed for favorites of %s (RSS 2.0)" -msgstr "Flöden för $s vänner" +msgstr "Flöde för %ss favoriter (RSS 2.0)" #: actions/showfavorites.php:184 #, php-format msgid "Feed for favorites of %s (Atom)" -msgstr "Flöden för $s vänner" +msgstr "Flöde för %ss favoriter (Atom)" #: actions/showfavorites.php:205 msgid "" @@ -2905,85 +2906,81 @@ msgstr "" #: actions/showfavorites.php:242 msgid "This is a way to share what you like." -msgstr "" +msgstr "Detta är ett sätt att dela vad du gillar." #: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" -msgstr "" +msgstr "%s grupp" #: actions/showgroup.php:84 #, php-format msgid "%s group, page %d" -msgstr "" +msgstr "%s grupp, sida %d" #: actions/showgroup.php:218 -#, fuzzy msgid "Group profile" -msgstr "Inget sådant inlägg." +msgstr "Grupprofil" #: actions/showgroup.php:263 actions/tagother.php:118 #: actions/userauthorization.php:167 lib/userprofile.php:177 msgid "URL" -msgstr "" +msgstr "URL" #: actions/showgroup.php:274 actions/tagother.php:128 #: actions/userauthorization.php:179 lib/userprofile.php:194 -#, fuzzy msgid "Note" -msgstr "Inlägg" +msgstr "Notis" #: actions/showgroup.php:284 lib/groupeditform.php:184 msgid "Aliases" -msgstr "" +msgstr "Alias" #: actions/showgroup.php:293 msgid "Group actions" -msgstr "" +msgstr "Gruppåtgärder" #: actions/showgroup.php:328 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s group (RSS 1.0)" -msgstr "Inlägg flöde för %s" +msgstr "Flöde av notiser för %s grupp (RSS 1.0)" #: actions/showgroup.php:334 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s group (RSS 2.0)" -msgstr "Inlägg flöde för %s" +msgstr "Flöde av notiser för %s grupp (RSS 2.0)" #: actions/showgroup.php:340 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s group (Atom)" -msgstr "Inlägg flöde för %s" +msgstr "Flöde av notiser för %s grupp (Atom)" #: actions/showgroup.php:345 #, php-format msgid "FOAF for %s group" -msgstr "Outbox för %s" +msgstr "FOAF för %s grupp" #: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 -#, fuzzy msgid "Members" -msgstr "Medlem sedan" +msgstr "Medlemmar" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 #: lib/tagcloudsection.php:71 msgid "(None)" -msgstr "" +msgstr "(Ingen)" #: actions/showgroup.php:392 msgid "All members" -msgstr "" +msgstr "Alla medlemmar" #: actions/showgroup.php:429 lib/profileaction.php:174 msgid "Statistics" msgstr "Statistik" #: actions/showgroup.php:432 -#, fuzzy msgid "Created" -msgstr "Skapa" +msgstr "Skapad" #: actions/showgroup.php:448 #, php-format @@ -2994,6 +2991,11 @@ msgid "" "their life and interests. [Join now](%%%%action.register%%%%) to become part " "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" +"**%s** är en användargrupp på %%%%site.name%%%%, en [mikroblogg](http://en." +"wikipedia.org/wiki/Micro-blogging)-tjänst baserad den fria programvaran " +"[StatusNet](http://status.net/). Dess medlemmar delar korta meddelande om " +"sina liv och intressen. [Gå med nu](%%%%action.register%%%%) för att bli en " +"del av denna grupp och många fler! ([Läs mer](%%%%doc.help%%%%))" #: actions/showgroup.php:454 #, php-format @@ -3003,10 +3005,14 @@ msgid "" "[StatusNet](http://status.net/) tool. Its members share short messages about " "their life and interests. " msgstr "" +"**%s** är en användargrupp på %%%%site.name%%%%, en [mikroblogg](http://en." +"wikipedia.org/wiki/Micro-blogging)-tjänst baserad den fria programvaran " +"[StatusNet](http://status.net/). Dess medlemmar delar korta meddelande om " +"sina liv och intressen. " #: actions/showgroup.php:482 msgid "Admins" -msgstr "" +msgstr "Administratörer" #: actions/showmessage.php:81 msgid "No such message." @@ -3014,7 +3020,7 @@ msgstr "Inget sådant meddelande." #: actions/showmessage.php:98 msgid "Only the sender and recipient may read this message." -msgstr "Endast den som skickat och mottagaren kan läsa detta meddelande." +msgstr "Endast avsändaren och mottagaren kan läsa detta meddelande." #: actions/showmessage.php:108 #, php-format @@ -3027,55 +3033,56 @@ msgid "Message from %1$s on %2$s" msgstr "Meddelande från %1$s på %2$s" #: actions/shownotice.php:90 -#, fuzzy msgid "Notice deleted." -msgstr "Inlägg" +msgstr "Notis borttagen." #: actions/showstream.php:73 -#, fuzzy, php-format +#, php-format msgid " tagged %s" -msgstr "Inlägg taggade med %s" +msgstr "taggade %s" #: actions/showstream.php:79 -#, fuzzy, php-format +#, php-format msgid "%s, page %d" -msgstr "Inbox för %s - sida %d" +msgstr "%s, sida %d" #: actions/showstream.php:122 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s tagged %s (RSS 1.0)" -msgstr "Inlägg flöde för %s" +msgstr "Flöde av notiser för %s taggade %s (RSS 1.0)" #: actions/showstream.php:129 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s (RSS 1.0)" -msgstr "Inlägg flöde för %s" +msgstr "Flöde av notiser för %s (RSS 1.0)" #: actions/showstream.php:136 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s (RSS 2.0)" -msgstr "Inlägg flöde för %s" +msgstr "Flöde av notiser för %s (RSS 2.0)" #: actions/showstream.php:143 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s (Atom)" -msgstr "Inlägg flöde för %s" +msgstr "Flöde av notiser för %s (Atom)" #: actions/showstream.php:148 -#, fuzzy, php-format +#, php-format msgid "FOAF for %s" -msgstr "Outbox för %s" +msgstr "FOAF för %s" #: actions/showstream.php:191 #, php-format msgid "This is the timeline for %s but %s hasn't posted anything yet." -msgstr "" +msgstr "Detta är tidslinjen för %s men %s har inte postat något än." #: actions/showstream.php:196 msgid "" "Seen anything interesting recently? You haven't posted any notices yet, now " "would be a good time to start :)" msgstr "" +"Sett något intressant nyligen? Du har inte postat några notiser än. Varför " +"inte börja nu?" #: actions/showstream.php:198 #, php-format @@ -3083,6 +3090,8 @@ msgid "" "You can try to nudge %s or [post something to his or her attention](%%%%" "action.newnotice%%%%?status_textarea=%s)." msgstr "" +"Du kan prova att knuffa %s eller [posta något för hans eller hennes " +"uppmärksamhet](%%%%action.newnotice%%%%?status_textarea=%s)." #: actions/showstream.php:234 #, php-format @@ -3092,6 +3101,10 @@ msgid "" "[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to " "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" +"**%s** har ett konto på %%%%site.name%%%%, en [mikroblogg](http://en." +"wikipedia.org/wiki/Micro-blogging)-tjänst baserad på den fria programvaran " +"[StatusNet](http://status.net/). [Gå med nu](%%%%action.register%%%%) för " +"att följa **%s**s notiser och många fler! ([Läs mer](%%%%doc.help%%%%))" #: actions/showstream.php:239 #, php-format @@ -3100,171 +3113,164 @@ msgid "" "wikipedia.org/wiki/Micro-blogging) service based on the Free Software " "[StatusNet](http://status.net/) tool. " msgstr "" +"**%s** har ett konto på %%%%site.name%%%%, en [mikroblogg](http://en." +"wikipedia.org/wiki/Micro-blogging)-tjänst baserad på den fria programvaran " +"[StatusNet](http://status.net/). " #: actions/silence.php:65 actions/unsilence.php:65 -#, fuzzy msgid "You cannot silence users on this site." -msgstr "Du kan inte skicka meddelande till den användaren." +msgstr "Du kan inte tysta ned användare på denna webbplats." #: actions/silence.php:72 -#, fuzzy msgid "User is already silenced." -msgstr "Användaren har ingen profil." +msgstr "Användaren är redan nedtystad." #: actions/siteadminpanel.php:69 msgid "Basic settings for this StatusNet site." -msgstr "" +msgstr "Grundinställningar för din StatusNet-webbplats" #: actions/siteadminpanel.php:147 msgid "Site name must have non-zero length." -msgstr "" +msgstr "Webbplatsnamnet måste vara minst ett tecken långt." #: actions/siteadminpanel.php:155 -#, fuzzy msgid "You must have a valid contact email address" -msgstr "Ingen giltig emailadress" +msgstr "Du måste ha en giltig kontakte-postadress" #: actions/siteadminpanel.php:173 #, php-format msgid "Unknown language \"%s\"" -msgstr "" +msgstr "Okänt språk \"%s\"" #: actions/siteadminpanel.php:180 msgid "Invalid snapshot report URL." -msgstr "" +msgstr "Ogiltig rapport-URL för ögonblicksbild" #: actions/siteadminpanel.php:186 msgid "Invalid snapshot run value." -msgstr "" +msgstr "Ogiltigt körvärde för ögonblicksbild." #: actions/siteadminpanel.php:192 msgid "Snapshot frequency must be a number." -msgstr "" +msgstr "Frekvens för ögonblicksbilder måste vara ett nummer." #: actions/siteadminpanel.php:199 msgid "You must set an SSL server when enabling SSL." -msgstr "" +msgstr "Du måste ange en SSL-server när du aktiverar SSL." #: actions/siteadminpanel.php:204 msgid "Invalid SSL server. The maximum length is 255 characters." -msgstr "" +msgstr "Ogiltigt SSL-servernamn. Den maximala längden är 255 tecken." #: actions/siteadminpanel.php:210 msgid "Minimum text limit is 140 characters." -msgstr "" +msgstr "Minsta textbegränsning är 140 tecken." #: actions/siteadminpanel.php:216 msgid "Dupe limit must 1 or more seconds." -msgstr "" +msgstr "Begränsning av duplikat måste vara en eller fler sekuner." #: actions/siteadminpanel.php:266 msgid "General" -msgstr "" +msgstr "Allmänt" #: actions/siteadminpanel.php:269 -#, fuzzy msgid "Site name" -msgstr "Nytt inlägg" +msgstr "Webbplatsnamn" #: actions/siteadminpanel.php:270 msgid "The name of your site, like \"Yourcompany Microblog\"" -msgstr "" +msgstr "Namnet på din webbplats, t.ex. \"Företagsnamn mikroblogg\"" #: actions/siteadminpanel.php:274 msgid "Brought by" -msgstr "" +msgstr "Tillhandahållen av" #: actions/siteadminpanel.php:275 msgid "Text used for credits link in footer of each page" -msgstr "" +msgstr "Text som används för tillskrivningslänkar i sidfoten på varje sida." #: actions/siteadminpanel.php:279 msgid "Brought by URL" -msgstr "" +msgstr "Tillhandahållen av URL" #: actions/siteadminpanel.php:280 msgid "URL used for credits link in footer of each page" -msgstr "" +msgstr "URL som används för tillskrivningslänkar i sidfoten på varje sida" #: actions/siteadminpanel.php:284 -#, fuzzy msgid "Contact email address for your site" -msgstr "Ny emailadress för att skicka till %s" +msgstr "Kontakte-postadress för din webbplats" #: actions/siteadminpanel.php:290 -#, fuzzy msgid "Local" -msgstr "Plats" +msgstr "Lokal" #: actions/siteadminpanel.php:301 msgid "Default timezone" -msgstr "" +msgstr "Standardtidszon" #: actions/siteadminpanel.php:302 msgid "Default timezone for the site; usually UTC." -msgstr "" +msgstr "Standardtidzon för denna webbplats; vanligtvis UTC." #: actions/siteadminpanel.php:308 -#, fuzzy msgid "Default site language" -msgstr "Språkval" +msgstr "Webbplatsens standardspråk" #: actions/siteadminpanel.php:316 msgid "URLs" -msgstr "" +msgstr "URL:er" #: actions/siteadminpanel.php:319 -#, fuzzy msgid "Server" -msgstr "Återställ" +msgstr "Server" #: actions/siteadminpanel.php:319 msgid "Site's server hostname." -msgstr "" +msgstr "Värdnamn för webbplatsens server." #: actions/siteadminpanel.php:323 msgid "Fancy URLs" -msgstr "" +msgstr "Utsmyckade URL:er" #: actions/siteadminpanel.php:325 msgid "Use fancy (more readable and memorable) URLs?" msgstr "" +"Skall utsmyckade URL:er användas (mer läsbara och lättare att komma ihåg)?" #: actions/siteadminpanel.php:331 -#, fuzzy msgid "Access" -msgstr "Acceptera" +msgstr "Åtkomst" #: actions/siteadminpanel.php:334 -#, fuzzy msgid "Private" -msgstr "Sekretesspolicy" +msgstr "Privat" #: actions/siteadminpanel.php:336 msgid "Prohibit anonymous users (not logged in) from viewing site?" msgstr "" +"Skall anonyma användare (inte inloggade) förhindras från att se webbplatsen?" #: actions/siteadminpanel.php:340 -#, fuzzy msgid "Invite only" -msgstr "Bjud in" +msgstr "Endast inbjudan" #: actions/siteadminpanel.php:342 msgid "Make registration invitation only." -msgstr "" +msgstr "Gör så att registrering endast sker genom inbjudan." #: actions/siteadminpanel.php:346 -#, fuzzy msgid "Closed" -msgstr "Ingen sådan användare" +msgstr "Stängd" #: actions/siteadminpanel.php:348 msgid "Disable new registrations." -msgstr "" +msgstr "Inaktivera nya registreringar." #: actions/siteadminpanel.php:354 msgid "Snapshots" -msgstr "" +msgstr "Ögonblicksbild" #: actions/siteadminpanel.php:357 msgid "Randomly during Web hit" @@ -3272,113 +3278,109 @@ msgstr "" #: actions/siteadminpanel.php:358 msgid "In a scheduled job" -msgstr "" +msgstr "I ett schemalagt jobb" #: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383 -#, fuzzy msgid "Never" -msgstr "Återställ" +msgstr "Aldrig" #: actions/siteadminpanel.php:360 msgid "Data snapshots" -msgstr "" +msgstr "Ögonblicksbild av data" #: actions/siteadminpanel.php:361 msgid "When to send statistical data to status.net servers" -msgstr "" +msgstr "När statistikdata skall skickas till status.net-servrar" #: actions/siteadminpanel.php:366 msgid "Frequency" -msgstr "" +msgstr "Frekvens" #: actions/siteadminpanel.php:367 msgid "Snapshots will be sent once every N web hits" -msgstr "" +msgstr "Ögonblicksbild kommer skickas var N:te webbträff" #: actions/siteadminpanel.php:372 msgid "Report URL" -msgstr "" +msgstr "Rapport-URL" #: actions/siteadminpanel.php:373 msgid "Snapshots will be sent to this URL" -msgstr "" +msgstr "Ögonblicksbild kommer skickat till denna URL" #: actions/siteadminpanel.php:380 -#, fuzzy msgid "SSL" -msgstr "SMS" +msgstr "SSL" #: actions/siteadminpanel.php:384 -#, fuzzy msgid "Sometimes" -msgstr "Inlägg" +msgstr "Ibland" #: actions/siteadminpanel.php:385 msgid "Always" -msgstr "" +msgstr "Alltid" #: actions/siteadminpanel.php:387 msgid "Use SSL" -msgstr "" +msgstr "Använd SSL" #: actions/siteadminpanel.php:388 msgid "When to use SSL" -msgstr "" +msgstr "När SSL skall användas" #: actions/siteadminpanel.php:393 msgid "SSL Server" -msgstr "" +msgstr "SSL-server" #: actions/siteadminpanel.php:394 msgid "Server to direct SSL requests to" -msgstr "" +msgstr "Server att dirigera SSL-förfrågningar till" #: actions/siteadminpanel.php:400 msgid "Limits" -msgstr "" +msgstr "Begränsningar" #: actions/siteadminpanel.php:403 msgid "Text limit" -msgstr "" +msgstr "Textbegränsning" #: actions/siteadminpanel.php:403 msgid "Maximum number of characters for notices." -msgstr "" +msgstr "Maximala antalet tecken för notiser." #: actions/siteadminpanel.php:407 msgid "Dupe limit" -msgstr "" +msgstr "Duplikatbegränsning" #: actions/siteadminpanel.php:407 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" +"Hur länge användare måste vänta (i sekunder) för att posta samma sak igen." #: actions/siteadminpanel.php:421 actions/useradminpanel.php:313 -#, fuzzy msgid "Save site settings" -msgstr "Twitter inställningar" +msgstr "Spara webbplatsinställningar" #: actions/smssettings.php:58 msgid "SMS Settings" -msgstr "SMS Inställningar" +msgstr "SMS-inställningar" #: actions/smssettings.php:69 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." -msgstr "Du kan ta emot SMS meddelande via email från %%site.name%%." +msgstr "Du kan ta emot SMS-meddelande genom e-post från %%site.name%%." #: actions/smssettings.php:91 -#, fuzzy msgid "SMS is not available." -msgstr "Denna sida är inte tillgänglig i den mediatyp du accepterat" +msgstr "SMS är inte tillgängligt." #: actions/smssettings.php:112 msgid "Current confirmed SMS-enabled phone number." -msgstr "Nuvarande bekäftat SMS telefonnummer" +msgstr "Nuvarande bekäftat telefonnummer för SMS." #: actions/smssettings.php:123 msgid "Awaiting confirmation on this phone number." -msgstr "Väntar bekräftelse på detta telefonnummer. " +msgstr "Väntar bekräftelse för detta telefonnummer." #: actions/smssettings.php:130 msgid "Confirmation code" @@ -3390,7 +3392,7 @@ msgstr "Fyll i koden du mottog i din telefon." #: actions/smssettings.php:138 msgid "SMS Phone number" -msgstr "SMS Telefonnummer" +msgstr "Telefonnummer för SMS" #: actions/smssettings.php:140 msgid "Phone number, no punctuation or spaces, with area code" @@ -3401,7 +3403,7 @@ msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." msgstr "" -"Skicka inlägg till mig via SMS; Jag är införstådd att min operatör kan " +"Skicka notiser till mig via SMS. Jag är införstådd med att min operatör kan " "debitera mig." #: actions/smssettings.php:306 @@ -3414,34 +3416,31 @@ msgstr "Ingen operatör vald." #: actions/smssettings.php:318 msgid "That is already your phone number." -msgstr "Det är redan ditt telefonnummer." +msgstr "Detta är redan ditt telefonnummer." #: actions/smssettings.php:321 msgid "That phone number already belongs to another user." -msgstr "Det numret tillhör en annan användare." +msgstr "Detta telefonnumr tillhör redan en annan användare." #: actions/smssettings.php:347 -#, fuzzy msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." msgstr "" -"En bekräftelsekod har skickats ut till telefonnumret du fyllde i. " -"Kontrollera din inbox (och spamlådan!) efter kod och instruktioner hur du " -"använder den." +"En bekräftelsekod skickades till det telefonnummer du lagt till. Kontrollera " +"din telefon för koden och instruktioner om hur du använder den." #: actions/smssettings.php:374 msgid "That is the wrong confirmation number." -msgstr "Det är fel nummer i bekräftelsen" +msgstr "Detta är fel bekräftelsenummer." #: actions/smssettings.php:405 msgid "That is not your phone number." -msgstr "Det är inte ditt telefonnummer." +msgstr "Detta är inte ditt telefonnummer." #: actions/smssettings.php:465 -#, fuzzy msgid "Mobile carrier" -msgstr "Välj en operatör" +msgstr "Mobiloperatör" #: actions/smssettings.php:469 msgid "Select a carrier" @@ -3453,63 +3452,61 @@ msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " "email but isn't listed here, send email to let us know at %s." msgstr "" -"Mobiloperatör för din telefon. Vet du nån operatör som kan taemot SMS över " -"email som inte finns med i listan, skicka ett email till oss och tala det " -"hit %s" +"Mobiloperatör för din telefon. Känner du till en operatör som kan ta emot " +"SMS via e-post men som inte finns med i listan, skicka ett e-post till oss " +"på %s och berätta." #: actions/smssettings.php:498 msgid "No code entered" -msgstr "Ingen kod är ifylld" +msgstr "Ingen kod ifylld" #: actions/subedit.php:70 -#, fuzzy msgid "You are not subscribed to that profile." -msgstr "Du skickade inte oss den profilen" +msgstr "Du är inte prenumerat hos den profilen." #: actions/subedit.php:83 -#, fuzzy msgid "Could not save subscription." -msgstr "Kunde inte skapa prenumeration." +msgstr "Kunde inte spara prenumeration." #: actions/subscribe.php:55 -#, fuzzy msgid "Not a local user." -msgstr "Ingen sådan användare" +msgstr "Inte en lokal användare." #: actions/subscribe.php:69 -#, fuzzy msgid "Subscribed" -msgstr "Prenumerera" +msgstr "Prenumerant" #: actions/subscribers.php:50 -#, fuzzy, php-format +#, php-format msgid "%s subscribers" -msgstr "Prenumerant" +msgstr "%s prenumeranter" #: actions/subscribers.php:52 #, php-format msgid "%s subscribers, page %d" -msgstr "" +msgstr "%s prenumeranter, sida %d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." -msgstr "Dessa personer är dom som lyssnar på dina inlägg." +msgstr "Det är dessa personer som lyssnar på dina notiser." #: actions/subscribers.php:67 #, php-format msgid "These are the people who listen to %s's notices." -msgstr "Dessa personer är dom som lyssnar på %s inlägg." +msgstr "Det är dessa personer som lyssnar på %ss notiser." #: actions/subscribers.php:108 msgid "" "You have no subscribers. Try subscribing to people you know and they might " "return the favor" msgstr "" +"Du har inga prenumeranter. Prova att prenumerera på personer du känner och " +"de kommer kanske återgälda tjänsten" #: actions/subscribers.php:110 #, php-format msgid "%s has no subscribers. Want to be the first?" -msgstr "" +msgstr "%s har inte några prenumeranter. Vill du bli först?" #: actions/subscribers.php:114 #, php-format @@ -3517,25 +3514,27 @@ msgid "" "%s has no subscribers. Why not [register an account](%%%%action.register%%%" "%) and be the first?" msgstr "" +"%s har inte några prenumeranter. Varför inte [registrera ett konto](%%%%" +"action.register%%%%) och bli först?" #: actions/subscriptions.php:52 -#, fuzzy, php-format +#, php-format msgid "%s subscriptions" -msgstr "Alla prenumerationer" +msgstr "%s prenumerationer" #: actions/subscriptions.php:54 -#, fuzzy, php-format +#, php-format msgid "%s subscriptions, page %d" -msgstr "Alla prenumerationer" +msgstr "%s prenumerationer, sida %d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." -msgstr "Detta är personer och inlägg som du lyssnar på." +msgstr "Dessa är de personer vars notiser du lyssnar på." #: actions/subscriptions.php:69 #, php-format msgid "These are the people whose notices %s listens to." -msgstr "Detta är personer och inlägg som %s lyssnar på." +msgstr "Dessa är de personer vars notiser %s lyssnar på." #: actions/subscriptions.php:121 #, php-format @@ -3548,153 +3547,148 @@ msgid "" msgstr "" #: actions/subscriptions.php:123 actions/subscriptions.php:127 -#, fuzzy, php-format +#, php-format msgid "%s is not listening to anyone." -msgstr "%1$s lyssnar nu på dina meddelanden i %2$s." +msgstr "%s lyssnar inte på någon." #: actions/subscriptions.php:194 -#, fuzzy msgid "Jabber" -msgstr "Inget Jabber ID." +msgstr "Jabber" #: actions/subscriptions.php:199 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "SMS" #: actions/tagother.php:33 -#, fuzzy msgid "Not logged in" -msgstr "Inte inloggad." +msgstr "Inte inloggad" #: actions/tagother.php:39 -#, fuzzy msgid "No id argument." -msgstr "Inget sådant dokument." +msgstr "Inget ID-argument." #: actions/tagother.php:65 -#, fuzzy, php-format +#, php-format msgid "Tag %s" -msgstr "Taggar" +msgstr "Tagg %s" #: actions/tagother.php:77 lib/userprofile.php:75 -#, fuzzy msgid "User profile" -msgstr "Användaren har ingen profil." +msgstr "Användarprofil" #: actions/tagother.php:81 lib/userprofile.php:102 msgid "Photo" -msgstr "" +msgstr "Foto" #: actions/tagother.php:141 -#, fuzzy msgid "Tag user" -msgstr "Taggar" +msgstr "Tagga användare" #: actions/tagother.php:151 msgid "" "Tags for this user (letters, numbers, -, ., and _), comma- or space- " "separated" msgstr "" +"Taggar för denna användare (bokstäver, nummer, -, ., och _), separerade med " +"kommatecken eller mellanslag" #: actions/tagother.php:193 msgid "" "You can only tag people you are subscribed to or who are subscribed to you." msgstr "" +"Du kan bara tagga personer du prenumererar på eller som prenumererar på dig." #: actions/tagother.php:200 -#, fuzzy msgid "Could not save tags." -msgstr "Kunde inte spara informationen om användarbild" +msgstr "Kunde inte spara taggar." #: actions/tagother.php:236 msgid "Use this form to add tags to your subscribers or subscriptions." msgstr "" +"Använd detta formulär för att lägga till taggar till dina prenumeranter " +"eller prenumerationer." #: actions/tag.php:68 -#, fuzzy, php-format +#, php-format msgid "Notices tagged with %s, page %d" -msgstr "Inlägg taggade med %s" +msgstr "Notiser taggade med %s, sida %d" #: actions/tag.php:86 -#, fuzzy, php-format +#, php-format msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "Inlägg flöde för %s" +msgstr "Flöde av notiser för tagg %s (RSS 1.0)" #: actions/tag.php:92 -#, fuzzy, php-format +#, php-format msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "Inlägg flöde för %s" +msgstr "Flöde av notiser för tagg %s (RSS 2.0)" #: actions/tag.php:98 -#, fuzzy, php-format +#, php-format msgid "Notice feed for tag %s (Atom)" -msgstr "Inlägg flöde för %s" +msgstr "Flöde av notiser för tagg %s (Atom)" #: actions/tagrss.php:35 -#, fuzzy msgid "No such tag." -msgstr "Inget sådant meddelande." +msgstr "Ingen sådan tagg." #: actions/twitapitrends.php:87 msgid "API method under construction." msgstr "API-metoden är under uppbyggnad." #: actions/unblock.php:59 -#, fuzzy msgid "You haven't blocked that user." -msgstr "Du prenumererar redan på dessa användare:" +msgstr "Du har inte blockerat denna användared." #: actions/unsandbox.php:72 #, fuzzy msgid "User is not sandboxed." -msgstr "Användaren har ingen profil." +msgstr "Användare är inte flyttad till sandlåda." #: actions/unsilence.php:72 -#, fuzzy msgid "User is not silenced." -msgstr "Användaren har ingen profil." +msgstr "Användare är inte nedtystad." #: actions/unsubscribe.php:77 -#, fuzzy msgid "No profile id in request." -msgstr "Ingen profil URL lämnades ut av servern." +msgstr "Ingen profil-ID i begäran." #: actions/unsubscribe.php:84 -#, fuzzy msgid "No profile with that id." -msgstr "Ingen status hittad med det ID" +msgstr "Ingen profil med det ID:t." #: actions/unsubscribe.php:98 -#, fuzzy msgid "Unsubscribed" -msgstr "Lämnar pren." +msgstr "Prenumeration avslutad" #: actions/updateprofile.php:62 actions/userauthorization.php:330 #, php-format msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." msgstr "" +"Licensen för lyssnarströmmen '%s' är inte förenlig med webbplatslicensen '%" +"s'." #: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 #: lib/personalgroupnav.php:115 msgid "User" -msgstr "" +msgstr "Användare" #: actions/useradminpanel.php:69 msgid "User settings for this StatusNet site." -msgstr "" +msgstr "Användarinställningar för denna StatusNet-webbplats" #: actions/useradminpanel.php:149 msgid "Invalid bio limit. Must be numeric." -msgstr "" +msgstr "Ogiltig begränsning av biografi. Måste vara numerisk." #: actions/useradminpanel.php:155 msgid "Invalid welcome text. Max length is 255 characters." -msgstr "" +msgstr "Ogiltig välkomsttext. Maximal längd är 255 tecken." #: actions/useradminpanel.php:165 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." -msgstr "" +msgstr "Ogiltig standardprenumeration: '%1$s' är inte användare." #: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 @@ -3703,89 +3697,83 @@ msgstr "Profil" #: actions/useradminpanel.php:222 msgid "Bio Limit" -msgstr "" +msgstr "Begränsning av biografi" #: actions/useradminpanel.php:223 msgid "Maximum length of a profile bio in characters." -msgstr "" +msgstr "Maximal teckenlängd av profilbiografi." #: actions/useradminpanel.php:231 -#, fuzzy msgid "New users" -msgstr "Bjud in nya användare" +msgstr "Nya användare" #: actions/useradminpanel.php:235 msgid "New user welcome" -msgstr "" +msgstr "Välkomnande av ny användare" #: actions/useradminpanel.php:236 msgid "Welcome text for new users (Max 255 chars)." -msgstr "" +msgstr "Välkomsttext för nya användare (max 255 tecken)." #: actions/useradminpanel.php:241 -#, fuzzy msgid "Default subscription" -msgstr "Alla prenumerationer" +msgstr "Standardprenumerationer" #: actions/useradminpanel.php:242 -#, fuzzy msgid "Automatically subscribe new users to this user." msgstr "" -"Automatisk prenummeration på den som prenumererar på mig. (Bäst för icke " -"mänsklig användare) " +"Lägg automatiskt till en prenumeration på denna användare för alla nya " +"användare." #: actions/useradminpanel.php:251 -#, fuzzy msgid "Invitations" -msgstr "Inbjudan(ar) skickad" +msgstr "Inbjudningar" #: actions/useradminpanel.php:256 -#, fuzzy msgid "Invitations enabled" -msgstr "Inbjudan(ar) skickad" +msgstr "Inbjudningar aktiverade" #: actions/useradminpanel.php:258 msgid "Whether to allow users to invite new users." -msgstr "" +msgstr "Hurvida användare skall tillåtas bjuda in nya användare." #: actions/useradminpanel.php:265 msgid "Sessions" -msgstr "" +msgstr "Sessioner" #: actions/useradminpanel.php:270 msgid "Handle sessions" -msgstr "" +msgstr "Hantera sessioner" #: actions/useradminpanel.php:272 msgid "Whether to handle sessions ourselves." -msgstr "" +msgstr "Hurvida sessioner skall hanteras av oss själva." #: actions/useradminpanel.php:276 msgid "Session debugging" -msgstr "" +msgstr "Sessionsfelsökning" #: actions/useradminpanel.php:278 msgid "Turn on debugging output for sessions." -msgstr "" +msgstr "Sätt på felsökningsutdata för sessioner." #: actions/userauthorization.php:105 msgid "Authorize subscription" -msgstr "Tillåt prenumeration." +msgstr "Godkänn prenumeration" #: actions/userauthorization.php:110 -#, fuzzy msgid "" "Please check these details to make sure that you want to subscribe to this " "user’s notices. If you didn’t just ask to subscribe to someone’s notices, " "click “Reject”." msgstr "" -"Kontrollera dessa detajer noga så att du verkligen vet att du vill " -"prenumerera på denna användares inlägg. Om du inte frågade efter att " -"prenumerera på någons inlägg, klicka på \"Cancel\"" +"Vänligen kontrollera dessa uppgifter för att försäkra dig om att du vill " +"prenumerera på den här användarens notiser. Om du inte bett att prenumerera " +"på någons meddelanden, klicka på \"Avvisa\"." #: actions/userauthorization.php:188 msgid "License" -msgstr "" +msgstr "Licens" #: actions/userauthorization.php:209 msgid "Accept" @@ -3793,101 +3781,98 @@ msgstr "Acceptera" #: actions/userauthorization.php:210 lib/subscribeform.php:115 #: lib/subscribeform.php:139 -#, fuzzy msgid "Subscribe to this user" -msgstr "Prenumerera på mina Twitter vänner här." +msgstr "Prenumerera på denna användare" #: actions/userauthorization.php:211 msgid "Reject" msgstr "Avvisa" #: actions/userauthorization.php:212 -#, fuzzy msgid "Reject this subscription" -msgstr "Alla prenumerationer" +msgstr "Avvisa denna prenumeration" #: actions/userauthorization.php:225 msgid "No authorization request!" -msgstr "Ingen rättighet förfrågan!" +msgstr "Ingen auktoriseringsförfrågan!" #: actions/userauthorization.php:247 msgid "Subscription authorized" -msgstr "Prenumeration accepterad" +msgstr "Prenumeration godkänd" #: actions/userauthorization.php:249 -#, fuzzy msgid "" "The subscription has been authorized, but no callback URL was passed. Check " "with the site’s instructions for details on how to authorize the " "subscription. Your subscription token is:" msgstr "" "Prenumerationen har blivit bekräftad, men ingen URL har gått igenom. Kolla " -"med sidans instruktioner hur du bekräftar en prenumeration. Din " -"prenumerering token är:" +"med webbplatsens instruktioner hur du bekräftar en prenumeration. Din " +"prenumerations-token är:" #: actions/userauthorization.php:259 msgid "Subscription rejected" msgstr "Prenumeration avvisad" #: actions/userauthorization.php:261 -#, fuzzy msgid "" "The subscription has been rejected, but no callback URL was passed. Check " "with the site’s instructions for details on how to fully reject the " "subscription." msgstr "" -"Prenumerationen har blivit avvisad, men inga URL har gått igenom. Kolla med " -"sidans instruktioner hur du avvisar en prenumeration." +"Prenumerationen har blivit avvisad, men ingen URL har gått igenom. Kolla med " +"webbplatsens instruktioner för detaljer om hur du fullständingt avvisar " +"prenumerationen." #: actions/userauthorization.php:296 #, php-format msgid "Listener URI ‘%s’ not found here" -msgstr "" +msgstr "Lyssnar-URI '%s' hittades inte här" #: actions/userauthorization.php:301 #, php-format msgid "Listenee URI ‘%s’ is too long." -msgstr "" +msgstr "Lyssnar-URI '%s' är för lång." #: actions/userauthorization.php:307 #, php-format msgid "Listenee URI ‘%s’ is a local user." -msgstr "" +msgstr "Lyssnar-URI '%s' är en lokal användare." #: actions/userauthorization.php:322 #, php-format msgid "Profile URL ‘%s’ is for a local user." -msgstr "" +msgstr "Profil-URL ‘%s’ är för en lokal användare." #: actions/userauthorization.php:338 #, php-format msgid "Avatar URL ‘%s’ is not valid." -msgstr "" +msgstr "Avatar-URL ‘%s’ är inte giltig." #: actions/userauthorization.php:343 -#, fuzzy, php-format +#, php-format msgid "Can’t read avatar URL ‘%s’." -msgstr "Kan inte läsa användarbild URL '%s'" +msgstr "Kan inte läsa avatar-URL '%s'." #: actions/userauthorization.php:348 -#, fuzzy, php-format +#, php-format msgid "Wrong image type for avatar URL ‘%s’." -msgstr "Fel filtyp för bild '%s'" +msgstr "Fel bildtyp för avatar-URL '%s'." #: actions/userbyid.php:70 msgid "No id." -msgstr "Inget id." +msgstr "Ingen ID." #: actions/userdesignsettings.php:76 lib/designsettings.php:65 -#, fuzzy msgid "Profile design" -msgstr "Profil inställningar" +msgstr "Profilutseende" #: actions/userdesignsettings.php:87 lib/designsettings.php:76 msgid "" "Customize the way your profile looks with a background image and a colour " "palette of your choice." msgstr "" +"Anpassa hur din profil ser ut genom att välja bakgrundbild och färgpalett." #: actions/userdesignsettings.php:282 msgid "Enjoy your hotdog!" @@ -3896,21 +3881,22 @@ msgstr "" #: actions/usergroups.php:64 #, php-format msgid "%s groups, page %d" -msgstr "" +msgstr "%s grupper, sida %d" #: actions/usergroups.php:130 msgid "Search for more groups" -msgstr "" +msgstr "Sök efter fler grupper" #: actions/usergroups.php:153 -#, fuzzy, php-format +#, php-format msgid "%s is not a member of any group." -msgstr "Du skickade inte oss den profilen" +msgstr "%s är inte en medlem i någon grupp." #: actions/usergroups.php:158 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" +"Prova att [söka efter grupper](%%action.groupsearch%%) och gå med i dem." #: classes/File.php:137 #, php-format @@ -3918,91 +3904,92 @@ msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" +"Inga filer får vara större än %d byte och filen du skickade var %d byte. " +"Prova att ladda upp en mindre version." #: classes/File.php:147 #, php-format msgid "A file this large would exceed your user quota of %d bytes." -msgstr "" +msgstr "En så här stor fil skulle överskrida din användarkvot på %d byte." #: classes/File.php:154 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." -msgstr "" +msgstr "En sådan här stor fil skulle överskrida din månatliga kvot på %d byte." #: classes/Message.php:45 msgid "You are banned from sending direct messages." -msgstr "" +msgstr "Du är utestängd från att skicka direktmeddelanden." #: classes/Message.php:61 msgid "Could not insert message." -msgstr "" +msgstr "Kunde inte infoga meddelande." #: classes/Message.php:71 msgid "Could not update message with new URI." -msgstr "" +msgstr "Kunde inte uppdatera meddelande med ny URI." #: classes/Notice.php:164 #, php-format msgid "DB error inserting hashtag: %s" -msgstr "DB error vid infog av hashtag: %s" +msgstr "Databasfel vid infogning av hashtag: %s" #: classes/Notice.php:179 -#, fuzzy msgid "Problem saving notice. Too long." -msgstr "Det var ett problem när inlägget sparades." +msgstr "Problem vid sparande av notis. För långt." #: classes/Notice.php:183 -#, fuzzy msgid "Problem saving notice. Unknown user." -msgstr "Det var ett problem när inlägget sparades." +msgstr "Problem vid sparande av notis. Okänd användare." #: classes/Notice.php:188 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" +"För många notiser för snabbt; ta en vilopaus och posta igen om ett par " +"minuter." #: classes/Notice.php:194 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" +"För många duplicerade meddelanden för snabbt; ta en vilopaus och posta igen " +"om ett par minuter." #: classes/Notice.php:200 msgid "You are banned from posting notices on this site." -msgstr "" +msgstr "Du är utestängd från att posta notiser på denna webbplats." #: classes/Notice.php:265 classes/Notice.php:290 msgid "Problem saving notice." -msgstr "Det var ett problem när inlägget sparades." +msgstr "Problem med att spara notis." #: classes/Notice.php:1124 #, php-format msgid "DB error inserting reply: %s" -msgstr "Databasfel för svar: %s" +msgstr "Databasfel vid infogning av svar: %s" #: classes/User_group.php:380 -#, fuzzy msgid "Could not create group." -msgstr "Kunde inte skapa favorit." +msgstr "Kunde inte skapa grupp." #: classes/User_group.php:409 -#, fuzzy msgid "Could not set group membership." -msgstr "Kunde inte skapa prenumeration." +msgstr "Kunde inte ställa in gruppmedlemskap." #: classes/User.php:347 -#, fuzzy, php-format +#, php-format msgid "Welcome to %1$s, @%2$s!" -msgstr "Meddelande till %1$s på %2$s" +msgstr "Välkommen till %1$s, @%2$s!" #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Ändra dina profilinställningar" #: lib/accountsettingsaction.php:112 -#, fuzzy msgid "Upload an avatar" -msgstr "Uppdatering av profilbild misslyckades." +msgstr "Ladda upp en avatar" #: lib/accountsettingsaction.php:116 msgid "Change your password" @@ -4010,33 +3997,32 @@ msgstr "Ändra ditt lösenord" #: lib/accountsettingsaction.php:120 msgid "Change email handling" -msgstr "Ändra email hantering" +msgstr "Ändra e-posthantering" #: lib/accountsettingsaction.php:124 -#, fuzzy msgid "Design your profile" -msgstr "Användaren har ingen profil." +msgstr "Designa din profil" #: lib/accountsettingsaction.php:128 msgid "Other" -msgstr "" +msgstr "Övrigt" #: lib/accountsettingsaction.php:128 msgid "Other options" -msgstr "" +msgstr "Övriga alternativ" #: lib/action.php:144 -#, fuzzy, php-format +#, php-format msgid "%s - %s" -msgstr "%s(%s)" +msgstr "%s - %s" #: lib/action.php:159 msgid "Untitled page" -msgstr "" +msgstr "Namnlös sida" #: lib/action.php:425 msgid "Primary site navigation" -msgstr "" +msgstr "Primär webbplatsnavigation" #: lib/action.php:431 msgid "Home" @@ -4044,42 +4030,36 @@ msgstr "Hem" #: lib/action.php:431 msgid "Personal profile and friends timeline" -msgstr "" +msgstr "Personlig profil och vänners tidslinje" #: lib/action.php:433 -#, fuzzy msgid "Account" -msgstr "Om" +msgstr "Konto" #: lib/action.php:433 -#, fuzzy msgid "Change your email, avatar, password, profile" -msgstr "Ändra ditt lösenord" +msgstr "Ändra din e-post, avatar, lösenord, profil" #: lib/action.php:436 msgid "Connect" msgstr "Anslut" #: lib/action.php:436 -#, fuzzy msgid "Connect to services" -msgstr "Kunde inte skicka vidare till servern: %s" +msgstr "Anslut till tjänster" #: lib/action.php:440 -#, fuzzy msgid "Change site configuration" -msgstr "Prenumerationer" +msgstr "Ändra webbplatskonfiguration" #: lib/action.php:444 lib/subgroupnav.php:105 msgid "Invite" msgstr "Bjud in" #: lib/action.php:445 lib/subgroupnav.php:106 -#, fuzzy, php-format +#, php-format msgid "Invite friends and colleagues to join you on %s" -msgstr "" -"Använd detta formulär för att bjuda in dina vänner och kollegor till denna " -"sida." +msgstr "Bjud in vänner och kollegor att gå med dig på %s" #: lib/action.php:450 msgid "Logout" @@ -4087,25 +4067,23 @@ msgstr "Logga ut" #: lib/action.php:450 msgid "Logout from the site" -msgstr "" +msgstr "Logga ut från webbplatsen" #: lib/action.php:455 -#, fuzzy msgid "Create an account" -msgstr "Skapa ett nytt konto" +msgstr "Skapa ett konto" #: lib/action.php:458 msgid "Login to the site" -msgstr "" +msgstr "Logga in på webbplatsen" #: lib/action.php:461 lib/action.php:724 msgid "Help" msgstr "Hjälp" #: lib/action.php:461 -#, fuzzy msgid "Help me!" -msgstr "Hjälp" +msgstr "Hjälp mig!" #: lib/action.php:464 lib/searchaction.php:127 msgid "Search" @@ -4113,26 +4091,23 @@ msgstr "Sök" #: lib/action.php:464 msgid "Search for people or text" -msgstr "" +msgstr "Sök efter personer eller text" #: lib/action.php:485 -#, fuzzy msgid "Site notice" -msgstr "Nytt inlägg" +msgstr "Webbplatsnotis" #: lib/action.php:551 msgid "Local views" -msgstr "" +msgstr "Lokala vyer" #: lib/action.php:617 -#, fuzzy msgid "Page notice" -msgstr "Nytt inlägg" +msgstr "Sidnotis" #: lib/action.php:719 -#, fuzzy msgid "Secondary site navigation" -msgstr "Prenumerationer" +msgstr "Sekundär webbplatsnavigation" #: lib/action.php:726 msgid "About" @@ -4144,11 +4119,11 @@ msgstr "Frågor & svar" #: lib/action.php:732 msgid "TOS" -msgstr "" +msgstr "Användarvillkor" #: lib/action.php:735 msgid "Privacy" -msgstr "Sekretesspolicy" +msgstr "Sekretess" #: lib/action.php:737 msgid "Source" @@ -4156,15 +4131,15 @@ msgstr "Källa" #: lib/action.php:739 msgid "Contact" -msgstr "Kontakta" +msgstr "Kontakt" #: lib/action.php:741 msgid "Badge" -msgstr "" +msgstr "Emblem" #: lib/action.php:769 msgid "StatusNet software license" -msgstr "" +msgstr "Programvarulicens för StatusNet" #: lib/action.php:772 #, php-format @@ -4172,13 +4147,13 @@ msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." "broughtby%%](%%site.broughtbyurl%%). " msgstr "" -"**%%site.name%%** är en mikroblogg service för dig ifrån [%%site.broughtby%%]" -"(%%site.broughtbyurl%%)" +"**%%site.name%%** är en mikrobloggtjänst tillhandahållen av [%%site.broughtby" +"%%](%%site.broughtbyurl%%)" #: lib/action.php:774 #, php-format msgid "**%%site.name%%** is a microblogging service. " -msgstr "**%%site.name%%** är en mikroblogg service." +msgstr "**%%site.name%%** är en mikrobloggtjänst." #: lib/action.php:776 #, php-format @@ -4187,125 +4162,115 @@ msgid "" "s, available under the [GNU Affero General Public License](http://www.fsf." "org/licensing/licenses/agpl-3.0.html)." msgstr "" -"Det drivs med [StatusNet](http://status.net/) mikroblogging software, " -"version %s, tillgängligt under [GNU Affero General Public License](http://" -"www.fsf.org/licensing/licenses/agpl-3.0.html)." +"Den drivs med mikroblogg-programvaran [StatusNet](http://status.net/), " +"version %s, tillgänglig under [GNU Affero General Public License](http://www." +"fsf.org/licensing/licenses/agpl-3.0.html)." #: lib/action.php:790 -#, fuzzy msgid "Site content license" -msgstr "Sök innehåll i inlägg" +msgstr "Licens för webbplatsinnehåll" #: lib/action.php:799 msgid "All " -msgstr "" +msgstr "Alla " #: lib/action.php:804 msgid "license." -msgstr "" +msgstr "licens." #: lib/action.php:1068 msgid "Pagination" -msgstr "" +msgstr "Numrering av sidor" #: lib/action.php:1077 -#, fuzzy msgid "After" -msgstr "« Nyare" +msgstr "Senare" #: lib/action.php:1085 -#, fuzzy msgid "Before" -msgstr "Tidigare »" +msgstr "Tidigare" #: lib/action.php:1133 -#, fuzzy msgid "There was a problem with your session token." -msgstr "Det var något problem med din session. Försök igen, tack." +msgstr "Det var ett problem med din sessions-token." #: lib/adminpanelaction.php:96 -#, fuzzy msgid "You cannot make changes to this site." -msgstr "Du kan inte skicka meddelande till den användaren." +msgstr "Du kan inte göra förändringar av denna webbplats." #: lib/adminpanelaction.php:195 msgid "showForm() not implemented." -msgstr "" +msgstr "showForm() är inte implementerat." #: lib/adminpanelaction.php:224 msgid "saveSettings() not implemented." -msgstr "" +msgstr "saveSetting() är inte implementerat." #: lib/adminpanelaction.php:247 -#, fuzzy msgid "Unable to delete design setting." -msgstr "Kunde inte spara dina Twitter inställningar!" +msgstr "Kunde inte ta bort utseendeinställning." #: lib/adminpanelaction.php:300 -#, fuzzy msgid "Basic site configuration" -msgstr "Bekräfta epostadress" +msgstr "Grundläggande webbplatskonfiguration" #: lib/adminpanelaction.php:303 -#, fuzzy msgid "Design configuration" -msgstr "SMS Bekräftelse" +msgstr "Konfiguration av utseende" #: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 -#, fuzzy msgid "Paths configuration" -msgstr "SMS Bekräftelse" +msgstr "Konfiguration av sökvägar" #: lib/attachmentlist.php:87 msgid "Attachments" -msgstr "" +msgstr "Bilagor" #: lib/attachmentlist.php:265 msgid "Author" -msgstr "" +msgstr "Författare" #: lib/attachmentlist.php:278 -#, fuzzy msgid "Provider" -msgstr "Profil" +msgstr "Tillhandahållare" #: lib/attachmentnoticesection.php:67 msgid "Notices where this attachment appears" -msgstr "" +msgstr "Notiser där denna bilaga förekommer" #: lib/attachmenttagcloudsection.php:48 msgid "Tags for this attachment" -msgstr "" +msgstr "Taggar för denna billaga" #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" -msgstr "" +msgstr "Resultat av kommando" #: lib/channel.php:210 msgid "Command complete" -msgstr "" +msgstr "Kommando komplett" #: lib/channel.php:221 msgid "Command failed" -msgstr "" +msgstr "Kommando misslyckades" #: lib/command.php:44 msgid "Sorry, this command is not yet implemented." -msgstr "" +msgstr "Ledsen, detta kommando är inte implementerat än." #: lib/command.php:88 -#, fuzzy, php-format +#, php-format msgid "Could not find a user with nickname %s" -msgstr "Kunde inte uppdatera användaren med bekräftad emailadress." +msgstr "Kunde inte hitta en användare med smeknamnet %s" #: lib/command.php:92 msgid "It does not make a lot of sense to nudge yourself!" -msgstr "" +msgstr "Det verkar inte vara särskilt meningsfullt att knuffa dig själv!" #: lib/command.php:99 #, php-format msgid "Nudge sent to %s" -msgstr "" +msgstr "Knuff skickad till %s" #: lib/command.php:126 #, php-format @@ -4314,28 +4279,31 @@ msgid "" "Subscribers: %2$s\n" "Notices: %3$s" msgstr "" +"Prenumerationer: %1$s\n" +"Prenumeranter: %2$s\n" +"Notiser: %3$s" #: lib/command.php:152 lib/command.php:400 msgid "Notice with that id does not exist" -msgstr "" +msgstr "Notis med den ID:n finns inte" #: lib/command.php:168 lib/command.php:416 lib/command.php:471 msgid "User has no last notice" -msgstr "" +msgstr "Användare har ingen sista notis" #: lib/command.php:190 msgid "Notice marked as fave." -msgstr "" +msgstr "Notis markerad som favorit." #: lib/command.php:315 #, php-format msgid "%1$s (%2$s)" -msgstr "%1$s (%2$s)" +msgstr "" #: lib/command.php:318 #, php-format msgid "Fullname: %s" -msgstr "Fullt namn: %s" +msgstr "Fullständigt namn: %s" #: lib/command.php:321 #, php-format @@ -4355,99 +4323,109 @@ msgstr "Om: %s" #: lib/command.php:358 scripts/xmppdaemon.php:321 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "" +msgstr "Meddelande för långt - maximum är %d tecken, du skickade %d" #: lib/command.php:377 msgid "Error sending direct message." -msgstr "" +msgstr "Fel vid sändning av direktmeddelande." #: lib/command.php:431 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" -msgstr "" +msgstr "Notis för långt - maximum är %d tecken, du skickade %d" #: lib/command.php:439 -#, fuzzy, php-format +#, php-format msgid "Reply to %s sent" -msgstr "Svara på detta inlägg" +msgstr "Svar på %s skickat" #: lib/command.php:441 -#, fuzzy msgid "Error saving notice." -msgstr "Det var ett problem när inlägget sparades." +msgstr "Fel vid sparande av notis." #: lib/command.php:495 msgid "Specify the name of the user to subscribe to" -msgstr "" +msgstr "Ange namnet på användaren att prenumerara på" #: lib/command.php:502 #, php-format msgid "Subscribed to %s" -msgstr "" +msgstr "Prenumerar på %s" #: lib/command.php:523 msgid "Specify the name of the user to unsubscribe from" -msgstr "" +msgstr "Ange namnet på användaren att avsluta prenumeration på" #: lib/command.php:530 #, php-format msgid "Unsubscribed from %s" -msgstr "" +msgstr "Prenumeration hos %s avslutad" #: lib/command.php:548 lib/command.php:571 msgid "Command not yet implemented." -msgstr "" +msgstr "Kommando inte implementerat än." #: lib/command.php:551 msgid "Notification off." -msgstr "" +msgstr "Notifikation av." #: lib/command.php:553 msgid "Can't turn off notification." -msgstr "" +msgstr "Kan inte sätta på notifikation." #: lib/command.php:574 msgid "Notification on." -msgstr "" +msgstr "Notifikation på." #: lib/command.php:576 msgid "Can't turn on notification." +msgstr "Kan inte stänga av notifikation." + +#: lib/command.php:588 +msgid "Login command is disabled" msgstr "" -#: lib/command.php:592 -#, fuzzy -msgid "You are not subscribed to anyone." -msgstr "Du skickade inte oss den profilen" +#: lib/command.php:602 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Kunde inte skapa alias." -#: lib/command.php:594 +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 +msgid "You are not subscribed to anyone." +msgstr "Du prenumererar inte på någon." + +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" -msgstr[0] "Du prenumererar redan på dessa användare:" -msgstr[1] "Du prenumererar redan på dessa användare:" +msgstr[0] "Du prenumererar på denna person:" +msgstr[1] "Du prenumererar på dessa personer:" -#: lib/command.php:614 -#, fuzzy +#: lib/command.php:645 msgid "No one is subscribed to you." -msgstr "Kunde inte prenumerera på annat åt dig." +msgstr "Ingen prenumerar på dig." -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" -msgstr[0] "Kunde inte prenumerera på annat åt dig." -msgstr[1] "Kunde inte prenumerera på annat åt dig." +msgstr[0] "Denna person prenumererar på dig:" +msgstr[1] "Dessa personer prenumererar på dig:" -#: lib/command.php:636 -#, fuzzy +#: lib/command.php:667 msgid "You are not a member of any groups." -msgstr "Du skickade inte oss den profilen" +msgstr "Du är inte medlem i några grupper." -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" -msgstr[0] "Du skickade inte oss den profilen" -msgstr[1] "Du skickade inte oss den profilen" +msgstr[0] "Du är en medlem i denna grupp:" +msgstr[1] "Du är en medlem i dessa grupper:" -#: lib/command.php:652 +#: lib/command.php:683 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4466,6 +4444,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" @@ -4486,21 +4465,20 @@ msgid "" msgstr "" #: lib/common.php:199 -#, fuzzy msgid "No configuration file found. " -msgstr "Ingen bekräftelsekod." +msgstr "Ingen konfigurationsfil hittades. " #: lib/common.php:200 msgid "I looked for configuration files in the following places: " -msgstr "" +msgstr "Jag letade efter konfigurationsfiler på följande platser: " #: lib/common.php:201 msgid "You may wish to run the installer to fix this." -msgstr "" +msgstr "Du kanske vill köra installeraren för att åtgärda detta." #: lib/common.php:202 msgid "Go to the installer." -msgstr "" +msgstr "Gå till installeraren." #: lib/connectsettingsaction.php:110 msgid "IM" @@ -4508,7 +4486,7 @@ msgstr "IM" #: lib/connectsettingsaction.php:111 msgid "Updates by instant messenger (IM)" -msgstr "Uppdateringar via instant messenger (IM)" +msgstr "Uppdateringar via snabbmeddelande (IM)" #: lib/connectsettingsaction.php:116 msgid "Updates by SMS" @@ -4516,170 +4494,159 @@ msgstr "Uppdateringar via SMS" #: lib/dberroraction.php:60 msgid "Database error" -msgstr "" +msgstr "Databasfel" #: lib/designsettings.php:105 -#, fuzzy msgid "Upload file" -msgstr "Ladda upp" +msgstr "Ladda upp fil" #: lib/designsettings.php:109 -#, fuzzy msgid "" "You can upload your personal background image. The maximum file size is 2MB." -msgstr "Du kan uppdatera din personliga profil här" +msgstr "" +"Du kan ladda upp din personliga bakgrundbild. Den maximala filstorleken är " +"2MB." #: lib/designsettings.php:418 msgid "Design defaults restored." -msgstr "" +msgstr "Standardvärden för utseende återställda." #: lib/disfavorform.php:114 lib/disfavorform.php:140 -#, fuzzy msgid "Disfavor this notice" -msgstr "%s favoriter" +msgstr "Avmarkera denna notis som favorit" #: lib/favorform.php:114 lib/favorform.php:140 -#, fuzzy msgid "Favor this notice" -msgstr "%s favoriter" +msgstr "Markera denna notis som favorit" #: lib/favorform.php:140 msgid "Favor" -msgstr "Favorisera" +msgstr "Markera som favorit" #: lib/feedlist.php:64 msgid "Export data" -msgstr "" +msgstr "Exportdata" #: lib/feed.php:85 msgid "RSS 1.0" -msgstr "" +msgstr "RSS 1.0" #: lib/feed.php:87 msgid "RSS 2.0" -msgstr "" +msgstr "RSS 2.0" #: lib/feed.php:89 msgid "Atom" -msgstr "" +msgstr "Atom" #: lib/feed.php:91 msgid "FOAF" -msgstr "" +msgstr "FOAF" #: lib/galleryaction.php:121 -#, fuzzy msgid "Filter tags" -msgstr "Feed för taggar %s" +msgstr "Filtrera taggar" #: lib/galleryaction.php:131 msgid "All" -msgstr "" +msgstr "Alla" #: lib/galleryaction.php:139 -#, fuzzy msgid "Select tag to filter" -msgstr "Välj en operatör" +msgstr "Välj tagg att filtrera" #: lib/galleryaction.php:140 -#, fuzzy msgid "Tag" -msgstr "Taggar" +msgstr "Tagg" #: lib/galleryaction.php:141 msgid "Choose a tag to narrow list" -msgstr "" +msgstr "Välj en tagg för att begränsa lista" #: lib/galleryaction.php:143 msgid "Go" -msgstr "" +msgstr "Gå" #: lib/groupeditform.php:163 -#, fuzzy msgid "URL of the homepage or blog of the group or topic" -msgstr "URL till din hemsida, blog eller profil på en annan sida." +msgstr "URL till gruppen eller ämnets hemsida eller blogg" #: lib/groupeditform.php:168 -#, fuzzy msgid "Describe the group or topic" -msgstr "Berätta om dig själv och dina intressen inom 140 tecken" +msgstr "Beskriv gruppen eller ämnet" #: lib/groupeditform.php:170 -#, fuzzy, php-format +#, php-format msgid "Describe the group or topic in %d characters" -msgstr "Berätta om dig själv och dina intressen inom 140 tecken" +msgstr "Beskriv gruppen eller ämnet med högst %d tecken" #: lib/groupeditform.php:172 -#, fuzzy msgid "Description" -msgstr "Prenumerationer" +msgstr "Beskrivning" #: lib/groupeditform.php:179 -#, fuzzy msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" -msgstr "Var du håller till, såsom \"Stad, Län, Land\"" +msgstr "Plats för gruppen, om den finns, såsom \"Stad, Län, Land\"" #: lib/groupeditform.php:187 #, php-format msgid "Extra nicknames for the group, comma- or space- separated, max %d" -msgstr "" +msgstr "Extra smeknamn för gruppen, komma- eller mellanslagsseparerade, max &d" #: lib/groupnav.php:85 msgid "Group" -msgstr "" +msgstr "Grupp" #: lib/groupnav.php:101 -#, fuzzy msgid "Blocked" -msgstr "Ingen sådan användare" +msgstr "Blockerad" #: lib/groupnav.php:102 -#, fuzzy, php-format +#, php-format msgid "%s blocked users" -msgstr "Ingen sådan användare" +msgstr "%s blockerade användare" #: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" -msgstr "" +msgstr "Redigera %s gruppegenskaper" #: lib/groupnav.php:113 -#, fuzzy msgid "Logo" -msgstr "Logga ut" +msgstr "Logotyp" #: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" -msgstr "" +msgstr "Lägg till eller redigera %s logotyp" #: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" -msgstr "" +msgstr "Lägg till eller redigera %s utseende" #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" -msgstr "" +msgstr "Grupper med flest medlemmar" #: lib/groupsbypostssection.php:71 msgid "Groups with most posts" -msgstr "" +msgstr "Grupper med flest inlägg" #: lib/grouptagcloudsection.php:56 #, php-format msgid "Tags in %s group's notices" -msgstr "" +msgstr "Taggar i %s grupps notiser" #: lib/htmloutputter.php:103 msgid "This page is not available in a media type you accept" msgstr "Denna sida är inte tillgänglig i den mediatyp du accepterat" #: lib/imagefile.php:75 -#, fuzzy, php-format +#, php-format msgid "That file is too big. The maximum file size is %s." -msgstr "Du kan uppdatera din personliga profil här" +msgstr "Denna fil är för stor. Den maximala filstorleken är %s." #: lib/imagefile.php:80 msgid "Partial upload." @@ -4687,33 +4654,31 @@ msgstr "Bitvis uppladdad." #: lib/imagefile.php:88 lib/mediafile.php:170 msgid "System error uploading file." -msgstr "Systemfel när filen laddades upp." +msgstr "Systemfel vid uppladdning av fil." #: lib/imagefile.php:96 msgid "Not an image or corrupt file." -msgstr "Det verkar inte vara en bildfil, annars korrupt." +msgstr "Inte en bildfil eller så är filen korrupt." #: lib/imagefile.php:105 msgid "Unsupported image file format." msgstr "Bildfilens format stödjs inte." #: lib/imagefile.php:118 -#, fuzzy msgid "Lost our file." -msgstr "Inget sådant inlägg." +msgstr "Förlorade vår fil." #: lib/imagefile.php:150 lib/imagefile.php:197 -#, fuzzy msgid "Unknown file type" -msgstr "okänd fil typ" +msgstr "Okänd filtyp" #: lib/imagefile.php:217 msgid "MB" -msgstr "" +msgstr "MB" #: lib/imagefile.php:219 msgid "kB" -msgstr "" +msgstr "kB" #: lib/jabber.php:191 #, php-format @@ -4721,43 +4686,41 @@ msgid "[%s]" msgstr "" #: lib/joinform.php:114 -#, fuzzy msgid "Join" -msgstr "Logga in" +msgstr "Gå med" #: lib/leaveform.php:114 -#, fuzzy msgid "Leave" -msgstr "Spara" +msgstr "Lämna" #: lib/logingroupnav.php:80 -#, fuzzy msgid "Login with a username and password" -msgstr "Logga in med ditt användarnamn och lösenord." +msgstr "Logga in med ett användarnamn och lösenord" #: lib/logingroupnav.php:86 -#, fuzzy msgid "Sign up for a new account" -msgstr "Skapa ett nytt konto" +msgstr "Registrera dig för ett nytt konto" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." -msgstr "" +msgstr "Bara användaren kan läsa sina egna brevlådor." #: 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 inga privata meddelanden. Du kan skicka privata meddelanden för att " +"engagera andra användare i konversationen. Folk kan skicka meddelanden till " +"dig som bara du ser." #: lib/mailbox.php:227 lib/noticelist.php:452 -#, fuzzy msgid "from" msgstr "från" #: lib/mail.php:172 msgid "Email address confirmation" -msgstr "Bekräfta epostadress" +msgstr "E-postadressbekräftelse" #: lib/mail.php:174 #, php-format @@ -4779,10 +4742,10 @@ msgstr "" #: lib/mail.php:236 #, php-format msgid "%1$s is now listening to your notices on %2$s." -msgstr "%1$s lyssnar nu på dina meddelanden i %2$s." +msgstr "%1$s lyssnar nu på dina notiser på %2$s." #: lib/mail.php:241 -#, fuzzy, php-format +#, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" "\n" @@ -4795,18 +4758,14 @@ msgid "" "----\n" "Change your email address or notification options at %8$s\n" msgstr "" -"%1$s lyssnar nu på dina meddelanden i %1$s.\n" -"\n" -"\tHälsningar,\n" -"%4$s.\n" #: lib/mail.php:254 -#, fuzzy, php-format +#, php-format msgid "Location: %s\n" msgstr "Plats: %s\n" #: lib/mail.php:256 -#, fuzzy, php-format +#, php-format msgid "Homepage: %s\n" msgstr "Hemsida: %s\n" @@ -4816,11 +4775,13 @@ msgid "" "Bio: %s\n" "\n" msgstr "" +"Biografi: %s\n" +"\n" #: lib/mail.php:286 #, php-format msgid "New email address for posting to %s" -msgstr "Ny emailadress för att skicka till %s" +msgstr "Ny e-postadress för att skicka till %s" #: lib/mail.php:289 #, php-format @@ -4834,13 +4795,13 @@ msgid "" "Faithfully yours,\n" "%4$s" msgstr "" -"Du har en ny adress %1$s.\n" +"Du har en ny adress på %1$s.\n" "\n" -"Skicka email till %2$s för att göra ett nytt inlägg.\n" +"Skicka e-post till %2$s för att posta nya meddelanden.\n" "\n" -"Mer information får du på %3$s.\n" +"Mer e-postinstruktioner på %3$s.\n" "\n" -"Mvh,\n" +"Med vänliga hälsningar,\n" "%4$s" #: lib/mail.php:413 @@ -4850,12 +4811,12 @@ msgstr "%s status" #: lib/mail.php:439 msgid "SMS confirmation" -msgstr "SMS Bekräftelse" +msgstr "SMS-bekräftelse" #: lib/mail.php:463 -#, fuzzy, php-format +#, php-format msgid "You've been nudged by %s" -msgstr "Du är identifierad. Skriv in" +msgstr "Du har blivit knuffad av %s" #: lib/mail.php:467 #, php-format @@ -4876,7 +4837,7 @@ msgstr "" #: lib/mail.php:510 #, php-format msgid "New private message from %s" -msgstr "" +msgstr "Nytt privat meddelande från %s" #: lib/mail.php:514 #, php-format @@ -4898,9 +4859,9 @@ msgid "" msgstr "" #: lib/mail.php:559 -#, fuzzy, php-format +#, php-format msgid "%s (@%s) added your notice as a favorite" -msgstr "%s la till ditt inlägg som favorit" +msgstr "%s (@%s) lade till din notis som en favorit" #: lib/mail.php:561 #, php-format @@ -4926,7 +4887,7 @@ msgstr "" #: lib/mail.php:620 #, php-format msgid "%s (@%s) sent a notice to your attention" -msgstr "" +msgstr "%s (@%s) skickade en notis för din uppmärksamhet" #: lib/mail.php:622 #, php-format @@ -4946,73 +4907,74 @@ msgstr "" #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" +"Det var ett databasfel vid sparandet av din profil. Var vänlig försök igen." #: lib/mediafile.php:142 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." msgstr "" +"Den uppladdade filen överstiger upload_max_filesize-direktivet i php.ini." #: lib/mediafile.php:147 msgid "" "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " "the HTML form." msgstr "" +"Den uppladdade filen överstiger MAX_FILE_SIZE-direktivet som var angivet i " +"HTML-formuläret." #: lib/mediafile.php:152 msgid "The uploaded file was only partially uploaded." -msgstr "" +msgstr "Den uppladdade filen var bara delvis uppladdad." #: lib/mediafile.php:159 msgid "Missing a temporary folder." -msgstr "" +msgstr "Saknar en tillfällig mapp." #: lib/mediafile.php:162 msgid "Failed to write file to disk." -msgstr "" +msgstr "Misslyckades att skriva fil till disk." #: lib/mediafile.php:165 msgid "File upload stopped by extension." -msgstr "" +msgstr "Filuppladdningen stoppad pga filändelse" #: lib/mediafile.php:179 lib/mediafile.php:216 msgid "File exceeds user's quota!" -msgstr "" +msgstr "Fil överstiger användaren kvot!" #: lib/mediafile.php:196 lib/mediafile.php:233 msgid "File could not be moved to destination directory." -msgstr "" +msgstr "Fil kunde inte flyttas till destinationskatalog." #: lib/mediafile.php:201 lib/mediafile.php:237 msgid "Could not determine file's mime-type!" -msgstr "Kunde inte ta emot favoritinläggen." +msgstr "Kunde inte fastställa filens MIME-typ!" #: lib/mediafile.php:270 #, php-format msgid " Try using another %s format." -msgstr "" +msgstr "Försök använda ett annat %s-format." #: lib/mediafile.php:275 #, php-format msgid "%s is not a supported filetype on this server." -msgstr "" +msgstr "%s är en filtyp som saknar stöd på denna server." #: lib/messageform.php:120 -#, fuzzy msgid "Send a direct notice" -msgstr "Tabort inlägg" +msgstr "Skicka ett direktinlägg" #: lib/messageform.php:146 msgid "To" -msgstr "" +msgstr "Till" #: lib/messageform.php:161 lib/noticeform.php:185 -#, fuzzy msgid "Available characters" -msgstr "Minst 6 tecken" +msgstr "Tillgängliga tecken" #: lib/noticeform.php:158 -#, fuzzy msgid "Send a notice" -msgstr "Skicka ett meddelande" +msgstr "Skicka ett inlägg" #: lib/noticeform.php:171 #, php-format @@ -5021,11 +4983,11 @@ msgstr "Vad är på gång, %s?" #: lib/noticeform.php:192 msgid "Attach" -msgstr "" +msgstr "Bifoga" #: lib/noticeform.php:196 msgid "Attach a file" -msgstr "" +msgstr "Bifoga en fil" #: lib/noticelist.php:403 #, php-format @@ -5033,78 +4995,72 @@ msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" #: lib/noticelist.php:404 -#, fuzzy msgid "N" -msgstr "Nej" +msgstr "N" #: lib/noticelist.php:404 msgid "S" -msgstr "" +msgstr "S" #: lib/noticelist.php:405 msgid "E" -msgstr "" +msgstr "Ö" #: lib/noticelist.php:405 msgid "W" -msgstr "" +msgstr "V" #: lib/noticelist.php:411 msgid "at" -msgstr "" +msgstr "på" #: lib/noticelist.php:506 -#, fuzzy msgid "in context" -msgstr "Inget innehåll!" +msgstr "i sammanhang" #: lib/noticelist.php:526 -#, fuzzy msgid "Reply to this notice" msgstr "Svara på detta inlägg" #: lib/noticelist.php:527 -#, fuzzy msgid "Reply" -msgstr "svar" +msgstr "Svara" #: lib/nudgeform.php:116 msgid "Nudge this user" -msgstr "" +msgstr "Knuffa denna användare" #: lib/nudgeform.php:128 msgid "Nudge" -msgstr "" +msgstr "Knuffa" #: lib/nudgeform.php:128 -#, fuzzy msgid "Send a nudge to this user" -msgstr "Du kan inte skicka meddelande till den användaren." +msgstr "Skicka en knuff till den användaren." #: lib/oauthstore.php:283 msgid "Error inserting new profile" -msgstr "Fel uppstog när nya profilen skulle läggas till" +msgstr "Fel vid infogning av ny profil" #: lib/oauthstore.php:291 msgid "Error inserting avatar" -msgstr "Fel uppstog när användarbild skulle läggas till" +msgstr "Fel vid infogning av avatar" #: lib/oauthstore.php:311 msgid "Error inserting remote profile" -msgstr "Fel uppstog när fjärrprofilen skulle läggas till" +msgstr "Fel vid infogning av fjärrprofilen" #: lib/oauthstore.php:345 -#, fuzzy msgid "Duplicate notice" -msgstr "Tabort inlägg" +msgstr "Duplicera notis" #: lib/oauthstore.php:467 lib/subs.php:48 msgid "You have been banned from subscribing." -msgstr "" +msgstr "Du har blivit utestängd från att prenumerera." #: lib/oauthstore.php:492 msgid "Couldn't insert new subscription." -msgstr "Kunde inte lägga till ny prenumeration." +msgstr "Kunde inte infoga ny prenumeration." #: lib/personalgroupnav.php:99 msgid "Personal" @@ -5116,28 +5072,28 @@ msgstr "Svar" #: lib/personalgroupnav.php:114 msgid "Favorites" -msgstr "" +msgstr "Favoriter" #: lib/personalgroupnav.php:124 msgid "Inbox" -msgstr "" +msgstr "Inkorg" #: lib/personalgroupnav.php:125 msgid "Your incoming messages" -msgstr "" +msgstr "Dina inkommande meddelanden" #: lib/personalgroupnav.php:129 msgid "Outbox" -msgstr "" +msgstr "Utkorg" #: lib/personalgroupnav.php:130 msgid "Your sent messages" -msgstr "" +msgstr "Dina skickade meddelanden" #: lib/personaltagcloudsection.php:56 #, php-format msgid "Tags in %s's notices" -msgstr "" +msgstr "Taggar i %ss notiser" #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" @@ -5149,16 +5105,15 @@ msgstr "Alla prenumerationer" #: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90 msgid "Subscribers" -msgstr "Prenumerant" +msgstr "Prenumeranter" #: lib/profileaction.php:157 -#, fuzzy msgid "All subscribers" -msgstr "Prenumerant" +msgstr "Alla prenumeranter" #: lib/profileaction.php:178 msgid "User ID" -msgstr "" +msgstr "Användar-ID" #: lib/profileaction.php:183 msgid "Member since" @@ -5166,16 +5121,15 @@ msgstr "Medlem sedan" #: lib/profileaction.php:245 msgid "All groups" -msgstr "" +msgstr "Alla grupper" #: lib/profileformaction.php:123 -#, fuzzy msgid "No return-to arguments" -msgstr "Inget sådant dokument." +msgstr "Inga \"return-to\"-argument" #: lib/profileformaction.php:137 msgid "unimplemented method" -msgstr "" +msgstr "inte implementerad metod" #: lib/publicgroupnav.php:78 msgid "Public" @@ -5183,44 +5137,41 @@ msgstr "Publik" #: lib/publicgroupnav.php:82 msgid "User groups" -msgstr "" +msgstr "Användargrupper" #: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85 -#, fuzzy msgid "Recent tags" -msgstr "Tidigare taggar" +msgstr "Senaste taggar" #: lib/publicgroupnav.php:88 msgid "Featured" msgstr "" #: lib/publicgroupnav.php:92 -#, fuzzy msgid "Popular" -msgstr "Personer" +msgstr "Populärt" #: lib/sandboxform.php:67 +#, fuzzy msgid "Sandbox" -msgstr "" +msgstr "Flytta till sandlåda" #: lib/sandboxform.php:78 #, fuzzy msgid "Sandbox this user" -msgstr "Ingen sådan användare" +msgstr "Flytta denna användare till sandlåda" #: lib/searchaction.php:120 -#, fuzzy msgid "Search site" -msgstr "Sök" +msgstr "Sök webbplats" #: lib/searchaction.php:126 msgid "Keyword(s)" -msgstr "" +msgstr "Nyckelord" #: lib/searchaction.php:162 -#, fuzzy msgid "Search help" -msgstr "Sök" +msgstr "Sök hjälp" #: lib/searchgroupnav.php:80 msgid "People" @@ -5228,49 +5179,46 @@ msgstr "Personer" #: lib/searchgroupnav.php:81 msgid "Find people on this site" -msgstr "Sök personer på denna sida" +msgstr "Hitta personer på denna webbplats" #: lib/searchgroupnav.php:83 msgid "Find content of notices" -msgstr "Sök innehåll i inlägg" +msgstr "Hitta innehåll i notiser" #: lib/searchgroupnav.php:85 -#, fuzzy msgid "Find groups on this site" -msgstr "Sök personer på denna sida" +msgstr "Hitta grupper på denna webbplats" #: lib/section.php:89 msgid "Untitled section" -msgstr "" +msgstr "Namnlös sektion" #: lib/section.php:106 msgid "More..." -msgstr "" +msgstr "Mer..." #: lib/silenceform.php:67 -#, fuzzy msgid "Silence" -msgstr "Nytt inlägg" +msgstr "Tysta ned" #: lib/silenceform.php:78 -#, fuzzy msgid "Silence this user" -msgstr "Ingen sådan användare" +msgstr "Tysta ned denna användare" #: lib/subgroupnav.php:83 -#, fuzzy, php-format +#, php-format msgid "People %s subscribes to" -msgstr "Fjärrprenumerera" +msgstr "Personer %s prenumererar på" #: lib/subgroupnav.php:91 -#, fuzzy, php-format +#, php-format msgid "People subscribed to %s" -msgstr "Fjärrprenumerera" +msgstr "Personer som prenumererar på %s" #: lib/subgroupnav.php:99 #, php-format msgid "Groups %s is a member of" -msgstr "" +msgstr "Grupper %s är en medlem i" #: lib/subscriberspeopleselftagcloudsection.php:48 #: lib/subscriptionspeopleselftagcloudsection.php:48 @@ -5284,16 +5232,15 @@ msgstr "" #: lib/subscriptionlist.php:126 msgid "(none)" -msgstr "" +msgstr "(ingen)" #: lib/subs.php:52 msgid "Already subscribed!" -msgstr "" +msgstr "Redan prenumerant!" #: lib/subs.php:56 -#, fuzzy msgid "User has blocked you." -msgstr "Användaren har ingen profil." +msgstr "Användaren har blockerat dig." #: lib/subs.php:60 msgid "Could not subscribe." @@ -5301,85 +5248,77 @@ msgstr "Kunde inte prenumerera." #: lib/subs.php:79 msgid "Could not subscribe other to you." -msgstr "Kunde inte prenumerera på annat åt dig." +msgstr "Kunde inte göra andra till prenumeranter hos dig." #: lib/subs.php:128 -#, fuzzy msgid "Not subscribed!" -msgstr "Ingen prenumerant!" +msgstr "Inte prenumerant!" #: lib/subs.php:133 -#, fuzzy msgid "Couldn't delete self-subscription." -msgstr "Kunde inte radera prenumerationen. " +msgstr "Kunde inte ta bort själv-prenumeration." #: lib/subs.php:146 msgid "Couldn't delete subscription." -msgstr "Kunde inte radera prenumerationen. " +msgstr "Kunde inte ta bort prenumeration." #: lib/tagcloudsection.php:56 -#, fuzzy msgid "None" -msgstr "Nej" +msgstr "Ingen" #: lib/topposterssection.php:74 msgid "Top posters" -msgstr "" +msgstr "Toppostare" #: lib/unsandboxform.php:69 +#, fuzzy msgid "Unsandbox" -msgstr "" +msgstr "Flytta från sandlåda" #: lib/unsandboxform.php:80 #, fuzzy msgid "Unsandbox this user" -msgstr "Ingen sådan användare" +msgstr "Flytta denna användare från sandlåda" #: lib/unsilenceform.php:67 msgid "Unsilence" -msgstr "" +msgstr "Häv nedtystning" #: lib/unsilenceform.php:78 -#, fuzzy msgid "Unsilence this user" -msgstr "Ingen sådan användare" +msgstr "Häv nedtystning av denna användare" #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137 msgid "Unsubscribe from this user" -msgstr "" +msgstr "Avsluta prenumerationen på denna användare" #: lib/unsubscribeform.php:137 msgid "Unsubscribe" -msgstr "Lämnar pren." +msgstr "Avsluta pren." #: lib/userprofile.php:116 -#, fuzzy msgid "Edit Avatar" -msgstr "Användarbild" +msgstr "Redigera avatar" #: lib/userprofile.php:236 -#, fuzzy msgid "User actions" -msgstr "Okänd funktion" +msgstr "Användaråtgärd" #: lib/userprofile.php:248 -#, fuzzy msgid "Edit profile settings" -msgstr "Profil inställningar" +msgstr "Redigera profilinställningar" #: lib/userprofile.php:249 msgid "Edit" -msgstr "" +msgstr "Redigera" #: lib/userprofile.php:272 -#, fuzzy msgid "Send a direct message to this user" -msgstr "Du kan inte skicka meddelande till den användaren." +msgstr "Skicka ett direktmeddelande till denna användare" #: lib/userprofile.php:273 -#, fuzzy msgid "Message" -msgstr "Nytt meddelande" +msgstr "Meddelande" #: lib/userprofile.php:311 msgid "Moderate" @@ -5430,27 +5369,27 @@ msgid "about a year ago" msgstr "för ett år sedan" #: lib/webcolor.php:82 -#, fuzzy, php-format +#, php-format msgid "%s is not a valid color!" -msgstr "Hemsidan har ingen giltig URL" +msgstr "%s är inte en giltig färg!" #: lib/webcolor.php:123 #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." -msgstr "" +msgstr "%s är inte en giltig färg! Använd 3 eller 6 hexadecimala tecken." #: scripts/maildaemon.php:48 msgid "Could not parse message." -msgstr "" +msgstr "Kunde inte tolka meddelande." #: scripts/maildaemon.php:53 msgid "Not a registered user." -msgstr "Inte registrerad användare." +msgstr "Inte en registrerad användare." #: scripts/maildaemon.php:57 msgid "Sorry, that is not your incoming email address." -msgstr "Ledsen, men det är inte din inkommande emailadress." +msgstr "Ledsen, det är inte din inkommande e-postadress." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." -msgstr "Ledsen, men inga inkommande email är tillåtna." +msgstr "Ledsen, ingen inkommande e-post tillåts." diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index b9461933d5..4e3b165acf 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-05 19:53+0000\n" -"PO-Revision-Date: 2009-12-05 19:55:11+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"PO-Revision-Date: 2009-12-07 21:27:26+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: te\n" "X-Message-Group: out-statusnet\n" @@ -571,7 +571,7 @@ msgstr "కత్తిరించు" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -1744,11 +1744,11 @@ msgstr "ఓపెన్ఐడీ ఫారమును సృష్టించ msgid "%s left group %s" msgstr "%2$s గుంపు నుండి %1$s వైదొలిగారు" -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "ఇప్పటికే లోనికి ప్రవేశించారు." -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 #, fuzzy msgid "Invalid or expired token." msgstr "సందేశపు విషయం సరైనది కాదు" @@ -4284,40 +4284,54 @@ msgstr "" msgid "Can't turn on notification." msgstr "" -#: lib/command.php:592 +#: lib/command.php:588 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:602 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "మారుపేర్లని సృష్టించలేకపోయాం." + +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 #, fuzzy msgid "You are not subscribed to anyone." msgstr "%sకి స్పందనలు" -#: lib/command.php:594 +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "%sకి స్పందనలు" msgstr[1] "%sకి స్పందనలు" -#: lib/command.php:614 +#: lib/command.php:645 #, fuzzy msgid "No one is subscribed to you." msgstr "%sకి స్పందనలు" -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "%sకి స్పందనలు" msgstr[1] "%sకి స్పందనలు" -#: lib/command.php:636 +#: lib/command.php:667 #, fuzzy msgid "You are not a member of any groups." msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!" -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!" msgstr[1] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!" -#: lib/command.php:652 +#: lib/command.php:683 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4336,6 +4350,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index e7ae86b4e7..3d9661e7db 100644 --- a/locale/tr/LC_MESSAGES/statusnet.po +++ b/locale/tr/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-05 19:53+0000\n" -"PO-Revision-Date: 2009-12-05 19:55:14+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"PO-Revision-Date: 2009-12-07 21:27:29+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: tr\n" "X-Message-Group: out-statusnet\n" @@ -582,7 +582,7 @@ msgstr "" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -1803,11 +1803,11 @@ msgstr "OpenID formu yaratılamadı: %s" msgid "%s left group %s" msgstr "" -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "Zaten giriş yapılmış." -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 #, fuzzy msgid "Invalid or expired token." msgstr "Geçersiz durum mesajı" @@ -4387,37 +4387,51 @@ msgstr "" msgid "Can't turn on notification." msgstr "" -#: lib/command.php:592 +#: lib/command.php:588 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:602 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Avatar bilgisi kaydedilemedi" + +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Bize o profili yollamadınız" -#: lib/command.php:594 +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Bize o profili yollamadınız" -#: lib/command.php:614 +#: lib/command.php:645 #, fuzzy msgid "No one is subscribed to you." msgstr "Uzaktan abonelik" -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Uzaktan abonelik" -#: lib/command.php:636 +#: lib/command.php:667 #, fuzzy msgid "You are not a member of any groups." msgstr "Bize o profili yollamadınız" -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Bize o profili yollamadınız" -#: lib/command.php:652 +#: lib/command.php:683 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4436,6 +4450,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index 165e56bca3..0d8674bfd5 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-05 19:53+0000\n" -"PO-Revision-Date: 2009-12-05 19:55:17+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"PO-Revision-Date: 2009-12-07 21:27:33+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: out-statusnet\n" @@ -190,9 +190,8 @@ msgid "Could not save profile." msgstr "Не вдалося зберегти профіль." #: actions/apiblockcreate.php:105 -#, fuzzy msgid "You cannot block yourself!" -msgstr "Не можна відписатись від самого себе!" +msgstr "Ви не можете блокувати самого себе!" #: actions/apiblockcreate.php:119 msgid "Block user failed." @@ -578,7 +577,7 @@ msgstr "Втяти" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -1817,11 +1816,11 @@ msgstr "Не вдалося видалити користувача %s з гру msgid "%s left group %s" msgstr "%s залишив групу %s" -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "Тепер Ви увійшли." -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 msgid "Invalid or expired token." msgstr "Недійсний або неправильний токен." @@ -4442,40 +4441,55 @@ msgstr "Сповіщення увімкнуто." msgid "Can't turn on notification." msgstr "Не можна увімкнути сповіщення." -#: lib/command.php:592 +#: lib/command.php:588 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:602 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Неможна призначити додаткові імена." + +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 msgid "You are not subscribed to anyone." msgstr "Ви не маєте жодних підписок." -#: lib/command.php:594 +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Ви підписані до цієї особи:" msgstr[1] "Ви підписані до цих людей:" msgstr[2] "Ви підписані до цих людей:" -#: lib/command.php:614 +#: lib/command.php:645 msgid "No one is subscribed to you." msgstr "До Вас ніхто не підписаний." -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Ця особа є підписаною до Вас:" msgstr[1] "Ці люди підписані до Вас:" msgstr[2] "Ці люди підписані до Вас:" -#: lib/command.php:636 +#: lib/command.php:667 msgid "You are not a member of any groups." msgstr "Ви не є учасником жодної групи." -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Ви є учасником групи:" msgstr[1] "Ви є учасником таких груп:" msgstr[2] "Ви є учасником таких груп:" -#: lib/command.php:652 +#: lib/command.php:683 +#, fuzzy msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4494,6 +4508,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" @@ -5411,9 +5426,8 @@ msgid "Not subscribed!" msgstr "Не підписано!" #: lib/subs.php:133 -#, fuzzy msgid "Couldn't delete self-subscription." -msgstr "Не вдалося видалити підписку." +msgstr "Не можу видалити самопідписку." #: lib/subs.php:146 msgid "Couldn't delete subscription." diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index bf323467cb..8e29eac3c4 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: 2009-12-05 19:53+0000\n" -"PO-Revision-Date: 2009-12-05 19:55:19+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"PO-Revision-Date: 2009-12-07 21:27:36+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: vi\n" "X-Message-Group: out-statusnet\n" @@ -589,7 +589,7 @@ msgstr "Nhóm" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -1888,11 +1888,11 @@ msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè c msgid "%s left group %s" msgstr "%s và nhóm" -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "Đã đăng nhập." -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 #, fuzzy msgid "Invalid or expired token." msgstr "Nội dung tin nhắn không hợp lệ" @@ -4555,37 +4555,51 @@ msgstr "Không có mã số xác nhận." msgid "Can't turn on notification." msgstr "" -#: lib/command.php:592 +#: lib/command.php:588 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:602 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Không thể tạo favorite." + +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Bạn chưa cập nhật thông tin riêng" -#: lib/command.php:594 +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Bạn đã theo những người này:" -#: lib/command.php:614 +#: lib/command.php:645 #, fuzzy msgid "No one is subscribed to you." msgstr "Không thể tạo favorite." -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Không thể tạo favorite." -#: lib/command.php:636 +#: lib/command.php:667 #, fuzzy msgid "You are not a member of any groups." msgstr "Bạn chưa cập nhật thông tin riêng" -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Bạn chưa cập nhật thông tin riêng" -#: lib/command.php:652 +#: lib/command.php:683 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4604,6 +4618,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index 041b4402e9..4e306a76bb 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.po +++ b/locale/zh_CN/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-05 19:53+0000\n" -"PO-Revision-Date: 2009-12-05 19:55:23+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"PO-Revision-Date: 2009-12-07 21:27:39+0000\n" "Language-Team: Simplified Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hans\n" "X-Message-Group: out-statusnet\n" @@ -583,7 +583,7 @@ msgstr "剪裁" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -1840,11 +1840,11 @@ msgstr "无法订阅用户：未找到。" msgid "%s left group %s" msgstr "%s 离开群 %s" -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "已登录。" -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 #, fuzzy msgid "Invalid or expired token." msgstr "通告内容不正确" @@ -4460,37 +4460,51 @@ msgstr "通告开启。" msgid "Can't turn on notification." msgstr "无法开启通告。" -#: lib/command.php:592 +#: lib/command.php:588 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:602 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "无法创建收藏。" + +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 #, fuzzy msgid "You are not subscribed to anyone." msgstr "您未告知此个人信息" -#: lib/command.php:594 +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "您已订阅这些用户：" -#: lib/command.php:614 +#: lib/command.php:645 #, fuzzy msgid "No one is subscribed to you." msgstr "无法订阅他人更新。" -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "无法订阅他人更新。" -#: lib/command.php:636 +#: lib/command.php:667 #, fuzzy msgid "You are not a member of any groups." msgstr "您未告知此个人信息" -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "您未告知此个人信息" -#: lib/command.php:652 +#: lib/command.php:683 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4509,6 +4523,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index 4325d5cde6..ad7d1fbaea 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: 2009-12-05 19:53+0000\n" -"PO-Revision-Date: 2009-12-05 19:55:27+0000\n" +"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"PO-Revision-Date: 2009-12-07 21:27:42+0000\n" "Language-Team: Traditional Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59747); Translate extension (2009-11-29)\n" +"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hant\n" "X-Message-Group: out-statusnet\n" @@ -576,7 +576,7 @@ msgstr "" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -1776,11 +1776,11 @@ msgstr "無法從 %s 建立OpenID" msgid "%s left group %s" msgstr "" -#: actions/login.php:79 actions/register.php:137 +#: actions/login.php:82 actions/register.php:137 msgid "Already logged in." msgstr "已登入" -#: actions/login.php:108 actions/login.php:118 +#: actions/login.php:113 actions/login.php:123 msgid "Invalid or expired token." msgstr "" @@ -4304,37 +4304,51 @@ msgstr "" msgid "Can't turn on notification." msgstr "" -#: lib/command.php:592 +#: lib/command.php:588 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:602 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "無法存取個人圖像資料" + +#: lib/command.php:607 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:623 #, fuzzy msgid "You are not subscribed to anyone." msgstr "此帳號已註冊" -#: lib/command.php:594 +#: lib/command.php:625 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "此帳號已註冊" -#: lib/command.php:614 +#: lib/command.php:645 #, fuzzy msgid "No one is subscribed to you." msgstr "無此訂閱" -#: lib/command.php:616 +#: lib/command.php:647 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "無此訂閱" -#: lib/command.php:636 +#: lib/command.php:667 #, fuzzy msgid "You are not a member of any groups." msgstr "無法連結到伺服器:%s" -#: lib/command.php:638 +#: lib/command.php:669 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "無法連結到伺服器:%s" -#: lib/command.php:652 +#: lib/command.php:683 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4353,6 +4367,7 @@ msgid "" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" +"login - Get a link to login to the web interface\n" "drop - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" From 5affa498209b8c768531a816865903728e726e88 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 8 Dec 2009 08:28:44 -0800 Subject: [PATCH 050/172] Tweak updateavatarurl.php: emit a newline whether we're on verbose or non-quiet, emit help when no users specified. --- scripts/updateavatarurl.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/updateavatarurl.php b/scripts/updateavatarurl.php index dfcfc118cf..617c2e24c7 100644 --- a/scripts/updateavatarurl.php +++ b/scripts/updateavatarurl.php @@ -60,7 +60,8 @@ try { } } } else { - throw new Exception("You have to provide an ID or nickname or 'all'."); + show_help(); + exit(1); } } catch (Exception $e) { print $e->getMessage()."\n"; @@ -123,6 +124,9 @@ function updateAvatars($user) } if (have_option('v', 'verbose')) { - print "DONE.\n"; + print "DONE."; + } + if (!have_option('q', 'quiet') || have_option('v', 'verbose')) { + print "\n"; } } From 3536f01258dc43bee764c98fbdda5a6f1df7bcb2 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 8 Dec 2009 09:57:37 -0800 Subject: [PATCH 051/172] Make default & sample val for $config['queue']['queue_basename'] actually work! Now matches the recommendation in README which is in fact correct. Must include the /queue/ prefix (unless somthing else actually makes sense) --- config.php.sample | 2 +- lib/default.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.php.sample b/config.php.sample index 473eb74e2c..91e6614c06 100644 --- a/config.php.sample +++ b/config.php.sample @@ -154,7 +154,7 @@ $config['sphinx']['port'] = 3312; // $config['queue']['subsystem'] = 'stomp'; // $config['queue']['stomp_server'] = 'tcp://localhost:61613'; // use different queue_basename for each statusnet instance managed by the server -// $config['queue']['queue_basename'] = 'statusnet'; +// $config['queue']['queue_basename'] = '/queue/statusnet/'; // The following customise the behaviour of the various daemons: // $config['daemon']['piddir'] = '/var/run'; diff --git a/lib/default.php b/lib/default.php index db90aeca3e..ebb6f8d016 100644 --- a/lib/default.php +++ b/lib/default.php @@ -75,7 +75,7 @@ $default = array('enabled' => false, 'subsystem' => 'db', # default to database, or 'stomp' 'stomp_server' => null, - 'queue_basename' => 'statusnet', + 'queue_basename' => '/queue/statusnet/', 'stomp_username' => null, 'stomp_password' => null, ), From add126bc6c6eb574e00f171c2107b0406b7015e5 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 8 Dec 2009 14:56:11 -0500 Subject: [PATCH 052/172] add forward table --- db/statusnet.sql | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/db/statusnet.sql b/db/statusnet.sql index 18abcdfdb2..b500b81f2d 100644 --- a/db/statusnet.sql +++ b/db/statusnet.sql @@ -585,3 +585,14 @@ create table login_token ( constraint primary key (user_id) ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; +create table forward ( + + profile_id integer not null comment 'profile who forwarded the notice' references profile (id), + notice_id integer not null comment 'notice they forwarded' references notice (id), + + created datetime not null comment 'date this record was created', + + constraint primary key (profile_id, notice_id) + +) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; + From 4b5e977a7b1c390555d880d3dc7f8b8c6744646c Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 8 Dec 2009 12:17:11 -0800 Subject: [PATCH 053/172] New _m() gettext wrapper with smart detection of plugin domains. Plugin base class registers your gettext files if present at initialization. update_pot.sh replaced with update_po_templates.php which can do core, plugins, or all (default). Top-level Makefile added to build .mo files for plugins as well as core. As described on list: http://lists.status.net/pipermail/statusnet-dev/2009-December/002869.html --- Makefile | 18 + lib/language.php | 125 +++++- lib/plugin.php | 19 + plugins/Facebook/FBConnectAuth.php | 62 +-- plugins/Facebook/FBConnectLogin.php | 6 +- plugins/Facebook/FBConnectSettings.php | 30 +- plugins/Facebook/FacebookPlugin.php | 10 +- plugins/Facebook/facebookaction.php | 34 +- plugins/Facebook/facebookhome.php | 20 +- plugins/Facebook/facebookinvite.php | 12 +- plugins/Facebook/facebooklogin.php | 2 +- plugins/Facebook/facebookremove.php | 2 +- plugins/Facebook/facebooksettings.php | 20 +- plugins/Facebook/facebookutil.php | 4 +- plugins/Facebook/locale/Facebook.po | 394 ++++++++++++++++++ plugins/FeedSub/FeedSubPlugin.php | 5 +- plugins/FeedSub/actions/feedsubsettings.php | 40 +- plugins/FeedSub/feedmunger.php | 2 +- plugins/FeedSub/locale/FeedSub.po | 104 +++++ .../FeedSub/locale/fr/LC_MESSAGES/FeedSub.po | 106 +++++ plugins/FeedSub/tests/gettext-speedtest.php | 78 ++++ plugins/Mapstraction/MapstractionPlugin.php | 4 +- plugins/Mapstraction/allmap.php | 4 +- plugins/Mapstraction/locale/Mapstraction.po | 48 +++ plugins/Mapstraction/map.php | 4 +- plugins/Mapstraction/usermap.php | 2 +- plugins/OpenID/OpenIDPlugin.php | 8 +- plugins/OpenID/finishaddopenid.php | 16 +- plugins/OpenID/finishopenidlogin.php | 62 +-- plugins/OpenID/locale/OpenID.po | 344 +++++++++++++++ plugins/OpenID/openid.php | 18 +- plugins/OpenID/openidlogin.php | 22 +- plugins/OpenID/openidserver.php | 4 +- plugins/OpenID/openidsettings.php | 30 +- plugins/OpenID/openidtrust.php | 10 +- plugins/Sample/SamplePlugin.php | 59 +++ plugins/TwitterBridge/TwitterBridgePlugin.php | 4 +- plugins/TwitterBridge/locale/TwitterBridge.po | 128 ++++++ plugins/TwitterBridge/twitter.php | 4 +- .../TwitterBridge/twitterauthorization.php | 10 +- plugins/TwitterBridge/twittersettings.php | 42 +- scripts/update_po_templates.php | 211 ++++++++++ scripts/update_pot.sh | 13 - 43 files changed, 1873 insertions(+), 267 deletions(-) create mode 100644 Makefile create mode 100644 plugins/Facebook/locale/Facebook.po create mode 100644 plugins/FeedSub/locale/FeedSub.po create mode 100644 plugins/FeedSub/locale/fr/LC_MESSAGES/FeedSub.po create mode 100644 plugins/FeedSub/tests/gettext-speedtest.php create mode 100644 plugins/Mapstraction/locale/Mapstraction.po create mode 100644 plugins/OpenID/locale/OpenID.po create mode 100644 plugins/Sample/SamplePlugin.php create mode 100644 plugins/TwitterBridge/locale/TwitterBridge.po create mode 100755 scripts/update_po_templates.php delete mode 100755 scripts/update_pot.sh diff --git a/Makefile b/Makefile new file mode 100644 index 0000000000..6f45c1b83e --- /dev/null +++ b/Makefile @@ -0,0 +1,18 @@ +# Warning: do not transform tabs to spaces in this file. + +all : translations + +core_mo = $(patsubst %.po,%.mo,$(wildcard locale/*/LC_MESSAGES/statusnet.po)) +plugin_mo = $(patsubst %.po,%.mo,$(wildcard plugins/*/locale/*/LC_MESSAGES/*.po)) + +translations : $(core_mo) $(plugin_mo) + +clean : + rm -f $(core_mo) $(plugin_mo) + +updatepo : + php scripts/update_po_templates.php --all + +%.mo : %.po + msgfmt -o $@ $< + diff --git a/lib/language.php b/lib/language.php index 4fc45bafe9..ab46f1a656 100644 --- a/lib/language.php +++ b/lib/language.php @@ -36,6 +36,33 @@ if (!function_exists('gettext')) { require_once("php-gettext/gettext.inc"); } + +if (!function_exists('dpgettext')) { + /** + * Context-aware dgettext wrapper; use when messages in different contexts + * won't be distinguished from the English source but need different translations. + * The context string will appear as msgctxt in the .po files. + * + * Not currently exposed in PHP's gettext module; implemented to be compat + * with gettext.h's macros. + * + * @param string $domain domain identifier, or null for default domain + * @param string $context context identifier, should be some key like "menu|file" + * @param string $msgid English source text + * @return string original or translated message + */ + function dpgettext($domain, $context, $msg) + { + $msgid = $context . "\004" . $msg; + $out = dcgettext($domain, $msgid, LC_MESSAGES); + if ($out == $msgid) { + return $msg; + } else { + return $out; + } + } +} + if (!function_exists('pgettext')) { /** * Context-aware gettext wrapper; use when messages in different contexts @@ -50,9 +77,31 @@ if (!function_exists('pgettext')) { * @return string original or translated message */ function pgettext($context, $msg) + { + return dpgettext(textdomain(NULL), $context, $msg); + } +} + +if (!function_exists('dnpgettext')) { + /** + * Context-aware dngettext wrapper; use when messages in different contexts + * won't be distinguished from the English source but need different translations. + * The context string will appear as msgctxt in the .po files. + * + * Not currently exposed in PHP's gettext module; implemented to be compat + * with gettext.h's macros. + * + * @param string $domain domain identifier, or null for default domain + * @param string $context context identifier, should be some key like "menu|file" + * @param string $msg singular English source text + * @param string $plural plural English source text + * @param int $n number of items to control plural selection + * @return string original or translated message + */ + function dnpgettext($domain, $context, $msg, $plural, $n) { $msgid = $context . "\004" . $msg; - $out = dcgettext(textdomain(NULL), $msgid, LC_MESSAGES); + $out = dcngettext($domain, $msgid, $plural, $n, LC_MESSAGES); if ($out == $msgid) { return $msg; } else { @@ -78,14 +127,78 @@ if (!function_exists('npgettext')) { */ function npgettext($context, $msg, $plural, $n) { - $msgid = $context . "\004" . $msg; - $out = dcngettext(textdomain(NULL), $msgid, $plural, $n, LC_MESSAGES); - if ($out == $msgid) { - return $msg; + return dnpgettext(textdomain(NULL), $msgid, $plural, $n, LC_MESSAGES); + } +} + +/** + * Shortcut for *gettext functions with smart domain detection. + * + * If calling from a plugin, this function checks which plugin was + * being called from and uses that as text domain, which will have + * been set up during plugin initialization. + * + * Also handles plurals and contexts depending on what parameters + * are passed to it: + * + * gettext -> _m($msg) + * ngettext -> _m($msg1, $msg2, $n) + * pgettext -> _m($ctx, $msg) + * npgettext -> _m($ctx, $msg1, $msg2, $n) + * + * @fixme may not work properly in eval'd code + * + * @param string $msg + * @return string + */ +function _m($msg/*, ...*/) +{ + $domain = _mdomain(debug_backtrace(false)); + $args = func_get_args(); + switch(count($args)) { + case 1: return dgettext($domain, $msg); + case 2: return dpgettext($domain, $args[0], $args[1]); + case 3: return dngettext($domain, $args[0], $args[1], $args[2]); + case 4: return dnpgettext($domain, $args[0], $args[1], $args[2], $args[3]); + default: throw new Exception("Bad parameter count to _m()"); + } +} + +/** + * Looks for which plugin we've been called from to set the gettext domain. + * + * @param array $backtrace debug_backtrace() output + * @return string + * @private + * @fixme could explode if SN is under a 'plugins' folder or share name. + */ +function _mdomain($backtrace) +{ + /* + 0 => + array + 'file' => string '/var/www/mublog/plugins/FeedSub/FeedSubPlugin.php' (length=49) + 'line' => int 77 + 'function' => string '_m' (length=2) + 'args' => + array + 0 => &string 'Feeds' (length=5) + */ + static $cached; + $path = $backtrace[0]['file']; + if (!isset($cached[$path])) { + if (DIRECTORY_SEPARATOR !== '/') { + $path = strtr($path, DIRECTORY_SEPARATOR, '/'); + } + $cut = strpos($path, '/plugins/') + 9; + $cut2 = strpos($path, '/', $cut); + if ($cut && $cut2) { + $cached[$path] = substr($path, $cut, $cut2 - $cut); } else { - return $out; + return null; } } + return $cached[$path]; } diff --git a/lib/plugin.php b/lib/plugin.php index 2c77c3e120..de7313e59e 100644 --- a/lib/plugin.php +++ b/lib/plugin.php @@ -65,6 +65,8 @@ class Plugin Event::addHandler(mb_substr($method, 2), array($this, $method)); } } + + $this->setupGettext(); } function initialize() @@ -77,6 +79,22 @@ class Plugin return true; } + /** + * Checks if this plugin has localization that needs to be set up. + * Gettext localizations can be called via the _m() helper function. + */ + protected function setupGettext() + { + $class = get_class($this); + if (substr($class, -6) == 'Plugin') { + $name = substr($class, 0, -6); + $path = INSTALLDIR . "/plugins/$name/locale"; + if (file_exists($path) && is_dir($path)) { + bindtextdomain($name, $path); + } + } + } + protected function log($level, $msg) { common_log($level, get_class($this) . ': '.$msg); @@ -87,3 +105,4 @@ class Plugin $this->log(LOG_DEBUG, $msg); } } + diff --git a/plugins/Facebook/FBConnectAuth.php b/plugins/Facebook/FBConnectAuth.php index b909a49771..51bfc38657 100644 --- a/plugins/Facebook/FBConnectAuth.php +++ b/plugins/Facebook/FBConnectAuth.php @@ -48,8 +48,8 @@ class FBConnectauthAction extends Action common_log(LOG_WARNING, 'Facebook Connect Plugin - ' . "Failed auth attempt, proxy = $proxy, ip = $ip."); - $this->clientError(_('You must be logged into Facebook to ' . - 'use Facebook Connect.')); + $this->clientError(_m('You must be logged into Facebook to ' . + 'use Facebook Connect.')); } return true; @@ -74,7 +74,7 @@ class FBConnectauthAction extends Action // We don't want these cookies getFacebook()->clear_cookie_state(); - $this->clientError(_('There is already a local user linked with this Facebook.')); + $this->clientError(_m('There is already a local user linked with this Facebook.')); } else { @@ -87,12 +87,12 @@ class FBConnectauthAction extends Action $token = $this->trimmed('token'); if (!$token || $token != common_session_token()) { - $this->showForm(_('There was a problem with your session token. Try again, please.')); + $this->showForm(_m('There was a problem with your session token. Try again, please.')); return; } if ($this->arg('create')) { if (!$this->boolean('license')) { - $this->showForm(_('You can\'t register if you don\'t agree to the license.'), + $this->showForm(_m('You can\'t register if you don\'t agree to the license.'), $this->trimmed('newname')); return; } @@ -102,7 +102,7 @@ class FBConnectauthAction extends Action } else { common_debug('Facebook Connect Plugin - ' . print_r($this->args, true)); - $this->showForm(_('Something weird happened.'), + $this->showForm(_m('Something weird happened.'), $this->trimmed('newname')); } } else { @@ -116,13 +116,13 @@ class FBConnectauthAction extends Action $this->element('div', array('class' => 'error'), $this->error); } else { $this->element('div', 'instructions', - sprintf(_('This is the first time you\'ve logged into %s so we must connect your Facebook to a local account. You can either create a new account, or connect with your existing account, if you have one.'), common_config('site', 'name'))); + sprintf(_m('This is the first time you\'ve logged into %s so we must connect your Facebook to a local account. You can either create a new account, or connect with your existing account, if you have one.'), common_config('site', 'name'))); } } function title() { - return _('Facebook Account Setup'); + return _m('Facebook Account Setup'); } function showForm($error=null, $username=null) @@ -150,7 +150,7 @@ class FBConnectauthAction extends Action 'class' => 'form_settings', 'action' => common_local_url('FBConnectAuth'))); $this->elementStart('fieldset', array('id' => 'settings_facebook_connect_options')); - $this->element('legend', null, _('Connection options')); + $this->element('legend', null, _m('Connection options')); $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->element('input', array('type' => 'checkbox', @@ -159,10 +159,10 @@ class FBConnectauthAction extends Action 'name' => 'license', 'value' => 'true')); $this->elementStart('label', array('class' => 'checkbox', 'for' => 'license')); - $this->text(_('My text and files are available under ')); + $this->text(_m('My text and files are available under ')); $this->element('a', array('href' => common_config('license', 'url')), common_config('license', 'title')); - $this->text(_(' except this private data: password, email address, IM address, phone number.')); + $this->text(_m(' except this private data: password, email address, IM address, phone number.')); $this->elementEnd('label'); $this->elementEnd('li'); $this->elementEnd('ul'); @@ -170,33 +170,33 @@ class FBConnectauthAction extends Action $this->elementStart('fieldset'); $this->hidden('token', common_session_token()); $this->element('legend', null, - _('Create new account')); + _m('Create new account')); $this->element('p', null, - _('Create a new user with this nickname.')); + _m('Create a new user with this nickname.')); $this->elementStart('ul', 'form_data'); $this->elementStart('li'); - $this->input('newname', _('New nickname'), + $this->input('newname', _m('New nickname'), ($this->username) ? $this->username : '', - _('1-64 lowercase letters or numbers, no punctuation or spaces')); + _m('1-64 lowercase letters or numbers, no punctuation or spaces')); $this->elementEnd('li'); $this->elementEnd('ul'); - $this->submit('create', _('Create')); + $this->submit('create', _m('Create')); $this->elementEnd('fieldset'); $this->elementStart('fieldset'); $this->element('legend', null, - _('Connect existing account')); + _m('Connect existing account')); $this->element('p', null, - _('If you already have an account, login with your username and password to connect it to your Facebook.')); + _m('If you already have an account, login with your username and password to connect it to your Facebook.')); $this->elementStart('ul', 'form_data'); $this->elementStart('li'); - $this->input('nickname', _('Existing nickname')); + $this->input('nickname', _m('Existing nickname')); $this->elementEnd('li'); $this->elementStart('li'); - $this->password('password', _('Password')); + $this->password('password', _m('Password')); $this->elementEnd('li'); $this->elementEnd('ul'); - $this->submit('connect', _('Connect')); + $this->submit('connect', _m('Connect')); $this->elementEnd('fieldset'); $this->elementEnd('fieldset'); @@ -212,7 +212,7 @@ class FBConnectauthAction extends Action function createNewUser() { if (common_config('site', 'closed')) { - $this->clientError(_('Registration not allowed.')); + $this->clientError(_m('Registration not allowed.')); return; } @@ -221,14 +221,14 @@ class FBConnectauthAction extends Action if (common_config('site', 'inviteonly')) { $code = $_SESSION['invitecode']; if (empty($code)) { - $this->clientError(_('Registration not allowed.')); + $this->clientError(_m('Registration not allowed.')); return; } $invite = Invitation::staticGet($code); if (empty($invite)) { - $this->clientError(_('Not a valid invitation code.')); + $this->clientError(_m('Not a valid invitation code.')); return; } } @@ -238,17 +238,17 @@ class FBConnectauthAction extends Action if (!Validate::string($nickname, array('min_length' => 1, 'max_length' => 64, 'format' => NICKNAME_FMT))) { - $this->showForm(_('Nickname must have only lowercase letters and numbers and no spaces.')); + $this->showForm(_m('Nickname must have only lowercase letters and numbers and no spaces.')); return; } if (!User::allowed_nickname($nickname)) { - $this->showForm(_('Nickname not allowed.')); + $this->showForm(_m('Nickname not allowed.')); return; } if (User::staticGet('nickname', $nickname)) { - $this->showForm(_('Nickname already in use. Try another one.')); + $this->showForm(_m('Nickname already in use. Try another one.')); return; } @@ -266,7 +266,7 @@ class FBConnectauthAction extends Action $result = $this->flinkUser($user->id, $this->fbuid); if (!$result) { - $this->serverError(_('Error connecting user to Facebook.')); + $this->serverError(_m('Error connecting user to Facebook.')); return; } @@ -286,7 +286,7 @@ class FBConnectauthAction extends Action $password = $this->trimmed('password'); if (!common_check_user($nickname, $password)) { - $this->showForm(_('Invalid username or password.')); + $this->showForm(_m('Invalid username or password.')); return; } @@ -300,7 +300,7 @@ class FBConnectauthAction extends Action $result = $this->flinkUser($user->id, $this->fbuid); if (!$result) { - $this->serverError(_('Error connecting user to Facebook.')); + $this->serverError(_m('Error connecting user to Facebook.')); return; } @@ -320,7 +320,7 @@ class FBConnectauthAction extends Action $result = $this->flinkUser($user->id, $this->fbuid); if (empty($result)) { - $this->serverError(_('Error connecting user to Facebook.')); + $this->serverError(_m('Error connecting user to Facebook.')); return; } diff --git a/plugins/Facebook/FBConnectLogin.php b/plugins/Facebook/FBConnectLogin.php index d2bb8054c9..20c409f3ea 100644 --- a/plugins/Facebook/FBConnectLogin.php +++ b/plugins/Facebook/FBConnectLogin.php @@ -30,7 +30,7 @@ class FBConnectLoginAction extends Action parent::handle($args); if (common_is_real_login()) { - $this->clientError(_('Already logged in.')); + $this->clientError(_m('Already logged in.')); } $this->showPage(); @@ -38,7 +38,7 @@ class FBConnectLoginAction extends Action function getInstructions() { - return _('Login with your Facebook Account'); + return _m('Login with your Facebook Account'); } function showPageNotice() @@ -52,7 +52,7 @@ class FBConnectLoginAction extends Action function title() { - return _('Facebook Login'); + return _m('Facebook Login'); } function showContent() { diff --git a/plugins/Facebook/FBConnectSettings.php b/plugins/Facebook/FBConnectSettings.php index 911c567873..590dffd8a9 100644 --- a/plugins/Facebook/FBConnectSettings.php +++ b/plugins/Facebook/FBConnectSettings.php @@ -53,7 +53,7 @@ class FBConnectSettingsAction extends ConnectSettingsAction function title() { - return _('Facebook Connect Settings'); + return _m('Facebook Connect Settings'); } /** @@ -64,7 +64,7 @@ class FBConnectSettingsAction extends ConnectSettingsAction function getInstructions() { - return _('Manage how your account connects to Facebook'); + return _m('Manage how your account connects to Facebook'); } /** @@ -89,7 +89,7 @@ class FBConnectSettingsAction extends ConnectSettingsAction if (!$flink) { $this->element('p', 'instructions', - _('There is no Facebook user connected to this account.')); + _m('There is no Facebook user connected to this account.')); $this->element('fb:login-button', array('onlogin' => 'goto_login()', 'length' => 'long')); @@ -97,7 +97,7 @@ class FBConnectSettingsAction extends ConnectSettingsAction } else { $this->element('p', 'form_note', - _('Connected Facebook user')); + _m('Connected Facebook user')); $this->elementStart('p', array('class' => 'facebook-user-display')); $this->elementStart('fb:profile-pic', @@ -116,18 +116,18 @@ class FBConnectSettingsAction extends ConnectSettingsAction $this->elementStart('fieldset'); - $this->element('legend', null, _('Disconnect my account from Facebook')); + $this->element('legend', null, _m('Disconnect my account from Facebook')); if (!$user->password) { $this->elementStart('p', array('class' => 'form_guide')); - $this->text(_('Disconnecting your Faceboook ' . - 'would make it impossible to log in! Please ')); + $this->text(_m('Disconnecting your Faceboook ' . + 'would make it impossible to log in! Please ')); $this->element('a', array('href' => common_local_url('passwordsettings')), - _('set a password')); + _m('set a password')); - $this->text(_(' first.')); + $this->text(_m(' first.')); $this->elementEnd('p'); } else { @@ -139,7 +139,7 @@ class FBConnectSettingsAction extends ConnectSettingsAction $this->element('p', 'instructions', sprintf($note, $site, $site)); - $this->submit('disconnect', _('Disconnect')); + $this->submit('disconnect', _m('Disconnect')); } $this->elementEnd('fieldset'); @@ -161,8 +161,8 @@ class FBConnectSettingsAction extends ConnectSettingsAction // CSRF protection $token = $this->trimmed('token'); if (!$token || $token != common_session_token()) { - $this->showForm(_('There was a problem with your session token. '. - 'Try again, please.')); + $this->showForm(_m('There was a problem with your session token. '. + 'Try again, please.')); return; } @@ -175,7 +175,7 @@ class FBConnectSettingsAction extends ConnectSettingsAction if ($result === false) { common_log_db_error($user, 'DELETE', __FILE__); - $this->serverError(_('Couldn\'t delete link to Facebook.')); + $this->serverError(_m('Couldn\'t delete link to Facebook.')); return; } @@ -191,10 +191,10 @@ class FBConnectSettingsAction extends ConnectSettingsAction $e->getMessage()); } - $this->showForm(_('You have disconnected from Facebook.'), true); + $this->showForm(_m('You have disconnected from Facebook.'), true); } else { - $this->showForm(_('Not sure what you\'re trying to do.')); + $this->showForm(_m('Not sure what you\'re trying to do.')); return; } diff --git a/plugins/Facebook/FacebookPlugin.php b/plugins/Facebook/FacebookPlugin.php index 40c911cce3..39b2ef2876 100644 --- a/plugins/Facebook/FacebookPlugin.php +++ b/plugins/Facebook/FacebookPlugin.php @@ -406,9 +406,9 @@ class FacebookPlugin extends Plugin $action_name = $action->trimmed('action'); $action->menuItem(common_local_url('FBConnectLogin'), - _('Facebook'), - _('Login or register using Facebook'), - 'FBConnectLogin' === $action_name); + _m('Facebook'), + _m('Login or register using Facebook'), + 'FBConnectLogin' === $action_name); return true; } @@ -426,8 +426,8 @@ class FacebookPlugin extends Plugin $action_name = $action->trimmed('action'); $action->menuItem(common_local_url('FBConnectSettings'), - _('Facebook'), - _('Facebook Connect Settings'), + _m('Facebook'), + _m('Facebook Connect Settings'), $action_name === 'FBConnectSettings'); return true; diff --git a/plugins/Facebook/facebookaction.php b/plugins/Facebook/facebookaction.php index b090e9bd9a..705bb2780d 100644 --- a/plugins/Facebook/facebookaction.php +++ b/plugins/Facebook/facebookaction.php @@ -168,7 +168,7 @@ class FacebookAction extends Action $this->elementStart('li', array('class' => ($this->action == 'facebookhome') ? 'current' : 'facebook_home')); $this->element('a', - array('href' => 'index.php', 'title' => _('Home')), _('Home')); + array('href' => 'index.php', 'title' => _m('Home')), _m('Home')); $this->elementEnd('li'); if (common_config('invite', 'enabled')) { @@ -176,7 +176,7 @@ class FacebookAction extends Action array('class' => ($this->action == 'facebookinvite') ? 'current' : 'facebook_invite')); $this->element('a', - array('href' => 'invite.php', 'title' => _('Invite')), _('Invite')); + array('href' => 'invite.php', 'title' => _m('Invite')), _m('Invite')); $this->elementEnd('li'); } @@ -185,7 +185,7 @@ class FacebookAction extends Action ($this->action == 'facebooksettings') ? 'current' : 'facebook_settings')); $this->element('a', array('href' => 'settings.php', - 'title' => _('Settings')), _('Settings')); + 'title' => _m('Settings')), _m('Settings')); $this->elementEnd('li'); $this->elementEnd('ul'); @@ -225,15 +225,15 @@ class FacebookAction extends Action $this->elementStart('dl', array('class' => 'system_notice')); $this->element('dt', null, 'Page Notice'); - $loginmsg_part1 = _('To use the %s Facebook Application you need to login ' . + $loginmsg_part1 = _m('To use the %s Facebook Application you need to login ' . 'with your username and password. Don\'t have a username yet? '); - $loginmsg_part2 = _(' a new account.'); + $loginmsg_part2 = _m(' a new account.'); $this->elementStart('dd'); $this->elementStart('p'); $this->text(sprintf($loginmsg_part1, common_config('site', 'name'))); $this->element('a', - array('href' => common_local_url('register')), _('Register')); + array('href' => common_local_url('register')), _m('Register')); $this->text($loginmsg_part2); $this->elementEnd('p'); $this->elementEnd('dd'); @@ -246,7 +246,7 @@ class FacebookAction extends Action { $this->elementStart('div', array('id' => 'content')); - $this->element('h1', null, _('Login')); + $this->element('h1', null, _m('Login')); if ($msg) { $this->element('fb:error', array('message' => $msg)); @@ -265,20 +265,20 @@ class FacebookAction extends Action $this->elementStart('ul', array('class' => 'form_datas')); $this->elementStart('li'); - $this->input('nickname', _('Nickname')); + $this->input('nickname', _m('Nickname')); $this->elementEnd('li'); $this->elementStart('li'); - $this->password('password', _('Password')); + $this->password('password', _m('Password')); $this->elementEnd('li'); $this->elementEnd('ul'); - $this->submit('submit', _('Login')); + $this->submit('submit', _m('Login')); $this->elementEnd('fieldset'); $this->elementEnd('form'); $this->elementStart('p'); $this->element('a', array('href' => common_local_url('recoverpassword')), - _('Lost or forgotten password?')); + _m('Lost or forgotten password?')); $this->elementEnd('p'); $this->elementEnd('div'); @@ -383,7 +383,7 @@ class FacebookAction extends Action // Does a little before-after block for next/prev page if ($have_before || $have_after) { $this->elementStart('dl', 'pagination'); - $this->element('dt', null, _('Pagination')); + $this->element('dt', null, _m('Pagination')); $this->elementStart('dd', null); $this->elementStart('ul', array('class' => 'nav')); } @@ -392,7 +392,7 @@ class FacebookAction extends Action $newargs = $args ? array_merge($args, $pargs) : $pargs; $this->elementStart('li', array('class' => 'nav_prev')); $this->element('a', array('href' => "$this->app_uri/$action?page=$newargs[page]", 'rel' => 'prev'), - _('After')); + _m('After')); $this->elementEnd('li'); } if ($have_after) { @@ -400,7 +400,7 @@ class FacebookAction extends Action $newargs = $args ? array_merge($args, $pargs) : $pargs; $this->elementStart('li', array('class' => 'nav_next')); $this->element('a', array('href' => "$this->app_uri/$action?page=$newargs[page]", 'rel' => 'next'), - _('Before')); + _m('Before')); $this->elementEnd('li'); } if ($have_before || $have_after) { @@ -418,13 +418,13 @@ class FacebookAction extends Action $content = $this->trimmed('status_textarea'); if (!$content) { - $this->showPage(_('No notice content!')); + $this->showPage(_m('No notice content!')); return; } else { $content_shortened = common_shorten_links($content); if (Notice::contentTooLong($content_shortened)) { - $this->showPage(sprintf(_('That\'s too long. Max notice size is %d chars.'), + $this->showPage(sprintf(_m('That\'s too long. Max notice size is %d chars.'), Notice::maxContent())); return; } @@ -520,7 +520,7 @@ class FacebookNoticeList extends NoticeList function show() { $this->out->elementStart('div', array('id' =>'notices_primary')); - $this->out->element('h2', null, _('Notices')); + $this->out->element('h2', null, _m('Notices')); $this->out->elementStart('ul', array('class' => 'notices')); $cnt = 0; diff --git a/plugins/Facebook/facebookhome.php b/plugins/Facebook/facebookhome.php index ea141c2c2d..60782f63c9 100644 --- a/plugins/Facebook/facebookhome.php +++ b/plugins/Facebook/facebookhome.php @@ -108,7 +108,7 @@ class FacebookhomeAction extends FacebookAction $user = User::staticGet('nickname', $nickname); if (!$user) { - $this->showLoginForm(_("Server error - couldn't get user!")); + $this->showLoginForm(_m("Server error - couldn't get user!")); } $flink = DB_DataObject::factory('foreign_link'); @@ -128,7 +128,7 @@ class FacebookhomeAction extends FacebookAction return; } else { - $msg = _('Incorrect username or password.'); + $msg = _m('Incorrect username or password.'); } } @@ -155,9 +155,9 @@ class FacebookhomeAction extends FacebookAction function title() { if ($this->page > 1) { - return sprintf(_("%s and friends, page %d"), $this->user->nickname, $this->page); + return sprintf(_m("%s and friends, page %d"), $this->user->nickname, $this->page); } else { - return sprintf(_("%s and friends"), $this->user->nickname); + return sprintf(_m("%s and friends"), $this->user->nickname); } } @@ -186,7 +186,7 @@ class FacebookhomeAction extends FacebookAction $this->elementStart('div', array('class' => 'facebook_guide')); - $instructions = sprintf(_('If you would like the %s app to automatically update ' . + $instructions = sprintf(_m('If you would like the %s app to automatically update ' . 'your Facebook status with your latest notice, you need ' . 'to give it permission.'), $this->app_name); @@ -210,13 +210,13 @@ class FacebookhomeAction extends FacebookAction $this->elementStart('span', array('class' => 'facebook-button')); $this->element('a', array('href' => $auth_url), - sprintf(_('Okay, do it!'), $this->app_name)); + sprintf(_m('Okay, do it!'), $this->app_name)); $this->elementEnd('span'); $this->elementEnd('li'); $this->elementStart('li', array('id' => 'fb-permissions-item')); - $this->submit('skip', _('Skip')); + $this->submit('skip', _m('Skip')); $this->elementEnd('li'); $this->elementEnd('ul'); @@ -245,7 +245,7 @@ class FacebookhomeAction extends FacebookAction if ($have_before || $have_after) { $this->elementStart('dl', 'pagination'); - $this->element('dt', null, _('Pagination')); + $this->element('dt', null, _m('Pagination')); $this->elementStart('dd', null); $this->elementStart('ul', array('class' => 'nav')); } @@ -254,7 +254,7 @@ class FacebookhomeAction extends FacebookAction $newargs = $args ? array_merge($args, $pargs) : $pargs; $this->elementStart('li', array('class' => 'nav_prev')); $this->element('a', array('href' => "$action?page=$newargs[page]", 'rel' => 'prev'), - _('After')); + _m('After')); $this->elementEnd('li'); } if ($have_after) { @@ -262,7 +262,7 @@ class FacebookhomeAction extends FacebookAction $newargs = $args ? array_merge($args, $pargs) : $pargs; $this->elementStart('li', array('class' => 'nav_next')); $this->element('a', array('href' => "$action?page=$newargs[page]", 'rel' => 'next'), - _('Before')); + _m('Before')); $this->elementEnd('li'); } if ($have_before || $have_after) { diff --git a/plugins/Facebook/facebookinvite.php b/plugins/Facebook/facebookinvite.php index 3380b4c857..e02c7bf3ed 100644 --- a/plugins/Facebook/facebookinvite.php +++ b/plugins/Facebook/facebookinvite.php @@ -69,9 +69,9 @@ class FacebookinviteAction extends FacebookAction function showSuccessContent() { - $this->element('h2', null, sprintf(_('Thanks for inviting your friends to use %s'), + $this->element('h2', null, sprintf(_m('Thanks for inviting your friends to use %s'), common_config('site', 'name'))); - $this->element('p', null, _('Invitations have been sent to the following users:')); + $this->element('p', null, _m('Invitations have been sent to the following users:')); $friend_ids = $_POST['ids']; // XXX: Hmm... is this the best way to access the list? @@ -91,7 +91,7 @@ class FacebookinviteAction extends FacebookAction function showFormContent() { - $content = sprintf(_('You have been invited to %s'), common_config('site', 'name')) . + $content = sprintf(_m('You have been invited to %s'), common_config('site', 'name')) . htmlentities(''); $this->elementStart('fb:request-form', array('action' => 'invite.php', @@ -100,7 +100,7 @@ class FacebookinviteAction extends FacebookAction 'type' => common_config('site', 'name'), 'content' => $content)); $this->hidden('invite', 'true'); - $actiontext = sprintf(_('Invite your friends to use %s'), common_config('site', 'name')); + $actiontext = sprintf(_m('Invite your friends to use %s'), common_config('site', 'name')); $multi_params = array('showborder' => 'false'); $multi_params['actiontext'] = $actiontext; @@ -122,7 +122,7 @@ class FacebookinviteAction extends FacebookAction if ($exclude_ids) { - $this->element('h2', null, sprintf(_('Friends already using %s:'), + $this->element('h2', null, sprintf(_m('Friends already using %s:'), common_config('site', 'name'))); $this->elementStart('ul', array('id' => 'facebook-friends')); @@ -140,7 +140,7 @@ class FacebookinviteAction extends FacebookAction function title() { - return sprintf(_('Send invitations')); + return sprintf(_m('Send invitations')); } } diff --git a/plugins/Facebook/facebooklogin.php b/plugins/Facebook/facebooklogin.php index f77aecca36..7a173ddaeb 100644 --- a/plugins/Facebook/facebooklogin.php +++ b/plugins/Facebook/facebooklogin.php @@ -88,7 +88,7 @@ class FacebookinviteAction extends FacebookAction function title() { - return sprintf(_('Login')); + return sprintf(_m('Login')); } function redirectHome() diff --git a/plugins/Facebook/facebookremove.php b/plugins/Facebook/facebookremove.php index 8531a8e6ea..09cb333428 100644 --- a/plugins/Facebook/facebookremove.php +++ b/plugins/Facebook/facebookremove.php @@ -55,7 +55,7 @@ class FacebookremoveAction extends FacebookAction if (!$result) { common_log_db_error($flink, 'DELETE', __FILE__); - $this->serverError(_('Couldn\'t remove Facebook user.')); + $this->serverError(_m('Couldn\'t remove Facebook user.')); return; } diff --git a/plugins/Facebook/facebooksettings.php b/plugins/Facebook/facebooksettings.php index d1269f1013..766d0e1996 100644 --- a/plugins/Facebook/facebooksettings.php +++ b/plugins/Facebook/facebooksettings.php @@ -71,9 +71,9 @@ class FacebooksettingsAction extends FacebookAction $trimmed); if ($result === false) { - $this->showForm(_('There was a problem saving your sync preferences!')); + $this->showForm(_m('There was a problem saving your sync preferences!')); } else { - $this->showForm(_('Sync preferences saved.'), true); + $this->showForm(_m('Sync preferences saved.'), true); } } @@ -96,14 +96,14 @@ class FacebooksettingsAction extends FacebookAction $this->elementStart('li'); - $this->checkbox('noticesync', _('Automatically update my Facebook status with my notices.'), + $this->checkbox('noticesync', _m('Automatically update my Facebook status with my notices.'), ($this->flink) ? ($this->flink->noticesync & FOREIGN_NOTICE_SEND) : true); $this->elementEnd('li'); $this->elementStart('li'); - $this->checkbox('replysync', _('Send "@" replies to Facebook.'), + $this->checkbox('replysync', _m('Send "@" replies to Facebook.'), ($this->flink) ? ($this->flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) : true); $this->elementEnd('li'); @@ -112,15 +112,15 @@ class FacebooksettingsAction extends FacebookAction $prefix = trim($this->facebook->api_client->data_getUserPreference(FACEBOOK_NOTICE_PREFIX)); - $this->input('prefix', _('Prefix'), + $this->input('prefix', _m('Prefix'), ($prefix) ? $prefix : null, - _('A string to prefix notices with.')); + _m('A string to prefix notices with.')); $this->elementEnd('li'); $this->elementStart('li'); - $this->submit('save', _('Save')); + $this->submit('save', _m('Save')); $this->elementEnd('li'); @@ -130,7 +130,7 @@ class FacebooksettingsAction extends FacebookAction } else { - $instructions = sprintf(_('If you would like %s to automatically update ' . + $instructions = sprintf(_m('If you would like %s to automatically update ' . 'your Facebook status with your latest notice, you need ' . 'to give it permission.'), $this->app_name); @@ -143,7 +143,7 @@ class FacebooksettingsAction extends FacebookAction $this->elementStart('fb:prompt-permission', array('perms' => 'publish_stream', 'next_fbjs' => 'document.setLocation(\'' . "$this->app_uri/settings.php" . '\')')); $this->element('span', array('class' => 'facebook-button'), - sprintf(_('Allow %s to update my Facebook status'), common_config('site', 'name'))); + sprintf(_m('Allow %s to update my Facebook status'), common_config('site', 'name'))); $this->elementEnd('fb:prompt-permission'); $this->elementEnd('li'); $this->elementEnd('ul'); @@ -153,7 +153,7 @@ class FacebooksettingsAction extends FacebookAction function title() { - return _('Sync preferences'); + return _m('Sync preferences'); } } diff --git a/plugins/Facebook/facebookutil.php b/plugins/Facebook/facebookutil.php index 2abcbb14e2..2ec6db6b8d 100644 --- a/plugins/Facebook/facebookutil.php +++ b/plugins/Facebook/facebookutil.php @@ -277,10 +277,10 @@ function mail_facebook_app_removed($user) $site_name = common_config('site', 'name'); $subject = sprintf( - _('Your %1$s Facebook application access has been disabled.', + _m('Your %1$s Facebook application access has been disabled.', $site_name)); - $body = sprintf(_("Hi, %1\$s. We're sorry to inform you that we are " . + $body = sprintf(_m("Hi, %1\$s. We're sorry to inform you that we are " . 'unable to update your Facebook status from %2$s, and have disabled ' . 'the Facebook application for your account. This may be because ' . 'you have removed the Facebook application\'s authorization, or ' . diff --git a/plugins/Facebook/locale/Facebook.po b/plugins/Facebook/locale/Facebook.po new file mode 100644 index 0000000000..5b313c8c53 --- /dev/null +++ b/plugins/Facebook/locale/Facebook.po @@ -0,0 +1,394 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-07 20:38-0800\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: facebookaction.php:171 +msgid "Home" +msgstr "" + +#: facebookaction.php:179 +msgid "Invite" +msgstr "" + +#: facebookaction.php:188 +msgid "Settings" +msgstr "" + +#: facebookaction.php:228 +#, php-format +msgid "" +"To use the %s Facebook Application you need to login with your username and " +"password. Don't have a username yet? " +msgstr "" + +#: facebookaction.php:230 +msgid " a new account." +msgstr "" + +#: facebookaction.php:236 +msgid "Register" +msgstr "" + +#: facebookaction.php:249 facebookaction.php:275 facebooklogin.php:91 +msgid "Login" +msgstr "" + +#: facebookaction.php:268 +msgid "Nickname" +msgstr "" + +#: facebookaction.php:271 FBConnectAuth.php:196 +msgid "Password" +msgstr "" + +#: facebookaction.php:281 +msgid "Lost or forgotten password?" +msgstr "" + +#: facebookaction.php:386 facebookhome.php:248 +msgid "Pagination" +msgstr "" + +#: facebookaction.php:395 facebookhome.php:257 +msgid "After" +msgstr "" + +#: facebookaction.php:403 facebookhome.php:265 +msgid "Before" +msgstr "" + +#: facebookaction.php:421 +msgid "No notice content!" +msgstr "" + +#: facebookaction.php:427 +#, php-format +msgid "That's too long. Max notice size is %d chars." +msgstr "" + +#: facebookaction.php:523 +msgid "Notices" +msgstr "" + +#: facebookutil.php:280 +#, php-format +msgid "Your %1$s Facebook application access has been disabled." +msgstr "" + +#: facebookutil.php:283 +#, php-format +msgid "" +"Hi, %1$s. We're sorry to inform you that we are unable to update your " +"Facebook status from %2$s, and have disabled the Facebook application for " +"your account. This may be because you have removed the Facebook " +"application's authorization, or have deleted your Facebook account. You can " +"re-enable the Facebook application and automatic status updating by re-" +"installing the %2$s Facebook application.\n" +"\n" +"Regards,\n" +"\n" +"%2$s" +msgstr "" + +#: FBConnectLogin.php:33 +msgid "Already logged in." +msgstr "" + +#: FBConnectLogin.php:41 +msgid "Login with your Facebook Account" +msgstr "" + +#: FBConnectLogin.php:55 +msgid "Facebook Login" +msgstr "" + +#: facebookhome.php:111 +msgid "Server error - couldn't get user!" +msgstr "" + +#: facebookhome.php:131 +msgid "Incorrect username or password." +msgstr "" + +#: facebookhome.php:158 +#, php-format +msgid "%s and friends, page %d" +msgstr "" + +#: facebookhome.php:160 +#, php-format +msgid "%s and friends" +msgstr "" + +#: facebookhome.php:189 +#, php-format +msgid "" +"If you would like the %s app to automatically update your Facebook status " +"with your latest notice, you need to give it permission." +msgstr "" + +#: facebookhome.php:213 +msgid "Okay, do it!" +msgstr "" + +#: facebookhome.php:219 +msgid "Skip" +msgstr "" + +#: facebooksettings.php:74 +msgid "There was a problem saving your sync preferences!" +msgstr "" + +#: facebooksettings.php:76 +msgid "Sync preferences saved." +msgstr "" + +#: facebooksettings.php:99 +msgid "Automatically update my Facebook status with my notices." +msgstr "" + +#: facebooksettings.php:106 +msgid "Send \"@\" replies to Facebook." +msgstr "" + +#: facebooksettings.php:115 +msgid "Prefix" +msgstr "" + +#: facebooksettings.php:117 +msgid "A string to prefix notices with." +msgstr "" + +#: facebooksettings.php:123 +msgid "Save" +msgstr "" + +#: facebooksettings.php:133 +#, php-format +msgid "" +"If you would like %s to automatically update your Facebook status with your " +"latest notice, you need to give it permission." +msgstr "" + +#: facebooksettings.php:146 +#, php-format +msgid "Allow %s to update my Facebook status" +msgstr "" + +#: facebooksettings.php:156 +msgid "Sync preferences" +msgstr "" + +#: facebookinvite.php:72 +#, php-format +msgid "Thanks for inviting your friends to use %s" +msgstr "" + +#: facebookinvite.php:74 +msgid "Invitations have been sent to the following users:" +msgstr "" + +#: facebookinvite.php:94 +#, php-format +msgid "You have been invited to %s" +msgstr "" + +#: facebookinvite.php:103 +#, php-format +msgid "Invite your friends to use %s" +msgstr "" + +#: facebookinvite.php:125 +#, php-format +msgid "Friends already using %s:" +msgstr "" + +#: facebookinvite.php:143 +msgid "Send invitations" +msgstr "" + +#: facebookremove.php:58 +msgid "Couldn't remove Facebook user." +msgstr "" + +#: FBConnectSettings.php:56 FacebookPlugin.php:430 +msgid "Facebook Connect Settings" +msgstr "" + +#: FBConnectSettings.php:67 +msgid "Manage how your account connects to Facebook" +msgstr "" + +#: FBConnectSettings.php:92 +msgid "There is no Facebook user connected to this account." +msgstr "" + +#: FBConnectSettings.php:100 +msgid "Connected Facebook user" +msgstr "" + +#: FBConnectSettings.php:119 +msgid "Disconnect my account from Facebook" +msgstr "" + +#: FBConnectSettings.php:124 +msgid "" +"Disconnecting your Faceboook would make it impossible to log in! Please " +msgstr "" + +#: FBConnectSettings.php:128 +msgid "set a password" +msgstr "" + +#: FBConnectSettings.php:130 +msgid " first." +msgstr "" + +#: FBConnectSettings.php:142 +msgid "Disconnect" +msgstr "" + +#: FBConnectSettings.php:164 FBConnectAuth.php:90 +msgid "There was a problem with your session token. Try again, please." +msgstr "" + +#: FBConnectSettings.php:178 +msgid "Couldn't delete link to Facebook." +msgstr "" + +#: FBConnectSettings.php:194 +msgid "You have disconnected from Facebook." +msgstr "" + +#: FBConnectSettings.php:197 +msgid "Not sure what you're trying to do." +msgstr "" + +#: FBConnectAuth.php:51 +msgid "You must be logged into Facebook to use Facebook Connect." +msgstr "" + +#: FBConnectAuth.php:77 +msgid "There is already a local user linked with this Facebook." +msgstr "" + +#: FBConnectAuth.php:95 +msgid "You can't register if you don't agree to the license." +msgstr "" + +#: FBConnectAuth.php:105 +msgid "Something weird happened." +msgstr "" + +#: FBConnectAuth.php:119 +#, php-format +msgid "" +"This is the first time you've logged into %s so we must connect your " +"Facebook to a local account. You can either create a new account, or connect " +"with your existing account, if you have one." +msgstr "" + +#: FBConnectAuth.php:125 +msgid "Facebook Account Setup" +msgstr "" + +#: FBConnectAuth.php:153 +msgid "Connection options" +msgstr "" + +#: FBConnectAuth.php:162 +msgid "My text and files are available under " +msgstr "" + +#: FBConnectAuth.php:165 +msgid "" +" except this private data: password, email address, IM address, phone number." +msgstr "" + +#: FBConnectAuth.php:173 +msgid "Create new account" +msgstr "" + +#: FBConnectAuth.php:175 +msgid "Create a new user with this nickname." +msgstr "" + +#: FBConnectAuth.php:178 +msgid "New nickname" +msgstr "" + +#: FBConnectAuth.php:180 +msgid "1-64 lowercase letters or numbers, no punctuation or spaces" +msgstr "" + +#: FBConnectAuth.php:183 +msgid "Create" +msgstr "" + +#: FBConnectAuth.php:188 +msgid "Connect existing account" +msgstr "" + +#: FBConnectAuth.php:190 +msgid "" +"If you already have an account, login with your username and password to " +"connect it to your Facebook." +msgstr "" + +#: FBConnectAuth.php:193 +msgid "Existing nickname" +msgstr "" + +#: FBConnectAuth.php:199 +msgid "Connect" +msgstr "" + +#: FBConnectAuth.php:215 FBConnectAuth.php:224 +msgid "Registration not allowed." +msgstr "" + +#: FBConnectAuth.php:231 +msgid "Not a valid invitation code." +msgstr "" + +#: FBConnectAuth.php:241 +msgid "Nickname must have only lowercase letters and numbers and no spaces." +msgstr "" + +#: FBConnectAuth.php:246 +msgid "Nickname not allowed." +msgstr "" + +#: FBConnectAuth.php:251 +msgid "Nickname already in use. Try another one." +msgstr "" + +#: FBConnectAuth.php:269 FBConnectAuth.php:303 FBConnectAuth.php:323 +msgid "Error connecting user to Facebook." +msgstr "" + +#: FBConnectAuth.php:289 +msgid "Invalid username or password." +msgstr "" + +#: FacebookPlugin.php:409 FacebookPlugin.php:429 +msgid "Facebook" +msgstr "" + +#: FacebookPlugin.php:410 +msgid "Login or register using Facebook" +msgstr "" diff --git a/plugins/FeedSub/FeedSubPlugin.php b/plugins/FeedSub/FeedSubPlugin.php index 36d4e78023..857a9794d5 100644 --- a/plugins/FeedSub/FeedSubPlugin.php +++ b/plugins/FeedSub/FeedSubPlugin.php @@ -51,7 +51,6 @@ class FeedSubPlugin extends Plugin * @param Net_URL_Mapper $m path-to-action mapper * @return boolean hook return */ - function onRouterInitialized($m) { $m->connect('feedsub/callback/:feed', @@ -74,8 +73,8 @@ class FeedSubPlugin extends Plugin $action_name = $action->trimmed('action'); $action->menuItem(common_local_url('feedsubsettings'), - dgettext('FeebSubPlugin', 'Feeds'), - dgettext('FeedSubPlugin', 'Feed subscription options'), + _m('Feeds'), + _m('Feed subscription options'), $action_name === 'feedsubsettings'); return true; diff --git a/plugins/FeedSub/actions/feedsubsettings.php b/plugins/FeedSub/actions/feedsubsettings.php index 242224fac0..0fba20a393 100644 --- a/plugins/FeedSub/actions/feedsubsettings.php +++ b/plugins/FeedSub/actions/feedsubsettings.php @@ -38,7 +38,7 @@ class FeedSubSettingsAction extends ConnectSettingsAction function title() { - return dgettext('FeedSubPlugin', 'Feed subscriptions'); + return _m('Feed subscriptions'); } /** @@ -49,9 +49,8 @@ class FeedSubSettingsAction extends ConnectSettingsAction function getInstructions() { - return dgettext('FeedSubPlugin', - 'You can subscribe to feeds from other sites; ' . - 'updates will appear in your personal timeline.'); + return _m('You can subscribe to feeds from other sites; ' . + 'updates will appear in your personal timeline.'); } /** @@ -94,9 +93,9 @@ class FeedSubSettingsAction extends ConnectSettingsAction $this->elementEnd('ul'); if ($this->preview) { - $this->submit('subscribe', dgettext('FeedSubPlugin', 'Subscribe')); + $this->submit('subscribe', _m('Subscribe')); } else { - $this->submit('validate', dgettext('FeedSubPlugin', 'Continue')); + $this->submit('validate', _m('Continue')); } $this->elementEnd('fieldset'); @@ -149,8 +148,7 @@ class FeedSubSettingsAction extends ConnectSettingsAction $feedurl = trim($this->arg('feedurl')); if ($feedurl == '') { - $this->showForm(dgettext('FeedSubPlugin', - 'Empty feed URL!')); + $this->showForm(_m('Empty feed URL!')); return; } $this->feedurl = $feedurl; @@ -160,26 +158,26 @@ class FeedSubSettingsAction extends ConnectSettingsAction $discover = new FeedDiscovery(); $uri = $discover->discoverFromURL($feedurl); } catch (FeedSubBadURLException $e) { - $this->showForm(dgettext('FeedSubPlugin', 'Invalid URL or could not reach server.')); + $this->showForm(_m('Invalid URL or could not reach server.')); return false; } catch (FeedSubBadResponseException $e) { - $this->showForm(dgettext('FeedSubPlugin', 'Cannot read feed; server returned error.')); + $this->showForm(_m('Cannot read feed; server returned error.')); return false; } catch (FeedSubEmptyException $e) { - $this->showForm(dgettext('FeedSubPlugin', 'Cannot read feed; server returned an empty page.')); + $this->showForm(_m('Cannot read feed; server returned an empty page.')); return false; } catch (FeedSubBadHTMLException $e) { - $this->showForm(dgettext('FeedSubPlugin', 'Bad HTML, could not find feed link.')); + $this->showForm(_m('Bad HTML, could not find feed link.')); return false; } catch (FeedSubNoFeedException $e) { - $this->showForm(dgettext('FeedSubPlugin', 'Could not find a feed linked from this URL.')); + $this->showForm(_m('Could not find a feed linked from this URL.')); return false; } catch (FeedSubUnrecognizedTypeException $e) { - $this->showForm(dgettext('FeedSubPlugin', 'Not a recognized feed type.')); + $this->showForm(_m('Not a recognized feed type.')); return false; } catch (FeedSubException $e) { // Any new ones we forgot about - $this->showForm(dgettext('FeedSubPlugin', 'Bad feed URL.')); + $this->showForm(_m('Bad feed URL.')); return false; } @@ -187,7 +185,7 @@ class FeedSubSettingsAction extends ConnectSettingsAction $this->feedinfo = $this->munger->feedInfo(); if ($this->feedinfo->huburi == '') { - $this->showForm(dgettext('FeedSubPlugin', 'Feed is not PuSH-enabled; cannot subscribe.')); + $this->showForm(_m('Feed is not PuSH-enabled; cannot subscribe.')); return false; } @@ -207,7 +205,7 @@ class FeedSubSettingsAction extends ConnectSettingsAction $ok = $this->feedinfo->subscribe(); common_log(LOG_INFO, __METHOD__ . ": sub was $ok"); if (!$ok) { - $this->showForm(dgettext('FeedSubPlugin', 'Feed subscription failed! Bad response from hub.')); + $this->showForm(_m('Feed subscription failed! Bad response from hub.')); return; } } @@ -217,11 +215,11 @@ class FeedSubSettingsAction extends ConnectSettingsAction $profile = $this->feedinfo->getProfile(); if ($user->isSubscribed($profile)) { - $this->showForm(dgettext('FeedSubPlugin', 'Already subscribed!')); + $this->showForm(_m('Already subscribed!')); } elseif ($user->subscribeTo($profile)) { - $this->showForm(dgettext('FeedSubPlugin', 'Feed subscribed!')); + $this->showForm(_m('Feed subscribed!')); } else { - $this->showForm(dgettext('FeedSubPlugin', 'Feed subscription failed!')); + $this->showForm(_m('Feed subscription failed!')); } } } @@ -230,7 +228,7 @@ class FeedSubSettingsAction extends ConnectSettingsAction { if ($this->validateFeed()) { $this->preview = true; - $this->showForm(dgettext('FeedSubPlugin', 'Previewing feed:')); + $this->showForm(_m('Previewing feed:')); } } diff --git a/plugins/FeedSub/feedmunger.php b/plugins/FeedSub/feedmunger.php index bb8075da95..f3618b8eb0 100644 --- a/plugins/FeedSub/feedmunger.php +++ b/plugins/FeedSub/feedmunger.php @@ -212,7 +212,7 @@ class FeedMunger // try adding #hashtags from the categories/tags on a post. // @todo Should we force a language here? - $format = dgettext("FeedSubPlugin", 'New post: "%1$s" %2$s'); + $format = _m('New post: "%1$s" %2$s'); $title = $entry->title; $link = $this->getAltLink($entry); $out = sprintf($format, $title, $link); diff --git a/plugins/FeedSub/locale/FeedSub.po b/plugins/FeedSub/locale/FeedSub.po new file mode 100644 index 0000000000..dedc018e3f --- /dev/null +++ b/plugins/FeedSub/locale/FeedSub.po @@ -0,0 +1,104 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-07 20:38-0800\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: tests/gettext-speedtest.php:57 FeedSubPlugin.php:76 +msgid "Feeds" +msgstr "" + +#: FeedSubPlugin.php:77 +msgid "Feed subscription options" +msgstr "" + +#: feedmunger.php:215 +#, php-format +msgid "New post: \"%1$s\" %2$s" +msgstr "" + +#: actions/feedsubsettings.php:41 +msgid "Feed subscriptions" +msgstr "" + +#: actions/feedsubsettings.php:52 +msgid "" +"You can subscribe to feeds from other sites; updates will appear in your " +"personal timeline." +msgstr "" + +#: actions/feedsubsettings.php:96 +msgid "Subscribe" +msgstr "" + +#: actions/feedsubsettings.php:98 +msgid "Continue" +msgstr "" + +#: actions/feedsubsettings.php:151 +msgid "Empty feed URL!" +msgstr "" + +#: actions/feedsubsettings.php:161 +msgid "Invalid URL or could not reach server." +msgstr "" + +#: actions/feedsubsettings.php:164 +msgid "Cannot read feed; server returned error." +msgstr "" + +#: actions/feedsubsettings.php:167 +msgid "Cannot read feed; server returned an empty page." +msgstr "" + +#: actions/feedsubsettings.php:170 +msgid "Bad HTML, could not find feed link." +msgstr "" + +#: actions/feedsubsettings.php:173 +msgid "Could not find a feed linked from this URL." +msgstr "" + +#: actions/feedsubsettings.php:176 +msgid "Not a recognized feed type." +msgstr "" + +#: actions/feedsubsettings.php:180 +msgid "Bad feed URL." +msgstr "" + +#: actions/feedsubsettings.php:188 +msgid "Feed is not PuSH-enabled; cannot subscribe." +msgstr "" + +#: actions/feedsubsettings.php:208 +msgid "Feed subscription failed! Bad response from hub." +msgstr "" + +#: actions/feedsubsettings.php:218 +msgid "Already subscribed!" +msgstr "" + +#: actions/feedsubsettings.php:220 +msgid "Feed subscribed!" +msgstr "" + +#: actions/feedsubsettings.php:222 +msgid "Feed subscription failed!" +msgstr "" + +#: actions/feedsubsettings.php:231 +msgid "Previewing feed:" +msgstr "" diff --git a/plugins/FeedSub/locale/fr/LC_MESSAGES/FeedSub.po b/plugins/FeedSub/locale/fr/LC_MESSAGES/FeedSub.po new file mode 100644 index 0000000000..f17dfa50a5 --- /dev/null +++ b/plugins/FeedSub/locale/fr/LC_MESSAGES/FeedSub.po @@ -0,0 +1,106 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-07 14:14-0800\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: FeedSubPlugin.php:77 +msgid "Feeds" +msgstr "Flux" + +#: FeedSubPlugin.php:78 +msgid "Feed subscription options" +msgstr "Préférences pour abonnement flux" + +#: feedmunger.php:215 +#, php-format +msgid "New post: \"%1$s\" %2$s" +msgstr "Nouveau: \"%1$s\" %2$s" + +#: actions/feedsubsettings.php:41 +msgid "Feed subscriptions" +msgstr "Abonnements aux fluxes" + +#: actions/feedsubsettings.php:52 +msgid "" +"You can subscribe to feeds from other sites; updates will appear in your " +"personal timeline." +msgstr "" +"Abonner aux fluxes RSS ou Atom des autres sites web; les temps se trouverair" +"en votre flux personnel." + +#: actions/feedsubsettings.php:96 +msgid "Subscribe" +msgstr "Abonner" + +#: actions/feedsubsettings.php:98 +msgid "Continue" +msgstr "Prochaine" + +#: actions/feedsubsettings.php:151 +msgid "Empty feed URL!" +msgstr "" + +#: actions/feedsubsettings.php:161 +msgid "Invalid URL or could not reach server." +msgstr "" + +#: actions/feedsubsettings.php:164 +msgid "Cannot read feed; server returned error." +msgstr "" + +#: actions/feedsubsettings.php:167 +msgid "Cannot read feed; server returned an empty page." +msgstr "" + +#: actions/feedsubsettings.php:170 +msgid "Bad HTML, could not find feed link." +msgstr "" + +#: actions/feedsubsettings.php:173 +msgid "Could not find a feed linked from this URL." +msgstr "" + +#: actions/feedsubsettings.php:176 +msgid "Not a recognized feed type." +msgstr "" + +#: actions/feedsubsettings.php:180 +msgid "Bad feed URL." +msgstr "" + +#: actions/feedsubsettings.php:188 +msgid "Feed is not PuSH-enabled; cannot subscribe." +msgstr "" + +#: actions/feedsubsettings.php:208 +msgid "Feed subscription failed! Bad response from hub." +msgstr "" + +#: actions/feedsubsettings.php:218 +msgid "Already subscribed!" +msgstr "" + +#: actions/feedsubsettings.php:220 +msgid "Feed subscribed!" +msgstr "" + +#: actions/feedsubsettings.php:222 +msgid "Feed subscription failed!" +msgstr "" + +#: actions/feedsubsettings.php:231 +msgid "Previewing feed:" +msgstr "" diff --git a/plugins/FeedSub/tests/gettext-speedtest.php b/plugins/FeedSub/tests/gettext-speedtest.php new file mode 100644 index 0000000000..8bbdf5e899 --- /dev/null +++ b/plugins/FeedSub/tests/gettext-speedtest.php @@ -0,0 +1,78 @@ + $bits) { + list($time, $result) = $bits; + $ms = $time * 1000.0; + printf("%10s %2.4fms %s\n", $func, $ms, $result); +} + + +function fake($str) { + return $str; +} + diff --git a/plugins/Mapstraction/MapstractionPlugin.php b/plugins/Mapstraction/MapstractionPlugin.php index f20e81b0ea..93679e56c2 100644 --- a/plugins/Mapstraction/MapstractionPlugin.php +++ b/plugins/Mapstraction/MapstractionPlugin.php @@ -177,7 +177,7 @@ class MapstractionPlugin extends Plugin $action->elementStart('div', array('id' => 'entity_map', 'class' => 'section')); - $action->element('h2', null, _('Map')); + $action->element('h2', null, _m('Map')); $action->element('div', array('id' => 'map_canvas', 'class' => 'gray smallmap', @@ -188,7 +188,7 @@ class MapstractionPlugin extends Plugin array('nickname' => $action->trimmed('nickname'))); $action->element('a', array('href' => $mapUrl), - _("Full size")); + _m("Full size")); $action->elementEnd('div'); } diff --git a/plugins/Mapstraction/allmap.php b/plugins/Mapstraction/allmap.php index 0c4f03b31c..e73aa76e8e 100644 --- a/plugins/Mapstraction/allmap.php +++ b/plugins/Mapstraction/allmap.php @@ -68,10 +68,10 @@ class AllmapAction extends MapAction } if ($this->page == 1) { - return sprintf(_("%s friends map"), + return sprintf(_m("%s friends map"), $base); } else { - return sprintf(_("%s friends map, page %d"), + return sprintf(_m("%s friends map, page %d"), $base, $this->page); } diff --git a/plugins/Mapstraction/locale/Mapstraction.po b/plugins/Mapstraction/locale/Mapstraction.po new file mode 100644 index 0000000000..c1c50bf506 --- /dev/null +++ b/plugins/Mapstraction/locale/Mapstraction.po @@ -0,0 +1,48 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-07 20:38-0800\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: allmap.php:71 +#, php-format +msgid "%s friends map" +msgstr "" + +#: allmap.php:74 +#, php-format +msgid "%s friends map, page %d" +msgstr "" + +#: map.php:72 +msgid "No such user." +msgstr "" + +#: map.php:79 +msgid "User has no profile." +msgstr "" + +#: usermap.php:71 +#, php-format +msgid "%s map, page %d" +msgstr "" + +#: MapstractionPlugin.php:180 +msgid "Map" +msgstr "" + +#: MapstractionPlugin.php:191 +msgid "Full size" +msgstr "" diff --git a/plugins/Mapstraction/map.php b/plugins/Mapstraction/map.php index 734e480884..a33dfc7360 100644 --- a/plugins/Mapstraction/map.php +++ b/plugins/Mapstraction/map.php @@ -69,14 +69,14 @@ class MapAction extends OwnerDesignAction $this->user = User::staticGet('nickname', $nickname); if (!$this->user) { - $this->clientError(_('No such user.'), 404); + $this->clientError(_m('No such user.'), 404); return false; } $this->profile = $this->user->getProfile(); if (!$this->profile) { - $this->serverError(_('User has no profile.')); + $this->serverError(_m('User has no profile.')); return false; } diff --git a/plugins/Mapstraction/usermap.php b/plugins/Mapstraction/usermap.php index 3e517ee864..ff47b6adaf 100644 --- a/plugins/Mapstraction/usermap.php +++ b/plugins/Mapstraction/usermap.php @@ -68,7 +68,7 @@ class UsermapAction extends MapAction if ($this->page == 1) { return $base; } else { - return sprintf(_("%s map, page %d"), + return sprintf(_m("%s map, page %d"), $base, $this->page); } diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php index e86725d70d..a37d5465e8 100644 --- a/plugins/OpenID/OpenIDPlugin.php +++ b/plugins/OpenID/OpenIDPlugin.php @@ -120,8 +120,8 @@ class OpenIDPlugin extends Plugin $action_name = $action->trimmed('action'); $action->menuItem(common_local_url('openidlogin'), - _('OpenID'), - _('Login or register with OpenID'), + _m('OpenID'), + _m('Login or register with OpenID'), $action_name === 'openidlogin'); return true; @@ -132,8 +132,8 @@ class OpenIDPlugin extends Plugin $action_name = $action->trimmed('action'); $action->menuItem(common_local_url('openidsettings'), - _('OpenID'), - _('Add or remove OpenIDs'), + _m('OpenID'), + _m('Add or remove OpenIDs'), $action_name === 'openidsettings'); return true; diff --git a/plugins/OpenID/finishaddopenid.php b/plugins/OpenID/finishaddopenid.php index 7cd9165231..991e6584ee 100644 --- a/plugins/OpenID/finishaddopenid.php +++ b/plugins/OpenID/finishaddopenid.php @@ -64,7 +64,7 @@ class FinishaddopenidAction extends Action { parent::handle($args); if (!common_logged_in()) { - $this->clientError(_('Not logged in.')); + $this->clientError(_m('Not logged in.')); } else { $this->tryLogin(); } @@ -85,11 +85,11 @@ class FinishaddopenidAction extends Action $response = $consumer->complete(common_local_url('finishaddopenid')); if ($response->status == Auth_OpenID_CANCEL) { - $this->message(_('OpenID authentication cancelled.')); + $this->message(_m('OpenID authentication cancelled.')); return; } else if ($response->status == Auth_OpenID_FAILURE) { // Authentication failed; display the error message. - $this->message(sprintf(_('OpenID authentication failed: %s'), + $this->message(sprintf(_m('OpenID authentication failed: %s'), $response->message)); } else if ($response->status == Auth_OpenID_SUCCESS) { @@ -109,9 +109,9 @@ class FinishaddopenidAction extends Action if ($other) { if ($other->id == $cur->id) { - $this->message(_('You already have this OpenID!')); + $this->message(_m('You already have this OpenID!')); } else { - $this->message(_('Someone else already has this OpenID.')); + $this->message(_m('Someone else already has this OpenID.')); } return; } @@ -123,12 +123,12 @@ class FinishaddopenidAction extends Action $result = oid_link_user($cur->id, $canonical, $display); if (!$result) { - $this->message(_('Error connecting user.')); + $this->message(_m('Error connecting user.')); return; } if ($sreg) { if (!oid_update_user($cur, $sreg)) { - $this->message(_('Error updating profile')); + $this->message(_m('Error updating profile')); return; } } @@ -167,7 +167,7 @@ class FinishaddopenidAction extends Action function title() { - return _('OpenID Login'); + return _m('OpenID Login'); } /** diff --git a/plugins/OpenID/finishopenidlogin.php b/plugins/OpenID/finishopenidlogin.php index e5551b4126..987fa92138 100644 --- a/plugins/OpenID/finishopenidlogin.php +++ b/plugins/OpenID/finishopenidlogin.php @@ -31,16 +31,16 @@ class FinishopenidloginAction extends Action { parent::handle($args); if (common_is_real_login()) { - $this->clientError(_('Already logged in.')); + $this->clientError(_m('Already logged in.')); } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { $token = $this->trimmed('token'); if (!$token || $token != common_session_token()) { - $this->showForm(_('There was a problem with your session token. Try again, please.')); + $this->showForm(_m('There was a problem with your session token. Try again, please.')); return; } if ($this->arg('create')) { if (!$this->boolean('license')) { - $this->showForm(_('You can\'t register if you don\'t agree to the license.'), + $this->showForm(_m('You can\'t register if you don\'t agree to the license.'), $this->trimmed('newname')); return; } @@ -49,7 +49,7 @@ class FinishopenidloginAction extends Action $this->connectUser(); } else { common_debug(print_r($this->args, true), __FILE__); - $this->showForm(_('Something weird happened.'), + $this->showForm(_m('Something weird happened.'), $this->trimmed('newname')); } } else { @@ -63,13 +63,13 @@ class FinishopenidloginAction extends Action $this->element('div', array('class' => 'error'), $this->error); } else { $this->element('div', 'instructions', - sprintf(_('This is the first time you\'ve logged into %s so we must connect your OpenID to a local account. You can either create a new account, or connect with your existing account, if you have one.'), common_config('site', 'name'))); + sprintf(_m('This is the first time you\'ve logged into %s so we must connect your OpenID to a local account. You can either create a new account, or connect with your existing account, if you have one.'), common_config('site', 'name'))); } } function title() { - return _('OpenID Account Setup'); + return _m('OpenID Account Setup'); } function showForm($error=null, $username=null) @@ -94,14 +94,14 @@ class FinishopenidloginAction extends Action $this->hidden('token', common_session_token()); $this->elementStart('fieldset', array('id' => 'form_openid_createaccount')); $this->element('legend', null, - _('Create new account')); + _m('Create new account')); $this->element('p', null, - _('Create a new user with this nickname.')); + _m('Create a new user with this nickname.')); $this->elementStart('ul', 'form_data'); $this->elementStart('li'); - $this->input('newname', _('New nickname'), + $this->input('newname', _m('New nickname'), ($this->username) ? $this->username : '', - _('1-64 lowercase letters or numbers, no punctuation or spaces')); + _m('1-64 lowercase letters or numbers, no punctuation or spaces')); $this->elementEnd('li'); $this->elementStart('li'); $this->element('input', array('type' => 'checkbox', @@ -111,30 +111,30 @@ class FinishopenidloginAction extends Action 'value' => 'true')); $this->elementStart('label', array('for' => 'license', 'class' => 'checkbox')); - $this->text(_('My text and files are available under ')); + $this->text(_m('My text and files are available under ')); $this->element('a', array('href' => common_config('license', 'url')), common_config('license', 'title')); - $this->text(_(' except this private data: password, email address, IM address, phone number.')); + $this->text(_m(' except this private data: password, email address, IM address, phone number.')); $this->elementEnd('label'); $this->elementEnd('li'); $this->elementEnd('ul'); - $this->submit('create', _('Create')); + $this->submit('create', _m('Create')); $this->elementEnd('fieldset'); $this->elementStart('fieldset', array('id' => 'form_openid_createaccount')); $this->element('legend', null, - _('Connect existing account')); + _m('Connect existing account')); $this->element('p', null, - _('If you already have an account, login with your username and password to connect it to your OpenID.')); + _m('If you already have an account, login with your username and password to connect it to your OpenID.')); $this->elementStart('ul', 'form_data'); $this->elementStart('li'); - $this->input('nickname', _('Existing nickname')); + $this->input('nickname', _m('Existing nickname')); $this->elementEnd('li'); $this->elementStart('li'); - $this->password('password', _('Password')); + $this->password('password', _m('Password')); $this->elementEnd('li'); $this->elementEnd('ul'); - $this->submit('connect', _('Connect')); + $this->submit('connect', _m('Connect')); $this->elementEnd('fieldset'); $this->elementEnd('form'); } @@ -146,11 +146,11 @@ class FinishopenidloginAction extends Action $response = $consumer->complete(common_local_url('finishopenidlogin')); if ($response->status == Auth_OpenID_CANCEL) { - $this->message(_('OpenID authentication cancelled.')); + $this->message(_m('OpenID authentication cancelled.')); return; } else if ($response->status == Auth_OpenID_FAILURE) { // Authentication failed; display the error message. - $this->message(sprintf(_('OpenID authentication failed: %s'), $response->message)); + $this->message(sprintf(_m('OpenID authentication failed: %s'), $response->message)); } else if ($response->status == Auth_OpenID_SUCCESS) { // This means the authentication succeeded; extract the // identity URL and Simple Registration data (if it was @@ -212,7 +212,7 @@ class FinishopenidloginAction extends Action # FIXME: save invite code before redirect, and check here if (common_config('site', 'closed')) { - $this->clientError(_('Registration not allowed.')); + $this->clientError(_m('Registration not allowed.')); return; } @@ -221,14 +221,14 @@ class FinishopenidloginAction extends Action if (common_config('site', 'inviteonly')) { $code = $_SESSION['invitecode']; if (empty($code)) { - $this->clientError(_('Registration not allowed.')); + $this->clientError(_m('Registration not allowed.')); return; } $invite = Invitation::staticGet($code); if (empty($invite)) { - $this->clientError(_('Not a valid invitation code.')); + $this->clientError(_m('Not a valid invitation code.')); return; } } @@ -238,24 +238,24 @@ class FinishopenidloginAction extends Action if (!Validate::string($nickname, array('min_length' => 1, 'max_length' => 64, 'format' => NICKNAME_FMT))) { - $this->showForm(_('Nickname must have only lowercase letters and numbers and no spaces.')); + $this->showForm(_m('Nickname must have only lowercase letters and numbers and no spaces.')); return; } if (!User::allowed_nickname($nickname)) { - $this->showForm(_('Nickname not allowed.')); + $this->showForm(_m('Nickname not allowed.')); return; } if (User::staticGet('nickname', $nickname)) { - $this->showForm(_('Nickname already in use. Try another one.')); + $this->showForm(_m('Nickname already in use. Try another one.')); return; } list($display, $canonical, $sreg) = $this->getSavedValues(); if (!$display || !$canonical) { - $this->serverError(_('Stored OpenID not found.')); + $this->serverError(_m('Stored OpenID not found.')); return; } @@ -264,7 +264,7 @@ class FinishopenidloginAction extends Action $other = oid_get_user($canonical); if ($other) { - $this->serverError(_('Creating new account for OpenID that already has a user.')); + $this->serverError(_m('Creating new account for OpenID that already has a user.')); return; } @@ -324,7 +324,7 @@ class FinishopenidloginAction extends Action $password = $this->trimmed('password'); if (!common_check_user($nickname, $password)) { - $this->showForm(_('Invalid username or password.')); + $this->showForm(_m('Invalid username or password.')); return; } @@ -335,14 +335,14 @@ class FinishopenidloginAction extends Action list($display, $canonical, $sreg) = $this->getSavedValues(); if (!$display || !$canonical) { - $this->serverError(_('Stored OpenID not found.')); + $this->serverError(_m('Stored OpenID not found.')); return; } $result = oid_link_user($user->id, $canonical, $display); if (!$result) { - $this->serverError(_('Error connecting user to OpenID.')); + $this->serverError(_m('Error connecting user to OpenID.')); return; } diff --git a/plugins/OpenID/locale/OpenID.po b/plugins/OpenID/locale/OpenID.po new file mode 100644 index 0000000000..34738bc750 --- /dev/null +++ b/plugins/OpenID/locale/OpenID.po @@ -0,0 +1,344 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-07 20:38-0800\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: openidlogin.php:30 finishopenidlogin.php:34 +msgid "Already logged in." +msgstr "" + +#: openidlogin.php:37 openidsettings.php:194 finishopenidlogin.php:38 +msgid "There was a problem with your session token. Try again, please." +msgstr "" + +#: openidlogin.php:66 +#, php-format +msgid "" +"For security reasons, please re-login with your [OpenID](%%doc.openid%%) " +"before changing your settings." +msgstr "" + +#: openidlogin.php:70 +#, php-format +msgid "Login with an [OpenID](%%doc.openid%%) account." +msgstr "" + +#: openidlogin.php:95 finishaddopenid.php:170 +msgid "OpenID Login" +msgstr "" + +#: openidlogin.php:112 +msgid "OpenID login" +msgstr "" + +#: openidlogin.php:117 openidsettings.php:107 +msgid "OpenID URL" +msgstr "" + +#: openidlogin.php:119 +msgid "Your OpenID URL" +msgstr "" + +#: openidlogin.php:122 +msgid "Remember me" +msgstr "" + +#: openidlogin.php:123 +msgid "Automatically login in the future; not for shared computers!" +msgstr "" + +#: openidlogin.php:127 +msgid "Login" +msgstr "" + +#: openidserver.php:106 +#, php-format +msgid "You are not authorized to use the identity %s" +msgstr "" + +#: openidserver.php:126 +msgid "Just an OpenID provider. Nothing to see here, move along..." +msgstr "" + +#: OpenIDPlugin.php:123 OpenIDPlugin.php:135 +msgid "OpenID" +msgstr "" + +#: OpenIDPlugin.php:124 +msgid "Login or register with OpenID" +msgstr "" + +#: OpenIDPlugin.php:136 +msgid "Add or remove OpenIDs" +msgstr "" + +#: openid.php:141 +msgid "Cannot instantiate OpenID consumer object." +msgstr "" + +#: openid.php:151 +msgid "Not a valid OpenID." +msgstr "" + +#: openid.php:153 +#, php-format +msgid "OpenID failure: %s" +msgstr "" + +#: openid.php:180 +#, php-format +msgid "Could not redirect to server: %s" +msgstr "" + +#: openid.php:198 +#, php-format +msgid "Could not create OpenID form: %s" +msgstr "" + +#: openid.php:214 +msgid "" +"This form should automatically submit itself. If not, click the submit " +"button to go to your OpenID provider." +msgstr "" + +#: openid.php:246 +msgid "Error saving the profile." +msgstr "" + +#: openid.php:257 +msgid "Error saving the user." +msgstr "" + +#: openid.php:277 +msgid "OpenID Auto-Submit" +msgstr "" + +#: openidtrust.php:51 +msgid "OpenID Identity Verification" +msgstr "" + +#: openidtrust.php:69 +msgid "" +"This page should only be reached during OpenID processing, not directly." +msgstr "" + +#: openidtrust.php:118 +#, php-format +msgid "" +"%s has asked to verify your identity. Click Continue to verify your " +"identity and login without creating a new password." +msgstr "" + +#: openidtrust.php:136 +msgid "Continue" +msgstr "" + +#: openidtrust.php:137 +msgid "Cancel" +msgstr "" + +#: finishaddopenid.php:67 +msgid "Not logged in." +msgstr "" + +#: finishaddopenid.php:88 finishopenidlogin.php:149 +msgid "OpenID authentication cancelled." +msgstr "" + +#: finishaddopenid.php:92 finishopenidlogin.php:153 +#, php-format +msgid "OpenID authentication failed: %s" +msgstr "" + +#: finishaddopenid.php:112 +msgid "You already have this OpenID!" +msgstr "" + +#: finishaddopenid.php:114 +msgid "Someone else already has this OpenID." +msgstr "" + +#: finishaddopenid.php:126 +msgid "Error connecting user." +msgstr "" + +#: finishaddopenid.php:131 +msgid "Error updating profile" +msgstr "" + +#: openidsettings.php:59 +msgid "OpenID settings" +msgstr "" + +#: openidsettings.php:70 +#, php-format +msgid "" +"[OpenID](%%doc.openid%%) lets you log into many sites with the same user " +"account. Manage your associated OpenIDs from here." +msgstr "" + +#: openidsettings.php:99 +msgid "Add OpenID" +msgstr "" + +#: openidsettings.php:102 +msgid "" +"If you want to add an OpenID to your account, enter it in the box below and " +"click \"Add\"." +msgstr "" + +#: openidsettings.php:117 +msgid "Add" +msgstr "" + +#: openidsettings.php:129 +msgid "Remove OpenID" +msgstr "" + +#: openidsettings.php:134 +msgid "" +"Removing your only OpenID would make it impossible to log in! If you need to " +"remove it, add another OpenID first." +msgstr "" + +#: openidsettings.php:149 +msgid "" +"You can remove an OpenID from your account by clicking the button marked " +"\"Remove\"." +msgstr "" + +#: openidsettings.php:172 +msgid "Remove" +msgstr "" + +#: openidsettings.php:208 finishopenidlogin.php:52 +msgid "Something weird happened." +msgstr "" + +#: openidsettings.php:228 +msgid "No such OpenID." +msgstr "" + +#: openidsettings.php:233 +msgid "That OpenID does not belong to you." +msgstr "" + +#: openidsettings.php:237 +msgid "OpenID removed." +msgstr "" + +#: finishopenidlogin.php:43 +msgid "You can't register if you don't agree to the license." +msgstr "" + +#: finishopenidlogin.php:66 +#, php-format +msgid "" +"This is the first time you've logged into %s so we must connect your OpenID " +"to a local account. You can either create a new account, or connect with " +"your existing account, if you have one." +msgstr "" + +#: finishopenidlogin.php:72 +msgid "OpenID Account Setup" +msgstr "" + +#: finishopenidlogin.php:97 +msgid "Create new account" +msgstr "" + +#: finishopenidlogin.php:99 +msgid "Create a new user with this nickname." +msgstr "" + +#: finishopenidlogin.php:102 +msgid "New nickname" +msgstr "" + +#: finishopenidlogin.php:104 +msgid "1-64 lowercase letters or numbers, no punctuation or spaces" +msgstr "" + +#: finishopenidlogin.php:114 +msgid "My text and files are available under " +msgstr "" + +#: finishopenidlogin.php:117 +msgid "" +" except this private data: password, email address, IM address, phone number." +msgstr "" + +#: finishopenidlogin.php:121 +msgid "Create" +msgstr "" + +#: finishopenidlogin.php:126 +msgid "Connect existing account" +msgstr "" + +#: finishopenidlogin.php:128 +msgid "" +"If you already have an account, login with your username and password to " +"connect it to your OpenID." +msgstr "" + +#: finishopenidlogin.php:131 +msgid "Existing nickname" +msgstr "" + +#: finishopenidlogin.php:134 +msgid "Password" +msgstr "" + +#: finishopenidlogin.php:137 +msgid "Connect" +msgstr "" + +#: finishopenidlogin.php:215 finishopenidlogin.php:224 +msgid "Registration not allowed." +msgstr "" + +#: finishopenidlogin.php:231 +msgid "Not a valid invitation code." +msgstr "" + +#: finishopenidlogin.php:241 +msgid "Nickname must have only lowercase letters and numbers and no spaces." +msgstr "" + +#: finishopenidlogin.php:246 +msgid "Nickname not allowed." +msgstr "" + +#: finishopenidlogin.php:251 +msgid "Nickname already in use. Try another one." +msgstr "" + +#: finishopenidlogin.php:258 finishopenidlogin.php:338 +msgid "Stored OpenID not found." +msgstr "" + +#: finishopenidlogin.php:267 +msgid "Creating new account for OpenID that already has a user." +msgstr "" + +#: finishopenidlogin.php:327 +msgid "Invalid username or password." +msgstr "" + +#: finishopenidlogin.php:345 +msgid "Error connecting user to OpenID." +msgstr "" diff --git a/plugins/OpenID/openid.php b/plugins/OpenID/openid.php index dd628e7733..8f949c9c5d 100644 --- a/plugins/OpenID/openid.php +++ b/plugins/OpenID/openid.php @@ -138,7 +138,7 @@ function oid_authenticate($openid_url, $returnto, $immediate=false) $consumer = oid_consumer(); if (!$consumer) { - common_server_error(_('Cannot instantiate OpenID consumer object.')); + common_server_error(_m('Cannot instantiate OpenID consumer object.')); return false; } @@ -148,9 +148,9 @@ function oid_authenticate($openid_url, $returnto, $immediate=false) // Handle failure status return values. if (!$auth_request) { - return _('Not a valid OpenID.'); + return _m('Not a valid OpenID.'); } else if (Auth_OpenID::isFailure($auth_request)) { - return sprintf(_('OpenID failure: %s'), $auth_request->message); + return sprintf(_m('OpenID failure: %s'), $auth_request->message); } $sreg_request = Auth_OpenID_SRegRequest::build(// Required @@ -177,7 +177,7 @@ function oid_authenticate($openid_url, $returnto, $immediate=false) $immediate); if (!$redirect_url) { } else if (Auth_OpenID::isFailure($redirect_url)) { - return sprintf(_('Could not redirect to server: %s'), $redirect_url->message); + return sprintf(_m('Could not redirect to server: %s'), $redirect_url->message); } else { common_redirect($redirect_url, 303); } @@ -195,7 +195,7 @@ function oid_authenticate($openid_url, $returnto, $immediate=false) // Display an error if the form markup couldn't be generated; // otherwise, render the HTML. if (Auth_OpenID::isFailure($form_html)) { - common_server_error(sprintf(_('Could not create OpenID form: %s'), $form_html->message)); + common_server_error(sprintf(_m('Could not create OpenID form: %s'), $form_html->message)); } else { $action = new AutosubmitAction(); // see below $action->form_html = $form_html; @@ -211,7 +211,7 @@ function oid_authenticate($openid_url, $returnto, $immediate=false) function _oid_print_instructions() { common_element('div', 'instructions', - _('This form should automatically submit itself. '. + _m('This form should automatically submit itself. '. 'If not, click the submit button to go to your '. 'OpenID provider.')); } @@ -243,7 +243,7 @@ function oid_update_user(&$user, &$sreg) # XXX save timezone if it's passed if (!$profile->update($orig_profile)) { - common_server_error(_('Error saving the profile.')); + common_server_error(_m('Error saving the profile.')); return false; } @@ -254,7 +254,7 @@ function oid_update_user(&$user, &$sreg) } if (!$user->update($orig_user)) { - common_server_error(_('Error saving the user.')); + common_server_error(_m('Error saving the user.')); return false; } @@ -274,7 +274,7 @@ class AutosubmitAction extends Action function title() { - return _('OpenID Auto-Submit'); + return _m('OpenID Auto-Submit'); } function showContent() diff --git a/plugins/OpenID/openidlogin.php b/plugins/OpenID/openidlogin.php index 29e89234e9..9ba55911c0 100644 --- a/plugins/OpenID/openidlogin.php +++ b/plugins/OpenID/openidlogin.php @@ -27,14 +27,14 @@ class OpenidloginAction extends Action { parent::handle($args); if (common_is_real_login()) { - $this->clientError(_('Already logged in.')); + $this->clientError(_m('Already logged in.')); } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { $openid_url = $this->trimmed('openid_url'); # CSRF protection $token = $this->trimmed('token'); if (!$token || $token != common_session_token()) { - $this->showForm(_('There was a problem with your session token. Try again, please.'), $openid_url); + $this->showForm(_m('There was a problem with your session token. Try again, please.'), $openid_url); return; } @@ -63,11 +63,11 @@ class OpenidloginAction extends Action common_get_returnto()) { // rememberme logins have to reauthenticate before // changing any profile settings (cookie-stealing protection) - return _('For security reasons, please re-login with your ' . + return _m('For security reasons, please re-login with your ' . '[OpenID](%%doc.openid%%) ' . 'before changing your settings.'); } else { - return _('Login with an [OpenID](%%doc.openid%%) account.'); + return _m('Login with an [OpenID](%%doc.openid%%) account.'); } } @@ -92,7 +92,7 @@ class OpenidloginAction extends Action function title() { - return _('OpenID Login'); + return _m('OpenID Login'); } function showForm($error=null, $openid_url) @@ -109,22 +109,22 @@ class OpenidloginAction extends Action 'class' => 'form_settings', 'action' => $formaction)); $this->elementStart('fieldset'); - $this->element('legend', null, _('OpenID login')); + $this->element('legend', null, _m('OpenID login')); $this->hidden('token', common_session_token()); $this->elementStart('ul', 'form_data'); $this->elementStart('li'); - $this->input('openid_url', _('OpenID URL'), + $this->input('openid_url', _m('OpenID URL'), $this->openid_url, - _('Your OpenID URL')); + _m('Your OpenID URL')); $this->elementEnd('li'); $this->elementStart('li', array('id' => 'settings_rememberme')); - $this->checkbox('rememberme', _('Remember me'), false, - _('Automatically login in the future; ' . + $this->checkbox('rememberme', _m('Remember me'), false, + _m('Automatically login in the future; ' . 'not for shared computers!')); $this->elementEnd('li'); $this->elementEnd('ul'); - $this->submit('submit', _('Login')); + $this->submit('submit', _m('Login')); $this->elementEnd('fieldset'); $this->elementEnd('form'); } diff --git a/plugins/OpenID/openidserver.php b/plugins/OpenID/openidserver.php index dab97c93ed..181cbdf45e 100644 --- a/plugins/OpenID/openidserver.php +++ b/plugins/OpenID/openidserver.php @@ -103,7 +103,7 @@ class OpenidserverAction extends Action $response = $this->generateDenyResponse($request); } else { //invalid - $this->clientError(sprintf(_('You are not authorized to use the identity %s'),$request->identity),$code=403); + $this->clientError(sprintf(_m('You are not authorized to use the identity %s'),$request->identity),$code=403); } } else { $response = $this->oserver->handleRequest($request); @@ -123,7 +123,7 @@ class OpenidserverAction extends Action } $this->raw($response->body); }else{ - $this->clientError(_('Just an OpenID provider. Nothing to see here, move along...'),$code=500); + $this->clientError(_m('Just an OpenID provider. Nothing to see here, move along...'),$code=500); } } diff --git a/plugins/OpenID/openidsettings.php b/plugins/OpenID/openidsettings.php index 3ad46f5f57..3fc3d61289 100644 --- a/plugins/OpenID/openidsettings.php +++ b/plugins/OpenID/openidsettings.php @@ -56,7 +56,7 @@ class OpenidsettingsAction extends AccountSettingsAction function title() { - return _('OpenID settings'); + return _m('OpenID settings'); } /** @@ -67,7 +67,7 @@ class OpenidsettingsAction extends AccountSettingsAction function getInstructions() { - return _('[OpenID](%%doc.openid%%) lets you log into many sites' . + return _m('[OpenID](%%doc.openid%%) lets you log into many sites' . ' with the same user account.'. ' Manage your associated OpenIDs from here.'); } @@ -96,15 +96,15 @@ class OpenidsettingsAction extends AccountSettingsAction 'action' => common_local_url('openidsettings'))); $this->elementStart('fieldset', array('id' => 'settings_openid_add')); - $this->element('legend', null, _('Add OpenID')); + $this->element('legend', null, _m('Add OpenID')); $this->hidden('token', common_session_token()); $this->element('p', 'form_guide', - _('If you want to add an OpenID to your account, ' . + _m('If you want to add an OpenID to your account, ' . 'enter it in the box below and click "Add".')); $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->element('label', array('for' => 'openid_url'), - _('OpenID URL')); + _m('OpenID URL')); $this->element('input', array('name' => 'openid_url', 'type' => 'text', 'id' => 'openid_url')); @@ -114,7 +114,7 @@ class OpenidsettingsAction extends AccountSettingsAction 'id' => 'settings_openid_add_action-submit', 'name' => 'add', 'class' => 'submit', - 'value' => _('Add'))); + 'value' => _m('Add'))); $this->elementEnd('fieldset'); $this->elementEnd('form'); @@ -126,12 +126,12 @@ class OpenidsettingsAction extends AccountSettingsAction if ($cnt > 0) { - $this->element('h2', null, _('Remove OpenID')); + $this->element('h2', null, _m('Remove OpenID')); if ($cnt == 1 && !$user->password) { $this->element('p', 'form_guide', - _('Removing your only OpenID '. + _m('Removing your only OpenID '. 'would make it impossible to log in! ' . 'If you need to remove it, '. 'add another OpenID first.')); @@ -146,7 +146,7 @@ class OpenidsettingsAction extends AccountSettingsAction } else { $this->element('p', 'form_guide', - _('You can remove an OpenID from your account '. + _m('You can remove an OpenID from your account '. 'by clicking the button marked "Remove".')); $idx = 0; @@ -169,7 +169,7 @@ class OpenidsettingsAction extends AccountSettingsAction 'id' => 'remove'.$idx, 'name' => 'remove', 'class' => 'submit remove', - 'value' => _('Remove'))); + 'value' => _m('Remove'))); $this->elementEnd('fieldset'); $this->elementEnd('form'); $idx++; @@ -191,7 +191,7 @@ class OpenidsettingsAction extends AccountSettingsAction // CSRF protection $token = $this->trimmed('token'); if (!$token || $token != common_session_token()) { - $this->showForm(_('There was a problem with your session token. '. + $this->showForm(_m('There was a problem with your session token. '. 'Try again, please.')); return; } @@ -205,7 +205,7 @@ class OpenidsettingsAction extends AccountSettingsAction } else if ($this->arg('remove')) { $this->removeOpenid(); } else { - $this->showForm(_('Something weird happened.')); + $this->showForm(_m('Something weird happened.')); } } @@ -225,16 +225,16 @@ class OpenidsettingsAction extends AccountSettingsAction $oid = User_openid::staticGet('canonical', $openid_url); if (!$oid) { - $this->showForm(_('No such OpenID.')); + $this->showForm(_m('No such OpenID.')); return; } $cur = common_current_user(); if (!$cur || $oid->user_id != $cur->id) { - $this->showForm(_('That OpenID does not belong to you.')); + $this->showForm(_m('That OpenID does not belong to you.')); return; } $oid->delete(); - $this->showForm(_('OpenID removed.'), true); + $this->showForm(_m('OpenID removed.'), true); return; } } diff --git a/plugins/OpenID/openidtrust.php b/plugins/OpenID/openidtrust.php index 29c7bdc23c..fa7ea36e26 100644 --- a/plugins/OpenID/openidtrust.php +++ b/plugins/OpenID/openidtrust.php @@ -48,7 +48,7 @@ class OpenidtrustAction extends Action function title() { - return _('OpenID Identity Verification'); + return _m('OpenID Identity Verification'); } function prepare($args) @@ -66,7 +66,7 @@ class OpenidtrustAction extends Action $this->allowUrl = $_SESSION['openid_allow_url']; $this->denyUrl = $_SESSION['openid_deny_url']; if(empty($this->trust_root) || empty($this->allowUrl) || empty($this->denyUrl)){ - $this->clientError(_('This page should only be reached during OpenID processing, not directly.')); + $this->clientError(_m('This page should only be reached during OpenID processing, not directly.')); return; } return true; @@ -115,7 +115,7 @@ class OpenidtrustAction extends Action function showPageNotice() { - $this->element('p',null,sprintf(_('%s has asked to verify your identity. Click Continue to verify your identity and login without creating a new password.'),$this->trust_root)); + $this->element('p',null,sprintf(_m('%s has asked to verify your identity. Click Continue to verify your identity and login without creating a new password.'),$this->trust_root)); } /** @@ -133,8 +133,8 @@ class OpenidtrustAction extends Action 'class' => 'form_settings', 'action' => common_local_url('openidtrust'))); $this->elementStart('fieldset'); - $this->submit('allow', _('Continue')); - $this->submit('deny', _('Cancel')); + $this->submit('allow', _m('Continue')); + $this->submit('deny', _m('Cancel')); $this->elementEnd('fieldset'); $this->elementEnd('form'); diff --git a/plugins/Sample/SamplePlugin.php b/plugins/Sample/SamplePlugin.php new file mode 100644 index 0000000000..6e361aafbe --- /dev/null +++ b/plugins/Sample/SamplePlugin.php @@ -0,0 +1,59 @@ +. + */ + +/** + * @package SamplePlugin + * @maintainer Your Name + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + // This check helps protect against security problems; + // your code file can't be executed directly from the web. + exit(1); +} + +class SamplePlugin extends Plugin +{ + function onInitializePlugin() + { + // Event handlers normally return true to indicate that all is well. + // + // Returning false will cancel further processing of any other + // plugins or core code hooking the same event. + return true; + } + + /** + * Hook for RouterInitialized event. + * + * @param Net_URL_Mapper $m path-to-action mapper + * @return boolean hook return + */ + + function onRouterInitialized($m) + { + $m->connect(':nickname/samples', + array('action' => 'showsamples'), + array('feed' => '[A-Za-z0-9_-]+')); + $m->connect('settings/sample', + array('action' => 'samplesettings')); + return true; + } +} + diff --git a/plugins/TwitterBridge/TwitterBridgePlugin.php b/plugins/TwitterBridge/TwitterBridgePlugin.php index adf9ceda34..de1181903e 100644 --- a/plugins/TwitterBridge/TwitterBridgePlugin.php +++ b/plugins/TwitterBridge/TwitterBridgePlugin.php @@ -86,8 +86,8 @@ class TwitterBridgePlugin extends Plugin $action_name = $action->trimmed('action'); $action->menuItem(common_local_url('twittersettings'), - _('Twitter'), - _('Twitter integration options'), + _m('Twitter'), + _m('Twitter integration options'), $action_name === 'twittersettings'); return true; diff --git a/plugins/TwitterBridge/locale/TwitterBridge.po b/plugins/TwitterBridge/locale/TwitterBridge.po new file mode 100644 index 0000000000..14c30f1c9c --- /dev/null +++ b/plugins/TwitterBridge/locale/TwitterBridge.po @@ -0,0 +1,128 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-07 20:38-0800\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: twitterauthorization.php:81 +msgid "Not logged in." +msgstr "" + +#: twitterauthorization.php:131 twitterauthorization.php:150 +#: twitterauthorization.php:170 twitterauthorization.php:217 +msgid "Couldn't link your Twitter account." +msgstr "" + +#: TwitterBridgePlugin.php:89 +msgid "Twitter" +msgstr "" + +#: TwitterBridgePlugin.php:90 +msgid "Twitter integration options" +msgstr "" + +#: twittersettings.php:59 +msgid "Twitter settings" +msgstr "" + +#: twittersettings.php:70 +msgid "" +"Connect your Twitter account to share your updates with your Twitter friends " +"and vice-versa." +msgstr "" + +#: twittersettings.php:118 +msgid "Twitter account" +msgstr "" + +#: twittersettings.php:123 +msgid "Connected Twitter account" +msgstr "" + +#: twittersettings.php:125 +msgid "Remove" +msgstr "" + +#: twittersettings.php:131 +msgid "Preferences" +msgstr "" + +#: twittersettings.php:135 +msgid "Automatically send my notices to Twitter." +msgstr "" + +#: twittersettings.php:142 +msgid "Send local \"@\" replies to Twitter." +msgstr "" + +#: twittersettings.php:149 +msgid "Subscribe to my Twitter friends here." +msgstr "" + +#: twittersettings.php:158 +msgid "Import my Friends Timeline." +msgstr "" + +#: twittersettings.php:174 +msgid "Save" +msgstr "" + +#: twittersettings.php:176 +msgid "Add" +msgstr "" + +#: twittersettings.php:201 +msgid "There was a problem with your session token. Try again, please." +msgstr "" + +#: twittersettings.php:211 +msgid "Unexpected form submission." +msgstr "" + +#: twittersettings.php:230 +msgid "Couldn't remove Twitter user." +msgstr "" + +#: twittersettings.php:234 +msgid "Twitter account removed." +msgstr "" + +#: twittersettings.php:255 twittersettings.php:265 +msgid "Couldn't save Twitter preferences." +msgstr "" + +#: twittersettings.php:269 +msgid "Twitter preferences saved." +msgstr "" + +#: twitter.php:333 +msgid "Your Twitter bridge has been disabled." +msgstr "" + +#: twitter.php:337 +#, php-format +msgid "" +"Hi, %1$s. We're sorry to inform you that your link to Twitter has been " +"disabled. We no longer seem to have permission to update your Twitter " +"status. (Did you revoke %3$s's access?)\n" +"\n" +"You can re-enable your Twitter bridge by visiting your Twitter settings " +"page:\n" +"\n" +"\t%2$s\n" +"\n" +"Regards,\n" +"%3$s\n" +msgstr "" diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php index fd51506388..b338a200de 100644 --- a/plugins/TwitterBridge/twitter.php +++ b/plugins/TwitterBridge/twitter.php @@ -330,11 +330,11 @@ function mail_twitter_bridge_removed($user) $profile = $user->getProfile(); - $subject = sprintf(_('Your Twitter bridge has been disabled.')); + $subject = sprintf(_m('Your Twitter bridge has been disabled.')); $site_name = common_config('site', 'name'); - $body = sprintf(_('Hi, %1$s. We\'re sorry to inform you that your ' . + $body = sprintf(_m('Hi, %1$s. We\'re sorry to inform you that your ' . 'link to Twitter has been disabled. We no longer seem to have ' . 'permission to update your Twitter status. (Did you revoke ' . '%3$s\'s access?)' . "\n\n" . diff --git a/plugins/TwitterBridge/twitterauthorization.php b/plugins/TwitterBridge/twitterauthorization.php index f1daefab12..4af2f03941 100644 --- a/plugins/TwitterBridge/twitterauthorization.php +++ b/plugins/TwitterBridge/twitterauthorization.php @@ -78,7 +78,7 @@ class TwitterauthorizationAction extends Action parent::handle($args); if (!common_logged_in()) { - $this->clientError(_('Not logged in.'), 403); + $this->clientError(_m('Not logged in.'), 403); } $user = common_current_user(); @@ -128,7 +128,7 @@ class TwitterauthorizationAction extends Action } catch (OAuthClientException $e) { $msg = sprintf('OAuth client cURL error - code: %1s, msg: %2s', $e->getCode(), $e->getMessage()); - $this->serverError(_('Couldn\'t link your Twitter account.')); + $this->serverError(_m('Couldn\'t link your Twitter account.')); } common_redirect($auth_link); @@ -147,7 +147,7 @@ class TwitterauthorizationAction extends Action // token we sent them if ($_SESSION['twitter_request_token'] != $this->oauth_token) { - $this->serverError(_('Couldn\'t link your Twitter account.')); + $this->serverError(_m('Couldn\'t link your Twitter account.')); } try { @@ -167,7 +167,7 @@ class TwitterauthorizationAction extends Action } catch (OAuthClientException $e) { $msg = sprintf('OAuth client cURL error - code: %1$s, msg: %2$s', $e->getCode(), $e->getMessage()); - $this->serverError(_('Couldn\'t link your Twitter account.')); + $this->serverError(_m('Couldn\'t link your Twitter account.')); } // Save the access token and Twitter user info @@ -214,7 +214,7 @@ class TwitterauthorizationAction extends Action if (empty($flink_id)) { common_log_db_error($flink, 'INSERT', __FILE__); - $this->serverError(_('Couldn\'t link your Twitter account.')); + $this->serverError(_m('Couldn\'t link your Twitter account.')); } save_twitter_user($twitter_user->id, $twitter_user->screen_name); diff --git a/plugins/TwitterBridge/twittersettings.php b/plugins/TwitterBridge/twittersettings.php index ca22c95535..bc9a636a15 100644 --- a/plugins/TwitterBridge/twittersettings.php +++ b/plugins/TwitterBridge/twittersettings.php @@ -56,7 +56,7 @@ class TwittersettingsAction extends ConnectSettingsAction function title() { - return _('Twitter settings'); + return _m('Twitter settings'); } /** @@ -67,8 +67,8 @@ class TwittersettingsAction extends ConnectSettingsAction function getInstructions() { - return _('Connect your Twitter account to share your updates ' . - 'with your Twitter friends and vice-versa.'); + return _m('Connect your Twitter account to share your updates ' . + 'with your Twitter friends and vice-versa.'); } /** @@ -115,38 +115,38 @@ class TwittersettingsAction extends ConnectSettingsAction $this->elementEnd('fieldset'); } else { - $this->element('legend', null, _('Twitter account')); + $this->element('legend', null, _m('Twitter account')); $this->elementStart('p', array('id' => 'form_confirmed')); $this->element('a', array('href' => $fuser->uri), $fuser->nickname); $this->elementEnd('p'); $this->element('p', 'form_note', - _('Connected Twitter account')); + _m('Connected Twitter account')); - $this->submit('remove', _('Remove')); + $this->submit('remove', _m('Remove')); $this->elementEnd('fieldset'); $this->elementStart('fieldset', array('id' => 'settings_twitter_preferences')); - $this->element('legend', null, _('Preferences')); + $this->element('legend', null, _m('Preferences')); $this->elementStart('ul', 'form_data'); $this->elementStart('li'); $this->checkbox('noticesend', - _('Automatically send my notices to Twitter.'), + _m('Automatically send my notices to Twitter.'), ($flink) ? ($flink->noticesync & FOREIGN_NOTICE_SEND) : true); $this->elementEnd('li'); $this->elementStart('li'); $this->checkbox('replysync', - _('Send local "@" replies to Twitter.'), + _m('Send local "@" replies to Twitter.'), ($flink) ? ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) : true); $this->elementEnd('li'); $this->elementStart('li'); $this->checkbox('friendsync', - _('Subscribe to my Twitter friends here.'), + _m('Subscribe to my Twitter friends here.'), ($flink) ? ($flink->friendsync & FOREIGN_FRIEND_RECV) : false); @@ -155,7 +155,7 @@ class TwittersettingsAction extends ConnectSettingsAction if (common_config('twitterimport','enabled')) { $this->elementStart('li'); $this->checkbox('noticerecv', - _('Import my Friends Timeline.'), + _m('Import my Friends Timeline.'), ($flink) ? ($flink->noticesync & FOREIGN_NOTICE_RECV) : false); @@ -171,9 +171,9 @@ class TwittersettingsAction extends ConnectSettingsAction $this->elementEnd('ul'); if ($flink) { - $this->submit('save', _('Save')); + $this->submit('save', _m('Save')); } else { - $this->submit('add', _('Add')); + $this->submit('add', _m('Add')); } $this->elementEnd('fieldset'); @@ -198,8 +198,8 @@ class TwittersettingsAction extends ConnectSettingsAction // CSRF protection $token = $this->trimmed('token'); if (!$token || $token != common_session_token()) { - $this->showForm(_('There was a problem with your session token. '. - 'Try again, please.')); + $this->showForm(_m('There was a problem with your session token. '. + 'Try again, please.')); return; } @@ -208,7 +208,7 @@ class TwittersettingsAction extends ConnectSettingsAction } else if ($this->arg('remove')) { $this->removeTwitterAccount(); } else { - $this->showForm(_('Unexpected form submission.')); + $this->showForm(_m('Unexpected form submission.')); } } @@ -227,11 +227,11 @@ class TwittersettingsAction extends ConnectSettingsAction if (empty($result)) { common_log_db_error($flink, 'DELETE', __FILE__); - $this->serverError(_('Couldn\'t remove Twitter user.')); + $this->serverError(_m('Couldn\'t remove Twitter user.')); return; } - $this->showForm(_('Twitter account removed.'), true); + $this->showForm(_m('Twitter account removed.'), true); } /** @@ -252,7 +252,7 @@ class TwittersettingsAction extends ConnectSettingsAction if (empty($flink)) { common_log_db_error($flink, 'SELECT', __FILE__); - $this->showForm(_('Couldn\'t save Twitter preferences.')); + $this->showForm(_m('Couldn\'t save Twitter preferences.')); return; } @@ -262,11 +262,11 @@ class TwittersettingsAction extends ConnectSettingsAction if ($result === false) { common_log_db_error($flink, 'UPDATE', __FILE__); - $this->showForm(_('Couldn\'t save Twitter preferences.')); + $this->showForm(_m('Couldn\'t save Twitter preferences.')); return; } - $this->showForm(_('Twitter preferences saved.'), true); + $this->showForm(_m('Twitter preferences saved.'), true); } } diff --git a/scripts/update_po_templates.php b/scripts/update_po_templates.php new file mode 100755 index 0000000000..83bff6d806 --- /dev/null +++ b/scripts/update_po_templates.php @@ -0,0 +1,211 @@ +#!/usr/bin/env php +. + */ + +// Abort if called from a web server +if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) { + print "This script must be run from the command line\n"; + exit(); +} + +define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); + +function update_core($dir, $domain) +{ + $old = getcwd(); + chdir($dir); + passthru(<<isDir() && !$item->isDot()) { + $name = $item->getBasename(); + if (file_exists("$dir/plugins/$name/{$name}Plugin.php")) { + $plugins[] = $name; + } + } + } + return $plugins; +} + +function get_plugin_sources($dir) +{ + $files = array(); + + $dirs = new RecursiveDirectoryIterator($dir); + $iter = new RecursiveIteratorIterator($dirs); + foreach ($iter as $pathname => $item) { + if ($item->isFile() && preg_match('/\.php$/', $item->getBaseName())) { + $files[] = $pathname; + } + } + return $files; +} + +function plugin_using_gettext($dir) +{ + $files = get_plugin_sources($dir); + foreach ($files as $pathname) { + // Check if the file is using our _m gettext wrapper + $code = file_get_contents($pathname); + if (preg_match('/\b_m\(/', $code)) { + return true; + } + } + + return false; +} + +function update_plugin($basedir, $name) +{ + $dir = "$basedir/plugins/$name"; + if (plugin_using_gettext($dir)) { + do_update_plugin($dir, $name); + do_translatewiki_plugin($basedir, $name); + return true; + } else { + return false; + } +} + +$args = $_SERVER['argv']; +array_shift($args); + +$all = false; +$core = false; +$allplugins = false; +$plugins = array(); +if (count($args) == 0) { + $all = true; +} +foreach ($args as $arg) { + if ($arg == '--all') { + $all = true; + } elseif ($arg == "--core") { + $core = true; + } elseif ($arg == "--plugins") { + $allplugins = true; + } elseif (substr($arg, 0, 9) == "--plugin=") { + $plugins[] = substr($arg, 9); + } +} + + + +if ($all || $core) { + echo "core..."; + update_core(INSTALLDIR, 'statusnet'); + echo " ok\n"; +} +if ($all || $allplugins) { + $plugins = get_plugins(INSTALLDIR); +} +if ($plugins) { + foreach ($plugins as $plugin) { + echo "$plugin..."; + if (update_plugin(INSTALLDIR, $plugin)) { + echo " ok\n"; + } else { + echo " not localized\n"; + } + } +} + diff --git a/scripts/update_pot.sh b/scripts/update_pot.sh deleted file mode 100755 index de53fe7c90..0000000000 --- a/scripts/update_pot.sh +++ /dev/null @@ -1,13 +0,0 @@ -cd `dirname $0` -cd .. -xgettext \ - --from-code=UTF-8 \ - --default-domain=statusnet \ - --output=locale/statusnet.po \ - --language=PHP \ - --keyword="pgettext:1c,2" \ - --keyword="npgettext:1c,2,3" \ - actions/*.php \ - classes/*.php \ - lib/*.php \ - scripts/*.php From dfba47bdf4d3a8eda1778007e274c57de4c3451c Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 8 Dec 2009 15:32:50 -0500 Subject: [PATCH 054/172] include DB_DataObject 1.9.0 --- extlib/DB/DataObject.php | 258 ++++++++++++++++++++++------- extlib/DB/DataObject/Generator.php | 21 +-- 2 files changed, 207 insertions(+), 72 deletions(-) diff --git a/extlib/DB/DataObject.php b/extlib/DB/DataObject.php index 60ff1441b5..a69fbae86b 100644 --- a/extlib/DB/DataObject.php +++ b/extlib/DB/DataObject.php @@ -15,7 +15,7 @@ * @author Alan Knowles * @copyright 1997-2006 The PHP Group * @license http://www.php.net/license/3_01.txt PHP License 3.01 - * @version CVS: $Id: DataObject.php 284150 2009-07-15 23:27:59Z alan_k $ + * @version CVS: $Id: DataObject.php 291349 2009-11-27 09:15:18Z alan_k $ * @link http://pear.php.net/package/DB_DataObject */ @@ -235,7 +235,7 @@ class DB_DataObject extends DB_DataObject_Overload * @access private * @var string */ - var $_DB_DataObject_version = "1.8.12"; + var $_DB_DataObject_version = "1.9.0"; /** * The Database table (used by table extends) @@ -309,7 +309,8 @@ class DB_DataObject extends DB_DataObject_Overload /** * An autoloading, caching static get method using key, value (based on get) - * + * (depreciated - use ::get / and your own caching method) + * * Usage: * $object = DB_DataObject::staticGet("DbTable_mytable",12); * or @@ -942,9 +943,13 @@ class DB_DataObject extends DB_DataObject_Overload } $this->$key = $keyvalue; } - - - + + // if we haven't set disable_null_strings to "full" + $ignore_null = !isset($options['disable_null_strings']) + || !is_string($options['disable_null_strings']) + || strtolower($options['disable_null_strings']) !== 'full' ; + + foreach($items as $k => $v) { // if we are using autoincrement - skip the column... @@ -953,7 +958,10 @@ class DB_DataObject extends DB_DataObject_Overload } - if (!isset($this->$k)) { + + + // Ignore variables which aren't set to a value + if ( !isset($this->$k) && $ignore_null) { continue; } // dont insert data into mysql timestamps @@ -980,8 +988,7 @@ class DB_DataObject extends DB_DataObject_Overload } - - if (!isset($options['disable_null_strings']) && is_string($this->$k) && (strtolower($this->$k) === 'null') && !($v & DB_DATAOBJECT_NOTNULL)) { + if (!($v & DB_DATAOBJECT_NOTNULL) && DB_DataObject::_is_null($this,$k)) { $rightq .= " NULL "; continue; } @@ -1194,8 +1201,14 @@ class DB_DataObject extends DB_DataObject_Overload $options = $_DB_DATAOBJECT['CONFIG']; + $ignore_null = !isset($options['disable_null_strings']) + || !is_string($options['disable_null_strings']) + || strtolower($options['disable_null_strings']) !== 'full' ; + + foreach($items as $k => $v) { - if (!isset($this->$k)) { + + if (!isset($this->$k) && $ignore_null) { continue; } // ignore stuff thats @@ -1234,7 +1247,7 @@ class DB_DataObject extends DB_DataObject_Overload } // special values ... at least null is handled... - if (!isset($options['disable_null_strings']) && (strtolower($this->$k) === 'null') && !($v & DB_DATAOBJECT_NOTNULL)) { + if (!($v & DB_DATAOBJECT_NOTNULL) && DB_DataObject::_is_null($this,$k)) { $settings .= "$kSql = NULL "; continue; } @@ -1796,10 +1809,15 @@ class DB_DataObject extends DB_DataObject_Overload } - + $_DB_DATAOBJECT['INI'][$this->_database] = array(); foreach ($schemas as $ini) { if (file_exists($ini) && is_file($ini)) { - $_DB_DATAOBJECT['INI'][$this->_database] = parse_ini_file($ini, true); + + $_DB_DATAOBJECT['INI'][$this->_database] = array_merge( + $_DB_DATAOBJECT['INI'][$this->_database], + parse_ini_file($ini, true) + ); + if (!empty($_DB_DATAOBJECT['CONFIG']['debug'])) { if (!is_readable ($ini)) { $this->debug("ini file is not readable: $ini","databaseStructure",1); @@ -2478,7 +2496,8 @@ class DB_DataObject extends DB_DataObject_Overload $x = new DB_DataObject; $this->_query= $x->_query; } - + + foreach($keys as $k => $v) { // index keys is an indexed array /* these filter checks are a bit suspicious.. @@ -2519,7 +2538,7 @@ class DB_DataObject extends DB_DataObject_Overload continue; } - if (!isset($options['disable_null_strings']) && (strtolower($this->$k) === 'null') && !($v & DB_DATAOBJECT_NOTNULL)) { + if (!($v & DB_DATAOBJECT_NOTNULL) && DB_DataObject::_is_null($this,$k)) { $this->whereAdd(" $kSql IS NULL"); continue; } @@ -2624,15 +2643,31 @@ class DB_DataObject extends DB_DataObject_Overload } // does this need multi db support?? - $p = isset($_DB_DATAOBJECT['CONFIG']['class_prefix']) ? - $_DB_DATAOBJECT['CONFIG']['class_prefix'] : ''; - $class = $p . preg_replace('/[^A-Z0-9]/i','_',ucfirst($table)); - $ce = substr(phpversion(),0,1) > 4 ? class_exists($class,false) : class_exists($class); + $cp = isset($_DB_DATAOBJECT['CONFIG']['class_prefix']) ? + explode(PATH_SEPARATOR, $_DB_DATAOBJECT['CONFIG']['class_prefix']) : ''; - $class = $ce ? $class : DB_DataObject::_autoloadClass($class); + // multiprefix support. + $tbl = preg_replace('/[^A-Z0-9]/i','_',ucfirst($table)); + if (is_array($cp)) { + $class = array(); + foreach($cp as $cpr) { + $ce = substr(phpversion(),0,1) > 4 ? class_exists($cpr . $tbl,false) : class_exists($cpr . $tbl); + if ($ce) { + $class = $cpr . $tbl; + break; + } + $class[] = $cpr . $tbl; + } + } else { + $class = $tbl; + $ce = substr(phpversion(),0,1) > 4 ? class_exists($class,false) : class_exists($class); + } + + + $rclass = $ce ? $class : DB_DataObject::_autoloadClass($class, $table); // proxy = full|light - if (!$class && isset($_DB_DATAOBJECT['CONFIG']['proxy'])) { + if (!$rclass && isset($_DB_DATAOBJECT['CONFIG']['proxy'])) { DB_DataObject::debug("FAILED TO Autoload $database.$table - using proxy.","FACTORY",1); @@ -2653,12 +2688,14 @@ class DB_DataObject extends DB_DataObject_Overload return $x->$proxyMethod( $d->_database, $table); } - if (!$class) { + if (!$rclass) { return DB_DataObject::raiseError( - "factory could not find class $class from $table", + "factory could not find class " . + (is_array($class) ? implode(PATH_SEPARATOR, $class) : $class ). + "from $table", DB_DATAOBJECT_ERROR_INVALIDCONFIG); } - $ret = new $class; + $ret = new $rclass; if (!empty($database)) { DB_DataObject::debug("Setting database to $database","FACTORY",1); $ret->database($database); @@ -2668,11 +2705,12 @@ class DB_DataObject extends DB_DataObject_Overload /** * autoload Class * - * @param string $class Class + * @param string|array $class Class + * @param string $table Table trying to load. * @access private * @return string classname on Success */ - function _autoloadClass($class) + function _autoloadClass($class, $table=false) { global $_DB_DATAOBJECT; @@ -2682,32 +2720,62 @@ class DB_DataObject extends DB_DataObject_Overload $class_prefix = empty($_DB_DATAOBJECT['CONFIG']['class_prefix']) ? '' : $_DB_DATAOBJECT['CONFIG']['class_prefix']; - $table = substr($class,strlen($class_prefix)); + $table = $table ? $table : substr($class,strlen($class_prefix)); // only include the file if it exists - and barf badly if it has parse errors :) if (!empty($_DB_DATAOBJECT['CONFIG']['proxy']) || empty($_DB_DATAOBJECT['CONFIG']['class_location'])) { return false; } + // support for: + // class_location = mydir/ => maps to mydir/Tablename.php + // class_location = mydir/myfile_%s.php => maps to mydir/myfile_Tablename + // with directory sepr + // class_location = mydir/:mydir2/: => tries all of thes locations. + $cl = $_DB_DATAOBJECT['CONFIG']['class_location']; - if (strpos($_DB_DATAOBJECT['CONFIG']['class_location'],'%s') !== false) { - $file = sprintf($_DB_DATAOBJECT['CONFIG']['class_location'], preg_replace('/[^A-Z0-9]/i','_',ucfirst($table))); - } else { - $file = $_DB_DATAOBJECT['CONFIG']['class_location'].'/'.preg_replace('/[^A-Z0-9]/i','_',ucfirst($table)).".php"; + switch (true) { + case (strpos($cl ,'%s') !== false): + $file = sprintf($cl , preg_replace('/[^A-Z0-9]/i','_',ucfirst($table))); + break; + + case (strpos($cl , PATH_SEPARATOR) !== false): + $file = array(); + foreach(explode(PATH_SEPARATOR, $cl ) as $p) { + $file[] = $p .'/'.preg_replace('/[^A-Z0-9]/i','_',ucfirst($table)).".php"; + } + break; + default: + $file = $cl .'/'.preg_replace('/[^A-Z0-9]/i','_',ucfirst($table)).".php"; + break; } - if (!file_exists($file)) { + $cls = is_array($class) ? $class : array($class); + + if (is_array($file) || !file_exists($file)) { $found = false; - foreach(explode(PATH_SEPARATOR, ini_get('include_path')) as $p) { - if (file_exists("$p/$file")) { - $file = "$p/$file"; - $found = true; + + $file = is_array($file) ? $file : array($file); + $search = implode(PATH_SEPARATOR, $file); + foreach($file as $f) { + foreach(explode(PATH_SEPARATOR, '' . PATH_SEPARATOR . ini_get('include_path')) as $p) { + $ff = empty($p) ? $f : "$p/$f"; + + if (file_exists($ff)) { + $file = $ff; + $found = true; + break; + } + } + if ($found) { break; } } if (!$found) { DB_DataObject::raiseError( - "autoload:Could not find class {$class} using class_location value", + "autoload:Could not find class " . implode(',', $cls) . + " using class_location value :" . $search . + " using include_path value :" . ini_get('include_path'), DB_DATAOBJECT_ERROR_INVALIDCONFIG); return false; } @@ -2715,12 +2783,18 @@ class DB_DataObject extends DB_DataObject_Overload include_once $file; - - $ce = substr(phpversion(),0,1) > 4 ? class_exists($class,false) : class_exists($class); - + + $ce = false; + foreach($cls as $c) { + $ce = substr(phpversion(),0,1) > 4 ? class_exists($c,false) : class_exists($c); + if ($ce) { + $class = $c; + break; + } + } if (!$ce) { DB_DataObject::raiseError( - "autoload:Could not autoload {$class}", + "autoload:Could not autoload " . implode(',', $cls) , DB_DATAOBJECT_ERROR_INVALIDCONFIG); return false; } @@ -2786,7 +2860,7 @@ class DB_DataObject extends DB_DataObject_Overload } - + $_DB_DATAOBJECT['LINKS'][$this->_database] = array(); foreach ($schemas as $ini) { $links = @@ -2794,9 +2868,13 @@ class DB_DataObject extends DB_DataObject_Overload $_DB_DATAOBJECT['CONFIG']["links_{$this->_database}"] : str_replace('.ini','.links.ini',$ini); - if (empty($_DB_DATAOBJECT['LINKS'][$this->_database]) && file_exists($links) && is_file($links)) { + if (file_exists($links) && is_file($links)) { /* not sure why $links = ... here - TODO check if that works */ - $_DB_DATAOBJECT['LINKS'][$this->_database] = parse_ini_file($links, true); + $_DB_DATAOBJECT['LINKS'][$this->_database] = array_merge( + $_DB_DATAOBJECT['LINKS'][$this->_database], + parse_ini_file($links, true) + ); + if (!empty($_DB_DATAOBJECT['CONFIG']['debug'])) { $this->debug("Loaded links.ini file: $links","links",1); } @@ -2977,14 +3055,12 @@ class DB_DataObject extends DB_DataObject_Overload } if ($link) { if ($obj->get($link, $this->$row)) { - $obj->free(); return $obj; } return false; } if ($obj->get($this->$row)) { - $obj->free(); return $obj; } return false; @@ -3315,14 +3391,23 @@ class DB_DataObject extends DB_DataObject_Overload DB_DATAOBJECT_ERROR_INVALIDCONFIG); return false; } + + $ignore_null = !isset($options['disable_null_strings']) + || !is_string($options['disable_null_strings']) + || strtolower($options['disable_null_strings']) !== 'full' ; + foreach($items as $k => $v) { - if (!isset($obj->$k)) { + if (!isset($obj->$k) && $ignore_null) { continue; } $kSql = ($quoteIdentifiers ? $DB->quoteIdentifier($k) : $k); + if (DB_DataObject::_is_null($obj,$k)) { + $obj->whereAdd("{$joinAs}.{$kSql} IS NULL"); + continue; + } if ($v & DB_DATAOBJECT_STR) { $obj->whereAdd("{$joinAs}.{$kSql} = " . $this->_quote((string) ( @@ -3344,14 +3429,9 @@ class DB_DataObject extends DB_DataObject_Overload if (PEAR::isError($value)) { $this->raiseError($value->getMessage() ,DB_DATAOBJECT_ERROR_INVALIDARG); return false; - } - if (!isset($options['disable_null_strings']) && strtolower($value) === 'null') { - $obj->whereAdd("{$joinAs}.{$kSql} IS NULL"); - continue; - } else { - $obj->whereAdd("{$joinAs}.{$kSql} = $value"); - continue; - } + } + $obj->whereAdd("{$joinAs}.{$kSql} = $value"); + continue; } @@ -3514,7 +3594,7 @@ class DB_DataObject extends DB_DataObject_Overload continue; } - if (!isset($from[sprintf($format,$k)])) { + if (!isset($from[sprintf($format,$k)]) && !DB_DataObject::_is_null($from, sprintf($format,$k))) { continue; } @@ -3643,7 +3723,7 @@ class DB_DataObject extends DB_DataObject_Overload // if not null - and it's not set....... - if (!isset($this->$key) && ($val & DB_DATAOBJECT_NOTNULL)) { + if ($val & DB_DATAOBJECT_NOTNULL && DB_DataObject::_is_null($this, $key)) { // dont check empty sequence key values.. if (($key == $seq[0]) && ($seq[1] == true)) { continue; @@ -3653,7 +3733,7 @@ class DB_DataObject extends DB_DataObject_Overload } - if (!isset($options['disable_null_strings']) && is_string($this->$key) && (strtolower($this->$key) == 'null')) { + if (DB_DataObject::_is_null($this, $key)) { if ($val & DB_DATAOBJECT_NOTNULL) { $this->debug("'null' field used for '$key', but it is defined as NOT NULL", 'VALIDATION', 4); $ret[$key] = false; @@ -3868,13 +3948,14 @@ class DB_DataObject extends DB_DataObject_Overload //echo "FROM VALUE $col, {$cols[$col]}, $value\n"; switch (true) { // set to null and column is can be null... - case (!isset($options['disable_null_strings']) && (strtolower($value) == 'null') && (!($cols[$col] & DB_DATAOBJECT_NOTNULL))): + case ((!($cols[$col] & DB_DATAOBJECT_NOTNULL)) && DB_DataObject::_is_null($value, false)): case (is_object($value) && is_a($value,'DB_DataObject_Cast')): $this->$col = $value; return true; // fail on setting null on a not null field.. - case (!isset($options['disable_null_strings']) && (strtolower($value) == 'null') && ($cols[$col] & DB_DATAOBJECT_NOTNULL)): + case (($cols[$col] & DB_DATAOBJECT_NOTNULL) && DB_DataObject::_is_null($value,false)): + return false; case (($cols[$col] & DB_DATAOBJECT_DATE) && ($cols[$col] & DB_DATAOBJECT_TIME)): @@ -4189,9 +4270,65 @@ class DB_DataObject extends DB_DataObject_Overload if (isset($_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5])) { $_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5]->num_rows = array(); } + + if (is_array($this->_link_loaded)) { + foreach ($this->_link_loaded as $do) { + $do->free(); + } + } + } + /** + * Evaluate whether or not a value is set to null, taking the 'disable_null_strings' option into account. + * If the value is a string set to "null" and the "disable_null_strings" option is not set to + * true, then the value is considered to be null. + * If the value is actually a PHP NULL value, and "disable_null_strings" has been set to + * the value "full", then it will also be considered null. - this can not differenticate between not set + * + * + * @param object|array $obj_or_ar + * @param string|false $prop prperty + * @access private + * @return bool object + */ + function _is_null($obj_or_ar , $prop) + { + global $_DB_DATAOBJECT; + + + $isset = $prop === false ? isset($obj_or_ar) : + (is_array($obj_or_ar) ? isset($obj_or_ar[$prop]) : isset($obj_or_ar->$prop)); + + $value = $isset ? + ($prop === false ? $obj_or_ar : + (is_array($obj_or_ar) ? $obj_or_ar[$prop] : $obj_or_ar->$prop)) + : null; + + + + $options = $_DB_DATAOBJECT['CONFIG']; + + $null_strings = !isset($options['disable_null_strings']) + || $options['disable_null_strings'] === false; + + $crazy_null = isset($options['disable_null_strings']) + && is_string($options['disable_null_strings']) + && strtolower($options['disable_null_strings'] === 'full'); + + if ( $null_strings && $isset && is_string($value) && (strtolower($value) === 'null') ) { + return true; + } + + if ( $crazy_null && !$isset ) { + return true; + } + + return false; + + + } /* ---- LEGACY BC METHODS - NOT DOCUMENTED - See Documentation on New Methods. ---*/ @@ -4214,3 +4351,4 @@ if (!defined('DB_DATAOBJECT_NO_OVERLOAD')) { } } + diff --git a/extlib/DB/DataObject/Generator.php b/extlib/DB/DataObject/Generator.php index ff6e42c7db..17d310f57c 100644 --- a/extlib/DB/DataObject/Generator.php +++ b/extlib/DB/DataObject/Generator.php @@ -15,7 +15,7 @@ * @author Alan Knowles * @copyright 1997-2006 The PHP Group * @license http://www.php.net/license/3_01.txt PHP License 3.01 - * @version CVS: $Id: Generator.php 284150 2009-07-15 23:27:59Z alan_k $ + * @version CVS: $Id: Generator.php 289384 2009-10-09 00:17:26Z alan_k $ * @link http://pear.php.net/package/DB_DataObject */ @@ -33,7 +33,7 @@ /** * * Config _$ptions - * [DB_DataObject_Generator] + * [DB_DataObject] * ; optional default = DB/DataObject.php * extends_location = * ; optional default = DB_DataObject @@ -775,11 +775,9 @@ class DB_DataObject_Generator extends DB_DataObject //echo "Generating Class files: \n"; $options = &PEAR::getStaticProperty('DB_DataObject','options'); - - if ($extends = @$options['extends']) { - $this->_extends = $extends; - $this->_extendsFile = $options['extends_location']; - } + $this->_extends = empty($options['extends']) ? $this->_extends : $options['extends']; + $this->_extendsFile = empty($options['extends_location']) ? $this->_extendsFile : $options['extends_location']; + foreach($this->tables as $this->table) { $this->table = trim($this->table); @@ -814,7 +812,7 @@ class DB_DataObject_Generator extends DB_DataObject } /** - * class being extended (can be overridden by [DB_DataObject_Generator] extends=xxxx + * class being extended (can be overridden by [DB_DataObject] extends=xxxx * * @var string * @access private @@ -1142,10 +1140,9 @@ class DB_DataObject_Generator extends DB_DataObject $options = &PEAR::getStaticProperty('DB_DataObject','options'); $class_prefix = empty($options['class_prefix']) ? '' : $options['class_prefix']; - if ($extends = @$options['extends']) { - $this->_extends = $extends; - $this->_extendsFile = $options['extends_location']; - } + $this->_extends = empty($options['extends']) ? $this->_extends : $options['extends']; + $this->_extendsFile = empty($options['extends_location']) ? $this->_extendsFile : $options['extends_location']; + $classname = $this->classname = $this->getClassNameFromTableName($this->table); $out = $this->_generateClassTable(); From 0f1d0ab4d7d50467dd7d4ab0646f04da2735b720 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 8 Dec 2009 15:43:11 -0500 Subject: [PATCH 055/172] add DB_DataObject for forward table --- classes/Forward.php | 45 +++++++++++++++++++++++++++++++++++++++++++ classes/statusnet.ini | 11 ++++++++++- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100755 classes/Forward.php mode change 100644 => 100755 classes/statusnet.ini diff --git a/classes/Forward.php b/classes/Forward.php new file mode 100755 index 0000000000..61cec34e3d --- /dev/null +++ b/classes/Forward.php @@ -0,0 +1,45 @@ +. + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Table Definition for location_namespace + */ + +require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; + +class Forward extends Memcached_DataObject +{ + ###START_AUTOCODE + /* the code below is auto generated do not remove the above tag */ + + public $__table = 'forward'; // table name + public $profile_id; // int(4) primary_key not_null + public $notice_id; // int(4) primary_key not_null + public $created; // datetime not_null default_0000-00-00%2000%3A00%3A00 + + /* Static get */ + function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Forward',$k,$v); } + + /* the code above is auto generated do not remove the tag below */ + ###END_AUTOCODE +} diff --git a/classes/statusnet.ini b/classes/statusnet.ini old mode 100644 new mode 100755 index 253f458798..a5126795bd --- a/classes/statusnet.ini +++ b/classes/statusnet.ini @@ -1,3 +1,4 @@ + [avatar] profile_id = 129 original = 17 @@ -195,6 +196,15 @@ id = K service = K uri = U +[forward] +profile_id = 129 +notice_id = 129 +created = 142 + +[forward__keys] +profile_id = K +notice_id = K + [group_alias] alias = 130 group_id = 129 @@ -260,7 +270,6 @@ modified = 384 [login_token__keys] user_id = K -token = K [message] id = 129 From 6bc6af667ec51e41570e580de43eac1f9e155d30 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 8 Dec 2009 15:43:34 -0500 Subject: [PATCH 056/172] fix exe flag --- classes/Forward.php | 0 classes/statusnet.ini | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 classes/Forward.php mode change 100755 => 100644 classes/statusnet.ini diff --git a/classes/Forward.php b/classes/Forward.php old mode 100755 new mode 100644 diff --git a/classes/statusnet.ini b/classes/statusnet.ini old mode 100755 new mode 100644 From 72c82a2e293549c10b60ca9e295f2f430224e814 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 8 Dec 2009 16:30:33 -0500 Subject: [PATCH 057/172] Basic function to store forwards and redistribute --- classes/Forward.php | 64 ++++++++++++++++++++++++++++++++++++++++ classes/Notice.php | 34 +-------------------- classes/Notice_inbox.php | 42 +++++++++++++++++++++++++- 3 files changed, 106 insertions(+), 34 deletions(-) diff --git a/classes/Forward.php b/classes/Forward.php index 61cec34e3d..6d4848438c 100644 --- a/classes/Forward.php +++ b/classes/Forward.php @@ -42,4 +42,68 @@ class Forward extends Memcached_DataObject /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE + + static function saveNew($profile_id, $notice_id) + { + $forward = new Forward(); + + $forward->profile_id = $profile_id; + $forward->notice_id = $notice_id; + $forward->created = common_sql_now(); + + $forward->query('BEGIN'); + + if (!$forward->insert()) { + throw new ServerException(_("Couldn't insert forward.")); + } + + $ni = $forward->addToInboxes(); + + $forward->query('COMMIT'); + + $forward->blowCache($ni); + } + + function addToInboxes() + { + $inbox = new Notice_inbox(); + + $user = new User(); + + $user->query('SELECT id FROM user JOIN subscription ON user.id = subscription.subscriber '. + 'WHERE subscription.subscribed = '.$this->profile_id); + + $ni = array(); + + while ($user->fetch()) { + $inbox = Notice_inbox::pkeyGet(array('user_id' => $user->id, + 'notice_id' => $this->notice_id)); + + if (empty($inbox)) { + $ni[$user->id] = NOTICE_INBOX_SOURCE_FORWARD; + } else { + $inbox->free(); + } + } + + $user->free(); + + Notice_inbox::bulkInsert($this->notice_id, $this->created, $ni); + + return $ni; + } + + function blowCache($ni) + { + $cache = common_memcache(); + + if (!empty($cache)) { + foreach ($ni as $id => $source) { + $cache->delete(common_cache_key('notice_inbox:by_user:'.$id)); + $cache->delete(common_cache_key('notice_inbox:by_user_own:'.$id)); + $cache->delete(common_cache_key('notice_inbox:by_user:'.$id.';last')); + $cache->delete(common_cache_key('notice_inbox:by_user_own:'.$id.';last')); + } + } + } } diff --git a/classes/Notice.php b/classes/Notice.php index 6610721564..bcd7947bd1 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -948,39 +948,7 @@ class Notice extends Memcached_DataObject } } - $cnt = 0; - - $qryhdr = 'INSERT INTO notice_inbox (user_id, notice_id, source, created) VALUES '; - $qry = $qryhdr; - - foreach ($ni as $id => $source) { - if ($cnt > 0) { - $qry .= ', '; - } - $qry .= '('.$id.', '.$this->id.', '.$source.", '".$this->created. "') "; - $cnt++; - if (rand() % NOTICE_INBOX_SOFT_LIMIT == 0) { - // FIXME: Causes lag in replicated servers - // Notice_inbox::gc($id); - } - if ($cnt >= MAX_BOXCARS) { - $inbox = new Notice_inbox(); - $result = $inbox->query($qry); - if (PEAR::isError($result)) { - common_log_db_error($inbox, $qry); - } - $qry = $qryhdr; - $cnt = 0; - } - } - - if ($cnt > 0) { - $inbox = new Notice_inbox(); - $result = $inbox->query($qry); - if (PEAR::isError($result)) { - common_log_db_error($inbox, $qry); - } - } + Notice_inbox::bulkInsert($this->id, $this->created, $ni); return; } diff --git a/classes/Notice_inbox.php b/classes/Notice_inbox.php index d3e7853b1b..b39006542c 100644 --- a/classes/Notice_inbox.php +++ b/classes/Notice_inbox.php @@ -32,6 +32,7 @@ define('NOTICE_INBOX_SOFT_LIMIT', 1000); define('NOTICE_INBOX_SOURCE_SUB', 1); define('NOTICE_INBOX_SOURCE_GROUP', 2); define('NOTICE_INBOX_SOURCE_REPLY', 3); +define('NOTICE_INBOX_SOURCE_FORWARD', 4); define('NOTICE_INBOX_SOURCE_GATEWAY', -1); class Notice_inbox extends Memcached_DataObject @@ -83,7 +84,7 @@ class Notice_inbox extends Memcached_DataObject $inbox->whereAdd('created > \'' . date('Y-m-d H:i:s', $since) . '\''); } - $inbox->orderBy('notice_id DESC'); + $inbox->orderBy('created DESC'); if (!is_null($offset)) { $inbox->limit($offset, $limit); @@ -141,4 +142,43 @@ class Notice_inbox extends Memcached_DataObject 'WHERE user_id = ' . $user_id . ' ' . 'AND notice_id in ('.implode(',', $notices).')'); } + + static function bulkInsert($notice_id, $created, $ni) + { + $cnt = 0; + + $qryhdr = 'INSERT INTO notice_inbox (user_id, notice_id, source, created) VALUES '; + $qry = $qryhdr; + + foreach ($ni as $id => $source) { + if ($cnt > 0) { + $qry .= ', '; + } + $qry .= '('.$id.', '.$notice_id.', '.$source.", '".$created. "') "; + $cnt++; + if (rand() % NOTICE_INBOX_SOFT_LIMIT == 0) { + // FIXME: Causes lag in replicated servers + // Notice_inbox::gc($id); + } + if ($cnt >= MAX_BOXCARS) { + $inbox = new Notice_inbox(); + $result = $inbox->query($qry); + if (PEAR::isError($result)) { + common_log_db_error($inbox, $qry); + } + $qry = $qryhdr; + $cnt = 0; + } + } + + if ($cnt > 0) { + $inbox = new Notice_inbox(); + $result = $inbox->query($qry); + if (PEAR::isError($result)) { + common_log_db_error($inbox, $qry); + } + } + + return; + } } From c899e4a84ee45b65950980ccb87e52129871d58e Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 8 Dec 2009 17:02:48 -0500 Subject: [PATCH 058/172] show forwards in the inbox --- actions/all.php | 87 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 85 insertions(+), 2 deletions(-) diff --git a/actions/all.php b/actions/all.php index 5a9d97dd76..2c96298faf 100644 --- a/actions/all.php +++ b/actions/all.php @@ -144,7 +144,7 @@ class AllAction extends ProfileAction function showContent() { - $nl = new NoticeList($this->notice, $this); + $nl = new InboxNoticeList($this->notice, $this->user, $this); $cnt = $nl->show(); @@ -167,5 +167,88 @@ class AllAction extends ProfileAction $this->element('h1', null, sprintf(_('%s and friends'), $this->user->nickname)); } } - +} + +class InboxNoticeList extends NoticeList +{ + var $owner = null; + + function __construct($notice, $owner, $out=null) + { + parent::__construct($notice, $out); + $this->owner = $owner; + } + + function newListItem($notice) + { + return new InboxNoticeListItem($notice, $this->owner, $this->out); + } +} + +class InboxNoticeListItem extends NoticeListItem +{ + var $owner = null; + var $ib = null; + + function __construct($notice, $owner, $out=null) + { + parent::__construct($notice, $out); + $this->owner = $owner; + + $this->ib = Notice_inbox::pkeyGet(array('user_id' => $owner->id, + 'notice_id' => $notice->id)); + } + + function showAuthor() + { + parent::showAuthor(); + if ($this->ib->source == NOTICE_INBOX_SOURCE_FORWARD) { + $this->out->element('span', 'forward', _('Fwd')); + } + } + + function showEnd() + { + if ($this->ib->source == NOTICE_INBOX_SOURCE_FORWARD) { + + $forward = new Forward(); + + // FIXME: scary join! + + $forward->query('SELECT profile_id '. + 'FROM forward JOIN subscription ON forward.profile_id = subscription.subscribed '. + 'WHERE subscription.subscriber = ' . $this->owner->id . ' '. + 'AND forward.notice_id = ' . $this->notice->id . ' '. + 'ORDER BY forward.created '); + + $n = 0; + + $firstForwarder = null; + + while ($forward->fetch()) { + if (empty($firstForwarder)) { + $firstForwarder = Profile::staticGet('id', $forward->profile_id); + } + $n++; + } + + $forward->free(); + unset($forward); + + $this->out->elementStart('span', 'forwards'); + + $link = XMLStringer::estring('a', array('href' => $firstForwarder->profileurl), + $firstForwarder->nickname); + + if ($n == 1) { + $this->out->raw(sprintf(_('Forwarded by %s'), $link)); + } else { + // XXX: use that cool ngettext thing + $this->out->raw(sprintf(_('Forwarded by %s and %d other(s)'), $link, $n - 1)); + } + + $this->out->elementEnd('span'); + } + parent::showEnd(); + } } From 7dd0f2fa9c8e9332c5ff481c93b53169c2510ff7 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 8 Dec 2009 17:20:04 -0500 Subject: [PATCH 059/172] pkeyGet() method for Forward and return value from saveNew() --- classes/Forward.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/classes/Forward.php b/classes/Forward.php index 6d4848438c..52ec538715 100644 --- a/classes/Forward.php +++ b/classes/Forward.php @@ -43,6 +43,11 @@ class Forward extends Memcached_DataObject /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE + function &pkeyGet($kv) + { + return Memcached_DataObject::pkeyGet('Forward', $kv); + } + static function saveNew($profile_id, $notice_id) { $forward = new Forward(); @@ -62,6 +67,8 @@ class Forward extends Memcached_DataObject $forward->query('COMMIT'); $forward->blowCache($ni); + + return $forward; } function addToInboxes() From c49ece9fb40c68e6d6a47343208dc3da5726cf44 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 8 Dec 2009 17:20:17 -0500 Subject: [PATCH 060/172] method to check if a profile has forwarded a notice --- classes/Profile.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/classes/Profile.php b/classes/Profile.php index 4b2e090064..4c14f62a06 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -716,4 +716,12 @@ class Profile extends Memcached_DataObject } return $result; } + + function hasForwarded($notice_id) + { + $forward = Forward::pkeyGet(array('profile_id' => $this->id, + 'notice_id' => $notice_id)); + + return (!empty($forward)); + } } From 48a93810abe5fd5098ef4f91e2b9d5991e217748 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 8 Dec 2009 17:20:45 -0500 Subject: [PATCH 061/172] action to forward a notice --- actions/forward.php | 117 ++++++++++++++++++++++++++++++++++++++++++++ lib/router.php | 2 +- 2 files changed, 118 insertions(+), 1 deletion(-) create mode 100644 actions/forward.php diff --git a/actions/forward.php b/actions/forward.php new file mode 100644 index 0000000000..87365c2d3c --- /dev/null +++ b/actions/forward.php @@ -0,0 +1,117 @@ + + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://status.net/ + * + * StatusNet - the distributed open-source microblogging tool + * Copyright (C) 2008, 2009, StatusNet, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Forward action + * + * @category Action + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://status.net/ + */ + +class ForwardAction extends Action +{ + var $user = null; + var $notice = null; + + function prepare($args) + { + parent::prepare($args); + + $this->user = common_current_user(); + + if (empty($this->user)) { + $this->clientError(_("Only logged-in users can forward notices.")); + return false; + } + + $id = $this->trimmed('notice'); + + if (empty($id)) { + $this->clientError(_("No notice specified.")); + return false; + } + + $this->notice = Notice::staticGet('id', $id); + + if (empty($this->notice)) { + $this->clientError(_("No notice specified.")); + return false; + } + + $token = $this->trimmed('token'); + + if (empty($token) || $token != common_session_token()) { + $this->clientError(_("There was a problem with your session token. Try again, please.")); + return false; + } + + $profile = $this->user->getProfile(); + + if ($profile->hasForwarded($id)) { + $this->clientError(_("You already forwarded that notice.")); + return false; + } + + return true; + } + + /** + * Class handler. + * + * @param array $args query arguments + * + * @return void + */ + + function handle($args) + { + $forward = Forward::saveNew($this->user->id, $this->notice->id); + + if ($this->boolean('ajax')) { + $this->startHTML('text/xml;charset=utf-8'); + $this->elementStart('head'); + $this->element('title', null, _('Forwarded')); + $this->elementEnd('head'); + $this->elementStart('body'); + $this->element('p', array('id' => 'forward_response'), _('Forwarded!')); + $this->elementEnd('body'); + $this->elementEnd('html'); + } else { + // FIXME! + } + } +} diff --git a/lib/router.php b/lib/router.php index 37525319f7..398135a3e2 100644 --- a/lib/router.php +++ b/lib/router.php @@ -99,7 +99,7 @@ class Router 'groupblock', 'groupunblock', 'sandbox', 'unsandbox', 'silence', 'unsilence', - 'deleteuser'); + 'deleteuser', 'forward'); foreach ($main as $a) { $m->connect('main/'.$a, array('action' => $a)); From 41cbb90faeabc0a6002b41d40d392f45a59a7aba Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 8 Dec 2009 17:31:23 -0500 Subject: [PATCH 062/172] add (ugly) form to forward notices --- actions/forward.php | 2 +- js/util.js | 10 ++- lib/forwardform.php | 147 ++++++++++++++++++++++++++++++++++++++++++++ lib/noticelist.php | 21 +++++++ 4 files changed, 176 insertions(+), 4 deletions(-) create mode 100644 lib/forwardform.php diff --git a/actions/forward.php b/actions/forward.php index 87365c2d3c..867ed97d29 100644 --- a/actions/forward.php +++ b/actions/forward.php @@ -72,7 +72,7 @@ class ForwardAction extends Action return false; } - $token = $this->trimmed('token'); + $token = $this->trimmed('token-'.$id); if (empty($token) || $token != common_session_token()) { $this->clientError(_("There was a problem with your session token. Try again, please.")); diff --git a/js/util.js b/js/util.js index ed6a781f74..67df73507b 100644 --- a/js/util.js +++ b/js/util.js @@ -208,7 +208,7 @@ var SN = { // StatusNet $('#'+form_id+' .form_response').remove(); var result; if ($('#'+SN.C.S.Error, data).length > 0) { - result = document._importNode($('p', data)[0], true); + result = document._importNode($('p', data)[0], true); result = result.textContent || result.innerHTML; form.append('

    '+result+'

    '); } @@ -306,8 +306,12 @@ var SN = { // StatusNet $('.form_disfavor').each(function() { SN.U.FormXHR($(this)); }); }, + NoticeForward: function() { + $('.form_forward').each(function() { SN.U.FormXHR($(this)); }); + }, + NoticeAttachments: function() { - $('.notice a.attachment').each(function() { + $('.notice a.attachment').each(function() { SN.U.NoticeWithAttachment($(this).closest('.notice')); }); }, @@ -439,7 +443,7 @@ var SN = { // StatusNet Notices: function() { if ($('body.user_in').length > 0) { SN.U.NoticeFavor(); - + SN.U.NoticeForward(); SN.U.NoticeReply(); } diff --git a/lib/forwardform.php b/lib/forwardform.php new file mode 100644 index 0000000000..2052856ae6 --- /dev/null +++ b/lib/forwardform.php @@ -0,0 +1,147 @@ +. + * + * @category Form + * @package StatusNet + * @author Evan Prodromou + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +require_once INSTALLDIR.'/lib/form.php'; + +/** + * Form for forwarding a notice + * + * @category Form + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class ForwardForm extends Form +{ + /** + * Notice to forward + */ + + var $notice = null; + + /** + * Constructor + * + * @param HTMLOutputter $out output channel + * @param Notice $notice notice to forward + */ + + function __construct($out=null, $notice=null) + { + parent::__construct($out); + + $this->notice = $notice; + } + + /** + * ID of the form + * + * @return int ID of the form + */ + + function id() + { + return 'forward-' . $this->notice->id; + } + + /** + * Action of the form + * + * @return string URL of the action + */ + + function action() + { + return common_local_url('forward'); + } + + /** + * Include a session token for CSRF protection + * + * @return void + */ + + function sessionToken() + { + $this->out->hidden('token-' . $this->notice->id, + common_session_token()); + } + + /** + * Legend of the Form + * + * @return void + */ + function formLegend() + { + $this->out->element('legend', null, _('Forward this notice')); + } + + /** + * Data elements + * + * @return void + */ + + function formData() + { + $this->out->hidden('notice-n'.$this->notice->id, + $this->notice->id, + 'notice'); + } + + /** + * Action elements + * + * @return void + */ + + function formActions() + { + $this->out->submit('forward-submit-' . $this->notice->id, + _('Forward'), 'submit', null, _('Forward this notice')); + } + + /** + * Class of the form. + * + * @return string the form's class + */ + + function formClass() + { + return 'form_forward'; + } +} diff --git a/lib/noticelist.php b/lib/noticelist.php index 21cec528ff..b38860880d 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -212,6 +212,7 @@ class NoticeListItem extends Widget $this->out->elementStart('div', 'notice-options'); $this->showFaveForm(); $this->showReplyLink(); + $this->showForwardForm(); $this->showDeleteLink(); $this->out->elementEnd('div'); } @@ -530,6 +531,26 @@ class NoticeListItem extends Widget } } + /** + * show the form to forward a notice + * + * @return void + */ + + function showForwardForm() + { + $user = common_current_user(); + if ($user) { + $profile = $user->getProfile(); + if ($profile->hasForwarded($this->notice->id)) { + $this->out->text(_('Forwarded')); + } else { + $ff = new ForwardForm($this->out, $this->notice); + $ff->show(); + } + } + } + /** * if the user is the author, let them delete the notice * From 5344b3fb4bd48e0559e5ff37b961878ae3a31d3b Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 8 Dec 2009 17:32:09 -0500 Subject: [PATCH 063/172] add forward table to updates --- db/08to09.sql | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/db/08to09.sql b/db/08to09.sql index 64640f4ced..a945416ea4 100644 --- a/db/08to09.sql +++ b/db/08to09.sql @@ -82,3 +82,15 @@ create table login_token ( constraint primary key (user_id) ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; + +create table forward ( + + profile_id integer not null comment 'profile who forwarded the notice' references profile (id), + notice_id integer not null comment 'notice they forwarded' references notice (id), + + created datetime not null comment 'date this record was created', + + constraint primary key (profile_id, notice_id) + +) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; + From 9dff9e6cea6c46734de85081856064561a34a501 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 8 Dec 2009 17:42:07 -0500 Subject: [PATCH 064/172] make sure not to forward blocked users --- classes/Forward.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/classes/Forward.php b/classes/Forward.php index 52ec538715..e9b83a58bf 100644 --- a/classes/Forward.php +++ b/classes/Forward.php @@ -77,23 +77,33 @@ class Forward extends Memcached_DataObject $user = new User(); - $user->query('SELECT id FROM user JOIN subscription ON user.id = subscription.subscriber '. + $user->query('SELECT user.* FROM user JOIN subscription ON user.id = subscription.subscriber '. 'WHERE subscription.subscribed = '.$this->profile_id); $ni = array(); + $notice = Notice::staticGet('id', $this->notice_id); + + $author = Profile::staticGet('id', $notice->profile_id); + while ($user->fetch()) { $inbox = Notice_inbox::pkeyGet(array('user_id' => $user->id, 'notice_id' => $this->notice_id)); if (empty($inbox)) { - $ni[$user->id] = NOTICE_INBOX_SOURCE_FORWARD; + if (!$user->hasBlocked($author)) { + $ni[$user->id] = NOTICE_INBOX_SOURCE_FORWARD; + } } else { $inbox->free(); } } $user->free(); + $author->free(); + + unset($user); + unset($author); Notice_inbox::bulkInsert($this->notice_id, $this->created, $ni); From 985d6a0de424b682ebe7f3f90a504ba3e70f2f61 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 8 Dec 2009 17:48:24 -0500 Subject: [PATCH 065/172] make forward form slightly less obnoxious --- theme/base/css/display.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 44d1d0300f..f622f35caf 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -112,7 +112,6 @@ border-style:solid; line-height:0; } - .form_settings input.remove { margin-left:11px; } @@ -246,7 +245,6 @@ margin-left:11px; width:auto; } - address { float:left; margin-bottom:18px; @@ -709,7 +707,6 @@ border-radius:4px; margin-bottom:18px; } - .entity_send-a-message button { position:absolute; top:3px; @@ -1005,11 +1002,13 @@ float:left; } .notice-options .notice_delete, .notice-options .notice_reply, +.notice-options .form_forward, .notice-options .form_favor, .notice-options .form_disfavor { float:left; margin-left:20%; } +.notice-options .form_forward, .notice-options .form_favor, .notice-options .form_disfavor { margin-left:0; @@ -1035,10 +1034,12 @@ border-radius:0; -moz-border-radius:0; -webkit-border-radius:0; } +.notice-options .form_forward legend, .notice-options .form_favor legend, .notice-options .form_disfavor legend { display:none; } +.notice-options .form_forward fieldset, .notice-options .form_favor fieldset, .notice-options .form_disfavor fieldset { border:0; From 21757186e9a7ffd2e3330fd4ef61ffeb2dc0229b Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 8 Dec 2009 17:52:20 -0500 Subject: [PATCH 066/172] don't allow forwarding your own notice --- actions/forward.php | 5 +++++ lib/noticelist.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/actions/forward.php b/actions/forward.php index 867ed97d29..194833fe0c 100644 --- a/actions/forward.php +++ b/actions/forward.php @@ -72,6 +72,11 @@ class ForwardAction extends Action return false; } + if ($this->user->id == $this->notice->profile_id) { + $this->clientError(_("You can't forward your own notice.")); + return false; + } + $token = $this->trimmed('token-'.$id); if (empty($token) || $token != common_session_token()) { diff --git a/lib/noticelist.php b/lib/noticelist.php index b38860880d..d6ffc9ca9c 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -540,7 +540,7 @@ class NoticeListItem extends Widget function showForwardForm() { $user = common_current_user(); - if ($user) { + if ($user && $user->id != $this->notice->profile_id) { $profile = $user->getProfile(); if ($profile->hasForwarded($this->notice->id)) { $this->out->text(_('Forwarded')); From b139be6caf39628834ca34f5f7e58c1e08a3ebf3 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Wed, 9 Dec 2009 13:09:38 +1300 Subject: [PATCH 067/172] added missing table: location_namespace --- db/08to09_pg.sql | 10 ++++++++++ db/statusnet_pg.sql | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql index 0bd47dea56..ee590b52f9 100644 --- a/db/08to09_pg.sql +++ b/db/08to09_pg.sql @@ -39,6 +39,16 @@ create table profile_role ( ); +create table location_namespace ( + + id integer /*comment 'identity for this namespace'*/, + description text /* comment 'description of the namespace'*/ , + created integer not null /*comment 'date the record was created*/ , + /* modified timestamp comment 'date this record was modified',*/ + primary key (id) + +); + create table login_token ( user_id integer not null /* comment 'user owning this token'*/ references "user" (id), token char(32) not null /* comment 'token useable for logging in'*/, diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql index 81b329d1e5..92546c814d 100644 --- a/db/statusnet_pg.sql +++ b/db/statusnet_pg.sql @@ -572,6 +572,16 @@ create table profile_role ( ); +create table location_namespace ( + + id integer /*comment 'identity for this namespace'*/, + description text /* comment 'description of the namespace'*/ , + created integer not null /*comment 'date the record was created*/ , + /* modified timestamp comment 'date this record was modified',*/ + primary key (id) + +); + create table login_token ( user_id integer not null /* comment 'user owning this token'*/ references "user" (id), token char(32) not null /* comment 'token useable for logging in'*/, From 3e9c2d779a3d3e014e8900060c3a2632d9e7f138 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Wed, 9 Dec 2009 13:12:29 +1300 Subject: [PATCH 068/172] add missing table "forward" --- db/08to09_pg.sql | 8 ++++++++ db/statusnet_pg.sql | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql index ee590b52f9..4f8281bc3e 100644 --- a/db/08to09_pg.sql +++ b/db/08to09_pg.sql @@ -79,3 +79,11 @@ ALTER TABLE profile ADD COLUMN lat decimal(10,7) /*comment 'latitude'*/ ; ALTER TABLE profile ADD COLUMN lon decimal(10,7) /*comment 'longitude'*/; ALTER TABLE profile ADD COLUMN location_id integer /* comment 'location id if possible'*/; ALTER TABLE profile ADD COLUMN location_ns integer /* comment 'namespace for location'*/; + +CREATE TABLE forward ( + profile_id integer not null /*comment 'profile who forwarded the notice'*/ references profile (id), + notice_id integer not null /*comment 'notice they forwarded'*/ references notice (id), + created timestamp not null /*comment 'date this record was created'*/ DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (profile_id, notice_id) +); + diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql index 92546c814d..6bcc278859 100644 --- a/db/statusnet_pg.sql +++ b/db/statusnet_pg.sql @@ -582,6 +582,8 @@ create table location_namespace ( ); + + create table login_token ( user_id integer not null /* comment 'user owning this token'*/ references "user" (id), token char(32) not null /* comment 'token useable for logging in'*/, @@ -591,3 +593,9 @@ create table login_token ( primary key (user_id) ); +CREATE TABLE forward ( + profile_id integer not null /*comment 'profile who forwarded the notice'*/ references profile (id), + notice_id integer not null /*comment 'notice they forwarded'*/ references notice (id), + created timestamp not null /*comment 'date this record was created'*/ DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (profile_id, notice_id) +); From 789378838b9a3ad6bff906d70c8316527aed9e98 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Wed, 9 Dec 2009 13:26:59 +1300 Subject: [PATCH 069/172] that pesky table named user - now quoted --- classes/Forward.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/Forward.php b/classes/Forward.php index e9b83a58bf..09b2d6a4ee 100644 --- a/classes/Forward.php +++ b/classes/Forward.php @@ -77,7 +77,8 @@ class Forward extends Memcached_DataObject $user = new User(); - $user->query('SELECT user.* FROM user JOIN subscription ON user.id = subscription.subscriber '. + $usertable = common_database_tablename('user'); + $user->query("SELECT $usertable.* FROM $usertable INNER JOIN subscription ON $usertable.id = subscription.subscriber ". 'WHERE subscription.subscribed = '.$this->profile_id); $ni = array(); From 2f59f0ddb5cc6030671af7e751e0ae85e4751497 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 8 Dec 2009 17:35:27 -0800 Subject: [PATCH 070/172] Compat fix for PHP 5.2.4 -- drop unneeded new param to debug_backtrace(), caused error spew on older PHP (introduced PHP 5.2.5) Fix for regression in 4b5e977a7b1c390555d880d3dc7f8b8c6744646c --- lib/language.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/language.php b/lib/language.php index ab46f1a656..916cee7ed4 100644 --- a/lib/language.php +++ b/lib/language.php @@ -153,7 +153,7 @@ if (!function_exists('npgettext')) { */ function _m($msg/*, ...*/) { - $domain = _mdomain(debug_backtrace(false)); + $domain = _mdomain(debug_backtrace()); $args = func_get_args(); switch(count($args)) { case 1: return dgettext($domain, $msg); From 45408142e9d7431dd4a664262d4806c655cc5c68 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 8 Dec 2009 21:02:54 -0500 Subject: [PATCH 071/172] reorder notices when not using memcached --- classes/Notice.php | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/classes/Notice.php b/classes/Notice.php index bcd7947bd1..c36c5a9c6b 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -788,10 +788,24 @@ class Notice extends Memcached_DataObject return $notice; } $notice->whereAdd('id in (' . implode(', ', $ids) . ')'); - $notice->orderBy('id DESC'); $notice->find(); - return $notice; + + $temp = array(); + + while ($notice->fetch()) { + $temp[$notice->id] = clone($notice); + } + + $wrapped = array(); + + foreach ($ids as $id) { + if (array_key_exists($id, $temp)) { + $wrapped[] = $temp[$id]; + } + } + + return new ArrayWrapper($wrapped); } } From 559415826a234c9d993535bc30f132af1e247160 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 9 Dec 2009 11:00:30 +0100 Subject: [PATCH 072/172] Added a todo list for Realtime plugin --- plugins/Realtime/README | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 plugins/Realtime/README diff --git a/plugins/Realtime/README b/plugins/Realtime/README new file mode 100644 index 0000000000..f5e4f91cf3 --- /dev/null +++ b/plugins/Realtime/README @@ -0,0 +1,9 @@ +== TODO == +* i18n +* Change in context URL to conversation (try not to construct the URL in JS) +* Update mark behaviour (on notice send) +* Pause, Send a notice ~ should not update counter +* Pause ~ retain up to 50-100 most recent notices +* Add geo data +* Make it work for Conversation page (perhaps a little tricky) +* IE is updating the counter in document title all the time (Not sure if this is still an issue) From 83830c26e746f9bccb149940ce67904d7e536851 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 9 Dec 2009 11:37:53 +0100 Subject: [PATCH 073/172] Added todo item to Realtime plugin --- plugins/Realtime/README | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/Realtime/README b/plugins/Realtime/README index f5e4f91cf3..524382696b 100644 --- a/plugins/Realtime/README +++ b/plugins/Realtime/README @@ -7,3 +7,5 @@ * Add geo data * Make it work for Conversation page (perhaps a little tricky) * IE is updating the counter in document title all the time (Not sure if this is still an issue) +* Reconsider the timestamp approach + From 4db184e5b4843ec15c7b4e48b3461f9d6fd87822 Mon Sep 17 00:00:00 2001 From: Eric Helgeson Date: Wed, 9 Dec 2009 22:31:07 -0500 Subject: [PATCH 074/172] New Events for avatar settings --- EVENTS.txt | 12 +++++ actions/avatarsettings.php | 108 +++++++++++++++++++------------------ 2 files changed, 69 insertions(+), 51 deletions(-) diff --git a/EVENTS.txt b/EVENTS.txt index e0516f8f45..96250f64c7 100644 --- a/EVENTS.txt +++ b/EVENTS.txt @@ -290,6 +290,18 @@ StartRegistrationTry: before validating and saving a new user EndRegistrationTry: after saving a new user (note: no profile or user object!) - $action: action object being shown +StartAvatarFormData: before displaying avatar form +- $action: action object being shown + +EndAvatarFormData: after displaying avatar form +- $action: action object being shown + +StartAvatarSaveForm: before saving the avatar +- $action: action object being shown + +EndAvatarSaveForm: after saving the avatar +- $action: action object being shown + StartNewQueueManager: before trying to start a new queue manager; good for plugins implementing new queue manager classes - $qm: empty queue manager to set diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php index 879e44842f..cf45255520 100644 --- a/actions/avatarsettings.php +++ b/actions/avatarsettings.php @@ -118,53 +118,56 @@ class AvatarsettingsAction extends AccountSettingsAction $this->elementStart('fieldset'); $this->element('legend', null, _('Avatar settings')); $this->hidden('token', common_session_token()); + + if (Event::handle('StartAvatarFormData', array($this))) { + $this->elementStart('ul', 'form_data'); + if ($original) { + $this->elementStart('li', array('id' => 'avatar_original', + 'class' => 'avatar_view')); + $this->element('h2', null, _("Original")); + $this->elementStart('div', array('id'=>'avatar_original_view')); + $this->element('img', array('src' => $original->url, + 'width' => $original->width, + 'height' => $original->height, + 'alt' => $user->nickname)); + $this->elementEnd('div'); + $this->elementEnd('li'); + } - $this->elementStart('ul', 'form_data'); - if ($original) { - $this->elementStart('li', array('id' => 'avatar_original', - 'class' => 'avatar_view')); - $this->element('h2', null, _("Original")); - $this->elementStart('div', array('id'=>'avatar_original_view')); - $this->element('img', array('src' => $original->url, - 'width' => $original->width, - 'height' => $original->height, - 'alt' => $user->nickname)); - $this->elementEnd('div'); + $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE); + + if ($avatar) { + $this->elementStart('li', array('id' => 'avatar_preview', + 'class' => 'avatar_view')); + $this->element('h2', null, _("Preview")); + $this->elementStart('div', array('id'=>'avatar_preview_view')); + $this->element('img', array('src' => $original->url, + 'width' => AVATAR_PROFILE_SIZE, + 'height' => AVATAR_PROFILE_SIZE, + 'alt' => $user->nickname)); + $this->elementEnd('div'); + $this->submit('delete', _('Delete')); + $this->elementEnd('li'); + } + + $this->elementStart('li', array ('id' => 'settings_attach')); + $this->element('input', array('name' => 'avatarfile', + 'type' => 'file', + 'id' => 'avatarfile')); + $this->element('input', array('name' => 'MAX_FILE_SIZE', + 'type' => 'hidden', + 'id' => 'MAX_FILE_SIZE', + 'value' => ImageFile::maxFileSizeInt())); $this->elementEnd('li'); - } + $this->elementEnd('ul'); - $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE); - - if ($avatar) { - $this->elementStart('li', array('id' => 'avatar_preview', - 'class' => 'avatar_view')); - $this->element('h2', null, _("Preview")); - $this->elementStart('div', array('id'=>'avatar_preview_view')); - $this->element('img', array('src' => $original->url, - 'width' => AVATAR_PROFILE_SIZE, - 'height' => AVATAR_PROFILE_SIZE, - 'alt' => $user->nickname)); - $this->elementEnd('div'); - $this->submit('delete', _('Delete')); + $this->elementStart('ul', 'form_actions'); + $this->elementStart('li'); + $this->submit('upload', _('Upload')); $this->elementEnd('li'); + $this->elementEnd('ul'); } - - $this->elementStart('li', array ('id' => 'settings_attach')); - $this->element('input', array('name' => 'avatarfile', - 'type' => 'file', - 'id' => 'avatarfile')); - $this->element('input', array('name' => 'MAX_FILE_SIZE', - 'type' => 'hidden', - 'id' => 'MAX_FILE_SIZE', - 'value' => ImageFile::maxFileSizeInt())); - $this->elementEnd('li'); - $this->elementEnd('ul'); - - $this->elementStart('ul', 'form_actions'); - $this->elementStart('li'); - $this->submit('upload', _('Upload')); - $this->elementEnd('li'); - $this->elementEnd('ul'); + Event::handle('EndAvatarFormData', array($this)); $this->elementEnd('fieldset'); $this->elementEnd('form'); @@ -266,15 +269,18 @@ class AvatarsettingsAction extends AccountSettingsAction 'Try again, please.')); return; } - - if ($this->arg('upload')) { - $this->uploadAvatar(); - } else if ($this->arg('crop')) { - $this->cropAvatar(); - } else if ($this->arg('delete')) { - $this->deleteAvatar(); - } else { - $this->showForm(_('Unexpected form submission.')); + + if (Event::handle('StartAvatarSaveForm', array($this))) { + if ($this->arg('upload')) { + $this->uploadAvatar(); + } else if ($this->arg('crop')) { + $this->cropAvatar(); + } else if ($this->arg('delete')) { + $this->deleteAvatar(); + } else { + $this->showForm(_('Unexpected form submission.')); + } + Event::handle('EndAvatarSaveForm', array($this)); } } From 155659dd1fee44c011962432a3e2ef6d523f1a7d Mon Sep 17 00:00:00 2001 From: Eric Helgeson Date: Wed, 9 Dec 2009 22:32:57 -0500 Subject: [PATCH 075/172] Initial GravatarPlugin --- plugins/Gravatar/GravatarPlugin.php | 176 ++++++++++++++++++++++++++++ plugins/Gravatar/README | 13 ++ 2 files changed, 189 insertions(+) create mode 100644 plugins/Gravatar/GravatarPlugin.php create mode 100644 plugins/Gravatar/README diff --git a/plugins/Gravatar/GravatarPlugin.php b/plugins/Gravatar/GravatarPlugin.php new file mode 100644 index 0000000000..b18f627266 --- /dev/null +++ b/plugins/Gravatar/GravatarPlugin.php @@ -0,0 +1,176 @@ +. + */ + +/** + * @package GravatarPlugin + * @maintainer Eric Helgeson + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + // This check helps protect against security problems; + // your code file can't be executed directly from the web. + exit(1); +} + +class GravatarPlugin extends Plugin +{ + function onInitializePlugin() { + return true; + } + + function onStartAvatarFormData($action) { + $user = common_current_user(); + $hasGravatar = $this->hasGravatar($user->id); + + if($hasGravatar) { + return false; + } + } + + function onEndAvatarFormData(&$action) { + $user = common_current_user(); + $hasGravatar = $this->hasGravatar($user->id); + + if(!empty($user->email) && !$hasGravatar) { //and not gravatar already set + $action->elementStart('form', array('method' => 'post', + 'id' => 'form_settings_gravatar_add', + 'class' => 'form_settings', + 'action' => + common_local_url('avatarsettings'))); + $action->elementStart('fieldset', array('id' => 'settings_gravatar_add')); + $action->element('legend', null, _m('Set Gravatar')); + $action->hidden('token', common_session_token()); + $action->element('p', 'form_guide', + _m('If you want to use your Gravatar image, click "Add".')); + $action->element('input', array('type' => 'submit', + 'id' => 'settings_gravatar_add_action-submit', + 'name' => 'add', + 'class' => 'submit', + 'value' => _m('Add'))); + $action->elementEnd('fieldset'); + $action->elementEnd('form'); + } elseif($hasGravatar) { + $action->elementStart('form', array('method' => 'post', + 'id' => 'form_settings_gravatar_remove', + 'class' => 'form_settings', + 'action' => + common_local_url('avatarsettings'))); + $action->elementStart('fieldset', array('id' => 'settings_gravatar_remove')); + $action->element('legend', null, _m('Remove Gravatar')); + $action->hidden('token', common_session_token()); + $action->element('p', 'form_guide', + _m('If you want to remove your Gravatar image, click "Remove".')); + $action->element('input', array('type' => 'submit', + 'id' => 'settings_gravatar_remove_action-submit', + 'name' => 'remove', + 'class' => 'submit', + 'value' => _m('Remove'))); + $action->elementEnd('fieldset'); + $action->elementEnd('form'); + } else { + $action->element('p', 'form_guide', + _m('To use a Gravatar first enter in an email address.')); + } + } + + function onStartAvatarSaveForm($action) { + if ($action->arg('add')) { + $result = $this->gravatar_save(); + $action->showForm($result['message'], $result['success']); + return false; + } else if ($action->arg('remove')) { + $result = $this->gravatar_remove(); + $action->showForm($result['message'], $result['success']); + return false; + } else { + return true; + } + } + + function hasGravatar($id) { + $avatar = new Avatar(); + $avatar->profile_id = $id; + if ($avatar->find()) { + while ($avatar->fetch()) { + if($avatar->filename == null) { + return true; + } + } + } + return false; + } + + + function gravatar_save() + { + $cur = common_current_user(); + + if(empty($cur->email)) { + return array('message' => _m('You do not have a email set in your profile.'), + 'success' => false); + } + //Get rid of previous Avatar + $this->gravatar_remove(); + + foreach (array(AVATAR_PROFILE_SIZE, AVATAR_STREAM_SIZE, AVATAR_MINI_SIZE) as $size) { + $gravatar = new Avatar(); + $gravatar->profile_id = $cur->id; + $gravatar->width = $size; + $gravatar->height = $size; + $gravatar->original = false; //No file, so no original + $gravatar->mediatype = 'img';//XXX: Unsure what to put here + //$gravatar->filename = null;//No filename. Remote + $gravatar->url = $this->gravatar_url($cur->email, $size); + $gravatar->created = DB_DataObject_Cast::dateTime(); # current time + + if (!$gravatar->insert()) { + return array('message' => _m('Failed to save Gravatar to the DB.'), + 'success' => false); + } + } + return array('message' => _m('Gravatar added.'), + 'success' => true); + } + + function gravatar_remove() + { + $user = common_current_user(); + $profile = $user->getProfile(); + + $avatar = $profile->getOriginalAvatar(); + if($avatar) $avatar->delete(); + $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE); + if($avatar) $avatar->delete(); + $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE); + if($avatar) $avatar->delete(); + $avatar = $profile->getAvatar(AVATAR_MINI_SIZE); + if($avatar) $avatar->delete(); + + return array('message' => _m('Gravatar removed.'), + 'success' => true); + } + + function gravatar_url($email, $size) { + $url = "http://www.gravatar.com/avatar.php?gravatar_id=". + md5(strtolower($email)). + "&default=".urlencode(Avatar::defaultImage($size)). + "&size=".$size; + return $url; + } +} diff --git a/plugins/Gravatar/README b/plugins/Gravatar/README new file mode 100644 index 0000000000..9337e24a0a --- /dev/null +++ b/plugins/Gravatar/README @@ -0,0 +1,13 @@ +GravatarPlugin 0.1 + +About +This will allow users to use their Gravatar Avatar with your StatusNet install. + +Configuration +add this to your config.php: +addPlugin('Gravatar', array()); + +ToDo: +Site default all on for gravatar by default +Migration Script +Localize \ No newline at end of file From 1e166e1bc4a8b16ad2ef8e99db6a112f47803eda Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 10 Dec 2009 14:16:07 +0100 Subject: [PATCH 076/172] Updated FormNoticeEnhancements and Counter to use the max text value from HTML. It also allows each .form_notice to have its own counter. --- js/util.js | 38 ++++++++++++++++++++++---------------- lib/messageform.php | 2 -- lib/noticeform.php | 2 -- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/js/util.js b/js/util.js index 67df73507b..60865d3520 100644 --- a/js/util.js +++ b/js/util.js @@ -57,21 +57,28 @@ var SN = { // StatusNet U: { // Utils FormNoticeEnhancements: function(form) { form_id = form.attr('id'); - $('#'+form_id+' #'+SN.C.S.NoticeDataText).unbind('keyup'); - $('#'+form_id+' #'+SN.C.S.NoticeDataText).unbind('keydown'); - if (maxLength > 0) { - $('#'+form_id+' #'+SN.C.S.NoticeDataText).bind('keyup', function(e) { + + if (jQuery.data(form[0], 'ElementData') === undefined) { + MaxLength = $('#'+form_id+' #'+SN.C.S.NoticeTextCount).text(); + if (typeof(MaxLength) == 'undefined') { + MaxLength = SN.C.I.MaxLength; + } + jQuery.data(form[0], 'ElementData', {MaxLength:MaxLength}); + + SN.U.Counter(form); + + NDT = $('#'+form_id+' #'+SN.C.S.NoticeDataText); + + NDT.bind('keyup', function(e) { SN.U.Counter(form); }); - // run once in case there's something in there - SN.U.Counter(form); + + NDT.bind('keydown', function(e) { + SN.U.SubmitOnReturn(e, form); + }); } - $('#'+form_id+' #'+SN.C.S.NoticeDataText).bind('keydown', function(e) { - SN.U.SubmitOnReturn(e, form); - }); - - if($('body')[0].id != 'conversation') { + if ($('body')[0].id != 'conversation') { $('#'+form_id+' textarea').focus(); } }, @@ -91,15 +98,14 @@ var SN = { // StatusNet Counter: function(form) { SN.C.I.FormNoticeCurrent = form; form_id = form.attr('id'); - if (typeof(maxLength) == "undefined") { - maxLength = SN.C.I.MaxLength; - } - if (maxLength <= 0) { + var MaxLength = jQuery.data(form[0], 'ElementData').MaxLength; + + if (MaxLength <= 0) { return; } - var remaining = maxLength - $('#'+form_id+' #'+SN.C.S.NoticeDataText).val().length; + var remaining = MaxLength - $('#'+form_id+' #'+SN.C.S.NoticeDataText).val().length; var counter = $('#'+form_id+' #'+SN.C.S.NoticeTextCount); if (remaining.toString() != counter.text()) { diff --git a/lib/messageform.php b/lib/messageform.php index 4df193c6d1..0c568e1bd8 100644 --- a/lib/messageform.php +++ b/lib/messageform.php @@ -154,8 +154,6 @@ class MessageForm extends Form $contentLimit = Message::maxContent(); - $this->out->inlineScript('maxLength = ' . $contentLimit . ';'); - if ($contentLimit > 0) { $this->out->elementStart('dl', 'form_note'); $this->out->element('dt', null, _('Available characters')); diff --git a/lib/noticeform.php b/lib/noticeform.php index 0dd3f2d777..593a1e9322 100644 --- a/lib/noticeform.php +++ b/lib/noticeform.php @@ -178,8 +178,6 @@ class NoticeForm extends Form $contentLimit = Notice::maxContent(); - $this->out->inlineScript('maxLength = ' . $contentLimit . ';'); - if ($contentLimit > 0) { $this->out->elementStart('dl', 'form_note'); $this->out->element('dt', null, _('Available characters')); From b2a16407ca75a9bbe43fea74ff250bb70ba41140 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 10 Dec 2009 14:24:23 +0100 Subject: [PATCH 077/172] Updated entity_action form input styles --- theme/base/css/display.css | 3 ++- theme/default/css/display.css | 13 +++++++------ theme/identica/css/display.css | 13 +++++++------ 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/theme/base/css/display.css b/theme/base/css/display.css index f622f35caf..e9dca8d02f 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -686,7 +686,8 @@ border-radius:4px; .entity_actions a, .entity_actions input, .entity_actions p { -border:0; +border-width:2px; +border-style:solid; padding-left:23px; } diff --git a/theme/default/css/display.css b/theme/default/css/display.css index d11bbe15e3..2d19b13a8c 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -87,11 +87,15 @@ input:focus, textarea:focus, select:focus, border-color:#9BB43E; } input.submit, -.entity_remote_subscribe, -.entity_actions .form_notice input.submit { +.entity_remote_subscribe { color:#FFFFFF; } -input.submit { +.entity_actions input.submit { +border-color:transparent; +text-shadow:none; +} +input.submit, +.form_notice input.submit { background:#AAAAAA url(../../base/images/illustrations/illu_pattern-01.png) 0 0 repeat-x; text-shadow:0 1px 0 #FFFFFF; color:#000000; @@ -109,9 +113,6 @@ box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1); -webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1); text-shadow:none; } -.entity_actions input.submit { -text-shadow:none; -} a, .form_settings input.form_action-primary, diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index d65ea2ef63..9b90d636aa 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -87,11 +87,15 @@ input:focus, textarea:focus, select:focus, border-color:#9BB43E; } input.submit, -.entity_remote_subscribe, -.entity_actions .form_notice input.submit { +.entity_remote_subscribe { color:#FFFFFF; } -input.submit { +.entity_actions input.submit { +border-color:transparent; +text-shadow:none; +} +input.submit, +.form_notice input.submit { background:#AAAAAA url(../../base/images/illustrations/illu_pattern-01.png) 0 0 repeat-x; text-shadow:0 1px 0 #FFFFFF; color:#000000; @@ -109,9 +113,6 @@ box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1); -webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1); text-shadow:none; } -.entity_actions input.submit { -text-shadow:none; -} a, .form_settings input.form_action-primary, From c855907f5943260a2b9740948a33f4170f3dda62 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 10 Dec 2009 14:29:27 +0100 Subject: [PATCH 078/172] Calling NewDirectMessage --- js/util.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/js/util.js b/js/util.js index 60865d3520..66d66c1547 100644 --- a/js/util.js +++ b/js/util.js @@ -463,6 +463,8 @@ var SN = { // StatusNet $('.form_group_join').each(function() { SN.U.FormXHR($(this)); }); $('.form_group_leave').each(function() { SN.U.FormXHR($(this)); }); $('.form_user_nudge').each(function() { SN.U.FormXHR($(this)); }); + + SN.U.NewDirectMessage(); } } } From 61023d42d33f51b6ad24de23adbb1cefe7d8a32d Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 10 Dec 2009 14:33:31 +0100 Subject: [PATCH 079/172] Updated input background colour for XHR direct message --- theme/default/css/display.css | 3 +-- theme/identica/css/display.css | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 2d19b13a8c..fc97101bb5 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -57,8 +57,7 @@ background:none; .form_notice.warning #notice_text-count, .form_settings .form_note, -.entity_remote_subscribe, -.entity_actions .form_notice input.submit { +.entity_remote_subscribe { background-color:#9BB43E; } input.submit, diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 9b90d636aa..728ca97334 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -57,8 +57,7 @@ background:none; .form_notice.warning #notice_text-count, .form_settings .form_note, -.entity_remote_subscribe, -.entity_actions .form_notice input.submit { +.entity_remote_subscribe { background-color:#9BB43E; } input.submit, From c0aad854f7f17cf817f488e0f2ee57303ff75305 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 10 Dec 2009 14:52:05 +0100 Subject: [PATCH 080/172] If ElementData is set on the notice form, use the existing MaxLength --- js/util.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/js/util.js b/js/util.js index 66d66c1547..71514324b1 100644 --- a/js/util.js +++ b/js/util.js @@ -77,6 +77,9 @@ var SN = { // StatusNet SN.U.SubmitOnReturn(e, form); }); } + else { + $('#'+form_id+' #'+SN.C.S.NoticeTextCount).text(jQuery.data(form[0], 'ElementData').MaxLength); + } if ($('body')[0].id != 'conversation') { $('#'+form_id+' textarea').focus(); From b07e1143cc8f07bf0613835debe08be227970c73 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Thu, 10 Dec 2009 13:08:24 -0500 Subject: [PATCH 081/172] Override login_token's sequenceKey() so that it behaves correctly --- classes/Login_token.php | 13 +++++++++++++ lib/command.php | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/classes/Login_token.php b/classes/Login_token.php index c172b30abc..746cd7f229 100644 --- a/classes/Login_token.php +++ b/classes/Login_token.php @@ -39,4 +39,17 @@ class Login_token extends Memcached_DataObject /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE + + /* + DB_DataObject calculates the sequence key(s) by taking the first key returned by the keys() function. + In this case, the keys() function returns user_id as the first key. user_id is not a sequence, but + DB_DataObject's sequenceKey() will incorrectly think it is. Then, since the sequenceKey() is a numeric + type, but is not set to autoincrement in the database, DB_DataObject will create a _seq table and + manage the sequence itself. This is not the correct behavior for the user_id in this class. + So we override that incorrect behavior, and simply say there is no sequence key. + */ + function sequenceKey() + { + return array(false,false); + } } diff --git a/lib/command.php b/lib/command.php index e2a6655111..af8855a7f2 100644 --- a/lib/command.php +++ b/lib/command.php @@ -584,7 +584,7 @@ class LoginCommand extends Command function execute($channel) { $disabled = common_config('logincommand','disabled'); - if(isset($disabled)) { + if(isset($disabled) && $disabled) { $channel->error($this->user, _('Login command is disabled')); return; } From b36ec6da87056324ce0cdf98a4745cdc992c5d52 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Thu, 10 Dec 2009 13:22:46 -0500 Subject: [PATCH 082/172] Fixed incorrect disabling of login_token. --- actions/login.php | 3 ++- lib/command.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/actions/login.php b/actions/login.php index a6f86c0ca1..c775fa6924 100644 --- a/actions/login.php +++ b/actions/login.php @@ -77,12 +77,13 @@ class LoginAction extends Action parent::handle($args); $disabled = common_config('logincommand','disabled'); + $disabled = isset($disabled) && $disabled; if (common_is_real_login()) { $this->clientError(_('Already logged in.')); } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { $this->checkLogin(); - } else if (!isset($disabled) && isset($args['user_id']) && isset($args['token'])){ + } else if (!$disabled && isset($args['user_id']) && isset($args['token'])){ $this->checkLogin($args['user_id'],$args['token']); } else { common_ensure_session(); diff --git a/lib/command.php b/lib/command.php index af8855a7f2..450db9da37 100644 --- a/lib/command.php +++ b/lib/command.php @@ -584,7 +584,8 @@ class LoginCommand extends Command function execute($channel) { $disabled = common_config('logincommand','disabled'); - if(isset($disabled) && $disabled) { + $disabled = isset($disabled) && $disabled; + if($disabled) { $channel->error($this->user, _('Login command is disabled')); return; } From 144faade3b3d366fc6f3a254ce6b1c36bd4f4cdb Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 10 Dec 2009 13:31:16 -0500 Subject: [PATCH 083/172] move forwarding stuff to Repeat plugin --- {classes => plugins/Repeat}/Forward.php | 0 {actions => plugins/Repeat}/forward.php | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {classes => plugins/Repeat}/Forward.php (100%) rename {actions => plugins/Repeat}/forward.php (100%) diff --git a/classes/Forward.php b/plugins/Repeat/Forward.php similarity index 100% rename from classes/Forward.php rename to plugins/Repeat/Forward.php diff --git a/actions/forward.php b/plugins/Repeat/forward.php similarity index 100% rename from actions/forward.php rename to plugins/Repeat/forward.php From 198e413a58f8aa3d07ce5da365f6c47ce98ab2c0 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 10 Dec 2009 13:34:11 -0500 Subject: [PATCH 084/172] move inbox notice list to repeat plugin --- actions/all.php | 86 +----------------------------- plugins/Repeat/inboxnoticelist.php | 85 +++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 85 deletions(-) create mode 100644 plugins/Repeat/inboxnoticelist.php diff --git a/actions/all.php b/actions/all.php index 2c96298faf..08fbacaef1 100644 --- a/actions/all.php +++ b/actions/all.php @@ -144,7 +144,7 @@ class AllAction extends ProfileAction function showContent() { - $nl = new InboxNoticeList($this->notice, $this->user, $this); + $nl = new NoticeList($this->notice, $this->user, $this); $cnt = $nl->show(); @@ -168,87 +168,3 @@ class AllAction extends ProfileAction } } } - -class InboxNoticeList extends NoticeList -{ - var $owner = null; - - function __construct($notice, $owner, $out=null) - { - parent::__construct($notice, $out); - $this->owner = $owner; - } - - function newListItem($notice) - { - return new InboxNoticeListItem($notice, $this->owner, $this->out); - } -} - -class InboxNoticeListItem extends NoticeListItem -{ - var $owner = null; - var $ib = null; - - function __construct($notice, $owner, $out=null) - { - parent::__construct($notice, $out); - $this->owner = $owner; - - $this->ib = Notice_inbox::pkeyGet(array('user_id' => $owner->id, - 'notice_id' => $notice->id)); - } - - function showAuthor() - { - parent::showAuthor(); - if ($this->ib->source == NOTICE_INBOX_SOURCE_FORWARD) { - $this->out->element('span', 'forward', _('Fwd')); - } - } - - function showEnd() - { - if ($this->ib->source == NOTICE_INBOX_SOURCE_FORWARD) { - - $forward = new Forward(); - - // FIXME: scary join! - - $forward->query('SELECT profile_id '. - 'FROM forward JOIN subscription ON forward.profile_id = subscription.subscribed '. - 'WHERE subscription.subscriber = ' . $this->owner->id . ' '. - 'AND forward.notice_id = ' . $this->notice->id . ' '. - 'ORDER BY forward.created '); - - $n = 0; - - $firstForwarder = null; - - while ($forward->fetch()) { - if (empty($firstForwarder)) { - $firstForwarder = Profile::staticGet('id', $forward->profile_id); - } - $n++; - } - - $forward->free(); - unset($forward); - - $this->out->elementStart('span', 'forwards'); - - $link = XMLStringer::estring('a', array('href' => $firstForwarder->profileurl), - $firstForwarder->nickname); - - if ($n == 1) { - $this->out->raw(sprintf(_('Forwarded by %s'), $link)); - } else { - // XXX: use that cool ngettext thing - $this->out->raw(sprintf(_('Forwarded by %s and %d other(s)'), $link, $n - 1)); - } - - $this->out->elementEnd('span'); - } - parent::showEnd(); - } -} diff --git a/plugins/Repeat/inboxnoticelist.php b/plugins/Repeat/inboxnoticelist.php new file mode 100644 index 0000000000..809fbe8af9 --- /dev/null +++ b/plugins/Repeat/inboxnoticelist.php @@ -0,0 +1,85 @@ +owner = $owner; + } + + function newListItem($notice) + { + return new InboxNoticeListItem($notice, $this->owner, $this->out); + } +} + +class InboxNoticeListItem extends NoticeListItem +{ + var $owner = null; + var $ib = null; + + function __construct($notice, $owner, $out=null) + { + parent::__construct($notice, $out); + $this->owner = $owner; + + $this->ib = Notice_inbox::pkeyGet(array('user_id' => $owner->id, + 'notice_id' => $notice->id)); + } + + function showAuthor() + { + parent::showAuthor(); + if ($this->ib->source == NOTICE_INBOX_SOURCE_FORWARD) { + $this->out->element('span', 'forward', _('Fwd')); + } + } + + function showEnd() + { + if ($this->ib->source == NOTICE_INBOX_SOURCE_FORWARD) { + + $forward = new Forward(); + + // FIXME: scary join! + + $forward->query('SELECT profile_id '. + 'FROM forward JOIN subscription ON forward.profile_id = subscription.subscribed '. + 'WHERE subscription.subscriber = ' . $this->owner->id . ' '. + 'AND forward.notice_id = ' . $this->notice->id . ' '. + 'ORDER BY forward.created '); + + $n = 0; + + $firstForwarder = null; + + while ($forward->fetch()) { + if (empty($firstForwarder)) { + $firstForwarder = Profile::staticGet('id', $forward->profile_id); + } + $n++; + } + + $forward->free(); + unset($forward); + + $this->out->elementStart('span', 'forwards'); + + $link = XMLStringer::estring('a', array('href' => $firstForwarder->profileurl), + $firstForwarder->nickname); + + if ($n == 1) { + $this->out->raw(sprintf(_('Forwarded by %s'), $link)); + } else { + // XXX: use that cool ngettext thing + $this->out->raw(sprintf(_('Forwarded by %s and %d other(s)'), $link, $n - 1)); + } + + $this->out->elementEnd('span'); + } + parent::showEnd(); + } +} From 37b0852fdb8b82741b327af57d898d4d89c2f177 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 10 Dec 2009 14:33:15 -0500 Subject: [PATCH 085/172] move forward form to plugin --- lib/noticelist.php | 21 --------------------- {lib => plugins/Repeat}/forwardform.php | 0 2 files changed, 21 deletions(-) rename {lib => plugins/Repeat}/forwardform.php (100%) diff --git a/lib/noticelist.php b/lib/noticelist.php index d6ffc9ca9c..21cec528ff 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -212,7 +212,6 @@ class NoticeListItem extends Widget $this->out->elementStart('div', 'notice-options'); $this->showFaveForm(); $this->showReplyLink(); - $this->showForwardForm(); $this->showDeleteLink(); $this->out->elementEnd('div'); } @@ -531,26 +530,6 @@ class NoticeListItem extends Widget } } - /** - * show the form to forward a notice - * - * @return void - */ - - function showForwardForm() - { - $user = common_current_user(); - if ($user && $user->id != $this->notice->profile_id) { - $profile = $user->getProfile(); - if ($profile->hasForwarded($this->notice->id)) { - $this->out->text(_('Forwarded')); - } else { - $ff = new ForwardForm($this->out, $this->notice); - $ff->show(); - } - } - } - /** * if the user is the author, let them delete the notice * diff --git a/lib/forwardform.php b/plugins/Repeat/forwardform.php similarity index 100% rename from lib/forwardform.php rename to plugins/Repeat/forwardform.php From dd098fee776fbb794080b8f95beab16b2f31556b Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 10 Dec 2009 14:34:47 -0500 Subject: [PATCH 086/172] remove forward table from db scripts --- classes/statusnet.ini | 10 ---------- db/08to09.sql | 12 ------------ db/statusnet.sql | 11 ----------- 3 files changed, 33 deletions(-) diff --git a/classes/statusnet.ini b/classes/statusnet.ini index a5126795bd..835faeb0b4 100644 --- a/classes/statusnet.ini +++ b/classes/statusnet.ini @@ -1,4 +1,3 @@ - [avatar] profile_id = 129 original = 17 @@ -196,15 +195,6 @@ id = K service = K uri = U -[forward] -profile_id = 129 -notice_id = 129 -created = 142 - -[forward__keys] -profile_id = K -notice_id = K - [group_alias] alias = 130 group_id = 129 diff --git a/db/08to09.sql b/db/08to09.sql index a945416ea4..64640f4ced 100644 --- a/db/08to09.sql +++ b/db/08to09.sql @@ -82,15 +82,3 @@ create table login_token ( constraint primary key (user_id) ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; - -create table forward ( - - profile_id integer not null comment 'profile who forwarded the notice' references profile (id), - notice_id integer not null comment 'notice they forwarded' references notice (id), - - created datetime not null comment 'date this record was created', - - constraint primary key (profile_id, notice_id) - -) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; - diff --git a/db/statusnet.sql b/db/statusnet.sql index b500b81f2d..18abcdfdb2 100644 --- a/db/statusnet.sql +++ b/db/statusnet.sql @@ -585,14 +585,3 @@ create table login_token ( constraint primary key (user_id) ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; -create table forward ( - - profile_id integer not null comment 'profile who forwarded the notice' references profile (id), - notice_id integer not null comment 'notice they forwarded' references notice (id), - - created datetime not null comment 'date this record was created', - - constraint primary key (profile_id, notice_id) - -) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; - From 79443d1ee2a50234e79c89f2bc41bb49935c66ca Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 10 Dec 2009 14:36:14 -0500 Subject: [PATCH 087/172] had wrong number of arguments to NoticeList in notice inbox --- actions/all.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/all.php b/actions/all.php index 08fbacaef1..452803d8ae 100644 --- a/actions/all.php +++ b/actions/all.php @@ -144,7 +144,7 @@ class AllAction extends ProfileAction function showContent() { - $nl = new NoticeList($this->notice, $this->user, $this); + $nl = new NoticeList($this->notice, $this); $cnt = $nl->show(); From a2fb1f5f9dda42b8bac689d3b5bfa86d7660416d Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 10 Dec 2009 14:37:58 -0500 Subject: [PATCH 088/172] remove form_forward from base css --- theme/base/css/display.css | 4 ---- 1 file changed, 4 deletions(-) diff --git a/theme/base/css/display.css b/theme/base/css/display.css index e9dca8d02f..d3b9d7cdca 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -1003,13 +1003,11 @@ float:left; } .notice-options .notice_delete, .notice-options .notice_reply, -.notice-options .form_forward, .notice-options .form_favor, .notice-options .form_disfavor { float:left; margin-left:20%; } -.notice-options .form_forward, .notice-options .form_favor, .notice-options .form_disfavor { margin-left:0; @@ -1035,12 +1033,10 @@ border-radius:0; -moz-border-radius:0; -webkit-border-radius:0; } -.notice-options .form_forward legend, .notice-options .form_favor legend, .notice-options .form_disfavor legend { display:none; } -.notice-options .form_forward fieldset, .notice-options .form_favor fieldset, .notice-options .form_disfavor fieldset { border:0; From 344c99df02fb34dcca02f36bee7cb66489742105 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 10 Dec 2009 14:40:00 -0500 Subject: [PATCH 089/172] remove forward table from PostgreSQL scripts --- db/08to09_pg.sql | 7 ----- db/statusnet_pg.sql | 62 ++++++++++++++++++--------------------------- 2 files changed, 25 insertions(+), 44 deletions(-) diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql index 4f8281bc3e..1df8c249b5 100644 --- a/db/08to09_pg.sql +++ b/db/08to09_pg.sql @@ -80,10 +80,3 @@ ALTER TABLE profile ADD COLUMN lon decimal(10,7) /*comment 'longitude'*/; ALTER TABLE profile ADD COLUMN location_id integer /* comment 'location id if possible'*/; ALTER TABLE profile ADD COLUMN location_ns integer /* comment 'namespace for location'*/; -CREATE TABLE forward ( - profile_id integer not null /*comment 'profile who forwarded the notice'*/ references profile (id), - notice_id integer not null /*comment 'notice they forwarded'*/ references notice (id), - created timestamp not null /*comment 'date this record was created'*/ DEFAULT CURRENT_TIMESTAMP, - PRIMARY KEY (profile_id, notice_id) -); - diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql index 6bcc278859..c37fa81dee 100644 --- a/db/statusnet_pg.sql +++ b/db/statusnet_pg.sql @@ -64,7 +64,7 @@ create table "user" ( emailnotifyfav integer default 1 /* comment 'Notify by email of favorites' */, emailnotifynudge integer default 1 /* comment 'Notify by email of nudges' */, emailnotifymsg integer default 1 /* comment 'Notify by email of direct messages' */, - emailnotifyattn integer default 1 /* command 'Notify by email of @-replies' */, + emailnotifyattn integer default 1 /* command 'Notify by email of @-replies' */, emailmicroid integer default 1 /* comment 'whether to publish email microid' */, language varchar(50) /* comment 'preferred language' */, timezone varchar(50) /* comment 'timezone' */, @@ -82,7 +82,7 @@ create table "user" ( uri varchar(255) unique /* comment 'universally unique identifier, usually a tag URI' */, autosubscribe integer default 0 /* comment 'automatically subscribe to users who subscribe to us' */, urlshorteningservice varchar(50) default 'ur1.ca' /* comment 'service to use for auto-shortening URLs' */, - inboxed integer default 0 /* comment 'has an inbox been created for this user?' */, + inboxed integer default 0 /* comment 'has an inbox been created for this user?' */, design_id integer /* comment 'id of a design' */references design(id), viewdesigns integer default 1 /* comment 'whether to view user-provided designs'*/, created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */, @@ -298,7 +298,7 @@ create table foreign_user ( nickname varchar(255) /* comment 'nickname on foreign service' */, created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */, modified timestamp /* comment 'date this record was modified' */, - + primary key (id, service) ); @@ -308,7 +308,7 @@ create table foreign_link ( service int not null /* comment 'foreign key to service' */ references foreign_service (id), credentials varchar(255) /* comment 'authc credentials, typically a password' */, noticesync int not null default 1 /* comment 'notice synchronisation, bit 1 = sync outgoing, bit 2 = sync incoming, bit 3 = filter local replies' */, - friendsync int not null default 2 /* comment 'friend synchronisation, bit 1 = sync outgoing, bit 2 = sync incoming */, + friendsync int not null default 2 /* comment 'friend synchronisation, bit 1 = sync outgoing, bit 2 = sync incoming */, profilesync int not null default 1 /* comment 'profile synchronization, bit 1 = sync outgoing, bit 2 = sync incoming' */, last_noticesync timestamp default null /* comment 'last time notices were imported' */, last_friendsync timestamp default null /* comment 'last time friends were imported' */, @@ -324,7 +324,7 @@ create table foreign_subscription ( subscriber int not null /* comment 'subscriber on foreign service' */ , subscribed int not null /* comment 'subscribed user' */ , created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */, - + primary key (service, subscriber, subscribed) ); create index foreign_subscription_subscriber_idx on foreign_subscription using btree(subscriber); @@ -354,7 +354,7 @@ create table message ( created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */, modified timestamp /* comment 'date this record was modified' */, source varchar(32) /* comment 'source of comment, like "web", "im", or "clientname"' */ - + ); create index message_from_idx on message using btree(from_profile); create index message_to_idx on message using btree(to_profile); @@ -409,7 +409,6 @@ create table user_group ( mini_logo varchar(255) /* comment 'mini logo' */, design_id integer /*comment 'id of a design' */ references design(id), - created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */, modified timestamp /* comment 'date this record was modified' */ @@ -447,16 +446,15 @@ create table group_inbox ( ); create index group_inbox_created_idx on group_inbox using btree(created); - /*attachments and URLs stuff */ create sequence file_seq; create table file ( id bigint default nextval('file_seq') primary key /* comment 'unique identifier' */, - url varchar(255) unique, - mimetype varchar(50), - size integer, - title varchar(255), - date integer, + url varchar(255) unique, + mimetype varchar(50), + size integer, + title varchar(255), + date integer, protected integer, filename text /* comment 'if a local file, name of the file' */, modified timestamp default CURRENT_TIMESTAMP /* comment 'date this record was modified'*/ @@ -467,38 +465,38 @@ create table file_oembed ( file_id bigint default nextval('file_oembed_seq') primary key /* comment 'unique identifier' */, version varchar(20), type varchar(20), - mimetype varchar(50), + mimetype varchar(50), provider varchar(50), provider_url varchar(255), width integer, height integer, html text, title varchar(255), - author_name varchar(50), - author_url varchar(255), - url varchar(255) + author_name varchar(50), + author_url varchar(255), + url varchar(255) ); create sequence file_redirection_seq; create table file_redirection ( - url varchar(255) primary key, - file_id bigint, - redirections integer, + url varchar(255) primary key, + file_id bigint, + redirections integer, httpcode integer ); create sequence file_thumbnail_seq; create table file_thumbnail ( - file_id bigint primary key, - url varchar(255) unique, - width integer, - height integer + file_id bigint primary key, + url varchar(255) unique, + width integer, + height integer ); create sequence file_to_post_seq; create table file_to_post ( - file_id bigint, - post_id bigint, + file_id bigint, + post_id bigint, primary key (file_id, post_id) ); @@ -527,7 +525,7 @@ create table session ( id varchar(32) primary key /* comment 'session ID'*/, session_data text /* comment 'session data'*/, created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created'*/, - modified integer DEFAULT extract(epoch from CURRENT_TIMESTAMP) /* comment 'date this record was modified'*/ + modified integer DEFAULT extract(epoch from CURRENT_TIMESTAMP) /* comment 'date this record was modified'*/ ); create index session_modified_idx on session (modified); @@ -543,7 +541,6 @@ create table deleted_notice ( CREATE index deleted_notice_profile_id_idx on deleted_notice (profile_id); - /* Textsearch stuff */ create index textsearch_idx on profile using gist(textsearch); @@ -551,7 +548,6 @@ create index noticecontent_idx on notice using gist(to_tsvector('english',conten create trigger textsearchupdate before insert or update on profile for each row execute procedure tsvector_update_trigger(textsearch, 'pg_catalog.english', nickname, fullname, location, bio, homepage); - create table config ( section varchar(32) /* comment 'configuration section'*/, @@ -582,8 +578,6 @@ create table location_namespace ( ); - - create table login_token ( user_id integer not null /* comment 'user owning this token'*/ references "user" (id), token char(32) not null /* comment 'token useable for logging in'*/, @@ -593,9 +587,3 @@ create table login_token ( primary key (user_id) ); -CREATE TABLE forward ( - profile_id integer not null /*comment 'profile who forwarded the notice'*/ references profile (id), - notice_id integer not null /*comment 'notice they forwarded'*/ references notice (id), - created timestamp not null /*comment 'date this record was created'*/ DEFAULT CURRENT_TIMESTAMP, - PRIMARY KEY (profile_id, notice_id) -); From 14f7c784a6fa11625df128309c0f211ca36101c1 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Thu, 10 Dec 2009 14:40:26 -0500 Subject: [PATCH 090/172] Add table() and keys() overrides to User_username --- plugins/Authentication/User_username.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/plugins/Authentication/User_username.php b/plugins/Authentication/User_username.php index f30f60d839..853fd5cb86 100644 --- a/plugins/Authentication/User_username.php +++ b/plugins/Authentication/User_username.php @@ -43,4 +43,19 @@ class User_username extends Memcached_DataObject return false; } } + + function table() { + return array( + 'user_id' => DB_DATAOBJECT_INT, + 'username' => DB_DATAOBJECT_STR, + 'provider_name' => DB_DATAOBJECT_STR , + 'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + ); + } + + // now define the keys. + function keys() { + return array('provider_name', 'username'); + } + } From 433106dfc512605f93a1354034c23452fbb3956b Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 10 Dec 2009 14:40:48 -0500 Subject: [PATCH 091/172] remove 'has forwarded' method from Profile --- classes/Profile.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/classes/Profile.php b/classes/Profile.php index 4c14f62a06..4b2e090064 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -716,12 +716,4 @@ class Profile extends Memcached_DataObject } return $result; } - - function hasForwarded($notice_id) - { - $forward = Forward::pkeyGet(array('profile_id' => $this->id, - 'notice_id' => $notice_id)); - - return (!empty($forward)); - } } From 038fbddd02d2f144936357ed2ed40c09b1441c6b Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 10 Dec 2009 14:41:18 -0500 Subject: [PATCH 092/172] remove NoticeForward from util.js --- js/util.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/js/util.js b/js/util.js index 71514324b1..336cd8cfe5 100644 --- a/js/util.js +++ b/js/util.js @@ -315,10 +315,6 @@ var SN = { // StatusNet $('.form_disfavor').each(function() { SN.U.FormXHR($(this)); }); }, - NoticeForward: function() { - $('.form_forward').each(function() { SN.U.FormXHR($(this)); }); - }, - NoticeAttachments: function() { $('.notice a.attachment').each(function() { SN.U.NoticeWithAttachment($(this).closest('.notice')); @@ -452,7 +448,6 @@ var SN = { // StatusNet Notices: function() { if ($('body.user_in').length > 0) { SN.U.NoticeFavor(); - SN.U.NoticeForward(); SN.U.NoticeReply(); } From eceb5e8a0fbf798e42fb9c1d0598d9dc0f4b7550 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 10 Dec 2009 14:42:13 -0500 Subject: [PATCH 093/172] remove forward action from router --- lib/router.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/router.php b/lib/router.php index 398135a3e2..37525319f7 100644 --- a/lib/router.php +++ b/lib/router.php @@ -99,7 +99,7 @@ class Router 'groupblock', 'groupunblock', 'sandbox', 'unsandbox', 'silence', 'unsilence', - 'deleteuser', 'forward'); + 'deleteuser'); foreach ($main as $a) { $m->connect('main/'.$a, array('action' => $a)); From c10fa99b04ef544e1ea082a694ad714f9246df86 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 10 Dec 2009 15:16:44 -0500 Subject: [PATCH 094/172] remove the Repeat plugin (for now) --- plugins/Repeat/Forward.php | 127 ------------------------- plugins/Repeat/forward.php | 122 ------------------------ plugins/Repeat/forwardform.php | 147 ----------------------------- plugins/Repeat/inboxnoticelist.php | 85 ----------------- 4 files changed, 481 deletions(-) delete mode 100644 plugins/Repeat/Forward.php delete mode 100644 plugins/Repeat/forward.php delete mode 100644 plugins/Repeat/forwardform.php delete mode 100644 plugins/Repeat/inboxnoticelist.php diff --git a/plugins/Repeat/Forward.php b/plugins/Repeat/Forward.php deleted file mode 100644 index 09b2d6a4ee..0000000000 --- a/plugins/Repeat/Forward.php +++ /dev/null @@ -1,127 +0,0 @@ -. - */ - -if (!defined('STATUSNET')) { - exit(1); -} - -/** - * Table Definition for location_namespace - */ - -require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; - -class Forward extends Memcached_DataObject -{ - ###START_AUTOCODE - /* the code below is auto generated do not remove the above tag */ - - public $__table = 'forward'; // table name - public $profile_id; // int(4) primary_key not_null - public $notice_id; // int(4) primary_key not_null - public $created; // datetime not_null default_0000-00-00%2000%3A00%3A00 - - /* Static get */ - function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Forward',$k,$v); } - - /* the code above is auto generated do not remove the tag below */ - ###END_AUTOCODE - - function &pkeyGet($kv) - { - return Memcached_DataObject::pkeyGet('Forward', $kv); - } - - static function saveNew($profile_id, $notice_id) - { - $forward = new Forward(); - - $forward->profile_id = $profile_id; - $forward->notice_id = $notice_id; - $forward->created = common_sql_now(); - - $forward->query('BEGIN'); - - if (!$forward->insert()) { - throw new ServerException(_("Couldn't insert forward.")); - } - - $ni = $forward->addToInboxes(); - - $forward->query('COMMIT'); - - $forward->blowCache($ni); - - return $forward; - } - - function addToInboxes() - { - $inbox = new Notice_inbox(); - - $user = new User(); - - $usertable = common_database_tablename('user'); - $user->query("SELECT $usertable.* FROM $usertable INNER JOIN subscription ON $usertable.id = subscription.subscriber ". - 'WHERE subscription.subscribed = '.$this->profile_id); - - $ni = array(); - - $notice = Notice::staticGet('id', $this->notice_id); - - $author = Profile::staticGet('id', $notice->profile_id); - - while ($user->fetch()) { - $inbox = Notice_inbox::pkeyGet(array('user_id' => $user->id, - 'notice_id' => $this->notice_id)); - - if (empty($inbox)) { - if (!$user->hasBlocked($author)) { - $ni[$user->id] = NOTICE_INBOX_SOURCE_FORWARD; - } - } else { - $inbox->free(); - } - } - - $user->free(); - $author->free(); - - unset($user); - unset($author); - - Notice_inbox::bulkInsert($this->notice_id, $this->created, $ni); - - return $ni; - } - - function blowCache($ni) - { - $cache = common_memcache(); - - if (!empty($cache)) { - foreach ($ni as $id => $source) { - $cache->delete(common_cache_key('notice_inbox:by_user:'.$id)); - $cache->delete(common_cache_key('notice_inbox:by_user_own:'.$id)); - $cache->delete(common_cache_key('notice_inbox:by_user:'.$id.';last')); - $cache->delete(common_cache_key('notice_inbox:by_user_own:'.$id.';last')); - } - } - } -} diff --git a/plugins/Repeat/forward.php b/plugins/Repeat/forward.php deleted file mode 100644 index 194833fe0c..0000000000 --- a/plugins/Repeat/forward.php +++ /dev/null @@ -1,122 +0,0 @@ - - * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 - * @link http://status.net/ - * - * StatusNet - the distributed open-source microblogging tool - * Copyright (C) 2008, 2009, StatusNet, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -if (!defined('STATUSNET')) { - exit(1); -} - -/** - * Forward action - * - * @category Action - * @package StatusNet - * @author Evan Prodromou - * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 - * @link http://status.net/ - */ - -class ForwardAction extends Action -{ - var $user = null; - var $notice = null; - - function prepare($args) - { - parent::prepare($args); - - $this->user = common_current_user(); - - if (empty($this->user)) { - $this->clientError(_("Only logged-in users can forward notices.")); - return false; - } - - $id = $this->trimmed('notice'); - - if (empty($id)) { - $this->clientError(_("No notice specified.")); - return false; - } - - $this->notice = Notice::staticGet('id', $id); - - if (empty($this->notice)) { - $this->clientError(_("No notice specified.")); - return false; - } - - if ($this->user->id == $this->notice->profile_id) { - $this->clientError(_("You can't forward your own notice.")); - return false; - } - - $token = $this->trimmed('token-'.$id); - - if (empty($token) || $token != common_session_token()) { - $this->clientError(_("There was a problem with your session token. Try again, please.")); - return false; - } - - $profile = $this->user->getProfile(); - - if ($profile->hasForwarded($id)) { - $this->clientError(_("You already forwarded that notice.")); - return false; - } - - return true; - } - - /** - * Class handler. - * - * @param array $args query arguments - * - * @return void - */ - - function handle($args) - { - $forward = Forward::saveNew($this->user->id, $this->notice->id); - - if ($this->boolean('ajax')) { - $this->startHTML('text/xml;charset=utf-8'); - $this->elementStart('head'); - $this->element('title', null, _('Forwarded')); - $this->elementEnd('head'); - $this->elementStart('body'); - $this->element('p', array('id' => 'forward_response'), _('Forwarded!')); - $this->elementEnd('body'); - $this->elementEnd('html'); - } else { - // FIXME! - } - } -} diff --git a/plugins/Repeat/forwardform.php b/plugins/Repeat/forwardform.php deleted file mode 100644 index 2052856ae6..0000000000 --- a/plugins/Repeat/forwardform.php +++ /dev/null @@ -1,147 +0,0 @@ -. - * - * @category Form - * @package StatusNet - * @author Evan Prodromou - * @copyright 2009 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ - */ - -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); -} - -require_once INSTALLDIR.'/lib/form.php'; - -/** - * Form for forwarding a notice - * - * @category Form - * @package StatusNet - * @author Evan Prodromou - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ - */ - -class ForwardForm extends Form -{ - /** - * Notice to forward - */ - - var $notice = null; - - /** - * Constructor - * - * @param HTMLOutputter $out output channel - * @param Notice $notice notice to forward - */ - - function __construct($out=null, $notice=null) - { - parent::__construct($out); - - $this->notice = $notice; - } - - /** - * ID of the form - * - * @return int ID of the form - */ - - function id() - { - return 'forward-' . $this->notice->id; - } - - /** - * Action of the form - * - * @return string URL of the action - */ - - function action() - { - return common_local_url('forward'); - } - - /** - * Include a session token for CSRF protection - * - * @return void - */ - - function sessionToken() - { - $this->out->hidden('token-' . $this->notice->id, - common_session_token()); - } - - /** - * Legend of the Form - * - * @return void - */ - function formLegend() - { - $this->out->element('legend', null, _('Forward this notice')); - } - - /** - * Data elements - * - * @return void - */ - - function formData() - { - $this->out->hidden('notice-n'.$this->notice->id, - $this->notice->id, - 'notice'); - } - - /** - * Action elements - * - * @return void - */ - - function formActions() - { - $this->out->submit('forward-submit-' . $this->notice->id, - _('Forward'), 'submit', null, _('Forward this notice')); - } - - /** - * Class of the form. - * - * @return string the form's class - */ - - function formClass() - { - return 'form_forward'; - } -} diff --git a/plugins/Repeat/inboxnoticelist.php b/plugins/Repeat/inboxnoticelist.php deleted file mode 100644 index 809fbe8af9..0000000000 --- a/plugins/Repeat/inboxnoticelist.php +++ /dev/null @@ -1,85 +0,0 @@ -owner = $owner; - } - - function newListItem($notice) - { - return new InboxNoticeListItem($notice, $this->owner, $this->out); - } -} - -class InboxNoticeListItem extends NoticeListItem -{ - var $owner = null; - var $ib = null; - - function __construct($notice, $owner, $out=null) - { - parent::__construct($notice, $out); - $this->owner = $owner; - - $this->ib = Notice_inbox::pkeyGet(array('user_id' => $owner->id, - 'notice_id' => $notice->id)); - } - - function showAuthor() - { - parent::showAuthor(); - if ($this->ib->source == NOTICE_INBOX_SOURCE_FORWARD) { - $this->out->element('span', 'forward', _('Fwd')); - } - } - - function showEnd() - { - if ($this->ib->source == NOTICE_INBOX_SOURCE_FORWARD) { - - $forward = new Forward(); - - // FIXME: scary join! - - $forward->query('SELECT profile_id '. - 'FROM forward JOIN subscription ON forward.profile_id = subscription.subscribed '. - 'WHERE subscription.subscriber = ' . $this->owner->id . ' '. - 'AND forward.notice_id = ' . $this->notice->id . ' '. - 'ORDER BY forward.created '); - - $n = 0; - - $firstForwarder = null; - - while ($forward->fetch()) { - if (empty($firstForwarder)) { - $firstForwarder = Profile::staticGet('id', $forward->profile_id); - } - $n++; - } - - $forward->free(); - unset($forward); - - $this->out->elementStart('span', 'forwards'); - - $link = XMLStringer::estring('a', array('href' => $firstForwarder->profileurl), - $firstForwarder->nickname); - - if ($n == 1) { - $this->out->raw(sprintf(_('Forwarded by %s'), $link)); - } else { - // XXX: use that cool ngettext thing - $this->out->raw(sprintf(_('Forwarded by %s and %d other(s)'), $link, $n - 1)); - } - - $this->out->elementEnd('span'); - } - parent::showEnd(); - } -} From 2c9b30a31b97a4d03d0f246c9ad938e44c1efc23 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 10 Dec 2009 15:17:16 -0500 Subject: [PATCH 095/172] Revert "remove the Repeat plugin (for now)" This reverts commit c10fa99b04ef544e1ea082a694ad714f9246df86. --- plugins/Repeat/Forward.php | 127 +++++++++++++++++++++++++ plugins/Repeat/forward.php | 122 ++++++++++++++++++++++++ plugins/Repeat/forwardform.php | 147 +++++++++++++++++++++++++++++ plugins/Repeat/inboxnoticelist.php | 85 +++++++++++++++++ 4 files changed, 481 insertions(+) create mode 100644 plugins/Repeat/Forward.php create mode 100644 plugins/Repeat/forward.php create mode 100644 plugins/Repeat/forwardform.php create mode 100644 plugins/Repeat/inboxnoticelist.php diff --git a/plugins/Repeat/Forward.php b/plugins/Repeat/Forward.php new file mode 100644 index 0000000000..09b2d6a4ee --- /dev/null +++ b/plugins/Repeat/Forward.php @@ -0,0 +1,127 @@ +. + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Table Definition for location_namespace + */ + +require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; + +class Forward extends Memcached_DataObject +{ + ###START_AUTOCODE + /* the code below is auto generated do not remove the above tag */ + + public $__table = 'forward'; // table name + public $profile_id; // int(4) primary_key not_null + public $notice_id; // int(4) primary_key not_null + public $created; // datetime not_null default_0000-00-00%2000%3A00%3A00 + + /* Static get */ + function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Forward',$k,$v); } + + /* the code above is auto generated do not remove the tag below */ + ###END_AUTOCODE + + function &pkeyGet($kv) + { + return Memcached_DataObject::pkeyGet('Forward', $kv); + } + + static function saveNew($profile_id, $notice_id) + { + $forward = new Forward(); + + $forward->profile_id = $profile_id; + $forward->notice_id = $notice_id; + $forward->created = common_sql_now(); + + $forward->query('BEGIN'); + + if (!$forward->insert()) { + throw new ServerException(_("Couldn't insert forward.")); + } + + $ni = $forward->addToInboxes(); + + $forward->query('COMMIT'); + + $forward->blowCache($ni); + + return $forward; + } + + function addToInboxes() + { + $inbox = new Notice_inbox(); + + $user = new User(); + + $usertable = common_database_tablename('user'); + $user->query("SELECT $usertable.* FROM $usertable INNER JOIN subscription ON $usertable.id = subscription.subscriber ". + 'WHERE subscription.subscribed = '.$this->profile_id); + + $ni = array(); + + $notice = Notice::staticGet('id', $this->notice_id); + + $author = Profile::staticGet('id', $notice->profile_id); + + while ($user->fetch()) { + $inbox = Notice_inbox::pkeyGet(array('user_id' => $user->id, + 'notice_id' => $this->notice_id)); + + if (empty($inbox)) { + if (!$user->hasBlocked($author)) { + $ni[$user->id] = NOTICE_INBOX_SOURCE_FORWARD; + } + } else { + $inbox->free(); + } + } + + $user->free(); + $author->free(); + + unset($user); + unset($author); + + Notice_inbox::bulkInsert($this->notice_id, $this->created, $ni); + + return $ni; + } + + function blowCache($ni) + { + $cache = common_memcache(); + + if (!empty($cache)) { + foreach ($ni as $id => $source) { + $cache->delete(common_cache_key('notice_inbox:by_user:'.$id)); + $cache->delete(common_cache_key('notice_inbox:by_user_own:'.$id)); + $cache->delete(common_cache_key('notice_inbox:by_user:'.$id.';last')); + $cache->delete(common_cache_key('notice_inbox:by_user_own:'.$id.';last')); + } + } + } +} diff --git a/plugins/Repeat/forward.php b/plugins/Repeat/forward.php new file mode 100644 index 0000000000..194833fe0c --- /dev/null +++ b/plugins/Repeat/forward.php @@ -0,0 +1,122 @@ + + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://status.net/ + * + * StatusNet - the distributed open-source microblogging tool + * Copyright (C) 2008, 2009, StatusNet, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Forward action + * + * @category Action + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://status.net/ + */ + +class ForwardAction extends Action +{ + var $user = null; + var $notice = null; + + function prepare($args) + { + parent::prepare($args); + + $this->user = common_current_user(); + + if (empty($this->user)) { + $this->clientError(_("Only logged-in users can forward notices.")); + return false; + } + + $id = $this->trimmed('notice'); + + if (empty($id)) { + $this->clientError(_("No notice specified.")); + return false; + } + + $this->notice = Notice::staticGet('id', $id); + + if (empty($this->notice)) { + $this->clientError(_("No notice specified.")); + return false; + } + + if ($this->user->id == $this->notice->profile_id) { + $this->clientError(_("You can't forward your own notice.")); + return false; + } + + $token = $this->trimmed('token-'.$id); + + if (empty($token) || $token != common_session_token()) { + $this->clientError(_("There was a problem with your session token. Try again, please.")); + return false; + } + + $profile = $this->user->getProfile(); + + if ($profile->hasForwarded($id)) { + $this->clientError(_("You already forwarded that notice.")); + return false; + } + + return true; + } + + /** + * Class handler. + * + * @param array $args query arguments + * + * @return void + */ + + function handle($args) + { + $forward = Forward::saveNew($this->user->id, $this->notice->id); + + if ($this->boolean('ajax')) { + $this->startHTML('text/xml;charset=utf-8'); + $this->elementStart('head'); + $this->element('title', null, _('Forwarded')); + $this->elementEnd('head'); + $this->elementStart('body'); + $this->element('p', array('id' => 'forward_response'), _('Forwarded!')); + $this->elementEnd('body'); + $this->elementEnd('html'); + } else { + // FIXME! + } + } +} diff --git a/plugins/Repeat/forwardform.php b/plugins/Repeat/forwardform.php new file mode 100644 index 0000000000..2052856ae6 --- /dev/null +++ b/plugins/Repeat/forwardform.php @@ -0,0 +1,147 @@ +. + * + * @category Form + * @package StatusNet + * @author Evan Prodromou + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +require_once INSTALLDIR.'/lib/form.php'; + +/** + * Form for forwarding a notice + * + * @category Form + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class ForwardForm extends Form +{ + /** + * Notice to forward + */ + + var $notice = null; + + /** + * Constructor + * + * @param HTMLOutputter $out output channel + * @param Notice $notice notice to forward + */ + + function __construct($out=null, $notice=null) + { + parent::__construct($out); + + $this->notice = $notice; + } + + /** + * ID of the form + * + * @return int ID of the form + */ + + function id() + { + return 'forward-' . $this->notice->id; + } + + /** + * Action of the form + * + * @return string URL of the action + */ + + function action() + { + return common_local_url('forward'); + } + + /** + * Include a session token for CSRF protection + * + * @return void + */ + + function sessionToken() + { + $this->out->hidden('token-' . $this->notice->id, + common_session_token()); + } + + /** + * Legend of the Form + * + * @return void + */ + function formLegend() + { + $this->out->element('legend', null, _('Forward this notice')); + } + + /** + * Data elements + * + * @return void + */ + + function formData() + { + $this->out->hidden('notice-n'.$this->notice->id, + $this->notice->id, + 'notice'); + } + + /** + * Action elements + * + * @return void + */ + + function formActions() + { + $this->out->submit('forward-submit-' . $this->notice->id, + _('Forward'), 'submit', null, _('Forward this notice')); + } + + /** + * Class of the form. + * + * @return string the form's class + */ + + function formClass() + { + return 'form_forward'; + } +} diff --git a/plugins/Repeat/inboxnoticelist.php b/plugins/Repeat/inboxnoticelist.php new file mode 100644 index 0000000000..809fbe8af9 --- /dev/null +++ b/plugins/Repeat/inboxnoticelist.php @@ -0,0 +1,85 @@ +owner = $owner; + } + + function newListItem($notice) + { + return new InboxNoticeListItem($notice, $this->owner, $this->out); + } +} + +class InboxNoticeListItem extends NoticeListItem +{ + var $owner = null; + var $ib = null; + + function __construct($notice, $owner, $out=null) + { + parent::__construct($notice, $out); + $this->owner = $owner; + + $this->ib = Notice_inbox::pkeyGet(array('user_id' => $owner->id, + 'notice_id' => $notice->id)); + } + + function showAuthor() + { + parent::showAuthor(); + if ($this->ib->source == NOTICE_INBOX_SOURCE_FORWARD) { + $this->out->element('span', 'forward', _('Fwd')); + } + } + + function showEnd() + { + if ($this->ib->source == NOTICE_INBOX_SOURCE_FORWARD) { + + $forward = new Forward(); + + // FIXME: scary join! + + $forward->query('SELECT profile_id '. + 'FROM forward JOIN subscription ON forward.profile_id = subscription.subscribed '. + 'WHERE subscription.subscriber = ' . $this->owner->id . ' '. + 'AND forward.notice_id = ' . $this->notice->id . ' '. + 'ORDER BY forward.created '); + + $n = 0; + + $firstForwarder = null; + + while ($forward->fetch()) { + if (empty($firstForwarder)) { + $firstForwarder = Profile::staticGet('id', $forward->profile_id); + } + $n++; + } + + $forward->free(); + unset($forward); + + $this->out->elementStart('span', 'forwards'); + + $link = XMLStringer::estring('a', array('href' => $firstForwarder->profileurl), + $firstForwarder->nickname); + + if ($n == 1) { + $this->out->raw(sprintf(_('Forwarded by %s'), $link)); + } else { + // XXX: use that cool ngettext thing + $this->out->raw(sprintf(_('Forwarded by %s and %d other(s)'), $link, $n - 1)); + } + + $this->out->elementEnd('span'); + } + parent::showEnd(); + } +} From 08901c98c4129c1d7707acb470e18f1056f2502e Mon Sep 17 00:00:00 2001 From: Eric Helgeson Date: Thu, 10 Dec 2009 21:06:54 -0500 Subject: [PATCH 096/172] Changing avatar should broadcast the profile via OMB. --- plugins/Gravatar/GravatarPlugin.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/plugins/Gravatar/GravatarPlugin.php b/plugins/Gravatar/GravatarPlugin.php index b18f627266..3c61a682ed 100644 --- a/plugins/Gravatar/GravatarPlugin.php +++ b/plugins/Gravatar/GravatarPlugin.php @@ -92,11 +92,23 @@ class GravatarPlugin extends Plugin function onStartAvatarSaveForm($action) { if ($action->arg('add')) { $result = $this->gravatar_save(); + + if($result['success']===true) { + common_broadcast_profile(common_current_user()->getProfile()); + } + $action->showForm($result['message'], $result['success']); + return false; } else if ($action->arg('remove')) { $result = $this->gravatar_remove(); + + if($result['success']===true) { + common_broadcast_profile(common_current_user()->getProfile()); + } + $action->showForm($result['message'], $result['success']); + return false; } else { return true; From 85473ecf94e92cd0e6503e4d27ea26452076aafd Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Fri, 11 Dec 2009 13:55:54 +0100 Subject: [PATCH 097/172] Removed styles from entity_remote_subscribe (doesn't need special treatment) in default and identica themes --- theme/base/css/display.css | 11 +---------- theme/default/css/display.css | 13 ++++--------- theme/identica/css/display.css | 13 ++++--------- 3 files changed, 9 insertions(+), 28 deletions(-) diff --git a/theme/base/css/display.css b/theme/base/css/display.css index d3b9d7cdca..e88e1f2226 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -670,8 +670,7 @@ display:block; text-align:left; width:100%; } -.entity_actions a, -.entity_remote_subscribe { +.entity_actions a { text-decoration:none; font-weight:bold; display:block; @@ -696,14 +695,6 @@ padding-left:23px; padding:2px 4px 1px 26px; } -.entity_remote_subscribe { -padding:4px; -border-width:2px; -border-style:solid; -border-radius:4px; --moz-border-radius:4px; --webkit-border-radius:4px; -} .entity_actions .accept { margin-bottom:18px; } diff --git a/theme/default/css/display.css b/theme/default/css/display.css index fc97101bb5..d4fcb23434 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -30,8 +30,7 @@ border-radius:4px; input, textarea, select, option { font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; } -input, textarea, select, -.entity_remote_subscribe { +input, textarea, select { border-color:#AAAAAA; } @@ -56,14 +55,12 @@ background:none; } .form_notice.warning #notice_text-count, -.form_settings .form_note, -.entity_remote_subscribe { +.form_settings .form_note { background-color:#9BB43E; } input.submit, .form_notice.warning #notice_text-count, .form_settings .form_note, -.entity_remote_subscribe, .entity_actions a, .entity_actions input, .entity_moderation p, @@ -81,12 +78,10 @@ background-color:transparent; input:focus, textarea:focus, select:focus, .form_notice.warning #notice_data-text, .form_notice.warning #notice_text-count, -.form_settings .form_note, -.entity_remote_subscribe { +.form_settings .form_note { border-color:#9BB43E; } -input.submit, -.entity_remote_subscribe { +input.submit { color:#FFFFFF; } .entity_actions input.submit { diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 728ca97334..0e8fa6d793 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -30,8 +30,7 @@ border-radius:4px; input, textarea, select, option { font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; } -input, textarea, select, -.entity_remote_subscribe { +input, textarea, select { border-color:#AAAAAA; } @@ -56,14 +55,12 @@ background:none; } .form_notice.warning #notice_text-count, -.form_settings .form_note, -.entity_remote_subscribe { +.form_settings .form_note { background-color:#9BB43E; } input.submit, .form_notice.warning #notice_text-count, .form_settings .form_note, -.entity_remote_subscribe, .entity_actions a, .entity_actions input, .entity_moderation p, @@ -81,12 +78,10 @@ background-color:transparent; input:focus, textarea:focus, select:focus, .form_notice.warning #notice_data-text, .form_notice.warning #notice_text-count, -.form_settings .form_note, -.entity_remote_subscribe { +.form_settings .form_note { border-color:#9BB43E; } -input.submit, -.entity_remote_subscribe { +input.submit { color:#FFFFFF; } .entity_actions input.submit { From a5724cca4956e3fcfe359bd72b4d874832b31393 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 11 Dec 2009 10:10:25 -0500 Subject: [PATCH 098/172] do some moving around of forwarding stuff --- .../Repeat/forward.php => actions/repeat.php | 0 .../forwardform.php => lib/repeatform.php | 0 plugins/Repeat/Forward.php | 127 ------------------ plugins/Repeat/inboxnoticelist.php | 85 ------------ 4 files changed, 212 deletions(-) rename plugins/Repeat/forward.php => actions/repeat.php (100%) rename plugins/Repeat/forwardform.php => lib/repeatform.php (100%) delete mode 100644 plugins/Repeat/Forward.php delete mode 100644 plugins/Repeat/inboxnoticelist.php diff --git a/plugins/Repeat/forward.php b/actions/repeat.php similarity index 100% rename from plugins/Repeat/forward.php rename to actions/repeat.php diff --git a/plugins/Repeat/forwardform.php b/lib/repeatform.php similarity index 100% rename from plugins/Repeat/forwardform.php rename to lib/repeatform.php diff --git a/plugins/Repeat/Forward.php b/plugins/Repeat/Forward.php deleted file mode 100644 index 09b2d6a4ee..0000000000 --- a/plugins/Repeat/Forward.php +++ /dev/null @@ -1,127 +0,0 @@ -. - */ - -if (!defined('STATUSNET')) { - exit(1); -} - -/** - * Table Definition for location_namespace - */ - -require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; - -class Forward extends Memcached_DataObject -{ - ###START_AUTOCODE - /* the code below is auto generated do not remove the above tag */ - - public $__table = 'forward'; // table name - public $profile_id; // int(4) primary_key not_null - public $notice_id; // int(4) primary_key not_null - public $created; // datetime not_null default_0000-00-00%2000%3A00%3A00 - - /* Static get */ - function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Forward',$k,$v); } - - /* the code above is auto generated do not remove the tag below */ - ###END_AUTOCODE - - function &pkeyGet($kv) - { - return Memcached_DataObject::pkeyGet('Forward', $kv); - } - - static function saveNew($profile_id, $notice_id) - { - $forward = new Forward(); - - $forward->profile_id = $profile_id; - $forward->notice_id = $notice_id; - $forward->created = common_sql_now(); - - $forward->query('BEGIN'); - - if (!$forward->insert()) { - throw new ServerException(_("Couldn't insert forward.")); - } - - $ni = $forward->addToInboxes(); - - $forward->query('COMMIT'); - - $forward->blowCache($ni); - - return $forward; - } - - function addToInboxes() - { - $inbox = new Notice_inbox(); - - $user = new User(); - - $usertable = common_database_tablename('user'); - $user->query("SELECT $usertable.* FROM $usertable INNER JOIN subscription ON $usertable.id = subscription.subscriber ". - 'WHERE subscription.subscribed = '.$this->profile_id); - - $ni = array(); - - $notice = Notice::staticGet('id', $this->notice_id); - - $author = Profile::staticGet('id', $notice->profile_id); - - while ($user->fetch()) { - $inbox = Notice_inbox::pkeyGet(array('user_id' => $user->id, - 'notice_id' => $this->notice_id)); - - if (empty($inbox)) { - if (!$user->hasBlocked($author)) { - $ni[$user->id] = NOTICE_INBOX_SOURCE_FORWARD; - } - } else { - $inbox->free(); - } - } - - $user->free(); - $author->free(); - - unset($user); - unset($author); - - Notice_inbox::bulkInsert($this->notice_id, $this->created, $ni); - - return $ni; - } - - function blowCache($ni) - { - $cache = common_memcache(); - - if (!empty($cache)) { - foreach ($ni as $id => $source) { - $cache->delete(common_cache_key('notice_inbox:by_user:'.$id)); - $cache->delete(common_cache_key('notice_inbox:by_user_own:'.$id)); - $cache->delete(common_cache_key('notice_inbox:by_user:'.$id.';last')); - $cache->delete(common_cache_key('notice_inbox:by_user_own:'.$id.';last')); - } - } - } -} diff --git a/plugins/Repeat/inboxnoticelist.php b/plugins/Repeat/inboxnoticelist.php deleted file mode 100644 index 809fbe8af9..0000000000 --- a/plugins/Repeat/inboxnoticelist.php +++ /dev/null @@ -1,85 +0,0 @@ -owner = $owner; - } - - function newListItem($notice) - { - return new InboxNoticeListItem($notice, $this->owner, $this->out); - } -} - -class InboxNoticeListItem extends NoticeListItem -{ - var $owner = null; - var $ib = null; - - function __construct($notice, $owner, $out=null) - { - parent::__construct($notice, $out); - $this->owner = $owner; - - $this->ib = Notice_inbox::pkeyGet(array('user_id' => $owner->id, - 'notice_id' => $notice->id)); - } - - function showAuthor() - { - parent::showAuthor(); - if ($this->ib->source == NOTICE_INBOX_SOURCE_FORWARD) { - $this->out->element('span', 'forward', _('Fwd')); - } - } - - function showEnd() - { - if ($this->ib->source == NOTICE_INBOX_SOURCE_FORWARD) { - - $forward = new Forward(); - - // FIXME: scary join! - - $forward->query('SELECT profile_id '. - 'FROM forward JOIN subscription ON forward.profile_id = subscription.subscribed '. - 'WHERE subscription.subscriber = ' . $this->owner->id . ' '. - 'AND forward.notice_id = ' . $this->notice->id . ' '. - 'ORDER BY forward.created '); - - $n = 0; - - $firstForwarder = null; - - while ($forward->fetch()) { - if (empty($firstForwarder)) { - $firstForwarder = Profile::staticGet('id', $forward->profile_id); - } - $n++; - } - - $forward->free(); - unset($forward); - - $this->out->elementStart('span', 'forwards'); - - $link = XMLStringer::estring('a', array('href' => $firstForwarder->profileurl), - $firstForwarder->nickname); - - if ($n == 1) { - $this->out->raw(sprintf(_('Forwarded by %s'), $link)); - } else { - // XXX: use that cool ngettext thing - $this->out->raw(sprintf(_('Forwarded by %s and %d other(s)'), $link, $n - 1)); - } - - $this->out->elementEnd('span'); - } - parent::showEnd(); - } -} From f5bfa11db2df2362ec5f81699b26942d52e9b60b Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 11 Dec 2009 10:10:53 -0500 Subject: [PATCH 099/172] Revert "remove NoticeForward from util.js" This reverts commit 038fbddd02d2f144936357ed2ed40c09b1441c6b. --- js/util.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/js/util.js b/js/util.js index 336cd8cfe5..71514324b1 100644 --- a/js/util.js +++ b/js/util.js @@ -315,6 +315,10 @@ var SN = { // StatusNet $('.form_disfavor').each(function() { SN.U.FormXHR($(this)); }); }, + NoticeForward: function() { + $('.form_forward').each(function() { SN.U.FormXHR($(this)); }); + }, + NoticeAttachments: function() { $('.notice a.attachment').each(function() { SN.U.NoticeWithAttachment($(this).closest('.notice')); @@ -448,6 +452,7 @@ var SN = { // StatusNet Notices: function() { if ($('body.user_in').length > 0) { SN.U.NoticeFavor(); + SN.U.NoticeForward(); SN.U.NoticeReply(); } From e75444b30d9c38f40f7a15422b46b5caae6bb16a Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 11 Dec 2009 10:11:06 -0500 Subject: [PATCH 100/172] Revert "remove form_forward from base css" This reverts commit a2fb1f5f9dda42b8bac689d3b5bfa86d7660416d. --- theme/base/css/display.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/theme/base/css/display.css b/theme/base/css/display.css index e88e1f2226..5abbe159da 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -994,11 +994,13 @@ float:left; } .notice-options .notice_delete, .notice-options .notice_reply, +.notice-options .form_forward, .notice-options .form_favor, .notice-options .form_disfavor { float:left; margin-left:20%; } +.notice-options .form_forward, .notice-options .form_favor, .notice-options .form_disfavor { margin-left:0; @@ -1024,10 +1026,12 @@ border-radius:0; -moz-border-radius:0; -webkit-border-radius:0; } +.notice-options .form_forward legend, .notice-options .form_favor legend, .notice-options .form_disfavor legend { display:none; } +.notice-options .form_forward fieldset, .notice-options .form_favor fieldset, .notice-options .form_disfavor fieldset { border:0; From 1204178660d34088f49bdaeb21189651c48c591e Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 11 Dec 2009 10:12:34 -0500 Subject: [PATCH 101/172] rename forward form to repeat form in JS --- js/util.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/util.js b/js/util.js index 71514324b1..f60b5d3137 100644 --- a/js/util.js +++ b/js/util.js @@ -315,8 +315,8 @@ var SN = { // StatusNet $('.form_disfavor').each(function() { SN.U.FormXHR($(this)); }); }, - NoticeForward: function() { - $('.form_forward').each(function() { SN.U.FormXHR($(this)); }); + NoticeRepeat: function() { + $('.form_repeat').each(function() { SN.U.FormXHR($(this)); }); }, NoticeAttachments: function() { @@ -452,7 +452,7 @@ var SN = { // StatusNet Notices: function() { if ($('body.user_in').length > 0) { SN.U.NoticeFavor(); - SN.U.NoticeForward(); + SN.U.NoticeRepeat(); SN.U.NoticeReply(); } From 63642dccf1d2ad6a42eafed5d4ede86635b554a2 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 11 Dec 2009 10:13:33 -0500 Subject: [PATCH 102/172] rename form_forward to form_repeat in CSS --- theme/base/css/display.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 5abbe159da..7446a42cdd 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -994,13 +994,13 @@ float:left; } .notice-options .notice_delete, .notice-options .notice_reply, -.notice-options .form_forward, +.notice-options .form_repeat, .notice-options .form_favor, .notice-options .form_disfavor { float:left; margin-left:20%; } -.notice-options .form_forward, +.notice-options .form_repeat, .notice-options .form_favor, .notice-options .form_disfavor { margin-left:0; @@ -1026,12 +1026,12 @@ border-radius:0; -moz-border-radius:0; -webkit-border-radius:0; } -.notice-options .form_forward legend, +.notice-options .form_repeat legend, .notice-options .form_favor legend, .notice-options .form_disfavor legend { display:none; } -.notice-options .form_forward fieldset, +.notice-options .form_repeat fieldset, .notice-options .form_favor fieldset, .notice-options .form_disfavor fieldset { border:0; From 3d06431787430f7102087ee4a8a66319fcb50350 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 11 Dec 2009 10:20:32 -0500 Subject: [PATCH 103/172] add repeat_of column to notice table --- db/08to09.sql | 4 +++- db/08to09_pg.sql | 1 + db/statusnet.sql | 2 ++ db/statusnet_pg.sql | 4 +++- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/db/08to09.sql b/db/08to09.sql index 64640f4ced..28ec3ec16b 100644 --- a/db/08to09.sql +++ b/db/08to09.sql @@ -4,8 +4,10 @@ alter table notice add column lon decimal(10,7) comment 'longitude', add column location_id integer comment 'location id if possible', add column location_ns integer comment 'namespace for location', + add column repeat_of integer comment 'notice this is a repeat of' references notice (id), drop index notice_profile_id_idx, - add index notice_profile_id_idx (profile_id,created,id); + add index notice_profile_id_idx (profile_id,created,id), + add index notice_repeatof_idx (repeat_of); alter table message modify column content text comment 'message content'; diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql index 1df8c249b5..0398952f6e 100644 --- a/db/08to09_pg.sql +++ b/db/08to09_pg.sql @@ -74,6 +74,7 @@ ALTER TABLE notice ADD COLUMN lat decimal(10, 7) /* comment 'latitude'*/; ALTER TABLE notice ADD COLUMN lon decimal(10,7) /* comment 'longitude'*/; ALTER TABLE notice ADD COLUMN location_id integer /* comment 'location id if possible'*/ ; ALTER TABLE notice ADD COLUMN location_ns integer /* comment 'namespace for location'*/; +ALTER TABLE notice ADD COLUMN repeat_of integer / * comment 'notice this is a repeat of' */ references notice (id); ALTER TABLE profile ADD COLUMN lat decimal(10,7) /*comment 'latitude'*/ ; ALTER TABLE profile ADD COLUMN lon decimal(10,7) /*comment 'longitude'*/; diff --git a/db/statusnet.sql b/db/statusnet.sql index 18abcdfdb2..6b3c2ca068 100644 --- a/db/statusnet.sql +++ b/db/statusnet.sql @@ -129,11 +129,13 @@ create table notice ( lon decimal(10,7) comment 'longitude', location_id integer comment 'location id if possible', location_ns integer comment 'namespace for location', + repeat_of integer comment 'notice this is a repeat of' references notice (id), index notice_profile_id_idx (profile_id,created,id), index notice_conversation_idx (conversation), index notice_created_idx (created), index notice_replyto_idx (reply_to), + index notice_repeatof_idx (repeat_of), FULLTEXT(content) ) ENGINE=MyISAM CHARACTER SET utf8 COLLATE utf8_general_ci; diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql index c37fa81dee..020bfd9670 100644 --- a/db/statusnet_pg.sql +++ b/db/statusnet_pg.sql @@ -135,7 +135,9 @@ create table notice ( lat decimal(10,7) /* comment 'latitude'*/ , lon decimal(10,7) /* comment 'longitude'*/ , location_id integer /* comment 'location id if possible'*/ , - location_ns integer /* comment 'namespace for location'*/ + location_ns integer /* comment 'namespace for location'*/ , + repeat_of integer /* comment 'notice this is a repeat of' */ references notice (id) , + /* FULLTEXT(content) */ ); From da3089098817234627e48619f3a8b217970f8627 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 11 Dec 2009 10:22:56 -0500 Subject: [PATCH 104/172] add repeat_of column to notice class --- classes/Notice.php | 14 ++++++++------ classes/statusnet.ini | 2 ++ 2 files changed, 10 insertions(+), 6 deletions(-) mode change 100644 => 100755 classes/statusnet.ini diff --git a/classes/Notice.php b/classes/Notice.php index c36c5a9c6b..0a2f16271f 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -55,13 +55,13 @@ class Notice extends Memcached_DataObject public $__table = 'notice'; // table name public $id; // int(4) primary_key not_null - public $profile_id; // int(4) not_null + public $profile_id; // int(4) multiple_key not_null public $uri; // varchar(255) unique_key - public $content; // text() - public $rendered; // text() + public $content; // text + public $rendered; // text public $url; // varchar(255) - public $created; // datetime() not_null - public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP + public $created; // datetime multiple_key not_null default_0000-00-00%2000%3A00%3A00 + public $modified; // timestamp not_null default_CURRENT_TIMESTAMP public $reply_to; // int(4) public $is_local; // tinyint(1) public $source; // varchar(32) @@ -70,9 +70,11 @@ class Notice extends Memcached_DataObject public $lon; // decimal(10,7) public $location_id; // int(4) public $location_ns; // int(4) + public $repeat_of; // int(4) /* Static get */ - function staticGet($k,$v=NULL) { + function staticGet($k,$v=NULL) + { return Memcached_DataObject::staticGet('Notice',$k,$v); } diff --git a/classes/statusnet.ini b/classes/statusnet.ini old mode 100644 new mode 100755 index 835faeb0b4..ff4ef2c142 --- a/classes/statusnet.ini +++ b/classes/statusnet.ini @@ -1,3 +1,4 @@ + [avatar] profile_id = 129 original = 17 @@ -306,6 +307,7 @@ lat = 1 lon = 1 location_id = 1 location_ns = 1 +repeat_of = 1 [notice__keys] id = N From c9649f932153e6636214841858fd265b1476c05b Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 11 Dec 2009 10:23:36 -0500 Subject: [PATCH 105/172] reset executable bit on Notice.php and statusnet.ini --- classes/statusnet.ini | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 classes/statusnet.ini diff --git a/classes/statusnet.ini b/classes/statusnet.ini old mode 100755 new mode 100644 From 280b0b500f5f374094794648942571237ca8c687 Mon Sep 17 00:00:00 2001 From: Christopher Vollick Date: Fri, 11 Dec 2009 10:34:57 -0500 Subject: [PATCH 106/172] Added UserEmail script. Used to query user's emails. Mostly used for administration, to see if a user requesting something is who they say. Also, some people assume that the admin knows this data, and says things like: "If you could do _____ with the account connected to this email". It'd be nice if we could do that without raw SQL. --- scripts/useremail.php | 77 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 scripts/useremail.php diff --git a/scripts/useremail.php b/scripts/useremail.php new file mode 100644 index 0000000000..6676a87c80 --- /dev/null +++ b/scripts/useremail.php @@ -0,0 +1,77 @@ +#!/usr/bin/env php +. + */ + +define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); + +$shortoptions = 'i:n:e:'; +$longoptions = array('id=', 'nickname=', 'email='); + +$helptext = <<email)) { + print "No email registered for user '$user->nickname'\n"; + } else { + print "$user->email\n"; + } + exit(0); +} + +if (have_option('e', 'email')) { + $user = new User(); + $user->email = get_option_value('e', 'email'); + $user->find(false); + if (!$user->fetch()) { + print "No users with email $user->email\n"; + exit(0); + } + do { + print "$user->id $user->nickname\n"; + } while ($user->fetch()); +} else { + print "You must provide either an ID, email, or a nickname.\n"; + exit(1); +} From 81843f2acd5375a9072d091fd58c6a6af079295e Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 11 Dec 2009 10:49:26 -0500 Subject: [PATCH 107/172] show the repeat form in notice lists --- classes/Profile.php | 11 +++++++++++ lib/noticelist.php | 21 +++++++++++++++++++++ lib/repeatform.php | 26 ++++++++++++-------------- 3 files changed, 44 insertions(+), 14 deletions(-) diff --git a/classes/Profile.php b/classes/Profile.php index 4b2e090064..03196447b8 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -716,4 +716,15 @@ class Profile extends Memcached_DataObject } return $result; } + + function hasRepeated($notice_id) + { + // XXX: not really a pkey, but should work + + $notice = Memcached_DataObject::pkeyGet('Notice', + array('profile_id' => $this->id, + 'repeat_of' => $notice_id)); + + return !empty($notice); + } } diff --git a/lib/noticelist.php b/lib/noticelist.php index 21cec528ff..924056ece2 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -212,6 +212,7 @@ class NoticeListItem extends Widget $this->out->elementStart('div', 'notice-options'); $this->showFaveForm(); $this->showReplyLink(); + $this->showRepeatForm(); $this->showDeleteLink(); $this->out->elementEnd('div'); } @@ -551,6 +552,26 @@ class NoticeListItem extends Widget } } + /** + * show the form to repeat a notice + * + * @return void + */ + + function showRepeatForm() + { + $user = common_current_user(); + if ($user && $user->id != $this->notice->profile_id) { + $profile = $user->getProfile(); + if ($profile->hasRepeated($this->notice->id)) { + $this->out->text(_('Repeated')); + } else { + $rf = new RepeatForm($this->out, $this->notice); + $rf->show(); + } + } + } + /** * finish the notice * diff --git a/lib/repeatform.php b/lib/repeatform.php index 2052856ae6..50e5d6dbe0 100644 --- a/lib/repeatform.php +++ b/lib/repeatform.php @@ -2,7 +2,7 @@ /** * StatusNet, the distributed open-source microblogging tool * - * Form for forwarding a notice + * Form for repeating a notice * * PHP version 5 * @@ -27,14 +27,12 @@ * @link http://status.net/ */ -if (!defined('STATUSNET') && !defined('LACONICA')) { +if (!defined('STATUSNET')) { exit(1); } -require_once INSTALLDIR.'/lib/form.php'; - /** - * Form for forwarding a notice + * Form for repeating a notice * * @category Form * @package StatusNet @@ -43,10 +41,10 @@ require_once INSTALLDIR.'/lib/form.php'; * @link http://status.net/ */ -class ForwardForm extends Form +class RepeatForm extends Form { /** - * Notice to forward + * Notice to repeat */ var $notice = null; @@ -55,7 +53,7 @@ class ForwardForm extends Form * Constructor * * @param HTMLOutputter $out output channel - * @param Notice $notice notice to forward + * @param Notice $notice notice to repeat */ function __construct($out=null, $notice=null) @@ -73,7 +71,7 @@ class ForwardForm extends Form function id() { - return 'forward-' . $this->notice->id; + return 'repeat-' . $this->notice->id; } /** @@ -84,7 +82,7 @@ class ForwardForm extends Form function action() { - return common_local_url('forward'); + return common_local_url('repeat'); } /** @@ -106,7 +104,7 @@ class ForwardForm extends Form */ function formLegend() { - $this->out->element('legend', null, _('Forward this notice')); + $this->out->element('legend', null, _('Repeat this notice')); } /** @@ -130,8 +128,8 @@ class ForwardForm extends Form function formActions() { - $this->out->submit('forward-submit-' . $this->notice->id, - _('Forward'), 'submit', null, _('Forward this notice')); + $this->out->submit('repeat-submit-' . $this->notice->id, + _('Repeat'), 'submit', null, _('Repeat this notice')); } /** @@ -142,6 +140,6 @@ class ForwardForm extends Form function formClass() { - return 'form_forward'; + return 'form_repeat'; } } From 79f81ad76d413908c097c121912eff233aebc483 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 11 Dec 2009 11:29:51 -0500 Subject: [PATCH 108/172] change Notice::saveNew() to use named arguments for little-used options --- actions/apistatusesupdate.php | 29 ++++++++++++++++------------- actions/newnotice.php | 10 ++++++---- classes/Notice.php | 15 ++++++++++++--- lib/command.php | 5 +++-- lib/oauthstore.php | 5 ++--- plugins/Facebook/facebookaction.php | 5 +++-- 6 files changed, 42 insertions(+), 27 deletions(-) diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php index 85a7c8c084..10bbc5ace0 100644 --- a/actions/apistatusesupdate.php +++ b/actions/apistatusesupdate.php @@ -231,19 +231,22 @@ class ApiStatusesUpdateAction extends ApiAuthAction } } - $this->notice = Notice::saveNew( - $this->user->id, - html_entity_decode($status_shortened, ENT_NOQUOTES, 'UTF-8'), - $this->source, - 1, - $reply_to, - null, - null, - empty($location) ? null : $location->lat, - empty($location) ? null : $location->lon, - empty($location) ? null : $location->location_id, - empty($location) ? null : $location->location_ns - ); + $content = html_entity_decode($status_shortened, ENT_NOQUOTES, 'UTF-8'), + + $options = array('reply_to' => $reply_to); + + if (!empty($location)) { + $options['lat'] = $location->lat; + $options['lon'] = $location->lon; + $options['location_id'] = $location->location_id; + $options['location_ns'] = $location->location_ns; + } + + $this->notice = + Notice::saveNew($this->user->id, + $content, + $this->source, + $options); if (isset($upload)) { $upload->attachToNotice($this->notice); diff --git a/actions/newnotice.php b/actions/newnotice.php index dd6da0b01c..c6c70e3260 100644 --- a/actions/newnotice.php +++ b/actions/newnotice.php @@ -187,10 +187,12 @@ class NewnoticeAction extends Action } } - $notice = Notice::saveNew($user->id, $content_shortened, 'web', 1, - ($replyto == 'false') ? null : $replyto, - null, null, - $lat, $lon, $location_id, $location_ns); + $notice = Notice::saveNew($user->id, $content_shortened, 'web', + array('reply_to' => ($replyto == 'false') ? null : $replyto, + 'lat' => $lat, + 'lon' => $lon, + 'location_id' => $location_id, + 'location_ns' => $location_ns)); if (isset($upload)) { $upload->attachToNotice($notice); diff --git a/classes/Notice.php b/classes/Notice.php index c36c5a9c6b..4422866fa1 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -167,9 +167,18 @@ class Notice extends Memcached_DataObject } } - static function saveNew($profile_id, $content, $source=null, - $is_local=Notice::LOCAL_PUBLIC, $reply_to=null, $uri=null, $created=null, - $lat=null, $lon=null, $location_id=null, $location_ns=null) { + static function saveNew($profile_id, $content, $source, $options=null) { + + if (!empty($options)) { + extract($options); + if (!isset($reply_to)) { + $reply_to = NULL; + } + } + + if (empty($is_local)) { + $is_local = Notice::LOCAL_PUBLIC; + } $profile = Profile::staticGet($profile_id); diff --git a/lib/command.php b/lib/command.php index 450db9da37..085331f825 100644 --- a/lib/command.php +++ b/lib/command.php @@ -433,8 +433,9 @@ class ReplyCommand extends Command return; } - $notice = Notice::saveNew($this->user->id, $this->text, $channel->source(), 1, - $notice->id); + $notice = Notice::saveNew($this->user->id, $this->text, $channel->source(), + array('reply_to' => $notice->id)); + if ($notice) { $channel->output($this->user, sprintf(_('Reply to %s sent'), $recipient->nickname)); } else { diff --git a/lib/oauthstore.php b/lib/oauthstore.php index e34bf8a5ed..df63cc1512 100644 --- a/lib/oauthstore.php +++ b/lib/oauthstore.php @@ -359,9 +359,8 @@ class StatusNetOAuthDataStore extends OAuthDataStore $notice = Notice::saveNew($author->id, $omb_notice->getContent(), 'omb', - false, - null, - $omb_notice->getIdentifierURI()); + array('is_local' => Notice::REMOTE_OMB, + 'uri' => $omb_notice->getIdentifierURI())); common_broadcast_notice($notice, true); } diff --git a/plugins/Facebook/facebookaction.php b/plugins/Facebook/facebookaction.php index 705bb2780d..24bf215fd9 100644 --- a/plugins/Facebook/facebookaction.php +++ b/plugins/Facebook/facebookaction.php @@ -445,8 +445,9 @@ class FacebookAction extends Action $replyto = $this->trimmed('inreplyto'); try { - $notice = Notice::saveNew($user->id, $content, - 'web', 1, ($replyto == 'false') ? null : $replyto); + $notice = Notice::saveNew($user->id, $content, 'web', + array('reply_to' => ($replyto == 'false') ? null : $replyto)); + } catch (Exception $e) { $this->showPage($e->getMessage()); return; From 89256fa754c1e03b822b8eeac388cc822b3c58ca Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 11 Dec 2009 11:33:26 -0500 Subject: [PATCH 109/172] fix typo in API arg creation --- actions/apistatusesupdate.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php index 10bbc5ace0..dabbea92f5 100644 --- a/actions/apistatusesupdate.php +++ b/actions/apistatusesupdate.php @@ -231,7 +231,7 @@ class ApiStatusesUpdateAction extends ApiAuthAction } } - $content = html_entity_decode($status_shortened, ENT_NOQUOTES, 'UTF-8'), + $content = html_entity_decode($status_shortened, ENT_NOQUOTES, 'UTF-8'); $options = array('reply_to' => $reply_to); From afc86a86d36dc8101c81d5d009546e4629db34a3 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 11 Dec 2009 11:51:09 -0500 Subject: [PATCH 110/172] save repeats from the form --- actions/repeat.php | 20 ++++++++++---------- classes/Notice.php | 23 ++++++++++++++++++++++- lib/router.php | 1 + 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/actions/repeat.php b/actions/repeat.php index 194833fe0c..a1c5f443fb 100644 --- a/actions/repeat.php +++ b/actions/repeat.php @@ -1,7 +1,7 @@ user = common_current_user(); if (empty($this->user)) { - $this->clientError(_("Only logged-in users can forward notices.")); + $this->clientError(_("Only logged-in users can repeat notices.")); return false; } @@ -73,7 +73,7 @@ class ForwardAction extends Action } if ($this->user->id == $this->notice->profile_id) { - $this->clientError(_("You can't forward your own notice.")); + $this->clientError(_("You can't repeat your own notice.")); return false; } @@ -86,8 +86,8 @@ class ForwardAction extends Action $profile = $this->user->getProfile(); - if ($profile->hasForwarded($id)) { - $this->clientError(_("You already forwarded that notice.")); + if ($profile->hasRepeated($id)) { + $this->clientError(_("You already repeated that notice.")); return false; } @@ -104,15 +104,15 @@ class ForwardAction extends Action function handle($args) { - $forward = Forward::saveNew($this->user->id, $this->notice->id); + $repeat = $this->notice->repeat($this->user->id, 'web'); if ($this->boolean('ajax')) { $this->startHTML('text/xml;charset=utf-8'); $this->elementStart('head'); - $this->element('title', null, _('Forwarded')); + $this->element('title', null, _('Repeated')); $this->elementEnd('head'); $this->elementStart('body'); - $this->element('p', array('id' => 'forward_response'), _('Forwarded!')); + $this->element('p', array('id' => 'repeat_response'), _('Repeated!')); $this->elementEnd('body'); $this->elementEnd('html'); } else { diff --git a/classes/Notice.php b/classes/Notice.php index 2282011882..82753fbdd6 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -236,7 +236,14 @@ class Notice extends Memcached_DataObject $notice->source = $source; $notice->uri = $uri; - $notice->reply_to = self::getReplyTo($reply_to, $profile_id, $source, $final); + // Handle repeat case + + if (isset($repeat_of)) { + $notice->repeat_of = $repeat_of; + $notice->reply_to = $repeat_of; + } else { + $notice->reply_to = self::getReplyTo($reply_to, $profile_id, $source, $final); + } if (!empty($notice->reply_to)) { $reply = Notice::staticGet('id', $notice->reply_to); @@ -1434,4 +1441,18 @@ class Notice extends Memcached_DataObject return $location; } + + function repeat($repeater_id, $source) + { + $author = Profile::staticGet('id', $this->profile_id); + + // FIXME: truncate on long repeats...? + + $content = sprintf(_('RT @%1$s %2$s'), + $author->nickname, + $this->content); + + return self::saveNew($repeater_id, $content, $source, + array('repeat_of' => $this->id)); + } } diff --git a/lib/router.php b/lib/router.php index 37525319f7..142206c16a 100644 --- a/lib/router.php +++ b/lib/router.php @@ -99,6 +99,7 @@ class Router 'groupblock', 'groupunblock', 'sandbox', 'unsandbox', 'silence', 'unsilence', + 'repeat', 'deleteuser'); foreach ($main as $a) { From 962f391f3ebd4908ae7187673426f03e57083b02 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 11 Dec 2009 12:10:58 -0500 Subject: [PATCH 111/172] show original notice in repeat, with repeat info below --- lib/noticelist.php | 60 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 58 insertions(+), 2 deletions(-) diff --git a/lib/noticelist.php b/lib/noticelist.php index 924056ece2..7319a62ea7 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -147,6 +147,10 @@ class NoticeListItem extends Widget var $notice = null; + /** The notice that was repeated. */ + + var $repeat = null; + /** The profile of the author of the notice, extracted once for convenience. */ var $profile = null; @@ -162,8 +166,13 @@ class NoticeListItem extends Widget function __construct($notice, $out=null) { parent::__construct($out); - $this->notice = $notice; - $this->profile = $notice->getProfile(); + if (!empty($notice->repeat_of)) { + $this->notice = Notice::staticGet('id', $notice->repeat_of); + $this->repeat = $notice; + } else { + $this->notice = $notice; + } + $this->profile = $this->notice->getProfile(); } /** @@ -202,6 +211,7 @@ class NoticeListItem extends Widget $this->showNoticeSource(); $this->showNoticeLocation(); $this->showContext(); + $this->showRepeat(); $this->out->elementEnd('div'); } @@ -508,6 +518,52 @@ class NoticeListItem extends Widget } } + /** + * show a link to the author of repeat + * + * @return void + */ + + function showRepeat() + { + if (!empty($this->repeat)) { + + $repeater = Profile::staticGet('id', $this->repeat->profile_id); + + $attrs = array('href' => $repeater->profileurl, + 'class' => 'url'); + + if (!empty($repeater->fullname)) { + $attrs['title'] = $repeater->fullname . ' (' . $repeater->nickname . ')'; + } + + $this->out->elementStart('span', 'repeat'); + + $this->out->elementStart('a', $attrs); + + $avatar = $repeater->getAvatar(AVATAR_MINI_SIZE); + + $this->out->element('img', array('src' => ($avatar) ? + $avatar->displayUrl() : + Avatar::defaultImage(AVATAR_MINI_SIZE), + 'class' => 'avatar photo', + 'width' => AVATAR_MINI_SIZE, + 'height' => AVATAR_MINI_SIZE, + 'alt' => + ($repeater->fullname) ? + $repeater->fullname : + $repeater->nickname)); + + $this->out->elementEnd('a'); + + $text_link = XMLStringer::estring('a', $attrs, $repeater->nickname); + + $this->out->raw(sprintf(_('Repeated by %s'), $text_link)); + + $this->out->elementEnd('span'); + } + } + /** * show a link to reply to the current notice * From 0cb1feed51522abc35bfd4252089ca8c4df52bda Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 11 Dec 2009 12:16:11 -0500 Subject: [PATCH 112/172] show repeated notice's author on profile page --- actions/showstream.php | 46 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/actions/showstream.php b/actions/showstream.php index 663638c18a..74b46cc95b 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -269,4 +269,50 @@ class ProfileNoticeListItem extends NoticeListItem { return; } + + /** + * show a link to the author of repeat + * + * @return void + */ + + function showRepeat() + { + if (!empty($this->repeat)) { + + // FIXME: this code is almost identical to default; need to refactor + + $attrs = array('href' => $this->profile->profileurl, + 'class' => 'url'); + + if (!empty($this->profile->fullname)) { + $attrs['title'] = $this->profile->fullname . ' (' . $this->profile->nickname . ')'; + } + + $this->out->elementStart('span', 'repeat'); + + $this->out->elementStart('a', $attrs); + + $avatar = $this->profile->getAvatar(AVATAR_MINI_SIZE); + + $this->out->element('img', array('src' => ($avatar) ? + $avatar->displayUrl() : + Avatar::defaultImage(AVATAR_MINI_SIZE), + 'class' => 'avatar photo', + 'width' => AVATAR_MINI_SIZE, + 'height' => AVATAR_MINI_SIZE, + 'alt' => + ($this->profile->fullname) ? + $this->profile->fullname : + $this->profile->nickname)); + + $this->out->elementEnd('a'); + + $text_link = XMLStringer::estring('a', $attrs, $this->profile->nickname); + + $this->out->raw(sprintf(_('Repeat of %s'), $text_link)); + + $this->out->elementEnd('span'); + } + } } From 1c370bb277d9b707a5f1956dd5e6856a9b278f5e Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 11 Dec 2009 12:39:29 -0500 Subject: [PATCH 113/172] show repeated notices correctly in API output --- lib/api.php | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/lib/api.php b/lib/api.php index eacb80dbea..12e3ba5314 100644 --- a/lib/api.php +++ b/lib/api.php @@ -213,6 +213,20 @@ class ApiAction extends Action } function twitterStatusArray($notice, $include_user=true) + { + $base = $this->twitterSimpleStatusArray($notice, $include_user); + + if (empty($notice->repeat_of)) { + return $base; + } else { + $original = Notice::staticGet('id', $notice->repeat_of); + $original_array = $this->twitterSimpleStatusArray($original, $include_user); + $original_array['retweeted_status'] = $base; + return $original_array; + } + } + + function twitterSimpleStatusArray($notice, $include_user=true) { $profile = $notice->getProfile(); @@ -446,9 +460,9 @@ class ApiAction extends Action } } - function showTwitterXmlStatus($twitter_status) + function showTwitterXmlStatus($twitter_status, $tag='status') { - $this->elementStart('status'); + $this->elementStart($tag); foreach($twitter_status as $element => $value) { switch ($element) { case 'user': @@ -463,11 +477,14 @@ class ApiAction extends Action case 'geo': $this->showGeoRSS($value); break; + case 'retweeted_status': + $this->showTwitterXmlStatus($value, 'retweeted_status'); + break; default: $this->element($element, null, $value); } } - $this->elementEnd('status'); + $this->elementEnd($tag); } function showTwitterXmlGroup($twitter_group) From 683edfd199ae150afa74993521c4c65d76b1e19d Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 11 Dec 2009 12:40:05 -0500 Subject: [PATCH 114/172] show repeated notices correctly in API output --- actions/apistatusesretweet.php | 136 +++++++++++++++++++++++++++++++++ lib/router.php | 5 ++ 2 files changed, 141 insertions(+) create mode 100644 actions/apistatusesretweet.php diff --git a/actions/apistatusesretweet.php b/actions/apistatusesretweet.php new file mode 100644 index 0000000000..fc71d22743 --- /dev/null +++ b/actions/apistatusesretweet.php @@ -0,0 +1,136 @@ +. + * + * @category API + * @package StatusNet + * @author Evan Prodromou + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +require_once INSTALLDIR . '/lib/apiauth.php'; +require_once INSTALLDIR . '/lib/mediafile.php'; + +/** + * Repeat a notice through the API + * + * @category API + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class ApiStatusesRetweetAction extends ApiAuthAction +{ + var $original = null; + + /** + * Take arguments for running + * + * @param array $args $_REQUEST args + * + * @return boolean success flag + * + */ + + function prepare($args) + { + parent::prepare($args); + + if ($_SERVER['REQUEST_METHOD'] != 'POST') { + $this->clientError(_('This method requires a POST.'), + 400, $this->format); + return false; + } + + $id = $this->trimmed('id'); + + $this->original = Notice::staticGet('id', $id); + + if (empty($this->original)) { + $this->clientError(_('No such notice'), + 400, $this->format); + return false; + } + + $this->user = $this->auth_user; + + if ($this->user->id == $notice->profile_id) { + $this->clientError(_('Cannot repeat your own notice')); + 400, $this->format); + return false; + } + + $profile = $this->user->getProfile(); + + if ($profile->hasRepeated($id)) { + $this->clientError(_('Already repeated that notice'), + 400, $this->format); + return false; + } + + return true; + } + + /** + * Handle the request + * + * Make a new notice for the update, save it, and show it + * + * @param array $args $_REQUEST data (unused) + * + * @return void + */ + + function handle($args) + { + parent::handle($args); + + $repeat = $this->original->repeat($this->user->id, $this->source); + + common_broadcast_notice($repeat); + + $this->showNotice($repeat); + } + + /** + * Show the resulting notice + * + * @return void + */ + + function showNotice($notice) + { + if (!empty($notice)) { + if ($this->format == 'xml') { + $this->showSingleXmlStatus($notice); + } elseif ($this->format == 'json') { + $this->show_single_json_status($notice); + } + } + } +} diff --git a/lib/router.php b/lib/router.php index 142206c16a..835339720d 100644 --- a/lib/router.php +++ b/lib/router.php @@ -359,6 +359,11 @@ class Router 'id' => '[0-9]+', 'format' => '(xml|json)')); + $m->connect('api/statuses/retweet/:id.:format', + array('action' => 'ApiStatusesRetweet', + 'id' => '[0-9]+', + 'format' => '(xml|json)')); + // users $m->connect('api/users/show.:format', From e2f0fc7b3f459a38c71c730c4006db42cab4724e Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 11 Dec 2009 13:14:40 -0800 Subject: [PATCH 115/172] Make useremail.php executable --- scripts/useremail.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/useremail.php diff --git a/scripts/useremail.php b/scripts/useremail.php old mode 100644 new mode 100755 From 59e5958d3afa0a5613efbc1ed4546ce63946fe43 Mon Sep 17 00:00:00 2001 From: Hue Bastard Date: Tue, 8 Dec 2009 21:28:11 +1000 Subject: [PATCH 116/172] ticket 2055: added logos to Atom and RSS feeds --- actions/apitimelinefavorites.php | 6 ++++-- actions/apitimelinefriends.php | 6 ++++-- actions/apitimelinegroup.php | 7 +++++-- actions/apitimelinementions.php | 6 ++++-- actions/apitimelinepublic.php | 5 +++-- actions/apitimelinetag.php | 6 ++++-- actions/apitimelineuser.php | 6 ++++-- lib/api.php | 27 +++++++++++++++++++++------ 8 files changed, 49 insertions(+), 20 deletions(-) diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php index f84d7b4cb7..77e5cea1bd 100644 --- a/actions/apitimelinefavorites.php +++ b/actions/apitimelinefavorites.php @@ -101,6 +101,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction function showTimeline() { $profile = $this->user->getProfile(); + $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE); $sitename = common_config('site', 'name'); $title = sprintf( @@ -121,20 +122,21 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction $profile->getBestName(), $this->user->nickname ); + $logo = ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE); switch($this->format) { case 'xml': $this->showXmlTimeline($this->notices); break; case 'rss': - $this->showRssTimeline($this->notices, $title, $link, $subtitle); + $this->showRssTimeline($this->notices, $title, $link, $subtitle, null, $logo, null, $logo); break; case 'atom': $selfuri = common_root_url() . ltrim($_SERVER['QUERY_STRING'], 'p='); $this->showAtomTimeline( $this->notices, $title, $id, $link, $subtitle, - null, $selfuri + null, $selfuri, $logo ); break; case 'json': diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php index e84f773723..09ba7a9691 100644 --- a/actions/apitimelinefriends.php +++ b/actions/apitimelinefriends.php @@ -110,6 +110,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction function showTimeline() { $profile = $this->user->getProfile(); + $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE); $sitename = common_config('site', 'name'); $title = sprintf(_("%s and friends"), $this->user->nickname); $taguribase = common_config('integration', 'taguri'); @@ -121,13 +122,14 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction _('Updates from %1$s and friends on %2$s!'), $this->user->nickname, $sitename ); + $logo = ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE); switch($this->format) { case 'xml': $this->showXmlTimeline($this->notices); break; case 'rss': - $this->showRssTimeline($this->notices, $title, $link, $subtitle); + $this->showRssTimeline($this->notices, $title, $link, $subtitle, null, $logo); break; case 'atom': @@ -144,7 +146,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction $this->showAtomTimeline( $this->notices, $title, $id, $link, - $subtitle, null, $selfuri + $subtitle, null, $selfuri, $logo ); break; case 'json': diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php index de13e7eb98..22c577f397 100644 --- a/actions/apitimelinegroup.php +++ b/actions/apitimelinegroup.php @@ -105,6 +105,7 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction function showTimeline() { $sitename = common_config('site', 'name'); + $avatar = $this->group->homepage_logo; $title = sprintf(_("%s timeline"), $this->group->nickname); $taguribase = common_config('integration', 'taguri'); $id = "tag:$taguribase:GroupTimeline:" . $this->group->id; @@ -117,13 +118,14 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction $this->group->nickname, $sitename ); + $logo = ($avatar) ? $avatar : User_group::defaultLogo(AVATAR_PROFILE_SIZE); switch($this->format) { case 'xml': $this->showXmlTimeline($this->notices); break; case 'rss': - $this->showRssTimeline($this->notices, $title, $link, $subtitle); + $this->showRssTimeline($this->notices, $title, $link, $subtitle, null, $logo); break; case 'atom': $selfuri = common_root_url() . @@ -136,7 +138,8 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction $link, $subtitle, null, - $selfuri + $selfuri, + $logo ); break; case 'json': diff --git a/actions/apitimelinementions.php b/actions/apitimelinementions.php index 0956ccdceb..19f40aebc9 100644 --- a/actions/apitimelinementions.php +++ b/actions/apitimelinementions.php @@ -110,6 +110,7 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction function showTimeline() { $profile = $this->user->getProfile(); + $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE); $sitename = common_config('site', 'name'); $title = sprintf( @@ -126,20 +127,21 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction _('%1$s updates that reply to updates from %2$s / %3$s.'), $sitename, $this->user->nickname, $profile->getBestName() ); + $logo = ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE); switch($this->format) { case 'xml': $this->showXmlTimeline($this->notices); break; case 'rss': - $this->showRssTimeline($this->notices, $title, $link, $subtitle); + $this->showRssTimeline($this->notices, $title, $link, $subtitle, null, $logo); break; case 'atom': $selfuri = common_root_url() . ltrim($_SERVER['QUERY_STRING'], 'p='); $this->showAtomTimeline( $this->notices, $title, $id, $link, $subtitle, - null, $selfuri + null, $selfuri, $logo ); break; case 'json': diff --git a/actions/apitimelinepublic.php b/actions/apitimelinepublic.php index 7a85042592..633f3c36e6 100644 --- a/actions/apitimelinepublic.php +++ b/actions/apitimelinepublic.php @@ -103,6 +103,7 @@ class ApiTimelinePublicAction extends ApiPrivateAuthAction function showTimeline() { $sitename = common_config('site', 'name'); + $sitelogo = (common_config('site', 'logo')) ? common_config('site', 'logo') : Theme::path('logo.png'); $title = sprintf(_("%s public timeline"), $sitename); $taguribase = common_config('integration', 'taguri'); $id = "tag:$taguribase:PublicTimeline"; @@ -114,13 +115,13 @@ class ApiTimelinePublicAction extends ApiPrivateAuthAction $this->showXmlTimeline($this->notices); break; case 'rss': - $this->showRssTimeline($this->notices, $title, $link, $subtitle); + $this->showRssTimeline($this->notices, $title, $link, $subtitle, null, $sitelogo); break; case 'atom': $selfuri = common_root_url() . 'api/statuses/public_timeline.atom'; $this->showAtomTimeline( $this->notices, $title, $id, $link, - $subtitle, null, $selfuri + $subtitle, null, $selfuri, $sitelogo ); break; case 'json': diff --git a/actions/apitimelinetag.php b/actions/apitimelinetag.php index 452593c116..1a50520f45 100644 --- a/actions/apitimelinetag.php +++ b/actions/apitimelinetag.php @@ -98,6 +98,7 @@ class ApiTimelineTagAction extends ApiPrivateAuthAction function showTimeline() { $sitename = common_config('site', 'name'); + $sitelogo = (common_config('site', 'logo')) ? common_config('site', 'logo') : Theme::path('logo.png'); $title = sprintf(_("Notices tagged with %s"), $this->tag); $link = common_local_url( 'tag', @@ -116,7 +117,7 @@ class ApiTimelineTagAction extends ApiPrivateAuthAction $this->showXmlTimeline($this->notices); break; case 'rss': - $this->showRssTimeline($this->notices, $title, $link, $subtitle); + $this->showRssTimeline($this->notices, $title, $link, $subtitle, null, $sitelogo); break; case 'atom': $selfuri = common_root_url() . @@ -129,7 +130,8 @@ class ApiTimelineTagAction extends ApiPrivateAuthAction $link, $subtitle, null, - $selfuri + $selfuri, + $sitelogo ); break; case 'json': diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php index ca1d217725..14c62a52e7 100644 --- a/actions/apitimelineuser.php +++ b/actions/apitimelineuser.php @@ -112,6 +112,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction function showTimeline() { $profile = $this->user->getProfile(); + $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE); $sitename = common_config('site', 'name'); $title = sprintf(_("%s timeline"), $this->user->nickname); @@ -125,6 +126,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction _('Updates from %1$s on %2$s!'), $this->user->nickname, $sitename ); + $logo = ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE); // FriendFeed's SUP protocol // Also added RSS and Atom feeds @@ -139,7 +141,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction case 'rss': $this->showRssTimeline( $this->notices, $title, $link, - $subtitle, $suplink + $subtitle, $suplink, $logo ); break; case 'atom': @@ -153,7 +155,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction } $this->showAtomTimeline( $this->notices, $title, $id, $link, - $subtitle, $suplink, $selfuri + $subtitle, $suplink, $selfuri, $logo ); break; case 'json': diff --git a/lib/api.php b/lib/api.php index eacb80dbea..7ebe65dbb7 100644 --- a/lib/api.php +++ b/lib/api.php @@ -134,17 +134,19 @@ class ApiAction extends Action $twitter_user['protected'] = false; # not supported by StatusNet yet $twitter_user['followers_count'] = $profile->subscriberCount(); - $user = $profile->getUser(); $design = null; + $user = $profile->getUser(); // Note: some profiles don't have an associated user - $defaultDesign = Design::siteDesign(); - if (!empty($user)) { $design = $user->getDesign(); } + if (empty($design)) { + $design = Design::siteDesign(); + } + $color = Design::toWebColor(empty($design->backgroundcolor) ? $defaultDesign->backgroundcolor : $design->backgroundcolor); $twitter_user['profile_background_color'] = ($color == null) ? '' : '#'.$color->hexValue(); $color = Design::toWebColor(empty($design->textcolor) ? $defaultDesign->textcolor : $design->textcolor); @@ -163,7 +165,7 @@ class ApiAction extends Action $timezone = 'UTC'; - if (!empty($user) && !empty($user->timezone)) { + if ($user->timezone) { $timezone = $user->timezone; } @@ -586,7 +588,7 @@ class ApiAction extends Action $this->endDocument('xml'); } - function showRssTimeline($notice, $title, $link, $subtitle, $suplink=null) + function showRssTimeline($notice, $title, $link, $subtitle, $suplink=null, $logo=null) { $this->initDocument('rss'); @@ -600,6 +602,15 @@ class ApiAction extends Action 'href' => $suplink, 'type' => 'application/json')); } + + if (!is_null($logo)) { + $this->elementStart('image'); + $this->element('link', null, $link); + $this->element('title', null, $title); + $this->element('url', null, $logo); + $this->elementEnd('image'); + } + $this->element('description', null, $subtitle); $this->element('language', null, 'en-us'); $this->element('ttl', null, '40'); @@ -619,7 +630,7 @@ class ApiAction extends Action $this->endTwitterRss(); } - function showAtomTimeline($notice, $title, $id, $link, $subtitle=null, $suplink=null, $selfuri=null) + function showAtomTimeline($notice, $title, $id, $link, $subtitle=null, $suplink=null, $selfuri=null, $logo=null) { $this->initDocument('atom'); @@ -628,6 +639,10 @@ class ApiAction extends Action $this->element('id', null, $id); $this->element('link', array('href' => $link, 'rel' => 'alternate', 'type' => 'text/html'), null); + if (!is_null($logo)) { + $this->element('logo',null,$logo); + } + if (!is_null($suplink)) { # For FriendFeed's SUP protocol $this->element('link', array('rel' => 'http://api.friendfeed.com/2008/03#sup', From c24afa986e04794bfd230cb527ebe6fd938f3934 Mon Sep 17 00:00:00 2001 From: Hue Bastard Date: Tue, 8 Dec 2009 21:35:54 +1000 Subject: [PATCH 117/172] (fix clumsy double paste in b45be2b actions/apitimelinefavorites.php --- actions/apitimelinefavorites.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php index 77e5cea1bd..008e042126 100644 --- a/actions/apitimelinefavorites.php +++ b/actions/apitimelinefavorites.php @@ -129,7 +129,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction $this->showXmlTimeline($this->notices); break; case 'rss': - $this->showRssTimeline($this->notices, $title, $link, $subtitle, null, $logo, null, $logo); + $this->showRssTimeline($this->notices, $title, $link, $subtitle, null, $logo); break; case 'atom': $selfuri = common_root_url() . From 2f77d47fd4dfb8c726b3a5184b149e7f72c3514f Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 11 Dec 2009 16:28:51 -0800 Subject: [PATCH 118/172] Build stub .po template for Gravatar plugin --- plugins/Gravatar/locale/Gravatar.po | 61 +++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 plugins/Gravatar/locale/Gravatar.po diff --git a/plugins/Gravatar/locale/Gravatar.po b/plugins/Gravatar/locale/Gravatar.po new file mode 100644 index 0000000000..1df62b6661 --- /dev/null +++ b/plugins/Gravatar/locale/Gravatar.po @@ -0,0 +1,61 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-11 16:27-0800\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: GravatarPlugin.php:57 +msgid "Set Gravatar" +msgstr "" + +#: GravatarPlugin.php:60 +msgid "If you want to use your Gravatar image, click \"Add\"." +msgstr "" + +#: GravatarPlugin.php:65 +msgid "Add" +msgstr "" + +#: GravatarPlugin.php:75 +msgid "Remove Gravatar" +msgstr "" + +#: GravatarPlugin.php:78 +msgid "If you want to remove your Gravatar image, click \"Remove\"." +msgstr "" + +#: GravatarPlugin.php:83 +msgid "Remove" +msgstr "" + +#: GravatarPlugin.php:88 +msgid "To use a Gravatar first enter in an email address." +msgstr "" + +#: GravatarPlugin.php:137 +msgid "You do not have a email set in your profile." +msgstr "" + +#: GravatarPlugin.php:155 +msgid "Failed to save Gravatar to the DB." +msgstr "" + +#: GravatarPlugin.php:159 +msgid "Gravatar added." +msgstr "" + +#: GravatarPlugin.php:177 +msgid "Gravatar removed." +msgstr "" From 0c11e64c27e0ba201e02d38b3b1d4af3e0e0b82b Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sat, 12 Dec 2009 18:21:10 +0100 Subject: [PATCH 119/172] Localisation updates for !StatusNet from !translatewiki.net !sntrans --- locale/ar/LC_MESSAGES/statusnet.po | 529 ++++++++++---------- locale/bg/LC_MESSAGES/statusnet.po | 534 ++++++++++---------- locale/ca/LC_MESSAGES/statusnet.po | 526 ++++++++++---------- locale/cs/LC_MESSAGES/statusnet.po | 536 ++++++++++---------- locale/de/LC_MESSAGES/statusnet.po | 534 ++++++++++---------- locale/el/LC_MESSAGES/statusnet.po | 536 ++++++++++---------- locale/en_GB/LC_MESSAGES/statusnet.po | 532 ++++++++++---------- locale/es/LC_MESSAGES/statusnet.po | 532 ++++++++++---------- locale/fi/LC_MESSAGES/statusnet.po | 532 ++++++++++---------- locale/fr/LC_MESSAGES/statusnet.po | 577 ++++++++++----------- locale/ga/LC_MESSAGES/statusnet.po | 549 ++++++++++---------- locale/he/LC_MESSAGES/statusnet.po | 536 ++++++++++---------- locale/hsb/LC_MESSAGES/statusnet.po | 534 ++++++++++---------- locale/is/LC_MESSAGES/statusnet.po | 532 ++++++++++---------- locale/it/LC_MESSAGES/statusnet.po | 534 ++++++++++---------- locale/ja/LC_MESSAGES/statusnet.po | 671 ++++++++++++------------- locale/ko/LC_MESSAGES/statusnet.po | 534 ++++++++++---------- locale/mk/LC_MESSAGES/statusnet.po | 540 ++++++++++---------- locale/nb/LC_MESSAGES/statusnet.po | 534 ++++++++++---------- locale/nl/LC_MESSAGES/statusnet.po | 568 ++++++++++----------- locale/nn/LC_MESSAGES/statusnet.po | 532 ++++++++++---------- locale/pl/LC_MESSAGES/statusnet.po | 566 ++++++++++----------- locale/pt/LC_MESSAGES/statusnet.po | 624 +++++++++++------------ locale/pt_BR/LC_MESSAGES/statusnet.po | 539 ++++++++++---------- locale/ru/LC_MESSAGES/statusnet.po | 563 ++++++++++----------- locale/statusnet.po | 520 +++++++++---------- locale/sv/LC_MESSAGES/statusnet.po | 548 ++++++++++---------- locale/te/LC_MESSAGES/statusnet.po | 691 +++++++++++++------------- locale/tr/LC_MESSAGES/statusnet.po | 538 ++++++++++---------- locale/uk/LC_MESSAGES/statusnet.po | 558 ++++++++++----------- locale/vi/LC_MESSAGES/statusnet.po | 546 ++++++++++---------- locale/zh_CN/LC_MESSAGES/statusnet.po | 540 ++++++++++---------- locale/zh_TW/LC_MESSAGES/statusnet.po | 536 ++++++++++---------- 33 files changed, 9091 insertions(+), 9110 deletions(-) diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index c7bb7a5e3e..fa5efc4551 100644 --- a/locale/ar/LC_MESSAGES/statusnet.po +++ b/locale/ar/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-07 21:25+0000\n" -"PO-Revision-Date: 2009-12-07 21:25:58+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:09:09+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ar\n" "X-Message-Group: out-statusnet\n" @@ -27,11 +27,11 @@ msgstr "لا صفحة كهذه" #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -44,7 +44,7 @@ msgstr "لا صفحة كهذه" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." @@ -56,7 +56,7 @@ msgid "%s and friends, page %d" msgstr "" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s والأصدقاء" @@ -107,25 +107,25 @@ msgstr "" msgid "You and friends" msgstr "أنت والأصدقاء" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 #, fuzzy msgid "API method not found." msgstr "لم يوجد رمز التأكيد." #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 @@ -144,9 +144,23 @@ msgstr "" msgid "Could not update user." msgstr "تعذّر تحديث المستخدم." +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "ليس للمستخدم ملف شخصي." + +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "تعذّر حفظ الملف الشخصي." + #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -167,24 +181,9 @@ msgstr "" msgid "Could not update your design." msgstr "تعذّر تحديث تصميمك." -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "ليس للمستخدم ملف شخصي." - -#: actions/apiaccountupdateprofile.php:147 -#, fuzzy -msgid "Could not save profile." -msgstr "تعذّر حفظ الملف الشخصي." - #: actions/apiblockcreate.php:105 -#, fuzzy msgid "You cannot block yourself!" -msgstr "لا يمكنك حذف المستخدمين." +msgstr "لا يمكنك منع نفسك!" #: actions/apiblockcreate.php:119 msgid "Block user failed." @@ -194,23 +193,6 @@ msgstr "فشل منع المستخدم." msgid "Unblock user failed." msgstr "فشل إلغاء منع المستخدم." -#: actions/apidirectmessagenew.php:126 -msgid "No message text!" -msgstr "لا نص في الرسالة!" - -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, php-format -msgid "That's too long. Max message size is %d chars." -msgstr "" - -#: actions/apidirectmessagenew.php:146 -msgid "Recipient user not found." -msgstr "لم يُعثر على المستخدم المستلم." - -#: actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." -msgstr "" - #: actions/apidirectmessage.php:89 #, php-format msgid "Direct messages from %s" @@ -236,18 +218,35 @@ msgstr "" #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "" +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "لا نص في الرسالة!" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "" + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "لم يُعثر على المستخدم المستلم." + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -390,16 +389,6 @@ msgstr "" msgid "Could not remove user %s to group %s." msgstr "" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, php-format -msgid "%s groups" -msgstr "مجموعات %s" - -#: actions/apigrouplistall.php:94 -#, php-format -msgid "groups on %s" -msgstr "مجموعات %s" - #: actions/apigrouplist.php:95 #, php-format msgid "%s's groups" @@ -410,6 +399,16 @@ msgstr "مجموعات %s" msgid "Groups %s is a member of on %s." msgstr "" +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "مجموعات %s" + +#: actions/apigrouplistall.php:94 +#, php-format +msgid "groups on %s" +msgstr "مجموعات %s" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "" @@ -445,54 +444,54 @@ msgstr "" msgid "Unsupported format." msgstr "نسق غير مدعوم." -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, php-format msgid "%s / Favorites from %s" msgstr "" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, php-format msgid "%s updates favorited by %s / %s." msgstr "" -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "مسار %s الزمني" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "" -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "مسار %s الزمني العام" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "الإشعارات الموسومة ب%s" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "" @@ -527,45 +526,45 @@ msgstr "أفتار" msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 msgid "User without matching profile" msgstr "" -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 msgid "Avatar settings" msgstr "إعدادات الأفتار" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "الأصلي" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "عاين" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 msgid "Delete" msgstr "احذف" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "ارفع" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -576,33 +575,70 @@ msgstr "" msgid "There was a problem with your session token. Try again, please." msgstr "" -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "" -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "رُفع الأفتار." -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "فشل تحديث الأفتار." -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 msgid "Avatar deleted." msgstr "حُذف الأفتار." +#: actions/block.php:69 +msgid "You already blocked that user." +msgstr "لقد منعت مسبقا هذا المستخدم." + +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +msgid "Block user" +msgstr "امنع المستخدم" + +#: actions/block.php:130 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" + +#: actions/block.php:143 actions/deletenotice.php:145 +#: actions/deleteuser.php:147 actions/groupblock.php:178 +msgid "No" +msgstr "لا" + +#: actions/block.php:143 actions/deleteuser.php:147 +msgid "Do not block this user" +msgstr "لا تمنع هذا المستخدم" + +#: actions/block.php:144 actions/deletenotice.php:146 +#: actions/deleteuser.php:148 actions/groupblock.php:179 +msgid "Yes" +msgstr "نعم" + +#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 +msgid "Block this user" +msgstr "امنع هذا المستخدم" + +#: actions/block.php:162 +msgid "Failed to save block information." +msgstr "فشل حفظ معلومات المنع." + #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 #: actions/groupmembers.php:76 actions/grouprss.php:91 @@ -643,43 +679,6 @@ msgstr "ألغِ المنع" msgid "Unblock this user" msgstr "ألغِ منع هذا المستخدم" -#: actions/block.php:69 -msgid "You already blocked that user." -msgstr "لقد منعت مسبقا هذا المستخدم." - -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 -msgid "Block user" -msgstr "امنع المستخدم" - -#: actions/block.php:130 -msgid "" -"Are you sure you want to block this user? Afterwards, they will be " -"unsubscribed from you, unable to subscribe to you in the future, and you " -"will not be notified of any @-replies from them." -msgstr "" - -#: actions/block.php:143 actions/deletenotice.php:145 -#: actions/deleteuser.php:147 actions/groupblock.php:178 -msgid "No" -msgstr "لا" - -#: actions/block.php:143 actions/deleteuser.php:147 -msgid "Do not block this user" -msgstr "لا تمنع هذا المستخدم" - -#: actions/block.php:144 actions/deletenotice.php:146 -#: actions/deleteuser.php:148 actions/groupblock.php:179 -msgid "Yes" -msgstr "نعم" - -#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 -msgid "Block this user" -msgstr "امنع هذا المستخدم" - -#: actions/block.php:162 -msgid "Failed to save block information." -msgstr "فشل حفظ معلومات المنع." - #: actions/bookmarklet.php:50 msgid "Post to " msgstr "" @@ -1137,6 +1136,14 @@ msgstr "" msgid "New incoming email address added." msgstr "" +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "هذا الإشعار مفضلة مسبقًا!" + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "ألغِ تفضيل المفضلة" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 msgid "Popular notices" @@ -1179,14 +1186,6 @@ msgstr "إشعارات %s المُفضلة" msgid "Updates favored by %1$s on %2$s!" msgstr "" -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "هذا الإشعار مفضلة مسبقًا!" - -#: actions/favor.php:92 lib/disfavorform.php:140 -msgid "Disfavor favorite" -msgstr "ألغِ تفضيل المفضلة" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1411,6 +1410,30 @@ msgstr "اجعل هذا المستخدم إداريًا" msgid "Updates from members of %1$s on %2$s!" msgstr "" +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "مجموعات" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "المجموعات، صفحة %d" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +msgid "Create a new group" +msgstr "أنشئ مجموعة جديدة" + #: actions/groupsearch.php:52 #, php-format msgid "" @@ -1441,30 +1464,6 @@ msgid "" "action.newgroup%%) yourself!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 -#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 -msgid "Groups" -msgstr "مجموعات" - -#: actions/groups.php:64 -#, php-format -msgid "Groups, page %d" -msgstr "المجموعات، صفحة %d" - -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%site.name%%%% groups let you find and talk with people of similar " -"interests. After you join a group you can send messages to all other members " -"using the syntax \"!groupname\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" -msgstr "" - -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -msgid "Create a new group" -msgstr "أنشئ مجموعة جديدة" - #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "" @@ -1642,7 +1641,7 @@ msgstr "رسالة شخصية" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "أرسل" @@ -1722,61 +1721,61 @@ msgstr "" msgid "%s left group %s" msgstr "" -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "والج بالفعل." -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 msgid "Invalid or expired token." msgstr "" -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "اسم المستخدم أو كلمة السر غير صحيحان." -#: actions/login.php:152 +#: actions/login.php:153 msgid "Error setting user. You are probably not authorized." msgstr "خطأ أثناء ضبط المستخدم. لست مُصرحًا على الأرجح." -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "لُج" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "لُج إلى الموقع" -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "الاسم المستعار" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "كلمة السر" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "تذكّرني" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "" -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "أنسيت كلمة السر؟" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "" -#: actions/login.php:289 +#: actions/login.php:290 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1845,7 +1844,7 @@ msgstr "أُرسلت الرسالة" msgid "Direct message to %s sent" msgstr "" -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" msgstr "خطأ أجاكس" @@ -1853,7 +1852,7 @@ msgstr "خطأ أجاكس" msgid "New notice" msgstr "إشعار جديد" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 msgid "Notice posted" msgstr "أُرسل الإشعار" @@ -1927,8 +1926,8 @@ msgstr "نوع المحتوى " msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "ليس نسق بيانات مدعوم." @@ -3410,6 +3409,26 @@ msgstr "جابر" msgid "SMS" msgstr "رسائل قصيرة" +#: actions/tag.php:68 +#, php-format +msgid "Notices tagged with %s, page %d" +msgstr "" + +#: actions/tag.php:86 +#, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "" + +#: actions/tag.php:92 +#, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "" + +#: actions/tag.php:98 +#, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "" + #: actions/tagother.php:33 msgid "Not logged in" msgstr "لست والجًا" @@ -3454,26 +3473,6 @@ msgstr "تعذّر حفظ الوسوم." msgid "Use this form to add tags to your subscribers or subscriptions." msgstr "" -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "" - -#: actions/tag.php:86 -#, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "" - -#: actions/tag.php:92 -#, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "" - -#: actions/tag.php:98 -#, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "" - #: actions/tagrss.php:35 msgid "No such tag." msgstr "لا وسم كهذا." @@ -3763,38 +3762,43 @@ msgstr "" msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:179 +#: classes/Notice.php:188 msgid "Problem saving notice. Too long." msgstr "مشكلة في حفظ الإشعار. طويل جدًا." -#: classes/Notice.php:183 +#: classes/Notice.php:192 msgid "Problem saving notice. Unknown user." msgstr "مشكلة في حفظ الإشعار. مستخدم غير معروف." -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:194 +#: classes/Notice.php:203 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "مشكلة أثناء حفظ الإشعار." -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "" +#: classes/User.php:347 +#, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "أهلا بكم في %1$s يا @%2$s!" + #: classes/User_group.php:380 msgid "Could not create group." msgstr "تعذّر إنشاء المجموعة." @@ -3803,11 +3807,6 @@ msgstr "تعذّر إنشاء المجموعة." msgid "Could not set group membership." msgstr "تعذّر ضبط عضوية المجموعة." -#: classes/User.php:347 -#, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "أهلا بكم في %1$s يا @%2$s!" - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "غيّر إعدادات ملفك الشخصي" @@ -4112,7 +4111,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 msgid "User has no last notice" msgstr "ليس للمستخدم إشعار أخير" @@ -4159,72 +4158,72 @@ msgstr "" msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:439 +#: lib/command.php:440 #, php-format msgid "Reply to %s sent" msgstr "رُد على رسالة %s" -#: lib/command.php:441 +#: lib/command.php:442 msgid "Error saving notice." msgstr "خطأ أثناء حفظ الإشعار." -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:502 +#: lib/command.php:503 #, php-format msgid "Subscribed to %s" msgstr "مُشترك ب%s" -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:530 +#: lib/command.php:531 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:551 +#: lib/command.php:552 msgid "Notification off." msgstr "" -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:574 +#: lib/command.php:575 msgid "Notification on." msgstr "" -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" msgstr "" -#: lib/command.php:602 +#: lib/command.php:604 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "تعذّر إنشاء الكنى." -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:623 +#: lib/command.php:625 msgid "You are not subscribed to anyone." msgstr "لست مُشتركًا بأي أحد." -#: lib/command.php:625 +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "لست مشتركًا بأحد." @@ -4234,11 +4233,11 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:645 +#: lib/command.php:647 msgid "No one is subscribed to you." msgstr "لا أحد مشترك بك." -#: lib/command.php:647 +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "لا أحد مشترك بك." @@ -4248,11 +4247,11 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:667 +#: lib/command.php:669 msgid "You are not a member of any groups." msgstr "لست عضوًا في أي مجموعة." -#: lib/command.php:669 +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "لست عضوًا في أي مجموعة." @@ -4262,7 +4261,7 @@ msgstr[3] "أنت عضو في هذه المجموعات:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:683 +#: lib/command.php:685 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4358,10 +4357,6 @@ msgstr "فضّل هذا الإشعار" msgid "Favor" msgstr "فضّل" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "تصدير البيانات" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "آرإس​إس 1.0" @@ -4378,6 +4373,10 @@ msgstr "أتوم" msgid "FOAF" msgstr "FOAF" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "تصدير البيانات" + #: lib/galleryaction.php:121 msgid "Filter tags" msgstr "رشّح الوسوم" @@ -4536,20 +4535,6 @@ msgstr "" msgid "Sign up for a new account" msgstr "" -#: lib/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "" - -#: 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 "" - -#: lib/mailbox.php:227 lib/noticelist.php:452 -msgid "from" -msgstr "من" - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "تأكيد عنوان البريد الإلكتروني" @@ -4726,6 +4711,20 @@ msgid "" "\n" msgstr "" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "" + +#: 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 "" + +#: lib/mailbox.php:227 lib/noticelist.php:452 +msgid "from" +msgstr "من" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -4786,7 +4785,7 @@ msgstr "أرسل إشعارًا مباشرًا" msgid "To" msgstr "إلى" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 msgid "Available characters" msgstr "المحارف المتوفرة" @@ -4799,11 +4798,11 @@ msgstr "أرسل إشعارًا" msgid "What's up, %s?" msgstr "ما الأخبار يا %s؟" -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "أرفق" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "أرفق ملفًا" @@ -4872,11 +4871,11 @@ msgstr "خطأ أثناء إدراج الملف الشخصي البعيد" msgid "Duplicate notice" msgstr "ضاعف الإشعار" -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 msgid "You have been banned from subscribing." msgstr "" -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "تعذّر إدراج اشتراك جديد." @@ -5038,20 +5037,6 @@ msgstr "الأشخاص المشتركون ب%s" msgid "Groups %s is a member of" msgstr "المجموعات التي %s عضو فيها" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(لا شيء)" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "مُشترك أصلا!" @@ -5082,6 +5067,20 @@ msgstr "تعذّر حذف الاشتراك." msgid "Couldn't delete subscription." msgstr "تعذّر حذف الاشتراك." +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "(لا شيء)" + #: lib/tagcloudsection.php:56 msgid "None" msgstr "لا شيء" diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index e1d9bd7776..0904420e09 100644 --- a/locale/bg/LC_MESSAGES/statusnet.po +++ b/locale/bg/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-07 21:25+0000\n" -"PO-Revision-Date: 2009-12-07 21:26:01+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:09:15+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: bg\n" "X-Message-Group: out-statusnet\n" @@ -26,11 +26,11 @@ msgstr "Няма такака страница." #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -43,7 +43,7 @@ msgstr "Няма такака страница." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." @@ -55,7 +55,7 @@ msgid "%s and friends, page %d" msgstr "%s и приятели, страница %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s и приятели" @@ -106,24 +106,24 @@ msgstr "" msgid "You and friends" msgstr "Вие и приятелите" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Бележки от %1$s и приятели в %2$s." #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 msgid "API method not found." msgstr "Не е открит методът в API." #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 @@ -142,9 +142,22 @@ msgstr "" msgid "Could not update user." msgstr "Грешка при обновяване на потребителя." +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "Потребителят няма профил." + +#: actions/apiaccountupdateprofile.php:147 +msgid "Could not save profile." +msgstr "Грешка при запазване на профила." + #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -167,19 +180,6 @@ msgstr "Грешка при записване настройките за Twitt msgid "Could not update your design." msgstr "Грешка при обновяване на потребителя." -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "Потребителят няма профил." - -#: actions/apiaccountupdateprofile.php:147 -msgid "Could not save profile." -msgstr "Грешка при запазване на профила." - #: actions/apiblockcreate.php:105 #, fuzzy msgid "You cannot block yourself!" @@ -193,25 +193,6 @@ msgstr "" msgid "Unblock user failed." msgstr "" -#: actions/apidirectmessagenew.php:126 -msgid "No message text!" -msgstr "Липсва текст на съобщението" - -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, php-format -msgid "That's too long. Max message size is %d chars." -msgstr "Твърде дълго. Може да е най-много %d знака." - -#: actions/apidirectmessagenew.php:146 -msgid "Recipient user not found." -msgstr "Получателят не е открит" - -#: actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." -msgstr "" -"Не може да изпращате преки съобщения до хора, които не са в списъка ви с " -"приятели." - #: actions/apidirectmessage.php:89 #, php-format msgid "Direct messages from %s" @@ -237,18 +218,37 @@ msgstr "Всички преки съобщения, изпратени до %s" #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "Не е открит методът в API." +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "Липсва текст на съобщението" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "Твърде дълго. Може да е най-много %d знака." + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "Получателят не е открит" + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "" +"Не може да изпращате преки съобщения до хора, които не са в списъка ви с " +"приятели." + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -395,16 +395,6 @@ msgstr "Не членувате в тази група." msgid "Could not remove user %s to group %s." msgstr "Грешка при проследяване — потребителят не е намерен." -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, php-format -msgid "%s groups" -msgstr "Групи на %s" - -#: actions/apigrouplistall.php:94 -#, fuzzy, php-format -msgid "groups on %s" -msgstr "Търсене на групи в сайта" - #: actions/apigrouplist.php:95 #, php-format msgid "%s's groups" @@ -415,6 +405,16 @@ msgstr "Групи на %s" msgid "Groups %s is a member of on %s." msgstr "Групи, в които участва %s" +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "Групи на %s" + +#: actions/apigrouplistall.php:94 +#, fuzzy, php-format +msgid "groups on %s" +msgstr "Търсене на групи в сайта" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Този метод изисква заявка POST или DELETE." @@ -450,54 +450,54 @@ msgstr "" msgid "Unsupported format." msgstr "Неподдържан формат." -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, php-format msgid "%s / Favorites from %s" msgstr "%s / Отбелязани като любими от %s" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, php-format msgid "%s updates favorited by %s / %s." msgstr "%s бележки отбелязани като любими от %s / %s." -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "Поток на %s" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Бележки от %1$s в %2$s." -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, fuzzy, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Реплики на %2$s" -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s реплики на съобщения от %2$s / %3$s." -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Общ поток на %s" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "Бележки с етикет %s" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Бележки от %1$s в %2$s." @@ -533,45 +533,45 @@ msgstr "Аватар" msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "Можете да качите личен аватар тук." -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 msgid "User without matching profile" msgstr "Потребител без съответстващ профил" -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 msgid "Avatar settings" msgstr "Настройки за аватар" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "Оригинал" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "Преглед" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 msgid "Delete" msgstr "Изтриване" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "Качване" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "Изрязване" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -582,33 +582,72 @@ msgstr "Изрязване" msgid "There was a problem with your session token. Try again, please." msgstr "Имаше проблем със сесията ви в сайта. Моля, опитайте отново!" -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Неочаквано изпращане на форма." -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "Изберете квадратна област от изображението за аватар" -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "Аватарът е обновен." -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "Неуспешно обновяване на аватара." -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 msgid "Avatar deleted." msgstr "Аватарът е изтрит." +#: actions/block.php:69 +#, fuzzy +msgid "You already blocked that user." +msgstr "Вече сте блокирали този потребител." + +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +msgid "Block user" +msgstr "Блокиране на потребителя" + +#: actions/block.php:130 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" + +#: actions/block.php:143 actions/deletenotice.php:145 +#: actions/deleteuser.php:147 actions/groupblock.php:178 +msgid "No" +msgstr "Не" + +#: actions/block.php:143 actions/deleteuser.php:147 +#, fuzzy +msgid "Do not block this user" +msgstr "Разблокиране на този потребител" + +#: actions/block.php:144 actions/deletenotice.php:146 +#: actions/deleteuser.php:148 actions/groupblock.php:179 +msgid "Yes" +msgstr "Да" + +#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 +msgid "Block this user" +msgstr "Блокиране на потребителя" + +#: actions/block.php:162 +msgid "Failed to save block information." +msgstr "Грешка при записване данните за блокирането." + #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 #: actions/groupmembers.php:76 actions/grouprss.php:91 @@ -651,45 +690,6 @@ msgstr "Разблокиране" msgid "Unblock this user" msgstr "Разблокиране на този потребител" -#: actions/block.php:69 -#, fuzzy -msgid "You already blocked that user." -msgstr "Вече сте блокирали този потребител." - -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 -msgid "Block user" -msgstr "Блокиране на потребителя" - -#: actions/block.php:130 -msgid "" -"Are you sure you want to block this user? Afterwards, they will be " -"unsubscribed from you, unable to subscribe to you in the future, and you " -"will not be notified of any @-replies from them." -msgstr "" - -#: actions/block.php:143 actions/deletenotice.php:145 -#: actions/deleteuser.php:147 actions/groupblock.php:178 -msgid "No" -msgstr "Не" - -#: actions/block.php:143 actions/deleteuser.php:147 -#, fuzzy -msgid "Do not block this user" -msgstr "Разблокиране на този потребител" - -#: actions/block.php:144 actions/deletenotice.php:146 -#: actions/deleteuser.php:148 actions/groupblock.php:179 -msgid "Yes" -msgstr "Да" - -#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 -msgid "Block this user" -msgstr "Блокиране на потребителя" - -#: actions/block.php:162 -msgid "Failed to save block information." -msgstr "Грешка при записване данните за блокирането." - #: actions/bookmarklet.php:50 #, fuzzy msgid "Post to " @@ -1163,6 +1163,15 @@ msgstr "Входящият адрес на е-поща е премахнат." msgid "New incoming email address added." msgstr "Добавен е нов входящ адрес на е-поща." +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "Тази бележка вече е отбелязана като любима!" + +#: actions/favor.php:92 lib/disfavorform.php:140 +#, fuzzy +msgid "Disfavor favorite" +msgstr "Нелюбимо" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 msgid "Popular notices" @@ -1205,15 +1214,6 @@ msgstr "Любими бележки на %s" msgid "Updates favored by %1$s on %2$s!" msgstr "Бележки от %1$s в %2$s." -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "Тази бележка вече е отбелязана като любима!" - -#: actions/favor.php:92 lib/disfavorform.php:140 -#, fuzzy -msgid "Disfavor favorite" -msgstr "Нелюбимо" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1456,6 +1456,30 @@ msgstr "" msgid "Updates from members of %1$s on %2$s!" msgstr "Бележки от %1$s в %2$s." +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "Групи" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "Групи, страница %d" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +msgid "Create a new group" +msgstr "Създаване на нова група" + #: actions/groupsearch.php:52 #, fuzzy, php-format msgid "" @@ -1488,30 +1512,6 @@ msgid "" "action.newgroup%%) yourself!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 -#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 -msgid "Groups" -msgstr "Групи" - -#: actions/groups.php:64 -#, php-format -msgid "Groups, page %d" -msgstr "Групи, страница %d" - -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%site.name%%%% groups let you find and talk with people of similar " -"interests. After you join a group you can send messages to all other members " -"using the syntax \"!groupname\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" -msgstr "" - -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -msgid "Create a new group" -msgstr "Създаване на нова група" - #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "" @@ -1704,7 +1704,7 @@ msgstr "Лично съобщение" msgid "Optionally add a personal message to the invitation." msgstr "Може да добавите и лично съобщение към поканата." -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "Прати" @@ -1811,57 +1811,57 @@ msgstr "Грешка при проследяване — потребителя msgid "%s left group %s" msgstr "%s напусна групата %s" -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "Вече сте влезли." -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 #, fuzzy msgid "Invalid or expired token." msgstr "Невалидно съдържание на бележка" -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "Грешно име или парола." -#: actions/login.php:152 +#: actions/login.php:153 #, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "Забранено." -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Вход" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "" -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Псевдоним" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Парола" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "Запомни ме" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "Автоматично влизане занапред. Да не се ползва на общи компютри!" -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "Загубена или забравена парола" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1869,7 +1869,7 @@ msgstr "" "За по-голяма сигурност, моля въведете отново потребителското си име и парола " "при промяна на настройките." -#: actions/login.php:289 +#: actions/login.php:290 #, fuzzy, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1942,7 +1942,7 @@ msgstr "Съобщението е изпратено" msgid "Direct message to %s sent" msgstr "Прякото съобщение до %s е изпратено." -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" msgstr "Грешка в Ajax" @@ -1950,7 +1950,7 @@ msgstr "Грешка в Ajax" msgid "New notice" msgstr "Нова бележка" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 msgid "Notice posted" msgstr "Бележката е публикувана" @@ -2027,8 +2027,8 @@ msgstr "Свързване" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "Неподдържан формат на данните" @@ -3563,6 +3563,26 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, php-format +msgid "Notices tagged with %s, page %d" +msgstr "Бележки с етикет %s, страница %d" + +#: actions/tag.php:86 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "Емисия с бележки на %s" + +#: actions/tag.php:92 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "Емисия с бележки на %s" + +#: actions/tag.php:98 +#, fuzzy, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "Емисия с бележки на %s" + #: actions/tagother.php:33 #, fuzzy msgid "Not logged in" @@ -3610,26 +3630,6 @@ msgstr "Грешка при запазване на етикетите." msgid "Use this form to add tags to your subscribers or subscriptions." msgstr "" -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Бележки с етикет %s, страница %d" - -#: actions/tag.php:86 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "Емисия с бележки на %s" - -#: actions/tag.php:92 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "Емисия с бележки на %s" - -#: actions/tag.php:98 -#, fuzzy, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "Емисия с бележки на %s" - #: actions/tagrss.php:35 msgid "No such tag." msgstr "Няма такъв етикет." @@ -3942,23 +3942,23 @@ msgstr "Грешка при обновяване на бележката с но msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:179 +#: classes/Notice.php:188 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Проблем при записване на бележката." -#: classes/Notice.php:183 +#: classes/Notice.php:192 msgid "Problem saving notice. Unknown user." msgstr "Грешка при записване на бележката. Непознат потребител." -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте " "отново след няколко минути." -#: classes/Notice.php:194 +#: classes/Notice.php:203 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -3967,19 +3967,24 @@ msgstr "" "Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте " "отново след няколко минути." -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "Забранено ви е да публикувате бележки в този сайт." -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "Проблем при записване на бележката." -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "Грешка в базата от данни — отговор при вмъкването: %s" +#: classes/User.php:347 +#, fuzzy, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "Съобщение до %1$s в %2$s" + #: classes/User_group.php:380 msgid "Could not create group." msgstr "Грешка при създаване на групата." @@ -3989,11 +3994,6 @@ msgstr "Грешка при създаване на групата." msgid "Could not set group membership." msgstr "Грешка при създаване на нов абонамент." -#: classes/User.php:347 -#, fuzzy, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "Съобщение до %1$s в %2$s" - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Промяна настройките на профила" @@ -4311,7 +4311,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 msgid "User has no last notice" msgstr "Потребителят няма последна бележка" @@ -4360,101 +4360,101 @@ msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" "Съобщението е твърде дълго. Най-много може да е 140 знака, а сте въвели %d." -#: lib/command.php:439 +#: lib/command.php:440 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Отговаряне на тази бележка" -#: lib/command.php:441 +#: lib/command.php:442 #, fuzzy msgid "Error saving notice." msgstr "Проблем при записване на бележката." -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "Уточнете името на потребителя, за когото се абонирате." -#: lib/command.php:502 +#: lib/command.php:503 #, php-format msgid "Subscribed to %s" msgstr "Абонирани сте за %s." -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "Уточнете името на потребителя, от когото се отписвате." -#: lib/command.php:530 +#: lib/command.php:531 #, php-format msgid "Unsubscribed from %s" msgstr "Отписани сте от %s." -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "Командата все още не се поддържа." -#: lib/command.php:551 +#: lib/command.php:552 msgid "Notification off." msgstr "Уведомлението е изключено." -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "Грешка при изключване на уведомлението." -#: lib/command.php:574 +#: lib/command.php:575 msgid "Notification on." msgstr "Уведомлението е включено." -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "Грешка при включване на уведомлението." -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" msgstr "" -#: lib/command.php:602 +#: lib/command.php:604 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Грешка при отбелязване като любима." -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:623 +#: lib/command.php:625 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Не сте абонирани за този профил" -#: lib/command.php:625 +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Вече сте абонирани за следните потребители:" msgstr[1] "Вече сте абонирани за следните потребители:" -#: lib/command.php:645 +#: lib/command.php:647 #, fuzzy msgid "No one is subscribed to you." msgstr "Грешка при абониране на друг потребител за вас." -#: lib/command.php:647 +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Грешка при абониране на друг потребител за вас." msgstr[1] "Грешка при абониране на друг потребител за вас." -#: lib/command.php:667 +#: lib/command.php:669 msgid "You are not a member of any groups." msgstr "Не членувате в нито една група." -#: lib/command.php:669 +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Не членувате в тази група." msgstr[1] "Не членувате в тази група." -#: lib/command.php:683 +#: lib/command.php:685 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4553,10 +4553,6 @@ msgstr "Отбелязване като любимо" msgid "Favor" msgstr "Любимо" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "Изнасяне на данните" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "RSS 1.0" @@ -4573,6 +4569,10 @@ msgstr "Atom" msgid "FOAF" msgstr "FOAF" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "Изнасяне на данните" + #: lib/galleryaction.php:121 msgid "Filter tags" msgstr "Филтриране на етикетите" @@ -4736,20 +4736,6 @@ msgstr "Вход с име и парола" msgid "Sign up for a new account" msgstr "Създаване на нова сметка" -#: lib/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "Само потребителят може да отваря собствената си кутия." - -#: 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 "" - -#: lib/mailbox.php:227 lib/noticelist.php:452 -msgid "from" -msgstr "от" - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "Потвърждаване адреса на е-поща" @@ -4934,6 +4920,20 @@ msgid "" "\n" msgstr "" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "Само потребителят може да отваря собствената си кутия." + +#: 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 "" + +#: lib/mailbox.php:227 lib/noticelist.php:452 +msgid "from" +msgstr "от" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -4994,7 +4994,7 @@ msgstr "Изпращане на пряко съобщеие" msgid "To" msgstr "До" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 msgid "Available characters" msgstr "Налични знаци" @@ -5007,11 +5007,11 @@ msgstr "Изпращане на бележка" msgid "What's up, %s?" msgstr "Какво става, %s?" -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "" @@ -5082,12 +5082,12 @@ msgstr "Грешка при вмъкване на отдалечен профи msgid "Duplicate notice" msgstr "Изтриване на бележката" -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 #, fuzzy msgid "You have been banned from subscribing." msgstr "Потребителят е забранил да се абонирате за него." -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Грешка при добавяне на нов абонамент." @@ -5253,20 +5253,6 @@ msgstr "Абонирани за %s" msgid "Groups %s is a member of" msgstr "Групи, в които участва %s" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(няма)" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "" @@ -5297,6 +5283,20 @@ msgstr "Грешка при изтриване на абонамента." msgid "Couldn't delete subscription." msgstr "Грешка при изтриване на абонамента." +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "(няма)" + #: lib/tagcloudsection.php:56 msgid "None" msgstr "Без" diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index 290866b5c8..6cb82084c3 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-07 21:25+0000\n" -"PO-Revision-Date: 2009-12-07 21:26:04+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:09:18+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: out-statusnet\n" @@ -26,11 +26,11 @@ msgstr "No existeix la pàgina." #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -43,7 +43,7 @@ msgstr "No existeix la pàgina." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." @@ -55,7 +55,7 @@ msgid "%s and friends, page %d" msgstr "%s i amics, pàgina %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s i amics" @@ -108,25 +108,25 @@ msgstr "" msgid "You and friends" msgstr "Un mateix i amics" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Actualitzacions de %1$s i amics a %2$s!" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 #, fuzzy msgid "API method not found." msgstr "No s'ha trobat el mètode API!" #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 @@ -146,9 +146,23 @@ msgstr "" msgid "Could not update user." msgstr "No s'ha pogut actualitzar l'usuari." +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "L'usuari no té perfil." + +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "No s'ha pogut guardar el perfil." + #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -171,20 +185,6 @@ msgstr "No s'ha pogut guardar la teva configuració de Twitter!" msgid "Could not update your design." msgstr "No s'ha pogut actualitzar l'usuari." -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "L'usuari no té perfil." - -#: actions/apiaccountupdateprofile.php:147 -#, fuzzy -msgid "Could not save profile." -msgstr "No s'ha pogut guardar el perfil." - #: actions/apiblockcreate.php:105 #, fuzzy msgid "You cannot block yourself!" @@ -198,23 +198,6 @@ msgstr "Ha fallat el bloqueig d'usuari." msgid "Unblock user failed." msgstr "Ha fallat el desbloqueig d'usuari." -#: actions/apidirectmessagenew.php:126 -msgid "No message text!" -msgstr "No hi ha text al missatge!" - -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, php-format -msgid "That's too long. Max message size is %d chars." -msgstr "És massa llarg. La mida màxima del missatge és %d caràcters." - -#: actions/apidirectmessagenew.php:146 -msgid "Recipient user not found." -msgstr "No has escrit cap usuari receptor." - -#: actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." -msgstr "No pots enviar missatges directes a usuaris que no siguin amics teus." - #: actions/apidirectmessage.php:89 #, php-format msgid "Direct messages from %s" @@ -240,18 +223,35 @@ msgstr "Tots els missatges directes enviats a %s" #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "No s'ha trobat el mètode API!" +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "No hi ha text al missatge!" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "És massa llarg. La mida màxima del missatge és %d caràcters." + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "No has escrit cap usuari receptor." + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "No pots enviar missatges directes a usuaris que no siguin amics teus." + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -401,16 +401,6 @@ msgstr "No sou un membre del grup." msgid "Could not remove user %s to group %s." msgstr "No s'ha pogut suprimir l'usuari %s del grup %s." -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, php-format -msgid "%s groups" -msgstr "%s grups" - -#: actions/apigrouplistall.php:94 -#, fuzzy, php-format -msgid "groups on %s" -msgstr "Accions del grup" - #: actions/apigrouplist.php:95 #, php-format msgid "%s's groups" @@ -421,6 +411,16 @@ msgstr "Grups de %s" msgid "Groups %s is a member of on %s." msgstr "%s grups són membres de" +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "%s grups" + +#: actions/apigrouplistall.php:94 +#, fuzzy, php-format +msgid "groups on %s" +msgstr "Accions del grup" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Aquest mètode requereix POST o DELETE." @@ -456,54 +456,54 @@ msgstr "" msgid "Unsupported format." msgstr "El format no està implementat." -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, php-format msgid "%s / Favorites from %s" msgstr "%s / Favorits de %s" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, php-format msgid "%s updates favorited by %s / %s." msgstr "%s actualitzacions favorites per %s / %s." -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "%s línia temporal" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Actualitzacions de %1$s a %2$s!" -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, fuzzy, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Notificacions contestant a %2$s" -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s notificacions que responen a notificacions de %2$s / %3$s." -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s línia temporal pública" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s notificacions de tots!" -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "Aviso etiquetats amb %s" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Actualitzacions de %1$s a %2$s!" @@ -539,45 +539,45 @@ msgstr "Avatar" msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "Pots pujar el teu avatar personal." -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 msgid "User without matching profile" msgstr "Usuari sense perfil coincident" -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 msgid "Avatar settings" msgstr "Configuració de l'avatar" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "Original" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "Previsualitzar" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 msgid "Delete" msgstr "Eliminar" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "Pujar" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "Crop" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -590,35 +590,72 @@ msgstr "" "Sembla que hi ha hagut un problema amb la teva sessió. Prova-ho de nou, si " "us plau." -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Enviament de formulari inesperat." -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" "Selecciona un quadrat de l'àrea de la imatge que vols que sigui el teu " "avatar." -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "S'ha perdut el nostre fitxer de dades." -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "Avatar actualitzat." -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "Error en actualitzar avatar." -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 msgid "Avatar deleted." msgstr "S'ha suprimit l'avatar." +#: actions/block.php:69 +msgid "You already blocked that user." +msgstr "Ja heu blocat l'usuari." + +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +msgid "Block user" +msgstr "Usuari bloquejat." + +#: actions/block.php:130 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" + +#: actions/block.php:143 actions/deletenotice.php:145 +#: actions/deleteuser.php:147 actions/groupblock.php:178 +msgid "No" +msgstr "No" + +#: actions/block.php:143 actions/deleteuser.php:147 +msgid "Do not block this user" +msgstr "No bloquis l'usuari" + +#: actions/block.php:144 actions/deletenotice.php:146 +#: actions/deleteuser.php:148 actions/groupblock.php:179 +msgid "Yes" +msgstr "Sí" + +#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 +msgid "Block this user" +msgstr "Bloquejar aquest usuari" + +#: actions/block.php:162 +msgid "Failed to save block information." +msgstr "Error al guardar la informació del block." + #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 #: actions/groupmembers.php:76 actions/grouprss.php:91 @@ -661,43 +698,6 @@ msgstr "Desbloquejar" msgid "Unblock this user" msgstr "Desbloquejar aquest usuari" -#: actions/block.php:69 -msgid "You already blocked that user." -msgstr "Ja heu blocat l'usuari." - -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 -msgid "Block user" -msgstr "Usuari bloquejat." - -#: actions/block.php:130 -msgid "" -"Are you sure you want to block this user? Afterwards, they will be " -"unsubscribed from you, unable to subscribe to you in the future, and you " -"will not be notified of any @-replies from them." -msgstr "" - -#: actions/block.php:143 actions/deletenotice.php:145 -#: actions/deleteuser.php:147 actions/groupblock.php:178 -msgid "No" -msgstr "No" - -#: actions/block.php:143 actions/deleteuser.php:147 -msgid "Do not block this user" -msgstr "No bloquis l'usuari" - -#: actions/block.php:144 actions/deletenotice.php:146 -#: actions/deleteuser.php:148 actions/groupblock.php:179 -msgid "Yes" -msgstr "Sí" - -#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 -msgid "Block this user" -msgstr "Bloquejar aquest usuari" - -#: actions/block.php:162 -msgid "Failed to save block information." -msgstr "Error al guardar la informació del block." - #: actions/bookmarklet.php:50 msgid "Post to " msgstr "Envia a " @@ -1173,6 +1173,14 @@ msgstr "Eliminat el correu electrònic entrant." msgid "New incoming email address added." msgstr "Nou correu electrònic entrant afegit." +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "Aquesta nota ja és favorita." + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "Desfavoritar favorit" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 msgid "Popular notices" @@ -1215,14 +1223,6 @@ msgstr "%s's notes favorites" msgid "Updates favored by %1$s on %2$s!" msgstr "Actualitzacions de %1$s a %2$s!" -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "Aquesta nota ja és favorita." - -#: actions/favor.php:92 lib/disfavorform.php:140 -msgid "Disfavor favorite" -msgstr "Desfavoritar favorit" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1466,6 +1466,30 @@ msgstr "Fes l'usuari administrador" msgid "Updates from members of %1$s on %2$s!" msgstr "Actualitzacions de %1$s a %2$s!" +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "Grups" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "Grups, pàgina %d" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +msgid "Create a new group" +msgstr "Crear nou grup" + #: actions/groupsearch.php:52 #, fuzzy, php-format msgid "" @@ -1498,30 +1522,6 @@ msgid "" "action.newgroup%%) yourself!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 -#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 -msgid "Groups" -msgstr "Grups" - -#: actions/groups.php:64 -#, php-format -msgid "Groups, page %d" -msgstr "Grups, pàgina %d" - -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%site.name%%%% groups let you find and talk with people of similar " -"interests. After you join a group you can send messages to all other members " -"using the syntax \"!groupname\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" -msgstr "" - -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -msgid "Create a new group" -msgstr "Crear nou grup" - #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "Només un administrador pot desblocar els membres del grup." @@ -1722,7 +1722,7 @@ msgstr "Missatge personal" msgid "Optionally add a personal message to the invitation." msgstr "Opcionalment pots afegir un missatge a la invitació." -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "Envia" @@ -1828,59 +1828,59 @@ msgstr "No s'ha pogut eliminar l'usuari %s del grup %s" msgid "%s left group %s" msgstr "%s ha abandonat el grup %s" -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "Ja estàs connectat." -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 #, fuzzy msgid "Invalid or expired token." msgstr "El contingut de l'avís és invàlid" -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "Nom d'usuari o contrasenya incorrectes." -#: actions/login.php:152 +#: actions/login.php:153 #, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "No autoritzat." -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Inici de sessió" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "Accedir al lloc" -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Sobrenom" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Contrasenya" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "Recorda'm" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Iniciar sessió automàticament en el futur; no utilitzar en ordinadors " "compartits!" -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "Contrasenya oblidada o perduda?" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1888,7 +1888,7 @@ msgstr "" "Per raons de seguretat, si us plau torna a escriure el teu nom d'usuari i " "contrasenya abans de canviar la teva configuració." -#: actions/login.php:289 +#: actions/login.php:290 #, fuzzy, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1960,7 +1960,7 @@ msgstr "S'ha enviat el missatge" msgid "Direct message to %s sent" msgstr "Missatge directe per a %s enviat" -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" msgstr "Ajax Error" @@ -1968,7 +1968,7 @@ msgstr "Ajax Error" msgid "New notice" msgstr "Nou avís" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 msgid "Notice posted" msgstr "Notificació publicada" @@ -2046,8 +2046,8 @@ msgstr "tipus de contingut " msgid "Only " msgstr "Només " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "Format de data no suportat." @@ -3601,6 +3601,26 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, php-format +msgid "Notices tagged with %s, page %d" +msgstr "Notificació etiquetada amb %s, pàgina %d" + +#: actions/tag.php:86 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "Feed d'avisos de %s" + +#: actions/tag.php:92 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "Feed d'avisos de %s" + +#: actions/tag.php:98 +#, fuzzy, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "Feed d'avisos de %s" + #: actions/tagother.php:33 msgid "Not logged in" msgstr "No connectat." @@ -3651,26 +3671,6 @@ msgstr "" "Utilitza aquest formulari per afegir etiquetes als teus subscriptors i " "subscripcions." -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Notificació etiquetada amb %s, pàgina %d" - -#: actions/tag.php:86 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "Feed d'avisos de %s" - -#: actions/tag.php:92 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "Feed d'avisos de %s" - -#: actions/tag.php:98 -#, fuzzy, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "Feed d'avisos de %s" - #: actions/tagrss.php:35 msgid "No such tag." msgstr "No existeix aquesta etiqueta." @@ -3982,23 +3982,23 @@ msgstr "No s'ha pogut inserir el missatge amb la nova URI." msgid "DB error inserting hashtag: %s" msgstr "Hashtag de l'error de la base de dades:%s" -#: classes/Notice.php:179 +#: classes/Notice.php:188 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Problema en guardar l'avís." -#: classes/Notice.php:183 +#: classes/Notice.php:192 msgid "Problem saving notice. Unknown user." msgstr "Problema al guardar la notificació. Usuari desconegut." -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Masses notificacions massa ràpid; pren un respir i publica de nou en uns " "minuts." -#: classes/Notice.php:194 +#: classes/Notice.php:203 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4007,19 +4007,24 @@ msgstr "" "Masses notificacions massa ràpid; pren un respir i publica de nou en uns " "minuts." -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "Ha estat bandejat de publicar notificacions en aquest lloc." -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "Problema en guardar l'avís." -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "Error de BD en inserir resposta: %s" +#: classes/User.php:347 +#, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "Us donem la benvinguda a %1$s, @%2$s!" + #: classes/User_group.php:380 msgid "Could not create group." msgstr "No s'ha pogut crear el grup." @@ -4028,11 +4033,6 @@ msgstr "No s'ha pogut crear el grup." msgid "Could not set group membership." msgstr "No s'ha pogut establir la pertinença d'aquest grup." -#: classes/User.php:347 -#, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "Us donem la benvinguda a %1$s, @%2$s!" - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Canvieu els paràmetres del vostre perfil" @@ -4341,7 +4341,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 msgid "User has no last notice" msgstr "L'usuari no té última nota" @@ -4388,101 +4388,101 @@ msgstr "Error al enviar el missatge directe." msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d" -#: lib/command.php:439 +#: lib/command.php:440 #, php-format msgid "Reply to %s sent" msgstr "S'ha enviat la resposta a %s" -#: lib/command.php:441 +#: lib/command.php:442 #, fuzzy msgid "Error saving notice." msgstr "Problema en guardar l'avís." -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "Especifica el nom de l'usuari a que vols subscriure't" -#: lib/command.php:502 +#: lib/command.php:503 #, php-format msgid "Subscribed to %s" msgstr "Subscrit a %s" -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "Especifica el nom de l'usuari del que vols deixar d'estar subscrit" -#: lib/command.php:530 +#: lib/command.php:531 #, php-format msgid "Unsubscribed from %s" msgstr "Has deixat d'estar subscrit a %s" -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "Comanda encara no implementada." -#: lib/command.php:551 +#: lib/command.php:552 msgid "Notification off." msgstr "Notificacions off." -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "No es poden posar en off les notificacions." -#: lib/command.php:574 +#: lib/command.php:575 msgid "Notification on." msgstr "Notificacions on." -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "No es poden posar en on les notificacions." -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" msgstr "" -#: lib/command.php:602 +#: lib/command.php:604 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "No s'han pogut crear els àlies." -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:623 +#: lib/command.php:625 #, fuzzy msgid "You are not subscribed to anyone." msgstr "No estàs subscrit a aquest perfil." -#: lib/command.php:625 +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Ja estàs subscrit a aquests usuaris:" msgstr[1] "Ja estàs subscrit a aquests usuaris:" -#: lib/command.php:645 +#: lib/command.php:647 #, fuzzy msgid "No one is subscribed to you." msgstr "No pots subscriure a un altre a tu mateix." -#: lib/command.php:647 +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "No pots subscriure a un altre a tu mateix." msgstr[1] "No pots subscriure a un altre a tu mateix." -#: lib/command.php:667 +#: lib/command.php:669 msgid "You are not a member of any groups." msgstr "No sou membre de cap grup." -#: lib/command.php:669 +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "No sou un membre del grup." msgstr[1] "No sou un membre del grup." -#: lib/command.php:683 +#: lib/command.php:685 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4580,10 +4580,6 @@ msgstr "Fer favorita aquesta notificació" msgid "Favor" msgstr "Favorit" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "Exportar data" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "" @@ -4600,6 +4596,10 @@ msgstr "" msgid "FOAF" msgstr "" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "Exportar data" + #: lib/galleryaction.php:121 msgid "Filter tags" msgstr "Filtre d'etiquetes" @@ -4761,20 +4761,6 @@ msgstr "Accedir amb el nom d'usuari i contrasenya" msgid "Sign up for a new account" msgstr "Crear nou compte" -#: lib/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "Només l'usuari pot llegir les seves safates de correu." - -#: 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 "" - -#: lib/mailbox.php:227 lib/noticelist.php:452 -msgid "from" -msgstr "de" - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "Confirmació de l'adreça de correu electrònic" @@ -4967,6 +4953,20 @@ msgid "" "\n" msgstr "" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "Només l'usuari pot llegir les seves safates de correu." + +#: 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 "" + +#: lib/mailbox.php:227 lib/noticelist.php:452 +msgid "from" +msgstr "de" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5027,7 +5027,7 @@ msgstr "Enviar notificació directa" msgid "To" msgstr "A" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 msgid "Available characters" msgstr "Caràcters disponibles" @@ -5040,11 +5040,11 @@ msgstr "Enviar notificació" msgid "What's up, %s?" msgstr "Què tal, %s?" -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "Adjunta" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "Adjunta un fitxer" @@ -5116,12 +5116,12 @@ msgstr "Error en inserir perfil remot" msgid "Duplicate notice" msgstr "Eliminar nota." -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 #, fuzzy msgid "You have been banned from subscribing." msgstr "Aquest usuari t'ha bloquejat com a subscriptor." -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "No s'ha pogut inserir una nova subscripció." @@ -5285,20 +5285,6 @@ msgstr "Persones subscrites a %s" msgid "Groups %s is a member of" msgstr "%s grups són membres de" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(cap)" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "" @@ -5329,6 +5315,20 @@ msgstr "No s'ha pogut eliminar la subscripció." msgid "Couldn't delete subscription." msgstr "No s'ha pogut eliminar la subscripció." +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "(cap)" + #: lib/tagcloudsection.php:56 msgid "None" msgstr "Cap" diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index 6d74b17611..36bec9bfe3 100644 --- a/locale/cs/LC_MESSAGES/statusnet.po +++ b/locale/cs/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-07 21:25+0000\n" -"PO-Revision-Date: 2009-12-07 21:26:08+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:09:20+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: cs\n" "X-Message-Group: out-statusnet\n" @@ -27,11 +27,11 @@ msgstr "Žádné takové oznámení." #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -44,7 +44,7 @@ msgstr "Žádné takové oznámení." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." @@ -56,7 +56,7 @@ msgid "%s and friends, page %d" msgstr "%s a přátelé" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s a přátelé" @@ -108,25 +108,25 @@ msgstr "" msgid "You and friends" msgstr "%s a přátelé" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 #, fuzzy msgid "API method not found." msgstr "Potvrzující kód nebyl nalezen" #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 @@ -146,9 +146,23 @@ msgstr "" msgid "Could not update user." msgstr "Nelze aktualizovat uživatele" +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "Uživatel nemá profil." + +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Nelze uložit profil" + #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -170,20 +184,6 @@ msgstr "" msgid "Could not update your design." msgstr "Nelze aktualizovat uživatele" -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "Uživatel nemá profil." - -#: actions/apiaccountupdateprofile.php:147 -#, fuzzy -msgid "Could not save profile." -msgstr "Nelze uložit profil" - #: actions/apiblockcreate.php:105 #, fuzzy msgid "You cannot block yourself!" @@ -197,23 +197,6 @@ msgstr "" msgid "Unblock user failed." msgstr "" -#: actions/apidirectmessagenew.php:126 -msgid "No message text!" -msgstr "" - -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, fuzzy, php-format -msgid "That's too long. Max message size is %d chars." -msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků" - -#: actions/apidirectmessagenew.php:146 -msgid "Recipient user not found." -msgstr "" - -#: actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." -msgstr "" - #: actions/apidirectmessage.php:89 #, php-format msgid "Direct messages from %s" @@ -239,18 +222,35 @@ msgstr "" #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "" +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, fuzzy, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků" + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "" + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -399,16 +399,6 @@ msgstr "Neodeslal jste nám profil" msgid "Could not remove user %s to group %s." msgstr "Nelze vytvořit OpenID z: %s" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, php-format -msgid "%s groups" -msgstr "" - -#: actions/apigrouplistall.php:94 -#, php-format -msgid "groups on %s" -msgstr "" - #: actions/apigrouplist.php:95 #, fuzzy, php-format msgid "%s's groups" @@ -419,6 +409,16 @@ msgstr "Profil" msgid "Groups %s is a member of on %s." msgstr "Neodeslal jste nám profil" +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "" + +#: actions/apigrouplistall.php:94 +#, php-format +msgid "groups on %s" +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "" @@ -456,54 +456,54 @@ msgstr "" msgid "Unsupported format." msgstr "Nepodporovaný formát obrázku." -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, php-format msgid "%s / Favorites from %s" msgstr "" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, php-format msgid "%s updates favorited by %s / %s." msgstr "" -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, fuzzy, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1 statusů na %2" -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Mikroblog od %s" @@ -540,46 +540,46 @@ msgstr "Obrázek" msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 msgid "User without matching profile" msgstr "" -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 #, fuzzy msgid "Avatar settings" msgstr "Nastavení" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 msgid "Delete" msgstr "Odstranit" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "Upload" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -590,33 +590,73 @@ msgstr "" msgid "There was a problem with your session token. Try again, please." msgstr "" -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Nečekaná forma submission." -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "Obrázek nahrán" -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "Nahrávání obrázku selhalo." -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 msgid "Avatar deleted." msgstr "Avatar smazán." +#: actions/block.php:69 +#, fuzzy +msgid "You already blocked that user." +msgstr "Již jste přihlášen" + +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#, fuzzy +msgid "Block user" +msgstr "Žádný takový uživatel." + +#: actions/block.php:130 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" + +#: actions/block.php:143 actions/deletenotice.php:145 +#: actions/deleteuser.php:147 actions/groupblock.php:178 +msgid "No" +msgstr "Ne" + +#: actions/block.php:143 actions/deleteuser.php:147 +#, fuzzy +msgid "Do not block this user" +msgstr "Žádný takový uživatel." + +#: actions/block.php:144 actions/deletenotice.php:146 +#: actions/deleteuser.php:148 actions/groupblock.php:179 +msgid "Yes" +msgstr "Ano" + +#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 +msgid "Block this user" +msgstr "Zablokovat tohoto uživatele" + +#: actions/block.php:162 +msgid "Failed to save block information." +msgstr "" + #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 #: actions/groupmembers.php:76 actions/grouprss.php:91 @@ -659,46 +699,6 @@ msgstr "" msgid "Unblock this user" msgstr "Žádný takový uživatel." -#: actions/block.php:69 -#, fuzzy -msgid "You already blocked that user." -msgstr "Již jste přihlášen" - -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 -#, fuzzy -msgid "Block user" -msgstr "Žádný takový uživatel." - -#: actions/block.php:130 -msgid "" -"Are you sure you want to block this user? Afterwards, they will be " -"unsubscribed from you, unable to subscribe to you in the future, and you " -"will not be notified of any @-replies from them." -msgstr "" - -#: actions/block.php:143 actions/deletenotice.php:145 -#: actions/deleteuser.php:147 actions/groupblock.php:178 -msgid "No" -msgstr "Ne" - -#: actions/block.php:143 actions/deleteuser.php:147 -#, fuzzy -msgid "Do not block this user" -msgstr "Žádný takový uživatel." - -#: actions/block.php:144 actions/deletenotice.php:146 -#: actions/deleteuser.php:148 actions/groupblock.php:179 -msgid "Yes" -msgstr "Ano" - -#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 -msgid "Block this user" -msgstr "Zablokovat tohoto uživatele" - -#: actions/block.php:162 -msgid "Failed to save block information." -msgstr "" - #: actions/bookmarklet.php:50 msgid "Post to " msgstr "" @@ -1168,6 +1168,14 @@ msgstr "" msgid "New incoming email address added." msgstr "" +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "" + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 #, fuzzy @@ -1211,14 +1219,6 @@ msgstr "" msgid "Updates favored by %1$s on %2$s!" msgstr "Mikroblog od %s" -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "" - -#: actions/favor.php:92 lib/disfavorform.php:140 -msgid "Disfavor favorite" -msgstr "" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1460,6 +1460,31 @@ msgstr "" msgid "Updates from members of %1$s on %2$s!" msgstr "Mikroblog od %s" +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "Skupiny" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#, fuzzy +msgid "Create a new group" +msgstr "Vytvořit nový účet" + #: actions/groupsearch.php:52 #, fuzzy, php-format msgid "" @@ -1494,31 +1519,6 @@ msgid "" "action.newgroup%%) yourself!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 -#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 -msgid "Groups" -msgstr "Skupiny" - -#: actions/groups.php:64 -#, php-format -msgid "Groups, page %d" -msgstr "" - -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%site.name%%%% groups let you find and talk with people of similar " -"interests. After you join a group you can send messages to all other members " -"using the syntax \"!groupname\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" -msgstr "" - -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -#, fuzzy -msgid "Create a new group" -msgstr "Vytvořit nový účet" - #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "" @@ -1707,7 +1707,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "Odeslat" @@ -1789,63 +1789,63 @@ msgstr "Nelze vytvořit OpenID z: %s" msgid "%s left group %s" msgstr "" -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "Již přihlášen" -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 #, fuzzy msgid "Invalid or expired token." msgstr "Neplatný obsah sdělení" -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "Neplatné jméno nebo heslo" -#: actions/login.php:152 +#: actions/login.php:153 #, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "Neautorizován." -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Přihlásit" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "" -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Přezdívka" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Heslo" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "Zapamatuj si mě" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "Příště automaticky přihlásit; ne pro počítače, které používá " -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "Ztracené nebo zapomenuté heslo?" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "Z bezpečnostních důvodů, prosím zadejte znovu své jméno a heslo." -#: actions/login.php:289 +#: actions/login.php:290 #, fuzzy, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1917,7 +1917,7 @@ msgstr "" msgid "Direct message to %s sent" msgstr "" -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" msgstr "" @@ -1925,7 +1925,7 @@ msgstr "" msgid "New notice" msgstr "Nové sdělení" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 #, fuzzy msgid "Notice posted" msgstr "Sdělení" @@ -2003,8 +2003,8 @@ msgstr "Připojit" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "" @@ -3533,6 +3533,26 @@ msgstr "Žádné Jabber ID." msgid "SMS" msgstr "" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %s, page %d" +msgstr "Mikroblog od %s" + +#: actions/tag.php:86 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "Feed sdělení pro %s" + +#: actions/tag.php:92 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "Feed sdělení pro %s" + +#: actions/tag.php:98 +#, fuzzy, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "Feed sdělení pro %s" + #: actions/tagother.php:33 #, fuzzy msgid "Not logged in" @@ -3581,26 +3601,6 @@ msgstr "Nelze uložin informace o obrázku" msgid "Use this form to add tags to your subscribers or subscriptions." msgstr "" -#: actions/tag.php:68 -#, fuzzy, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Mikroblog od %s" - -#: actions/tag.php:86 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "Feed sdělení pro %s" - -#: actions/tag.php:92 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "Feed sdělení pro %s" - -#: actions/tag.php:98 -#, fuzzy, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "Feed sdělení pro %s" - #: actions/tagrss.php:35 #, fuzzy msgid "No such tag." @@ -3913,40 +3913,45 @@ msgstr "" msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:179 +#: classes/Notice.php:188 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Problém při ukládání sdělení" -#: classes/Notice.php:183 +#: classes/Notice.php:192 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Problém při ukládání sdělení" -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:194 +#: classes/Notice.php:203 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "Problém při ukládání sdělení" -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "Chyba v DB při vkládání odpovědi: %s" +#: classes/User.php:347 +#, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "" + #: classes/User_group.php:380 #, fuzzy msgid "Could not create group." @@ -3957,11 +3962,6 @@ msgstr "Nelze uložin informace o obrázku" msgid "Could not set group membership." msgstr "Nelze vytvořit odebírat" -#: classes/User.php:347 -#, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "" - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "" @@ -4278,7 +4278,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 msgid "User has no last notice" msgstr "" @@ -4325,105 +4325,105 @@ msgstr "" msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:439 +#: lib/command.php:440 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Odpovědi na %s" -#: lib/command.php:441 +#: lib/command.php:442 #, fuzzy msgid "Error saving notice." msgstr "Problém při ukládání sdělení" -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:502 +#: lib/command.php:503 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:530 +#: lib/command.php:531 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:551 +#: lib/command.php:552 msgid "Notification off." msgstr "" -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:574 +#: lib/command.php:575 msgid "Notification on." msgstr "" -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" msgstr "" -#: lib/command.php:602 +#: lib/command.php:604 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Nelze uložin informace o obrázku" -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:623 +#: lib/command.php:625 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Neodeslal jste nám profil" -#: lib/command.php:625 +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Neodeslal jste nám profil" msgstr[1] "Neodeslal jste nám profil" msgstr[2] "" -#: lib/command.php:645 +#: lib/command.php:647 #, fuzzy msgid "No one is subscribed to you." msgstr "Vzdálený odběr" -#: lib/command.php:647 +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Vzdálený odběr" msgstr[1] "Vzdálený odběr" msgstr[2] "" -#: lib/command.php:667 +#: lib/command.php:669 #, fuzzy msgid "You are not a member of any groups." msgstr "Neodeslal jste nám profil" -#: lib/command.php:669 +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Neodeslal jste nám profil" msgstr[1] "Neodeslal jste nám profil" msgstr[2] "" -#: lib/command.php:683 +#: lib/command.php:685 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4523,10 +4523,6 @@ msgstr "Žádné takové oznámení." msgid "Favor" msgstr "" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "" @@ -4543,6 +4539,10 @@ msgstr "" msgid "FOAF" msgstr "" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "" + #: lib/galleryaction.php:121 msgid "Filter tags" msgstr "" @@ -4710,21 +4710,6 @@ msgstr "Neplatné jméno nebo heslo" msgid "Sign up for a new account" msgstr "Vytvořit nový účet" -#: lib/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "" - -#: 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 "" - -#: lib/mailbox.php:227 lib/noticelist.php:452 -#, fuzzy -msgid "from" -msgstr " od " - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "Potvrzení emailové adresy" @@ -4907,6 +4892,21 @@ msgid "" "\n" msgstr "" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "" + +#: 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 "" + +#: lib/mailbox.php:227 lib/noticelist.php:452 +#, fuzzy +msgid "from" +msgstr " od " + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -4968,7 +4968,7 @@ msgstr "" msgid "To" msgstr "" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 #, fuzzy msgid "Available characters" msgstr "6 a více znaků" @@ -4983,11 +4983,11 @@ msgstr "Nové sdělení" msgid "What's up, %s?" msgstr "Co se děje %s?" -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "" @@ -5059,11 +5059,11 @@ msgstr "Chyba při vkládaní vzdáleného profilu" msgid "Duplicate notice" msgstr "Nové sdělení" -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 msgid "You have been banned from subscribing." msgstr "" -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Nelze vložit odebírání" @@ -5230,20 +5230,6 @@ msgstr "Vzdálený odběr" msgid "Groups %s is a member of" msgstr "" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "" @@ -5275,6 +5261,20 @@ msgstr "Nelze smazat odebírání" msgid "Couldn't delete subscription." msgstr "Nelze smazat odebírání" +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "" + #: lib/tagcloudsection.php:56 msgid "None" msgstr "" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index c1d24f11d2..37dccbdfcc 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-07 21:25+0000\n" -"PO-Revision-Date: 2009-12-07 21:26:11+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:09:23+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: out-statusnet\n" @@ -28,11 +28,11 @@ msgstr "Seite nicht vorhanden" #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -45,7 +45,7 @@ msgstr "Seite nicht vorhanden" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." @@ -57,7 +57,7 @@ msgid "%s and friends, page %d" msgstr "%s und Freunde, Seite %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s und Freunde" @@ -108,24 +108,24 @@ msgstr "" msgid "You and friends" msgstr "Du und Freunde" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 msgid "API method not found." msgstr "API-Methode nicht gefunden." #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 @@ -144,9 +144,22 @@ msgstr "" msgid "Could not update user." msgstr "Konnte Benutzerdaten nicht aktualisieren." +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "Benutzer hat kein Profil." + +#: actions/apiaccountupdateprofile.php:147 +msgid "Could not save profile." +msgstr "Konnte Profil nicht speichern." + #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -167,19 +180,6 @@ msgstr "Konnte Twitter-Einstellungen nicht speichern." msgid "Could not update your design." msgstr "Konnte Benutzerdesign nicht aktualisieren." -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "Benutzer hat kein Profil." - -#: actions/apiaccountupdateprofile.php:147 -msgid "Could not save profile." -msgstr "Konnte Profil nicht speichern." - #: actions/apiblockcreate.php:105 #, fuzzy msgid "You cannot block yourself!" @@ -193,26 +193,6 @@ msgstr "Blockieren des Benutzers fehlgeschlagen." msgid "Unblock user failed." msgstr "Freigeben des Benutzers fehlgeschlagen." -#: actions/apidirectmessagenew.php:126 -msgid "No message text!" -msgstr "Fehlender Nachrichtentext!" - -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, php-format -msgid "That's too long. Max message size is %d chars." -msgstr "" -"Die Nachricht ist zu lang. Die maximale Nachrichtenlänge ist 140 Zeichen." - -#: actions/apidirectmessagenew.php:146 -msgid "Recipient user not found." -msgstr "Empfänger nicht gefunden." - -#: actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." -msgstr "" -"Es können keine direkten Nachrichten an Benutzer geschickt werden mit denen " -"du nicht befreundet bist." - #: actions/apidirectmessage.php:89 #, php-format msgid "Direct messages from %s" @@ -238,18 +218,38 @@ msgstr "Alle an %s gesendeten direkten Nachrichten" #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "API-Methode nicht gefunden!" +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "Fehlender Nachrichtentext!" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "" +"Die Nachricht ist zu lang. Die maximale Nachrichtenlänge ist 140 Zeichen." + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "Empfänger nicht gefunden." + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "" +"Es können keine direkten Nachrichten an Benutzer geschickt werden mit denen " +"du nicht befreundet bist." + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -395,16 +395,6 @@ msgstr "Du bist kein Mitglied dieser Gruppe." msgid "Could not remove user %s to group %s." msgstr "Konnte Benutzer %s nicht aus der Gruppe %s entfernen." -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, php-format -msgid "%s groups" -msgstr "%s Gruppen" - -#: actions/apigrouplistall.php:94 -#, php-format -msgid "groups on %s" -msgstr "Gruppen von %s" - #: actions/apigrouplist.php:95 #, php-format msgid "%s's groups" @@ -415,6 +405,16 @@ msgstr "%s’s Gruppen" msgid "Groups %s is a member of on %s." msgstr "Gruppen %s sind ein Mitglied von %s." +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "%s Gruppen" + +#: actions/apigrouplistall.php:94 +#, php-format +msgid "groups on %s" +msgstr "Gruppen von %s" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Diese Methode benötigt ein POST oder DELETE." @@ -453,54 +453,54 @@ msgstr "" msgid "Unsupported format." msgstr "Bildformat wird nicht unterstützt." -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, php-format msgid "%s / Favorites from %s" msgstr "%s / Favoriten von %s" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, php-format msgid "%s updates favorited by %s / %s." msgstr "%s Aktualisierung in den Favoriten von %s / %s." -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "%s Zeitleiste" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Aktualisierungen von %1$s auf %2$s!" -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Aktualisierungen erwähnen %2$s" -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "Nachrichten von %1$, die auf Nachrichten von %2$ / %3$ antworten." -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s öffentliche Zeitleiste" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s Nachrichten von allen!" -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "Nachrichten, die mit %s getagt sind" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Aktualisierungen mit %1$s getagt auf %2$s!" @@ -536,45 +536,45 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" "Du kannst dein persönliches Avatar hochladen. Die maximale Dateigröße ist %s." -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 msgid "User without matching profile" msgstr "Benutzer ohne passendes Profil" -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 msgid "Avatar settings" msgstr "Avatar-Einstellungen" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "Original" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "Vorschau" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 msgid "Delete" msgstr "Löschen" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "Hochladen" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "Zuschneiden" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -585,34 +585,71 @@ msgstr "Zuschneiden" msgid "There was a problem with your session token. Try again, please." msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut." -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Unerwartete Formulareingabe." -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" "Wähle eine quadratische Fläche aus dem Bild, um dein Avatar zu speichern" -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "Daten verloren." -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "Avatar aktualisiert." -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "Aktualisierung des Avatars fehlgeschlagen." -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 msgid "Avatar deleted." msgstr "Avatar gelöscht." +#: actions/block.php:69 +msgid "You already blocked that user." +msgstr "Du hast diesen Benutzer bereits blockiert." + +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +msgid "Block user" +msgstr "Benutzer blockieren" + +#: actions/block.php:130 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" + +#: actions/block.php:143 actions/deletenotice.php:145 +#: actions/deleteuser.php:147 actions/groupblock.php:178 +msgid "No" +msgstr "Nein" + +#: actions/block.php:143 actions/deleteuser.php:147 +msgid "Do not block this user" +msgstr "Diesen Benutzer freigeben" + +#: actions/block.php:144 actions/deletenotice.php:146 +#: actions/deleteuser.php:148 actions/groupblock.php:179 +msgid "Yes" +msgstr "Ja" + +#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 +msgid "Block this user" +msgstr "Diesen Benutzer blockieren" + +#: actions/block.php:162 +msgid "Failed to save block information." +msgstr "Konnte Blockierungsdaten nicht speichern." + #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 #: actions/groupmembers.php:76 actions/grouprss.php:91 @@ -653,43 +690,6 @@ msgstr "Freigeben" msgid "Unblock this user" msgstr "Diesen Benutzer freigeben" -#: actions/block.php:69 -msgid "You already blocked that user." -msgstr "Du hast diesen Benutzer bereits blockiert." - -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 -msgid "Block user" -msgstr "Benutzer blockieren" - -#: actions/block.php:130 -msgid "" -"Are you sure you want to block this user? Afterwards, they will be " -"unsubscribed from you, unable to subscribe to you in the future, and you " -"will not be notified of any @-replies from them." -msgstr "" - -#: actions/block.php:143 actions/deletenotice.php:145 -#: actions/deleteuser.php:147 actions/groupblock.php:178 -msgid "No" -msgstr "Nein" - -#: actions/block.php:143 actions/deleteuser.php:147 -msgid "Do not block this user" -msgstr "Diesen Benutzer freigeben" - -#: actions/block.php:144 actions/deletenotice.php:146 -#: actions/deleteuser.php:148 actions/groupblock.php:179 -msgid "Yes" -msgstr "Ja" - -#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 -msgid "Block this user" -msgstr "Diesen Benutzer blockieren" - -#: actions/block.php:162 -msgid "Failed to save block information." -msgstr "Konnte Blockierungsdaten nicht speichern." - #: actions/bookmarklet.php:50 msgid "Post to " msgstr "Versenden an " @@ -1160,6 +1160,14 @@ msgstr "Eingehende E-Mail-Adresse entfernt" msgid "New incoming email address added." msgstr "Neue Eingangs-E-Mail-Adresse hinzugefügt." +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "Diese Nachricht ist bereits ein Favorit!" + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "Aus Favoriten entfernen" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 msgid "Popular notices" @@ -1202,14 +1210,6 @@ msgstr "%ss favorisierte Nachrichten" msgid "Updates favored by %1$s on %2$s!" msgstr "Aktualisierungen von %1$s auf %2$s!" -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "Diese Nachricht ist bereits ein Favorit!" - -#: actions/favor.php:92 lib/disfavorform.php:140 -msgid "Disfavor favorite" -msgstr "Aus Favoriten entfernen" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1436,6 +1436,30 @@ msgstr "Diesen Benutzer zu einem Admin ernennen" msgid "Updates from members of %1$s on %2$s!" msgstr "Aktualisierungen von %1$s auf %2$s!" +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "Gruppen" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "Gruppen, Seite %d" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +msgid "Create a new group" +msgstr "Neue Gruppe erstellen" + #: actions/groupsearch.php:52 #, php-format msgid "" @@ -1471,30 +1495,6 @@ msgid "" "action.newgroup%%) yourself!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 -#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 -msgid "Groups" -msgstr "Gruppen" - -#: actions/groups.php:64 -#, php-format -msgid "Groups, page %d" -msgstr "Gruppen, Seite %d" - -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%site.name%%%% groups let you find and talk with people of similar " -"interests. After you join a group you can send messages to all other members " -"using the syntax \"!groupname\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" -msgstr "" - -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -msgid "Create a new group" -msgstr "Neue Gruppe erstellen" - #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "Nur Administratoren können Gruppenmitglieder entsperren." @@ -1695,7 +1695,7 @@ msgstr "" "Wenn du möchtest kannst du zu der Einladung eine persönliche Nachricht " "anfügen." -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "Senden" @@ -1800,56 +1800,56 @@ msgstr "Konnte Benutzer %s aus der Gruppe %s nicht entfernen" msgid "%s left group %s" msgstr "%s hat die Gruppe %s verlassen" -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "Bereits angemeldet." -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 msgid "Invalid or expired token." msgstr "Token ungültig oder abgelaufen." -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "Falscher Benutzername oder Passwort." -#: actions/login.php:152 +#: actions/login.php:153 msgid "Error setting user. You are probably not authorized." msgstr "" "Fehler beim setzen des Benutzers. Du bist vermutlich nicht autorisiert." -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Anmelden" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "An Seite anmelden" -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Nutzername" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Passwort" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "Anmeldedaten merken" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "Automatisch anmelden; nicht bei gemeinsam genutzten PCs einsetzen!" -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "Passwort vergessen?" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1857,7 +1857,7 @@ msgstr "" "Bitte gebe aus Sicherheitsgründen deinen Benutzernamen und dein Passwort " "ein, bevor die Änderungen an deinen Einstellungen übernommen werden." -#: actions/login.php:289 +#: actions/login.php:290 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1929,7 +1929,7 @@ msgstr "Nachricht gesendet" msgid "Direct message to %s sent" msgstr "Direkte Nachricht an %s abgeschickt" -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" msgstr "Ajax-Fehler" @@ -1937,7 +1937,7 @@ msgstr "Ajax-Fehler" msgid "New notice" msgstr "Neue Nachricht" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 msgid "Notice posted" msgstr "Nachricht hinzugefügt" @@ -2016,8 +2016,8 @@ msgstr "Content-Typ " msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "Kein unterstütztes Datenformat." @@ -3567,6 +3567,26 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, php-format +msgid "Notices tagged with %s, page %d" +msgstr "Nachrichten, die mit %s getagt sind, Seite %d" + +#: actions/tag.php:86 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "Feed der Nachrichten von %s" + +#: actions/tag.php:92 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "Feed der Nachrichten von %s" + +#: actions/tag.php:98 +#, fuzzy, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "Feed der Nachrichten von %s" + #: actions/tagother.php:33 msgid "Not logged in" msgstr "Nicht angemeldet" @@ -3617,26 +3637,6 @@ msgstr "" "Benutze dieses Formular, um Tags zu deinen Abonnenten oder Abonnements " "hinzuzufügen." -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Nachrichten, die mit %s getagt sind, Seite %d" - -#: actions/tag.php:86 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "Feed der Nachrichten von %s" - -#: actions/tag.php:92 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "Feed der Nachrichten von %s" - -#: actions/tag.php:98 -#, fuzzy, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "Feed der Nachrichten von %s" - #: actions/tagrss.php:35 msgid "No such tag." msgstr "Tag nicht vorhanden." @@ -3948,22 +3948,22 @@ msgstr "Konnte Nachricht nicht mit neuer URI versehen." msgid "DB error inserting hashtag: %s" msgstr "Datenbankfehler beim Einfügen des Hashtags: %s" -#: classes/Notice.php:179 +#: classes/Notice.php:188 msgid "Problem saving notice. Too long." msgstr "Problem bei Speichern der Nachricht. Sie ist zu lang." -#: classes/Notice.php:183 +#: classes/Notice.php:192 msgid "Problem saving notice. Unknown user." msgstr "Problem bei Speichern der Nachricht. Unbekannter Benutzer." -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Zu schnell zu viele Nachrichten; atme kurz durch und schicke sie erneut in " "ein paar Minuten ab." -#: classes/Notice.php:194 +#: classes/Notice.php:203 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -3972,20 +3972,25 @@ msgstr "" "Zu schnell zu viele Nachrichten; atme kurz durch und schicke sie erneut in " "ein paar Minuten ab." -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "" "Du wurdest für das Schreiben von Nachrichten auf dieser Seite gesperrt." -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "Problem bei Speichern der Nachricht." -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "Datenbankfehler beim Einfügen der Antwort: %s" +#: classes/User.php:347 +#, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "Herzlich willkommen bei %1$s, @%2$s!" + #: classes/User_group.php:380 msgid "Could not create group." msgstr "Konnte Gruppe nicht erstellen." @@ -3994,11 +3999,6 @@ msgstr "Konnte Gruppe nicht erstellen." msgid "Could not set group membership." msgstr "Konnte Gruppenmitgliedschaft nicht setzen." -#: classes/User.php:347 -#, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "Herzlich willkommen bei %1$s, @%2$s!" - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Ändern der Profileinstellungen" @@ -4310,7 +4310,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "Nachricht mit dieser ID existiert nicht" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 msgid "User has no last notice" msgstr "Benutzer hat keine letzte Nachricht" @@ -4357,101 +4357,101 @@ msgstr "Fehler beim Senden der Nachricht" msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Nachricht zu lange - maximal 140 Zeichen erlaubt, du hast %s gesendet" -#: lib/command.php:439 +#: lib/command.php:440 #, php-format msgid "Reply to %s sent" msgstr "Antwort an %s gesendet" -#: lib/command.php:441 +#: lib/command.php:442 msgid "Error saving notice." msgstr "Problem beim Speichern der Nachricht." -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "Gib den Namen des Benutzers an, den du abonnieren möchtest" -#: lib/command.php:502 +#: lib/command.php:503 #, php-format msgid "Subscribed to %s" msgstr "%s abonniert" -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "Gib den Namen des Benutzers ein, den du nicht mehr abonnieren möchtest" -#: lib/command.php:530 +#: lib/command.php:531 #, php-format msgid "Unsubscribed from %s" msgstr "%s nicht mehr abonniert" -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "Befehl noch nicht implementiert." -#: lib/command.php:551 +#: lib/command.php:552 msgid "Notification off." msgstr "Benachrichtigung deaktiviert." -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "Konnte Benachrichtigung nicht deaktivieren." -#: lib/command.php:574 +#: lib/command.php:575 msgid "Notification on." msgstr "Benachrichtigung aktiviert." -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "Konnte Benachrichtigung nicht aktivieren." -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" msgstr "" -#: lib/command.php:602 +#: lib/command.php:604 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Konnte keinen Favoriten erstellen." -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:623 +#: lib/command.php:625 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Du hast dieses Profil nicht abonniert." -#: lib/command.php:625 +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Du hast diese Benutzer bereits abonniert:" msgstr[1] "Du hast diese Benutzer bereits abonniert:" -#: lib/command.php:645 +#: lib/command.php:647 #, fuzzy msgid "No one is subscribed to you." msgstr "Die Gegenseite konnte Dich nicht abonnieren." -#: lib/command.php:647 +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Die Gegenseite konnte Dich nicht abonnieren." msgstr[1] "Die Gegenseite konnte Dich nicht abonnieren." -#: lib/command.php:667 +#: lib/command.php:669 #, fuzzy msgid "You are not a member of any groups." msgstr "Du bist kein Mitglied dieser Gruppe." -#: lib/command.php:669 +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Du bist kein Mitglied dieser Gruppe." msgstr[1] "Du bist kein Mitglied dieser Gruppe." -#: lib/command.php:683 +#: lib/command.php:685 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4554,10 +4554,6 @@ msgstr "Zu den Favoriten hinzufügen" msgid "Favor" msgstr "Zu Favoriten hinzufügen" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "Daten exportieren" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "" @@ -4574,6 +4570,10 @@ msgstr "" msgid "FOAF" msgstr "" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "Daten exportieren" + #: lib/galleryaction.php:121 msgid "Filter tags" msgstr "Tags filtern" @@ -4745,21 +4745,6 @@ msgstr "Anmelden mit einem Benutzernamen und Passwort" msgid "Sign up for a new account" msgstr "Für ein neues Konto registrieren" -#: lib/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "Nur der Benutzer selbst kann seinen Posteingang lesen." - -#: 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 "" - -#: lib/mailbox.php:227 lib/noticelist.php:452 -#, fuzzy -msgid "from" -msgstr "von" - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "Bestätigung der E-Mail-Adresse" @@ -4952,6 +4937,21 @@ msgid "" "\n" msgstr "" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "Nur der Benutzer selbst kann seinen Posteingang lesen." + +#: 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 "" + +#: lib/mailbox.php:227 lib/noticelist.php:452 +#, fuzzy +msgid "from" +msgstr "von" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5013,7 +5013,7 @@ msgstr "Versende eine direkte Nachricht" msgid "To" msgstr "An" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 #, fuzzy msgid "Available characters" msgstr "Verfügbare Zeichen" @@ -5028,11 +5028,11 @@ msgstr "Nachricht versenden" msgid "What's up, %s?" msgstr "Was ist los, %s?" -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "" @@ -5106,12 +5106,12 @@ msgstr "Fehler beim Einfügen des entfernten Profils" msgid "Duplicate notice" msgstr "Notiz löschen" -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 #, fuzzy msgid "You have been banned from subscribing." msgstr "Dieser Benutzer erlaubt dir nicht ihn zu abonnieren." -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Konnte neues Abonnement nicht eintragen." @@ -5278,21 +5278,6 @@ msgstr "Leute, die %s abonniert haben" msgid "Groups %s is a member of" msgstr "Gruppen in denen %s Mitglied ist" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "" - -#: lib/subscriptionlist.php:126 -#, fuzzy -msgid "(none)" -msgstr "(leer)" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "" @@ -5323,6 +5308,21 @@ msgstr "Konnte Abonnement nicht löschen." msgid "Couldn't delete subscription." msgstr "Konnte Abonnement nicht löschen." +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "" + +#: lib/subscriptionlist.php:126 +#, fuzzy +msgid "(none)" +msgstr "(leer)" + #: lib/tagcloudsection.php:56 msgid "None" msgstr "Nichts" diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index d6142aaa76..a072fcbc24 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-07 21:25+0000\n" -"PO-Revision-Date: 2009-12-07 21:26:14+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:09:26+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: el\n" "X-Message-Group: out-statusnet\n" @@ -27,11 +27,11 @@ msgstr "Αδύνατη η αποθήκευση του προφίλ." #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -44,7 +44,7 @@ msgstr "Αδύνατη η αποθήκευση του προφίλ." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." @@ -56,7 +56,7 @@ msgid "%s and friends, page %d" msgstr "%s και οι φίλοι του/της" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s και οι φίλοι του/της" @@ -108,25 +108,25 @@ msgstr "" msgid "You and friends" msgstr "%s και οι φίλοι του/της" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 #, fuzzy msgid "API method not found." msgstr "Η μέθοδος του ΑΡΙ δε βρέθηκε!" #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 @@ -146,9 +146,23 @@ msgstr "" msgid "Could not update user." msgstr "Απέτυχε η ενημέρωση του χρήστη." +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "" + +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Απέτυχε η αποθήκευση του προφίλ." + #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -170,20 +184,6 @@ msgstr "" msgid "Could not update your design." msgstr "Απέτυχε η ενημέρωση του χρήστη." -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "" - -#: actions/apiaccountupdateprofile.php:147 -#, fuzzy -msgid "Could not save profile." -msgstr "Απέτυχε η αποθήκευση του προφίλ." - #: actions/apiblockcreate.php:105 #, fuzzy msgid "You cannot block yourself!" @@ -197,23 +197,6 @@ msgstr "" msgid "Unblock user failed." msgstr "" -#: actions/apidirectmessagenew.php:126 -msgid "No message text!" -msgstr "" - -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, php-format -msgid "That's too long. Max message size is %d chars." -msgstr "" - -#: actions/apidirectmessagenew.php:146 -msgid "Recipient user not found." -msgstr "" - -#: actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." -msgstr "" - #: actions/apidirectmessage.php:89 #, php-format msgid "Direct messages from %s" @@ -239,18 +222,35 @@ msgstr "" #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "Η μέθοδος του ΑΡΙ δε βρέθηκε!" +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "" + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "" + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -398,16 +398,6 @@ msgstr "" msgid "Could not remove user %s to group %s." msgstr "Αδύνατη η αποθήκευση του προφίλ." -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, php-format -msgid "%s groups" -msgstr "" - -#: actions/apigrouplistall.php:94 -#, php-format -msgid "groups on %s" -msgstr "ομάδες του χρήστη %s" - #: actions/apigrouplist.php:95 #, php-format msgid "%s's groups" @@ -418,6 +408,16 @@ msgstr "ομάδες των χρηστών %s" msgid "Groups %s is a member of on %s." msgstr "Ομάδες με τα περισσότερα μέλη" +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "" + +#: actions/apigrouplistall.php:94 +#, php-format +msgid "groups on %s" +msgstr "ομάδες του χρήστη %s" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "" @@ -454,54 +454,54 @@ msgstr "" msgid "Unsupported format." msgstr "" -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, php-format msgid "%s / Favorites from %s" msgstr "" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, php-format msgid "%s updates favorited by %s / %s." msgstr "" -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "χρονοδιάγραμμα του χρήστη %s" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "" -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "" @@ -536,45 +536,45 @@ msgstr "" msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 msgid "User without matching profile" msgstr "" -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 msgid "Avatar settings" msgstr "Ρυθμίσεις του άβαταρ" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 msgid "Delete" msgstr "" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -585,34 +585,73 @@ msgstr "" msgid "There was a problem with your session token. Try again, please." msgstr "" -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "" -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "" -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "" -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 #, fuzzy msgid "Avatar deleted." msgstr "Ρυθμίσεις OpenID" +#: actions/block.php:69 +#, fuzzy +msgid "You already blocked that user." +msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." + +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +msgid "Block user" +msgstr "" + +#: actions/block.php:130 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" + +#: actions/block.php:143 actions/deletenotice.php:145 +#: actions/deleteuser.php:147 actions/groupblock.php:178 +msgid "No" +msgstr "Όχι" + +#: actions/block.php:143 actions/deleteuser.php:147 +#, fuzzy +msgid "Do not block this user" +msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." + +#: actions/block.php:144 actions/deletenotice.php:146 +#: actions/deleteuser.php:148 actions/groupblock.php:179 +msgid "Yes" +msgstr "" + +#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 +msgid "Block this user" +msgstr "" + +#: actions/block.php:162 +msgid "Failed to save block information." +msgstr "" + #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 #: actions/groupmembers.php:76 actions/grouprss.php:91 @@ -654,45 +693,6 @@ msgstr "" msgid "Unblock this user" msgstr "" -#: actions/block.php:69 -#, fuzzy -msgid "You already blocked that user." -msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." - -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 -msgid "Block user" -msgstr "" - -#: actions/block.php:130 -msgid "" -"Are you sure you want to block this user? Afterwards, they will be " -"unsubscribed from you, unable to subscribe to you in the future, and you " -"will not be notified of any @-replies from them." -msgstr "" - -#: actions/block.php:143 actions/deletenotice.php:145 -#: actions/deleteuser.php:147 actions/groupblock.php:178 -msgid "No" -msgstr "Όχι" - -#: actions/block.php:143 actions/deleteuser.php:147 -#, fuzzy -msgid "Do not block this user" -msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." - -#: actions/block.php:144 actions/deletenotice.php:146 -#: actions/deleteuser.php:148 actions/groupblock.php:179 -msgid "Yes" -msgstr "" - -#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 -msgid "Block this user" -msgstr "" - -#: actions/block.php:162 -msgid "Failed to save block information." -msgstr "" - #: actions/bookmarklet.php:50 msgid "Post to " msgstr "" @@ -1169,6 +1169,14 @@ msgstr "Η διεύθυνση του εισερχόμενου email αφαιρέ msgid "New incoming email address added." msgstr "" +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "" + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 msgid "Popular notices" @@ -1211,14 +1219,6 @@ msgstr "" msgid "Updates favored by %1$s on %2$s!" msgstr "" -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "" - -#: actions/favor.php:92 lib/disfavorform.php:140 -msgid "Disfavor favorite" -msgstr "" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1453,6 +1453,31 @@ msgstr "" msgid "Updates from members of %1$s on %2$s!" msgstr "" +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#, fuzzy +msgid "Create a new group" +msgstr "Δημιουργία νέου λογαριασμού" + #: actions/groupsearch.php:52 #, php-format msgid "" @@ -1483,31 +1508,6 @@ msgid "" "action.newgroup%%) yourself!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 -#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 -msgid "Groups" -msgstr "" - -#: actions/groups.php:64 -#, php-format -msgid "Groups, page %d" -msgstr "" - -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%site.name%%%% groups let you find and talk with people of similar " -"interests. After you join a group you can send messages to all other members " -"using the syntax \"!groupname\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" -msgstr "" - -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -#, fuzzy -msgid "Create a new group" -msgstr "Δημιουργία νέου λογαριασμού" - #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "" @@ -1691,7 +1691,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "" @@ -1771,55 +1771,55 @@ msgstr "" msgid "%s left group %s" msgstr "" -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "Ήδη συνδεδεμένος." -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 msgid "Invalid or expired token." msgstr "" -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "Λάθος όνομα χρήστη ή κωδικός" -#: actions/login.php:152 +#: actions/login.php:153 msgid "Error setting user. You are probably not authorized." msgstr "" -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Σύνδεση" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "" -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Ψευδώνυμο" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Κωδικός" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "Αυτόματη σύνδεση στο μέλλον. ΟΧΙ για κοινόχρηστους υπολογιστές!" -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "Χάσατε ή ξεχάσατε τον κωδικό σας;" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1827,7 +1827,7 @@ msgstr "" "Για λόγους ασφαλείας, παρακαλώ εισάγετε ξανά το όνομα χρήστη και τον κωδικό " "σας, πριν αλλάξετε τις ρυθμίσεις σας." -#: actions/login.php:289 +#: actions/login.php:290 #, fuzzy, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1899,7 +1899,7 @@ msgstr "" msgid "Direct message to %s sent" msgstr "" -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" msgstr "" @@ -1907,7 +1907,7 @@ msgstr "" msgid "New notice" msgstr "" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 msgid "Notice posted" msgstr "" @@ -1982,8 +1982,8 @@ msgstr "Σύνδεση" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "" @@ -3508,6 +3508,26 @@ msgstr "" msgid "SMS" msgstr "" +#: actions/tag.php:68 +#, php-format +msgid "Notices tagged with %s, page %d" +msgstr "" + +#: actions/tag.php:86 +#, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "" + +#: actions/tag.php:92 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "Ροή φίλων του/της %s" + +#: actions/tag.php:98 +#, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "" + #: actions/tagother.php:33 msgid "Not logged in" msgstr "" @@ -3554,26 +3574,6 @@ msgstr "Αδύνατη η αποθήκευση του προφίλ." msgid "Use this form to add tags to your subscribers or subscriptions." msgstr "" -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "" - -#: actions/tag.php:86 -#, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "" - -#: actions/tag.php:92 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "Ροή φίλων του/της %s" - -#: actions/tag.php:98 -#, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "" - #: actions/tagrss.php:35 msgid "No such tag." msgstr "" @@ -3870,38 +3870,43 @@ msgstr "" msgid "DB error inserting hashtag: %s" msgstr "Σφάλμα στη βάση δεδομένων κατά την εισαγωγή hashtag: %s" -#: classes/Notice.php:179 +#: classes/Notice.php:188 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:183 +#: classes/Notice.php:192 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:194 +#: classes/Notice.php:203 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "Σφάλμα βάσης δεδομένων κατά την εισαγωγή απάντησης: %s" +#: classes/User.php:347 +#, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "" + #: classes/User_group.php:380 #, fuzzy msgid "Could not create group." @@ -3912,11 +3917,6 @@ msgstr "Αδύνατη η αποθήκευση του προφίλ." msgid "Could not set group membership." msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ" -#: classes/User.php:347 -#, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "" - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Αλλάξτε τις ρυθμίσεις του προφίλ σας" @@ -4224,7 +4224,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 msgid "User has no last notice" msgstr "" @@ -4271,101 +4271,101 @@ msgstr "" msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:439 +#: lib/command.php:440 #, php-format msgid "Reply to %s sent" msgstr "" -#: lib/command.php:441 +#: lib/command.php:442 msgid "Error saving notice." msgstr "" -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:502 +#: lib/command.php:503 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:530 +#: lib/command.php:531 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:551 +#: lib/command.php:552 msgid "Notification off." msgstr "" -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:574 +#: lib/command.php:575 msgid "Notification on." msgstr "" -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" msgstr "" -#: lib/command.php:602 +#: lib/command.php:604 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Αδύνατη η αποθήκευση του προφίλ." -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:623 +#: lib/command.php:625 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/command.php:625 +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." msgstr[1] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/command.php:645 +#: lib/command.php:647 #, fuzzy msgid "No one is subscribed to you." msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/command.php:647 +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." msgstr[1] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/command.php:667 +#: lib/command.php:669 #, fuzzy msgid "You are not a member of any groups." msgstr "Ομάδες με τα περισσότερα μέλη" -#: lib/command.php:669 +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Ομάδες με τα περισσότερα μέλη" msgstr[1] "Ομάδες με τα περισσότερα μέλη" -#: lib/command.php:683 +#: lib/command.php:685 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4463,10 +4463,6 @@ msgstr "" msgid "Favor" msgstr "" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "" @@ -4483,6 +4479,10 @@ msgstr "" msgid "FOAF" msgstr "" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "" + #: lib/galleryaction.php:121 msgid "Filter tags" msgstr "" @@ -4645,21 +4645,6 @@ msgstr "Σύνδεση με όνομα χρήστη και κωδικό" msgid "Sign up for a new account" msgstr "Δημιουργία νέου λογαριασμού" -#: lib/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "" - -#: 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 "" - -#: lib/mailbox.php:227 lib/noticelist.php:452 -#, fuzzy -msgid "from" -msgstr "από" - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "Επιβεβαίωση διεύθυνσης email" @@ -4838,6 +4823,21 @@ msgid "" "\n" msgstr "" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "" + +#: 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 "" + +#: lib/mailbox.php:227 lib/noticelist.php:452 +#, fuzzy +msgid "from" +msgstr "από" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -4899,7 +4899,7 @@ msgstr "" msgid "To" msgstr "" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 #, fuzzy msgid "Available characters" msgstr "6 ή περισσότεροι χαρακτήρες" @@ -4913,11 +4913,11 @@ msgstr "" msgid "What's up, %s?" msgstr "" -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "" @@ -4987,11 +4987,11 @@ msgstr "" msgid "Duplicate notice" msgstr "Διαγραφή μηνύματος" -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 msgid "You have been banned from subscribing." msgstr "" -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Απέτυχε η εισαγωγή νέας συνδρομής." @@ -5153,21 +5153,6 @@ msgstr "" msgid "Groups %s is a member of" msgstr "" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "" - -#: lib/subscriptionlist.php:126 -#, fuzzy -msgid "(none)" -msgstr "(κανένα)" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "" @@ -5198,6 +5183,21 @@ msgstr "Απέτυχε η διαγραφή συνδρομής." msgid "Couldn't delete subscription." msgstr "Απέτυχε η διαγραφή συνδρομής." +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "" + +#: lib/subscriptionlist.php:126 +#, fuzzy +msgid "(none)" +msgstr "(κανένα)" + #: lib/tagcloudsection.php:56 msgid "None" msgstr "Κανένα" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index 782a5ec0ac..13172f52a7 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-07 21:25+0000\n" -"PO-Revision-Date: 2009-12-07 21:26:19+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:09:29+0000\n" "Language-Team: British English\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" "X-Message-Group: out-statusnet\n" @@ -27,11 +27,11 @@ msgstr "No such page" #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -44,7 +44,7 @@ msgstr "No such page" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." @@ -56,7 +56,7 @@ msgid "%s and friends, page %d" msgstr "%s and friends, page %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s and friends" @@ -107,24 +107,24 @@ msgstr "" msgid "You and friends" msgstr "You and friends" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Updates from %1$s and friends on %2$s!" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 msgid "API method not found." msgstr "API method not found." #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 @@ -144,9 +144,23 @@ msgstr "" msgid "Could not update user." msgstr "Couldn't update user." +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "User has no profile." + +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Couldn't save profile." + #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -167,20 +181,6 @@ msgstr "Unable to save your design settings!" msgid "Could not update your design." msgstr "Could not update your design." -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "User has no profile." - -#: actions/apiaccountupdateprofile.php:147 -#, fuzzy -msgid "Could not save profile." -msgstr "Couldn't save profile." - #: actions/apiblockcreate.php:105 #, fuzzy msgid "You cannot block yourself!" @@ -194,23 +194,6 @@ msgstr "Block user failed." msgid "Unblock user failed." msgstr "Unblock user failed." -#: actions/apidirectmessagenew.php:126 -msgid "No message text!" -msgstr "No message text!" - -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, php-format -msgid "That's too long. Max message size is %d chars." -msgstr "That's too long. Max message size is %d chars." - -#: actions/apidirectmessagenew.php:146 -msgid "Recipient user not found." -msgstr "Recipient user not found." - -#: actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." -msgstr "Can't send direct messages to users who aren't your friend." - #: actions/apidirectmessage.php:89 #, php-format msgid "Direct messages from %s" @@ -236,18 +219,35 @@ msgstr "All the direct messages sent to %s" #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "API method not found!" +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "No message text!" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "That's too long. Max message size is %d chars." + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "Recipient user not found." + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "Can't send direct messages to users who aren't your friend." + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -391,16 +391,6 @@ msgstr "You are not a member of that group." msgid "Could not remove user %s to group %s." msgstr "Could not remove user %s to group %s" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, php-format -msgid "%s groups" -msgstr "%s groups" - -#: actions/apigrouplistall.php:94 -#, php-format -msgid "groups on %s" -msgstr "groups on %s" - #: actions/apigrouplist.php:95 #, php-format msgid "%s's groups" @@ -411,6 +401,16 @@ msgstr "%s's groups" msgid "Groups %s is a member of on %s." msgstr "Groups %s is a member of on %s." +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "%s groups" + +#: actions/apigrouplistall.php:94 +#, php-format +msgid "groups on %s" +msgstr "groups on %s" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "This method requires a POST or DELETE." @@ -447,54 +447,54 @@ msgstr "" msgid "Unsupported format." msgstr "Unsupported image file format." -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, php-format msgid "%s / Favorites from %s" msgstr "%s / Favourites from %s" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, php-format msgid "%s updates favorited by %s / %s." msgstr "%s updates favourited by %s / %s." -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "%s timeline" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Updates from %1$s on %2$s!" -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Updates mentioning %2$s" -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s updates that reply to updates from %2$s / %3$s." -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s public timeline" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s updates from everyone!" -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "Notices tagged with %s" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Updates tagged with %1$s on %2$s!" @@ -530,45 +530,45 @@ msgstr "Avatar" msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "You can upload your personal avatar. The maximum file size is %s." -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 msgid "User without matching profile" msgstr "User without matching profile" -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 msgid "Avatar settings" msgstr "Avatar settings" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "Original" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "Preview" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 msgid "Delete" msgstr "Delete" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "Upload" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "Crop" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -579,34 +579,73 @@ msgstr "Crop" msgid "There was a problem with your session token. Try again, please." msgstr "There was a problem with your session token. Try again, please." -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Unexpected form submission." -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "Pick a square area of the image to be your avatar" -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "Lost our file data." -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "Avatar updated." -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "Failed updating avatar." -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 #, fuzzy msgid "Avatar deleted." msgstr "Avatar updated." +#: actions/block.php:69 +#, fuzzy +msgid "You already blocked that user." +msgstr "You have already blocked this user." + +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +msgid "Block user" +msgstr "Block user" + +#: actions/block.php:130 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" + +#: actions/block.php:143 actions/deletenotice.php:145 +#: actions/deleteuser.php:147 actions/groupblock.php:178 +msgid "No" +msgstr "No" + +#: actions/block.php:143 actions/deleteuser.php:147 +#, fuzzy +msgid "Do not block this user" +msgstr "Unblock this user" + +#: actions/block.php:144 actions/deletenotice.php:146 +#: actions/deleteuser.php:148 actions/groupblock.php:179 +msgid "Yes" +msgstr "Yes" + +#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 +msgid "Block this user" +msgstr "Block this user" + +#: actions/block.php:162 +msgid "Failed to save block information." +msgstr "Failed to save block information." + #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 #: actions/groupmembers.php:76 actions/grouprss.php:91 @@ -647,45 +686,6 @@ msgstr "Unblock" msgid "Unblock this user" msgstr "Unblock this user" -#: actions/block.php:69 -#, fuzzy -msgid "You already blocked that user." -msgstr "You have already blocked this user." - -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 -msgid "Block user" -msgstr "Block user" - -#: actions/block.php:130 -msgid "" -"Are you sure you want to block this user? Afterwards, they will be " -"unsubscribed from you, unable to subscribe to you in the future, and you " -"will not be notified of any @-replies from them." -msgstr "" - -#: actions/block.php:143 actions/deletenotice.php:145 -#: actions/deleteuser.php:147 actions/groupblock.php:178 -msgid "No" -msgstr "No" - -#: actions/block.php:143 actions/deleteuser.php:147 -#, fuzzy -msgid "Do not block this user" -msgstr "Unblock this user" - -#: actions/block.php:144 actions/deletenotice.php:146 -#: actions/deleteuser.php:148 actions/groupblock.php:179 -msgid "Yes" -msgstr "Yes" - -#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 -msgid "Block this user" -msgstr "Block this user" - -#: actions/block.php:162 -msgid "Failed to save block information." -msgstr "Failed to save block information." - #: actions/bookmarklet.php:50 msgid "Post to " msgstr "Post to " @@ -1160,6 +1160,14 @@ msgstr "Incoming e-mail address removed." msgid "New incoming email address added." msgstr "New incoming e-mail address added." +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "This notice is already a favourite!" + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "Disfavor favourite" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 msgid "Popular notices" @@ -1207,14 +1215,6 @@ msgstr "%s's favourite notices" msgid "Updates favored by %1$s on %2$s!" msgstr "Updates favoured by %1$s on %2$s!" -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "This notice is already a favourite!" - -#: actions/favor.php:92 lib/disfavorform.php:140 -msgid "Disfavor favorite" -msgstr "Disfavor favourite" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1452,6 +1452,30 @@ msgstr "" msgid "Updates from members of %1$s on %2$s!" msgstr "Updates from %1$s on %2$s!" +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "Groups" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "Groups, page %d" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +msgid "Create a new group" +msgstr "Create a new group" + #: actions/groupsearch.php:52 #, fuzzy, php-format msgid "" @@ -1485,30 +1509,6 @@ msgid "" "action.newgroup%%) yourself!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 -#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 -msgid "Groups" -msgstr "Groups" - -#: actions/groups.php:64 -#, php-format -msgid "Groups, page %d" -msgstr "Groups, page %d" - -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%site.name%%%% groups let you find and talk with people of similar " -"interests. After you join a group you can send messages to all other members " -"using the syntax \"!groupname\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" -msgstr "" - -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -msgid "Create a new group" -msgstr "Create a new group" - #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "" @@ -1699,7 +1699,7 @@ msgstr "Personal message" msgid "Optionally add a personal message to the invitation." msgstr "Optionally add a personal message to the invitation." -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "Send" @@ -1805,57 +1805,57 @@ msgstr "Could not remove user %s to group %s" msgid "%s left group %s" msgstr "%s left group %s" -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "Already logged in." -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 #, fuzzy msgid "Invalid or expired token." msgstr "Invalid notice content" -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "Incorrect username or password." -#: actions/login.php:152 +#: actions/login.php:153 #, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "You are not authorised." -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Login" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "Login to site" -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Nickname" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Password" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "Remember me" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "Automatically login in the future; not for shared computers!" -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "Lost or forgotten password?" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1863,7 +1863,7 @@ msgstr "" "For security reasons, please re-enter your user name and password before " "changing your settings." -#: actions/login.php:289 +#: actions/login.php:290 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1935,7 +1935,7 @@ msgstr "Message sent" msgid "Direct message to %s sent" msgstr "Direct message to %s sent" -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" msgstr "Ajax Error" @@ -1943,7 +1943,7 @@ msgstr "Ajax Error" msgid "New notice" msgstr "New notice" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 msgid "Notice posted" msgstr "Notice posted" @@ -2021,8 +2021,8 @@ msgstr "Connect" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "Not a supported data format." @@ -3562,6 +3562,26 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, php-format +msgid "Notices tagged with %s, page %d" +msgstr "Notices tagged with %s, page %d" + +#: actions/tag.php:86 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "Notice feed for %s" + +#: actions/tag.php:92 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "Notice feed for %s" + +#: actions/tag.php:98 +#, fuzzy, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "Notice feed for %s" + #: actions/tagother.php:33 msgid "Not logged in" msgstr "Not logged in" @@ -3609,26 +3629,6 @@ msgstr "Could not save tags." msgid "Use this form to add tags to your subscribers or subscriptions." msgstr "Use this form to add tags to your subscribers or subscriptions." -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Notices tagged with %s, page %d" - -#: actions/tag.php:86 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "Notice feed for %s" - -#: actions/tag.php:92 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "Notice feed for %s" - -#: actions/tag.php:98 -#, fuzzy, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "Notice feed for %s" - #: actions/tagrss.php:35 msgid "No such tag." msgstr "No such tag." @@ -3939,22 +3939,22 @@ msgstr "Could not update message with new URI." msgid "DB error inserting hashtag: %s" msgstr "DB error inserting hashtag: %s" -#: classes/Notice.php:179 +#: classes/Notice.php:188 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Problem saving notice." -#: classes/Notice.php:183 +#: classes/Notice.php:192 msgid "Problem saving notice. Unknown user." msgstr "Problem saving notice. Unknown user." -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Too many notices too fast; take a breather and post again in a few minutes." -#: classes/Notice.php:194 +#: classes/Notice.php:203 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -3962,19 +3962,24 @@ msgid "" msgstr "" "Too many notices too fast; take a breather and post again in a few minutes." -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "You are banned from posting notices on this site." -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "Problem saving notice." -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "DB error inserting reply: %s" +#: classes/User.php:347 +#, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "Welcome to %1$s, @%2$s!" + #: classes/User_group.php:380 msgid "Could not create group." msgstr "Could not create group." @@ -3983,11 +3988,6 @@ msgstr "Could not create group." msgid "Could not set group membership." msgstr "Could not set group membership." -#: classes/User.php:347 -#, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "Welcome to %1$s, @%2$s!" - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Change your profile settings" @@ -4298,7 +4298,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 msgid "User has no last notice" msgstr "User has no last notice" @@ -4345,101 +4345,101 @@ msgstr "Error sending direct message." msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Notice too long - maximum is %d characters, you sent %d" -#: lib/command.php:439 +#: lib/command.php:440 #, php-format msgid "Reply to %s sent" msgstr "Reply to %s sent" -#: lib/command.php:441 +#: lib/command.php:442 msgid "Error saving notice." msgstr "Error saving notice." -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "Specify the name of the user to subscribe to" -#: lib/command.php:502 +#: lib/command.php:503 #, php-format msgid "Subscribed to %s" msgstr "Subscribed to %s" -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "Specify the name of the user to unsubscribe from" -#: lib/command.php:530 +#: lib/command.php:531 #, php-format msgid "Unsubscribed from %s" msgstr "Unsubscribed from %s" -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "Command not yet implemented." -#: lib/command.php:551 +#: lib/command.php:552 msgid "Notification off." msgstr "Notification off." -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "Can't turn off notification." -#: lib/command.php:574 +#: lib/command.php:575 msgid "Notification on." msgstr "Notification on." -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "Can't turn on notification." -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" msgstr "" -#: lib/command.php:602 +#: lib/command.php:604 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Could not create aliases" -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:623 +#: lib/command.php:625 #, fuzzy msgid "You are not subscribed to anyone." msgstr "You are not subscribed to that profile." -#: lib/command.php:625 +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "You are already subscribed to these users:" msgstr[1] "You are already subscribed to these users:" -#: lib/command.php:645 +#: lib/command.php:647 #, fuzzy msgid "No one is subscribed to you." msgstr "Could not subscribe other to you." -#: lib/command.php:647 +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Could not subscribe other to you." msgstr[1] "Could not subscribe other to you." -#: lib/command.php:667 +#: lib/command.php:669 #, fuzzy msgid "You are not a member of any groups." msgstr "You are not a member of that group." -#: lib/command.php:669 +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "You are not a member of that group." msgstr[1] "You are not a member of that group." -#: lib/command.php:683 +#: lib/command.php:685 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4537,10 +4537,6 @@ msgstr "Favour this notice" msgid "Favor" msgstr "Favour" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "Export data" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "" @@ -4557,6 +4553,10 @@ msgstr "" msgid "FOAF" msgstr "" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "Export data" + #: lib/galleryaction.php:121 msgid "Filter tags" msgstr "Filter tags" @@ -4716,21 +4716,6 @@ msgstr "Login with a username and password" msgid "Sign up for a new account" msgstr "Sign up for a new account" -#: lib/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "Only the user can read their own mailboxes." - -#: 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 "" - -#: lib/mailbox.php:227 lib/noticelist.php:452 -#, fuzzy -msgid "from" -msgstr "from" - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "E-mail address confirmation" @@ -4927,6 +4912,21 @@ msgid "" "\n" msgstr "" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "Only the user can read their own mailboxes." + +#: 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 "" + +#: lib/mailbox.php:227 lib/noticelist.php:452 +#, fuzzy +msgid "from" +msgstr "from" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -4987,7 +4987,7 @@ msgstr "Send a direct notice" msgid "To" msgstr "To" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 msgid "Available characters" msgstr "Available characters" @@ -5000,11 +5000,11 @@ msgstr "Send a notice" msgid "What's up, %s?" msgstr "What's up, %s?" -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "" @@ -5074,11 +5074,11 @@ msgstr "Error inserting remote profile." msgid "Duplicate notice" msgstr "Duplicate notice" -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 msgid "You have been banned from subscribing." msgstr "You have been banned from subscribing." -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Couldn't insert new subscription." @@ -5240,20 +5240,6 @@ msgstr "People subscribed to %s" msgid "Groups %s is a member of" msgstr "Groups %s is a member of" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(none)" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "" @@ -5284,6 +5270,20 @@ msgstr "Couldn't delete subscription." msgid "Couldn't delete subscription." msgstr "Couldn't delete subscription." +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "(none)" + #: lib/tagcloudsection.php:56 msgid "None" msgstr "None" diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index 871040c9ae..7973b9eef7 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -11,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-07 21:25+0000\n" -"PO-Revision-Date: 2009-12-07 21:26:23+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:09:33+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: es\n" "X-Message-Group: out-statusnet\n" @@ -29,11 +29,11 @@ msgstr "No existe tal página" #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -46,7 +46,7 @@ msgstr "No existe tal página" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." @@ -58,7 +58,7 @@ msgid "%s and friends, page %d" msgstr "%s y amigos, página %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s y amigos" @@ -109,25 +109,25 @@ msgstr "" msgid "You and friends" msgstr "Tú y amigos" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "¡Actualizaciones de %1$s y amigos en %2$s!" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 #, fuzzy msgid "API method not found." msgstr "¡No se encontró el método de la API!" #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 @@ -147,9 +147,23 @@ msgstr "" msgid "Could not update user." msgstr "No se pudo actualizar el usuario." +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "El usuario no tiene un perfil." + +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "No se pudo guardar el perfil." + #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -174,20 +188,6 @@ msgstr "¡No se pudo guardar tu configuración de Twitter!" msgid "Could not update your design." msgstr "No se pudo actualizar el usuario." -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "El usuario no tiene un perfil." - -#: actions/apiaccountupdateprofile.php:147 -#, fuzzy -msgid "Could not save profile." -msgstr "No se pudo guardar el perfil." - #: actions/apiblockcreate.php:105 msgid "You cannot block yourself!" msgstr "¡No puedes bloquearte a tí mismo!" @@ -200,23 +200,6 @@ msgstr "Falló bloquear usuario." msgid "Unblock user failed." msgstr "Falló desbloquear usuario." -#: actions/apidirectmessagenew.php:126 -msgid "No message text!" -msgstr "¡Sin texto de mensaje!" - -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, fuzzy, php-format -msgid "That's too long. Max message size is %d chars." -msgstr "Demasiado largo. Máximo 140 caracteres. " - -#: actions/apidirectmessagenew.php:146 -msgid "Recipient user not found." -msgstr "No se encuentra usuario receptor." - -#: actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." -msgstr "No se puede enviar mensajes directos a usuarios que no son tu amigo." - #: actions/apidirectmessage.php:89 #, php-format msgid "Direct messages from %s" @@ -242,18 +225,35 @@ msgstr "Todos los mensajes directos enviados a %s" #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "¡No se encontró el método de la API!" +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "¡Sin texto de mensaje!" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, fuzzy, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "Demasiado largo. Máximo 140 caracteres. " + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "No se encuentra usuario receptor." + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "No se puede enviar mensajes directos a usuarios que no son tu amigo." + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -399,16 +399,6 @@ msgstr "No eres miembro de este grupo." msgid "Could not remove user %s to group %s." msgstr "No se pudo eliminar a usuario %s de grupo %s" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, php-format -msgid "%s groups" -msgstr "Grupos %s" - -#: actions/apigrouplistall.php:94 -#, php-format -msgid "groups on %s" -msgstr "Grupos en %s" - #: actions/apigrouplist.php:95 #, php-format msgid "%s's groups" @@ -419,6 +409,16 @@ msgstr "Grupos de %s" msgid "Groups %s is a member of on %s." msgstr "%s es miembro de los grupos" +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "Grupos %s" + +#: actions/apigrouplistall.php:94 +#, php-format +msgid "groups on %s" +msgstr "Grupos en %s" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Este método requiere un PUBLICAR O ELIMINAR" @@ -454,54 +454,54 @@ msgstr "" msgid "Unsupported format." msgstr "Formato no soportado." -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, php-format msgid "%s / Favorites from %s" msgstr "%s / Favoritos desde %s" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, php-format msgid "%s updates favorited by %s / %s." msgstr "%s actualizaciones favoritas por %s / %s." -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "línea temporal de %s" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "¡Actualizaciones de %1$s en %2$s!" -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, fuzzy, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Actualizaciones en respuesta a %2$s" -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "actualizaciones de %1$s en respuesta a las de %2$s / %3$s" -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "línea temporal pública de %s" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "¡Actualizaciones de todos en %s!" -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "Avisos marcados con %s" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "¡Actualizaciones de %1$s en %2$s!" @@ -538,45 +538,45 @@ msgstr "Avatar" msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "Puedes cargar tu avatar personal." -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 msgid "User without matching profile" msgstr "Usuario sin perfil equivalente" -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 msgid "Avatar settings" msgstr "Configuración de Avatar" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "Original" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "Vista previa" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 msgid "Delete" msgstr "Borrar" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "Cargar" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "Cortar" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -588,34 +588,73 @@ msgid "There was a problem with your session token. Try again, please." msgstr "" "Hubo un problema con tu clave de sesión. Por favor, intenta nuevamente." -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Envío de formulario inesperado." -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "Elige un área cuadrada de la imagen para que sea tu avatar" -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "Se perdió nuestros datos de archivo." -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "Avatar actualizado" -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "Error al actualizar avatar." -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 #, fuzzy msgid "Avatar deleted." msgstr "Avatar actualizado" +#: actions/block.php:69 +#, fuzzy +msgid "You already blocked that user." +msgstr "Ya has bloqueado este usuario." + +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +msgid "Block user" +msgstr "Bloquear usuario." + +#: actions/block.php:130 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" + +#: actions/block.php:143 actions/deletenotice.php:145 +#: actions/deleteuser.php:147 actions/groupblock.php:178 +msgid "No" +msgstr "No" + +#: actions/block.php:143 actions/deleteuser.php:147 +#, fuzzy +msgid "Do not block this user" +msgstr "Desbloquear este usuario" + +#: actions/block.php:144 actions/deletenotice.php:146 +#: actions/deleteuser.php:148 actions/groupblock.php:179 +msgid "Yes" +msgstr "Sí" + +#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 +msgid "Block this user" +msgstr "Bloquear este usuario." + +#: actions/block.php:162 +msgid "Failed to save block information." +msgstr "No se guardó información de bloqueo." + #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 #: actions/groupmembers.php:76 actions/grouprss.php:91 @@ -659,45 +698,6 @@ msgstr "Desbloquear" msgid "Unblock this user" msgstr "Desbloquear este usuario" -#: actions/block.php:69 -#, fuzzy -msgid "You already blocked that user." -msgstr "Ya has bloqueado este usuario." - -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 -msgid "Block user" -msgstr "Bloquear usuario." - -#: actions/block.php:130 -msgid "" -"Are you sure you want to block this user? Afterwards, they will be " -"unsubscribed from you, unable to subscribe to you in the future, and you " -"will not be notified of any @-replies from them." -msgstr "" - -#: actions/block.php:143 actions/deletenotice.php:145 -#: actions/deleteuser.php:147 actions/groupblock.php:178 -msgid "No" -msgstr "No" - -#: actions/block.php:143 actions/deleteuser.php:147 -#, fuzzy -msgid "Do not block this user" -msgstr "Desbloquear este usuario" - -#: actions/block.php:144 actions/deletenotice.php:146 -#: actions/deleteuser.php:148 actions/groupblock.php:179 -msgid "Yes" -msgstr "Sí" - -#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 -msgid "Block this user" -msgstr "Bloquear este usuario." - -#: actions/block.php:162 -msgid "Failed to save block information." -msgstr "No se guardó información de bloqueo." - #: actions/bookmarklet.php:50 msgid "Post to " msgstr "Mensaje a " @@ -1044,7 +1044,7 @@ msgstr "Correo Electrónico" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" -msgstr "Correo electrónico, como \"NombredeUsuario@ejemplo.org\"" +msgstr "Correo electrónico, como \"NombredeUsuario@example.org\"" #: actions/emailsettings.php:126 actions/imsettings.php:133 #: actions/smssettings.php:145 @@ -1183,6 +1183,14 @@ msgstr "Dirección de correo entrante removida." msgid "New incoming email address added." msgstr "Nueva dirección de correo entrante agregada." +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "¡Este aviso ya está en favoritos!" + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "Sacar favorito" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 #, fuzzy @@ -1227,14 +1235,6 @@ msgstr "Avisos favoritos de %s" msgid "Updates favored by %1$s on %2$s!" msgstr "¡Actualizaciones de %1$s en %2$s!" -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "¡Este aviso ya está en favoritos!" - -#: actions/favor.php:92 lib/disfavorform.php:140 -msgid "Disfavor favorite" -msgstr "Sacar favorito" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1484,6 +1484,30 @@ msgstr "" msgid "Updates from members of %1$s on %2$s!" msgstr "¡Actualizaciones de %1$s en %2$s!" +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "Grupos" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "Grupos, página %d" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +msgid "Create a new group" +msgstr "Crear un nuevo grupo" + #: actions/groupsearch.php:52 #, fuzzy, php-format msgid "" @@ -1518,30 +1542,6 @@ msgid "" "action.newgroup%%) yourself!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 -#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 -msgid "Groups" -msgstr "Grupos" - -#: actions/groups.php:64 -#, php-format -msgid "Groups, page %d" -msgstr "Grupos, página %d" - -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%site.name%%%% groups let you find and talk with people of similar " -"interests. After you join a group you can send messages to all other members " -"using the syntax \"!groupname\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" -msgstr "" - -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -msgid "Create a new group" -msgstr "Crear un nuevo grupo" - #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "" @@ -1739,7 +1739,7 @@ msgstr "Mensaje Personal" msgid "Optionally add a personal message to the invitation." msgstr "Opcionalmente añada un mensaje personalizado a su invitación." -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "Enviar" @@ -1848,59 +1848,59 @@ msgstr "No se pudo eliminar a usuario %s de grupo %s" msgid "%s left group %s" msgstr "%s dejó grupo %s" -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "Ya estás conectado." -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 #, fuzzy msgid "Invalid or expired token." msgstr "El contenido del aviso es inválido" -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "Nombre de usuario o contraseña incorrectos." -#: actions/login.php:152 +#: actions/login.php:153 #, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "No autorizado." -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Inicio de sesión" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "Ingresar a sitio" -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Apodo" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Contraseña" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "Recordarme" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Iniciar sesión automáticamente en el futuro. ¡No usar en ordenadores " "compartidos! " -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "¿Contraseña olvidada o perdida?" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1908,7 +1908,7 @@ msgstr "" "Por razones de seguridad, por favor vuelve a escribir tu nombre de usuario y " "contraseña antes de cambiar tu configuración." -#: actions/login.php:289 +#: actions/login.php:290 #, fuzzy, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1981,7 +1981,7 @@ msgstr "Mensaje" msgid "Direct message to %s sent" msgstr "Se envió mensaje directo a %s" -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" msgstr "Error de Ajax" @@ -1989,7 +1989,7 @@ msgstr "Error de Ajax" msgid "New notice" msgstr "Nuevo aviso" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 #, fuzzy msgid "Notice posted" msgstr "Aviso publicado" @@ -2070,8 +2070,8 @@ msgstr "Conectarse" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "No es un formato de dato soportado" @@ -3652,6 +3652,26 @@ msgstr "Jabber " msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %s, page %d" +msgstr "Avisos marcados con %s, página %d" + +#: actions/tag.php:86 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "Feed de avisos de %s" + +#: actions/tag.php:92 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "Feed de avisos de %s" + +#: actions/tag.php:98 +#, fuzzy, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "Feed de avisos de %s" + #: actions/tagother.php:33 #, fuzzy msgid "Not logged in" @@ -3703,26 +3723,6 @@ msgid "Use this form to add tags to your subscribers or subscriptions." msgstr "" "Usar este formulario para agregar tags a tus suscriptores o suscripciones." -#: actions/tag.php:68 -#, fuzzy, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Avisos marcados con %s, página %d" - -#: actions/tag.php:86 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "Feed de avisos de %s" - -#: actions/tag.php:92 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "Feed de avisos de %s" - -#: actions/tag.php:98 -#, fuzzy, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "Feed de avisos de %s" - #: actions/tagrss.php:35 msgid "No such tag." msgstr "No existe ese tag." @@ -4040,24 +4040,24 @@ msgstr "No se pudo actualizar mensaje con nuevo URI." msgid "DB error inserting hashtag: %s" msgstr "Error de la BD al insertar la etiqueta clave: %s" -#: classes/Notice.php:179 +#: classes/Notice.php:188 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Hubo un problema al guardar el aviso." -#: classes/Notice.php:183 +#: classes/Notice.php:192 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Hubo problemas al guardar el aviso. Usuario desconocido." -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Demasiados avisos demasiado rápido; para y publicar nuevamente en unos " "minutos." -#: classes/Notice.php:194 +#: classes/Notice.php:203 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4066,19 +4066,24 @@ msgstr "" "Demasiados avisos demasiado rápido; para y publicar nuevamente en unos " "minutos." -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "Tienes prohibido publicar avisos en este sitio." -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "Hubo un problema al guardar el aviso." -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "Error de BD al insertar respuesta: %s" +#: classes/User.php:347 +#, fuzzy, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "Mensaje a %1$s en %2$s" + #: classes/User_group.php:380 #, fuzzy msgid "Could not create group." @@ -4089,11 +4094,6 @@ msgstr "No se pudo crear grupo." msgid "Could not set group membership." msgstr "No se pudo configurar miembros de grupo." -#: classes/User.php:347 -#, fuzzy, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "Mensaje a %1$s en %2$s" - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Cambia tus opciones de perfil" @@ -4411,7 +4411,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 msgid "User has no last notice" msgstr "Usuario no tiene último aviso" @@ -4458,102 +4458,102 @@ msgstr "Error al enviar mensaje directo." msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Mensaje muy largo - máximo 140 caracteres, enviaste %d" -#: lib/command.php:439 +#: lib/command.php:440 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Responder este aviso." -#: lib/command.php:441 +#: lib/command.php:442 #, fuzzy msgid "Error saving notice." msgstr "Hubo un problema al guardar el aviso." -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "Especificar el nombre del usuario a suscribir" -#: lib/command.php:502 +#: lib/command.php:503 #, php-format msgid "Subscribed to %s" msgstr "Suscrito a %s" -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "Especificar el nombre del usuario para desuscribirse de" -#: lib/command.php:530 +#: lib/command.php:531 #, php-format msgid "Unsubscribed from %s" msgstr "Desuscrito de %s" -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "Todavía no se implementa comando." -#: lib/command.php:551 +#: lib/command.php:552 msgid "Notification off." msgstr "Notificación no activa." -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "No se puede desactivar notificación." -#: lib/command.php:574 +#: lib/command.php:575 msgid "Notification on." msgstr "Notificación activada." -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "No se puede activar notificación." -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" msgstr "" -#: lib/command.php:602 +#: lib/command.php:604 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "No se pudo crear favorito." -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:623 +#: lib/command.php:625 #, fuzzy msgid "You are not subscribed to anyone." msgstr "No estás suscrito a ese perfil." -#: lib/command.php:625 +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Ya estás suscrito a estos usuarios:" msgstr[1] "Ya estás suscrito a estos usuarios:" -#: lib/command.php:645 +#: lib/command.php:647 #, fuzzy msgid "No one is subscribed to you." msgstr "No se pudo suscribir otro a ti." -#: lib/command.php:647 +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "No se pudo suscribir otro a ti." msgstr[1] "No se pudo suscribir otro a ti." -#: lib/command.php:667 +#: lib/command.php:669 #, fuzzy msgid "You are not a member of any groups." msgstr "No eres miembro de ese grupo" -#: lib/command.php:669 +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "No eres miembro de este grupo." msgstr[1] "No eres miembro de este grupo." -#: lib/command.php:683 +#: lib/command.php:685 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4651,10 +4651,6 @@ msgstr "Aceptar este aviso" msgid "Favor" msgstr "Aceptar" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "Exportar datos" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "" @@ -4671,6 +4667,10 @@ msgstr "" msgid "FOAF" msgstr "" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "Exportar datos" + #: lib/galleryaction.php:121 msgid "Filter tags" msgstr "Filtrar tags" @@ -4836,20 +4836,6 @@ msgstr "Ingresar con un nombre de usuario y contraseña." msgid "Sign up for a new account" msgstr "Registrar una cuenta nueva " -#: lib/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "Sólo el usuario puede leer sus bandejas de correo." - -#: 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 "" - -#: lib/mailbox.php:227 lib/noticelist.php:452 -msgid "from" -msgstr "desde" - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "Confirmación de correo electrónico" @@ -5042,6 +5028,20 @@ msgid "" "\n" msgstr "" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "Sólo el usuario puede leer sus bandejas de correo." + +#: 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 "" + +#: lib/mailbox.php:227 lib/noticelist.php:452 +msgid "from" +msgstr "desde" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5102,7 +5102,7 @@ msgstr "Enviar un aviso directo" msgid "To" msgstr "Para" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 #, fuzzy msgid "Available characters" msgstr "Caracteres disponibles" @@ -5117,11 +5117,11 @@ msgstr "Enviar un aviso" msgid "What's up, %s?" msgstr "¿Qué tal, %s?" -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "" @@ -5191,12 +5191,12 @@ msgstr "Error al insertar perfil remoto" msgid "Duplicate notice" msgstr "Duplicar aviso" -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 #, fuzzy msgid "You have been banned from subscribing." msgstr "Ese usuario te ha bloqueado la suscripción." -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "No se pudo insertar una nueva suscripción." @@ -5363,20 +5363,6 @@ msgstr "Personas suscritas a %s" msgid "Groups %s is a member of" msgstr "%s es miembro de los grupos" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(ninguno)" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "" @@ -5407,6 +5393,20 @@ msgstr "No se pudo eliminar la suscripción." msgid "Couldn't delete subscription." msgstr "No se pudo eliminar la suscripción." +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "(ninguno)" + #: lib/tagcloudsection.php:56 msgid "None" msgstr "Ninguno" diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index c1b9febfe2..4a49508576 100644 --- a/locale/fi/LC_MESSAGES/statusnet.po +++ b/locale/fi/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-07 21:25+0000\n" -"PO-Revision-Date: 2009-12-07 21:26:26+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:09:38+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fi\n" "X-Message-Group: out-statusnet\n" @@ -27,11 +27,11 @@ msgstr "Sivua ei ole." #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -44,7 +44,7 @@ msgstr "Sivua ei ole." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." @@ -56,7 +56,7 @@ msgid "%s and friends, page %d" msgstr "%s ja kaverit, sivu %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s ja kaverit" @@ -111,25 +111,25 @@ msgstr "" msgid "You and friends" msgstr "Sinä ja kaverit" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 #, fuzzy msgid "API method not found." msgstr "API-metodia ei löytynyt!" #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 @@ -149,9 +149,23 @@ msgstr "" msgid "Could not update user." msgstr "Ei voitu päivittää käyttäjää." +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "Käyttäjällä ei ole profiilia." + +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Ei voitu tallentaa profiilia." + #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -174,20 +188,6 @@ msgstr "Twitter-asetuksia ei voitu tallentaa!" msgid "Could not update your design." msgstr "Ei voitu päivittää käyttäjää." -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "Käyttäjällä ei ole profiilia." - -#: actions/apiaccountupdateprofile.php:147 -#, fuzzy -msgid "Could not save profile." -msgstr "Ei voitu tallentaa profiilia." - #: actions/apiblockcreate.php:105 #, fuzzy msgid "You cannot block yourself!" @@ -201,24 +201,6 @@ msgstr "Käyttäjän esto epäonnistui." msgid "Unblock user failed." msgstr "Käyttäjän eston poisto epäonnistui." -#: actions/apidirectmessagenew.php:126 -msgid "No message text!" -msgstr "Viestissä ei ole tekstiä!" - -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, php-format -msgid "That's too long. Max message size is %d chars." -msgstr "Liian pitkä päivitys. Maksimikoko päivitykselle on %d merkkiä." - -#: actions/apidirectmessagenew.php:146 -msgid "Recipient user not found." -msgstr "Vastaanottajaa ei löytynyt." - -#: actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." -msgstr "" -"Et voi lähettää suoraa viestiä käyttäjälle, jonka kanssa et ole vielä kaveri." - #: actions/apidirectmessage.php:89 #, php-format msgid "Direct messages from %s" @@ -244,18 +226,36 @@ msgstr "Kaikki suorat viestit käyttäjälle %s" #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "API-metodia ei löytynyt!" +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "Viestissä ei ole tekstiä!" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "Liian pitkä päivitys. Maksimikoko päivitykselle on %d merkkiä." + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "Vastaanottajaa ei löytynyt." + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "" +"Et voi lähettää suoraa viestiä käyttäjälle, jonka kanssa et ole vielä kaveri." + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -402,16 +402,6 @@ msgstr "Sinä et kuulu tähän ryhmään." msgid "Could not remove user %s to group %s." msgstr "Ei voitu poistaa käyttäjää %s ryhmästä %s" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, php-format -msgid "%s groups" -msgstr "Käyttäjän %s ryhmät" - -#: actions/apigrouplistall.php:94 -#, fuzzy, php-format -msgid "groups on %s" -msgstr "Ryhmän toiminnot" - #: actions/apigrouplist.php:95 #, php-format msgid "%s's groups" @@ -422,6 +412,16 @@ msgstr "Käyttäjän %s ryhmät" msgid "Groups %s is a member of on %s." msgstr "Ryhmät, joiden jäsen %s on" +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "Käyttäjän %s ryhmät" + +#: actions/apigrouplistall.php:94 +#, fuzzy, php-format +msgid "groups on %s" +msgstr "Ryhmän toiminnot" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Tämä metodi edellyttää joko POST tai DELETE sanoman." @@ -457,55 +457,55 @@ msgstr "Maksimikoko päivitykselle on %d merkkiä, mukaan lukien URL-osoite." msgid "Unsupported format." msgstr "Formaattia ei ole tuettu." -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, php-format msgid "%s / Favorites from %s" msgstr "%s / Käyttäjän %s suosikit" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, php-format msgid "%s updates favorited by %s / %s." msgstr " Palvelun %s päivitykset, jotka %s / %s on merkinnyt suosikikseen." -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "%s aikajana" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!" -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, fuzzy, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Vastaukset päivitykseen %2$s" -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" "%1$s -päivitykset, jotka on vastauksia käyttäjän %2$s / %3$s päivityksiin." -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s julkinen aikajana" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s päivitykset kaikilta!" -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "Päivitykset joilla on tagi %s" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!" @@ -540,45 +540,45 @@ msgstr "Kuva" msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "Voit ladata oman profiilikuvasi. Maksimikoko on %s." -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 msgid "User without matching profile" msgstr "Käyttäjälle ei löydy profiilia" -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 msgid "Avatar settings" msgstr "Profiilikuva-asetukset" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "Alkuperäinen" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "Esikatselu" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 msgid "Delete" msgstr "Poista" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "Lataa" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "Rajaa" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -591,33 +591,71 @@ msgstr "" "Istuntosi avaimen kanssa oli ongelmia. Olisitko ystävällinen ja kokeilisit " "uudelleen." -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Odottamaton lomakkeen lähetys." -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "Valitse neliön muotoinen alue kuvasta profiilikuvaksi" -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "Tiedoston data hävisi." -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "Kuva päivitetty." -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "Profiilikuvan päivittäminen epäonnistui." -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 msgid "Avatar deleted." msgstr "Kuva poistettu." +#: actions/block.php:69 +#, fuzzy +msgid "You already blocked that user." +msgstr "Sinä olet jo estänyt tämän käyttäjän." + +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +msgid "Block user" +msgstr "Estä käyttäjä" + +#: actions/block.php:130 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" + +#: actions/block.php:143 actions/deletenotice.php:145 +#: actions/deleteuser.php:147 actions/groupblock.php:178 +msgid "No" +msgstr "Ei" + +#: actions/block.php:143 actions/deleteuser.php:147 +msgid "Do not block this user" +msgstr "Älä estä tätä käyttäjää" + +#: actions/block.php:144 actions/deletenotice.php:146 +#: actions/deleteuser.php:148 actions/groupblock.php:179 +msgid "Yes" +msgstr "Kyllä" + +#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 +msgid "Block this user" +msgstr "Estä tämä käyttäjä" + +#: actions/block.php:162 +msgid "Failed to save block information." +msgstr "Käyttäjän estotiedon tallennus epäonnistui." + #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 #: actions/groupmembers.php:76 actions/grouprss.php:91 @@ -658,44 +696,6 @@ msgstr "Poista esto" msgid "Unblock this user" msgstr "Poista esto tältä käyttäjältä" -#: actions/block.php:69 -#, fuzzy -msgid "You already blocked that user." -msgstr "Sinä olet jo estänyt tämän käyttäjän." - -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 -msgid "Block user" -msgstr "Estä käyttäjä" - -#: actions/block.php:130 -msgid "" -"Are you sure you want to block this user? Afterwards, they will be " -"unsubscribed from you, unable to subscribe to you in the future, and you " -"will not be notified of any @-replies from them." -msgstr "" - -#: actions/block.php:143 actions/deletenotice.php:145 -#: actions/deleteuser.php:147 actions/groupblock.php:178 -msgid "No" -msgstr "Ei" - -#: actions/block.php:143 actions/deleteuser.php:147 -msgid "Do not block this user" -msgstr "Älä estä tätä käyttäjää" - -#: actions/block.php:144 actions/deletenotice.php:146 -#: actions/deleteuser.php:148 actions/groupblock.php:179 -msgid "Yes" -msgstr "Kyllä" - -#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 -msgid "Block this user" -msgstr "Estä tämä käyttäjä" - -#: actions/block.php:162 -msgid "Failed to save block information." -msgstr "Käyttäjän estotiedon tallennus epäonnistui." - #: actions/bookmarklet.php:50 #, fuzzy msgid "Post to " @@ -1175,6 +1175,14 @@ msgstr "Saapuvan sähköpostin osoite poistettu." msgid "New incoming email address added." msgstr "Uusi saapuvan sähköpostin osoite lisätty." +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "Tämä päivitys on jo suosikki!" + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "Poista suosikeista" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 msgid "Popular notices" @@ -1217,14 +1225,6 @@ msgstr "Käyttäjän %s suosikkipäivitykset" msgid "Updates favored by %1$s on %2$s!" msgstr "Käyttäjän %1$s suosikit palvelussa %2$s!" -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "Tämä päivitys on jo suosikki!" - -#: actions/favor.php:92 lib/disfavorform.php:140 -msgid "Disfavor favorite" -msgstr "Poista suosikeista" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1454,6 +1454,30 @@ msgstr "Tee tästä käyttäjästä ylläpitäjä" msgid "Updates from members of %1$s on %2$s!" msgstr "Ryhmän %1$s käyttäjien päivitykset palvelussa %2$s!" +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "Ryhmät" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "Ryhmät, sivu %d" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +msgid "Create a new group" +msgstr "Luo uusi ryhmä" + #: actions/groupsearch.php:52 #, fuzzy, php-format msgid "" @@ -1487,30 +1511,6 @@ msgid "" "action.newgroup%%) yourself!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 -#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 -msgid "Groups" -msgstr "Ryhmät" - -#: actions/groups.php:64 -#, php-format -msgid "Groups, page %d" -msgstr "Ryhmät, sivu %d" - -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%site.name%%%% groups let you find and talk with people of similar " -"interests. After you join a group you can send messages to all other members " -"using the syntax \"!groupname\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" -msgstr "" - -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -msgid "Create a new group" -msgstr "Luo uusi ryhmä" - #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "Vain ylläpitäjä voi poistaa eston ryhmän jäseniltä." @@ -1708,7 +1708,7 @@ msgstr "Henkilökohtainen viesti" msgid "Optionally add a personal message to the invitation." msgstr "Voit myös lisätä oman viestisi kutsuun" -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "Lähetä" @@ -1813,59 +1813,59 @@ msgstr "Ei voitu poistaa käyttäjää %s ryhmästä %s" msgid "%s left group %s" msgstr "%s erosi ryhmästä %s" -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "Olet jo kirjautunut sisään." -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 #, fuzzy msgid "Invalid or expired token." msgstr "Päivityksen sisältö ei kelpaa" -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "Väärä käyttäjätunnus tai salasana" -#: actions/login.php:152 +#: actions/login.php:153 #, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "Sinulla ei ole valtuutusta tähän." -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Kirjaudu sisään" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "Kirjaudu sisään" -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Tunnus" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Salasana" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "Muista minut" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Kirjaudu sisään automaattisesti tulevaisuudessa; ei tietokoneille joilla " "useampi käyttäjä!" -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "Oletko hukannut tai unohtanut salasanasi?" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1873,7 +1873,7 @@ msgstr "" "Syötä turvallisuussyistä käyttäjätunnuksesi ja salasanasi uudelleen ennen " "asetuksiesi muuttamista." -#: actions/login.php:289 +#: actions/login.php:290 #, fuzzy, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1945,7 +1945,7 @@ msgstr "Viesti lähetetty" msgid "Direct message to %s sent" msgstr "Suora viesti käyttäjälle %s lähetetty" -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" msgstr "Ajax-virhe" @@ -1953,7 +1953,7 @@ msgstr "Ajax-virhe" msgid "New notice" msgstr "Uusi päivitys" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 msgid "Notice posted" msgstr "Päivitys lähetetty" @@ -2034,8 +2034,8 @@ msgstr "Yhdistä" msgid "Only " msgstr "Vain " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "Tuo ei ole tuettu tietomuoto." @@ -3599,6 +3599,26 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, php-format +msgid "Notices tagged with %s, page %d" +msgstr "Päivitykset joissa on tagi %s, sivu %d" + +#: actions/tag.php:86 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "Päivityksien syöte käyttäjälle %s" + +#: actions/tag.php:92 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "Päivityksien syöte käyttäjälle %s" + +#: actions/tag.php:98 +#, fuzzy, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "Päivityksien syöte käyttäjälle %s" + #: actions/tagother.php:33 msgid "Not logged in" msgstr "Et ole kirjautunut sisään" @@ -3649,26 +3669,6 @@ msgstr "" "Käytä tätä lomaketta lisätäksesi tageja tilaajillesi ja käyttäjille jotka " "tilaavat päivityksiäsi." -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Päivitykset joissa on tagi %s, sivu %d" - -#: actions/tag.php:86 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "Päivityksien syöte käyttäjälle %s" - -#: actions/tag.php:92 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "Päivityksien syöte käyttäjälle %s" - -#: actions/tag.php:98 -#, fuzzy, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "Päivityksien syöte käyttäjälle %s" - #: actions/tagrss.php:35 msgid "No such tag." msgstr "Tuota tagia ei ole." @@ -3981,23 +3981,23 @@ msgstr "Viestin päivittäminen uudella URI-osoitteella ei onnistunut." msgid "DB error inserting hashtag: %s" msgstr "Tietokantavirhe tallennettaessa risutagiä: %s" -#: classes/Notice.php:179 +#: classes/Notice.php:188 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Ongelma päivityksen tallentamisessa." -#: classes/Notice.php:183 +#: classes/Notice.php:192 msgid "Problem saving notice. Unknown user." msgstr "Virhe tapahtui päivityksen tallennuksessa. Tuntematon käyttäjä." -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Liian monta päivitystä liian nopeasti; pidä pieni hengähdystauko ja jatka " "päivityksien lähettämista muutaman minuutin päästä." -#: classes/Notice.php:194 +#: classes/Notice.php:203 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4005,19 +4005,24 @@ msgstr "" "Liian monta päivitystä liian nopeasti; pidä pieni hengähdystauko ja jatka " "päivityksien lähettämista muutaman minuutin päästä." -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "Päivityksesi tähän palveluun on estetty." -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "Ongelma päivityksen tallentamisessa." -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "Tietokantavirhe tallennettaessa vastausta: %s" +#: classes/User.php:347 +#, fuzzy, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "Viesti käyttäjälle %1$s, %2$s" + #: classes/User_group.php:380 msgid "Could not create group." msgstr "Ryhmän luonti ei onnistunut." @@ -4026,11 +4031,6 @@ msgstr "Ryhmän luonti ei onnistunut." msgid "Could not set group membership." msgstr "Ryhmän jäsenyystietoja ei voitu asettaa." -#: classes/User.php:347 -#, fuzzy, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "Viesti käyttäjälle %1$s, %2$s" - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Vaihda profiiliasetuksesi" @@ -4345,7 +4345,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 msgid "User has no last notice" msgstr "Käyttäjällä ei ole viimeistä päivitystä" @@ -4392,102 +4392,102 @@ msgstr "Tapahtui virhe suoran viestin lähetyksessä." msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d" -#: lib/command.php:439 +#: lib/command.php:440 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Vastaa tähän päivitykseen" -#: lib/command.php:441 +#: lib/command.php:442 #, fuzzy msgid "Error saving notice." msgstr "Ongelma päivityksen tallentamisessa." -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "Anna käyttäjätunnus, jonka päivitykset haluat tilata" -#: lib/command.php:502 +#: lib/command.php:503 #, php-format msgid "Subscribed to %s" msgstr "Käyttäjän %s päivitykset tilattu" -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "Anna käyttäjätunnus, jonka päivityksien tilauksen haluat lopettaa" -#: lib/command.php:530 +#: lib/command.php:531 #, php-format msgid "Unsubscribed from %s" msgstr "Käyttäjän %s päivitysten tilaus lopetettu" -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "Komentoa ei ole vielä toteutettu." -#: lib/command.php:551 +#: lib/command.php:552 msgid "Notification off." msgstr "Ilmoitukset pois päältä." -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "Ilmoituksia ei voi pistää pois päältä." -#: lib/command.php:574 +#: lib/command.php:575 msgid "Notification on." msgstr "Ilmoitukset päällä." -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "Ilmoituksia ei voi pistää päälle." -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" msgstr "" -#: lib/command.php:602 +#: lib/command.php:604 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Ei voitu lisätä aliasta." -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:623 +#: lib/command.php:625 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Et ole tilannut tämän käyttäjän päivityksiä." -#: lib/command.php:625 +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Olet jos tilannut seuraavien käyttäjien päivitykset:" msgstr[1] "Olet jos tilannut seuraavien käyttäjien päivitykset:" -#: lib/command.php:645 +#: lib/command.php:647 #, fuzzy msgid "No one is subscribed to you." msgstr "Toista ei voitu asettaa tilaamaan sinua." -#: lib/command.php:647 +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Toista ei voitu asettaa tilaamaan sinua." msgstr[1] "Toista ei voitu asettaa tilaamaan sinua." -#: lib/command.php:667 +#: lib/command.php:669 #, fuzzy msgid "You are not a member of any groups." msgstr "Sinä et kuulu tähän ryhmään." -#: lib/command.php:669 +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Sinä et kuulu tähän ryhmään." msgstr[1] "Sinä et kuulu tähän ryhmään." -#: lib/command.php:683 +#: lib/command.php:685 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4587,10 +4587,6 @@ msgstr "Merkitse päivitys suosikkeihin" msgid "Favor" msgstr "Lisää suosikiksi" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "Vie tietoja" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "RSS 1.0" @@ -4607,6 +4603,10 @@ msgstr "Atom" msgid "FOAF" msgstr "FOAF" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "Vie tietoja" + #: lib/galleryaction.php:121 msgid "Filter tags" msgstr "Suodata tagien perusteella" @@ -4770,21 +4770,6 @@ 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/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "Vain käyttäjä voi lukea omaa postilaatikkoaan." - -#: 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 "" - -#: lib/mailbox.php:227 lib/noticelist.php:452 -#, fuzzy -msgid "from" -msgstr " lähteestä " - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "Sähköpostiosoitteen vahvistus" @@ -4981,6 +4966,21 @@ msgid "" "\n" msgstr "" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "Vain käyttäjä voi lukea omaa postilaatikkoaan." + +#: 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 "" + +#: lib/mailbox.php:227 lib/noticelist.php:452 +#, fuzzy +msgid "from" +msgstr " lähteestä " + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5041,7 +5041,7 @@ msgstr "Lähetä suora viesti" msgid "To" msgstr "Vastaanottaja" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 msgid "Available characters" msgstr "Sallitut merkit" @@ -5054,11 +5054,11 @@ msgstr "Lähetä päivitys" msgid "What's up, %s?" msgstr "Mitä teet juuri nyt, %s?" -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "" @@ -5130,12 +5130,12 @@ msgstr "Virhe tapahtui uuden etäprofiilin lisäämisessä" msgid "Duplicate notice" msgstr "Poista päivitys" -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 #, fuzzy msgid "You have been banned from subscribing." msgstr "Käyttäjä on estänyt sinua tilaamasta päivityksiä." -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Ei voitu lisätä uutta tilausta." @@ -5303,20 +5303,6 @@ msgstr "Ihmiset jotka ovat käyttäjän %s tilaajia" msgid "Groups %s is a member of" msgstr "Ryhmät, joiden jäsen %s on" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(tyhjä)" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "" @@ -5347,6 +5333,20 @@ msgstr "Ei voitu poistaa tilausta." msgid "Couldn't delete subscription." msgstr "Ei voitu poistaa tilausta." +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "(tyhjä)" + #: lib/tagcloudsection.php:56 msgid "None" msgstr "Ei mitään" diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index d667087954..1ed66b9054 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -13,12 +13,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-07 21:25+0000\n" -"PO-Revision-Date: 2009-12-07 21:26:29+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:09:41+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" "X-Message-Group: out-statusnet\n" @@ -31,11 +31,11 @@ msgstr "Page non trouvée" #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -48,7 +48,7 @@ msgstr "Page non trouvée" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." @@ -60,7 +60,7 @@ msgid "%s and friends, page %d" msgstr "%s et ses amis - page %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s et ses amis" @@ -120,24 +120,24 @@ msgstr "" msgid "You and friends" msgstr "Vous et vos amis" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Statuts de %1$s et ses amis dans %2$s!" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 msgid "API method not found." msgstr "Méthode API non trouvée !" #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 @@ -158,9 +158,22 @@ msgstr "" msgid "Could not update user." msgstr "Impossible de mettre à jour l’utilisateur." +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "Aucun profil ne correspond à cet utilisateur." + +#: actions/apiaccountupdateprofile.php:147 +msgid "Could not save profile." +msgstr "Impossible d’enregistrer le profil." + #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -183,19 +196,6 @@ msgstr "Impossible de sauvegarder les parmètres de la conception." msgid "Could not update your design." msgstr "Impossible de mettre à jour votre conception." -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "Aucun profil ne correspond à cet utilisateur." - -#: actions/apiaccountupdateprofile.php:147 -msgid "Could not save profile." -msgstr "Impossible d’enregistrer le profil." - #: actions/apiblockcreate.php:105 msgid "You cannot block yourself!" msgstr "Vous ne pouvez pas vous bloquer vous-même !" @@ -208,25 +208,6 @@ msgstr "Le blocage de l’utilisateur a échoué." msgid "Unblock user failed." msgstr "Le déblocage de l’utilisateur a échoué." -#: actions/apidirectmessagenew.php:126 -msgid "No message text!" -msgstr "Message sans texte !" - -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, php-format -msgid "That's too long. Max message size is %d chars." -msgstr "C’est trop long ! La taille maximale du message est de %d caractères." - -#: actions/apidirectmessagenew.php:146 -msgid "Recipient user not found." -msgstr "Destinataire non trouvé." - -#: actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." -msgstr "" -"Vous ne pouvez envoyer des messages personnels qu’aux utilisateurs inscrits " -"comme amis." - #: actions/apidirectmessage.php:89 #, php-format msgid "Direct messages from %s" @@ -252,18 +233,37 @@ msgstr "Tous les messages envoyés à %s" #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "Méthode API non trouvée !" +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "Message sans texte !" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "C’est trop long ! La taille maximale du message est de %d caractères." + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "Destinataire non trouvé." + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "" +"Vous ne pouvez envoyer des messages personnels qu’aux utilisateurs inscrits " +"comme amis." + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -408,16 +408,6 @@ msgstr "Vous n'êtes pas membre de ce groupe." msgid "Could not remove user %s to group %s." msgstr "Impossible de retirer l’utilisateur %s du groupe %s" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, php-format -msgid "%s groups" -msgstr "Groupes de %s" - -#: actions/apigrouplistall.php:94 -#, php-format -msgid "groups on %s" -msgstr "groupes sur %s" - #: actions/apigrouplist.php:95 #, php-format msgid "%s's groups" @@ -428,6 +418,16 @@ msgstr "Groupes de %s" msgid "Groups %s is a member of on %s." msgstr "Les groupes dont %s est membre sur %s." +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "Groupes de %s" + +#: actions/apigrouplistall.php:94 +#, php-format +msgid "groups on %s" +msgstr "groupes sur %s" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Ce processus requiert un POST ou un DELETE." @@ -465,54 +465,54 @@ msgstr "" msgid "Unsupported format." msgstr "Format non supporté." -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, php-format msgid "%s / Favorites from %s" msgstr "%s / Favoris de %s" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, php-format msgid "%s updates favorited by %s / %s." msgstr "%s statuts ont été ajoutés aux favoris de %s / %s." -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "Activité de %s" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Statuts de %1$s dans %2$s!" -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Mises à jour mentionnant %2$s" -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s statuts en réponses aux statuts de %2$s / %3$s." -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Activité publique %s" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s statuts de tout le monde !" -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "Avis marqués avec %s" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Mises à jour marquées avec %1$s dans %2$s !" @@ -549,45 +549,45 @@ msgstr "" "Vous pouvez associer un « avatar » (image personnelle) à votre profil. La " "taille maximale du fichier est de %s." -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 msgid "User without matching profile" msgstr "Utilisateur sans profil correspondant" -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 msgid "Avatar settings" msgstr "Paramètres de l’avatar" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "Image originale" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "Aperçu" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 msgid "Delete" msgstr "Supprimer" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "Transfert" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "Recadrer" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -600,73 +600,33 @@ msgstr "" "Un problème est survenu avec votre jeton de session. Veuillez essayer à " "nouveau." -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Soumission de formulaire inattendue." -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "Sélectionnez une zone de forme carrée pour définir votre avatar" -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "Données perdues." -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "Avatar mis à jour." -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "La mise à jour de l’avatar a échoué." -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 msgid "Avatar deleted." msgstr "Avatar supprimé." -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 -msgid "No nickname" -msgstr "Aucun pseudo" - -#: actions/blockedfromgroup.php:80 actions/editgroup.php:96 -#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 -#: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "Aucun groupe trouvé" - -#: actions/blockedfromgroup.php:90 -#, php-format -msgid "%s blocked profiles" -msgstr "%s profils bloqués" - -#: actions/blockedfromgroup.php:93 -#, php-format -msgid "%s blocked profiles, page %d" -msgstr "%s profils bloqués, page %d" - -#: actions/blockedfromgroup.php:108 -msgid "A list of the users blocked from joining this group." -msgstr "Une liste des utilisateurs dont l’inscription à ce groupe est bloquée." - -#: actions/blockedfromgroup.php:281 -msgid "Unblock user from group" -msgstr "Débloquer l’utilisateur du groupe" - -#: actions/blockedfromgroup.php:313 lib/unblockform.php:69 -msgid "Unblock" -msgstr "Débloquer" - -#: actions/blockedfromgroup.php:313 lib/unblockform.php:80 -msgid "Unblock this user" -msgstr "Débloquer cet utilisateur" - #: actions/block.php:69 msgid "You already blocked that user." msgstr "Vous avez déjà bloqué cet utilisateur." @@ -707,6 +667,46 @@ msgstr "Bloquer cet utilisateur" msgid "Failed to save block information." msgstr "Impossible d’enregistrer les informations de blocage." +#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 +#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 +#: actions/groupmembers.php:76 actions/grouprss.php:91 +#: actions/joingroup.php:76 actions/showgroup.php:121 +msgid "No nickname" +msgstr "Aucun pseudo" + +#: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 +#: actions/grouplogo.php:99 actions/groupmembers.php:83 +#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +msgid "No such group" +msgstr "Aucun groupe trouvé" + +#: actions/blockedfromgroup.php:90 +#, php-format +msgid "%s blocked profiles" +msgstr "%s profils bloqués" + +#: actions/blockedfromgroup.php:93 +#, php-format +msgid "%s blocked profiles, page %d" +msgstr "%s profils bloqués, page %d" + +#: actions/blockedfromgroup.php:108 +msgid "A list of the users blocked from joining this group." +msgstr "Une liste des utilisateurs dont l’inscription à ce groupe est bloquée." + +#: actions/blockedfromgroup.php:281 +msgid "Unblock user from group" +msgstr "Débloquer l’utilisateur du groupe" + +#: actions/blockedfromgroup.php:313 lib/unblockform.php:69 +msgid "Unblock" +msgstr "Débloquer" + +#: actions/blockedfromgroup.php:313 lib/unblockform.php:80 +msgid "Unblock this user" +msgstr "Débloquer cet utilisateur" + #: actions/bookmarklet.php:50 msgid "Post to " msgstr "Poster sur " @@ -1024,6 +1024,7 @@ msgid "Remove" msgstr "Retirer" #: actions/emailsettings.php:113 +#, fuzzy msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." @@ -1055,7 +1056,7 @@ msgstr "Courriel entrant" #: actions/emailsettings.php:138 actions/smssettings.php:157 msgid "Send email to this address to post new notices." -msgstr "Écrivez à cette adresse courriel pour poster de nouveaux avis. " +msgstr "Écrivez à cette adresse courriel pour poster de nouveaux avis." #: actions/emailsettings.php:145 actions/smssettings.php:162 msgid "Make a new email address for posting to; cancels the old one." @@ -1178,6 +1179,14 @@ msgstr "L’adresse de courriel entrant a été supprimée." msgid "New incoming email address added." msgstr "Nouvelle adresse courriel ajoutée." +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "Cet avis a déjà été ajouté à vos favoris !" + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "Retirer ce favori" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 msgid "Popular notices" @@ -1226,14 +1235,6 @@ msgstr "Avis favoris de %s" msgid "Updates favored by %1$s on %2$s!" msgstr "Mises à jour privilégiées par %1$s sur %2$s !" -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "Cet avis a déjà été ajouté à vos favoris !" - -#: actions/favor.php:92 lib/disfavorform.php:140 -msgid "Disfavor favorite" -msgstr "Retirer ce favori" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1466,6 +1467,36 @@ msgstr "Faire de cet utilisateur un administrateur" msgid "Updates from members of %1$s on %2$s!" msgstr "Mises à jour des membres de %1$s dans %2$s !" +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "Groupes" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "Groupes - page %d" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" +"Les groupes de %%%%site.name%%%% permettent de trouver et de parler avec des " +"personnes qui ont des intérêts en commun avec vous. Après avoir rejoint un " +"groupe, vous pouvez envoyer des messages à tous les autres membres en " +"utilisant la syntaxe « !nomdugroupe ». Vous ne voyez aucun groupe qui vous " +"intéresse ? Essayez d’en [rechercher un](%%%%action.groupsearch%%%%) ou de " +"[créer le vôtre !](%%%%action.newgroup%%%%)" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +msgid "Create a new group" +msgstr "Créer un nouveau groupe" + #: actions/groupsearch.php:52 #, php-format msgid "" @@ -1503,36 +1534,6 @@ msgstr "" "Pourquoi ne pas [créer un compte](%%action.register%%) et [créer le groupe](%" "%action.newgroup%%) vous-même !" -#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 -#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 -msgid "Groups" -msgstr "Groupes" - -#: actions/groups.php:64 -#, php-format -msgid "Groups, page %d" -msgstr "Groupes - page %d" - -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%site.name%%%% groups let you find and talk with people of similar " -"interests. After you join a group you can send messages to all other members " -"using the syntax \"!groupname\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" -msgstr "" -"Les groupes de %%%%site.name%%%% permettent de trouver et de parler avec des " -"personnes qui ont des intérêts en commun avec vous. Après avoir rejoint un " -"groupe, vous pouvez envoyer des messages à tous les autres membres en " -"utilisant la syntaxe « !nomdugroupe ». Vous ne voyez aucun groupe qui vous " -"intéresse ? Essayez d’en [rechercher un](%%%%action.groupsearch%%%%) ou de " -"[créer le vôtre !](%%%%action.newgroup%%%%)" - -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -msgid "Create a new group" -msgstr "Créer un nouveau groupe" - #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "Seul un administrateur peut débloquer les membres du groupes." @@ -1732,7 +1733,7 @@ msgstr "Message personnel" msgid "Optionally add a personal message to the invitation." msgstr "Ajouter un message personnel à l’invitation (optionnel)." -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "Envoyer" @@ -1840,57 +1841,57 @@ msgstr "Impossible de retirer l’utilisateur %s du groupe %s" msgid "%s left group %s" msgstr "%s a quitté le groupe %s" -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "Déjà connecté." -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 msgid "Invalid or expired token." msgstr "Jeton invalide ou expiré." -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "Identifiant ou mot de passe incorrect." -#: actions/login.php:152 +#: actions/login.php:153 msgid "Error setting user. You are probably not authorized." msgstr "Abonnements par défaut" -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Ouvrir une session" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "Ouverture de session" -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Pseudo" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Mot de passe" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "Se souvenir de moi" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Ouvrir automatiquement ma session à l’avenir (déconseillé pour les " "ordinateurs publics ou partagés)" -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "Mot de passe perdu ?" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1898,7 +1899,7 @@ msgstr "" "Pour des raisons de sécurité, veuillez entrer à nouveau votre identifiant et " "votre mot de passe afin d’enregistrer vos préférences." -#: actions/login.php:289 +#: actions/login.php:290 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1974,7 +1975,7 @@ msgstr "Message envoyé" msgid "Direct message to %s sent" msgstr "Votre message a été envoyé à %s" -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" msgstr "Erreur Ajax" @@ -1982,7 +1983,7 @@ msgstr "Erreur Ajax" msgid "New notice" msgstr "Nouvel avis" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 msgid "Notice posted" msgstr "Avis publié" @@ -2065,8 +2066,8 @@ msgstr "type de contenu " msgid "Only " msgstr "Seulement " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "Format de données non supporté." @@ -3663,6 +3664,26 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, php-format +msgid "Notices tagged with %s, page %d" +msgstr "Avis marqués %s - page %d" + +#: actions/tag.php:86 +#, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "Flux des avis pour la marque %s (RSS 1.0)" + +#: actions/tag.php:92 +#, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "Flux des avis pour la marque %s (RSS 2.0)" + +#: actions/tag.php:98 +#, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "Flux des avis pour la marque %s (Atom)" + #: actions/tagother.php:33 msgid "Not logged in" msgstr "Aucune session ouverte" @@ -3712,26 +3733,6 @@ msgid "Use this form to add tags to your subscribers or subscriptions." msgstr "" "Remplissez les champs suivants pour marquer vos abonnés ou vos abonnements." -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Avis marqués %s - page %d" - -#: actions/tag.php:86 -#, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "Flux des avis pour la marque %s (RSS 1.0)" - -#: actions/tag.php:92 -#, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "Flux des avis pour la marque %s (RSS 2.0)" - -#: actions/tag.php:98 -#, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "Flux des avis pour la marque %s (Atom)" - #: actions/tagrss.php:35 msgid "No such tag." msgstr "Cette marque n’existe pas." @@ -4040,22 +4041,22 @@ msgstr "Impossible de mettre à jour le message avec un nouvel URI." msgid "DB error inserting hashtag: %s" msgstr "Erreur de base de donnée en insérant la marque (hashtag) : %s" -#: classes/Notice.php:179 +#: classes/Notice.php:188 msgid "Problem saving notice. Too long." msgstr "Problème lors de l’enregistrement de l’avis ; trop long." -#: classes/Notice.php:183 +#: classes/Notice.php:192 msgid "Problem saving notice. Unknown user." msgstr "Erreur lors de l’enregistrement de l’avis. Utilisateur inconnu." -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Trop d’avis, trop vite ! Faites une pause et publiez à nouveau dans quelques " "minutes." -#: classes/Notice.php:194 +#: classes/Notice.php:203 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4063,19 +4064,24 @@ msgstr "" "Trop de messages en double trop vite ! Prenez une pause et publiez à nouveau " "dans quelques minutes." -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "Il vous est interdit de poster des avis sur ce site." -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "Problème lors de l’enregistrement de l’avis." -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "Erreur de base de donnée en insérant la réponse :%s" +#: classes/User.php:347 +#, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "Bienvenu à %1$s, @%2$s !" + #: classes/User_group.php:380 msgid "Could not create group." msgstr "Impossible de créer le groupe." @@ -4084,11 +4090,6 @@ msgstr "Impossible de créer le groupe." msgid "Could not set group membership." msgstr "Impossible d'établir l’inscription au groupe." -#: classes/User.php:347 -#, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "Bienvenu à %1$s, @%2$s !" - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Modifier vos paramètres de profil" @@ -4393,7 +4394,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "Aucun avis avec cet identifiant n’existe" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 msgid "User has no last notice" msgstr "Aucun avis récent pour cet utilisateur" @@ -4444,99 +4445,100 @@ msgstr "" "Avis trop long ! La taille maximale est de %d caractères ; vous en avez " "entré %d." -#: lib/command.php:439 +#: lib/command.php:440 #, php-format msgid "Reply to %s sent" msgstr "Réponse à %s envoyée" -#: lib/command.php:441 +#: lib/command.php:442 msgid "Error saving notice." msgstr "Problème lors de l’enregistrement de l’avis." -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "Indiquez le nom de l’utilisateur auquel vous souhaitez vous abonner" -#: lib/command.php:502 +#: lib/command.php:503 #, php-format msgid "Subscribed to %s" msgstr "Abonné à %s" -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "Indiquez le nom de l’utilisateur duquel vous souhaitez vous désabonner" -#: lib/command.php:530 +#: lib/command.php:531 #, php-format msgid "Unsubscribed from %s" msgstr "Désabonné de %s" -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "Cette commande n’a pas encore été implémentée." -#: lib/command.php:551 +#: lib/command.php:552 msgid "Notification off." msgstr "Avertissements désactivés." -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "Impossible de désactiver les avertissements." -#: lib/command.php:574 +#: lib/command.php:575 msgid "Notification on." msgstr "Avertissements activés." -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "Impossible d’activer les avertissements." -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" -msgstr "" +msgstr "La commande d'ouverture de session est désactivée" -#: lib/command.php:602 -#, fuzzy, php-format +#: lib/command.php:604 +#, php-format msgid "Could not create login token for %s" -msgstr "Impossible de créer les alias." +msgstr "Impossible de créer le jeton d'ouverture de session pour %s" -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" +"Ce lien n’est utilisable qu’une seule fois, et est valable uniquement " +"pendant 2 minutes : %s" -#: lib/command.php:623 +#: lib/command.php:625 msgid "You are not subscribed to anyone." msgstr "Vous n'êtes pas abonné(e) à personne." -#: lib/command.php:625 +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Vous êtes abonné à cette personne :" msgstr[1] "Vous êtes abonné à ces personnes :" -#: lib/command.php:645 +#: lib/command.php:647 msgid "No one is subscribed to you." msgstr "Personne ne s'est abonné à vous." -#: lib/command.php:647 +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Cette personne est abonnée à vous :" msgstr[1] "Ces personnes sont abonnées à vous :" -#: lib/command.php:667 +#: lib/command.php:669 msgid "You are not a member of any groups." msgstr "Vous n'êtes pas membre d'aucun groupe." -#: lib/command.php:669 +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Vous êtes membre de ce groupe :" msgstr[1] "Vous êtes membre de ces groupes :" -#: lib/command.php:683 -#, fuzzy +#: lib/command.php:685 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4577,9 +4579,9 @@ msgstr "" "Commandes :\n" "on - activer les notifications\n" "off - désactiver les notifications\n" -"help - montrer l’aide\n" +"help - montrer cette aide\n" "follow - s’abonner à l’utilisateur\n" -"groups - lister les groupes de vous avez joint\n" +"groups - lister les groupes que vous avez joints\n" "subscriptions - lister les personnes que vous suivez\n" "subscribers - lister les personnes qui vous suivent\n" "leave - se désabonner de l’utilisateur\n" @@ -4587,10 +4589,11 @@ msgstr "" "get - obtenir le dernier avis de l’utilisateur\n" "whois - obtenir le profil de cet utilisateur\n" "fav - ajouter de dernier avis de l’utilisateur comme favori\n" -"fav # - ajouter l’avis correspondant à l’id comme favori\n" -"reply # - répondre à l’avis correspondant à l’id\n" +"fav # - ajouter l’avis correspondant à l’identifiant comme " +"favori\n" +"reply # - répondre à l’avis correspondant à l’identifiant\n" "reply - répondre au dernier avis de l’utilisateur\n" -"join - s’inscrire au groupe\n" +"join - rejoindre le groupe\n" "login - Obtenir un lien pour s’identifier sur l’interface web\n" "drop - quitter le groupe\n" "stats - obtenir vos statistiques\n" @@ -4601,7 +4604,7 @@ msgstr "" "last - même effet que 'get'\n" "on - pas encore implémenté.\n" "off - pas encore implémenté.\n" -"nudge - clin d’œil : rappeler à un utilisateur de poster.\n" +"nudge - rappeler à un utilisateur de poster.\n" "invite - pas encore implémenté.\n" "track - pas encore implémenté.\n" "untrack - pas encore implémenté.\n" @@ -4670,10 +4673,6 @@ msgstr "Ajouter aux favoris" msgid "Favor" msgstr "Ajouter à mes favoris" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "Exporter les données" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "RSS 1.0" @@ -4690,6 +4689,10 @@ msgstr "Atom" msgid "FOAF" msgstr "Ami d’un ami" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "Exporter les données" + #: lib/galleryaction.php:121 msgid "Filter tags" msgstr "Filtrer les marques" @@ -4853,23 +4856,6 @@ 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/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "L’accès à cette boîte de réception est réservé à son utilisateur." - -#: lib/mailbox.php:139 -msgid "" -"You have no private messages. You can send private message to engage other " -"users in conversation. People can send you messages for your eyes only." -msgstr "" -"Vous n’avez pas de messages privés. Vous pouvez envoyer des messages privés " -"pour démarrer des conversations avec d’autres utilisateurs. Ceux-ci peuvent " -"vous envoyer des messages destinés à vous seul(e)." - -#: lib/mailbox.php:227 lib/noticelist.php:452 -msgid "from" -msgstr "de" - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "Confirmation de l’adresse courriel" @@ -5131,6 +5117,23 @@ msgstr "" "\t%4$s\n" "\n" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "L’accès à cette boîte de réception est réservé à son utilisateur." + +#: lib/mailbox.php:139 +msgid "" +"You have no private messages. You can send private message to engage other " +"users in conversation. People can send you messages for your eyes only." +msgstr "" +"Vous n’avez pas de messages privés. Vous pouvez envoyer des messages privés " +"pour démarrer des conversations avec d’autres utilisateurs. Ceux-ci peuvent " +"vous envoyer des messages destinés à vous seul(e)." + +#: lib/mailbox.php:227 lib/noticelist.php:452 +msgid "from" +msgstr "de" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5195,7 +5198,7 @@ msgstr "Envoyer un message direct" msgid "To" msgstr "À" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 msgid "Available characters" msgstr "Caractères restants" @@ -5208,11 +5211,11 @@ msgstr "Envoyer un avis" msgid "What's up, %s?" msgstr "Quoi de neuf, %s ?" -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "Attacher" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "Attacher un fichier" @@ -5281,11 +5284,11 @@ msgstr "Erreur lors de l’insertion du profil distant" msgid "Duplicate notice" msgstr "Dupliquer l’avis" -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 msgid "You have been banned from subscribing." msgstr "Il vous avez été interdit de vous abonner." -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Impossible d’insérer un nouvel abonnement." @@ -5445,20 +5448,6 @@ msgstr "Abonnés de %s" msgid "Groups %s is a member of" msgstr "Groupes de %s" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "Nuage de marques pour une personne (ajoutées par eux-même)" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "Nuage de marques pour une personne" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(aucun)" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "Déjà abonné !" @@ -5487,6 +5476,20 @@ msgstr "Impossible de supprimer l’abonnement à soi-même." msgid "Couldn't delete subscription." msgstr "Impossible de cesser l’abonnement" +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "Nuage de marques pour une personne (ajoutées par eux-même)" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "Nuage de marques pour une personne" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "(aucun)" + #: lib/tagcloudsection.php:56 msgid "None" msgstr "Aucun" diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index b3d15c8a47..793b136e97 100644 --- a/locale/ga/LC_MESSAGES/statusnet.po +++ b/locale/ga/LC_MESSAGES/statusnet.po @@ -1,5 +1,6 @@ # Translation of StatusNet to Irish # +# Author@translatewiki.net: McDutchie # -- # This file is distributed under the same license as the StatusNet package. # @@ -7,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-07 21:25+0000\n" -"PO-Revision-Date: 2009-12-07 21:26:33+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:09:43+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ga\n" "X-Message-Group: out-statusnet\n" @@ -27,11 +28,11 @@ msgstr "Non existe a etiqueta." #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -44,7 +45,7 @@ msgstr "Non existe a etiqueta." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." @@ -56,7 +57,7 @@ msgid "%s and friends, page %d" msgstr "%s e amigos" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s e amigos" @@ -108,25 +109,25 @@ msgstr "" msgid "You and friends" msgstr "%s e amigos" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Actualizacións dende %1$s e amigos en %2$s!" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 #, fuzzy msgid "API method not found." msgstr "Método da API non atopado" #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 @@ -146,9 +147,23 @@ msgstr "" msgid "Could not update user." msgstr "Non se puido actualizar o usuario." +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "O usuario non ten perfil." + +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Non se puido gardar o perfil." + #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -171,20 +186,6 @@ msgstr "Non se puideron gardar os teus axustes de Twitter!" msgid "Could not update your design." msgstr "Non se puido actualizar o usuario." -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "O usuario non ten perfil." - -#: actions/apiaccountupdateprofile.php:147 -#, fuzzy -msgid "Could not save profile." -msgstr "Non se puido gardar o perfil." - #: actions/apiblockcreate.php:105 #, fuzzy msgid "You cannot block yourself!" @@ -198,25 +199,6 @@ msgstr "Bloqueo de usuario fallido." msgid "Unblock user failed." msgstr "Desbloqueo de usuario fallido." -#: actions/apidirectmessagenew.php:126 -msgid "No message text!" -msgstr "Non hai mensaxes de texto!" - -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, fuzzy, php-format -msgid "That's too long. Max message size is %d chars." -msgstr "" -"Iso é demasiado longo. O tamaño máximo para unha mensaxe é de 140 caracteres." - -#: actions/apidirectmessagenew.php:146 -msgid "Recipient user not found." -msgstr "Usuario destinatario non atopado." - -#: actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." -msgstr "" -"Non se pode enviar a mensaxe directa a usuarios dos que non eres amigo." - #: actions/apidirectmessage.php:89 #, fuzzy, php-format msgid "Direct messages from %s" @@ -242,18 +224,37 @@ msgstr "Tódalas mensaxes directas enviadas a %s" #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "Método da API non atopado" +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "Non hai mensaxes de texto!" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, fuzzy, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "" +"Iso é demasiado longo. O tamaño máximo para unha mensaxe é de 140 caracteres." + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "Usuario destinatario non atopado." + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "" +"Non se pode enviar a mensaxe directa a usuarios dos que non eres amigo." + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -404,16 +405,6 @@ msgstr "Non estás suscrito a ese perfil" msgid "Could not remove user %s to group %s." msgstr "Non podes seguir a este usuario: o Usuario non se atopa." -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, php-format -msgid "%s groups" -msgstr "" - -#: actions/apigrouplistall.php:94 -#, fuzzy, php-format -msgid "groups on %s" -msgstr "Outras opcions" - #: actions/apigrouplist.php:95 #, fuzzy, php-format msgid "%s's groups" @@ -424,6 +415,16 @@ msgstr "Usuarios" msgid "Groups %s is a member of on %s." msgstr "%1s non é unha orixe fiable." +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "" + +#: actions/apigrouplistall.php:94 +#, fuzzy, php-format +msgid "groups on %s" +msgstr "Outras opcions" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Este método require un POST ou DELETE." @@ -462,54 +463,54 @@ msgstr "" msgid "Unsupported format." msgstr "Formato de ficheiro de imaxe non soportado." -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, php-format msgid "%s / Favorites from %s" msgstr "%s / Favoritos dende %s" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, php-format msgid "%s updates favorited by %s / %s." msgstr "%s updates favorited by %s / %s." -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "Liña de tempo de %s" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Actualizacións dende %1$s en %2$s!" -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, fuzzy, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Chíos que respostan a %2$s" -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "Hai %1$s chíos en resposta a chíos dende %2$s / %3$s." -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Liña de tempo pública de %s" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s chíos de calquera!" -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "Chíos tagueados con %s" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Actualizacións dende %1$s en %2$s!" @@ -545,47 +546,47 @@ msgstr "Avatar" msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "Podes actualizar a túa información do perfil persoal aquí" -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 msgid "User without matching profile" msgstr "Usuario sen un perfil que coincida." -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 #, fuzzy msgid "Avatar settings" msgstr "Configuracións de Twitter" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 #, fuzzy msgid "Delete" msgstr "eliminar" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "Subir" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -596,34 +597,77 @@ msgstr "" msgid "There was a problem with your session token. Try again, please." msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..." -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Envio de formulario non esperada." -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "Avatar actualizado." -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "Acounteceu un fallo ó actualizar o avatar." -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 #, fuzzy msgid "Avatar deleted." msgstr "Avatar actualizado." +#: actions/block.php:69 +#, fuzzy +msgid "You already blocked that user." +msgstr "Xa bloqueaches a este usuario." + +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +msgid "Block user" +msgstr "Bloquear usuario" + +#: actions/block.php:130 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" +"Seguro que queres bloquear a este usuario? Despois diso, vai ser de-suscrito " +"do teur perfil, non será capaz de suscribirse a ti nun futuro, e non vas a " +"ser notificado de ningunha resposta-@ del." + +#: actions/block.php:143 actions/deletenotice.php:145 +#: actions/deleteuser.php:147 actions/groupblock.php:178 +msgid "No" +msgstr "No" + +#: actions/block.php:143 actions/deleteuser.php:147 +#, fuzzy +msgid "Do not block this user" +msgstr "Bloquear usuario" + +#: actions/block.php:144 actions/deletenotice.php:146 +#: actions/deleteuser.php:148 actions/groupblock.php:179 +msgid "Yes" +msgstr "Si" + +#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 +#, fuzzy +msgid "Block this user" +msgstr "Bloquear usuario" + +#: actions/block.php:162 +msgid "Failed to save block information." +msgstr "Erro ao gardar información de bloqueo." + #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 #: actions/groupmembers.php:76 actions/grouprss.php:91 @@ -668,49 +712,6 @@ msgstr "Desbloquear" msgid "Unblock this user" msgstr "Bloquear usuario" -#: actions/block.php:69 -#, fuzzy -msgid "You already blocked that user." -msgstr "Xa bloqueaches a este usuario." - -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 -msgid "Block user" -msgstr "Bloquear usuario" - -#: actions/block.php:130 -msgid "" -"Are you sure you want to block this user? Afterwards, they will be " -"unsubscribed from you, unable to subscribe to you in the future, and you " -"will not be notified of any @-replies from them." -msgstr "" -"Seguro que queres bloquear a este usuario? Despois diso, vai ser de-suscrito " -"do teur perfil, non será capaz de suscribirse a ti nun futuro, e non vas a " -"ser notificado de ningunha resposta-@ del." - -#: actions/block.php:143 actions/deletenotice.php:145 -#: actions/deleteuser.php:147 actions/groupblock.php:178 -msgid "No" -msgstr "No" - -#: actions/block.php:143 actions/deleteuser.php:147 -#, fuzzy -msgid "Do not block this user" -msgstr "Bloquear usuario" - -#: actions/block.php:144 actions/deletenotice.php:146 -#: actions/deleteuser.php:148 actions/groupblock.php:179 -msgid "Yes" -msgstr "Si" - -#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 -#, fuzzy -msgid "Block this user" -msgstr "Bloquear usuario" - -#: actions/block.php:162 -msgid "Failed to save block information." -msgstr "Erro ao gardar información de bloqueo." - #: actions/bookmarklet.php:50 #, fuzzy msgid "Post to " @@ -1065,7 +1066,7 @@ msgstr "Enderezo de correo" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" -msgstr "Dirección de correo, coma \"Nomede Usuario@exemplo.org\"" +msgstr "Dirección de correo, coma \"Nomede Usuario@example.org\"" #: actions/emailsettings.php:126 actions/imsettings.php:133 #: actions/smssettings.php:145 @@ -1201,6 +1202,14 @@ msgstr "Dirección de correo entrante eliminada." msgid "New incoming email address added." msgstr "Engadida nova dirección de correo entrante." +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "Este chío xa é un favorito!" + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "Desactivar favorito" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 msgid "Popular notices" @@ -1244,14 +1253,6 @@ msgstr "Chíos favoritos de %s" msgid "Updates favored by %1$s on %2$s!" msgstr "Actualizacións dende %1$s en %2$s!" -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "Este chío xa é un favorito!" - -#: actions/favor.php:92 lib/disfavorform.php:140 -msgid "Disfavor favorite" -msgstr "Desactivar favorito" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1496,6 +1497,31 @@ msgstr "" msgid "Updates from members of %1$s on %2$s!" msgstr "Actualizacións dende %1$s en %2$s!" +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#, fuzzy +msgid "Create a new group" +msgstr "Crear nova conta" + #: actions/groupsearch.php:52 #, fuzzy, php-format msgid "" @@ -1530,31 +1556,6 @@ msgid "" "action.newgroup%%) yourself!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 -#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 -msgid "Groups" -msgstr "" - -#: actions/groups.php:64 -#, php-format -msgid "Groups, page %d" -msgstr "" - -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%site.name%%%% groups let you find and talk with people of similar " -"interests. After you join a group you can send messages to all other members " -"using the syntax \"!groupname\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" -msgstr "" - -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -#, fuzzy -msgid "Create a new group" -msgstr "Crear nova conta" - #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "" @@ -1748,7 +1749,7 @@ msgstr "Mensaxe persoal" msgid "Optionally add a personal message to the invitation." msgstr "Opcionalmente engadir unha mensaxe persoal á invitación." -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "Enviar" @@ -1857,57 +1858,57 @@ msgstr "Non podes seguir a este usuario: o Usuario non se atopa." msgid "%s left group %s" msgstr "" -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "Sesión xa iniciada" -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 #, fuzzy msgid "Invalid or expired token." msgstr "Contido do chío inválido" -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "Usuario ou contrasinal incorrectos." -#: actions/login.php:152 +#: actions/login.php:153 #, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "Non está autorizado." -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Inicio de sesión" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "" -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Alcume" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Contrasinal" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "Lembrarme" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "Endiante acceder automáticamente, coidado en equipos compartidos!" -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "¿Perdeches a contrasinal?" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1915,7 +1916,7 @@ msgstr "" "Por razóns de seguranza, por favor re-insire o teu nome de usuario e " "contrasinal antes de cambiar as túas preferenzas." -#: actions/login.php:289 +#: actions/login.php:290 #, fuzzy, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1990,7 +1991,7 @@ msgstr "Non hai mensaxes de texto!" msgid "Direct message to %s sent" msgstr "Mensaxe directo a %s enviado" -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" msgstr "Erro de Ajax" @@ -1998,7 +1999,7 @@ msgstr "Erro de Ajax" msgid "New notice" msgstr "Novo chío" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 msgid "Notice posted" msgstr "Chío publicado" @@ -2077,8 +2078,8 @@ msgstr "Conectar" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "Non é un formato de datos soportado." @@ -3669,6 +3670,26 @@ msgstr "Jabber." msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %s, page %d" +msgstr "Chíos tagueados con %s" + +#: actions/tag.php:86 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "Fonte de chíos para %s" + +#: actions/tag.php:92 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "Fonte de chíos para %s" + +#: actions/tag.php:98 +#, fuzzy, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "Fonte de chíos para %s" + #: actions/tagother.php:33 msgid "Not logged in" msgstr "Non estás logueado." @@ -3721,26 +3742,6 @@ msgstr "" "Usa este formulario para engadir etiquetas aos teus seguidores ou aos que " "sigues." -#: actions/tag.php:68 -#, fuzzy, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Chíos tagueados con %s" - -#: actions/tag.php:86 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "Fonte de chíos para %s" - -#: actions/tag.php:92 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "Fonte de chíos para %s" - -#: actions/tag.php:98 -#, fuzzy, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "Fonte de chíos para %s" - #: actions/tagrss.php:35 msgid "No such tag." msgstr "Non existe a etiqueta." @@ -4055,23 +4056,23 @@ msgstr "Non se puido actualizar a mensaxe coa nova URI." msgid "DB error inserting hashtag: %s" msgstr "Erro ó inserir o hashtag na BD: %s" -#: classes/Notice.php:179 +#: classes/Notice.php:188 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Aconteceu un erro ó gardar o chío." -#: classes/Notice.php:183 +#: classes/Notice.php:192 msgid "Problem saving notice. Unknown user." msgstr "Aconteceu un erro ó gardar o chío. Usuario descoñecido." -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro " "duns minutos." -#: classes/Notice.php:194 +#: classes/Notice.php:203 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4080,19 +4081,24 @@ msgstr "" "Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro " "duns minutos." -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "Tes restrinxido o envio de chíos neste sitio." -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "Aconteceu un erro ó gardar o chío." -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "Erro ó inserir a contestación na BD: %s" +#: classes/User.php:347 +#, fuzzy, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "Mensaxe de %1$s en %2$s" + #: classes/User_group.php:380 #, fuzzy msgid "Could not create group." @@ -4103,11 +4109,6 @@ msgstr "Non se puido crear o favorito." msgid "Could not set group membership." msgstr "Non se pode gardar a subscrición." -#: classes/User.php:347 -#, fuzzy, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "Mensaxe de %1$s en %2$s" - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Configuración de perfil" @@ -4438,7 +4439,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 msgid "User has no last notice" msgstr "O usuario non ten último chio." @@ -4485,74 +4486,74 @@ msgstr "Erro ó enviar a mensaxe directa." msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d " -#: lib/command.php:439 +#: lib/command.php:440 #, php-format msgid "Reply to %s sent" msgstr "Non se pode eliminar este chíos." -#: lib/command.php:441 +#: lib/command.php:442 #, fuzzy msgid "Error saving notice." msgstr "Aconteceu un erro ó gardar o chío." -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "Especifica o nome do usuario ó que queres suscribirte" -#: lib/command.php:502 +#: lib/command.php:503 #, php-format msgid "Subscribed to %s" msgstr "Suscrito a %s" -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "Especifica o nome de usuario ó que queres deixar de seguir" -#: lib/command.php:530 +#: lib/command.php:531 #, php-format msgid "Unsubscribed from %s" msgstr "Desuscribir de %s" -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "Comando non implementado." -#: lib/command.php:551 +#: lib/command.php:552 msgid "Notification off." msgstr "Notificación desactivada." -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "No se pode desactivar a notificación." -#: lib/command.php:574 +#: lib/command.php:575 msgid "Notification on." msgstr "Notificación habilitada." -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "Non se pode activar a notificación." -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" msgstr "" -#: lib/command.php:602 +#: lib/command.php:604 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Non se puido crear o favorito." -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:623 +#: lib/command.php:625 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Non estás suscrito a ese perfil" -#: lib/command.php:625 +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Xa estas suscrito a estes usuarios:" @@ -4561,12 +4562,12 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: lib/command.php:645 +#: lib/command.php:647 #, fuzzy msgid "No one is subscribed to you." msgstr "Outro usuario non se puido suscribir a ti." -#: lib/command.php:647 +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Outro usuario non se puido suscribir a ti." @@ -4575,12 +4576,12 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: lib/command.php:667 +#: lib/command.php:669 #, fuzzy msgid "You are not a member of any groups." msgstr "Non estás suscrito a ese perfil" -#: lib/command.php:669 +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Non estás suscrito a ese perfil" @@ -4589,7 +4590,7 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: lib/command.php:683 +#: lib/command.php:685 #, fuzzy msgid "" "Commands:\n" @@ -4717,10 +4718,6 @@ msgstr "%s chíos favoritos" msgid "Favor" msgstr "Gostame" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "" @@ -4737,6 +4734,10 @@ msgstr "" msgid "FOAF" msgstr "" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "" + #: lib/galleryaction.php:121 msgid "Filter tags" msgstr "Filtrar etiquetas" @@ -4908,21 +4909,6 @@ msgstr "Accede co teu nome de usuario e contrasinal." msgid "Sign up for a new account" msgstr "Crear nova conta" -#: lib/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "Só o usuario pode ler os seus propios buzóns." - -#: 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 "" - -#: lib/mailbox.php:227 lib/noticelist.php:452 -#, fuzzy -msgid "from" -msgstr " dende " - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "Confirmar correo electrónico" @@ -5161,6 +5147,21 @@ msgid "" "\n" msgstr "" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "Só o usuario pode ler os seus propios buzóns." + +#: 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 "" + +#: lib/mailbox.php:227 lib/noticelist.php:452 +#, fuzzy +msgid "from" +msgstr " dende " + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5222,7 +5223,7 @@ msgstr "Eliminar chío" msgid "To" msgstr "A" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 #, fuzzy msgid "Available characters" msgstr "6 ou máis caracteres" @@ -5237,11 +5238,11 @@ msgstr "Dar un toque" msgid "What's up, %s?" msgstr "¿Que pasa, %s?" -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "" @@ -5318,12 +5319,12 @@ msgstr "Aconteceu un erro ó inserir o perfil remoto" msgid "Duplicate notice" msgstr "Eliminar chío" -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 #, fuzzy msgid "You have been banned from subscribing." msgstr "Este usuario non che permite suscribirte a el." -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Non se puido inserir a nova subscrición." @@ -5495,20 +5496,6 @@ msgstr "Suscrito a %s" msgid "Groups %s is a member of" msgstr "" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(nada)" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "" @@ -5539,6 +5526,20 @@ msgstr "Non se pode eliminar a subscrición." msgid "Couldn't delete subscription." msgstr "Non se pode eliminar a subscrición." +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "(nada)" + #: lib/tagcloudsection.php:56 #, fuzzy msgid "None" diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index a6d463d533..48606c28a0 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: 2009-12-07 21:25+0000\n" -"PO-Revision-Date: 2009-12-07 21:26:36+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:09:46+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: he\n" "X-Message-Group: out-statusnet\n" @@ -26,11 +26,11 @@ msgstr "אין הודעה כזו." #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -43,7 +43,7 @@ msgstr "אין הודעה כזו." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." @@ -55,7 +55,7 @@ msgid "%s and friends, page %d" msgstr "%s וחברים" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s וחברים" @@ -107,25 +107,25 @@ msgstr "" msgid "You and friends" msgstr "%s וחברים" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 #, fuzzy msgid "API method not found." msgstr "קוד האישור לא נמצא." #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 @@ -145,9 +145,23 @@ msgstr "" msgid "Could not update user." msgstr "עידכון המשתמש נכשל." +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "למשתמש אין פרופיל." + +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "שמירת הפרופיל נכשלה." + #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -169,20 +183,6 @@ msgstr "" msgid "Could not update your design." msgstr "עידכון המשתמש נכשל." -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "למשתמש אין פרופיל." - -#: actions/apiaccountupdateprofile.php:147 -#, fuzzy -msgid "Could not save profile." -msgstr "שמירת הפרופיל נכשלה." - #: actions/apiblockcreate.php:105 #, fuzzy msgid "You cannot block yourself!" @@ -196,23 +196,6 @@ msgstr "" msgid "Unblock user failed." msgstr "" -#: actions/apidirectmessagenew.php:126 -msgid "No message text!" -msgstr "" - -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, fuzzy, php-format -msgid "That's too long. Max message size is %d chars." -msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות." - -#: actions/apidirectmessagenew.php:146 -msgid "Recipient user not found." -msgstr "" - -#: actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." -msgstr "" - #: actions/apidirectmessage.php:89 #, php-format msgid "Direct messages from %s" @@ -238,18 +221,35 @@ msgstr "" #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "" +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, fuzzy, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות." + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "" + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -398,16 +398,6 @@ msgstr "לא שלחנו אלינו את הפרופיל הזה" msgid "Could not remove user %s to group %s." msgstr "נכשלה יצירת OpenID מתוך: %s" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, php-format -msgid "%s groups" -msgstr "" - -#: actions/apigrouplistall.php:94 -#, php-format -msgid "groups on %s" -msgstr "" - #: actions/apigrouplist.php:95 #, fuzzy, php-format msgid "%s's groups" @@ -418,6 +408,16 @@ msgstr "פרופיל" msgid "Groups %s is a member of on %s." msgstr "לא שלחנו אלינו את הפרופיל הזה" +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "" + +#: actions/apigrouplistall.php:94 +#, php-format +msgid "groups on %s" +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "" @@ -455,54 +455,54 @@ msgstr "" msgid "Unsupported format." msgstr "פורמט התמונה אינו נתמך." -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, php-format msgid "%s / Favorites from %s" msgstr "" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, php-format msgid "%s updates favorited by %s / %s." msgstr "" -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, fuzzy, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "הסטטוס של %1$s ב-%2$s " -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "מיקרובלוג מאת %s" @@ -539,47 +539,47 @@ msgstr "תמונה" msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 msgid "User without matching profile" msgstr "" -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 #, fuzzy msgid "Avatar settings" msgstr "הגדרות" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 #, fuzzy msgid "Delete" msgstr "מחק" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "ההעלה" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -590,34 +590,75 @@ msgstr "" msgid "There was a problem with your session token. Try again, please." msgstr "" -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "הגשת טופס לא צפויה." -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "התמונה עודכנה." -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "עדכון התמונה נכשל." -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 #, fuzzy msgid "Avatar deleted." msgstr "התמונה עודכנה." +#: actions/block.php:69 +#, fuzzy +msgid "You already blocked that user." +msgstr "כבר נכנסת למערכת!" + +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#, fuzzy +msgid "Block user" +msgstr "אין משתמש כזה." + +#: actions/block.php:130 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" + +#: actions/block.php:143 actions/deletenotice.php:145 +#: actions/deleteuser.php:147 actions/groupblock.php:178 +msgid "No" +msgstr "לא" + +#: actions/block.php:143 actions/deleteuser.php:147 +#, fuzzy +msgid "Do not block this user" +msgstr "אין משתמש כזה." + +#: actions/block.php:144 actions/deletenotice.php:146 +#: actions/deleteuser.php:148 actions/groupblock.php:179 +msgid "Yes" +msgstr "כן" + +#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 +#, fuzzy +msgid "Block this user" +msgstr "אין משתמש כזה." + +#: actions/block.php:162 +msgid "Failed to save block information." +msgstr "" + #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 #: actions/groupmembers.php:76 actions/grouprss.php:91 @@ -662,47 +703,6 @@ msgstr "" msgid "Unblock this user" msgstr "אין משתמש כזה." -#: actions/block.php:69 -#, fuzzy -msgid "You already blocked that user." -msgstr "כבר נכנסת למערכת!" - -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 -#, fuzzy -msgid "Block user" -msgstr "אין משתמש כזה." - -#: actions/block.php:130 -msgid "" -"Are you sure you want to block this user? Afterwards, they will be " -"unsubscribed from you, unable to subscribe to you in the future, and you " -"will not be notified of any @-replies from them." -msgstr "" - -#: actions/block.php:143 actions/deletenotice.php:145 -#: actions/deleteuser.php:147 actions/groupblock.php:178 -msgid "No" -msgstr "לא" - -#: actions/block.php:143 actions/deleteuser.php:147 -#, fuzzy -msgid "Do not block this user" -msgstr "אין משתמש כזה." - -#: actions/block.php:144 actions/deletenotice.php:146 -#: actions/deleteuser.php:148 actions/groupblock.php:179 -msgid "Yes" -msgstr "כן" - -#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 -#, fuzzy -msgid "Block this user" -msgstr "אין משתמש כזה." - -#: actions/block.php:162 -msgid "Failed to save block information." -msgstr "" - #: actions/bookmarklet.php:50 msgid "Post to " msgstr "" @@ -1179,6 +1179,14 @@ msgstr "" msgid "New incoming email address added." msgstr "" +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "" + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 #, fuzzy @@ -1222,14 +1230,6 @@ msgstr "" msgid "Updates favored by %1$s on %2$s!" msgstr "מיקרובלוג מאת %s" -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "" - -#: actions/favor.php:92 lib/disfavorform.php:140 -msgid "Disfavor favorite" -msgstr "" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1473,6 +1473,31 @@ msgstr "" msgid "Updates from members of %1$s on %2$s!" msgstr "מיקרובלוג מאת %s" +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "קבוצות" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#, fuzzy +msgid "Create a new group" +msgstr "צור חשבון חדש" + #: actions/groupsearch.php:52 #, fuzzy, php-format msgid "" @@ -1507,31 +1532,6 @@ msgid "" "action.newgroup%%) yourself!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 -#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 -msgid "Groups" -msgstr "קבוצות" - -#: actions/groups.php:64 -#, php-format -msgid "Groups, page %d" -msgstr "" - -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%site.name%%%% groups let you find and talk with people of similar " -"interests. After you join a group you can send messages to all other members " -"using the syntax \"!groupname\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" -msgstr "" - -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -#, fuzzy -msgid "Create a new group" -msgstr "צור חשבון חדש" - #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "" @@ -1720,7 +1720,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "שלח" @@ -1802,63 +1802,63 @@ msgstr "נכשלה יצירת OpenID מתוך: %s" msgid "%s left group %s" msgstr "" -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "כבר מחובר." -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 #, fuzzy msgid "Invalid or expired token." msgstr "תוכן ההודעה לא חוקי" -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "שם משתמש או סיסמה לא נכונים." -#: actions/login.php:152 +#: actions/login.php:153 #, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "לא מורשה." -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "היכנס" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "" -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "כינוי" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "סיסמה" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "זכור אותי" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "בעתיד התחבר אוטומטית; לא לשימוש במחשבים ציבוריים!" -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "שכחת או איבדת את הסיסמה?" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "לצרכי אבטחה, הכנס מחדש את שם המשתמש והסיסמה לפני שתשנה את ההגדרות." -#: actions/login.php:289 +#: actions/login.php:290 #, fuzzy, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1930,7 +1930,7 @@ msgstr "הודעה חדשה" msgid "Direct message to %s sent" msgstr "" -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" msgstr "" @@ -1938,7 +1938,7 @@ msgstr "" msgid "New notice" msgstr "הודעה חדשה" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 #, fuzzy msgid "Notice posted" msgstr "הודעות" @@ -2016,8 +2016,8 @@ msgstr "התחבר" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "" @@ -3540,6 +3540,26 @@ msgstr "אין זיהוי Jabber כזה." msgid "SMS" msgstr "סמס" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %s, page %d" +msgstr "מיקרובלוג מאת %s" + +#: actions/tag.php:86 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "הזנת הודעות של %s" + +#: actions/tag.php:92 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "הזנת הודעות של %s" + +#: actions/tag.php:98 +#, fuzzy, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "הזנת הודעות של %s" + #: actions/tagother.php:33 #, fuzzy msgid "Not logged in" @@ -3588,26 +3608,6 @@ msgstr "שמירת מידע התמונה נכשל" msgid "Use this form to add tags to your subscribers or subscriptions." msgstr "" -#: actions/tag.php:68 -#, fuzzy, php-format -msgid "Notices tagged with %s, page %d" -msgstr "מיקרובלוג מאת %s" - -#: actions/tag.php:86 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "הזנת הודעות של %s" - -#: actions/tag.php:92 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "הזנת הודעות של %s" - -#: actions/tag.php:98 -#, fuzzy, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "הזנת הודעות של %s" - #: actions/tagrss.php:35 #, fuzzy msgid "No such tag." @@ -3919,40 +3919,45 @@ msgstr "" msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:179 +#: classes/Notice.php:188 #, fuzzy msgid "Problem saving notice. Too long." msgstr "בעיה בשמירת ההודעה." -#: classes/Notice.php:183 +#: classes/Notice.php:192 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "בעיה בשמירת ההודעה." -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:194 +#: classes/Notice.php:203 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "בעיה בשמירת ההודעה." -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "שגיאת מסד נתונים בהכנסת התגובה: %s" +#: classes/User.php:347 +#, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "" + #: classes/User_group.php:380 #, fuzzy msgid "Could not create group." @@ -3963,11 +3968,6 @@ msgstr "שמירת מידע התמונה נכשל" msgid "Could not set group membership." msgstr "יצירת המנוי נכשלה." -#: classes/User.php:347 -#, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "" - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "" @@ -4285,7 +4285,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 msgid "User has no last notice" msgstr "" @@ -4332,102 +4332,102 @@ msgstr "" msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:439 +#: lib/command.php:440 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "תגובת עבור %s" -#: lib/command.php:441 +#: lib/command.php:442 #, fuzzy msgid "Error saving notice." msgstr "בעיה בשמירת ההודעה." -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:502 +#: lib/command.php:503 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:530 +#: lib/command.php:531 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:551 +#: lib/command.php:552 msgid "Notification off." msgstr "" -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:574 +#: lib/command.php:575 msgid "Notification on." msgstr "" -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" msgstr "" -#: lib/command.php:602 +#: lib/command.php:604 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "שמירת מידע התמונה נכשל" -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:623 +#: lib/command.php:625 #, fuzzy msgid "You are not subscribed to anyone." msgstr "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:625 +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "לא שלחנו אלינו את הפרופיל הזה" msgstr[1] "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:645 +#: lib/command.php:647 #, fuzzy msgid "No one is subscribed to you." msgstr "הרשמה מרוחקת" -#: lib/command.php:647 +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "הרשמה מרוחקת" msgstr[1] "הרשמה מרוחקת" -#: lib/command.php:667 +#: lib/command.php:669 #, fuzzy msgid "You are not a member of any groups." msgstr "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:669 +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "לא שלחנו אלינו את הפרופיל הזה" msgstr[1] "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:683 +#: lib/command.php:685 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4527,10 +4527,6 @@ msgstr "אין הודעה כזו." msgid "Favor" msgstr "" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "" @@ -4547,6 +4543,10 @@ msgstr "" msgid "FOAF" msgstr "" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "" + #: lib/galleryaction.php:121 msgid "Filter tags" msgstr "" @@ -4716,20 +4716,6 @@ msgstr "שם המשתמש או הסיסמה לא חוקיים" msgid "Sign up for a new account" msgstr "צור חשבון חדש" -#: lib/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "" - -#: 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 "" - -#: lib/mailbox.php:227 lib/noticelist.php:452 -msgid "from" -msgstr "" - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "" @@ -4911,6 +4897,20 @@ msgid "" "\n" msgstr "" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "" + +#: 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 "" + +#: lib/mailbox.php:227 lib/noticelist.php:452 +msgid "from" +msgstr "" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -4972,7 +4972,7 @@ msgstr "" msgid "To" msgstr "אל" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 #, fuzzy msgid "Available characters" msgstr "לפחות 6 אותיות" @@ -4987,11 +4987,11 @@ msgstr "הודעה חדשה" msgid "What's up, %s?" msgstr "מה המצב %s?" -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "" @@ -5064,11 +5064,11 @@ msgstr "שגיאה בהכנסת פרופיל מרוחק" msgid "Duplicate notice" msgstr "הודעה חדשה" -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 msgid "You have been banned from subscribing." msgstr "" -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "הכנסת מנוי חדש נכשלה." @@ -5237,20 +5237,6 @@ msgstr "הרשמה מרוחקת" msgid "Groups %s is a member of" msgstr "" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "" @@ -5282,6 +5268,20 @@ msgstr "מחיקת המנוי לא הצליחה." msgid "Couldn't delete subscription." msgstr "מחיקת המנוי לא הצליחה." +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "" + #: lib/tagcloudsection.php:56 #, fuzzy msgid "None" diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index 9bea1de8fc..4ef3a75860 100644 --- a/locale/hsb/LC_MESSAGES/statusnet.po +++ b/locale/hsb/LC_MESSAGES/statusnet.po @@ -1,5 +1,6 @@ # Translation of StatusNet to Upper Sorbian # +# Author@translatewiki.net: McDutchie # Author@translatewiki.net: Michawiki # -- # This file is distributed under the same license as the StatusNet package. @@ -8,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-07 21:25+0000\n" -"PO-Revision-Date: 2009-12-07 21:26:39+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:09:49+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: hsb\n" "X-Message-Group: out-statusnet\n" @@ -27,11 +28,11 @@ msgstr "Strona njeeksistuje" #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -44,7 +45,7 @@ msgstr "Strona njeeksistuje" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." @@ -56,7 +57,7 @@ msgid "%s and friends, page %d" msgstr "%s a přećeljo, bok %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s a přećeljo" @@ -107,24 +108,24 @@ msgstr "" msgid "You and friends" msgstr "Ty a přećeljo" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 msgid "API method not found." msgstr "API-metoda njenamakana." #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 @@ -143,9 +144,22 @@ msgstr "" msgid "Could not update user." msgstr "Wužiwar njeje so dał aktualizować." +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "Wužiwar nima profil." + +#: actions/apiaccountupdateprofile.php:147 +msgid "Could not save profile." +msgstr "Profil njeje so składować dał." + #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -166,19 +180,6 @@ msgstr "" msgid "Could not update your design." msgstr "Design njeda so aktualizować." -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "Wužiwar nima profil." - -#: actions/apiaccountupdateprofile.php:147 -msgid "Could not save profile." -msgstr "Profil njeje so składować dał." - #: actions/apiblockcreate.php:105 msgid "You cannot block yourself!" msgstr "Njemóžeš so samoho blokować." @@ -191,23 +192,6 @@ msgstr "" msgid "Unblock user failed." msgstr "" -#: actions/apidirectmessagenew.php:126 -msgid "No message text!" -msgstr "Žadyn powěsćowy tekst!" - -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, php-format -msgid "That's too long. Max message size is %d chars." -msgstr "To je předołho. Maksimalna powěsćowa wulkosć je %d znamješkow." - -#: actions/apidirectmessagenew.php:146 -msgid "Recipient user not found." -msgstr "Přijimowar njenamakany." - -#: actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." -msgstr "" - #: actions/apidirectmessage.php:89 #, php-format msgid "Direct messages from %s" @@ -233,18 +217,35 @@ msgstr "Wšě do %s pósłane direktne powěsće" #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "API-metoda njenamakana!" +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "Žadyn powěsćowy tekst!" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "To je předołho. Maksimalna powěsćowa wulkosć je %d znamješkow." + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "Přijimowar njenamakany." + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -387,16 +388,6 @@ msgstr "Njejsy čłon tuteje skupiny." msgid "Could not remove user %s to group %s." msgstr "" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, php-format -msgid "%s groups" -msgstr "" - -#: actions/apigrouplistall.php:94 -#, php-format -msgid "groups on %s" -msgstr "skupiny na %s" - #: actions/apigrouplist.php:95 #, php-format msgid "%s's groups" @@ -407,6 +398,16 @@ msgstr "" msgid "Groups %s is a member of on %s." msgstr "" +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "" + +#: actions/apigrouplistall.php:94 +#, php-format +msgid "groups on %s" +msgstr "skupiny na %s" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Tuta metoda wužaduje sej POST abo DELETE." @@ -442,54 +443,54 @@ msgstr "" msgid "Unsupported format." msgstr "Njepodpěrany format." -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, php-format msgid "%s / Favorites from %s" msgstr "" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, php-format msgid "%s updates favorited by %s / %s." msgstr "" -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "" -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "" @@ -525,45 +526,45 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" "Móžeš swój wosobinski awatar nahrać. Maksimalna datajowa wulkosć je %s." -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 msgid "User without matching profile" msgstr "Wužiwar bjez hodźaceho so profila" -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 msgid "Avatar settings" msgstr "Nastajenja awatara" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "Original" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "Přehlad" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 msgid "Delete" msgstr "Zničić" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "Nahrać" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -574,33 +575,70 @@ msgstr "" msgid "There was a problem with your session token. Try again, please." msgstr "" -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "" -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "Awatar zaktualizowany." -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "" -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 msgid "Avatar deleted." msgstr "Awatar zničeny." +#: actions/block.php:69 +msgid "You already blocked that user." +msgstr "Sy tutoho wužiwarja hižo zablokował." + +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +msgid "Block user" +msgstr "Wužiwarja blokować" + +#: actions/block.php:130 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" + +#: actions/block.php:143 actions/deletenotice.php:145 +#: actions/deleteuser.php:147 actions/groupblock.php:178 +msgid "No" +msgstr "Ně" + +#: actions/block.php:143 actions/deleteuser.php:147 +msgid "Do not block this user" +msgstr "Tutoho wužiwarja njeblokować" + +#: actions/block.php:144 actions/deletenotice.php:146 +#: actions/deleteuser.php:148 actions/groupblock.php:179 +msgid "Yes" +msgstr "Haj" + +#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 +msgid "Block this user" +msgstr "Tutoho wužiwarja blokować" + +#: actions/block.php:162 +msgid "Failed to save block information." +msgstr "" + #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 #: actions/groupmembers.php:76 actions/grouprss.php:91 @@ -641,43 +679,6 @@ msgstr "" msgid "Unblock this user" msgstr "" -#: actions/block.php:69 -msgid "You already blocked that user." -msgstr "Sy tutoho wužiwarja hižo zablokował." - -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 -msgid "Block user" -msgstr "Wužiwarja blokować" - -#: actions/block.php:130 -msgid "" -"Are you sure you want to block this user? Afterwards, they will be " -"unsubscribed from you, unable to subscribe to you in the future, and you " -"will not be notified of any @-replies from them." -msgstr "" - -#: actions/block.php:143 actions/deletenotice.php:145 -#: actions/deleteuser.php:147 actions/groupblock.php:178 -msgid "No" -msgstr "Ně" - -#: actions/block.php:143 actions/deleteuser.php:147 -msgid "Do not block this user" -msgstr "Tutoho wužiwarja njeblokować" - -#: actions/block.php:144 actions/deletenotice.php:146 -#: actions/deleteuser.php:148 actions/groupblock.php:179 -msgid "Yes" -msgstr "Haj" - -#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 -msgid "Block this user" -msgstr "Tutoho wužiwarja blokować" - -#: actions/block.php:162 -msgid "Failed to save block information." -msgstr "" - #: actions/bookmarklet.php:50 msgid "Post to " msgstr "" @@ -1004,7 +1005,7 @@ msgstr "E-mejlowa adresa" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" -msgstr "E-mejlowa adresa, kaž na př. \"WužiwarskeMjeno@přikład.org\"" +msgstr "E-mejlowa adresa, kaž na př. \"WužiwarskeMjeno@example.org\"" #: actions/emailsettings.php:126 actions/imsettings.php:133 #: actions/smssettings.php:145 @@ -1136,6 +1137,14 @@ msgstr "Adresa za dochadźaće e-mejle wotstronjena." msgid "New incoming email address added." msgstr "Nowa adresa za dochadźace e-mejle přidata." +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "Tuta zdźělenka je hižo faworit!" + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 msgid "Popular notices" @@ -1178,14 +1187,6 @@ msgstr "" msgid "Updates favored by %1$s on %2$s!" msgstr "" -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "Tuta zdźělenka je hižo faworit!" - -#: actions/favor.php:92 lib/disfavorform.php:140 -msgid "Disfavor favorite" -msgstr "" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1412,6 +1413,30 @@ msgstr "Tutoho wužiwarja k administratorej činić" msgid "Updates from members of %1$s on %2$s!" msgstr "" +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "Skupiny" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "Skupiny, strona %d" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +msgid "Create a new group" +msgstr "Nowu skupinu wutworić" + #: actions/groupsearch.php:52 #, php-format msgid "" @@ -1442,30 +1467,6 @@ msgid "" "action.newgroup%%) yourself!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 -#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 -msgid "Groups" -msgstr "Skupiny" - -#: actions/groups.php:64 -#, php-format -msgid "Groups, page %d" -msgstr "Skupiny, strona %d" - -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%site.name%%%% groups let you find and talk with people of similar " -"interests. After you join a group you can send messages to all other members " -"using the syntax \"!groupname\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" -msgstr "" - -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -msgid "Create a new group" -msgstr "Nowu skupinu wutworić" - #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "" @@ -1645,7 +1646,7 @@ msgstr "Wosobinska powěsć" msgid "Optionally add a personal message to the invitation." msgstr "Wosobinsku powěsć po dobrozdaću přeprošenju přidać." -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "Pósłać" @@ -1725,61 +1726,61 @@ msgstr "" msgid "%s left group %s" msgstr "" -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "Hižo přizjewjeny." -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 msgid "Invalid or expired token." msgstr "" -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "Wopačne wužiwarske mjeno abo hesło." -#: actions/login.php:152 +#: actions/login.php:153 msgid "Error setting user. You are probably not authorized." msgstr "Zmylk při nastajenju wužiwarja. Snano njejsy awtorizowany." -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Přizjewić" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "Při sydle přizjewić" -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Přimjeno" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Hesło" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "Składować" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "" -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "Hesło zhubjene abo zabyte?" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "" -#: actions/login.php:289 +#: actions/login.php:290 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1848,7 +1849,7 @@ msgstr "Powěsć pósłana" msgid "Direct message to %s sent" msgstr "" -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" msgstr "Zmylk Ajax" @@ -1856,7 +1857,7 @@ msgstr "Zmylk Ajax" msgid "New notice" msgstr "Nowa zdźělenka" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 msgid "Notice posted" msgstr "Zdźělenka wotpósłana" @@ -1930,8 +1931,8 @@ msgstr "" msgid "Only " msgstr "Jenož " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "Njeje podpěrany datowy format." @@ -3403,6 +3404,26 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, php-format +msgid "Notices tagged with %s, page %d" +msgstr "" + +#: actions/tag.php:86 +#, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "" + +#: actions/tag.php:92 +#, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "" + +#: actions/tag.php:98 +#, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "" + #: actions/tagother.php:33 msgid "Not logged in" msgstr "Njepřizjewjeny" @@ -3447,26 +3468,6 @@ msgstr "" msgid "Use this form to add tags to your subscribers or subscriptions." msgstr "" -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "" - -#: actions/tag.php:86 -#, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "" - -#: actions/tag.php:92 -#, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "" - -#: actions/tag.php:98 -#, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "" - #: actions/tagrss.php:35 msgid "No such tag." msgstr "" @@ -3755,38 +3756,43 @@ msgstr "" msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:179 +#: classes/Notice.php:188 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:183 +#: classes/Notice.php:192 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:194 +#: classes/Notice.php:203 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "" +#: classes/User.php:347 +#, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "" + #: classes/User_group.php:380 msgid "Could not create group." msgstr "" @@ -3795,11 +3801,6 @@ msgstr "" msgid "Could not set group membership." msgstr "" -#: classes/User.php:347 -#, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "" - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "" @@ -4096,7 +4097,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 msgid "User has no last notice" msgstr "" @@ -4143,72 +4144,72 @@ msgstr "" msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:439 +#: lib/command.php:440 #, php-format msgid "Reply to %s sent" msgstr "" -#: lib/command.php:441 +#: lib/command.php:442 msgid "Error saving notice." msgstr "" -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:502 +#: lib/command.php:503 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:530 +#: lib/command.php:531 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:551 +#: lib/command.php:552 msgid "Notification off." msgstr "" -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:574 +#: lib/command.php:575 msgid "Notification on." msgstr "" -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" msgstr "" -#: lib/command.php:602 -#, fuzzy, php-format +#: lib/command.php:604 +#, php-format msgid "Could not create login token for %s" -msgstr "Aliasy njejsu so dali wutworić." +msgstr "Njeje móžno było, přizjewjenske znamješko za %s wutworić" -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:623 +#: lib/command.php:625 msgid "You are not subscribed to anyone." msgstr "" -#: lib/command.php:625 +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Sy tutu wosobu abonował:" @@ -4216,11 +4217,11 @@ msgstr[1] "Sy tutej wosobje abonował:" msgstr[2] "Sy tute wosoby abonował:" msgstr[3] "Sy tute wosoby abonował:" -#: lib/command.php:645 +#: lib/command.php:647 msgid "No one is subscribed to you." msgstr "" -#: lib/command.php:647 +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Tuta wosoba je će abonowała:" @@ -4228,11 +4229,11 @@ msgstr[1] "Tutej wosobje stej će abonowałoj:" msgstr[2] "Tute wosoby su će abonowali:" msgstr[3] "Tute wosoby su će abonowali:" -#: lib/command.php:667 +#: lib/command.php:669 msgid "You are not a member of any groups." msgstr "" -#: lib/command.php:669 +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Sy čłon tuteje skupiny:" @@ -4240,7 +4241,7 @@ msgstr[1] "Sy čłon tuteju skupinow:" msgstr[2] "Sy čłon tutych skupinow:" msgstr[3] "Sy čłon tutych skupinow:" -#: lib/command.php:683 +#: lib/command.php:685 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4336,10 +4337,6 @@ msgstr "" msgid "Favor" msgstr "" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "RSS 1.0" @@ -4356,6 +4353,10 @@ msgstr "Atom" msgid "FOAF" msgstr "FOAF" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "" + #: lib/galleryaction.php:121 msgid "Filter tags" msgstr "" @@ -4514,20 +4515,6 @@ msgstr "Přizjewjenje z wužiwarskim mjenom a hesłom" msgid "Sign up for a new account" msgstr "Nowe konto registrować" -#: lib/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "" - -#: 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 "" - -#: lib/mailbox.php:227 lib/noticelist.php:452 -msgid "from" -msgstr "wot" - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "Wobkrućenje e-mejloweje adresy" @@ -4706,6 +4693,20 @@ msgid "" "\n" msgstr "" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "" + +#: 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 "" + +#: lib/mailbox.php:227 lib/noticelist.php:452 +msgid "from" +msgstr "wot" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -4766,7 +4767,7 @@ msgstr "Direktnu zdźělenku pósłać" msgid "To" msgstr "Komu" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 msgid "Available characters" msgstr "K dispoziciji stejace znamješka" @@ -4779,11 +4780,11 @@ msgstr "Zdźělenku pósłać" msgid "What's up, %s?" msgstr "" -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "Připowěsnyć" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "Dataju připowěsnyć" @@ -4852,11 +4853,11 @@ msgstr "Zmylk při zasunjenju zdaleneho profila" msgid "Duplicate notice" msgstr "Dwójna zdźělenka" -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 msgid "You have been banned from subscribing." msgstr "" -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "" @@ -5016,20 +5017,6 @@ msgstr "" msgid "Groups %s is a member of" msgstr "" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(žadyn)" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "Hižo abonowany!" @@ -5051,14 +5038,27 @@ msgid "Not subscribed!" msgstr "Njeje abonowany!" #: lib/subs.php:133 -#, fuzzy msgid "Couldn't delete self-subscription." -msgstr "Abonoment njeje so dał zničić." +msgstr "Sebjeabonement njeje so dał zničić." #: lib/subs.php:146 msgid "Couldn't delete subscription." msgstr "Abonoment njeje so dał zničić." +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "(žadyn)" + #: lib/tagcloudsection.php:56 msgid "None" msgstr "Žadyn" diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index 16e4b7435a..2eb8678b6e 100644 --- a/locale/is/LC_MESSAGES/statusnet.po +++ b/locale/is/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-07 21:25+0000\n" -"PO-Revision-Date: 2009-12-07 21:26:42+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:09:52+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: is\n" "X-Message-Group: out-statusnet\n" @@ -28,11 +28,11 @@ msgstr "Ekkert þannig merki." #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -45,7 +45,7 @@ msgstr "Ekkert þannig merki." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." @@ -57,7 +57,7 @@ msgid "%s and friends, page %d" msgstr "%s og vinirnir, síða %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s og vinirnir" @@ -108,25 +108,25 @@ msgstr "" msgid "You and friends" msgstr "" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Færslur frá %1$s og vinum á %2$s!" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 #, fuzzy msgid "API method not found." msgstr "Aðferð í forritsskilum fannst ekki!" #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 @@ -146,9 +146,23 @@ msgstr "" msgid "Could not update user." msgstr "Gat ekki uppfært notanda." +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "Notandi hefur enga persónulega síðu." + +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Gat ekki vistað persónulega síðu." + #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -170,20 +184,6 @@ msgstr "" msgid "Could not update your design." msgstr "Gat ekki uppfært hóp." -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "Notandi hefur enga persónulega síðu." - -#: actions/apiaccountupdateprofile.php:147 -#, fuzzy -msgid "Could not save profile." -msgstr "Gat ekki vistað persónulega síðu." - #: actions/apiblockcreate.php:105 #, fuzzy msgid "You cannot block yourself!" @@ -197,23 +197,6 @@ msgstr "Mistókst að loka á notanda." msgid "Unblock user failed." msgstr "Mistókst að opna fyrir notanda." -#: actions/apidirectmessagenew.php:126 -msgid "No message text!" -msgstr "Enginn texti í skilaboðum!" - -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, fuzzy, php-format -msgid "That's too long. Max message size is %d chars." -msgstr "Þetta er of langt. Hámarkslengd skilaboða er 140 tákn." - -#: actions/apidirectmessagenew.php:146 -msgid "Recipient user not found." -msgstr "Móttakandi fannst ekki." - -#: actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." -msgstr "Gat ekki sent bein skilaboð til notenda sem eru ekki vinir þínir." - #: actions/apidirectmessage.php:89 #, fuzzy, php-format msgid "Direct messages from %s" @@ -239,18 +222,35 @@ msgstr "Öll bein skilaboð til %s" #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "Aðferð í forritsskilum fannst ekki!" +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "Enginn texti í skilaboðum!" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, fuzzy, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "Þetta er of langt. Hámarkslengd skilaboða er 140 tákn." + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "Móttakandi fannst ekki." + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "Gat ekki sent bein skilaboð til notenda sem eru ekki vinir þínir." + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -398,16 +398,6 @@ msgstr "Þú ert ekki meðlimur í þessum hópi." msgid "Could not remove user %s to group %s." msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, php-format -msgid "%s groups" -msgstr "Hópar %s" - -#: actions/apigrouplistall.php:94 -#, fuzzy, php-format -msgid "groups on %s" -msgstr "Hópsaðgerðir" - #: actions/apigrouplist.php:95 #, fuzzy, php-format msgid "%s's groups" @@ -418,6 +408,16 @@ msgstr "Hópar %s" msgid "Groups %s is a member of on %s." msgstr "Hópar sem %s er meðlimur í" +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "Hópar %s" + +#: actions/apigrouplistall.php:94 +#, fuzzy, php-format +msgid "groups on %s" +msgstr "Hópsaðgerðir" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Þessi aðferð krefst POST eða DELETE." @@ -454,54 +454,54 @@ msgstr "" msgid "Unsupported format." msgstr "Skráarsnið myndar ekki stutt." -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, php-format msgid "%s / Favorites from %s" msgstr "%s / Uppáhaldsbabl frá %s" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, php-format msgid "%s updates favorited by %s / %s." msgstr "%s færslur gerðar að uppáhaldsbabli af %s / %s." -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "Rás %s" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Færslur frá %1$s á %2$s!" -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "" -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s færslur sem svara færslum frá %2$s / %3$s." -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Almenningsrás %s" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s færslur frá öllum!" -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "Babl merkt með %s" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "" @@ -536,45 +536,45 @@ msgstr "Mynd" msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 msgid "User without matching profile" msgstr "Notandi með enga persónulega síðu sem passar við" -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 msgid "Avatar settings" msgstr "Stillingar fyrir mynd" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "Upphafleg mynd" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "Forsýn" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 msgid "Delete" msgstr "Eyða" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "Hlaða upp" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "Skera af" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -585,34 +585,73 @@ msgstr "Skera af" msgid "There was a problem with your session token. Try again, please." msgstr "Það kom upp vandamál með setutókann þinn. Vinsamlegast reyndu aftur." -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Bjóst ekki við innsendingu eyðublaðs." -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" "Veldu ferningslaga svæði á upphaflegu myndinni sem einkennismyndina þína" -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "Týndum skráargögnunum okkar" -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "Mynd hefur verið uppfærð." -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "Mistókst að uppfæra mynd" -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 msgid "Avatar deleted." msgstr "" +#: actions/block.php:69 +#, fuzzy +msgid "You already blocked that user." +msgstr "Þú hefur nú þegar lokað á þennan notanda." + +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +msgid "Block user" +msgstr "Loka á notanda" + +#: actions/block.php:130 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" + +#: actions/block.php:143 actions/deletenotice.php:145 +#: actions/deleteuser.php:147 actions/groupblock.php:178 +msgid "No" +msgstr "Nei" + +#: actions/block.php:143 actions/deleteuser.php:147 +#, fuzzy +msgid "Do not block this user" +msgstr "Opna á þennan notanda" + +#: actions/block.php:144 actions/deletenotice.php:146 +#: actions/deleteuser.php:148 actions/groupblock.php:179 +msgid "Yes" +msgstr "Já" + +#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 +msgid "Block this user" +msgstr "Loka á þennan notanda" + +#: actions/block.php:162 +msgid "Failed to save block information." +msgstr "Mistókst að vista upplýsingar um notendalokun" + #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 #: actions/groupmembers.php:76 actions/grouprss.php:91 @@ -653,45 +692,6 @@ msgstr "Opna" msgid "Unblock this user" msgstr "Opna á þennan notanda" -#: actions/block.php:69 -#, fuzzy -msgid "You already blocked that user." -msgstr "Þú hefur nú þegar lokað á þennan notanda." - -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 -msgid "Block user" -msgstr "Loka á notanda" - -#: actions/block.php:130 -msgid "" -"Are you sure you want to block this user? Afterwards, they will be " -"unsubscribed from you, unable to subscribe to you in the future, and you " -"will not be notified of any @-replies from them." -msgstr "" - -#: actions/block.php:143 actions/deletenotice.php:145 -#: actions/deleteuser.php:147 actions/groupblock.php:178 -msgid "No" -msgstr "Nei" - -#: actions/block.php:143 actions/deleteuser.php:147 -#, fuzzy -msgid "Do not block this user" -msgstr "Opna á þennan notanda" - -#: actions/block.php:144 actions/deletenotice.php:146 -#: actions/deleteuser.php:148 actions/groupblock.php:179 -msgid "Yes" -msgstr "Já" - -#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 -msgid "Block this user" -msgstr "Loka á þennan notanda" - -#: actions/block.php:162 -msgid "Failed to save block information." -msgstr "Mistókst að vista upplýsingar um notendalokun" - #: actions/bookmarklet.php:50 #, fuzzy msgid "Post to " @@ -1166,6 +1166,14 @@ msgstr "Móttökutölvupóstfang fjarlægt." msgid "New incoming email address added." msgstr "Nýju móttökutölvupóstfangi bætt við." +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "Þetta babl er nú þegar í uppáhaldi!" + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "Ekki lengur í uppáhaldi" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 msgid "Popular notices" @@ -1208,14 +1216,6 @@ msgstr "Uppáhaldsbabl %s" msgid "Updates favored by %1$s on %2$s!" msgstr "Færslur frá %1$s á %2$s!" -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "Þetta babl er nú þegar í uppáhaldi!" - -#: actions/favor.php:92 lib/disfavorform.php:140 -msgid "Disfavor favorite" -msgstr "Ekki lengur í uppáhaldi" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1446,6 +1446,30 @@ msgstr "" msgid "Updates from members of %1$s on %2$s!" msgstr "Færslur frá %1$s á %2$s!" +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "Hópar" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "Hópar, síða %d" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +msgid "Create a new group" +msgstr "Búa til nýjan hóp" + #: actions/groupsearch.php:52 #, php-format msgid "" @@ -1476,30 +1500,6 @@ msgid "" "action.newgroup%%) yourself!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 -#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 -msgid "Groups" -msgstr "Hópar" - -#: actions/groups.php:64 -#, php-format -msgid "Groups, page %d" -msgstr "Hópar, síða %d" - -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%site.name%%%% groups let you find and talk with people of similar " -"interests. After you join a group you can send messages to all other members " -"using the syntax \"!groupname\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" -msgstr "" - -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -msgid "Create a new group" -msgstr "Búa til nýjan hóp" - #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "" @@ -1696,7 +1696,7 @@ msgstr "Persónuleg skilaboð" msgid "Optionally add a personal message to the invitation." msgstr "Bættu persónulegum skilaboðum við boðskortið ef þú vilt." -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "Senda" @@ -1802,59 +1802,59 @@ msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s" msgid "%s left group %s" msgstr "%s gekk úr hópnum %s" -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "Þú hefur nú þegar skráð þig inn." -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 #, fuzzy msgid "Invalid or expired token." msgstr "Ótækt bablinnihald" -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "Rangt notendanafn eða lykilorð." -#: actions/login.php:152 +#: actions/login.php:153 #, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "Engin heimild." -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Innskráning" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "Skrá þig inn á síðuna" -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Stuttnefni" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Lykilorð" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "Muna eftir mér" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Sjálfvirk innskráning í framtíðinni. Ekki nota þetta á tölvu sem aðrir deila " "með þér!" -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "Tapað eða gleymt lykilorð?" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1862,7 +1862,7 @@ msgstr "" "Af öryggisástæðum, vinsamlegast sláðu aftur inn notendanafnið þitt og " "lykilorð áður en þú breytir stillingunum þínum." -#: actions/login.php:289 +#: actions/login.php:290 #, fuzzy, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1936,7 +1936,7 @@ msgstr "" msgid "Direct message to %s sent" msgstr "Bein skilaboð send til %s" -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" msgstr "Ajax villa" @@ -1944,7 +1944,7 @@ msgstr "Ajax villa" msgid "New notice" msgstr "Nýtt babl" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 msgid "Notice posted" msgstr "Babl sent inn" @@ -2022,8 +2022,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "Enginn stuðningur við gagnasnið." @@ -3567,6 +3567,26 @@ msgstr "Jabber snarskilaboðaþjónusta" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, php-format +msgid "Notices tagged with %s, page %d" +msgstr "Babl merkt með %s, síða %d" + +#: actions/tag.php:86 +#, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "" + +#: actions/tag.php:92 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "Bablveita fyrir %s" + +#: actions/tag.php:98 +#, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "" + #: actions/tagother.php:33 msgid "Not logged in" msgstr "Ekki innskráð(ur)" @@ -3617,26 +3637,6 @@ msgstr "" "Notaðu þetta eyðublað til að bæta við merkjum við áskrifendur þína eða þau " "sem þú ert áskrifandi að." -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Babl merkt með %s, síða %d" - -#: actions/tag.php:86 -#, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "" - -#: actions/tag.php:92 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "Bablveita fyrir %s" - -#: actions/tag.php:98 -#, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "" - #: actions/tagrss.php:35 msgid "No such tag." msgstr "Ekkert þannig merki." @@ -3947,40 +3947,45 @@ msgstr "Gat ekki uppfært skilaboð með nýju veffangi." msgid "DB error inserting hashtag: %s" msgstr "Gagnagrunnsvilla við innsetningu myllumerkis: %s" -#: classes/Notice.php:179 +#: classes/Notice.php:188 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:183 +#: classes/Notice.php:192 msgid "Problem saving notice. Unknown user." msgstr "Gat ekki vistað babl. Óþekktur notandi." -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Of mikið babl í einu; slakaðu aðeins á og haltu svo áfram eftir nokkrar " "mínútur." -#: classes/Notice.php:194 +#: classes/Notice.php:203 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "Það hefur verið lagt bann við babli frá þér á þessari síðu." -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "Vandamál komu upp við að vista babl." -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "Gagnagrunnsvilla við innsetningu svars: %s" +#: classes/User.php:347 +#, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "" + #: classes/User_group.php:380 msgid "Could not create group." msgstr "Gat ekki búið til hóp." @@ -3989,11 +3994,6 @@ msgstr "Gat ekki búið til hóp." msgid "Could not set group membership." msgstr "Gat ekki skráð hópmeðlimi." -#: classes/User.php:347 -#, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "" - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Breyta persónulegu stillingunum þínum" @@ -4306,7 +4306,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 msgid "User has no last notice" msgstr "Notandi hefur ekkert nýtt babl" @@ -4353,102 +4353,102 @@ msgstr "Villa kom upp við að senda bein skilaboð" msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d" -#: lib/command.php:439 +#: lib/command.php:440 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Svara þessu babli" -#: lib/command.php:441 +#: lib/command.php:442 #, fuzzy msgid "Error saving notice." msgstr "Vandamál komu upp við að vista babl." -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "Tilgreindu nafn notandans sem þú vilt gerast áskrifandi að" -#: lib/command.php:502 +#: lib/command.php:503 #, php-format msgid "Subscribed to %s" msgstr "Nú ert þú áskrifandi að %s" -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "Tilgreindu nafn notandans sem þú vilt hætta sem áskrifandi að" -#: lib/command.php:530 +#: lib/command.php:531 #, php-format msgid "Unsubscribed from %s" msgstr "Nú ert þú ekki lengur áskrifandi að %s" -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "Skipun hefur ekki verið fullbúin" -#: lib/command.php:551 +#: lib/command.php:552 msgid "Notification off." msgstr "Tilkynningar af." -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "Get ekki slökkt á tilkynningum." -#: lib/command.php:574 +#: lib/command.php:575 msgid "Notification on." msgstr "Tilkynningar á." -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "Get ekki kveikt á tilkynningum." -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" msgstr "" -#: lib/command.php:602 +#: lib/command.php:604 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Gat ekki búið til uppáhald." -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:623 +#: lib/command.php:625 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Þú ert ekki áskrifandi." -#: lib/command.php:625 +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Þú ert nú þegar í áskrift að þessum notendum:" msgstr[1] "Þú ert nú þegar í áskrift að þessum notendum:" -#: lib/command.php:645 +#: lib/command.php:647 #, fuzzy msgid "No one is subscribed to you." msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér." -#: lib/command.php:647 +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Gat ekki leyft öðrum að gerast áskrifandi að þér." msgstr[1] "Gat ekki leyft öðrum að gerast áskrifandi að þér." -#: lib/command.php:667 +#: lib/command.php:669 #, fuzzy msgid "You are not a member of any groups." msgstr "Þú ert ekki meðlimur í þessum hópi." -#: lib/command.php:669 +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Þú ert ekki meðlimur í þessum hópi." msgstr[1] "Þú ert ekki meðlimur í þessum hópi." -#: lib/command.php:683 +#: lib/command.php:685 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4547,10 +4547,6 @@ msgstr "Setja þetta babl í uppáhald" msgid "Favor" msgstr "Uppáhald" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "Flytja út gögn" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "" @@ -4567,6 +4563,10 @@ msgstr "" msgid "FOAF" msgstr "" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "Flytja út gögn" + #: lib/galleryaction.php:121 msgid "Filter tags" msgstr "Sía merki" @@ -4728,21 +4728,6 @@ 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/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "Aðeins notandinn getur lesið hans eigin pósthólf." - -#: 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 "" - -#: lib/mailbox.php:227 lib/noticelist.php:452 -#, fuzzy -msgid "from" -msgstr "frá" - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "Staðfesting tölvupóstfangs" @@ -4929,6 +4914,21 @@ msgid "" "\n" msgstr "" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "Aðeins notandinn getur lesið hans eigin pósthólf." + +#: 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 "" + +#: lib/mailbox.php:227 lib/noticelist.php:452 +#, fuzzy +msgid "from" +msgstr "frá" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -4990,7 +4990,7 @@ msgstr "Senda bein skilaboð" msgid "To" msgstr "Til" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 msgid "Available characters" msgstr "Leyfileg tákn" @@ -5003,11 +5003,11 @@ msgstr "Senda babl" msgid "What's up, %s?" msgstr "Hvað er að frétta %s?" -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "" @@ -5078,12 +5078,12 @@ msgstr "Villa kom upp við að setja inn persónulega fjarsíðu" msgid "Duplicate notice" msgstr "Eyða babli" -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 #, fuzzy msgid "You have been banned from subscribing." msgstr "Þessi notandi hefur bannað þér að gerast áskrifandi" -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Gat ekki sett inn nýja áskrift." @@ -5248,20 +5248,6 @@ msgstr "Fólk sem eru áskrifendur að %s" msgid "Groups %s is a member of" msgstr "Hópar sem %s er meðlimur í" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(ekkert)" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "" @@ -5292,6 +5278,20 @@ msgstr "Gat ekki eytt áskrift." msgid "Couldn't delete subscription." msgstr "Gat ekki eytt áskrift." +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "(ekkert)" + #: lib/tagcloudsection.php:56 msgid "None" msgstr "Ekkert" diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index b86ca75b94..6a85f3dc25 100644 --- a/locale/it/LC_MESSAGES/statusnet.po +++ b/locale/it/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-07 21:25+0000\n" -"PO-Revision-Date: 2009-12-07 21:26:45+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:09:55+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: it\n" "X-Message-Group: out-statusnet\n" @@ -27,11 +27,11 @@ msgstr "Nessuna tale etichetta." #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -44,7 +44,7 @@ msgstr "Nessuna tale etichetta." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." @@ -56,7 +56,7 @@ msgid "%s and friends, page %d" msgstr "%s e amici, pagina %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s e amici" @@ -108,25 +108,25 @@ msgstr "" msgid "You and friends" msgstr "%s e amici" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Aggiornamenti da %1$s e amici su %2$s!" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 #, fuzzy msgid "API method not found." msgstr "Metodo delle API non trovato!" #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 @@ -146,9 +146,23 @@ msgstr "" msgid "Could not update user." msgstr "Impossibile aggiornare l'utente." +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "L'utente non ha un profilo." + +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Impossibile salvare il profilo." + #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -171,20 +185,6 @@ msgstr "Impossibile salvare le tue impostazioni di Twitter!" msgid "Could not update your design." msgstr "Impossibile aggiornare l'utente." -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "L'utente non ha un profilo." - -#: actions/apiaccountupdateprofile.php:147 -#, fuzzy -msgid "Could not save profile." -msgstr "Impossibile salvare il profilo." - #: actions/apiblockcreate.php:105 #, fuzzy msgid "You cannot block yourself!" @@ -198,23 +198,6 @@ msgstr "Blocco dell'utente non riuscito." msgid "Unblock user failed." msgstr "Sblocco dell'utente non riuscito." -#: actions/apidirectmessagenew.php:126 -msgid "No message text!" -msgstr "Nessun testo nel messaggio!" - -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, fuzzy, php-format -msgid "That's too long. Max message size is %d chars." -msgstr "Troppo lungo. Il massimo per un messaggio è 140 caratteri." - -#: actions/apidirectmessagenew.php:146 -msgid "Recipient user not found." -msgstr "Utente destinatario non trovato." - -#: actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." -msgstr "Non puoi inviare messaggi diretti a utenti che non sono amici tuoi." - #: actions/apidirectmessage.php:89 #, fuzzy, php-format msgid "Direct messages from %s" @@ -240,18 +223,35 @@ msgstr "Tutti i messaggi diretti inviati a %s" #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "Metodo delle API non trovato!" +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "Nessun testo nel messaggio!" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, fuzzy, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "Troppo lungo. Il massimo per un messaggio è 140 caratteri." + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "Utente destinatario non trovato." + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "Non puoi inviare messaggi diretti a utenti che non sono amici tuoi." + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -404,16 +404,6 @@ msgstr "Non sei un membro di quel gruppo." msgid "Could not remove user %s to group %s." msgstr "Impossibile rimuovere l'utente %s dal gruppo %s" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, php-format -msgid "%s groups" -msgstr "Gruppi di %s" - -#: actions/apigrouplistall.php:94 -#, fuzzy, php-format -msgid "groups on %s" -msgstr "Azioni dei gruppi" - #: actions/apigrouplist.php:95 #, fuzzy, php-format msgid "%s's groups" @@ -424,6 +414,16 @@ msgstr "Gruppi di %s" msgid "Groups %s is a member of on %s." msgstr "Il gruppo %s è membro di" +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "Gruppi di %s" + +#: actions/apigrouplistall.php:94 +#, fuzzy, php-format +msgid "groups on %s" +msgstr "Azioni dei gruppi" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Questo metodo richiede POST o DELETE." @@ -461,54 +461,54 @@ msgstr "" msgid "Unsupported format." msgstr "Formato file immagine non supportato." -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, php-format msgid "%s / Favorites from %s" msgstr "%s / Preferiti da %s" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, php-format msgid "%s updates favorited by %s / %s." msgstr "%s aggiornamenti preferiti da %s / %s" -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "Attività di %s" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Aggiornamenti da %1$s su %2$s!" -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, fuzzy, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Aggiornamenti in risposta a %2$s" -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s aggiornamenti in risposta agli aggiornamenti da %2$s / %3$s" -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "attività pubblica di %s" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "Aggiornamenti di %s da tutti!" -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "Messaggi etichettati con %s" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Aggiornamenti da %1$s su %2$s!" @@ -544,45 +544,45 @@ msgstr "Immagine" msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "Qui puoi caricare la tua immagine personale." -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 msgid "User without matching profile" msgstr "Utente senza profilo corrispondente" -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 msgid "Avatar settings" msgstr "Impostazioni immagine" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "Originale" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "Anteprima" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 msgid "Delete" msgstr "Elimina" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "Carica" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "Ritaglia" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -593,34 +593,73 @@ msgstr "Ritaglia" msgid "There was a problem with your session token. Try again, please." msgstr "C'è stato un problema con il tuo token di sessione. Prova di nuovo." -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Invio del modulo inaspettato." -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "Scegli un'area quadrata per la tua immagine personale" -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "Perso il nostro file di dati." -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "Immagine aggiornata." -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "Errore nell'aggiornare l'immagine." -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 #, fuzzy msgid "Avatar deleted." msgstr "Immagine aggiornata." +#: actions/block.php:69 +#, fuzzy +msgid "You already blocked that user." +msgstr "Hai già bloccato questo utente." + +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +msgid "Block user" +msgstr "Blocca utente" + +#: actions/block.php:130 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" + +#: actions/block.php:143 actions/deletenotice.php:145 +#: actions/deleteuser.php:147 actions/groupblock.php:178 +msgid "No" +msgstr "No" + +#: actions/block.php:143 actions/deleteuser.php:147 +#, fuzzy +msgid "Do not block this user" +msgstr "Sblocca questo utente" + +#: actions/block.php:144 actions/deletenotice.php:146 +#: actions/deleteuser.php:148 actions/groupblock.php:179 +msgid "Yes" +msgstr "Sì" + +#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 +msgid "Block this user" +msgstr "Blocca questo utente" + +#: actions/block.php:162 +msgid "Failed to save block information." +msgstr "Salvataggio delle informazioni per il blocco non riuscito." + #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 #: actions/groupmembers.php:76 actions/grouprss.php:91 @@ -663,45 +702,6 @@ msgstr "Sblocca" msgid "Unblock this user" msgstr "Sblocca questo utente" -#: actions/block.php:69 -#, fuzzy -msgid "You already blocked that user." -msgstr "Hai già bloccato questo utente." - -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 -msgid "Block user" -msgstr "Blocca utente" - -#: actions/block.php:130 -msgid "" -"Are you sure you want to block this user? Afterwards, they will be " -"unsubscribed from you, unable to subscribe to you in the future, and you " -"will not be notified of any @-replies from them." -msgstr "" - -#: actions/block.php:143 actions/deletenotice.php:145 -#: actions/deleteuser.php:147 actions/groupblock.php:178 -msgid "No" -msgstr "No" - -#: actions/block.php:143 actions/deleteuser.php:147 -#, fuzzy -msgid "Do not block this user" -msgstr "Sblocca questo utente" - -#: actions/block.php:144 actions/deletenotice.php:146 -#: actions/deleteuser.php:148 actions/groupblock.php:179 -msgid "Yes" -msgstr "Sì" - -#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 -msgid "Block this user" -msgstr "Blocca questo utente" - -#: actions/block.php:162 -msgid "Failed to save block information." -msgstr "Salvataggio delle informazioni per il blocco non riuscito." - #: actions/bookmarklet.php:50 #, fuzzy msgid "Post to " @@ -1190,6 +1190,14 @@ msgstr "Indirizzo email di ricezione rimosso." msgid "New incoming email address added." msgstr "Nuovo indirizzo email di ricezione aggiunto." +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "Questo messaggio è già un preferito!" + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "Rimuovi preferito" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 msgid "Popular notices" @@ -1232,14 +1240,6 @@ msgstr "Messaggi preferiti di %s" msgid "Updates favored by %1$s on %2$s!" msgstr "Aggiornamenti da %1$s su %2$s!" -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "Questo messaggio è già un preferito!" - -#: actions/favor.php:92 lib/disfavorform.php:140 -msgid "Disfavor favorite" -msgstr "Rimuovi preferito" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1487,6 +1487,30 @@ msgstr "" msgid "Updates from members of %1$s on %2$s!" msgstr "Aggiornamenti da %1$s su %2$s!" +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "Gruppi" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "Gruppi, pagina %d" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +msgid "Create a new group" +msgstr "Crea un nuovo gruppo" + #: actions/groupsearch.php:52 #, fuzzy, php-format msgid "" @@ -1520,30 +1544,6 @@ msgid "" "action.newgroup%%) yourself!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 -#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 -msgid "Groups" -msgstr "Gruppi" - -#: actions/groups.php:64 -#, php-format -msgid "Groups, page %d" -msgstr "Gruppi, pagina %d" - -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%site.name%%%% groups let you find and talk with people of similar " -"interests. After you join a group you can send messages to all other members " -"using the syntax \"!groupname\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" -msgstr "" - -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -msgid "Create a new group" -msgstr "Crea un nuovo gruppo" - #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "" @@ -1741,7 +1741,7 @@ msgstr "Messaggio personale" msgid "Optionally add a personal message to the invitation." msgstr "Puoi aggiungere un messaggio personale agli inviti." -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "Invia" @@ -1847,57 +1847,57 @@ msgstr "Impossibile rimuovere l'utente %s dal gruppo %s" msgid "%s left group %s" msgstr "%s ha lasciato il gruppo %s" -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "Accesso già effettuato." -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 #, fuzzy msgid "Invalid or expired token." msgstr "Contenuto del messaggio non valido" -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "Nome utente o password non corretto." -#: actions/login.php:152 +#: actions/login.php:153 #, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "Non autorizzato." -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Accedi" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "Accedi al sito" -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Soprannome" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Password" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "Ricordami" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "Accedi automaticamente in futuro; non per computer condivisi!" -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "Password persa o dimenticata?" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1905,7 +1905,7 @@ msgstr "" "Per motivi di sicurezza è necessario reinserire il proprio nome utente e la " "propria password prima di modificare le impostazioni." -#: actions/login.php:289 +#: actions/login.php:290 #, fuzzy, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1978,7 +1978,7 @@ msgstr "Messaggio" msgid "Direct message to %s sent" msgstr "Messaggio diretto a %s inviato" -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" msgstr "Errore di Ajax" @@ -1986,7 +1986,7 @@ msgstr "Errore di Ajax" msgid "New notice" msgstr "Nuovo messaggio" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 msgid "Notice posted" msgstr "Messaggio inviato" @@ -2065,8 +2065,8 @@ msgstr "Connetti" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "Non è un formato di dati supportato." @@ -3628,6 +3628,26 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, php-format +msgid "Notices tagged with %s, page %d" +msgstr "Messaggi etichettati con %s, pagina %d" + +#: actions/tag.php:86 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "Feed dei messaggi per %s" + +#: actions/tag.php:92 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "Feed dei messaggi per %s" + +#: actions/tag.php:98 +#, fuzzy, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "Feed dei messaggi per %s" + #: actions/tagother.php:33 msgid "Not logged in" msgstr "Non connesso" @@ -3677,26 +3697,6 @@ msgstr "" "Usa questo modulo per aggiungere etichette ai tuoi abbonati o ai tuoi " "abbonamenti." -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Messaggi etichettati con %s, pagina %d" - -#: actions/tag.php:86 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "Feed dei messaggi per %s" - -#: actions/tag.php:92 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "Feed dei messaggi per %s" - -#: actions/tag.php:98 -#, fuzzy, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "Feed dei messaggi per %s" - #: actions/tagrss.php:35 msgid "No such tag." msgstr "Nessuna tale etichetta." @@ -4011,23 +4011,23 @@ msgstr "Impossibile aggiornare il messaggio con il nuovo URI." msgid "DB error inserting hashtag: %s" msgstr "Errore del DB nell'inserire un hashtag: %s" -#: classes/Notice.php:179 +#: classes/Notice.php:188 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Problema nel salvare il messaggio." -#: classes/Notice.php:183 +#: classes/Notice.php:192 msgid "Problem saving notice. Unknown user." msgstr "Problema nel salvare il messaggio. Utente sconosciuto." -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Troppi messaggi troppo velocemente; fai una pausa e scrivi di nuovo tra " "qualche minuto." -#: classes/Notice.php:194 +#: classes/Notice.php:203 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4036,19 +4036,24 @@ msgstr "" "Troppi messaggi troppo velocemente; fai una pausa e scrivi di nuovo tra " "qualche minuto." -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "Ti è proibito inviare messaggi su questo sito." -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "Problema nel salvare il messaggio." -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "Errore del DB nell'inserire la risposta: %s" +#: classes/User.php:347 +#, fuzzy, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "Messaggio a %1$s su %2$s" + #: classes/User_group.php:380 msgid "Could not create group." msgstr "Impossibile creare il gruppo." @@ -4057,11 +4062,6 @@ msgstr "Impossibile creare il gruppo." msgid "Could not set group membership." msgstr "Impossibile impostare la membership al gruppo." -#: classes/User.php:347 -#, fuzzy, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "Messaggio a %1$s su %2$s" - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Modifica le impostazioni del tuo profilo" @@ -4376,7 +4376,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 msgid "User has no last notice" msgstr "L'utente non ha un ultimo messaggio" @@ -4423,102 +4423,102 @@ msgstr "Errore nell'inviare il messaggio diretto." msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Messaggio troppo lungo - massimo 140 caratteri, inviati %d" -#: lib/command.php:439 +#: lib/command.php:440 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Rispondi a questo messaggio" -#: lib/command.php:441 +#: lib/command.php:442 #, fuzzy msgid "Error saving notice." msgstr "Problema nel salvare il messaggio." -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "Specifica il nome dell'utente a cui abbonarti" -#: lib/command.php:502 +#: lib/command.php:503 #, php-format msgid "Subscribed to %s" msgstr "Abbonato a %s" -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "Specifica il nome dell'utente da cui annullare l'abbonamento" -#: lib/command.php:530 +#: lib/command.php:531 #, php-format msgid "Unsubscribed from %s" msgstr "Abbonamento a %s annullato" -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "Comando non ancora implementato." -#: lib/command.php:551 +#: lib/command.php:552 msgid "Notification off." msgstr "Notifiche disattivate." -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "Impossibile disattivare le notifiche." -#: lib/command.php:574 +#: lib/command.php:575 msgid "Notification on." msgstr "Notifiche attivate." -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "Impossibile attivare le notifiche." -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" msgstr "" -#: lib/command.php:602 +#: lib/command.php:604 #, fuzzy, php-format msgid "Could not create login token for %s" -msgstr "Impossibile creare preferito." +msgstr "Impossibile creare il modulo OpenID: %s" -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:623 +#: lib/command.php:625 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Non sei abbonato a quel profilo." -#: lib/command.php:625 +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Sei già abbonato a questi utenti:" msgstr[1] "Sei già abbonato a questi utenti:" -#: lib/command.php:645 +#: lib/command.php:647 #, fuzzy msgid "No one is subscribed to you." msgstr "Impossibile abbonare altri a te." -#: lib/command.php:647 +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Impossibile abbonare altri a te." msgstr[1] "Impossibile abbonare altri a te." -#: lib/command.php:667 +#: lib/command.php:669 #, fuzzy msgid "You are not a member of any groups." msgstr "Non sei un membro di quel gruppo." -#: lib/command.php:669 +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Non sei un membro di quel gruppo." msgstr[1] "Non sei un membro di quel gruppo." -#: lib/command.php:683 +#: lib/command.php:685 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4618,10 +4618,6 @@ msgstr "Rendi questo messaggio un favorito" msgid "Favor" msgstr "Preferito" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "Esporta dati" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "" @@ -4638,6 +4634,10 @@ msgstr "" msgid "FOAF" msgstr "" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "Esporta dati" + #: lib/galleryaction.php:121 msgid "Filter tags" msgstr "Filtra etichette" @@ -4799,21 +4799,6 @@ msgstr "Accedi con nome utente e password" msgid "Sign up for a new account" msgstr "Iscriviti per un nuovo account" -#: lib/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "Solo l'utente può leggere la propria casella di posta." - -#: 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 "" - -#: lib/mailbox.php:227 lib/noticelist.php:452 -#, fuzzy -msgid "from" -msgstr " via " - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "Conferma indirizzo email" @@ -5006,6 +4991,21 @@ msgid "" "\n" msgstr "" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "Solo l'utente può leggere la propria casella di posta." + +#: 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 "" + +#: lib/mailbox.php:227 lib/noticelist.php:452 +#, fuzzy +msgid "from" +msgstr " via " + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5066,7 +5066,7 @@ msgstr "Invia un messaggio diretto" msgid "To" msgstr "A" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 msgid "Available characters" msgstr "Caratteri disponibili" @@ -5079,11 +5079,11 @@ msgstr "Invia un messaggio" msgid "What's up, %s?" msgstr "Cosa succede, %s?" -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "" @@ -5155,12 +5155,12 @@ msgstr "Errore nell'inserire un profilo remoto" msgid "Duplicate notice" msgstr "Elimina messaggio" -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 #, fuzzy msgid "You have been banned from subscribing." msgstr "Quell'utente ti ha bloccato dall'abbonarti." -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Impossibile inserire un nuovo abbonamento." @@ -5328,20 +5328,6 @@ msgstr "Persone abbonate a %s" msgid "Groups %s is a member of" msgstr "Il gruppo %s è membro di" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(nessuna)" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "" @@ -5372,6 +5358,20 @@ msgstr "Impossibile eliminare l'abbonamento." msgid "Couldn't delete subscription." msgstr "Impossibile eliminare l'abbonamento." +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "(nessuna)" + #: lib/tagcloudsection.php:56 msgid "None" msgstr "Nessuno" diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index 74baa8e281..3880ce1551 100644 --- a/locale/ja/LC_MESSAGES/statusnet.po +++ b/locale/ja/LC_MESSAGES/statusnet.po @@ -2,6 +2,7 @@ # # Author@translatewiki.net: Aotake # Author@translatewiki.net: Fryed-peach +# Author@translatewiki.net: Whym # -- # 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: 2009-12-07 21:25+0000\n" -"PO-Revision-Date: 2009-12-07 21:26:48+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:09:58+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ja\n" "X-Message-Group: out-statusnet\n" @@ -27,11 +28,11 @@ msgstr "そのようなページはありません。" #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -44,19 +45,19 @@ msgstr "そのようなページはありません。" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." -msgstr "そのようなユーザはいません。" +msgstr "そのような利用者はいません。" #: actions/all.php:84 #, php-format msgid "%s and friends, page %d" -msgstr "%sとともだち、%dページ" +msgstr "%s と友人、%dページ" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s と友人" @@ -64,23 +65,23 @@ msgstr "%s と友人" #: actions/all.php:99 #, php-format msgid "Feed for friends of %s (RSS 1.0)" -msgstr "%s のともだちのフィード(RSS 1.0)" +msgstr "%s の友人のフィード (RSS 1.0)" #: actions/all.php:107 #, php-format msgid "Feed for friends of %s (RSS 2.0)" -msgstr "%s のともだちのフィード (RSS 2.0)" +msgstr "%s の友人のフィード (RSS 2.0)" #: actions/all.php:115 #, php-format msgid "Feed for friends of %s (Atom)" -msgstr "%s のともだちのフィード (Atom)" +msgstr "%s の友人のフィード (Atom)" #: actions/all.php:127 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." -msgstr "これは%sとともだちの予定表です。まだ誰も投稿していません。" +msgstr "これは %s と友人の予定表です。まだ誰も投稿していません。" #: actions/all.php:132 #, php-format @@ -97,8 +98,8 @@ msgid "" "You can try to [nudge %s](../%s) from his profile or [post something to his " "or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." msgstr "" -"プロフィールから[%sさんに合図](../%s) したり、[知らせたいことについて投稿](%%" -"%%action.newnotice%%%%?status_textarea=%s)したりできます。" +"プロフィールから [%s さんに合図](../%s) したり、[知らせたいことについて投稿]" +"(%%%%action.newnotice%%%%?status_textarea=%s) したりできます。" #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 #, php-format @@ -106,54 +107,67 @@ msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " "post a notice to his or her attention." msgstr "" -"[アカウントを登録](%%%%action.register%%%%) して%sさんに合図したり、お知らせ" -"を送ってみませんか。" +"[アカウントを登録](%%%%action.register%%%%) して %s さんに合図したり、お知ら" +"せを送ってみませんか。" #: actions/all.php:165 msgid "You and friends" -msgstr "あなたとともだち" +msgstr "あなたと友人" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" -msgstr "" +msgstr "%2$s に %1$s と友人からの更新があります！" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 -#, fuzzy msgid "API method not found." -msgstr "API メソッドが見つかりません！" +msgstr "API メソッドが見つかりません。" #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." -msgstr "" +msgstr "このメソッドには POST が必要です。" #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " "none" msgstr "" +"「device」という名前の引数を、次の中から値を選んで、指定する必要があります: " +"sms, im, none" #: actions/apiaccountupdatedeliverydevice.php:132 -#, fuzzy msgid "Could not update user." -msgstr "ユーザを更新できません" +msgstr "利用者を更新できませんでした。" + +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "利用者はプロフィールをもっていません。" + +#: actions/apiaccountupdateprofile.php:147 +msgid "Could not save profile." +msgstr "プロフィールを保存できませんでした。" #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -161,63 +175,32 @@ msgid "" "The server was unable to handle that much POST data (%s bytes) due to its " "current configuration." msgstr "" +"サーバーの現在の構成が理由で、大量の POST データ (%sバイト) を処理することが" +"できませんでした。" #: actions/apiaccountupdateprofilebackgroundimage.php:136 #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 msgid "Unable to save your design settings." -msgstr "" +msgstr "あなたのデザイン設定を保存できません。" #: actions/apiaccountupdateprofilebackgroundimage.php:187 #: actions/apiaccountupdateprofilecolors.php:142 -#, fuzzy msgid "Could not update your design." -msgstr "ユーザを更新できません" - -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "プロファイルがありません。" - -#: actions/apiaccountupdateprofile.php:147 -#, fuzzy -msgid "Could not save profile." -msgstr "プロファイルを保存できません" +msgstr "デザインを更新できませんでした。" #: actions/apiblockcreate.php:105 -#, fuzzy msgid "You cannot block yourself!" -msgstr "ユーザを更新できません" +msgstr "自分自身をブロックすることはできません！" #: actions/apiblockcreate.php:119 msgid "Block user failed." -msgstr "ユーザのブロックに失敗しました。" +msgstr "利用者のブロックに失敗しました。" #: actions/apiblockdestroy.php:107 msgid "Unblock user failed." -msgstr "ユーザのアンブロックに失敗しました。" - -#: actions/apidirectmessagenew.php:126 -msgid "No message text!" -msgstr "" - -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, fuzzy, php-format -msgid "That's too long. Max message size is %d chars." -msgstr "長すぎます。通知は最大 140 字までです。" - -#: actions/apidirectmessagenew.php:146 -msgid "Recipient user not found." -msgstr "" - -#: actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." -msgstr "" +msgstr "利用者のブロック解除に失敗しました。" #: actions/apidirectmessage.php:89 #, php-format @@ -244,18 +227,35 @@ msgstr "" #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "API メソッドが見つかりません！" +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "お知らせの本文がありません！" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "長すぎます。お知らせは最大 %d 字までです。" + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "受け取り手の利用者が見つかりません。" + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -288,13 +288,12 @@ msgstr "" "利用者をフォローできませんでした: %s は既にあなたのリストに入っています。" #: actions/apifriendshipsdestroy.php:109 -#, fuzzy msgid "Could not unfollow user: User not found." -msgstr "サーバへリダイレクトできません : %s" +msgstr "利用者のフォローを停止できませんでした: 利用者が見つかりません。" #: actions/apifriendshipsdestroy.php:120 msgid "You cannot unfollow yourself!" -msgstr "" +msgstr "自分自身をフォロー停止することはできません！" #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." @@ -407,16 +406,6 @@ msgstr "そのプロファイルは送信されていません。" msgid "Could not remove user %s to group %s." msgstr "OpenIDを作成できません : %s" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, php-format -msgid "%s groups" -msgstr "%s グループ" - -#: actions/apigrouplistall.php:94 -#, fuzzy, php-format -msgid "groups on %s" -msgstr "このサイト上のグループを検索する" - #: actions/apigrouplist.php:95 #, fuzzy, php-format msgid "%s's groups" @@ -427,6 +416,16 @@ msgstr "%s グループ" msgid "Groups %s is a member of on %s." msgstr "そのプロファイルは送信されていません。" +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "%s グループ" + +#: actions/apigrouplistall.php:94 +#, fuzzy, php-format +msgid "groups on %s" +msgstr "このサイト上のグループを検索する" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "" @@ -464,57 +463,57 @@ msgstr "" msgid "Unsupported format." msgstr "サポート外の画像形式です。" -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, php-format msgid "%s / Favorites from %s" msgstr "" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, php-format msgid "%s updates favorited by %s / %s." msgstr "" -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "%s のタイムライン" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, fuzzy, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$ のステータス %2$s" -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s の公開タイムライン" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 -#, fuzzy, php-format +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 +#, php-format msgid "Updates tagged with %1$s on %2$s!" -msgstr "マイクロブログ by %s" +msgstr "%2$s に %1$s による更新があります！" #: actions/apiusershow.php:96 msgid "Not found." @@ -545,48 +544,47 @@ msgstr "アバター" #: actions/avatarsettings.php:78 #, php-format msgid "You can upload your personal avatar. The maximum file size is %s." -msgstr "" +msgstr "自分のアバターをアップロードできます。最大サイズは%sです。" -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 msgid "User without matching profile" msgstr "" -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 -#, fuzzy msgid "Avatar settings" -msgstr "設定" +msgstr "アバター設定" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 msgid "Delete" msgstr "削除" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "アップロード" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -597,34 +595,74 @@ msgstr "" msgid "There was a problem with your session token. Try again, please." msgstr "" -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "予期せぬフォーム送信です。" -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "アバターが更新されました。" -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "アバターの更新に失敗しました。" -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 #, fuzzy msgid "Avatar deleted." msgstr "アバターが更新されました。" +#: actions/block.php:69 +#, fuzzy +msgid "You already blocked that user." +msgstr "既にログイン済みです。" + +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#, fuzzy +msgid "Block user" +msgstr "そのようなユーザはいません。" + +#: actions/block.php:130 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" + +#: actions/block.php:143 actions/deletenotice.php:145 +#: actions/deleteuser.php:147 actions/groupblock.php:178 +msgid "No" +msgstr "" + +#: actions/block.php:143 actions/deleteuser.php:147 +#, fuzzy +msgid "Do not block this user" +msgstr "このユーザをアンブロックする" + +#: actions/block.php:144 actions/deletenotice.php:146 +#: actions/deleteuser.php:148 actions/groupblock.php:179 +msgid "Yes" +msgstr "" + +#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 +msgid "Block this user" +msgstr "このユーザをブロックする" + +#: actions/block.php:162 +msgid "Failed to save block information." +msgstr "" + #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 #: actions/groupmembers.php:76 actions/grouprss.php:91 @@ -668,46 +706,6 @@ msgstr "アンブロック" msgid "Unblock this user" msgstr "このユーザをアンブロックする" -#: actions/block.php:69 -#, fuzzy -msgid "You already blocked that user." -msgstr "既にログイン済みです。" - -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 -#, fuzzy -msgid "Block user" -msgstr "そのようなユーザはいません。" - -#: actions/block.php:130 -msgid "" -"Are you sure you want to block this user? Afterwards, they will be " -"unsubscribed from you, unable to subscribe to you in the future, and you " -"will not be notified of any @-replies from them." -msgstr "" - -#: actions/block.php:143 actions/deletenotice.php:145 -#: actions/deleteuser.php:147 actions/groupblock.php:178 -msgid "No" -msgstr "" - -#: actions/block.php:143 actions/deleteuser.php:147 -#, fuzzy -msgid "Do not block this user" -msgstr "このユーザをアンブロックする" - -#: actions/block.php:144 actions/deletenotice.php:146 -#: actions/deleteuser.php:148 actions/groupblock.php:179 -msgid "Yes" -msgstr "" - -#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 -msgid "Block this user" -msgstr "このユーザをブロックする" - -#: actions/block.php:162 -msgid "Failed to save block information." -msgstr "" - #: actions/bookmarklet.php:50 msgid "Post to " msgstr "" @@ -831,9 +829,8 @@ msgid "" msgstr "" #: actions/deleteuser.php:148 lib/deleteuserform.php:77 -#, fuzzy msgid "Delete this user" -msgstr "この通知を削除" +msgstr "このユーザーを削除" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 #: lib/adminpanelaction.php:302 lib/groupnav.php:119 @@ -855,9 +852,8 @@ msgid "Theme not available: %s" msgstr "このページはあなたが承認したメディアタイプでは利用できません。" #: actions/designadminpanel.php:375 -#, fuzzy msgid "Change logo" -msgstr "パスワードの変更" +msgstr "ロゴの変更" #: actions/designadminpanel.php:380 #, fuzzy @@ -1188,6 +1184,14 @@ msgstr "" msgid "New incoming email address added." msgstr "" +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "" + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 #, fuzzy @@ -1231,14 +1235,6 @@ msgstr "" msgid "Updates favored by %1$s on %2$s!" msgstr "マイクロブログ by %s" -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "" - -#: actions/favor.php:92 lib/disfavorform.php:140 -msgid "Disfavor favorite" -msgstr "" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1311,19 +1307,16 @@ msgstr "リモートプロファイル更新エラー" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupunblock.php:86 actions/leavegroup.php:83 #: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 -#, fuzzy msgid "No such group." -msgstr "そのような通知はありません。" +msgstr "そのようなグループはありません。" #: actions/getfile.php:75 -#, fuzzy msgid "No such file." -msgstr "そのような通知はありません。" +msgstr "そのようなファイルはありません。" #: actions/getfile.php:79 -#, fuzzy msgid "Cannot read file." -msgstr "そのような通知はありません。" +msgstr "ファイルを読み込めません。" #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 @@ -1433,14 +1426,12 @@ msgid "Pick a square area of the image to be the logo." msgstr "" #: actions/grouplogo.php:396 -#, fuzzy msgid "Logo updated." -msgstr "アバターが更新されました。" +msgstr "ロゴが更新されました。" #: actions/grouplogo.php:398 -#, fuzzy msgid "Failed updating logo." -msgstr "アバターの更新に失敗しました。" +msgstr "ロゴの更新に失敗しました。" #: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format @@ -1482,39 +1473,6 @@ msgstr "" msgid "Updates from members of %1$s on %2$s!" msgstr "マイクロブログ by %s" -#: actions/groupsearch.php:52 -#, fuzzy, php-format -msgid "" -"Search for groups on %%site.name%% by their name, location, or description. " -"Separate the terms by spaces; they must be 3 characters or more." -msgstr "" -"%%site.name%% の人を名前、場所、興味から検索。検索語はスペース区切る。3字以上" - -#: actions/groupsearch.php:58 -#, fuzzy -msgid "Group search" -msgstr "ピープルサーチ" - -#: actions/groupsearch.php:79 actions/noticesearch.php:117 -#: actions/peoplesearch.php:83 -#, fuzzy -msgid "No results." -msgstr "結果なし" - -#: actions/groupsearch.php:82 -#, php-format -msgid "" -"If you can't find the group you're looking for, you can [create it](%%action." -"newgroup%%) yourself." -msgstr "" - -#: actions/groupsearch.php:85 -#, php-format -msgid "" -"Why not [register an account](%%action.register%%) and [create the group](%%" -"action.newgroup%%) yourself!" -msgstr "" - #: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" @@ -1540,6 +1498,38 @@ msgstr "" msgid "Create a new group" msgstr "アカウントを作成" +#: actions/groupsearch.php:52 +#, fuzzy, php-format +msgid "" +"Search for groups on %%site.name%% by their name, location, or description. " +"Separate the terms by spaces; they must be 3 characters or more." +msgstr "" +"%%site.name%% の人を名前、場所、興味から検索。検索語はスペース区切る。3字以上" + +#: actions/groupsearch.php:58 +msgid "Group search" +msgstr "グループの検索" + +#: actions/groupsearch.php:79 actions/noticesearch.php:117 +#: actions/peoplesearch.php:83 +#, fuzzy +msgid "No results." +msgstr "結果なし" + +#: actions/groupsearch.php:82 +#, php-format +msgid "" +"If you can't find the group you're looking for, you can [create it](%%action." +"newgroup%%) yourself." +msgstr "" + +#: actions/groupsearch.php:85 +#, php-format +msgid "" +"Why not [register an account](%%action.register%%) and [create the group](%%" +"action.newgroup%%) yourself!" +msgstr "" + #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "" @@ -1727,7 +1717,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "送る" @@ -1798,9 +1788,8 @@ msgid "You must be logged in to join a group." msgstr "" #: actions/joingroup.php:90 lib/command.php:217 -#, fuzzy msgid "You are already a member of that group" -msgstr "既にログイン済みです。" +msgstr "あなたは既にそのグループに参加しています。" #: actions/joingroup.php:128 lib/command.php:234 #, fuzzy, php-format @@ -1835,57 +1824,57 @@ msgstr "OpenIDを作成できません : %s" msgid "%s left group %s" msgstr "" -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "既にログインしています。" -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 #, fuzzy msgid "Invalid or expired token." msgstr "不正な通知内容" -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "ユーザ名またはパスワードが間違っています。" -#: actions/login.php:152 +#: actions/login.php:153 #, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "認証されていません。" -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "ログイン" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "" -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "ニックネーム" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "パスワード" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "ログイン状態を保持" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "以降は自動的にログインする。共用コンピューターでは避けましょう！" -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "パスワードを紛失、忘れた？" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1893,7 +1882,7 @@ msgstr "" "セキュリティー上の理由により、設定を変更する前にユーザ名とパスワードを入力し" "て下さい。" -#: actions/login.php:289 +#: actions/login.php:290 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1962,7 +1951,7 @@ msgstr "" msgid "Direct message to %s sent" msgstr "" -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" msgstr "" @@ -1970,7 +1959,7 @@ msgstr "" msgid "New notice" msgstr "新しい通知" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 #, fuzzy msgid "Notice posted" msgstr "通知" @@ -2045,8 +2034,8 @@ msgstr "内容種別 " msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "" @@ -2112,14 +2101,12 @@ msgid "Change password" msgstr "パスワードの変更" #: actions/passwordsettings.php:69 -#, fuzzy msgid "Change your password." -msgstr "パスワードの変更" +msgstr "パスワードを変更します。" #: actions/passwordsettings.php:96 actions/recoverpassword.php:231 -#, fuzzy msgid "Password change" -msgstr "パスワードが保存されました。" +msgstr "パスワードの変更" #: actions/passwordsettings.php:104 msgid "Old password" @@ -2148,7 +2135,7 @@ msgstr "変更" #: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." -msgstr "" +msgstr "パスワードは6文字以上にする必要があります。" #: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." @@ -2344,14 +2331,13 @@ msgid "URL of your homepage, blog, or profile on another site" msgstr "ホームページ、ブログ、プロファイル、その他サイトの URL" #: actions/profilesettings.php:122 actions/register.php:460 -#, fuzzy, php-format +#, php-format msgid "Describe yourself and your interests in %d chars" -msgstr "140字以内で自己紹介" +msgstr "%d字以内で自分自身と自分の興味について書いてください" #: actions/profilesettings.php:125 actions/register.php:463 -#, fuzzy msgid "Describe yourself and your interests" -msgstr "140字以内で自己紹介" +msgstr "自分自身と自分の興味について書いてください" #: actions/profilesettings.php:127 actions/register.php:465 msgid "Bio" @@ -2366,34 +2352,36 @@ msgstr "場所" #: actions/profilesettings.php:134 actions/register.php:472 msgid "Where you are, like \"City, State (or Region), Country\"" -msgstr "いる場所, 例えば \"City, State (or Region), Country\"" +msgstr "自分のいる場所。例：「都市, 州 (または地域), 国」" #: actions/profilesettings.php:138 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 #: lib/subscriptionlist.php:108 lib/userprofile.php:209 msgid "Tags" -msgstr "" +msgstr "タグ" #: actions/profilesettings.php:140 msgid "" "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" msgstr "" +"自分自身についてのタグ (アルファベット／数字／-／.／_)、カンマまたは空白区切" +"りで" #: actions/profilesettings.php:144 actions/siteadminpanel.php:307 msgid "Language" -msgstr "" +msgstr "言語" #: actions/profilesettings.php:145 msgid "Preferred language" -msgstr "" +msgstr "ご希望の言語" #: actions/profilesettings.php:154 msgid "Timezone" -msgstr "" +msgstr "タイムゾーン" #: actions/profilesettings.php:155 msgid "What timezone are you normally in?" -msgstr "" +msgstr "普段のタイムゾーンはどれですか？" #: actions/profilesettings.php:160 msgid "" @@ -3591,6 +3579,26 @@ msgstr "Jabbar ID はありません。" msgid "SMS" msgstr "" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %s, page %d" +msgstr "マイクロブログ by %s" + +#: actions/tag.php:86 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "%sの通知フィード" + +#: actions/tag.php:92 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "%sの通知フィード" + +#: actions/tag.php:98 +#, fuzzy, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "%sの通知フィード" + #: actions/tagother.php:33 #, fuzzy msgid "Not logged in" @@ -3639,26 +3647,6 @@ msgstr "アバターを保存できません" msgid "Use this form to add tags to your subscribers or subscriptions." msgstr "" -#: actions/tag.php:68 -#, fuzzy, php-format -msgid "Notices tagged with %s, page %d" -msgstr "マイクロブログ by %s" - -#: actions/tag.php:86 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "%sの通知フィード" - -#: actions/tag.php:92 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "%sの通知フィード" - -#: actions/tag.php:98 -#, fuzzy, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "%sの通知フィード" - #: actions/tagrss.php:35 #, fuzzy msgid "No such tag." @@ -3816,9 +3804,8 @@ msgstr "承認" #: actions/userauthorization.php:210 lib/subscribeform.php:115 #: lib/subscribeform.php:139 -#, fuzzy msgid "Subscribe to this user" -msgstr "購読が許可" +msgstr "このユーザーを購読" #: actions/userauthorization.php:211 msgid "Reject" @@ -3963,40 +3950,45 @@ msgstr "" msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:179 +#: classes/Notice.php:188 #, fuzzy msgid "Problem saving notice. Too long." msgstr "通知を保存する際に問題が発生しました。" -#: classes/Notice.php:183 +#: classes/Notice.php:192 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "通知を保存する際に問題が発生しました。" -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:194 +#: classes/Notice.php:203 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "通知を保存する際に問題が発生しました。" -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "返信を追加する際にデータベースエラー : %s" +#: classes/User.php:347 +#, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "" + #: classes/User_group.php:380 #, fuzzy msgid "Could not create group." @@ -4007,11 +3999,6 @@ msgstr "アバターを保存できません" msgid "Could not set group membership." msgstr "サブスクリプションを作成できません" -#: classes/User.php:347 -#, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "" - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "プロファイル設定の変更" @@ -4327,7 +4314,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 msgid "User has no last notice" msgstr "" @@ -4374,99 +4361,99 @@ msgstr "" msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:439 +#: lib/command.php:440 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "この通知へ返信" -#: lib/command.php:441 +#: lib/command.php:442 #, fuzzy msgid "Error saving notice." msgstr "通知を保存する際に問題が発生しました。" -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:502 +#: lib/command.php:503 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:530 +#: lib/command.php:531 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:551 +#: lib/command.php:552 msgid "Notification off." msgstr "" -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:574 +#: lib/command.php:575 msgid "Notification on." msgstr "" -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" msgstr "" -#: lib/command.php:602 -#, fuzzy, php-format +#: lib/command.php:604 +#, php-format msgid "Could not create login token for %s" -msgstr "アバターを保存できません" +msgstr "%s 用のログイン・トークンを作成できませんでした" -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:623 +#: lib/command.php:625 #, fuzzy msgid "You are not subscribed to anyone." msgstr "そのプロファイルは送信されていません。" -#: lib/command.php:625 +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "そのプロファイルは送信されていません。" -#: lib/command.php:645 +#: lib/command.php:647 #, fuzzy msgid "No one is subscribed to you." msgstr "リモートサブスクライブ" -#: lib/command.php:647 +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "リモートサブスクライブ" -#: lib/command.php:667 +#: lib/command.php:669 #, fuzzy msgid "You are not a member of any groups." msgstr "そのプロファイルは送信されていません。" -#: lib/command.php:669 +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "そのプロファイルは送信されていません。" -#: lib/command.php:683 +#: lib/command.php:685 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4566,10 +4553,6 @@ msgstr "この通知をお気に入りにする" msgid "Favor" msgstr "" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "データのエクスポート" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "" @@ -4586,6 +4569,10 @@ msgstr "" msgid "FOAF" msgstr "" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "データのエクスポート" + #: lib/galleryaction.php:121 msgid "Filter tags" msgstr "タグのフィルター" @@ -4748,20 +4735,6 @@ msgstr "ユーザ名とパスワードでログイン" msgid "Sign up for a new account" msgstr "新しいアカウントでサインアップ" -#: lib/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "" - -#: 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 "" - -#: lib/mailbox.php:227 lib/noticelist.php:452 -msgid "from" -msgstr "から " - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "メールアドレス確認" @@ -4944,6 +4917,20 @@ msgid "" "\n" msgstr "" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "" + +#: 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 "" + +#: lib/mailbox.php:227 lib/noticelist.php:452 +msgid "from" +msgstr "から " + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5005,7 +4992,7 @@ msgstr "直接通知を送る" msgid "To" msgstr "" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 msgid "Available characters" msgstr "利用可能な文字" @@ -5018,11 +5005,11 @@ msgstr "通知を送る" msgid "What's up, %s?" msgstr "最近どう %s?" -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "" @@ -5093,11 +5080,11 @@ msgstr "リモートプロファイル追加エラー" msgid "Duplicate notice" msgstr "新しい通知" -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 msgid "You have been banned from subscribing." msgstr "" -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "サブスクリプションを追加できません" @@ -5264,20 +5251,6 @@ msgstr "リモートサブスクライブ" msgid "Groups %s is a member of" msgstr "" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(なし)" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "" @@ -5309,6 +5282,20 @@ msgstr "サブスクリプションを削除できません" msgid "Couldn't delete subscription." msgstr "サブスクリプションを削除できません" +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "(なし)" + #: lib/tagcloudsection.php:56 msgid "None" msgstr "" diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index 05b20ed918..8bc4175fac 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: 2009-12-07 21:25+0000\n" -"PO-Revision-Date: 2009-12-07 21:26:51+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:10:00+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ko\n" "X-Message-Group: out-statusnet\n" @@ -26,11 +26,11 @@ msgstr "그러한 태그가 없습니다." #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -43,7 +43,7 @@ msgstr "그러한 태그가 없습니다." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." @@ -55,7 +55,7 @@ msgid "%s and friends, page %d" msgstr "%s 와 친구들, %d 페이지" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s 및 친구들" @@ -107,25 +107,25 @@ msgstr "" msgid "You and friends" msgstr "%s 및 친구들" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "%1$s 및 %2$s에 있는 친구들의 업데이트!" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 #, fuzzy msgid "API method not found." msgstr "API 메서드를 찾을 수 없습니다." #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 @@ -145,9 +145,23 @@ msgstr "" msgid "Could not update user." msgstr "사용자를 업데이트 할 수 없습니다." +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "이용자가 프로필을 가지고 있지 않습니다." + +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "프로필을 저장 할 수 없습니다." + #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -170,20 +184,6 @@ msgstr "트위터 환경설정을 저장할 수 없습니다." msgid "Could not update your design." msgstr "사용자를 업데이트 할 수 없습니다." -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "이용자가 프로필을 가지고 있지 않습니다." - -#: actions/apiaccountupdateprofile.php:147 -#, fuzzy -msgid "Could not save profile." -msgstr "프로필을 저장 할 수 없습니다." - #: actions/apiblockcreate.php:105 #, fuzzy msgid "You cannot block yourself!" @@ -197,23 +197,6 @@ msgstr "사용자 차단에 실패했습니다." msgid "Unblock user failed." msgstr "사용자 차단 해제에 실패했습니다." -#: actions/apidirectmessagenew.php:126 -msgid "No message text!" -msgstr "메시지 내용이 없습니다!" - -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, fuzzy, php-format -msgid "That's too long. Max message size is %d chars." -msgstr "메시지가 너무 길어요. 최대로 140자까지 입력하실 수 있습니다." - -#: actions/apidirectmessagenew.php:146 -msgid "Recipient user not found." -msgstr "받는 사용자가 없습니다." - -#: actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." -msgstr "당신의 친구가 아닌 사용자에게 직접 메시지를 보낼 수 없습니다." - #: actions/apidirectmessage.php:89 #, fuzzy, php-format msgid "Direct messages from %s" @@ -239,18 +222,35 @@ msgstr "%s에게 모든 직접 메시지" #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "API 메서드를 찾을 수 없습니다." +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "메시지 내용이 없습니다!" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, fuzzy, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "메시지가 너무 길어요. 최대로 140자까지 입력하실 수 있습니다." + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "받는 사용자가 없습니다." + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "당신의 친구가 아닌 사용자에게 직접 메시지를 보낼 수 없습니다." + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -403,16 +403,6 @@ msgstr "당신은 해당 그룹의 멤버가 아닙니다." msgid "Could not remove user %s to group %s." msgstr "그룹 %s에서 %s 사용자를 제거할 수 없습니다." -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, php-format -msgid "%s groups" -msgstr "%s 그룹" - -#: actions/apigrouplistall.php:94 -#, fuzzy, php-format -msgid "groups on %s" -msgstr "그룹 행동" - #: actions/apigrouplist.php:95 #, fuzzy, php-format msgid "%s's groups" @@ -423,6 +413,16 @@ msgstr "%s 그룹" msgid "Groups %s is a member of on %s." msgstr "%s 그룹들은 의 멤버입니다." +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "%s 그룹" + +#: actions/apigrouplistall.php:94 +#, fuzzy, php-format +msgid "groups on %s" +msgstr "그룹 행동" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "이 메서드는 등록 또는 삭제를 요구합니다." @@ -460,54 +460,54 @@ msgstr "" msgid "Unsupported format." msgstr "지원하지 않는 그림 파일 형식입니다." -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, php-format msgid "%s / Favorites from %s" msgstr "%s / %s의 좋아하는 글들" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, php-format msgid "%s updates favorited by %s / %s." msgstr "%s 좋아하는 글이 업데이트 됐습니다. %S에 의해 / %s." -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "%s 타임라인" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "%2$s에 있는 %1$s의 업데이트!" -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, fuzzy, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / %2$s에게 답신 업데이트" -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s님이 %2$s/%3$s의 업데이트에 답변했습니다." -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s 공개 타임라인" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "모두로부터의 업데이트 %s개!" -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "%s 태그된 통지" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "%2$s에 있는 %1$s의 업데이트!" @@ -543,45 +543,45 @@ msgstr "아바타" msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "당신의 개인적인 아바타를 업로드할 수 있습니다." -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 msgid "User without matching profile" msgstr "프로필 매칭이 없는 사용자" -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 msgid "Avatar settings" msgstr "아바타 설정" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "원래 설정" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "미리보기" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 msgid "Delete" msgstr "삭제" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "올리기" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "자르기" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -592,34 +592,73 @@ msgstr "자르기" msgid "There was a problem with your session token. Try again, please." msgstr "세션토큰에 문제가 있습니다. 다시 시도해주세요." -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "잘못된 폼 제출" -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "당신의 아바타가 될 이미지영역을 지정하세요." -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "파일 데이터를 잃어버렸습니다." -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "아바타가 업데이트 되었습니다." -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "아바타 업데이트 실패" -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 #, fuzzy msgid "Avatar deleted." msgstr "아바타가 업데이트 되었습니다." +#: actions/block.php:69 +#, fuzzy +msgid "You already blocked that user." +msgstr "당신은 이미 이 사용자를 차단하고 있습니다." + +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +msgid "Block user" +msgstr "사용자를 차단합니다." + +#: actions/block.php:130 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" + +#: actions/block.php:143 actions/deletenotice.php:145 +#: actions/deleteuser.php:147 actions/groupblock.php:178 +msgid "No" +msgstr "아니오" + +#: actions/block.php:143 actions/deleteuser.php:147 +#, fuzzy +msgid "Do not block this user" +msgstr "이 사용자를 차단해제합니다." + +#: actions/block.php:144 actions/deletenotice.php:146 +#: actions/deleteuser.php:148 actions/groupblock.php:179 +msgid "Yes" +msgstr "네, 맞습니다." + +#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 +msgid "Block this user" +msgstr "이 사용자 차단하기" + +#: actions/block.php:162 +msgid "Failed to save block information." +msgstr "정보차단을 저장하는데 실패했습니다." + #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 #: actions/groupmembers.php:76 actions/grouprss.php:91 @@ -662,45 +701,6 @@ msgstr "차단해제" msgid "Unblock this user" msgstr "이 사용자를 차단해제합니다." -#: actions/block.php:69 -#, fuzzy -msgid "You already blocked that user." -msgstr "당신은 이미 이 사용자를 차단하고 있습니다." - -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 -msgid "Block user" -msgstr "사용자를 차단합니다." - -#: actions/block.php:130 -msgid "" -"Are you sure you want to block this user? Afterwards, they will be " -"unsubscribed from you, unable to subscribe to you in the future, and you " -"will not be notified of any @-replies from them." -msgstr "" - -#: actions/block.php:143 actions/deletenotice.php:145 -#: actions/deleteuser.php:147 actions/groupblock.php:178 -msgid "No" -msgstr "아니오" - -#: actions/block.php:143 actions/deleteuser.php:147 -#, fuzzy -msgid "Do not block this user" -msgstr "이 사용자를 차단해제합니다." - -#: actions/block.php:144 actions/deletenotice.php:146 -#: actions/deleteuser.php:148 actions/groupblock.php:179 -msgid "Yes" -msgstr "네, 맞습니다." - -#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 -msgid "Block this user" -msgstr "이 사용자 차단하기" - -#: actions/block.php:162 -msgid "Failed to save block information." -msgstr "정보차단을 저장하는데 실패했습니다." - #: actions/bookmarklet.php:50 #, fuzzy msgid "Post to " @@ -1184,6 +1184,14 @@ msgstr "받은 이메일 계정 삭제" msgid "New incoming email address added." msgstr "새로운 이메일 주소가 추가 되었습니다." +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "이 게시글은 이미 좋아하는 게시글입니다." + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "좋아하는글 취소" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 msgid "Popular notices" @@ -1226,14 +1234,6 @@ msgstr "%s 님의 좋아하는 글들" msgid "Updates favored by %1$s on %2$s!" msgstr "%2$s에 있는 %1$s의 업데이트!" -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "이 게시글은 이미 좋아하는 게시글입니다." - -#: actions/favor.php:92 lib/disfavorform.php:140 -msgid "Disfavor favorite" -msgstr "좋아하는글 취소" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1480,6 +1480,30 @@ msgstr "" msgid "Updates from members of %1$s on %2$s!" msgstr "%2$s에 있는 %1$s의 업데이트!" +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "그룹" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "그룹, %d 페이지" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +msgid "Create a new group" +msgstr "새 그룹을 만듭니다." + #: actions/groupsearch.php:52 #, fuzzy, php-format msgid "" @@ -1513,30 +1537,6 @@ msgid "" "action.newgroup%%) yourself!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 -#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 -msgid "Groups" -msgstr "그룹" - -#: actions/groups.php:64 -#, php-format -msgid "Groups, page %d" -msgstr "그룹, %d 페이지" - -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%site.name%%%% groups let you find and talk with people of similar " -"interests. After you join a group you can send messages to all other members " -"using the syntax \"!groupname\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" -msgstr "" - -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -msgid "Create a new group" -msgstr "새 그룹을 만듭니다." - #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "" @@ -1727,7 +1727,7 @@ msgstr "개인적인 메시지" msgid "Optionally add a personal message to the invitation." msgstr "초대장에 메시지 첨부하기." -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "보내기" @@ -1828,64 +1828,64 @@ msgstr "그룹 %s에서 %s 사용자를 제거할 수 없습니다." msgid "%s left group %s" msgstr "%s가 그룹%s를 떠났습니다." -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "이미 로그인 하셨습니다." -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 #, fuzzy msgid "Invalid or expired token." msgstr "옳지 않은 통지 내용" -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "틀린 계정 또는 비밀 번호" -#: actions/login.php:152 +#: actions/login.php:153 #, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "인증이 되지 않았습니다." -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "로그인" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "사이트에 로그인하세요." -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "별명" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "비밀 번호" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "자동 로그인" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "앞으로는 자동으로 로그인합니다. 공용 컴퓨터에서는 이용하지 마십시오!" -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "비밀 번호를 잊으셨나요?" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "" "보안을 위해 세팅을 저장하기 전에 계정과 비밀 번호를 다시 입력 해 주십시오." -#: actions/login.php:289 +#: actions/login.php:290 #, fuzzy, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1959,7 +1959,7 @@ msgstr "메시지" msgid "Direct message to %s sent" msgstr "%s에게 보낸 직접 메시지" -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" msgstr "Ajax 에러입니다." @@ -1967,7 +1967,7 @@ msgstr "Ajax 에러입니다." msgid "New notice" msgstr "새로운 통지" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 msgid "Notice posted" msgstr "게시글이 등록되었습니다." @@ -2045,8 +2045,8 @@ msgstr "연결" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "지원하는 형식의 데이터가 아닙니다." @@ -3596,6 +3596,26 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, php-format +msgid "Notices tagged with %s, page %d" +msgstr "%s 으로 태그된 게시글, %d 페이지" + +#: actions/tag.php:86 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "%s의 통지 피드" + +#: actions/tag.php:92 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "%s의 통지 피드" + +#: actions/tag.php:98 +#, fuzzy, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "%s의 통지 피드" + #: actions/tagother.php:33 msgid "Not logged in" msgstr "로그인되지 않았습니다." @@ -3643,26 +3663,6 @@ msgstr "태그를 저장할 수 없습니다." msgid "Use this form to add tags to your subscribers or subscriptions." msgstr "당신의 구독자나 구독하는 사람에 태깅을 위해 이 양식을 사용하세요." -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "%s 으로 태그된 게시글, %d 페이지" - -#: actions/tag.php:86 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "%s의 통지 피드" - -#: actions/tag.php:92 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "%s의 통지 피드" - -#: actions/tag.php:98 -#, fuzzy, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "%s의 통지 피드" - #: actions/tagrss.php:35 msgid "No such tag." msgstr "그러한 태그가 없습니다." @@ -3973,23 +3973,23 @@ msgstr "새 URI와 함께 메시지를 업데이트할 수 없습니다." msgid "DB error inserting hashtag: %s" msgstr "해쉬테그를 추가 할 때에 데이타베이스 에러 : %s" -#: classes/Notice.php:179 +#: classes/Notice.php:188 #, fuzzy msgid "Problem saving notice. Too long." msgstr "통지를 저장하는데 문제가 발생했습니다." -#: classes/Notice.php:183 +#: classes/Notice.php:192 msgid "Problem saving notice. Unknown user." msgstr "게시글 저장문제. 알려지지않은 회원" -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "너무 많은 게시글이 너무 빠르게 올라옵니다. 한숨고르고 몇분후에 다시 포스트를 " "해보세요." -#: classes/Notice.php:194 +#: classes/Notice.php:203 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -3998,19 +3998,24 @@ msgstr "" "너무 많은 게시글이 너무 빠르게 올라옵니다. 한숨고르고 몇분후에 다시 포스트를 " "해보세요." -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "이 사이트에 게시글 포스팅으로부터 당신은 금지되었습니다." -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "통지를 저장하는데 문제가 발생했습니다." -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "답신을 추가 할 때에 데이타베이스 에러 : %s" +#: classes/User.php:347 +#, fuzzy, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "%2$s에서 %1$s까지 메시지" + #: classes/User_group.php:380 msgid "Could not create group." msgstr "새 그룹을 만들 수 없습니다." @@ -4019,11 +4024,6 @@ msgstr "새 그룹을 만들 수 없습니다." msgid "Could not set group membership." msgstr "그룹 맴버십을 세팅할 수 없습니다." -#: classes/User.php:347 -#, fuzzy, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "%2$s에서 %1$s까지 메시지" - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "프로필 세팅 바꾸기" @@ -4338,7 +4338,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 msgid "User has no last notice" msgstr "이용자의 지속적인 게시글이 없습니다." @@ -4385,99 +4385,99 @@ msgstr "직접 메시지 보내기 오류." msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다." -#: lib/command.php:439 +#: lib/command.php:440 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "이 게시글에 대해 답장하기" -#: lib/command.php:441 +#: lib/command.php:442 #, fuzzy msgid "Error saving notice." msgstr "통지를 저장하는데 문제가 발생했습니다." -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "구독하려는 사용자의 이름을 지정하십시오." -#: lib/command.php:502 +#: lib/command.php:503 #, php-format msgid "Subscribed to %s" msgstr "%s에게 구독되었습니다." -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "구독을 해제하려는 사용자의 이름을 지정하십시오." -#: lib/command.php:530 +#: lib/command.php:531 #, php-format msgid "Unsubscribed from %s" msgstr "%s에서 구독을 해제했습니다." -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "명령이 아직 실행되지 않았습니다." -#: lib/command.php:551 +#: lib/command.php:552 msgid "Notification off." msgstr "알림끄기." -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "알림을 끌 수 없습니다." -#: lib/command.php:574 +#: lib/command.php:575 msgid "Notification on." msgstr "알림이 켜졌습니다." -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "알림을 켤 수 없습니다." -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" msgstr "" -#: lib/command.php:602 +#: lib/command.php:604 #, fuzzy, php-format msgid "Could not create login token for %s" -msgstr "좋아하는 게시글을 생성할 수 없습니다." +msgstr "OpenID를 작성 할 수 없습니다 : %s" -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:623 +#: lib/command.php:625 #, fuzzy msgid "You are not subscribed to anyone." msgstr "당신은 이 프로필에 구독되지 않고있습니다." -#: lib/command.php:625 +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "당신은 다음 사용자를 이미 구독하고 있습니다." -#: lib/command.php:645 +#: lib/command.php:647 #, fuzzy msgid "No one is subscribed to you." msgstr "다른 사람을 구독 하실 수 없습니다." -#: lib/command.php:647 +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "다른 사람을 구독 하실 수 없습니다." -#: lib/command.php:667 +#: lib/command.php:669 #, fuzzy msgid "You are not a member of any groups." msgstr "당신은 해당 그룹의 멤버가 아닙니다." -#: lib/command.php:669 +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "당신은 해당 그룹의 멤버가 아닙니다." -#: lib/command.php:683 +#: lib/command.php:685 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4577,10 +4577,6 @@ msgstr "이 게시글을 좋아합니다." msgid "Favor" msgstr "좋아합니다" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "데이터 내보내기" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "" @@ -4597,6 +4593,10 @@ msgstr "" msgid "FOAF" msgstr "" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "데이터 내보내기" + #: lib/galleryaction.php:121 msgid "Filter tags" msgstr "태그 필터링하기" @@ -4758,21 +4758,6 @@ msgstr "사용자 이름과 비밀번호로 로그인" msgid "Sign up for a new account" msgstr "새 계정을 위한 회원가입" -#: lib/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "오직 해당 사용자만 자신의 메일박스를 열람할 수 있습니다." - -#: 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 "" - -#: lib/mailbox.php:227 lib/noticelist.php:452 -#, fuzzy -msgid "from" -msgstr "다음에서:" - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "이메일 주소 확인서" @@ -4957,6 +4942,21 @@ msgid "" "\n" msgstr "" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "오직 해당 사용자만 자신의 메일박스를 열람할 수 있습니다." + +#: 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 "" + +#: lib/mailbox.php:227 lib/noticelist.php:452 +#, fuzzy +msgid "from" +msgstr "다음에서:" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5017,7 +5017,7 @@ msgstr "직접 메시지 보내기" msgid "To" msgstr "에게" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 msgid "Available characters" msgstr "사용 가능한 글자" @@ -5030,11 +5030,11 @@ msgstr "게시글 보내기" msgid "What's up, %s?" msgstr "뭐하세요? %?" -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "" @@ -5106,12 +5106,12 @@ msgstr "리모트 프로필 추가 오류" msgid "Duplicate notice" msgstr "통지 삭제" -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 #, fuzzy msgid "You have been banned from subscribing." msgstr "이 회원은 구독으로부터 당신을 차단해왔다." -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "예약 구독을 추가 할 수 없습니다." @@ -5279,20 +5279,6 @@ msgstr "%s에 의해 구독되는 사람들" msgid "Groups %s is a member of" msgstr "%s 그룹들은 의 멤버입니다." -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(없습니다)" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "" @@ -5323,6 +5309,20 @@ msgstr "예약 구독을 삭제 할 수 없습니다." msgid "Couldn't delete subscription." msgstr "예약 구독을 삭제 할 수 없습니다." +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "(없습니다)" + #: lib/tagcloudsection.php:56 msgid "None" msgstr "없음" diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index dff5c0b431..cd03f9c995 100644 --- a/locale/mk/LC_MESSAGES/statusnet.po +++ b/locale/mk/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-07 21:25+0000\n" -"PO-Revision-Date: 2009-12-07 21:26:55+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:10:04+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: mk\n" "X-Message-Group: out-statusnet\n" @@ -27,11 +27,11 @@ msgstr "Нема такво известување." #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -44,7 +44,7 @@ msgstr "Нема такво известување." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." @@ -56,7 +56,7 @@ msgid "%s and friends, page %d" msgstr "%s и пријателите" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s и пријателите" @@ -108,25 +108,25 @@ msgstr "" msgid "You and friends" msgstr "%s и пријателите" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 #, fuzzy msgid "API method not found." msgstr "Кодот за потврда не е пронајден." #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 @@ -146,9 +146,23 @@ msgstr "" msgid "Could not update user." msgstr "Корисникот не може да се освежи/" +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "Корисникот нема профил." + +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Профилот не може да се сними." + #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -170,20 +184,6 @@ msgstr "" msgid "Could not update your design." msgstr "Корисникот не може да се освежи/" -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "Корисникот нема профил." - -#: actions/apiaccountupdateprofile.php:147 -#, fuzzy -msgid "Could not save profile." -msgstr "Профилот не може да се сними." - #: actions/apiblockcreate.php:105 #, fuzzy msgid "You cannot block yourself!" @@ -197,23 +197,6 @@ msgstr "" msgid "Unblock user failed." msgstr "" -#: actions/apidirectmessagenew.php:126 -msgid "No message text!" -msgstr "" - -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, fuzzy, php-format -msgid "That's too long. Max message size is %d chars." -msgstr "Ова е предолго. Максималната должина е 140 знаци." - -#: actions/apidirectmessagenew.php:146 -msgid "Recipient user not found." -msgstr "" - -#: actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." -msgstr "" - #: actions/apidirectmessage.php:89 #, php-format msgid "Direct messages from %s" @@ -239,18 +222,35 @@ msgstr "" #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "" +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, fuzzy, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "Ова е предолго. Максималната должина е 140 знаци." + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "" + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -399,16 +399,6 @@ msgstr "Не ни го испративте тој профил." msgid "Could not remove user %s to group %s." msgstr "OpenID формуларот не може да се креира:%s" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, php-format -msgid "%s groups" -msgstr "" - -#: actions/apigrouplistall.php:94 -#, php-format -msgid "groups on %s" -msgstr "" - #: actions/apigrouplist.php:95 #, fuzzy, php-format msgid "%s's groups" @@ -419,6 +409,16 @@ msgstr "Профил" msgid "Groups %s is a member of on %s." msgstr "Не ни го испративте тој профил." +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "" + +#: actions/apigrouplistall.php:94 +#, php-format +msgid "groups on %s" +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "" @@ -456,54 +456,54 @@ msgstr "" msgid "Unsupported format." msgstr "Неподдржан фомрат на слики." -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, php-format msgid "%s / Favorites from %s" msgstr "" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, php-format msgid "%s updates favorited by %s / %s." msgstr "" -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, fuzzy, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s статус на %2$s" -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Микроблог на %s" @@ -540,46 +540,46 @@ msgstr "Аватар" msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 msgid "User without matching profile" msgstr "" -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 #, fuzzy msgid "Avatar settings" msgstr "Поставки" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 msgid "Delete" msgstr "" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "Товари" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -590,34 +590,75 @@ msgstr "" msgid "There was a problem with your session token. Try again, please." msgstr "" -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Неочекувано испраќање на формулар." -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "Аватарот е ажуриран." -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "Товарањето на аватарот не успеа." -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 #, fuzzy msgid "Avatar deleted." msgstr "Аватарот е ажуриран." +#: actions/block.php:69 +#, fuzzy +msgid "You already blocked that user." +msgstr "Веќе сте пријавени!" + +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#, fuzzy +msgid "Block user" +msgstr "Нема таков корисник." + +#: actions/block.php:130 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" + +#: actions/block.php:143 actions/deletenotice.php:145 +#: actions/deleteuser.php:147 actions/groupblock.php:178 +msgid "No" +msgstr "Не" + +#: actions/block.php:143 actions/deleteuser.php:147 +#, fuzzy +msgid "Do not block this user" +msgstr "Нема таков корисник." + +#: actions/block.php:144 actions/deletenotice.php:146 +#: actions/deleteuser.php:148 actions/groupblock.php:179 +msgid "Yes" +msgstr "" + +#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 +#, fuzzy +msgid "Block this user" +msgstr "Нема таков корисник." + +#: actions/block.php:162 +msgid "Failed to save block information." +msgstr "" + #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 #: actions/groupmembers.php:76 actions/grouprss.php:91 @@ -661,47 +702,6 @@ msgstr "" msgid "Unblock this user" msgstr "Нема таков корисник." -#: actions/block.php:69 -#, fuzzy -msgid "You already blocked that user." -msgstr "Веќе сте пријавени!" - -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 -#, fuzzy -msgid "Block user" -msgstr "Нема таков корисник." - -#: actions/block.php:130 -msgid "" -"Are you sure you want to block this user? Afterwards, they will be " -"unsubscribed from you, unable to subscribe to you in the future, and you " -"will not be notified of any @-replies from them." -msgstr "" - -#: actions/block.php:143 actions/deletenotice.php:145 -#: actions/deleteuser.php:147 actions/groupblock.php:178 -msgid "No" -msgstr "Не" - -#: actions/block.php:143 actions/deleteuser.php:147 -#, fuzzy -msgid "Do not block this user" -msgstr "Нема таков корисник." - -#: actions/block.php:144 actions/deletenotice.php:146 -#: actions/deleteuser.php:148 actions/groupblock.php:179 -msgid "Yes" -msgstr "" - -#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 -#, fuzzy -msgid "Block this user" -msgstr "Нема таков корисник." - -#: actions/block.php:162 -msgid "Failed to save block information." -msgstr "" - #: actions/bookmarklet.php:50 msgid "Post to " msgstr "" @@ -1176,6 +1176,14 @@ msgstr "" msgid "New incoming email address added." msgstr "" +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "" + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 #, fuzzy @@ -1219,14 +1227,6 @@ msgstr "" msgid "Updates favored by %1$s on %2$s!" msgstr "Микроблог на %s" -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "" - -#: actions/favor.php:92 lib/disfavorform.php:140 -msgid "Disfavor favorite" -msgstr "" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1469,6 +1469,31 @@ msgstr "" msgid "Updates from members of %1$s on %2$s!" msgstr "Микроблог на %s" +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#, fuzzy +msgid "Create a new group" +msgstr "Креирај нова сметка" + #: actions/groupsearch.php:52 #, fuzzy, php-format msgid "" @@ -1503,31 +1528,6 @@ msgid "" "action.newgroup%%) yourself!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 -#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 -msgid "Groups" -msgstr "" - -#: actions/groups.php:64 -#, php-format -msgid "Groups, page %d" -msgstr "" - -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%site.name%%%% groups let you find and talk with people of similar " -"interests. After you join a group you can send messages to all other members " -"using the syntax \"!groupname\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" -msgstr "" - -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -#, fuzzy -msgid "Create a new group" -msgstr "Креирај нова сметка" - #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "" @@ -1717,7 +1717,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "Испрати" @@ -1799,58 +1799,58 @@ msgstr "OpenID формуларот не може да се креира:%s" msgid "%s left group %s" msgstr "" -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "Веќе сте најавени." -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 #, fuzzy msgid "Invalid or expired token." msgstr "Неправилна содржина за известување" -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "Неточно корисничко име или лозинка" -#: actions/login.php:152 +#: actions/login.php:153 #, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "Не е одобрено." -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Пријави се" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "" -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Прекар" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Лозинка" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "Запамети ме" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Следниот пат најавете се автоматски; не за компјутери кои ги делите со други!" -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "Загубена или заборавена лозинка?" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1858,7 +1858,7 @@ msgstr "" "Поради безбедносни причини треба повторно да го внесете Вашето корисничко " "име и лозинка пред да ги смените Вашите поставки." -#: actions/login.php:289 +#: actions/login.php:290 #, fuzzy, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1929,7 +1929,7 @@ msgstr "" msgid "Direct message to %s sent" msgstr "" -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" msgstr "" @@ -1937,7 +1937,7 @@ msgstr "" msgid "New notice" msgstr "Ново известување" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 #, fuzzy msgid "Notice posted" msgstr "Известувања" @@ -2015,8 +2015,8 @@ msgstr "Поврзи се" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "" @@ -2698,7 +2698,7 @@ msgstr "" #: actions/register.php:493 msgid "My text and files are available under " -msgstr "Мојот текст и датотеки се достапни под" +msgstr "Мојот текст и податотеки се достапни под " #: actions/register.php:495 msgid "Creative Commons Attribution 3.0" @@ -3550,6 +3550,26 @@ msgstr "Нема JabberID." msgid "SMS" msgstr "" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %s, page %d" +msgstr "Микроблог на %s" + +#: actions/tag.php:86 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "Канал со известувања на %s" + +#: actions/tag.php:92 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "Канал со известувања на %s" + +#: actions/tag.php:98 +#, fuzzy, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "Канал со известувања на %s" + #: actions/tagother.php:33 #, fuzzy msgid "Not logged in" @@ -3598,26 +3618,6 @@ msgstr "Информациите за аватарот не може да се msgid "Use this form to add tags to your subscribers or subscriptions." msgstr "" -#: actions/tag.php:68 -#, fuzzy, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Микроблог на %s" - -#: actions/tag.php:86 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "Канал со известувања на %s" - -#: actions/tag.php:92 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "Канал со известувања на %s" - -#: actions/tag.php:98 -#, fuzzy, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "Канал со известувања на %s" - #: actions/tagrss.php:35 #, fuzzy msgid "No such tag." @@ -3929,40 +3929,45 @@ msgstr "" msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:179 +#: classes/Notice.php:188 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Проблем во снимањето на известувањето." -#: classes/Notice.php:183 +#: classes/Notice.php:192 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Проблем во снимањето на известувањето." -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:194 +#: classes/Notice.php:203 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "Проблем во снимањето на известувањето." -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "Одговор од внесот во базата: %s" +#: classes/User.php:347 +#, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "" + #: classes/User_group.php:380 #, fuzzy msgid "Could not create group." @@ -3973,11 +3978,6 @@ msgstr "Информациите за аватарот не може да се msgid "Could not set group membership." msgstr "Не може да се креира претплатата" -#: classes/User.php:347 -#, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "" - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "" @@ -4296,7 +4296,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 msgid "User has no last notice" msgstr "" @@ -4343,102 +4343,102 @@ msgstr "" msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:439 +#: lib/command.php:440 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Одговори испратени до %s" -#: lib/command.php:441 +#: lib/command.php:442 #, fuzzy msgid "Error saving notice." msgstr "Проблем во снимањето на известувањето." -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:502 +#: lib/command.php:503 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:530 +#: lib/command.php:531 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:551 +#: lib/command.php:552 msgid "Notification off." msgstr "" -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:574 +#: lib/command.php:575 msgid "Notification on." msgstr "" -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" msgstr "" -#: lib/command.php:602 +#: lib/command.php:604 #, fuzzy, php-format msgid "Could not create login token for %s" -msgstr "Информациите за аватарот не може да се снимат" +msgstr "OpenID формуларот не може да се креира:%s" -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:623 +#: lib/command.php:625 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Не ни го испративте тој профил." -#: lib/command.php:625 +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Не ни го испративте тој профил." msgstr[1] "Не ни го испративте тој профил." -#: lib/command.php:645 +#: lib/command.php:647 #, fuzzy msgid "No one is subscribed to you." msgstr "Оддалечена претплата" -#: lib/command.php:647 +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Оддалечена претплата" msgstr[1] "Оддалечена претплата" -#: lib/command.php:667 +#: lib/command.php:669 #, fuzzy msgid "You are not a member of any groups." msgstr "Не ни го испративте тој профил." -#: lib/command.php:669 +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Не ни го испративте тој профил." msgstr[1] "Не ни го испративте тој профил." -#: lib/command.php:683 +#: lib/command.php:685 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4538,10 +4538,6 @@ msgstr "Нема такво известување." msgid "Favor" msgstr "" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "" @@ -4558,6 +4554,10 @@ msgstr "" msgid "FOAF" msgstr "" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "" + #: lib/galleryaction.php:121 msgid "Filter tags" msgstr "" @@ -4727,20 +4727,6 @@ msgstr "Погрешно име или лозинка." msgid "Sign up for a new account" msgstr "Креирај нова сметка" -#: lib/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "" - -#: 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 "" - -#: lib/mailbox.php:227 lib/noticelist.php:452 -msgid "from" -msgstr "" - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "Потврдување на адресата" @@ -4923,6 +4909,20 @@ msgid "" "\n" msgstr "" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "" + +#: 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 "" + +#: lib/mailbox.php:227 lib/noticelist.php:452 +msgid "from" +msgstr "" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -4984,7 +4984,7 @@ msgstr "" msgid "To" msgstr "" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 #, fuzzy msgid "Available characters" msgstr "6 или повеќе знаци" @@ -4999,11 +4999,11 @@ msgstr "Ново известување" msgid "What's up, %s?" msgstr "Што има %s?" -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "" @@ -5074,11 +5074,11 @@ msgstr "Грешка во внесувањето на оддалечениот msgid "Duplicate notice" msgstr "Дуплирано известување" -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 msgid "You have been banned from subscribing." msgstr "" -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Не може да се внесе нова претплата." @@ -5246,20 +5246,6 @@ msgstr "Оддалечена претплата" msgid "Groups %s is a member of" msgstr "" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "" @@ -5291,6 +5277,20 @@ msgstr "Претплата не може да се избрише." msgid "Couldn't delete subscription." msgstr "Претплата не може да се избрише." +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "" + #: lib/tagcloudsection.php:56 msgid "None" msgstr "" diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index 12b20f3ddb..cd4d46b5dc 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-07 21:25+0000\n" -"PO-Revision-Date: 2009-12-07 21:26:58+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:10:06+0000\n" "Language-Team: Norwegian (bokmål)‬\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: no\n" "X-Message-Group: out-statusnet\n" @@ -26,11 +26,11 @@ msgstr "Klarte ikke å lagre profil." #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -43,7 +43,7 @@ msgstr "Klarte ikke å lagre profil." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." @@ -55,7 +55,7 @@ msgid "%s and friends, page %d" msgstr "%s og venner" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s og venner" @@ -107,25 +107,25 @@ msgstr "" msgid "You and friends" msgstr "%s og venner" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 #, fuzzy msgid "API method not found." msgstr "API-metode ikke funnet!" #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 @@ -145,9 +145,23 @@ msgstr "" msgid "Could not update user." msgstr "Klarte ikke å oppdatere bruker." +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "" + +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Klarte ikke å lagre profil." + #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -169,20 +183,6 @@ msgstr "" msgid "Could not update your design." msgstr "Klarte ikke å oppdatere bruker." -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "" - -#: actions/apiaccountupdateprofile.php:147 -#, fuzzy -msgid "Could not save profile." -msgstr "Klarte ikke å lagre profil." - #: actions/apiblockcreate.php:105 #, fuzzy msgid "You cannot block yourself!" @@ -196,23 +196,6 @@ msgstr "" msgid "Unblock user failed." msgstr "" -#: actions/apidirectmessagenew.php:126 -msgid "No message text!" -msgstr "" - -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, php-format -msgid "That's too long. Max message size is %d chars." -msgstr "" - -#: actions/apidirectmessagenew.php:146 -msgid "Recipient user not found." -msgstr "" - -#: actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." -msgstr "" - #: actions/apidirectmessage.php:89 #, php-format msgid "Direct messages from %s" @@ -238,18 +221,35 @@ msgstr "" #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "API-metode ikke funnet!" +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "" + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "" + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -399,16 +399,6 @@ msgstr "Du er allerede logget inn!" msgid "Could not remove user %s to group %s." msgstr "Klarte ikke å oppdatere bruker." -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, php-format -msgid "%s groups" -msgstr "" - -#: actions/apigrouplistall.php:94 -#, php-format -msgid "groups on %s" -msgstr "" - #: actions/apigrouplist.php:95 #, php-format msgid "%s's groups" @@ -419,6 +409,16 @@ msgstr "" msgid "Groups %s is a member of on %s." msgstr "" +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "" + +#: actions/apigrouplistall.php:94 +#, php-format +msgid "groups on %s" +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "" @@ -454,54 +454,54 @@ msgstr "" msgid "Unsupported format." msgstr "" -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, php-format msgid "%s / Favorites from %s" msgstr "" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, php-format msgid "%s updates favorited by %s / %s." msgstr "" -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "%s tidslinje" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, fuzzy, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Oppdateringer som svarer til %2$s" -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s oppdateringer som svarer på oppdateringer fra %2$s / %3$s." -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s offentlig tidslinje" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s oppdateringer fra alle sammen!" -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Mikroblogg av %s" @@ -537,47 +537,47 @@ msgstr "Brukerbilde" msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 msgid "User without matching profile" msgstr "" -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 #, fuzzy msgid "Avatar settings" msgstr "Innstillinger for IM" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 #, fuzzy msgid "Delete" msgstr "slett" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "Last opp" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -588,34 +588,73 @@ msgstr "" msgid "There was a problem with your session token. Try again, please." msgstr "" -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "" -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "Brukerbildet har blitt oppdatert." -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "" -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 #, fuzzy msgid "Avatar deleted." msgstr "Brukerbildet har blitt oppdatert." +#: actions/block.php:69 +#, fuzzy +msgid "You already blocked that user." +msgstr "Du er allerede logget inn!" + +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +msgid "Block user" +msgstr "" + +#: actions/block.php:130 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" + +#: actions/block.php:143 actions/deletenotice.php:145 +#: actions/deleteuser.php:147 actions/groupblock.php:178 +msgid "No" +msgstr "" + +#: actions/block.php:143 actions/deleteuser.php:147 +#, fuzzy +msgid "Do not block this user" +msgstr "Kan ikke slette notisen." + +#: actions/block.php:144 actions/deletenotice.php:146 +#: actions/deleteuser.php:148 actions/groupblock.php:179 +msgid "Yes" +msgstr "Ja" + +#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 +msgid "Block this user" +msgstr "" + +#: actions/block.php:162 +msgid "Failed to save block information." +msgstr "" + #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 #: actions/groupmembers.php:76 actions/grouprss.php:91 @@ -658,45 +697,6 @@ msgstr "" msgid "Unblock this user" msgstr "" -#: actions/block.php:69 -#, fuzzy -msgid "You already blocked that user." -msgstr "Du er allerede logget inn!" - -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 -msgid "Block user" -msgstr "" - -#: actions/block.php:130 -msgid "" -"Are you sure you want to block this user? Afterwards, they will be " -"unsubscribed from you, unable to subscribe to you in the future, and you " -"will not be notified of any @-replies from them." -msgstr "" - -#: actions/block.php:143 actions/deletenotice.php:145 -#: actions/deleteuser.php:147 actions/groupblock.php:178 -msgid "No" -msgstr "" - -#: actions/block.php:143 actions/deleteuser.php:147 -#, fuzzy -msgid "Do not block this user" -msgstr "Kan ikke slette notisen." - -#: actions/block.php:144 actions/deletenotice.php:146 -#: actions/deleteuser.php:148 actions/groupblock.php:179 -msgid "Yes" -msgstr "Ja" - -#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 -msgid "Block this user" -msgstr "" - -#: actions/block.php:162 -msgid "Failed to save block information." -msgstr "" - #: actions/bookmarklet.php:50 msgid "Post to " msgstr "" @@ -1174,6 +1174,14 @@ msgstr "" msgid "New incoming email address added." msgstr "" +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "" + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 msgid "Popular notices" @@ -1216,14 +1224,6 @@ msgstr "" msgid "Updates favored by %1$s on %2$s!" msgstr "" -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "" - -#: actions/favor.php:92 lib/disfavorform.php:140 -msgid "Disfavor favorite" -msgstr "" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1457,6 +1457,31 @@ msgstr "" msgid "Updates from members of %1$s on %2$s!" msgstr "" +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#, fuzzy +msgid "Create a new group" +msgstr "Opprett en ny konto" + #: actions/groupsearch.php:52 #, php-format msgid "" @@ -1488,31 +1513,6 @@ msgid "" "action.newgroup%%) yourself!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 -#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 -msgid "Groups" -msgstr "" - -#: actions/groups.php:64 -#, php-format -msgid "Groups, page %d" -msgstr "" - -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%site.name%%%% groups let you find and talk with people of similar " -"interests. After you join a group you can send messages to all other members " -"using the syntax \"!groupname\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" -msgstr "" - -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -#, fuzzy -msgid "Create a new group" -msgstr "Opprett en ny konto" - #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "" @@ -1694,7 +1694,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "Send" @@ -1796,63 +1796,63 @@ msgstr "Klarte ikke å oppdatere bruker." msgid "%s left group %s" msgstr "" -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "Allerede innlogget." -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 msgid "Invalid or expired token." msgstr "" -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "Feil brukernavn eller passord" -#: actions/login.php:152 +#: actions/login.php:153 #, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "Ikke autorisert." -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Logg inn" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "" -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Nick" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Passord" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "Husk meg" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Logg inn automatisk i framtiden. Ikke for datamaskiner du deler med andre!" -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "Mistet eller glemt passordet?" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "" -#: actions/login.php:289 +#: actions/login.php:290 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1921,7 +1921,7 @@ msgstr "" msgid "Direct message to %s sent" msgstr "" -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" msgstr "" @@ -1929,7 +1929,7 @@ msgstr "" msgid "New notice" msgstr "" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 msgid "Notice posted" msgstr "" @@ -2003,8 +2003,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "" @@ -3526,6 +3526,26 @@ msgstr "Ingen Jabber ID." msgid "SMS" msgstr "" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %s, page %d" +msgstr "Mikroblogg av %s" + +#: actions/tag.php:86 +#, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "" + +#: actions/tag.php:92 +#, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "" + +#: actions/tag.php:98 +#, fuzzy, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "Feed for taggen %s" + #: actions/tagother.php:33 #, fuzzy msgid "Not logged in" @@ -3574,26 +3594,6 @@ msgstr "Klarte ikke å lagre avatar-informasjonen" msgid "Use this form to add tags to your subscribers or subscriptions." msgstr "" -#: actions/tag.php:68 -#, fuzzy, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Mikroblogg av %s" - -#: actions/tag.php:86 -#, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "" - -#: actions/tag.php:92 -#, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "" - -#: actions/tag.php:98 -#, fuzzy, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "Feed for taggen %s" - #: actions/tagrss.php:35 msgid "No such tag." msgstr "" @@ -3890,38 +3890,43 @@ msgstr "" msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:179 +#: classes/Notice.php:188 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:183 +#: classes/Notice.php:192 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:194 +#: classes/Notice.php:203 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "" +#: classes/User.php:347 +#, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "" + #: classes/User_group.php:380 #, fuzzy msgid "Could not create group." @@ -3932,11 +3937,6 @@ msgstr "Klarte ikke å lagre avatar-informasjonen" msgid "Could not set group membership." msgstr "Klarte ikke å lagre avatar-informasjonen" -#: classes/User.php:347 -#, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "" - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Endre profilinnstillingene dine" @@ -4241,7 +4241,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 msgid "User has no last notice" msgstr "" @@ -4288,101 +4288,101 @@ msgstr "" msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:439 +#: lib/command.php:440 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Svar til %s" -#: lib/command.php:441 +#: lib/command.php:442 msgid "Error saving notice." msgstr "" -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:502 +#: lib/command.php:503 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:530 +#: lib/command.php:531 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:551 +#: lib/command.php:552 msgid "Notification off." msgstr "" -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:574 +#: lib/command.php:575 msgid "Notification on." msgstr "" -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" msgstr "" -#: lib/command.php:602 +#: lib/command.php:604 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Klarte ikke å lagre avatar-informasjonen" -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:623 +#: lib/command.php:625 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Ikke autorisert." -#: lib/command.php:625 +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Ikke autorisert." msgstr[1] "Ikke autorisert." -#: lib/command.php:645 +#: lib/command.php:647 #, fuzzy msgid "No one is subscribed to you." msgstr "Svar til %s" -#: lib/command.php:647 +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Svar til %s" msgstr[1] "Svar til %s" -#: lib/command.php:667 +#: lib/command.php:669 #, fuzzy msgid "You are not a member of any groups." msgstr "Du er allerede logget inn!" -#: lib/command.php:669 +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Du er allerede logget inn!" msgstr[1] "Du er allerede logget inn!" -#: lib/command.php:683 +#: lib/command.php:685 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4480,10 +4480,6 @@ msgstr "" msgid "Favor" msgstr "" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "" @@ -4500,6 +4496,10 @@ msgstr "" msgid "FOAF" msgstr "" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "" + #: lib/galleryaction.php:121 #, fuzzy msgid "Filter tags" @@ -4669,21 +4669,6 @@ msgstr "Ugyldig brukernavn eller passord" msgid "Sign up for a new account" msgstr "Opprett en ny konto" -#: lib/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "" - -#: 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 "" - -#: lib/mailbox.php:227 lib/noticelist.php:452 -#, fuzzy -msgid "from" -msgstr "fra" - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "" @@ -4866,6 +4851,21 @@ msgid "" "\n" msgstr "" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "" + +#: 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 "" + +#: lib/mailbox.php:227 lib/noticelist.php:452 +#, fuzzy +msgid "from" +msgstr "fra" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -4926,7 +4926,7 @@ msgstr "" msgid "To" msgstr "" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 #, fuzzy msgid "Available characters" msgstr "6 eller flere tegn" @@ -4940,11 +4940,11 @@ msgstr "" msgid "What's up, %s?" msgstr "" -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "" @@ -5014,11 +5014,11 @@ msgstr "" msgid "Duplicate notice" msgstr "" -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 msgid "You have been banned from subscribing." msgstr "" -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "" @@ -5185,20 +5185,6 @@ msgstr "Svar til %s" msgid "Groups %s is a member of" msgstr "" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "" @@ -5229,6 +5215,20 @@ msgstr "Klarte ikke å lagre avatar-informasjonen" msgid "Couldn't delete subscription." msgstr "" +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "" + #: lib/tagcloudsection.php:56 msgid "None" msgstr "" diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index cec42ca714..c17a03a539 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-07 21:25+0000\n" -"PO-Revision-Date: 2009-12-07 21:27:06+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:10:12+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: out-statusnet\n" @@ -27,11 +27,11 @@ msgstr "Deze pagina bestaat niet" #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -44,7 +44,7 @@ msgstr "Deze pagina bestaat niet" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." @@ -56,7 +56,7 @@ msgid "%s and friends, page %d" msgstr "%s en vrienden, pagina %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s en vrienden" @@ -116,24 +116,24 @@ msgstr "" msgid "You and friends" msgstr "U en vrienden" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Updates van %1$s en vrienden op %2$s." #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 msgid "API method not found." msgstr "De API-functie is niet aangetroffen." #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 @@ -154,9 +154,22 @@ msgstr "" msgid "Could not update user." msgstr "Het was niet mogelijk de gebruiker te actualiseren." +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "Deze gebruiker heeft geen profiel." + +#: actions/apiaccountupdateprofile.php:147 +msgid "Could not save profile." +msgstr "Het was niet mogelijk het profiel op te slaan." + #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -179,22 +192,9 @@ msgstr "Het was niet mogelijk om uw ontwerpinstellingen op te slaan." msgid "Could not update your design." msgstr "Het was niet mogelijk uw ontwerp bij te werken." -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "Deze gebruiker heeft geen profiel." - -#: actions/apiaccountupdateprofile.php:147 -msgid "Could not save profile." -msgstr "Het was niet mogelijk het profiel op te slaan." - #: actions/apiblockcreate.php:105 msgid "You cannot block yourself!" -msgstr "U zichzelf niet blokkeren!" +msgstr "U kunt zichzelf niet blokkeren!" #: actions/apiblockcreate.php:119 msgid "Block user failed." @@ -204,25 +204,6 @@ msgstr "Het blokkeren van de gebruiker is mislukt." msgid "Unblock user failed." msgstr "Het deblokkeren van de gebruiker is mislukt." -#: actions/apidirectmessagenew.php:126 -msgid "No message text!" -msgstr "Het bericht bevat geen inhoud!" - -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, php-format -msgid "That's too long. Max message size is %d chars." -msgstr "Dat is te lang. De maximale berichtlengte is %d tekens." - -#: actions/apidirectmessagenew.php:146 -msgid "Recipient user not found." -msgstr "De ontvanger is niet aangetroffen." - -#: actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." -msgstr "" -"U kunt geen directe berichten sturen aan gebruikers die niet op uw " -"vriendenlijst staan." - #: actions/apidirectmessage.php:89 #, php-format msgid "Direct messages from %s" @@ -248,18 +229,37 @@ msgstr "Alle directe berichten verzonden aan %s" #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "De API-functie is niet aangetroffen!" +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "Het bericht bevat geen inhoud!" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "Dat is te lang. De maximale berichtlengte is %d tekens." + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "De ontvanger is niet aangetroffen." + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "" +"U kunt geen directe berichten sturen aan gebruikers die niet op uw " +"vriendenlijst staan." + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -408,16 +408,6 @@ msgstr "U bent geen lid van deze groep." msgid "Could not remove user %s to group %s." msgstr "Het was niet mogelijk gebruiker %s uit de group %s te verwijderen." -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, php-format -msgid "%s groups" -msgstr "%s groepen" - -#: actions/apigrouplistall.php:94 -#, php-format -msgid "groups on %s" -msgstr "groepen op %s" - #: actions/apigrouplist.php:95 #, php-format msgid "%s's groups" @@ -428,6 +418,16 @@ msgstr "Groepen van %s" msgid "Groups %s is a member of on %s." msgstr "Groepen waarvan %s lid is op %s." +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "%s groepen" + +#: actions/apigrouplistall.php:94 +#, php-format +msgid "groups on %s" +msgstr "groepen op %s" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Deze methode heeft een POST of DELETE nodig." @@ -465,54 +465,54 @@ msgstr "" msgid "Unsupported format." msgstr "Niet-ondersteund bestandsformaat." -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, php-format msgid "%s / Favorites from %s" msgstr "%s / Favorieten van %s" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, php-format msgid "%s updates favorited by %s / %s." msgstr "%s updates op de favorietenlijst geplaatst door %s / %s" -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "%s tijdlijn" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Updates van %1$s op %2$s." -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Updates over %2$s" -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s updates die een reactie zijn op updates van %2$s / %3$s." -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s publieke tijdlijn" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s updates van iedereen" -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "Mededelingen met het label %s" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Updates met het label %1$s op %2$s!" @@ -548,45 +548,45 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" "U kunt een persoonlijke avatar uploaden. De maximale bestandsgrootte is %s." -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 msgid "User without matching profile" msgstr "Gebruiker zonder bijbehorend profiel" -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 msgid "Avatar settings" msgstr "Avatarinstellingen" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "Origineel" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "Voorvertoning" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 msgid "Delete" msgstr "Verwijderen" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "Uploaden" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "Uitsnijden" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -599,33 +599,74 @@ msgstr "" "Er is een probleem ontstaan met uw sessie. Probeer het nog een keer, " "alstublieft." -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Het formulier is onverwacht ingezonden." -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "Selecteer een vierkant de afbeelding om als uw avatar in te stellen" -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "Ons databestand is verloren gegaan." -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "De avatar is bijgewerkt." -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "Het bijwerken van de avatar is mislukt." -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 msgid "Avatar deleted." msgstr "De avatar is verwijderd." +#: actions/block.php:69 +msgid "You already blocked that user." +msgstr "U hebt deze gebruiker reeds geblokkeerd." + +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +msgid "Block user" +msgstr "Gebruiker blokkeren" + +#: actions/block.php:130 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" +"Weet u zeker dat u deze gebruiker wilt blokkeren? Na deze handeling wordt " +"het abonnement van de gebruiker op u opgezegd en kan deze gebruiker in de " +"toekomst niet op u abonneren. U wordt niet op de hoogte gesteld van \"@\"-" +"antwoorden van de gebruiker." + +#: actions/block.php:143 actions/deletenotice.php:145 +#: actions/deleteuser.php:147 actions/groupblock.php:178 +msgid "No" +msgstr "Nee" + +#: actions/block.php:143 actions/deleteuser.php:147 +msgid "Do not block this user" +msgstr "Gebruiker niet blokkeren" + +#: actions/block.php:144 actions/deletenotice.php:146 +#: actions/deleteuser.php:148 actions/groupblock.php:179 +msgid "Yes" +msgstr "Ja" + +#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 +msgid "Block this user" +msgstr "Deze gebruiker blokkeren" + +#: actions/block.php:162 +msgid "Failed to save block information." +msgstr "Het was niet mogelijk om de blokkadeinformatie op te slaan." + #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 #: actions/groupmembers.php:76 actions/grouprss.php:91 @@ -666,47 +707,6 @@ msgstr "Deblokkeer" msgid "Unblock this user" msgstr "Deblokkeer deze gebruiker." -#: actions/block.php:69 -msgid "You already blocked that user." -msgstr "U hebt deze gebruiker reeds geblokkeerd." - -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 -msgid "Block user" -msgstr "Gebruiker blokkeren" - -#: actions/block.php:130 -msgid "" -"Are you sure you want to block this user? Afterwards, they will be " -"unsubscribed from you, unable to subscribe to you in the future, and you " -"will not be notified of any @-replies from them." -msgstr "" -"Weet u zeker dat u deze gebruiker wilt blokkeren? Na deze handeling wordt " -"het abonnement van de gebruiker op u opgezegd en kan deze gebruiker in de " -"toekomst niet op u abonneren. U wordt niet op de hoogte gesteld van \"@\"-" -"antwoorden van de gebruiker." - -#: actions/block.php:143 actions/deletenotice.php:145 -#: actions/deleteuser.php:147 actions/groupblock.php:178 -msgid "No" -msgstr "Nee" - -#: actions/block.php:143 actions/deleteuser.php:147 -msgid "Do not block this user" -msgstr "Gebruiker deblokkeren" - -#: actions/block.php:144 actions/deletenotice.php:146 -#: actions/deleteuser.php:148 actions/groupblock.php:179 -msgid "Yes" -msgstr "Ja" - -#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 -msgid "Block this user" -msgstr "Deze gebruiker blokkeren" - -#: actions/block.php:162 -msgid "Failed to save block information." -msgstr "Het was niet mogelijk om de blokkadeinformatie op te slaan." - #: actions/bookmarklet.php:50 msgid "Post to " msgstr "Verzenden naar " @@ -1060,8 +1060,8 @@ msgstr "Stuur een email naar dit adres om een nieuw bericht te posten" #: actions/emailsettings.php:145 actions/smssettings.php:162 msgid "Make a new email address for posting to; cancels the old one." msgstr "" -"Een nieuw e-mailadres instellen voor het ontvangen van e-mail. Hier wordt " -"het het eerder ingestelde e-mailadres verwijderd." +"Stelt een nieuw e-mailadres in voor het plaatsen van berichten; verwijdert " +"het oude." #: actions/emailsettings.php:148 actions/smssettings.php:164 msgid "New" @@ -1179,6 +1179,14 @@ msgstr "Het e-mailadres voor inkomende mail is verwijderd." msgid "New incoming email address added." msgstr "Het nieuwe binnenkomende e-mailadres is toegevoegd." +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "Deze mededeling staat al in uw favorietenlijst." + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "Van favotietenlijst verwijderen" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 msgid "Popular notices" @@ -1228,14 +1236,6 @@ msgstr "Favoriete mededelingen van %s" msgid "Updates favored by %1$s on %2$s!" msgstr "Updates op de favorietenlijst van %1$s op %2$s." -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "Deze mededeling staat al in uw favorietenlijst." - -#: actions/favor.php:92 lib/disfavorform.php:140 -msgid "Disfavor favorite" -msgstr "Van favotietenlijst verwijderen" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1473,6 +1473,36 @@ msgstr "Deze gebruiker beheerder maken" msgid "Updates from members of %1$s on %2$s!" msgstr "Updates voor leden van %1$s op %2$s." +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "Groepen" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "Groepen, pagina %d" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" +"Met groepen van %%%%site.name%%%% kunt u gebruikers vinden met gelijke " +"interessen en daarmee in contact treden. Nadat u lid bent geworden van een " +"groep, kunt u berichten naar alle gebruikers zenden met door het voorvoegsel " +"\"!groepsnaam\" te gebruiken. Als u geen groep ziet die u aantreft, " +"[doorzoek dan de groepen](%%%%action.groupsearch%%%%) of [start zelf een " +"groep!](%%%%action.newgroup%%%%)." + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +msgid "Create a new group" +msgstr "Nieuwe groep aanmaken" + #: actions/groupsearch.php:52 #, php-format msgid "" @@ -1510,36 +1540,6 @@ msgstr "" "U kunt een [gebruiker registreren](%%action.register%%) en de groep zelf " "[aanmaken](%%action.newgroup%%)!" -#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 -#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 -msgid "Groups" -msgstr "Groepen" - -#: actions/groups.php:64 -#, php-format -msgid "Groups, page %d" -msgstr "Groepen, pagina %d" - -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%site.name%%%% groups let you find and talk with people of similar " -"interests. After you join a group you can send messages to all other members " -"using the syntax \"!groupname\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" -msgstr "" -"Met groepen van %%%%site.name%%%% kunt u gebruikers vinden met gelijke " -"interessen en daarmee in contact treden. Nadat u lid bent geworden van een " -"groep, kunt u berichten naar alle gebruikers zenden met door het voorvoegsel " -"\"!groepsnaam\" te gebruiken. Als u geen groep ziet die u aantreft, " -"[doorzoek dan de groepen](%%%%action.groupsearch%%%%) of [start zelf een " -"groep!](%%%%action.newgroup%%%%)." - -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -msgid "Create a new group" -msgstr "Nieuwe groep aanmaken" - #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "Alleen beheerders kunnen groepsleden deblokkeren." @@ -1736,7 +1736,7 @@ msgstr "Persoonlijk bericht" msgid "Optionally add a personal message to the invitation." msgstr "Persoonlijk bericht bij de uitnodiging (optioneel)." -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "Verzenden" @@ -1842,57 +1842,57 @@ msgstr "De gebruiker %s kon niet uit de groet %s verwijderd worden" msgid "%s left group %s" msgstr "%s heeft de groep %s verlaten" -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "U bent al aangemeld." -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 msgid "Invalid or expired token." msgstr "Het token is ongeldig of verlopen." -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "De gebruikersnaam of wachtwoord is onjuist." -#: actions/login.php:152 +#: actions/login.php:153 msgid "Error setting user. You are probably not authorized." msgstr "" "Er is een fout opgetreden bij het maken van de instellingen. U hebt " "waarschijnlijk niet de juiste rechten." -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Aanmelden" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "Aanmelden" -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Gebruikersnaam" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Wachtwoord" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "Aanmeldgegevens onthouden" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "Voortaan automatisch aanmelden. Niet gebruiken op gedeelde computers!" -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "Wachtwoord kwijt of vergeten?" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1900,7 +1900,7 @@ msgstr "" "Om veiligheidsredenen moet u uw gebruikersnaam en wachtwoord nogmaals " "invoeren alvorens u uw instellingen kunt wijzigen." -#: actions/login.php:289 +#: actions/login.php:290 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1971,7 +1971,7 @@ msgstr "Bericht verzonden." msgid "Direct message to %s sent" msgstr "Het directe bericht aan %s is verzonden" -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" msgstr "Er is een Ajax-fout opgetreden" @@ -1979,7 +1979,7 @@ msgstr "Er is een Ajax-fout opgetreden" msgid "New notice" msgstr "Nieuw bericht" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 msgid "Notice posted" msgstr "De mededeling is verzonden" @@ -2062,8 +2062,8 @@ msgstr "inhoudstype " msgid "Only " msgstr "Alleen " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "Geen ondersteund gegevensformaat." @@ -3660,6 +3660,26 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, php-format +msgid "Notices tagged with %s, page %d" +msgstr "Mededelingen met het label %s, pagina %d" + +#: actions/tag.php:86 +#, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "Mededelingenfeed voor label %s (RSS 1.0)" + +#: actions/tag.php:92 +#, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "Mededelingenfeed voor label %s (RSS 2.0)" + +#: actions/tag.php:98 +#, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "Mededelingenfeed voor label %s (Atom)" + #: actions/tagother.php:33 msgid "Not logged in" msgstr "Niet aangemeld." @@ -3710,26 +3730,6 @@ msgstr "" "Gebruik dit formulier om labels toe te voegen aan uw abonnementen of " "abonnees." -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Mededelingen met het label %s, pagina %d" - -#: actions/tag.php:86 -#, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "Mededelingenfeed voor label %s (RSS 1.0)" - -#: actions/tag.php:92 -#, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "Mededelingenfeed voor label %s (RSS 2.0)" - -#: actions/tag.php:98 -#, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "Mededelingenfeed voor label %s (Atom)" - #: actions/tagrss.php:35 msgid "No such tag." msgstr "Onbekend label." @@ -4037,26 +4037,26 @@ msgstr "Het was niet mogelijk het bericht bij te werken met de nieuwe URI." msgid "DB error inserting hashtag: %s" msgstr "Er is een databasefout opgetreden bij de invoer van de hashtag: %s" -#: classes/Notice.php:179 +#: classes/Notice.php:188 msgid "Problem saving notice. Too long." msgstr "" "Er is een probleem opgetreden bij het opslaan van de mededeling. Deze is te " "lang." -#: classes/Notice.php:183 +#: classes/Notice.php:192 msgid "Problem saving notice. Unknown user." msgstr "" "Er was een probleem bij het opslaan van de mededeling. De gebruiker is " "onbekend." -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "U hebt te snel te veel mededelingen verstuurd. Kom even op adem en probeer " "het over enige tijd weer." -#: classes/Notice.php:194 +#: classes/Notice.php:203 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4064,21 +4064,26 @@ msgstr "" "Te veel duplicaatberichten te snel achter elkaar. Neem een adempauze en " "plaats over een aantal minuten pas weer een bericht." -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "" "U bent geblokkeerd en mag geen mededelingen meer achterlaten op deze site." -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "Er is een probleem opgetreden bij het opslaan van de mededeling." -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "" "Er is een databasefout opgetreden bij het invoegen van het antwoord: %s" +#: classes/User.php:347 +#, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "Welkom bij %1$s, @%2$s!" + #: classes/User_group.php:380 msgid "Could not create group." msgstr "Het was niet mogelijk de groep aan te maken." @@ -4087,11 +4092,6 @@ msgstr "Het was niet mogelijk de groep aan te maken." msgid "Could not set group membership." msgstr "Het was niet mogelijk het groepslidmaatschap in te stellen." -#: classes/User.php:347 -#, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "Welkom bij %1$s, @%2$s!" - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Uw profielgegevens wijzigen" @@ -4396,7 +4396,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "Er bestaat geen mededeling met dat ID" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 msgid "User has no last notice" msgstr "Deze gebruiker heeft geen laatste mededeling" @@ -4447,100 +4447,101 @@ msgstr "" "De mededeling is te lang. De maximale lengte is %d tekens. Uw mededeling " "bevatte %d tekens" -#: lib/command.php:439 +#: lib/command.php:440 #, php-format msgid "Reply to %s sent" msgstr "Het antwoord aan %s is verzonden" -#: lib/command.php:441 +#: lib/command.php:442 msgid "Error saving notice." msgstr "Er is een fout opgetreden bij het opslaan van de mededeling." -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "Geef de naam op van de gebruiker waarop u wilt abonneren" -#: lib/command.php:502 +#: lib/command.php:503 #, php-format msgid "Subscribed to %s" msgstr "Geabonneerd op %s" -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "" "Geef de naam op van de gebruiker waarvoor u het abonnement wilt opzeggen" -#: lib/command.php:530 +#: lib/command.php:531 #, php-format msgid "Unsubscribed from %s" msgstr "Uw abonnement op %s is opgezegd" -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "Dit commando is nog niet geïmplementeerd." -#: lib/command.php:551 +#: lib/command.php:552 msgid "Notification off." msgstr "Notificaties uitgeschakeld." -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "Het is niet mogelijk de mededelingen uit te schakelen." -#: lib/command.php:574 +#: lib/command.php:575 msgid "Notification on." msgstr "Notificaties ingeschakeld." -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "Het is niet mogelijk de notificatie uit te schakelen." -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" -msgstr "" +msgstr "Het aanmeldcommando is uitgeschakeld" -#: lib/command.php:602 -#, fuzzy, php-format +#: lib/command.php:604 +#, php-format msgid "Could not create login token for %s" -msgstr "Het was niet mogelijk de aliassen aan te maken." +msgstr "Het was niet mogelijk een aanmeldtoken aan te maken voor %s" -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" +"Deze verwijzing kan slechts één keer gebruikt worden en is twee minuten " +"geldig: %s" -#: lib/command.php:623 +#: lib/command.php:625 msgid "You are not subscribed to anyone." msgstr "U bent op geen enkele gebruiker geabonneerd." -#: lib/command.php:625 +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "U bent geabonneerd op deze gebruiker:" msgstr[1] "U bent geabonneerd op deze gebruikers:" -#: lib/command.php:645 +#: lib/command.php:647 msgid "No one is subscribed to you." msgstr "Niemand heeft een abonnenment op u." -#: lib/command.php:647 +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Deze gebruiker is op u geabonneerd:" msgstr[1] "Deze gebruikers zijn op u geabonneerd:" -#: lib/command.php:667 +#: lib/command.php:669 msgid "You are not a member of any groups." msgstr "U bent lid van geen enkele groep." -#: lib/command.php:669 +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "U bent lid van deze groep:" msgstr[1] "U bent lid van deze groepen:" -#: lib/command.php:683 -#, fuzzy +#: lib/command.php:685 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4597,6 +4598,7 @@ msgstr "" "reply # - antwoorden op de mededeling met het aangegeven ID\n" "reply - antwoorden op de laatste mededeling van gebruiker\n" "join - lid worden van groep\n" +"login - verwijzing opvragen naar de webpagina voor aanmelden\n" "drop - groepslidmaatschap opzeggen\n" "stats - uw statistieken opvragen\n" "stop - zelfde als 'off'\n" @@ -4675,10 +4677,6 @@ msgstr "Op de favorietenlijst plaatsen" msgid "Favor" msgstr "Aan favorieten toevoegen" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "Feeds" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "RSS 1.0" @@ -4695,6 +4693,10 @@ msgstr "Atom" msgid "FOAF" msgstr "Vrienden van vrienden (FOAF)" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "Feeds" + #: lib/galleryaction.php:121 msgid "Filter tags" msgstr "Labels filteren" @@ -4855,22 +4857,6 @@ msgstr "Aanmelden met gebruikersnaam en wachtwoord" msgid "Sign up for a new account" msgstr "Nieuwe gebruiker aanmaken" -#: lib/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "Gebruikers kunnen alleen hun eigen postvakken lezen." - -#: 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 "" -"U hebt geen privéberichten. U kunt privéberichten verzenden aan andere " -"gebruikers. Mensen kunnen u privéberichten sturen die alleen u kunt lezen." - -#: lib/mailbox.php:227 lib/noticelist.php:452 -msgid "from" -msgstr "van" - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "E-mailadresbevestiging" @@ -5134,6 +5120,22 @@ msgstr "" "%4$s\n" "\n" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "Gebruikers kunnen alleen hun eigen postvakken lezen." + +#: 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 "" +"U hebt geen privéberichten. U kunt privéberichten verzenden aan andere " +"gebruikers. Mensen kunnen u privéberichten sturen die alleen u kunt lezen." + +#: lib/mailbox.php:227 lib/noticelist.php:452 +msgid "from" +msgstr "van" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5200,7 +5202,7 @@ msgstr "Directe mededeling verzenden" msgid "To" msgstr "Aan" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 msgid "Available characters" msgstr "Beschikbare tekens" @@ -5213,11 +5215,11 @@ msgstr "Mededeling verzenden" msgid "What's up, %s?" msgstr "Hallo, %s." -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "Toevoegen" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "Bestand toevoegen" @@ -5287,11 +5289,11 @@ msgstr "" msgid "Duplicate notice" msgstr "Duplicaatmelding" -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 msgid "You have been banned from subscribing." msgstr "U mag zich niet abonneren." -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Kon nieuw abonnement niet toevoegen." @@ -5451,20 +5453,6 @@ msgstr "Gebruikers met een abonnement op %s" msgid "Groups %s is a member of" msgstr "Groepen waar %s lid van is" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "Gebruikerslabelwolk als zelf gelabeld" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "Gebruikerslabelwolk" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(geen)" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "U bent al gebonneerd!" @@ -5493,6 +5481,20 @@ msgstr "Het was niet mogelijk het abonnement op uzelf te verwijderen." msgid "Couldn't delete subscription." msgstr "Kon abonnement niet verwijderen." +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "Gebruikerslabelwolk als zelf gelabeld" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "Gebruikerslabelwolk" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "(geen)" + #: lib/tagcloudsection.php:56 msgid "None" msgstr "Geen" diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index 0703217dea..fe4af0f156 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: 2009-12-07 21:25+0000\n" -"PO-Revision-Date: 2009-12-07 21:27:01+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:10:09+0000\n" "Language-Team: Norwegian Nynorsk\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nn\n" "X-Message-Group: out-statusnet\n" @@ -26,11 +26,11 @@ msgstr "Dette emneord finst ikkje." #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -43,7 +43,7 @@ msgstr "Dette emneord finst ikkje." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." @@ -55,7 +55,7 @@ msgid "%s and friends, page %d" msgstr "%s med vener, side %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s med vener" @@ -107,25 +107,25 @@ msgstr "" msgid "You and friends" msgstr "%s med vener" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Oppdateringar frå %1$s og vener på %2$s!" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 #, fuzzy msgid "API method not found." msgstr "Fann ikkje API-metode." #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 @@ -145,9 +145,23 @@ msgstr "" msgid "Could not update user." msgstr "Kan ikkje oppdatera brukar." +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "Brukaren har inga profil." + +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Kan ikkje lagra profil." + #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -170,20 +184,6 @@ msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!" msgid "Could not update your design." msgstr "Kan ikkje oppdatera brukar." -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "Brukaren har inga profil." - -#: actions/apiaccountupdateprofile.php:147 -#, fuzzy -msgid "Could not save profile." -msgstr "Kan ikkje lagra profil." - #: actions/apiblockcreate.php:105 #, fuzzy msgid "You cannot block yourself!" @@ -197,23 +197,6 @@ msgstr "Blokkering av brukar feila." msgid "Unblock user failed." msgstr "De-blokkering av brukar feila." -#: actions/apidirectmessagenew.php:126 -msgid "No message text!" -msgstr "Inga meldingstekst!" - -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, fuzzy, php-format -msgid "That's too long. Max message size is %d chars." -msgstr "Det er for langt. Ein notis kan berre være 140 teikn." - -#: actions/apidirectmessagenew.php:146 -msgid "Recipient user not found." -msgstr "Kunne ikkje finne mottakar." - -#: actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." -msgstr "Kan ikkje senda direktemeldingar til brukarar som du ikkje er ven med." - #: actions/apidirectmessage.php:89 #, fuzzy, php-format msgid "Direct messages from %s" @@ -239,18 +222,35 @@ msgstr "Alle direkte meldingar sendt til %s" #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "Fann ikkje API-metode." +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "Inga meldingstekst!" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, fuzzy, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "Det er for langt. Ein notis kan berre være 140 teikn." + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "Kunne ikkje finne mottakar." + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "Kan ikkje senda direktemeldingar til brukarar som du ikkje er ven med." + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -401,16 +401,6 @@ msgstr "Du er ikkje medlem av den gruppa." msgid "Could not remove user %s to group %s." msgstr "Kunne ikkje fjerne %s fra %s gruppa " -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, php-format -msgid "%s groups" -msgstr "%s grupper" - -#: actions/apigrouplistall.php:94 -#, fuzzy, php-format -msgid "groups on %s" -msgstr "Gruppe handlingar" - #: actions/apigrouplist.php:95 #, fuzzy, php-format msgid "%s's groups" @@ -421,6 +411,16 @@ msgstr "%s grupper" msgid "Groups %s is a member of on %s." msgstr "Grupper %s er medlem av" +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "%s grupper" + +#: actions/apigrouplistall.php:94 +#, fuzzy, php-format +msgid "groups on %s" +msgstr "Gruppe handlingar" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Dette krev anten ein POST eller DELETE." @@ -458,54 +458,54 @@ msgstr "" msgid "Unsupported format." msgstr "Støttar ikkje bileteformatet." -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, php-format msgid "%s / Favorites from %s" msgstr "%s / Favorittar frå %s" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, php-format msgid "%s updates favorited by %s / %s." msgstr "%s oppdateringar favorisert av %s / %s." -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "%s tidsline" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Oppdateringar frå %1$s på %2$s!" -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, fuzzy, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Oppdateringar som svarar til %2$s" -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s oppdateringar som svarar på oppdateringar frå %2$s / %3$s." -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s offentleg tidsline" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s oppdateringar frå alle saman!" -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "Notisar merka med %s" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Oppdateringar frå %1$s på %2$s!" @@ -541,45 +541,45 @@ msgstr "Brukarbilete" msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "Du kan laste opp ein personleg avatar." -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 msgid "User without matching profile" msgstr "Kan ikkje finne brukar" -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 msgid "Avatar settings" msgstr "Avatar-innstillingar" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "Original" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "Forhandsvis" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 msgid "Delete" msgstr "Slett" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "Last opp" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "Skaler" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -590,34 +590,73 @@ msgstr "Skaler" msgid "There was a problem with your session token. Try again, please." msgstr "Der var eit problem med sesjonen din. Vennlegst prøv på nytt." -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Uventa skjemasending." -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "Velg eit utvalg av bildet som vil blir din avatar." -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "Fant ikkje igjen fil data." -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "Lasta opp brukarbilete." -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "Feil ved oppdatering av brukarbilete." -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 #, fuzzy msgid "Avatar deleted." msgstr "Lasta opp brukarbilete." +#: actions/block.php:69 +#, fuzzy +msgid "You already blocked that user." +msgstr "Du har allereie blokkert denne brukaren." + +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +msgid "Block user" +msgstr "Blokker brukaren" + +#: actions/block.php:130 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" + +#: actions/block.php:143 actions/deletenotice.php:145 +#: actions/deleteuser.php:147 actions/groupblock.php:178 +msgid "No" +msgstr "Nei" + +#: actions/block.php:143 actions/deleteuser.php:147 +#, fuzzy +msgid "Do not block this user" +msgstr "Lås opp brukaren" + +#: actions/block.php:144 actions/deletenotice.php:146 +#: actions/deleteuser.php:148 actions/groupblock.php:179 +msgid "Yes" +msgstr "Jau" + +#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 +msgid "Block this user" +msgstr "Blokkér denne brukaren" + +#: actions/block.php:162 +msgid "Failed to save block information." +msgstr "Lagring av informasjon feila." + #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 #: actions/groupmembers.php:76 actions/grouprss.php:91 @@ -660,45 +699,6 @@ msgstr "Lås opp" msgid "Unblock this user" msgstr "Lås opp brukaren" -#: actions/block.php:69 -#, fuzzy -msgid "You already blocked that user." -msgstr "Du har allereie blokkert denne brukaren." - -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 -msgid "Block user" -msgstr "Blokker brukaren" - -#: actions/block.php:130 -msgid "" -"Are you sure you want to block this user? Afterwards, they will be " -"unsubscribed from you, unable to subscribe to you in the future, and you " -"will not be notified of any @-replies from them." -msgstr "" - -#: actions/block.php:143 actions/deletenotice.php:145 -#: actions/deleteuser.php:147 actions/groupblock.php:178 -msgid "No" -msgstr "Nei" - -#: actions/block.php:143 actions/deleteuser.php:147 -#, fuzzy -msgid "Do not block this user" -msgstr "Lås opp brukaren" - -#: actions/block.php:144 actions/deletenotice.php:146 -#: actions/deleteuser.php:148 actions/groupblock.php:179 -msgid "Yes" -msgstr "Jau" - -#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 -msgid "Block this user" -msgstr "Blokkér denne brukaren" - -#: actions/block.php:162 -msgid "Failed to save block information." -msgstr "Lagring av informasjon feila." - #: actions/bookmarklet.php:50 #, fuzzy msgid "Post to " @@ -1184,6 +1184,14 @@ msgstr "Fjerna innkomande epostadresse." msgid "New incoming email address added." msgstr "La til ny innkomande epostadresse." +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "Denne notisen er alt ein favoritt!" + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "Fjern favoritt" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 msgid "Popular notices" @@ -1226,14 +1234,6 @@ msgstr "%s's favoritt meldingar" msgid "Updates favored by %1$s on %2$s!" msgstr "Oppdateringar frå %1$s på %2$s!" -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "Denne notisen er alt ein favoritt!" - -#: actions/favor.php:92 lib/disfavorform.php:140 -msgid "Disfavor favorite" -msgstr "Fjern favoritt" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1480,6 +1480,30 @@ msgstr "" msgid "Updates from members of %1$s on %2$s!" msgstr "Oppdateringar frå %1$s på %2$s!" +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "Grupper" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "Grupper, side %d" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +msgid "Create a new group" +msgstr "Opprett ei ny gruppe" + #: actions/groupsearch.php:52 #, fuzzy, php-format msgid "" @@ -1513,30 +1537,6 @@ msgid "" "action.newgroup%%) yourself!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 -#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 -msgid "Groups" -msgstr "Grupper" - -#: actions/groups.php:64 -#, php-format -msgid "Groups, page %d" -msgstr "Grupper, side %d" - -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%site.name%%%% groups let you find and talk with people of similar " -"interests. After you join a group you can send messages to all other members " -"using the syntax \"!groupname\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" -msgstr "" - -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -msgid "Create a new group" -msgstr "Opprett ei ny gruppe" - #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "" @@ -1729,7 +1729,7 @@ msgstr "Personleg melding" msgid "Optionally add a personal message to the invitation." msgstr "Eventuelt legg til ei personleg melding til invitasjonen." -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "Send" @@ -1830,57 +1830,57 @@ msgstr "Kunne ikkje fjerne %s fra %s gruppa " msgid "%s left group %s" msgstr "%s forlot %s gruppa" -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "Allereie logga inn." -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 #, fuzzy msgid "Invalid or expired token." msgstr "Ugyldig notisinnhald" -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "Feil brukarnamn eller passord" -#: actions/login.php:152 +#: actions/login.php:153 #, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "Ikkje autorisert." -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Logg inn" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "Logg inn " -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Kallenamn" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Passord" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "Hugs meg" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "Logg inn automatisk i framtidi (ikkje for delte maskiner)." -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "Mista eller gløymd passord?" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1888,7 +1888,7 @@ msgstr "" "Skriv inn brukarnam og passord før du endrar innstillingar (av " "tryggleiksomsyn)." -#: actions/login.php:289 +#: actions/login.php:290 #, fuzzy, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1963,7 +1963,7 @@ msgstr "Melding" msgid "Direct message to %s sent" msgstr "Direkte melding til %s sendt" -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" msgstr "Ajax feil" @@ -1971,7 +1971,7 @@ msgstr "Ajax feil" msgid "New notice" msgstr "Ny notis" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 msgid "Notice posted" msgstr "Melding lagra" @@ -2050,8 +2050,8 @@ msgstr "Kopla til" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "Ikkje eit støtta dataformat." @@ -3610,6 +3610,26 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, php-format +msgid "Notices tagged with %s, page %d" +msgstr "Notisar merka med %s, side %d" + +#: actions/tag.php:86 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "Notisstraum for %s" + +#: actions/tag.php:92 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "Notisstraum for %s" + +#: actions/tag.php:98 +#, fuzzy, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "Notisstraum for %s" + #: actions/tagother.php:33 msgid "Not logged in" msgstr "Ikkje logga inn" @@ -3660,26 +3680,6 @@ msgstr "" "Bruk dette skjemaet for å leggje til emneord til dei som tingar notisar frå " "deg, eller som du tingar notisar frå." -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Notisar merka med %s, side %d" - -#: actions/tag.php:86 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "Notisstraum for %s" - -#: actions/tag.php:92 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "Notisstraum for %s" - -#: actions/tag.php:98 -#, fuzzy, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "Notisstraum for %s" - #: actions/tagrss.php:35 msgid "No such tag." msgstr "Dette emneord finst ikkje." @@ -3992,22 +3992,22 @@ msgstr "Kunne ikkje oppdatere melding med ny URI." msgid "DB error inserting hashtag: %s" msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s" -#: classes/Notice.php:179 +#: classes/Notice.php:188 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Eit problem oppstod ved lagring av notis." -#: classes/Notice.php:183 +#: classes/Notice.php:192 msgid "Problem saving notice. Unknown user." msgstr "Feil ved lagring av notis. Ukjend brukar." -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt." -#: classes/Notice.php:194 +#: classes/Notice.php:203 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4015,19 +4015,24 @@ msgid "" msgstr "" "For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt." -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "Du kan ikkje lengre legge inn notisar på denne sida." -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "Eit problem oppstod ved lagring av notis." -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "Databasefeil, kan ikkje lagra svar: %s" +#: classes/User.php:347 +#, fuzzy, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "Melding til %1$s på %2$s" + #: classes/User_group.php:380 msgid "Could not create group." msgstr "Kunne ikkje laga gruppa." @@ -4036,11 +4041,6 @@ msgstr "Kunne ikkje laga gruppa." msgid "Could not set group membership." msgstr "Kunne ikkje bli med i gruppa." -#: classes/User.php:347 -#, fuzzy, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "Melding til %1$s på %2$s" - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Endra profilinnstillingane dine" @@ -4355,7 +4355,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 msgid "User has no last notice" msgstr "Brukaren har ikkje siste notis" @@ -4402,102 +4402,102 @@ msgstr "Ein feil oppstod ved sending av direkte melding." msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d" -#: lib/command.php:439 +#: lib/command.php:440 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Svar på denne notisen" -#: lib/command.php:441 +#: lib/command.php:442 #, fuzzy msgid "Error saving notice." msgstr "Eit problem oppstod ved lagring av notis." -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "Spesifer namnet til brukaren du vil tinge" -#: lib/command.php:502 +#: lib/command.php:503 #, php-format msgid "Subscribed to %s" msgstr "Tingar %s" -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "Spesifer namnet til brukar du vil fjerne tinging på" -#: lib/command.php:530 +#: lib/command.php:531 #, php-format msgid "Unsubscribed from %s" msgstr "Tingar ikkje %s lengre" -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "Kommando ikkje implementert." -#: lib/command.php:551 +#: lib/command.php:552 msgid "Notification off." msgstr "Notifikasjon av." -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "Kan ikkje skru av notifikasjon." -#: lib/command.php:574 +#: lib/command.php:575 msgid "Notification on." msgstr "Notifikasjon på." -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "Kan ikkje slå på notifikasjon." -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" msgstr "" -#: lib/command.php:602 +#: lib/command.php:604 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Kunne ikkje lagre favoritt." -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:623 +#: lib/command.php:625 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Du tingar ikkje oppdateringar til den profilen." -#: lib/command.php:625 +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Du tingar allereie oppdatering frå desse brukarane:" msgstr[1] "Du tingar allereie oppdatering frå desse brukarane:" -#: lib/command.php:645 +#: lib/command.php:647 #, fuzzy msgid "No one is subscribed to you." msgstr "Kan ikkje tinga andre til deg." -#: lib/command.php:647 +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Kan ikkje tinga andre til deg." msgstr[1] "Kan ikkje tinga andre til deg." -#: lib/command.php:667 +#: lib/command.php:669 #, fuzzy msgid "You are not a member of any groups." msgstr "Du er ikkje medlem av den gruppa." -#: lib/command.php:669 +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Du er ikkje medlem av den gruppa." msgstr[1] "Du er ikkje medlem av den gruppa." -#: lib/command.php:683 +#: lib/command.php:685 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4597,10 +4597,6 @@ msgstr "Favoriser denne notisen" msgid "Favor" msgstr "Tjeneste" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "Eksporter data" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "" @@ -4617,6 +4613,10 @@ msgstr "" msgid "FOAF" msgstr "" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "Eksporter data" + #: lib/galleryaction.php:121 msgid "Filter tags" msgstr "Filtrer emneord" @@ -4778,21 +4778,6 @@ msgstr "Log inn med brukarnamn og passord." msgid "Sign up for a new account" msgstr "Opprett ny konto" -#: lib/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "Kun brukaren kan lese sine eigne meldingar." - -#: 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 "" - -#: lib/mailbox.php:227 lib/noticelist.php:452 -#, fuzzy -msgid "from" -msgstr " frå " - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "Stadfesting av epostadresse" @@ -4984,6 +4969,21 @@ msgid "" "\n" msgstr "" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "Kun brukaren kan lese sine eigne meldingar." + +#: 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 "" + +#: lib/mailbox.php:227 lib/noticelist.php:452 +#, fuzzy +msgid "from" +msgstr " frå " + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5044,7 +5044,7 @@ msgstr "Send ei direkte melding" msgid "To" msgstr "Til" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 msgid "Available characters" msgstr "Tilgjenglege teikn" @@ -5057,11 +5057,11 @@ msgstr "Send ei melding" msgid "What's up, %s?" msgstr "Kva skjer, %s?" -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "" @@ -5133,12 +5133,12 @@ msgstr "Feil med å henta inn ekstern profil" msgid "Duplicate notice" msgstr "Slett notis" -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 #, fuzzy msgid "You have been banned from subscribing." msgstr "Brukaren tillet deg ikkje å tinga meldingane sine." -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Kan ikkje leggja til ny tinging." @@ -5306,20 +5306,6 @@ msgstr "Mennesker som tingar %s" msgid "Groups %s is a member of" msgstr "Grupper %s er medlem av" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(ingen)" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "" @@ -5350,6 +5336,20 @@ msgstr "Kan ikkje sletta tinging." msgid "Couldn't delete subscription." msgstr "Kan ikkje sletta tinging." +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "(ingen)" + #: lib/tagcloudsection.php:56 msgid "None" msgstr "Ingen" diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index c8363f2a38..9fbafcb0a2 100644 --- a/locale/pl/LC_MESSAGES/statusnet.po +++ b/locale/pl/LC_MESSAGES/statusnet.po @@ -1,5 +1,6 @@ # Translation of StatusNet to Polish # +# Author@translatewiki.net: McDutchie # Author@translatewiki.net: Raven # -- # Paweł Wilk , 2008. @@ -9,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-07 21:25+0000\n" -"PO-Revision-Date: 2009-12-07 21:27:09+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:10:15+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -18,7 +19,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pl\n" "X-Message-Group: out-statusnet\n" @@ -30,11 +31,11 @@ msgstr "Nie ma takiej strony" #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -47,7 +48,7 @@ msgstr "Nie ma takiej strony" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." @@ -59,7 +60,7 @@ msgid "%s and friends, page %d" msgstr "Użytkownik %s i przyjaciele, strona %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "Użytkownik %s i przyjaciele" @@ -119,24 +120,24 @@ msgstr "" msgid "You and friends" msgstr "Ty i przyjaciele" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Aktualizacje z %1$s i przyjaciół na %2$s." #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 msgid "API method not found." msgstr "Nie odnaleziono metody API." #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 @@ -156,9 +157,22 @@ msgstr "" msgid "Could not update user." msgstr "Nie można zaktualizować użytkownika." +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "Użytkownik nie posiada profilu." + +#: actions/apiaccountupdateprofile.php:147 +msgid "Could not save profile." +msgstr "Nie można zapisać profilu." + #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -181,21 +195,7 @@ msgstr "Nie można zapisać ustawień wyglądu." msgid "Could not update your design." msgstr "Nie można zaktualizować wyglądu." -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "Użytkownik nie posiada profilu." - -#: actions/apiaccountupdateprofile.php:147 -msgid "Could not save profile." -msgstr "Nie można zapisać profilu." - #: actions/apiblockcreate.php:105 -#, fuzzy msgid "You cannot block yourself!" msgstr "Nie można zablokować siebie." @@ -207,25 +207,6 @@ msgstr "Zablokowanie użytkownika nie powiodło się." msgid "Unblock user failed." msgstr "Odblokowanie użytkownika nie powiodło się." -#: actions/apidirectmessagenew.php:126 -msgid "No message text!" -msgstr "Brak tekstu wiadomości." - -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, php-format -msgid "That's too long. Max message size is %d chars." -msgstr "Wiadomość jest za długa. Maksymalna długość wynosi %d znaków." - -#: actions/apidirectmessagenew.php:146 -msgid "Recipient user not found." -msgstr "Nie odnaleziono odbiorcy." - -#: actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." -msgstr "" -"Nie można wysłać bezpośredniej wiadomości do użytkowników, którzy nie są " -"twoimi przyjaciółmi." - #: actions/apidirectmessage.php:89 #, php-format msgid "Direct messages from %s" @@ -251,18 +232,37 @@ msgstr "Wszystkie bezpośrednie wiadomości wysłane do użytkownika %s" #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "Nie odnaleziono metody API." +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "Brak tekstu wiadomości." + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "Wiadomość jest za długa. Maksymalna długość wynosi %d znaków." + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "Nie odnaleziono odbiorcy." + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "" +"Nie można wysłać bezpośredniej wiadomości do użytkowników, którzy nie są " +"twoimi przyjaciółmi." + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -406,16 +406,6 @@ msgstr "Nie jesteś członkiem tej grupy." msgid "Could not remove user %s to group %s." msgstr "Nie można usunąć użytkownika %s z grupy %s." -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, php-format -msgid "%s groups" -msgstr "Grupy %s" - -#: actions/apigrouplistall.php:94 -#, php-format -msgid "groups on %s" -msgstr "grupy na %s" - #: actions/apigrouplist.php:95 #, php-format msgid "%s's groups" @@ -426,6 +416,16 @@ msgstr "Grupy użytkownika %s" msgid "Groups %s is a member of on %s." msgstr "Grupy %s są członkiem na %s." +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "Grupy %s" + +#: actions/apigrouplistall.php:94 +#, php-format +msgid "groups on %s" +msgstr "grupy na %s" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Ta metoda wymaga POST lub DELETE." @@ -461,54 +461,54 @@ msgstr "Maksymalny rozmiar wpisu wynosi %d znaków, w tym adres URL załącznika msgid "Unsupported format." msgstr "Nieobsługiwany format." -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, php-format msgid "%s / Favorites from %s" msgstr "%s/ulubione wpisy od %s" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, php-format msgid "%s updates favorited by %s / %s." msgstr "Użytkownik %s aktualizuje ulubione według %s/%s." -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "Oś czasu użytkownika %s" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Aktualizacje z %1$s na %2$s." -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s/aktualizacje wspominające %2$s" -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s aktualizuje tę odpowiedź na aktualizacje od %2$s/%3$s." -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Publiczna oś czasu użytkownika %s" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "Użytkownik %s aktualizuje od każdego." -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "Wpisy ze znacznikiem %s" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Aktualizacje ze znacznikiem %1$s na %2$s." @@ -543,45 +543,45 @@ msgstr "Awatar" msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "Można wysłać osobisty awatar. Maksymalny rozmiar pliku to %s." -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 msgid "User without matching profile" msgstr "Użytkownik bez odpowiadającego profilu" -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 msgid "Avatar settings" msgstr "Ustawienia awatara" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "Oryginał" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "Podgląd" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 msgid "Delete" msgstr "Usuń" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "Wyślij" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "Przytnij" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -592,73 +592,33 @@ msgstr "Przytnij" msgid "There was a problem with your session token. Try again, please." msgstr "Wystąpił problem z tokenem sesji. Spróbuj ponownie." -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Nieoczekiwane wysłanie formularza." -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "Wybierz kwadratowy obszar obrazu do awatara" -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "Utracono dane pliku." -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "Zaktualizowano awatar." -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "Zaktualizowanie awatara nie powiodło się." -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 msgid "Avatar deleted." msgstr "Usunięto awatar." -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 -msgid "No nickname" -msgstr "Brak pseudonimu" - -#: actions/blockedfromgroup.php:80 actions/editgroup.php:96 -#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 -#: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "Nie ma takiej grupy" - -#: actions/blockedfromgroup.php:90 -#, php-format -msgid "%s blocked profiles" -msgstr "%s zablokowane profile" - -#: actions/blockedfromgroup.php:93 -#, php-format -msgid "%s blocked profiles, page %d" -msgstr "%s zablokowane profile, strona %d" - -#: actions/blockedfromgroup.php:108 -msgid "A list of the users blocked from joining this group." -msgstr "Lista użytkowników zablokowanych w tej grupie." - -#: actions/blockedfromgroup.php:281 -msgid "Unblock user from group" -msgstr "Odblokuj użytkownika w tej grupie" - -#: actions/blockedfromgroup.php:313 lib/unblockform.php:69 -msgid "Unblock" -msgstr "Odblokuj" - -#: actions/blockedfromgroup.php:313 lib/unblockform.php:80 -msgid "Unblock this user" -msgstr "Odblokuj tego użytkownika" - #: actions/block.php:69 msgid "You already blocked that user." msgstr "Użytkownik jest już zablokowany." @@ -699,6 +659,46 @@ msgstr "Zablokuj tego użytkownika" msgid "Failed to save block information." msgstr "Zapisanie informacji o blokadzie nie powiodło się." +#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 +#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 +#: actions/groupmembers.php:76 actions/grouprss.php:91 +#: actions/joingroup.php:76 actions/showgroup.php:121 +msgid "No nickname" +msgstr "Brak pseudonimu" + +#: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 +#: actions/grouplogo.php:99 actions/groupmembers.php:83 +#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +msgid "No such group" +msgstr "Nie ma takiej grupy" + +#: actions/blockedfromgroup.php:90 +#, php-format +msgid "%s blocked profiles" +msgstr "%s zablokowane profile" + +#: actions/blockedfromgroup.php:93 +#, php-format +msgid "%s blocked profiles, page %d" +msgstr "%s zablokowane profile, strona %d" + +#: actions/blockedfromgroup.php:108 +msgid "A list of the users blocked from joining this group." +msgstr "Lista użytkowników zablokowanych w tej grupie." + +#: actions/blockedfromgroup.php:281 +msgid "Unblock user from group" +msgstr "Odblokuj użytkownika w tej grupie" + +#: actions/blockedfromgroup.php:313 lib/unblockform.php:69 +msgid "Unblock" +msgstr "Odblokuj" + +#: actions/blockedfromgroup.php:313 lib/unblockform.php:80 +msgid "Unblock this user" +msgstr "Odblokuj tego użytkownika" + #: actions/bookmarklet.php:50 msgid "Post to " msgstr "Wyślij do " @@ -1031,7 +1031,7 @@ msgstr "Adres e-mail" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" -msgstr "Adres e-mail, taki jak \"NazwaUżytkownika@przykład.org\"" +msgstr "Adres e-mail, taki jak \"NazwaUżytkownika@example.org\"" #: actions/emailsettings.php:126 actions/imsettings.php:133 #: actions/smssettings.php:145 @@ -1166,6 +1166,14 @@ msgstr "Usunięto przychodzący adres e-mail." msgid "New incoming email address added." msgstr "Dodano nowy przychodzący adres e-mail." +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "Ten wpis jest już ulubiony." + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "Usuń wpis z ulubionych" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 msgid "Popular notices" @@ -1214,14 +1222,6 @@ msgstr "Ulubione wpisy użytkownika %s" msgid "Updates favored by %1$s on %2$s!" msgstr "Aktualizacje ulubione przez użytkownika %1$s na %2$s." -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "Ten wpis jest już ulubiony." - -#: actions/favor.php:92 lib/disfavorform.php:140 -msgid "Disfavor favorite" -msgstr "Usuń wpis z ulubionych" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1449,6 +1449,35 @@ msgstr "Uczyń tego użytkownika administratorem" msgid "Updates from members of %1$s on %2$s!" msgstr "Aktualizacje od członków %1$s na %2$s." +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "Grupy" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "Grupy, strona %d" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" +"Grupy %%%%site.name%%%% umożliwiają odnalezienie i rozmawianie z osobami o " +"podobnych zainteresowaniach. Po dołączeniu do grupy można wysyłać wiadomości " +"do wszystkich członków używając składni \"!nazwagrupy\". Nie widzisz grupy, " +"która cię interesuje? Spróbuj ją [znaleźć](%%%%action.groupsearch%%%%) lub " +"[założyć własną.](%%%%action.newgroup%%%%)" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +msgid "Create a new group" +msgstr "Utwórz nową grupę" + #: actions/groupsearch.php:52 #, php-format msgid "" @@ -1485,35 +1514,6 @@ msgstr "" "Dlaczego nie [zarejestrujesz konta](%%action.register%%) i sam [utworzysz " "grupę](%%action.newgroup%%)." -#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 -#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 -msgid "Groups" -msgstr "Grupy" - -#: actions/groups.php:64 -#, php-format -msgid "Groups, page %d" -msgstr "Grupy, strona %d" - -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%site.name%%%% groups let you find and talk with people of similar " -"interests. After you join a group you can send messages to all other members " -"using the syntax \"!groupname\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" -msgstr "" -"Grupy %%%%site.name%%%% umożliwiają odnalezienie i rozmawianie z osobami o " -"podobnych zainteresowaniach. Po dołączeniu do grupy można wysyłać wiadomości " -"do wszystkich członków używając składni \"!nazwagrupy\". Nie widzisz grupy, " -"która cię interesuje? Spróbuj ją [znaleźć](%%%%action.groupsearch%%%%) lub " -"[założyć własną.](%%%%action.newgroup%%%%)" - -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -msgid "Create a new group" -msgstr "Utwórz nową grupę" - #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "Tylko administrator może odblokowywać członków grupy." @@ -1708,7 +1708,7 @@ msgstr "Osobista wiadomość" msgid "Optionally add a personal message to the invitation." msgstr "Opcjonalnie dodaj osobistą wiadomość do zaproszenia." -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "Wyślij" @@ -1814,57 +1814,57 @@ msgstr "Nie można usunąć użytkownika %s z grupy %s" msgid "%s left group %s" msgstr "Użytkownik %s opuścił grupę %s" -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "Jesteś już zalogowany." -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 msgid "Invalid or expired token." msgstr "Nieprawidłowy lub wygasły token." -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "Niepoprawna nazwa użytkownika lub hasło." -#: actions/login.php:152 +#: actions/login.php:153 msgid "Error setting user. You are probably not authorized." msgstr "Błąd podczas ustawiania użytkownika. Prawdopodobnie brak upoważnienia." -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Zaloguj się" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "Zaloguj się na stronie" -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Pseudonim" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Hasło" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "Zapamiętaj mnie" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Automatyczne logowanie. Nie należy używać na komputerach używanych przez " "wiele osób." -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "Zgubione lub zapomniane hasło?" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1872,7 +1872,7 @@ msgstr "" "Z powodów bezpieczeństwa ponownie podaj nazwę użytkownika i hasło przed " "zmienianiem ustawień." -#: actions/login.php:289 +#: actions/login.php:290 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1943,7 +1943,7 @@ msgstr "Wysłano wiadomość" msgid "Direct message to %s sent" msgstr "Wysłano bezpośrednią wiadomość do użytkownika %s" -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" msgstr "Błąd AJAX" @@ -1951,7 +1951,7 @@ msgstr "Błąd AJAX" msgid "New notice" msgstr "Nowy wpis" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 msgid "Notice posted" msgstr "Wysłano wpis" @@ -2034,8 +2034,8 @@ msgstr "typ zawartości " msgid "Only " msgstr "Tylko " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "To nie jest obsługiwany format danych." @@ -2820,7 +2820,6 @@ msgid "Invalid profile URL (bad format)" msgstr "Nieprawidłowy adres URL profilu (błędny format)" #: actions/remotesubscribe.php:168 -#, fuzzy msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)." msgstr "" "Nieprawidłowy adres URL profilu (brak dokumentu YADIS lub określono " @@ -3618,6 +3617,26 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, php-format +msgid "Notices tagged with %s, page %d" +msgstr "Wpisy ze znacznikiem %s, strona %d" + +#: actions/tag.php:86 +#, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "Kanał wpisów dla znacznika %s (RSS 1.0)" + +#: actions/tag.php:92 +#, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "Kanał wpisów dla znacznika %s (RSS 2.0)" + +#: actions/tag.php:98 +#, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "Kanał wpisów dla znacznika %s (Atom)" + #: actions/tagother.php:33 msgid "Not logged in" msgstr "Niezalogowano" @@ -3667,26 +3686,6 @@ msgid "Use this form to add tags to your subscribers or subscriptions." msgstr "" "Użyj tego formularza, aby dodać znaczniki subskrybentom lub subskrypcjom." -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Wpisy ze znacznikiem %s, strona %d" - -#: actions/tag.php:86 -#, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "Kanał wpisów dla znacznika %s (RSS 1.0)" - -#: actions/tag.php:92 -#, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "Kanał wpisów dla znacznika %s (RSS 2.0)" - -#: actions/tag.php:98 -#, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "Kanał wpisów dla znacznika %s (Atom)" - #: actions/tagrss.php:35 msgid "No such tag." msgstr "Nie ma takiego znacznika." @@ -3990,22 +3989,22 @@ msgstr "Nie można zaktualizować wiadomości za pomocą nowego adresu URL." msgid "DB error inserting hashtag: %s" msgstr "Błąd bazy danych podczas wprowadzania znacznika mieszania: %s" -#: classes/Notice.php:179 +#: classes/Notice.php:188 msgid "Problem saving notice. Too long." msgstr "Problem podczas zapisywania wpisu. Za długi." -#: classes/Notice.php:183 +#: classes/Notice.php:192 msgid "Problem saving notice. Unknown user." msgstr "Problem podczas zapisywania wpisu. Nieznany użytkownik." -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Za dużo wpisów w za krótkim czasie, weź głęboki oddech i wyślij ponownie za " "kilka minut." -#: classes/Notice.php:194 +#: classes/Notice.php:203 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4013,19 +4012,24 @@ msgstr "" "Za dużo takich samych wiadomości w za krótkim czasie, weź głęboki oddech i " "wyślij ponownie za kilka minut." -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "Zabroniono ci wysyłania wpisów na tej stronie." -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "Problem podczas zapisywania wpisu." -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "Błąd bazy danych podczas wprowadzania odpowiedzi: %s" +#: classes/User.php:347 +#, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "Witaj w %1$s, @%2$s." + #: classes/User_group.php:380 msgid "Could not create group." msgstr "Nie można utworzyć grupy." @@ -4034,11 +4038,6 @@ msgstr "Nie można utworzyć grupy." msgid "Could not set group membership." msgstr "Nie można ustawić członkostwa w grupie." -#: classes/User.php:347 -#, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "Witaj w %1$s, @%2$s." - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Zmień ustawienia profilu" @@ -4343,7 +4342,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "Wpis z tym identyfikatorem nie istnieje" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 msgid "User has no last notice" msgstr "Użytkownik nie posiada ostatniego wpisu" @@ -4390,102 +4389,103 @@ msgstr "Błąd podczas wysyłania bezpośredniej wiadomości." msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Wpis jest za długi - maksymalnie %d znaków, wysłano %d" -#: lib/command.php:439 +#: lib/command.php:440 #, php-format msgid "Reply to %s sent" msgstr "Wysłano odpowiedź do %s" -#: lib/command.php:441 +#: lib/command.php:442 msgid "Error saving notice." msgstr "Błąd podczas zapisywania wpisu." -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "Podaj nazwę użytkownika do subskrybowania" -#: lib/command.php:502 +#: lib/command.php:503 #, php-format msgid "Subscribed to %s" msgstr "Subskrybowano użytkownika %s" -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "Podaj nazwę użytkownika do usunięcia subskrypcji" -#: lib/command.php:530 +#: lib/command.php:531 #, php-format msgid "Unsubscribed from %s" msgstr "Usunięto subskrypcję użytkownika %s" -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "Nie zaimplementowano polecenia." -#: lib/command.php:551 +#: lib/command.php:552 msgid "Notification off." msgstr "Wyłączono powiadomienia." -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "Nie można wyłączyć powiadomień." -#: lib/command.php:574 +#: lib/command.php:575 msgid "Notification on." msgstr "Włączono powiadomienia." -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "Nie można włączyć powiadomień." -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" -msgstr "" +msgstr "Polecenie logowania jest wyłączone" -#: lib/command.php:602 -#, fuzzy, php-format +#: lib/command.php:604 +#, php-format msgid "Could not create login token for %s" -msgstr "Nie można utworzyć aliasów." +msgstr "Nie można utworzyć tokenów loginów dla %s" -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" +"Ten odnośnik można użyć tylko raz i będzie prawidłowy tylko przez dwie " +"minuty: %s" -#: lib/command.php:623 +#: lib/command.php:625 msgid "You are not subscribed to anyone." msgstr "Nie subskrybujesz nikogo." -#: lib/command.php:625 +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Subskrybujesz tę osobę:" msgstr[1] "Subskrybujesz te osoby:" msgstr[2] "Subskrybujesz te osoby:" -#: lib/command.php:645 +#: lib/command.php:647 msgid "No one is subscribed to you." msgstr "Nikt cię nie subskrybuje." -#: lib/command.php:647 +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Ta osoba cię subskrybuje:" msgstr[1] "Te osoby cię subskrybują:" msgstr[2] "Te osoby cię subskrybują:" -#: lib/command.php:667 +#: lib/command.php:669 msgid "You are not a member of any groups." msgstr "Nie jesteś członkiem żadnej grupy." -#: lib/command.php:669 +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Jesteś członkiem tej grupy:" msgstr[1] "Jesteś członkiem tych grup:" msgstr[2] "Jesteś członkiem tych grup:" -#: lib/command.php:683 -#, fuzzy +#: lib/command.php:685 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4541,6 +4541,7 @@ msgstr "" "reply # - odpowiada na wpis z podanym identyfikatorem\n" "reply - odpowiada na ostatni wpis użytkownika\n" "join - dołącza do grupy\n" +"login - uzyskuje odnośnik do logowania do interfejsu WWW\n" "drop - opuszcza grupę\n" "stats - uzyskuje statystyki\n" "stop - to samo co \"off\"\n" @@ -4616,10 +4617,6 @@ msgstr "Dodaj ten wpis do ulubionych" msgid "Favor" msgstr "Dodaj do ulubionych" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "Wyeksportuj dane" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "RSS 1.0" @@ -4636,6 +4633,10 @@ msgstr "Atom" msgid "FOAF" msgstr "FOAF" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "Wyeksportuj dane" + #: lib/galleryaction.php:121 msgid "Filter tags" msgstr "Filtruj znaczniki" @@ -4798,23 +4799,6 @@ msgstr "Zaloguj się za pomocą nazwy użytkownika i hasła" msgid "Sign up for a new account" msgstr "Załóż nowe konto" -#: lib/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "Tylko użytkownik może czytać swoje skrzynki pocztowe." - -#: 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 "" -"Brak prywatnych wiadomości. Można wysłać prywatną wiadomość, aby nawiązać " -"rozmowę z innymi użytkownikami. Inni mogą wysyłać ci wiadomości tylko dla " -"twoich oczu." - -#: lib/mailbox.php:227 lib/noticelist.php:452 -msgid "from" -msgstr "z" - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "Potwierdzenie adresu e-mail" @@ -5077,6 +5061,23 @@ msgstr "" "\t%4$s\n" "\n" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "Tylko użytkownik może czytać swoje skrzynki pocztowe." + +#: 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 "" +"Brak prywatnych wiadomości. Można wysłać prywatną wiadomość, aby nawiązać " +"rozmowę z innymi użytkownikami. Inni mogą wysyłać ci wiadomości tylko dla " +"twoich oczu." + +#: lib/mailbox.php:227 lib/noticelist.php:452 +msgid "from" +msgstr "z" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "Wystąpił błąd bazy danych podczas zapisywania pliku. Spróbuj ponownie." @@ -5138,7 +5139,7 @@ msgstr "Wyślij bezpośredni wpis" msgid "To" msgstr "Do" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 msgid "Available characters" msgstr "Dostępne znaki" @@ -5151,11 +5152,11 @@ msgstr "Wyślij wpis" msgid "What's up, %s?" msgstr "Co słychać, %s?" -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "Załącz" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "Załącz plik" @@ -5224,11 +5225,11 @@ msgstr "Błąd podczas wprowadzania zdalnego profilu" msgid "Duplicate notice" msgstr "Duplikat wpisu" -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 msgid "You have been banned from subscribing." msgstr "Zablokowano subskrybowanie." -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Nie można wprowadzić nowej subskrypcji." @@ -5388,20 +5389,6 @@ msgstr "Osoby subskrybowane do %s" msgid "Groups %s is a member of" msgstr "Grupy %s są członkiem" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "Chmura znaczników osób, które same sobie nadały znaczniki" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "Chmura znaczników osób ze znacznikami" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(brak)" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "Już subskrybowane." @@ -5423,7 +5410,6 @@ msgid "Not subscribed!" msgstr "Niesubskrybowane." #: lib/subs.php:133 -#, fuzzy msgid "Couldn't delete self-subscription." msgstr "Nie można usunąć autosubskrypcji." @@ -5431,6 +5417,20 @@ msgstr "Nie można usunąć autosubskrypcji." msgid "Couldn't delete subscription." msgstr "Nie można usunąć subskrypcji." +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "Chmura znaczników osób, które same sobie nadały znaczniki" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "Chmura znaczników osób ze znacznikami" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "(brak)" + #: lib/tagcloudsection.php:56 msgid "None" msgstr "Brak" diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index 54cc569f2f..96869a74a7 100644 --- a/locale/pt/LC_MESSAGES/statusnet.po +++ b/locale/pt/LC_MESSAGES/statusnet.po @@ -1,6 +1,7 @@ # Translation of StatusNet to Portuguese # # Author@translatewiki.net: Hamilton Abreu +# Author@translatewiki.net: McDutchie # -- # This file is distributed under the same license as the StatusNet package. # @@ -8,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-07 21:25+0000\n" -"PO-Revision-Date: 2009-12-07 21:27:13+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:10:18+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt\n" "X-Message-Group: out-statusnet\n" @@ -26,11 +27,11 @@ msgstr "Página não encontrada." #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -43,7 +44,7 @@ msgstr "Página não encontrada." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." @@ -55,7 +56,7 @@ msgid "%s and friends, page %d" msgstr "%s e amigos, página %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s e amigos" @@ -63,23 +64,24 @@ msgstr "%s e amigos" #: actions/all.php:99 #, php-format msgid "Feed for friends of %s (RSS 1.0)" -msgstr "''Feed'' para amigos de %s (RSS 1.0)" +msgstr "Feed para os amigos de %s (RSS 1.0)" #: actions/all.php:107 #, php-format msgid "Feed for friends of %s (RSS 2.0)" -msgstr "''Feed'' para amigos de %s (RSS 2.0)" +msgstr "Feed para os amigos de %s (RSS 2.0)" #: actions/all.php:115 #, php-format msgid "Feed for friends of %s (Atom)" -msgstr "''Feed'' para amigos de %s (Atom)" +msgstr "Feed para os amigos de %s (Atom)" #: actions/all.php:127 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." -msgstr "Esta é a cronolinha de %s e amigos, mas ainda não publicaram nada." +msgstr "" +"Estas são as notas de %s e dos amigos, mas ainda não publicaram nenhuma." #: actions/all.php:132 #, php-format @@ -87,7 +89,7 @@ msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " "something yourself." msgstr "" -"Tente subscrever mais pessoas, [entrar num grupo] (%%action.groups%%) ou " +"Tente subscrever mais pessoas, [juntar-se a um grupo] (%%action.groups%%) ou " "publicar qualquer coisa." #: actions/all.php:134 @@ -112,24 +114,24 @@ msgstr "" msgid "You and friends" msgstr "Você e amigos" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Actualizações de %1$s e amigos no %2$s!" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 msgid "API method not found." msgstr "Método da API não encontrado." #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 @@ -149,9 +151,22 @@ msgstr "" msgid "Could not update user." msgstr "Não foi possível actualizar o utilizador." +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "Utilizador não tem perfil." + +#: actions/apiaccountupdateprofile.php:147 +msgid "Could not save profile." +msgstr "Não foi possível gravar o perfil." + #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -174,19 +189,6 @@ msgstr "Não foi possível gravar as configurações do design." msgid "Could not update your design." msgstr "Não foi possível actualizar o seu design." -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "Utilizador não tem perfil." - -#: actions/apiaccountupdateprofile.php:147 -msgid "Could not save profile." -msgstr "Não foi possível gravar o perfil." - #: actions/apiblockcreate.php:105 msgid "You cannot block yourself!" msgstr "Os utilizadores não podem bloquear-se a si próprios!" @@ -199,24 +201,6 @@ msgstr "Bloqueio do utilizador falhou." msgid "Unblock user failed." msgstr "Desbloqueio do utilizador falhou." -#: actions/apidirectmessagenew.php:126 -msgid "No message text!" -msgstr "Mensagem não tem texto!" - -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, php-format -msgid "That's too long. Max message size is %d chars." -msgstr "Demasiado longo. Tamanho máx. das mensagens é %d caracteres." - -#: actions/apidirectmessagenew.php:146 -msgid "Recipient user not found." -msgstr "Destinatário não encontrado." - -#: actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." -msgstr "" -"Não pode enviar mensagens directas a utilizadores que não sejam amigos." - #: actions/apidirectmessage.php:89 #, php-format msgid "Direct messages from %s" @@ -242,18 +226,36 @@ msgstr "Todas as mensagens directas enviadas para %s" #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "Método da API não encontrado!" +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "Mensagem não tem texto!" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "Demasiado longo. Tamanho máx. das mensagens é %d caracteres." + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "Destinatário não encontrado." + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "" +"Não pode enviar mensagens directas a utilizadores que não sejam amigos." + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -397,16 +399,6 @@ msgstr "Não é membro deste grupo." msgid "Could not remove user %s to group %s." msgstr "Não foi possível remover %s do grupo %s." -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, php-format -msgid "%s groups" -msgstr "Grupos de %s" - -#: actions/apigrouplistall.php:94 -#, php-format -msgid "groups on %s" -msgstr "Grupos em %s" - #: actions/apigrouplist.php:95 #, php-format msgid "%s's groups" @@ -417,6 +409,16 @@ msgstr "Grupos de %s" msgid "Groups %s is a member of on %s." msgstr "Grupos de que %s é membro em %s." +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "Grupos de %s" + +#: actions/apigrouplistall.php:94 +#, php-format +msgid "groups on %s" +msgstr "Grupos em %s" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Este método requer um POST ou DELETE." @@ -452,54 +454,54 @@ msgstr "Tamanho máx. das notas é %d caracteres, incluíndo a URL do anexo." msgid "Unsupported format." msgstr "Formato não suportado." -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, php-format msgid "%s / Favorites from %s" msgstr "%s / Favoritas de %s" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, php-format msgid "%s updates favorited by %s / %s." msgstr "%s actualizações preferidas por %s / %s" -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" -msgstr "cronolinha de %s" +msgstr "Notas de %s" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Actualizações de %1#s a %2$s!" -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Actualizações que mencionam %2$s" -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s actualizações em resposta a actualizações de %2$s / %3$s." -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" -msgstr "Cronolinha pública de %s" +msgstr "Notas públicas de %s" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s actualizações de todos!" -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "Notas categorizadas com %s" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Actualizações categorizadas com %1$s em %2$s!" @@ -534,45 +536,45 @@ msgstr "Avatar" msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "Pode carregar o seu avatar pessoal. O tamanho máximo do ficheiro é %s." -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 msgid "User without matching profile" msgstr "Utilizador sem perfil correspondente" -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 msgid "Avatar settings" msgstr "Configurações do avatar" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "Original" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "Antevisão" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 msgid "Delete" msgstr "Apagar" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "Carregar" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "Cortar" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -584,73 +586,33 @@ msgid "There was a problem with your session token. Try again, please." msgstr "" "Ocorreu um problema com a sua chave de sessão. Por favor, tente novamente." -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Envio inesperado de formulário." -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "Escolha uma área quadrada da imagem para ser o seu avatar" -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "Perdi os dados do nosso ficheiro." -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "Avatar actualizado." -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "Falha ao actualizar avatar." -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 msgid "Avatar deleted." msgstr "Avatar apagado." -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 -msgid "No nickname" -msgstr "Sem alcunha" - -#: actions/blockedfromgroup.php:80 actions/editgroup.php:96 -#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 -#: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "Grupo não existe" - -#: actions/blockedfromgroup.php:90 -#, php-format -msgid "%s blocked profiles" -msgstr "%s perfis bloqueados" - -#: actions/blockedfromgroup.php:93 -#, php-format -msgid "%s blocked profiles, page %d" -msgstr "%s perfis bloqueados, página %d" - -#: actions/blockedfromgroup.php:108 -msgid "A list of the users blocked from joining this group." -msgstr "Uma lista dos utilizadores com entrada bloqueada neste grupo." - -#: actions/blockedfromgroup.php:281 -msgid "Unblock user from group" -msgstr "Desbloquear utilizador do grupo" - -#: actions/blockedfromgroup.php:313 lib/unblockform.php:69 -msgid "Unblock" -msgstr "Desbloquear" - -#: actions/blockedfromgroup.php:313 lib/unblockform.php:80 -msgid "Unblock this user" -msgstr "Desbloquear este utilizador" - #: actions/block.php:69 msgid "You already blocked that user." msgstr "Já bloqueou esse utilizador." @@ -691,6 +653,46 @@ msgstr "Bloquear este utilizador" msgid "Failed to save block information." msgstr "Não foi possível gravar informação do bloqueio." +#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 +#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 +#: actions/groupmembers.php:76 actions/grouprss.php:91 +#: actions/joingroup.php:76 actions/showgroup.php:121 +msgid "No nickname" +msgstr "Sem alcunha" + +#: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 +#: actions/grouplogo.php:99 actions/groupmembers.php:83 +#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +msgid "No such group" +msgstr "Grupo não existe" + +#: actions/blockedfromgroup.php:90 +#, php-format +msgid "%s blocked profiles" +msgstr "%s perfis bloqueados" + +#: actions/blockedfromgroup.php:93 +#, php-format +msgid "%s blocked profiles, page %d" +msgstr "%s perfis bloqueados, página %d" + +#: actions/blockedfromgroup.php:108 +msgid "A list of the users blocked from joining this group." +msgstr "Uma lista dos utilizadores com entrada bloqueada neste grupo." + +#: actions/blockedfromgroup.php:281 +msgid "Unblock user from group" +msgstr "Desbloquear utilizador do grupo" + +#: actions/blockedfromgroup.php:313 lib/unblockform.php:69 +msgid "Unblock" +msgstr "Desbloquear" + +#: actions/blockedfromgroup.php:313 lib/unblockform.php:80 +msgid "Unblock this user" +msgstr "Desbloquear este utilizador" + #: actions/bookmarklet.php:50 msgid "Post to " msgstr "Publicar em " @@ -1026,7 +1028,7 @@ msgstr "Endereço electrónico" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" msgstr "" -"Endereço de correio electrónico, por ex. \"nomedeutilizador@exemplo.org\"" +"Endereço de correio electrónico, por ex. \"nomedeutilizador@example.org\"" #: actions/emailsettings.php:126 actions/imsettings.php:133 #: actions/smssettings.php:145 @@ -1165,6 +1167,14 @@ msgstr "Endereço electrónico de entrada foi removido." msgid "New incoming email address added." msgstr "Adicionado endereço electrónico de entrada novo." +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "Esta nota já é uma favorita!" + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "Desfavorecer favorita" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 msgid "Popular notices" @@ -1212,14 +1222,6 @@ msgstr "Notas favoritas de %s" msgid "Updates favored by %1$s on %2$s!" msgstr "Actualizações favorecidas por %1$s em %2$s!" -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "Esta nota já é uma favorita!" - -#: actions/favor.php:92 lib/disfavorform.php:140 -msgid "Disfavor favorite" -msgstr "Desfavorecer favorita" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1451,6 +1453,35 @@ msgstr "Tornar este utilizador um administrador" msgid "Updates from members of %1$s on %2$s!" msgstr "Actualizações dos membros de %1$s em %2$s!" +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "Grupos" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "Grupos, página %d" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" +"Os grupos no site %%%%site.name%%%% permitem-lhe encontrar e falar com " +"pessoas que têm interesses semelhantes aos seus. Após juntar-se a um grupo, " +"pode enviar mensagens a outros membros usando a sintaxe \"!groupname\". Não " +"encontra nenhum grupo de que gosta? Tente [pesquisar um grupo](%%%%action." +"groupsearch%%%%) ou [crie o seu!](%%%%action.newgroup%%%%)" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +msgid "Create a new group" +msgstr "Criar um grupo novo" + #: actions/groupsearch.php:52 #, php-format msgid "" @@ -1487,35 +1518,6 @@ msgstr "" "Podia [registar uma conta](%%action.register%%) e [criar o grupo](%%action." "newgroup%%) você mesmo!" -#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 -#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 -msgid "Groups" -msgstr "Grupos" - -#: actions/groups.php:64 -#, php-format -msgid "Groups, page %d" -msgstr "Grupos, página %d" - -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%site.name%%%% groups let you find and talk with people of similar " -"interests. After you join a group you can send messages to all other members " -"using the syntax \"!groupname\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" -msgstr "" -"Os grupos no site %%%%site.name%%%% permitem-lhe encontrar e falar com " -"pessoas que têm interesses semelhantes aos seus. Após juntar-se a um grupo, " -"pode enviar mensagens a outros membros usando a sintaxe \"!groupname\". Não " -"encontra nenhum grupo de que gosta? Tente [pesquisar um grupo](%%%%action." -"groupsearch%%%%) ou [crie o seu!](%%%%action.newgroup%%%%)" - -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -msgid "Create a new group" -msgstr "Criar um grupo novo" - #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "Só um administrador pode desbloquear membros de um grupo." @@ -1711,7 +1713,7 @@ msgstr "Mensagem pessoal" msgid "Optionally add a personal message to the invitation." msgstr "Pode optar por acrescentar uma mensagem pessoal ao convite" -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "Enviar" @@ -1816,57 +1818,57 @@ msgstr "Não foi possível remover o utilizador %s do grupo %s" msgid "%s left group %s" msgstr "%s deixou o grupo %s" -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "Sessão já foi iniciada." -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 msgid "Invalid or expired token." msgstr "Chave inválida ou expirada." -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "Nome de utilizador ou palavra-passe incorrectos." -#: actions/login.php:152 +#: actions/login.php:153 msgid "Error setting user. You are probably not authorized." msgstr "Erro ao preparar o utilizador. Provavelmente não está autorizado." -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Entrar" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "Iniciar sessão no site" -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Alcunha" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Palavra-chave" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "Lembrar-me neste computador" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "" "De futuro, iniciar sessão automaticamente. Não usar em computadores " "partilhados!" -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "Perdeu ou esqueceu-se da palavra-passe?" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1874,7 +1876,7 @@ msgstr "" "Por razões de segurança, por favor reintroduza o seu nome de utilizador e " "palavra-passe antes de alterar as suas configurações." -#: actions/login.php:289 +#: actions/login.php:290 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1945,7 +1947,7 @@ msgstr "Mensagem enviada" msgid "Direct message to %s sent" msgstr "Mensagem directa para %s enviada" -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" msgstr "Erro do Ajax" @@ -1953,7 +1955,7 @@ msgstr "Erro do Ajax" msgid "New notice" msgstr "Nota nova" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 msgid "Notice posted" msgstr "Nota publicada" @@ -2035,8 +2037,8 @@ msgstr "tipo de conteúdo " msgid "Only " msgstr "Apenas " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "Formato de dados não suportado." @@ -2070,11 +2072,11 @@ msgstr "Serviço de compactação automática que será usado" #: actions/othersettings.php:122 msgid "View profile designs" -msgstr "Ver o design dos perfis" +msgstr "Ver designs para o perfil" #: actions/othersettings.php:123 msgid "Show or hide profile designs." -msgstr "Mostrar ou esconder o design dos perfis" +msgstr "Mostrar ou esconder designs para o perfil." #: actions/othersettings.php:153 msgid "URL shortening service is too long (max 50 chars)." @@ -2429,11 +2431,11 @@ msgstr "Não foi possível importar as notas públicas." #: actions/public.php:129 #, php-format msgid "Public timeline, page %d" -msgstr "Cronolinha pública, página %d" +msgstr "Notas públicas, página %d" #: actions/public.php:131 lib/publicgroupnav.php:79 msgid "Public timeline" -msgstr "Cronolinha pública" +msgstr "Notas públicas" #: actions/public.php:151 msgid "Public Stream Feed (RSS 1.0)" @@ -2453,8 +2455,8 @@ msgid "" "This is the public timeline for %%site.name%% but no one has posted anything " "yet." msgstr "" -"Esta é a cronolinha pública do site %%site.name%% mas ainda ninguém publicou " -"nada." +"Estas são as notas públicas do site %%site.name%% mas ninguém publicou nada " +"ainda." #: actions/public.php:182 msgid "Be the first to post!" @@ -2495,7 +2497,7 @@ msgstr "" #: actions/publictagcloud.php:57 msgid "Public tag cloud" -msgstr "Catenuvem pública" +msgstr "Nuvem de categorias pública" #: actions/publictagcloud.php:63 #, php-format @@ -2524,7 +2526,7 @@ msgstr "" #: actions/publictagcloud.php:135 msgid "Tag cloud" -msgstr "Catenuvem" +msgstr "Nuvem de categorias" #: actions/recoverpassword.php:36 msgid "You are already logged in!" @@ -2855,17 +2857,17 @@ msgstr "Respostas a %s, página %d" #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" -msgstr "Feed de respostas de %s (RSS 1.0)" +msgstr "Feed de respostas a %s (RSS 1.0)" #: actions/replies.php:151 #, php-format msgid "Replies feed for %s (RSS 2.0)" -msgstr "Feed de respostas de %s (RSS 2.0)" +msgstr "Feed de respostas a %s (RSS 2.0)" #: actions/replies.php:158 #, php-format msgid "Replies feed for %s (Atom)" -msgstr "Feed de respostas de %s (Atom)" +msgstr "Feed de respostas a %s (Atom)" #: actions/replies.php:198 #, php-format @@ -2873,8 +2875,8 @@ msgid "" "This is the timeline showing replies to %s but %s hasn't received a notice " "to his attention yet." msgstr "" -"Esta é a cronolinha com respostas a %s, mas %s ainda não recebeu nenhuma " -"nota à sua atenção." +"Estas são as notas de resposta a %s, mas %s ainda não recebeu nenhuma " +"resposta." #: actions/replies.php:203 #, php-format @@ -2882,7 +2884,7 @@ msgid "" "You can engage other users in a conversation, subscribe to more people or " "[join groups](%%action.groups%%)." msgstr "" -"Pode encetar conversa com outros utilizadores, subscrever mais pessoas ou " +"Pode meter conversa com outros utilizadores, subscrever mais pessoas ou " "[juntar-se a grupos](%%action.groups%%)." #: actions/replies.php:205 @@ -2901,11 +2903,11 @@ msgstr "Respostas a %1$s em %2$s!" #: actions/sandbox.php:65 actions/unsandbox.php:65 msgid "You cannot sandbox users on this site." -msgstr "Não pode descronolinhar utilizadores neste site." +msgstr "Não pode impedir notas públicas neste site." #: actions/sandbox.php:72 msgid "User is already sandboxed." -msgstr "Utilizador já está descronolinhado." +msgstr "Utilizador já está impedido de criar notas públicas." #: actions/showfavorites.php:79 #, php-format @@ -3131,7 +3133,7 @@ msgstr "FOAF para %s" #: actions/showstream.php:191 #, php-format msgid "This is the timeline for %s but %s hasn't posted anything yet." -msgstr "Esta é a cronolinha de %s, mas %s ainda não publicou nada." +msgstr "Estas são as notas de %s, mas %s ainda não publicou nenhuma." #: actions/showstream.php:196 msgid "" @@ -3623,6 +3625,26 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, php-format +msgid "Notices tagged with %s, page %d" +msgstr "Notas categorizadas com %s, página %d" + +#: actions/tag.php:86 +#, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "Feed de notas para a categoria %s (RSS 1.0)" + +#: actions/tag.php:92 +#, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "Feed de notas para a categoria %s (RSS 2.0)" + +#: actions/tag.php:98 +#, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "Feed de notas para a categoria %s (Atom)" + #: actions/tagother.php:33 msgid "Not logged in" msgstr "Não iniciou sessão." @@ -3671,26 +3693,6 @@ msgstr "" "Use este formulário para categorizar os seus subscritores ou os que " "subscreve." -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Notas categorizadas com %s, página %d" - -#: actions/tag.php:86 -#, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "Feed de notas para a categoria %s (RSS 1.0)" - -#: actions/tag.php:92 -#, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "Feed de notas para a categoria %s (RSS 2.0)" - -#: actions/tag.php:98 -#, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "Feed de notas para a categoria %s (Atom)" - #: actions/tagrss.php:35 msgid "No such tag." msgstr "Categoria não existe." @@ -3705,7 +3707,7 @@ msgstr "Não bloqueou esse utilizador." #: actions/unsandbox.php:72 msgid "User is not sandboxed." -msgstr "Utilizador não está descronolinhado." +msgstr "Utilizador não está impedido de criar notas públicas." #: actions/unsilence.php:72 msgid "User is not silenced." @@ -3994,22 +3996,22 @@ msgstr "Não foi possível actualizar a mensagem com a nova URI." msgid "DB error inserting hashtag: %s" msgstr "Erro na base de dados ao inserir a hashtag: %s" -#: classes/Notice.php:179 +#: classes/Notice.php:188 msgid "Problem saving notice. Too long." msgstr "Problema na gravação da nota. Demasiado longa." -#: classes/Notice.php:183 +#: classes/Notice.php:192 msgid "Problem saving notice. Unknown user." msgstr "Problema na gravação da nota. Utilizador desconhecido." -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Demasiadas notas, demasiado rápido; descanse e volte a publicar daqui a " "alguns minutos." -#: classes/Notice.php:194 +#: classes/Notice.php:203 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4017,19 +4019,24 @@ msgstr "" "Demasiadas mensagens duplicadas, demasiado rápido; descanse e volte a " "publicar daqui a alguns minutos." -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "Está proibido de publicar notas neste site." -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "Problema na gravação da nota." -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "Ocorreu um erro na base de dados ao inserir a resposta: %s" +#: classes/User.php:347 +#, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "%1$s dá-lhe as boas-vindas, @%2$s!" + #: classes/User_group.php:380 msgid "Could not create group." msgstr "Não foi possível criar o grupo." @@ -4038,11 +4045,6 @@ msgstr "Não foi possível criar o grupo." msgid "Could not set group membership." msgstr "Não foi possível configurar membros do grupo." -#: classes/User.php:347 -#, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "%1$s dá-lhe as boas-vindas, @%2$s!" - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Modificar as suas definições de perfil" @@ -4090,7 +4092,7 @@ msgstr "Início" #: lib/action.php:431 msgid "Personal profile and friends timeline" -msgstr "Perfil pessoal e cronolinha dos amigos" +msgstr "Perfil pessoal e notas dos amigos" #: lib/action.php:433 msgid "Account" @@ -4347,7 +4349,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "Não existe nenhuma nota com essa identificação" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 msgid "User has no last notice" msgstr "Utilizador não tem nenhuma última nota" @@ -4394,99 +4396,100 @@ msgstr "Erro no envio da mensagem directa." msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Nota demasiado extensa - máx. %d caracteres, enviou %d" -#: lib/command.php:439 +#: lib/command.php:440 #, php-format msgid "Reply to %s sent" msgstr "Resposta a %s enviada" -#: lib/command.php:441 +#: lib/command.php:442 msgid "Error saving notice." msgstr "Erro ao gravar nota." -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "Introduza o nome do utilizador para subscrever" -#: lib/command.php:502 +#: lib/command.php:503 #, php-format msgid "Subscribed to %s" msgstr "Subscreveu %s" -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "Introduza o nome do utilizador para deixar de subscrever" -#: lib/command.php:530 +#: lib/command.php:531 #, php-format msgid "Unsubscribed from %s" msgstr "Deixou de subscrever %s" -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "Comando ainda não implementado." -#: lib/command.php:551 +#: lib/command.php:552 msgid "Notification off." msgstr "Notificação desligada." -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "Não foi possível desligar a notificação." -#: lib/command.php:574 +#: lib/command.php:575 msgid "Notification on." msgstr "Notificação ligada." -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "Não foi possível ligar a notificação." -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" -msgstr "" +msgstr "Comando para iniciar sessão foi desactivado" -#: lib/command.php:602 -#, fuzzy, php-format +#: lib/command.php:604 +#, php-format msgid "Could not create login token for %s" -msgstr "Não foi possível criar cognomes." +msgstr "Não foi possível criar a chave de entrada para %s" -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" +"Esta ligação é utilizável uma única vez e só durante os próximos 2 minutos: %" +"s" -#: lib/command.php:623 +#: lib/command.php:625 msgid "You are not subscribed to anyone." msgstr "Não subscreveu ninguém." -#: lib/command.php:625 +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Subscreve esta pessoa:" msgstr[1] "Subscreve estas pessoas:" -#: lib/command.php:645 +#: lib/command.php:647 msgid "No one is subscribed to you." msgstr "Ninguém subscreve as suas notas." -#: lib/command.php:647 +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Esta pessoa subscreve as suas notas:" msgstr[1] "Estas pessoas subscrevem as suas notas:" -#: lib/command.php:667 +#: lib/command.php:669 msgid "You are not a member of any groups." msgstr "Não está em nenhum grupo." -#: lib/command.php:669 +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Está no grupo:" msgstr[1] "Está nos grupos:" -#: lib/command.php:683 -#, fuzzy +#: lib/command.php:685 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4541,6 +4544,7 @@ msgstr "" "reply # - responder à nota com esta identificação\n" "reply - responder à última nota do utilizador\n" "join - juntar-se ao grupo\n" +"login - Receber uma ligação para iniciar sessão na interface web\n" "drop - afastar-se do grupo\n" "stats - receber as suas estatísticas\n" "stop - o mesmo que 'off'\n" @@ -4618,10 +4622,6 @@ msgstr "Favorecer esta nota" msgid "Favor" msgstr "Favorecer" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "Exportar dados" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "RSS 1.0" @@ -4638,6 +4638,10 @@ msgstr "Atom" msgid "FOAF" msgstr "FOAF" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "Exportar dados" + #: lib/galleryaction.php:121 msgid "Filter tags" msgstr "Filtrar categorias" @@ -4798,23 +4802,6 @@ msgstr "Iniciar sessão com um nome de utilizador e palavra-chave" msgid "Sign up for a new account" msgstr "Registar uma conta nova" -#: lib/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "Só o próprio utilizador pode ler a sua caixa de correio." - -#: 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 "" -"Não tem messagens privadas. Pode enviar mensagens privadas para encetar " -"conversas com outros utilizadores. Outros podem enviar-lhe mensagens, a que " -"só você terá acesso." - -#: lib/mailbox.php:227 lib/noticelist.php:452 -msgid "from" -msgstr "de" - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "Confirmação do endereço electrónico" @@ -5076,6 +5063,23 @@ msgstr "" "%4$s\n" "\n" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "Só o próprio utilizador pode ler a sua caixa de correio." + +#: 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 "" +"Não tem messagens privadas. Pode enviar mensagens privadas para encetar " +"conversas com outros utilizadores. Outros podem enviar-lhe mensagens, a que " +"só você terá acesso." + +#: lib/mailbox.php:227 lib/noticelist.php:452 +msgid "from" +msgstr "de" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5140,7 +5144,7 @@ msgstr "Enviar uma nota directa" msgid "To" msgstr "Para" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 msgid "Available characters" msgstr "Caracteres disponíveis" @@ -5153,11 +5157,11 @@ msgstr "Enviar uma nota" msgid "What's up, %s?" msgstr "Novidades, %s?" -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "Anexar" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "Anexar um ficheiro" @@ -5226,11 +5230,11 @@ msgstr "Erro ao inserir perfil remoto" msgid "Duplicate notice" msgstr "Nota duplicada" -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 msgid "You have been banned from subscribing." msgstr "Foi bloqueado de fazer subscrições" -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Não foi possível inserir nova subscrição." @@ -5285,7 +5289,7 @@ msgstr "Todos os subscritores" #: lib/profileaction.php:178 msgid "User ID" -msgstr "ID de utilizador" +msgstr "ID do utilizador" #: lib/profileaction.php:183 msgid "Member since" @@ -5325,11 +5329,11 @@ msgstr "Populares" #: lib/sandboxform.php:67 msgid "Sandbox" -msgstr "Descronolinhar" +msgstr "Impedir notas públicas" #: lib/sandboxform.php:78 msgid "Sandbox this user" -msgstr "Impedir que notas deste utilizador apareçam na cronolinha" +msgstr "Impedir que notas deste utilizador sejam públicas" #: lib/searchaction.php:120 msgid "Search site" @@ -5390,20 +5394,6 @@ msgstr "Pessoas que subscrevem %s" msgid "Groups %s is a member of" msgstr "Grupos de que %s é membro" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "Catenuvem de Pessoas tal como elas se categorizam" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "Catenuvem de Pessoas tal como as categoriza" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(nenhum)" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "Já subscrito!" @@ -5432,6 +5422,20 @@ msgstr "Não foi possível apagar a auto-subscrição." msgid "Couldn't delete subscription." msgstr "Não foi possível apagar a subscrição." +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "Nuvem da auto-categorização das pessoas" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "Nuvem da sua categorização das pessoas" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "(nenhum)" + #: lib/tagcloudsection.php:56 msgid "None" msgstr "Nenhum" @@ -5442,11 +5446,11 @@ msgstr "Quem mais publica" #: lib/unsandboxform.php:69 msgid "Unsandbox" -msgstr "Cronolinhar" +msgstr "Permitir notas públicas" #: lib/unsandboxform.php:80 msgid "Unsandbox this user" -msgstr "Permitir que notas deste utilizador apareçam na cronolinha" +msgstr "Permitir que notas deste utilizador sejam públicas" #: lib/unsilenceform.php:67 msgid "Unsilence" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index 535520096b..eb81de65f6 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -1,6 +1,7 @@ # Translation of StatusNet to Brazilian Portuguese # # Author@translatewiki.net: Ewout +# Author@translatewiki.net: McDutchie # Author@translatewiki.net: Vuln # -- # 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: 2009-12-07 21:25+0000\n" -"PO-Revision-Date: 2009-12-07 21:27:16+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:10:21+0000\n" "Language-Team: Brazilian Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt-br\n" "X-Message-Group: out-statusnet\n" @@ -27,11 +28,11 @@ msgstr "Essa página não existe." #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -44,7 +45,7 @@ msgstr "Essa página não existe." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." @@ -56,7 +57,7 @@ msgid "%s and friends, page %d" msgstr "%s e amigos, página %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s e amigos" @@ -107,25 +108,25 @@ msgstr "" msgid "You and friends" msgstr "Você e amigos" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Atualizações de %1$s e amigos no %2$s!" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 #, fuzzy msgid "API method not found." msgstr "O método da API não foi encontrado!" #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 @@ -145,9 +146,23 @@ msgstr "" msgid "Could not update user." msgstr "Não foi possível atualizar o usuário." +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "O usuário não tem perfil." + +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Não foi possível salvar o perfil." + #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -170,20 +185,6 @@ msgstr "Não foi possível salvar suas configurações do Twitter!" msgid "Could not update your design." msgstr "Não foi possível atualizar o usuário." -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "O usuário não tem perfil." - -#: actions/apiaccountupdateprofile.php:147 -#, fuzzy -msgid "Could not save profile." -msgstr "Não foi possível salvar o perfil." - #: actions/apiblockcreate.php:105 #, fuzzy msgid "You cannot block yourself!" @@ -197,25 +198,6 @@ msgstr "Não foi possível bloquear o usuário." msgid "Unblock user failed." msgstr "Não foi possível desbloquear o usuário." -#: actions/apidirectmessagenew.php:126 -msgid "No message text!" -msgstr "Nenhuma mensagem de texto!" - -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, php-format -msgid "That's too long. Max message size is %d chars." -msgstr "Isso é muito extenso. O tamanho máximo das mensagens é 140 caracteres." - -#: actions/apidirectmessagenew.php:146 -msgid "Recipient user not found." -msgstr "O usuário destinatário não foi encontrado." - -#: actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." -msgstr "" -"Não é possível enviar mensagens diretas para usuários que não são seus " -"amigos." - #: actions/apidirectmessage.php:89 #, php-format msgid "Direct messages from %s" @@ -241,18 +223,37 @@ msgstr "Todas as mensagens diretas enviadas para %s" #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "O método da API não foi encontrado!" +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "Nenhuma mensagem de texto!" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "Isso é muito extenso. O tamanho máximo das mensagens é 140 caracteres." + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "O usuário destinatário não foi encontrado." + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "" +"Não é possível enviar mensagens diretas para usuários que não são seus " +"amigos." + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -399,16 +400,6 @@ msgstr "Você não é membro deste grupo." msgid "Could not remove user %s to group %s." msgstr "Não foi possível remover o usuário %s do grupo %." -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, php-format -msgid "%s groups" -msgstr "Grupos de %s" - -#: actions/apigrouplistall.php:94 -#, fuzzy, php-format -msgid "groups on %s" -msgstr "Outras opções" - #: actions/apigrouplist.php:95 #, fuzzy, php-format msgid "%s's groups" @@ -419,6 +410,16 @@ msgstr "Grupos de %s" msgid "Groups %s is a member of on %s." msgstr "O grupo %s é membro de" +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "Grupos de %s" + +#: actions/apigrouplistall.php:94 +#, fuzzy, php-format +msgid "groups on %s" +msgstr "Outras opções" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Este método requer POSTAGEM ou EXCLUSÃO." @@ -455,54 +456,54 @@ msgstr "" msgid "Unsupported format." msgstr "Formato de imagem não suportado." -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, php-format msgid "%s / Favorites from %s" msgstr "%s / Favoritas de %s" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, php-format msgid "%s updates favorited by %s / %s." msgstr "%s atualizações de favoritas por %s / %s." -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "Mensagens de %s" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Atualizações de %1$s no %2$s!" -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, fuzzy, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Atualizações respondendo à %2$s" -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s atualizações que respondem a mensagens de %2$s / %3$s." -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Mensagens públicas de %s" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s atualizações de todo mundo!" -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "Mensagens etiquetadas com %s" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Atualizações de %1$s no %2$s!" @@ -538,45 +539,45 @@ msgstr "Avatar" msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "Você pode enviar seu avatar pessoal. O tamanho máximo do arquivo é %s" -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 msgid "User without matching profile" msgstr "Usuário sem um perfil correspondente" -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 msgid "Avatar settings" msgstr "Configurações do avatar" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "Original" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "Visualização" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 msgid "Delete" msgstr "Excluir" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "Enviar" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "Cortar" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -588,34 +589,72 @@ msgid "There was a problem with your session token. Try again, please." msgstr "" "Ocorreu um problema com o seu token de sessão. Tente novamente, por favor." -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Submissão inesperada de formulário." -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "Selecione uma área quadrada da imagem para ser seu avatar" -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "Nossos dados do arquivo foi perdido." -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "O avatar foi atualizado." -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "Não foi possível atualizar o avatar." -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 #, fuzzy msgid "Avatar deleted." msgstr "O avatar foi atualizado." +#: actions/block.php:69 +msgid "You already blocked that user." +msgstr "Você já bloqueou esse usuário." + +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +msgid "Block user" +msgstr "Bloquear usuário" + +#: actions/block.php:130 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" + +#: actions/block.php:143 actions/deletenotice.php:145 +#: actions/deleteuser.php:147 actions/groupblock.php:178 +msgid "No" +msgstr "Não" + +#: actions/block.php:143 actions/deleteuser.php:147 +#, fuzzy +msgid "Do not block this user" +msgstr "Desbloquear este usuário" + +#: actions/block.php:144 actions/deletenotice.php:146 +#: actions/deleteuser.php:148 actions/groupblock.php:179 +msgid "Yes" +msgstr "Sim" + +#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 +msgid "Block this user" +msgstr "Bloquear usuário" + +#: actions/block.php:162 +msgid "Failed to save block information." +msgstr "Não foi possível salvar a informação de bloqueio." + #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 #: actions/groupmembers.php:76 actions/grouprss.php:91 @@ -657,44 +696,6 @@ msgstr "Desbloquear" msgid "Unblock this user" msgstr "Desbloquear este usuário" -#: actions/block.php:69 -msgid "You already blocked that user." -msgstr "Você já bloqueou esse usuário." - -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 -msgid "Block user" -msgstr "Bloquear usuário" - -#: actions/block.php:130 -msgid "" -"Are you sure you want to block this user? Afterwards, they will be " -"unsubscribed from you, unable to subscribe to you in the future, and you " -"will not be notified of any @-replies from them." -msgstr "" - -#: actions/block.php:143 actions/deletenotice.php:145 -#: actions/deleteuser.php:147 actions/groupblock.php:178 -msgid "No" -msgstr "Não" - -#: actions/block.php:143 actions/deleteuser.php:147 -#, fuzzy -msgid "Do not block this user" -msgstr "Desbloquear este usuário" - -#: actions/block.php:144 actions/deletenotice.php:146 -#: actions/deleteuser.php:148 actions/groupblock.php:179 -msgid "Yes" -msgstr "Sim" - -#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 -msgid "Block this user" -msgstr "Bloquear usuário" - -#: actions/block.php:162 -msgid "Failed to save block information." -msgstr "Não foi possível salvar a informação de bloqueio." - #: actions/bookmarklet.php:50 msgid "Post to " msgstr "" @@ -1045,7 +1046,7 @@ msgstr "Endereço de e-mail" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" -msgstr "Endereço de e-mail, ex: \"usuario@exemplo.org\"" +msgstr "Endereço de e-mail, ex: \"usuario@example.org\"" #: actions/emailsettings.php:126 actions/imsettings.php:133 #: actions/smssettings.php:145 @@ -1184,6 +1185,14 @@ msgid "New incoming email address added." msgstr "" "Foi adicionado um novo endereço de e-mail para recebimento de mensagens." +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "Essa mensagem já é uma favorita!" + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "Excluir a favorita" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 msgid "Popular notices" @@ -1226,14 +1235,6 @@ msgstr "Mensagens favoritas de %s" msgid "Updates favored by %1$s on %2$s!" msgstr "Atualizações de %1$s no %2$s!" -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "Essa mensagem já é uma favorita!" - -#: actions/favor.php:92 lib/disfavorform.php:140 -msgid "Disfavor favorite" -msgstr "Excluir a favorita" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1480,6 +1481,31 @@ msgstr "" msgid "Updates from members of %1$s on %2$s!" msgstr "Atualizações de %1$s no %2$s!" +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#, fuzzy +msgid "Create a new group" +msgstr "Criar uma nova conta" + #: actions/groupsearch.php:52 #, fuzzy, php-format msgid "" @@ -1515,31 +1541,6 @@ msgid "" "action.newgroup%%) yourself!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 -#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 -msgid "Groups" -msgstr "" - -#: actions/groups.php:64 -#, php-format -msgid "Groups, page %d" -msgstr "" - -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%site.name%%%% groups let you find and talk with people of similar " -"interests. After you join a group you can send messages to all other members " -"using the syntax \"!groupname\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" -msgstr "" - -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -#, fuzzy -msgid "Create a new group" -msgstr "Criar uma nova conta" - #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "" @@ -1737,7 +1738,7 @@ msgstr "Mensagem pessoal" msgid "Optionally add a personal message to the invitation." msgstr "Você pode, opcionalmente, adicionar uma mensagem pessoal ao convite." -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "Enviar" @@ -1850,59 +1851,59 @@ msgstr "Não é possível acompanhar o usuário: Usuário não encontrado." msgid "%s left group %s" msgstr "" -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "Já está logado." -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 #, fuzzy msgid "Invalid or expired token." msgstr "O conteúdo da mensagem é inválido" -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "Nome de usuário e/ou senha incorreto(s)." -#: actions/login.php:152 +#: actions/login.php:153 #, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "Não autorizado." -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Logar" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "" -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Apelido" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Senha" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "Lembrar neste computador" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Entrar automaticamente sem pedir a senha. Não use em computadores " "compartilhados!" -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "Perdeu ou esqueceu sua senha?" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1910,7 +1911,7 @@ msgstr "" "Por razões de segurança, por favor, digite novamente seu nome de usuário e " "senha antes de alterar suas configurações." -#: actions/login.php:289 +#: actions/login.php:290 #, fuzzy, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1986,7 +1987,7 @@ msgstr "Nova mensagem" msgid "Direct message to %s sent" msgstr "A mensagem direta para %s foi enviada" -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" msgstr "Erro no Ajax" @@ -1994,7 +1995,7 @@ msgstr "Erro no Ajax" msgid "New notice" msgstr "Nova mensagem" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 msgid "Notice posted" msgstr "Mensagem publicada" @@ -2072,8 +2073,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "Formato de dados não suportado." @@ -3647,6 +3648,26 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %s, page %d" +msgstr "Mensagens etiquetadas com %s" + +#: actions/tag.php:86 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "Feed de mensagens de %s" + +#: actions/tag.php:92 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "Feed de mensagens de %s" + +#: actions/tag.php:98 +#, fuzzy, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "Feed de mensagens de %s" + #: actions/tagother.php:33 msgid "Not logged in" msgstr "Você não está autenticado" @@ -3697,26 +3718,6 @@ msgstr "" "Use esse formulário para adicionar etiquetas aos seus assinantes ou " "assinados." -#: actions/tag.php:68 -#, fuzzy, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Mensagens etiquetadas com %s" - -#: actions/tag.php:86 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "Feed de mensagens de %s" - -#: actions/tag.php:92 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "Feed de mensagens de %s" - -#: actions/tag.php:98 -#, fuzzy, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "Feed de mensagens de %s" - #: actions/tagrss.php:35 msgid "No such tag." msgstr "Essa etiqueta não existe." @@ -4029,23 +4030,23 @@ msgstr "Não foi possível atualizar a mensagem com a nova URI." msgid "DB error inserting hashtag: %s" msgstr "Erro no banco de dados durante a inserção de hashtag: %s" -#: classes/Notice.php:179 +#: classes/Notice.php:188 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Problema ao salvar a mensagem." -#: classes/Notice.php:183 +#: classes/Notice.php:192 msgid "Problem saving notice. Unknown user." msgstr "Problema no salvamento da mensagem. Usuário desconhecido." -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Muitas mensagens em um período curto de tempo; dê uma respirada e publique " "novamente daqui a alguns minutos." -#: classes/Notice.php:194 +#: classes/Notice.php:203 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4054,19 +4055,24 @@ msgstr "" "Muitas mensagens em um período curto de tempo; dê uma respirada e publique " "novamente daqui a alguns minutos." -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "Você foi banido de publicar mensagens nesse site." -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "Problema ao salvar a mensagem." -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "Erro no banco de dados na inserção da reposta: %s" +#: classes/User.php:347 +#, fuzzy, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "Mensagem para %1$s no %2$s" + #: classes/User_group.php:380 msgid "Could not create group." msgstr "Não foi possível criar o grupo." @@ -4076,11 +4082,6 @@ msgstr "Não foi possível criar o grupo." msgid "Could not set group membership." msgstr "Não foi possível salvar a assinatura." -#: classes/User.php:347 -#, fuzzy, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "Mensagem para %1$s no %2$s" - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Alterar as suas configurações de perfil" @@ -4401,7 +4402,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 msgid "User has no last notice" msgstr "O usuário não tem uma \"última mensagem\"" @@ -4450,102 +4451,102 @@ msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" "A mensagem é muito extensa - o máximo são 140 caracteres e você enviou %d" -#: lib/command.php:439 +#: lib/command.php:440 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Responder a esta mensagem" -#: lib/command.php:441 +#: lib/command.php:442 #, fuzzy msgid "Error saving notice." msgstr "Problema ao salvar a mensagem." -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "Especifique o nome do usuário que será assinado" -#: lib/command.php:502 +#: lib/command.php:503 #, php-format msgid "Subscribed to %s" msgstr "Efetuada a assinatura de %s" -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "Especifique o nome do usuário que deixará de ser assinado" -#: lib/command.php:530 +#: lib/command.php:531 #, php-format msgid "Unsubscribed from %s" msgstr "Cancelada a assinatura de %s" -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "O comando não foi implementado ainda." -#: lib/command.php:551 +#: lib/command.php:552 msgid "Notification off." msgstr "Notificação desligada." -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "Não é possível desligar a notificação" -#: lib/command.php:574 +#: lib/command.php:575 msgid "Notification on." msgstr "Notificação ligada." -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "Não é possível ligar a notificação." -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" msgstr "" -#: lib/command.php:602 +#: lib/command.php:604 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Não foi possível criar a favorita." -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:623 +#: lib/command.php:625 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Você não está assinando esse perfil." -#: lib/command.php:625 +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Você já está assinando esses usuários:" msgstr[1] "Você já está assinando esses usuários:" -#: lib/command.php:645 +#: lib/command.php:647 #, fuzzy msgid "No one is subscribed to you." msgstr "Não foi possível fazer com que o outros o sigam." -#: lib/command.php:647 +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Não foi possível fazer com que o outros o sigam." msgstr[1] "Não foi possível fazer com que o outros o sigam." -#: lib/command.php:667 +#: lib/command.php:669 #, fuzzy msgid "You are not a member of any groups." msgstr "Você não está assinando esse perfil." -#: lib/command.php:669 +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Você não é membro deste grupo." msgstr[1] "Você não é membro deste grupo." -#: lib/command.php:683 +#: lib/command.php:685 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4645,10 +4646,6 @@ msgstr "Acrescentar às favoritas" msgid "Favor" msgstr "Tornar favorita" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "Exportar os dados" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "" @@ -4665,6 +4662,10 @@ msgstr "" msgid "FOAF" msgstr "" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "Exportar os dados" + #: lib/galleryaction.php:121 msgid "Filter tags" msgstr "Filtrar etiquetas" @@ -4826,21 +4827,6 @@ msgstr "Autentique-se com um nome de usuário e senha" msgid "Sign up for a new account" msgstr "Cadastre-se para uma nova conta" -#: lib/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "As caixas postais são legíveis somente pelo seu próprio usuário." - -#: 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 "" - -#: lib/mailbox.php:227 lib/noticelist.php:452 -#, fuzzy -msgid "from" -msgstr " de " - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "Confirmação do endereço de e-mail" @@ -5033,6 +5019,21 @@ msgid "" "\n" msgstr "" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "As caixas postais são legíveis somente pelo seu próprio usuário." + +#: 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 "" + +#: lib/mailbox.php:227 lib/noticelist.php:452 +#, fuzzy +msgid "from" +msgstr " de " + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5094,7 +5095,7 @@ msgstr "Enviar uma mensagem direta" msgid "To" msgstr "Para" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 msgid "Available characters" msgstr "Caracteres disponíveis" @@ -5107,11 +5108,11 @@ msgstr "Enviar uma mensagem" msgid "What's up, %s?" msgstr "E aí, %s?" -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "" @@ -5183,12 +5184,12 @@ msgstr "Erro na inserção do perfil remoto" msgid "Duplicate notice" msgstr "Excluir a mensagem" -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 #, fuzzy msgid "You have been banned from subscribing." msgstr "Esse usuário bloqueou o seu pedido de assinatura." -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Não foi possível inserir a nova assinatura." @@ -5357,20 +5358,6 @@ msgstr "Assinantes de %s" msgid "Groups %s is a member of" msgstr "O grupo %s é membro de" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(nenhum)" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "" @@ -5401,6 +5388,20 @@ msgstr "Não foi possível excluir a assinatura." msgid "Couldn't delete subscription." msgstr "Não foi possível excluir a assinatura." +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "(nenhum)" + #: lib/tagcloudsection.php:56 msgid "None" msgstr "Nenhuma" diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index 713357714c..b8ed5d97a6 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-07 21:25+0000\n" -"PO-Revision-Date: 2009-12-07 21:27:20+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:10:25+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ru\n" "X-Message-Group: out-statusnet\n" @@ -29,11 +29,11 @@ msgstr "Нет такой страницы" #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -46,7 +46,7 @@ msgstr "Нет такой страницы" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." @@ -58,7 +58,7 @@ msgid "%s and friends, page %d" msgstr "%s и друзья, страница %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s и друзья" @@ -116,24 +116,24 @@ msgstr "" msgid "You and friends" msgstr "Вы и друзья" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Обновлено от %1$s и его друзей на %2$s!" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 msgid "API method not found." msgstr "Метод API не найден." #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 @@ -152,9 +152,22 @@ msgstr "Укажите параметр с именем 'device' и значен msgid "Could not update user." msgstr "Не удаётся обновить пользователя." +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "У пользователя нет профиля." + +#: actions/apiaccountupdateprofile.php:147 +msgid "Could not save profile." +msgstr "Не удаётся сохранить профиль." + #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -177,19 +190,6 @@ msgstr "Не удаётся сохранить ваши настройки оф msgid "Could not update your design." msgstr "Не удаётся обновить ваше оформление." -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "У пользователя нет профиля." - -#: actions/apiaccountupdateprofile.php:147 -msgid "Could not save profile." -msgstr "Не удаётся сохранить профиль." - #: actions/apiblockcreate.php:105 msgid "You cannot block yourself!" msgstr "Вы не можете заблокировать самого себя!" @@ -202,25 +202,6 @@ msgstr "Неудача при блокировке пользователя." msgid "Unblock user failed." msgstr "Неудача при разблокировке пользователя." -#: actions/apidirectmessagenew.php:126 -msgid "No message text!" -msgstr "Отсутствует текст сообщения!" - -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, php-format -msgid "That's too long. Max message size is %d chars." -msgstr "Слишком длинно. Максимальная длина сообщения — %d знаков." - -#: actions/apidirectmessagenew.php:146 -msgid "Recipient user not found." -msgstr "Получатель не найден." - -#: actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." -msgstr "" -"Не удаётся посылать прямые сообщения пользователям, которые не являются " -"Вашими друзьями." - #: actions/apidirectmessage.php:89 #, php-format msgid "Direct messages from %s" @@ -246,18 +227,37 @@ msgstr "Все прямые сообщения посланные для %s" #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "Метод API не найден!" +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "Отсутствует текст сообщения!" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "Слишком длинно. Максимальная длина сообщения — %d знаков." + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "Получатель не найден." + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "" +"Не удаётся посылать прямые сообщения пользователям, которые не являются " +"Вашими друзьями." + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -405,16 +405,6 @@ msgstr "Вы не являетесь членом этой группы." msgid "Could not remove user %s to group %s." msgstr "Не удаётся удалить пользователя %s из группы %s." -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, php-format -msgid "%s groups" -msgstr "Группы %s" - -#: actions/apigrouplistall.php:94 -#, php-format -msgid "groups on %s" -msgstr "группы на %s" - #: actions/apigrouplist.php:95 #, php-format msgid "%s's groups" @@ -425,6 +415,16 @@ msgstr "Группы %s" msgid "Groups %s is a member of on %s." msgstr "Группы, в которых состоит %s на %s." +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "Группы %s" + +#: actions/apigrouplistall.php:94 +#, php-format +msgid "groups on %s" +msgstr "группы на %s" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Этот метод требует POST или DELETE." @@ -460,54 +460,54 @@ msgstr "Максимальная длина записи — %d символов msgid "Unsupported format." msgstr "Неподдерживаемый формат." -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, php-format msgid "%s / Favorites from %s" msgstr "%s / Любимое от %s" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, php-format msgid "%s updates favorited by %s / %s." msgstr "%s обновлённые любимые записи от %s / %s." -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "Лента %s" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Обновлено от %1$s на %2$s!" -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Обновления, упоминающие %2$s" -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s обновил этот ответ на сообщение: %2$s / %3$s." -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "Общая лента %s" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "Обновления %s от всех!" -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "Записи с тегом %s" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Обновления с тегом %1$s на %2$s!" @@ -543,45 +543,45 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" "Вы можете загрузить свою аватару. Максимальный размер файла составляет %s." -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 msgid "User without matching profile" msgstr "Пользователь без соответствующего профиля" -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 msgid "Avatar settings" msgstr "Настройки аватары" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "Оригинал" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "Просмотр" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 msgid "Delete" msgstr "Удалить" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "Загрузить" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "Обрезать" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -592,73 +592,33 @@ msgstr "Обрезать" msgid "There was a problem with your session token. Try again, please." msgstr "Проблема с Вашей сессией. Попробуйте ещё раз, пожалуйста." -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Нетиповое подтверждение формы." -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "Подберите нужный квадратный участок для вашей аватары" -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "Потеряна информация о файле." -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "Аватара обновлена." -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "Неудача при обновлении аватары." -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 msgid "Avatar deleted." msgstr "Аватара удалена." -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 -msgid "No nickname" -msgstr "Нет названия группы" - -#: actions/blockedfromgroup.php:80 actions/editgroup.php:96 -#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 -#: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "Нет такой группы" - -#: actions/blockedfromgroup.php:90 -#, php-format -msgid "%s blocked profiles" -msgstr "Заблокированные профили %s" - -#: actions/blockedfromgroup.php:93 -#, php-format -msgid "%s blocked profiles, page %d" -msgstr "Заблокированные профили %s, страница %d" - -#: actions/blockedfromgroup.php:108 -msgid "A list of the users blocked from joining this group." -msgstr "Список пользователей, заблокированных от присоединения к этой группе." - -#: actions/blockedfromgroup.php:281 -msgid "Unblock user from group" -msgstr "Разблокировать пользователя в группе." - -#: actions/blockedfromgroup.php:313 lib/unblockform.php:69 -msgid "Unblock" -msgstr "Разблокировать" - -#: actions/blockedfromgroup.php:313 lib/unblockform.php:80 -msgid "Unblock this user" -msgstr "Разблокировать пользователя." - #: actions/block.php:69 msgid "You already blocked that user." msgstr "Вы уже заблокировали этого пользователя." @@ -699,6 +659,46 @@ msgstr "Заблокировать пользователя." msgid "Failed to save block information." msgstr "Не удаётся сохранить информацию о блокировании." +#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 +#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 +#: actions/groupmembers.php:76 actions/grouprss.php:91 +#: actions/joingroup.php:76 actions/showgroup.php:121 +msgid "No nickname" +msgstr "Нет названия группы" + +#: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 +#: actions/grouplogo.php:99 actions/groupmembers.php:83 +#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +msgid "No such group" +msgstr "Нет такой группы" + +#: actions/blockedfromgroup.php:90 +#, php-format +msgid "%s blocked profiles" +msgstr "Заблокированные профили %s" + +#: actions/blockedfromgroup.php:93 +#, php-format +msgid "%s blocked profiles, page %d" +msgstr "Заблокированные профили %s, страница %d" + +#: actions/blockedfromgroup.php:108 +msgid "A list of the users blocked from joining this group." +msgstr "Список пользователей, заблокированных от присоединения к этой группе." + +#: actions/blockedfromgroup.php:281 +msgid "Unblock user from group" +msgstr "Разблокировать пользователя в группе." + +#: actions/blockedfromgroup.php:313 lib/unblockform.php:69 +msgid "Unblock" +msgstr "Разблокировать" + +#: actions/blockedfromgroup.php:313 lib/unblockform.php:80 +msgid "Unblock this user" +msgstr "Разблокировать пользователя." + #: actions/bookmarklet.php:50 msgid "Post to " msgstr "Отправить в " @@ -1045,7 +1045,8 @@ msgstr "Входящий электронный адрес" #: actions/emailsettings.php:138 actions/smssettings.php:157 msgid "Send email to this address to post new notices." -msgstr "Посылать электронные письма на этот адрес для постинга новых записей." +msgstr "" +"Отправляйте электронные письма на этот адрес для отсылки новых записей." #: actions/emailsettings.php:145 actions/smssettings.php:162 msgid "Make a new email address for posting to; cancels the old one." @@ -1176,6 +1177,14 @@ msgstr "Входящий электронный адрес удалён." msgid "New incoming email address added." msgstr "Новый входящий электронный адрес добавлен." +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "Эта запись уже входит в число любимых!" + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "Разлюбить" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 msgid "Popular notices" @@ -1224,14 +1233,6 @@ msgstr "Любимые записи %s" msgid "Updates favored by %1$s on %2$s!" msgstr "Обновления, понравившиеся %1$s на %2$s!" -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "Эта запись уже входит в число любимых!" - -#: actions/favor.php:92 lib/disfavorform.php:140 -msgid "Disfavor favorite" -msgstr "Разлюбить" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1463,6 +1464,35 @@ msgstr "Сделать этого пользователя администра msgid "Updates from members of %1$s on %2$s!" msgstr "Обновления участников %1$s на %2$s!" +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "Группы" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "Группы, страница %d" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" +"Группы на сайте %%%%site.name%%%% позволяют искать и общаться с людьми с " +"общими интересами. После присоединения к группе и вы сможете отправлять " +"сообщения до всех её участников, используя команду «!имягруппы». Не видите " +"группу, которая вас интересует? Попробуйте [найти её](%%%%action.groupsearch%" +"%%%) или [создайте собственную!](%%%%action.newgroup%%%%)" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +msgid "Create a new group" +msgstr "Создать новую группу" + #: actions/groupsearch.php:52 #, php-format msgid "" @@ -1499,35 +1529,6 @@ msgstr "" "Почему бы не [зарегистрироваться](%%action.register%%), чтобы [создать " "группу](%%action.newgroup%%) самому?" -#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 -#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 -msgid "Groups" -msgstr "Группы" - -#: actions/groups.php:64 -#, php-format -msgid "Groups, page %d" -msgstr "Группы, страница %d" - -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%site.name%%%% groups let you find and talk with people of similar " -"interests. After you join a group you can send messages to all other members " -"using the syntax \"!groupname\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" -msgstr "" -"Группы на сайте %%%%site.name%%%% позволяют искать и общаться с людьми с " -"общими интересами. После присоединения к группе и вы сможете отправлять " -"сообщения до всех её участников, используя команду «!имягруппы». Не видите " -"группу, которая вас интересует? Попробуйте [найти её](%%%%action.groupsearch%" -"%%%) или [создайте собственную!](%%%%action.newgroup%%%%)" - -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -msgid "Create a new group" -msgstr "Создать новую группу" - #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "Только администратор может разблокировать участников группы." @@ -1723,7 +1724,7 @@ msgstr "Личное сообщение" msgid "Optionally add a personal message to the invitation." msgstr "Можно добавить к приглашению личное сообщение." -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "ОК" @@ -1829,55 +1830,55 @@ msgstr "Не удаётся удалить пользователя %s из гр msgid "%s left group %s" msgstr "%s покинул группу %s" -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "Вы уже авторизовались." -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 msgid "Invalid or expired token." msgstr "Неверный или устаревший ключ." -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "Некорректное имя или пароль." -#: actions/login.php:152 +#: actions/login.php:153 msgid "Error setting user. You are probably not authorized." msgstr "Ошибка установки пользователя. Вы, вероятно, не авторизованы." -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Вход" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "Авторизоваться" -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Имя" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Пароль" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "Запомнить меня" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "Автоматическии входить в дальнейшем. Не для общедоступных компьютеров!" -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "Потеряли или забыли пароль?" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1885,7 +1886,7 @@ msgstr "" "По причинам сохранения безопасности введите имя и пароль ещё раз, прежде чем " "изменять Ваши установки." -#: actions/login.php:289 +#: actions/login.php:290 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1957,7 +1958,7 @@ msgstr "Сообщение отправлено" msgid "Direct message to %s sent" msgstr "Прямое сообщение для %s послано" -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" msgstr "Ошибка AJAX" @@ -1965,7 +1966,7 @@ msgstr "Ошибка AJAX" msgid "New notice" msgstr "Новая запись" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 msgid "Notice posted" msgstr "Запись опубликована" @@ -2047,8 +2048,8 @@ msgstr "тип содержимого " msgid "Only " msgstr "Только " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "Неподдерживаемый формат данных." @@ -3632,6 +3633,26 @@ msgstr "Jabber" msgid "SMS" msgstr "СМС" +#: actions/tag.php:68 +#, php-format +msgid "Notices tagged with %s, page %d" +msgstr "Записи с тегом %s, страница %d" + +#: actions/tag.php:86 +#, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "Лента записей для тега %s (RSS 1.0)" + +#: actions/tag.php:92 +#, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "Лента записей для тега %s (RSS 2.0)" + +#: actions/tag.php:98 +#, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "Лента записей для тега %s (Atom)" + #: actions/tagother.php:33 msgid "Not logged in" msgstr "Не авторизовано" @@ -3681,26 +3702,6 @@ msgid "Use this form to add tags to your subscribers or subscriptions." msgstr "" "Используйте эту форму для добавления тегов Вашим подписчикам или подписантам." -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Записи с тегом %s, страница %d" - -#: actions/tag.php:86 -#, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "Лента записей для тега %s (RSS 1.0)" - -#: actions/tag.php:92 -#, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "Лента записей для тега %s (RSS 2.0)" - -#: actions/tag.php:98 -#, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "Лента записей для тега %s (Atom)" - #: actions/tagrss.php:35 msgid "No such tag." msgstr "Нет такого тега." @@ -4003,22 +4004,22 @@ msgstr "Не удаётся обновить сообщение с новым UR msgid "DB error inserting hashtag: %s" msgstr "Ошибка баз данных при вставке хеш-тегов для %s" -#: classes/Notice.php:179 +#: classes/Notice.php:188 msgid "Problem saving notice. Too long." msgstr "Проблемы с сохранением записи. Слишком длинно." -#: classes/Notice.php:183 +#: classes/Notice.php:192 msgid "Problem saving notice. Unknown user." msgstr "Проблема при сохранении записи. Неизвестный пользователь." -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Слишком много записей за столь короткий срок; передохните немного и " "попробуйте вновь через пару минут." -#: classes/Notice.php:194 +#: classes/Notice.php:203 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4026,19 +4027,24 @@ msgstr "" "Слишком много одинаковых записей за столь короткий срок; передохните немного " "и попробуйте вновь через пару минут." -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "Вам запрещено поститься на этом сайте (бан)" -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "Проблемы с сохранением записи." -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "Ошибка баз данных при вставке ответа для %s" +#: classes/User.php:347 +#, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "Добро пожаловать на %1$s, @%2$s!" + #: classes/User_group.php:380 msgid "Could not create group." msgstr "Не удаётся создать группу." @@ -4047,11 +4053,6 @@ msgstr "Не удаётся создать группу." msgid "Could not set group membership." msgstr "Не удаётся назначить членство в группе." -#: classes/User.php:347 -#, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "Добро пожаловать на %1$s, @%2$s!" - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Изменить ваши настройки профиля" @@ -4357,7 +4358,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "Записи с таким id не существует" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 msgid "User has no last notice" msgstr "У пользователя нет записей" @@ -4404,102 +4405,101 @@ msgstr "Ошибка при отправке прямого сообщения." msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Запись слишком длинная — не больше %d символов, вы посылаете %d" -#: lib/command.php:439 +#: lib/command.php:440 #, php-format msgid "Reply to %s sent" msgstr "Ответ %s отправлен" -#: lib/command.php:441 +#: lib/command.php:442 msgid "Error saving notice." msgstr "Проблемы с сохранением записи." -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "Определите имя пользователя при подписке на" -#: lib/command.php:502 +#: lib/command.php:503 #, php-format msgid "Subscribed to %s" msgstr "Подписано на %s" -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "Определите имя пользователя для отписки от" -#: lib/command.php:530 +#: lib/command.php:531 #, php-format msgid "Unsubscribed from %s" msgstr "Отписано от %s" -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "Команда ещё не выполнена." -#: lib/command.php:551 +#: lib/command.php:552 msgid "Notification off." msgstr "Оповещение отсутствует." -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "Нет оповещения." -#: lib/command.php:574 +#: lib/command.php:575 msgid "Notification on." msgstr "Есть оповещение." -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "Есть оповещение." -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" -msgstr "" +msgstr "Команда входа отключена" -#: lib/command.php:602 -#, fuzzy, php-format +#: lib/command.php:604 +#, php-format msgid "Could not create login token for %s" -msgstr "Не удаётся создать алиасы." +msgstr "Не удаётся создать токен входа для %s" -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" -msgstr "" +msgstr "Эта ссылка действительна только один раз в течение 2 минут: %s" -#: lib/command.php:623 +#: lib/command.php:625 msgid "You are not subscribed to anyone." msgstr "Вы ни на кого не подписаны." -#: lib/command.php:625 +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Вы подписаны на этих людей:" msgstr[1] "Вы подписаны на этих людей:" msgstr[2] "Вы подписаны на этих людей:" -#: lib/command.php:645 +#: lib/command.php:647 msgid "No one is subscribed to you." msgstr "Никто не подписан на вас." -#: lib/command.php:647 +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Эти люди подписались на вас:" msgstr[1] "Эти люди подписались на вас:" msgstr[2] "Эти люди подписались на вас:" -#: lib/command.php:667 +#: lib/command.php:669 msgid "You are not a member of any groups." msgstr "Вы не состоите ни в одной группе." -#: lib/command.php:669 +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Вы являетесь участником следующих групп:" msgstr[1] "Вы являетесь участником следующих групп:" msgstr[2] "Вы являетесь участником следующих групп:" -#: lib/command.php:683 -#, fuzzy +#: lib/command.php:685 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4554,6 +4554,7 @@ msgstr "" "reply # — ответить на запись с заданным id\n" "reply — ответить на последнюю запись пользователя\n" "join — присоединиться к группе\n" +"login — получить ссылку на вход в веб-интрефейсе\n" "drop — покинуть группу\n" "stats — получить свою статистику\n" "stop — то же, что и 'off'\n" @@ -4631,10 +4632,6 @@ msgstr "Мне нравится эта запись" msgid "Favor" msgstr "Пометить" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "Экспорт потока записей" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "RSS 1.0" @@ -4651,6 +4648,10 @@ msgstr "Atom" msgid "FOAF" msgstr "FOAF" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "Экспорт потока записей" + #: lib/galleryaction.php:121 msgid "Filter tags" msgstr "Фильтровать теги" @@ -4811,23 +4812,6 @@ msgstr "Войти с вашим ником и паролем." msgid "Sign up for a new account" msgstr "Создать новый аккаунт" -#: lib/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "Только сам пользователь может читать собственный почтовый ящик." - -#: 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 "" -"У вас нет личных сообщений. Вы можете отправить личное сообщение для " -"вовлечения других пользователей в разговор. Сообщения, получаемые от других " -"людей, видите только вы." - -#: lib/mailbox.php:227 lib/noticelist.php:452 -msgid "from" -msgstr "от " - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "Подтверждение электронного адреса" @@ -5089,6 +5073,23 @@ msgstr "" "%4$s\n" "\n" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "Только сам пользователь может читать собственный почтовый ящик." + +#: 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 "" +"У вас нет личных сообщений. Вы можете отправить личное сообщение для " +"вовлечения других пользователей в разговор. Сообщения, получаемые от других " +"людей, видите только вы." + +#: lib/mailbox.php:227 lib/noticelist.php:452 +msgid "from" +msgstr "от " + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5152,7 +5153,7 @@ msgstr "Послать прямую запись" msgid "To" msgstr "Для" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 msgid "Available characters" msgstr "6 или больше знаков" @@ -5165,11 +5166,11 @@ msgstr "Послать запись" msgid "What's up, %s?" msgstr "Что нового, %s?" -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "Прикрепить" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "Прикрепить файл" @@ -5238,11 +5239,11 @@ msgstr "Ошибка вставки удалённого профиля" msgid "Duplicate notice" msgstr "Дублировать запись" -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 msgid "You have been banned from subscribing." msgstr "Вы заблокированы от подписки." -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Не удаётся вставить новую подписку." @@ -5402,20 +5403,6 @@ msgstr "Люди подписанные на %s" msgid "Groups %s is a member of" msgstr "Группы, в которых состоит %s" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "Облако собственных тегов людей" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "Облако тегов людей" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(пока ничего нет)" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "Уже подписаны!" @@ -5444,6 +5431,20 @@ msgstr "Невозможно удалить самоподписку." msgid "Couldn't delete subscription." msgstr "Не удаётся удалить подписку." +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "Облако собственных тегов людей" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "Облако тегов людей" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "(пока ничего нет)" + #: lib/tagcloudsection.php:56 msgid "None" msgstr "Нет тегов" diff --git a/locale/statusnet.po b/locale/statusnet.po index dce6f6551c..50510715f6 100644 --- a/locale/statusnet.po +++ b/locale/statusnet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-07 21:25+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,11 +24,11 @@ msgstr "" #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -41,7 +41,7 @@ msgstr "" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." @@ -53,7 +53,7 @@ msgid "%s and friends, page %d" msgstr "" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "" @@ -104,24 +104,24 @@ msgstr "" msgid "You and friends" msgstr "" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 msgid "API method not found." msgstr "" #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 @@ -140,9 +140,22 @@ msgstr "" msgid "Could not update user." msgstr "" +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "" + +#: actions/apiaccountupdateprofile.php:147 +msgid "Could not save profile." +msgstr "" + #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -163,19 +176,6 @@ msgstr "" msgid "Could not update your design." msgstr "" -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "" - -#: actions/apiaccountupdateprofile.php:147 -msgid "Could not save profile." -msgstr "" - #: actions/apiblockcreate.php:105 msgid "You cannot block yourself!" msgstr "" @@ -188,23 +188,6 @@ msgstr "" msgid "Unblock user failed." msgstr "" -#: actions/apidirectmessagenew.php:126 -msgid "No message text!" -msgstr "" - -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, php-format -msgid "That's too long. Max message size is %d chars." -msgstr "" - -#: actions/apidirectmessagenew.php:146 -msgid "Recipient user not found." -msgstr "" - -#: actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." -msgstr "" - #: actions/apidirectmessage.php:89 #, php-format msgid "Direct messages from %s" @@ -230,18 +213,35 @@ msgstr "" #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "" +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "" + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "" + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -384,16 +384,6 @@ msgstr "" msgid "Could not remove user %s to group %s." msgstr "" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, php-format -msgid "%s groups" -msgstr "" - -#: actions/apigrouplistall.php:94 -#, php-format -msgid "groups on %s" -msgstr "" - #: actions/apigrouplist.php:95 #, php-format msgid "%s's groups" @@ -404,6 +394,16 @@ msgstr "" msgid "Groups %s is a member of on %s." msgstr "" +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "" + +#: actions/apigrouplistall.php:94 +#, php-format +msgid "groups on %s" +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "" @@ -439,54 +439,54 @@ msgstr "" msgid "Unsupported format." msgstr "" -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, php-format msgid "%s / Favorites from %s" msgstr "" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, php-format msgid "%s updates favorited by %s / %s." msgstr "" -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "" -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "" @@ -521,45 +521,45 @@ msgstr "" msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 msgid "User without matching profile" msgstr "" -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 msgid "Avatar settings" msgstr "" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 msgid "Delete" msgstr "" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -570,33 +570,70 @@ msgstr "" msgid "There was a problem with your session token. Try again, please." msgstr "" -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "" -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "" -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "" -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 msgid "Avatar deleted." msgstr "" +#: actions/block.php:69 +msgid "You already blocked that user." +msgstr "" + +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +msgid "Block user" +msgstr "" + +#: actions/block.php:130 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" + +#: actions/block.php:143 actions/deletenotice.php:145 +#: actions/deleteuser.php:147 actions/groupblock.php:178 +msgid "No" +msgstr "" + +#: actions/block.php:143 actions/deleteuser.php:147 +msgid "Do not block this user" +msgstr "" + +#: actions/block.php:144 actions/deletenotice.php:146 +#: actions/deleteuser.php:148 actions/groupblock.php:179 +msgid "Yes" +msgstr "" + +#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 +msgid "Block this user" +msgstr "" + +#: actions/block.php:162 +msgid "Failed to save block information." +msgstr "" + #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 #: actions/groupmembers.php:76 actions/grouprss.php:91 @@ -637,43 +674,6 @@ msgstr "" msgid "Unblock this user" msgstr "" -#: actions/block.php:69 -msgid "You already blocked that user." -msgstr "" - -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 -msgid "Block user" -msgstr "" - -#: actions/block.php:130 -msgid "" -"Are you sure you want to block this user? Afterwards, they will be " -"unsubscribed from you, unable to subscribe to you in the future, and you " -"will not be notified of any @-replies from them." -msgstr "" - -#: actions/block.php:143 actions/deletenotice.php:145 -#: actions/deleteuser.php:147 actions/groupblock.php:178 -msgid "No" -msgstr "" - -#: actions/block.php:143 actions/deleteuser.php:147 -msgid "Do not block this user" -msgstr "" - -#: actions/block.php:144 actions/deletenotice.php:146 -#: actions/deleteuser.php:148 actions/groupblock.php:179 -msgid "Yes" -msgstr "" - -#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 -msgid "Block this user" -msgstr "" - -#: actions/block.php:162 -msgid "Failed to save block information." -msgstr "" - #: actions/bookmarklet.php:50 msgid "Post to " msgstr "" @@ -1131,6 +1131,14 @@ msgstr "" msgid "New incoming email address added." msgstr "" +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "" + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 msgid "Popular notices" @@ -1173,14 +1181,6 @@ msgstr "" msgid "Updates favored by %1$s on %2$s!" msgstr "" -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "" - -#: actions/favor.php:92 lib/disfavorform.php:140 -msgid "Disfavor favorite" -msgstr "" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1405,6 +1405,30 @@ msgstr "" msgid "Updates from members of %1$s on %2$s!" msgstr "" +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +msgid "Create a new group" +msgstr "" + #: actions/groupsearch.php:52 #, php-format msgid "" @@ -1435,30 +1459,6 @@ msgid "" "action.newgroup%%) yourself!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 -#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 -msgid "Groups" -msgstr "" - -#: actions/groups.php:64 -#, php-format -msgid "Groups, page %d" -msgstr "" - -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%site.name%%%% groups let you find and talk with people of similar " -"interests. After you join a group you can send messages to all other members " -"using the syntax \"!groupname\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" -msgstr "" - -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -msgid "Create a new group" -msgstr "" - #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "" @@ -1636,7 +1636,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "" @@ -1716,61 +1716,61 @@ msgstr "" msgid "%s left group %s" msgstr "" -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "" -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 msgid "Invalid or expired token." msgstr "" -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "" -#: actions/login.php:152 +#: actions/login.php:153 msgid "Error setting user. You are probably not authorized." msgstr "" -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "" -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "" -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "" -#: actions/login.php:289 +#: actions/login.php:290 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1839,7 +1839,7 @@ msgstr "" msgid "Direct message to %s sent" msgstr "" -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" msgstr "" @@ -1847,7 +1847,7 @@ msgstr "" msgid "New notice" msgstr "" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 msgid "Notice posted" msgstr "" @@ -1921,8 +1921,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "" @@ -3393,6 +3393,26 @@ msgstr "" msgid "SMS" msgstr "" +#: actions/tag.php:68 +#, php-format +msgid "Notices tagged with %s, page %d" +msgstr "" + +#: actions/tag.php:86 +#, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "" + +#: actions/tag.php:92 +#, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "" + +#: actions/tag.php:98 +#, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "" + #: actions/tagother.php:33 msgid "Not logged in" msgstr "" @@ -3437,26 +3457,6 @@ msgstr "" msgid "Use this form to add tags to your subscribers or subscriptions." msgstr "" -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "" - -#: actions/tag.php:86 -#, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "" - -#: actions/tag.php:92 -#, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "" - -#: actions/tag.php:98 -#, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "" - #: actions/tagrss.php:35 msgid "No such tag." msgstr "" @@ -3745,38 +3745,43 @@ msgstr "" msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:179 +#: classes/Notice.php:188 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:183 +#: classes/Notice.php:192 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:194 +#: classes/Notice.php:203 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "" +#: classes/User.php:347 +#, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "" + #: classes/User_group.php:380 msgid "Could not create group." msgstr "" @@ -3785,11 +3790,6 @@ msgstr "" msgid "Could not set group membership." msgstr "" -#: classes/User.php:347 -#, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "" - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "" @@ -4086,7 +4086,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 msgid "User has no last notice" msgstr "" @@ -4133,98 +4133,98 @@ msgstr "" msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:439 +#: lib/command.php:440 #, php-format msgid "Reply to %s sent" msgstr "" -#: lib/command.php:441 +#: lib/command.php:442 msgid "Error saving notice." msgstr "" -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:502 +#: lib/command.php:503 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:530 +#: lib/command.php:531 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:551 +#: lib/command.php:552 msgid "Notification off." msgstr "" -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:574 +#: lib/command.php:575 msgid "Notification on." msgstr "" -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" msgstr "" -#: lib/command.php:602 +#: lib/command.php:604 #, php-format msgid "Could not create login token for %s" msgstr "" -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:623 +#: lib/command.php:625 msgid "You are not subscribed to anyone." msgstr "" -#: lib/command.php:625 +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:645 +#: lib/command.php:647 msgid "No one is subscribed to you." msgstr "" -#: lib/command.php:647 +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:667 +#: lib/command.php:669 msgid "You are not a member of any groups." msgstr "" -#: lib/command.php:669 +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:683 +#: lib/command.php:685 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4320,10 +4320,6 @@ msgstr "" msgid "Favor" msgstr "" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "" @@ -4340,6 +4336,10 @@ msgstr "" msgid "FOAF" msgstr "" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "" + #: lib/galleryaction.php:121 msgid "Filter tags" msgstr "" @@ -4498,20 +4498,6 @@ msgstr "" msgid "Sign up for a new account" msgstr "" -#: lib/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "" - -#: 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 "" - -#: lib/mailbox.php:227 lib/noticelist.php:452 -msgid "from" -msgstr "" - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "" @@ -4688,6 +4674,20 @@ msgid "" "\n" msgstr "" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "" + +#: 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 "" + +#: lib/mailbox.php:227 lib/noticelist.php:452 +msgid "from" +msgstr "" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -4748,7 +4748,7 @@ msgstr "" msgid "To" msgstr "" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 msgid "Available characters" msgstr "" @@ -4761,11 +4761,11 @@ msgstr "" msgid "What's up, %s?" msgstr "" -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "" @@ -4834,11 +4834,11 @@ msgstr "" msgid "Duplicate notice" msgstr "" -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 msgid "You have been banned from subscribing." msgstr "" -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "" @@ -4998,20 +4998,6 @@ msgstr "" msgid "Groups %s is a member of" msgstr "" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "" @@ -5040,6 +5026,20 @@ msgstr "" msgid "Couldn't delete subscription." msgstr "" +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "" + #: lib/tagcloudsection.php:56 msgid "None" msgstr "" diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index 01e895f8e9..60e4f72011 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: 2009-12-07 21:25+0000\n" -"PO-Revision-Date: 2009-12-07 21:27:23+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:10:28+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: sv\n" "X-Message-Group: out-statusnet\n" @@ -27,11 +27,11 @@ msgstr "Ingen sådan sida" #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -44,7 +44,7 @@ msgstr "Ingen sådan sida" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." @@ -56,7 +56,7 @@ msgid "%s and friends, page %d" msgstr "%s och vänner, sida %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s och vänner" @@ -114,24 +114,24 @@ msgstr "" msgid "You and friends" msgstr "Du och vänner" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Uppdateringar från %1$s och vänner på %2$s!" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 msgid "API method not found." msgstr "API-metoden hittades inte" #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 @@ -150,9 +150,22 @@ msgstr "Du måste ange ett värdet på parametern 'device': sms, im, none" msgid "Could not update user." msgstr "Kunde inte uppdatera användare." +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "Användaren har ingen profil." + +#: actions/apiaccountupdateprofile.php:147 +msgid "Could not save profile." +msgstr "Kunde inte spara profil." + #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -175,19 +188,6 @@ msgstr "Kunde inte spara dina utseendeinställningar." msgid "Could not update your design." msgstr "Kunde inte uppdatera din profils utseende." -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "Användaren har ingen profil." - -#: actions/apiaccountupdateprofile.php:147 -msgid "Could not save profile." -msgstr "Kunde inte spara profil." - #: actions/apiblockcreate.php:105 msgid "You cannot block yourself!" msgstr "Du kan inte blockera dig själv!" @@ -200,23 +200,6 @@ msgstr "Blockering av användare misslyckades." msgid "Unblock user failed." msgstr "Hävning av blockering av användare misslyckades." -#: actions/apidirectmessagenew.php:126 -msgid "No message text!" -msgstr "Ingen meddelandetext!" - -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, php-format -msgid "That's too long. Max message size is %d chars." -msgstr "Detta är för långt. Maximal meddelandestorlek är %d tecken." - -#: actions/apidirectmessagenew.php:146 -msgid "Recipient user not found." -msgstr "Mottagare hittades inte." - -#: actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." -msgstr "Kan inte skicka direktmeddelanden till användare som inte är din vän." - #: actions/apidirectmessage.php:89 #, php-format msgid "Direct messages from %s" @@ -242,18 +225,35 @@ msgstr "Alla direktmeddelanden skickade till %s" #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "API-metoden hittades inte!" +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "Ingen meddelandetext!" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "Detta är för långt. Maximal meddelandestorlek är %d tecken." + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "Mottagare hittades inte." + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "Kan inte skicka direktmeddelanden till användare som inte är din vän." + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -397,16 +397,6 @@ msgstr "Du är inte en medlem i denna grupp." msgid "Could not remove user %s to group %s." msgstr "Kunde inte ta bort användare %s från grupp %s." -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, php-format -msgid "%s groups" -msgstr "%s grupper" - -#: actions/apigrouplistall.php:94 -#, php-format -msgid "groups on %s" -msgstr "grupper på %s" - #: actions/apigrouplist.php:95 #, php-format msgid "%s's groups" @@ -417,6 +407,16 @@ msgstr "%ss grupper" msgid "Groups %s is a member of on %s." msgstr "Grupper %s är en medlem i på %s." +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "%s grupper" + +#: actions/apigrouplistall.php:94 +#, php-format +msgid "groups on %s" +msgstr "grupper på %s" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Denna metod kräver en POST eller en DELETE." @@ -452,54 +452,54 @@ msgstr "Maximal notisstorlek är %d tecken, inklusive bilage-URL." msgid "Unsupported format." msgstr "Format som inte stödjs." -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, php-format msgid "%s / Favorites from %s" msgstr "%s / Favoriter från %s" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, php-format msgid "%s updates favorited by %s / %s." msgstr "%s uppdateringar markerade som favorit av %s / %s." -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "%s tidslinje" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Uppdateringar från %1$s på %2$s!" -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Uppdateringar som nämner %2$s" -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s uppdateringar med svar på uppdatering från %2$s / %3$s." -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s publika tidslinje" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s uppdateringar från alla!" -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "Notiser taggade med %s" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Uppdateringar taggade med %1$s på %2$s!" @@ -535,45 +535,45 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" "Du kan ladda upp din personliga avatar. Den maximala filstorleken är %s." -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 msgid "User without matching profile" msgstr "Användare utan matchande profil" -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 msgid "Avatar settings" msgstr "Avatarinställningar" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "Orginal" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "Förhandsgranska" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 msgid "Delete" msgstr "Ta bort" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "Ladda upp" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "Beskär" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -584,33 +584,73 @@ msgstr "Beskär" msgid "There was a problem with your session token. Try again, please." msgstr "Det var ett problem med din sessions-token. Var vänlig försök igen." -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Oväntat inskick av formulär." -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "Välj ett kvadratiskt område i bilden som din avatar" -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "Förlorade vår fildata." -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "Avatar uppdaterad." -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "Misslyckades uppdatera avatar." -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 msgid "Avatar deleted." msgstr "Avatar borttagen." +#: actions/block.php:69 +msgid "You already blocked that user." +msgstr "Du har redan blockerat denna användare." + +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +msgid "Block user" +msgstr "Blockera användare" + +#: actions/block.php:130 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" +"Är du säker på att du vill blockera denna användare? Efteråt kommer deras " +"prenumeration på dig tas bort, de kommer inte kunna prenumerera på dig i " +"framtiden och du kommer inte bli underrättad om några @-svar från dem." + +#: actions/block.php:143 actions/deletenotice.php:145 +#: actions/deleteuser.php:147 actions/groupblock.php:178 +msgid "No" +msgstr "Nej" + +#: actions/block.php:143 actions/deleteuser.php:147 +msgid "Do not block this user" +msgstr "Blockera inte denna användare" + +#: actions/block.php:144 actions/deletenotice.php:146 +#: actions/deleteuser.php:148 actions/groupblock.php:179 +msgid "Yes" +msgstr "Ja" + +#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 +msgid "Block this user" +msgstr "Blockera denna användare" + +#: actions/block.php:162 +msgid "Failed to save block information." +msgstr "Misslyckades att spara blockeringsinformation." + #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 #: actions/groupmembers.php:76 actions/grouprss.php:91 @@ -652,46 +692,6 @@ msgstr "Häv blockering" msgid "Unblock this user" msgstr "Häv blockering av denna användare" -#: actions/block.php:69 -msgid "You already blocked that user." -msgstr "Du har redan blockerat denna användare." - -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 -msgid "Block user" -msgstr "Blockera användare" - -#: actions/block.php:130 -msgid "" -"Are you sure you want to block this user? Afterwards, they will be " -"unsubscribed from you, unable to subscribe to you in the future, and you " -"will not be notified of any @-replies from them." -msgstr "" -"Är du säker på att du vill blockera denna användare? Efteråt kommer deras " -"prenumeration på dig tas bort, de kommer inte kunna prenumerera på dig i " -"framtiden och du kommer inte bli underrättad om några @-svar från dem." - -#: actions/block.php:143 actions/deletenotice.php:145 -#: actions/deleteuser.php:147 actions/groupblock.php:178 -msgid "No" -msgstr "Nej" - -#: actions/block.php:143 actions/deleteuser.php:147 -msgid "Do not block this user" -msgstr "Blockera inte denna användare" - -#: actions/block.php:144 actions/deletenotice.php:146 -#: actions/deleteuser.php:148 actions/groupblock.php:179 -msgid "Yes" -msgstr "Ja" - -#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 -msgid "Block this user" -msgstr "Blockera denna användare" - -#: actions/block.php:162 -msgid "Failed to save block information." -msgstr "Misslyckades att spara blockeringsinformation." - #: actions/bookmarklet.php:50 msgid "Post to " msgstr "Posta till " @@ -1025,7 +1025,7 @@ msgstr "E-postadress" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" -msgstr "E-postadress, såsom \"användarnamn@exempel.se\"" +msgstr "E-postadress, såsom \"användarnamn@example.org\"" #: actions/emailsettings.php:126 actions/imsettings.php:133 #: actions/smssettings.php:145 @@ -1161,6 +1161,14 @@ msgstr "Inkommande e-postadress borttagen." msgid "New incoming email address added." msgstr "Ny inkommande e-postadress tillagd." +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "Denna notis är redan en favorit!" + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "Ta bort märkning som favorit" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 msgid "Popular notices" @@ -1207,14 +1215,6 @@ msgstr "%ss favoritnotiser" msgid "Updates favored by %1$s on %2$s!" msgstr "Uppdateringar markerade som favorit av %1$s på %2$s!" -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "Denna notis är redan en favorit!" - -#: actions/favor.php:92 lib/disfavorform.php:140 -msgid "Disfavor favorite" -msgstr "Ta bort märkning som favorit" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1445,6 +1445,35 @@ msgstr "Gör denna användare till administratör" msgid "Updates from members of %1$s on %2$s!" msgstr "Uppdateringar från medlemmar i %1$s på %2$s!" +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "Grupper" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "Grupper, sida %d" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" +"%%%%site.name%%%% grupper låter dig hitta och prata med personer med " +"liknande intressen. Efter att ha gått med i en grupp kan du skicka " +"meddelanden till alla andra medlemmar mha. syntaxen \"!gruppnamn\". Ser du " +"inte någon grupp du gillar? Prova att [söka efter en](%%%%action.groupsearch%" +"%%%) eller [starta din egen!](%%%%action.newgroup%%%%)" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +msgid "Create a new group" +msgstr "Skapa en ny grupp" + #: actions/groupsearch.php:52 #, php-format msgid "" @@ -1482,35 +1511,6 @@ msgstr "" "Varför inte [registrera ett konto](%%action.register%%) och [skapa gruppen](%" "%action.newgroup%%) själv!" -#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 -#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 -msgid "Groups" -msgstr "Grupper" - -#: actions/groups.php:64 -#, php-format -msgid "Groups, page %d" -msgstr "Grupper, sida %d" - -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%site.name%%%% groups let you find and talk with people of similar " -"interests. After you join a group you can send messages to all other members " -"using the syntax \"!groupname\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" -msgstr "" -"%%%%site.name%%%% grupper låter dig hitta och prata med personer med " -"liknande intressen. Efter att ha gått med i en grupp kan du skicka " -"meddelanden till alla andra medlemmar mha. syntaxen \"!gruppnamn\". Ser du " -"inte någon grupp du gillar? Prova att [söka efter en](%%%%action.groupsearch%" -"%%%) eller [starta din egen!](%%%%action.newgroup%%%%)" - -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -msgid "Create a new group" -msgstr "Skapa en ny grupp" - #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "Bara en administratör kan häva blockering av gruppmedlemmar." @@ -1705,7 +1705,7 @@ msgstr "Personligt meddelande" msgid "Optionally add a personal message to the invitation." msgstr "Om du vill, skriv ett personligt meddelande till inbjudan." -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "Skicka" @@ -1785,55 +1785,55 @@ msgstr "Kunde inte ta bort användare %s från grupp %s" msgid "%s left group %s" msgstr "%s lämnade grupp %s" -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "Redan inloggad." -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 msgid "Invalid or expired token." msgstr "Ogiltig eller utgången token." -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "Felaktigt användarnamn eller lösenord." -#: actions/login.php:152 +#: actions/login.php:153 msgid "Error setting user. You are probably not authorized." msgstr "Fel vid inställning av användare. Du har sannolikt inte tillstånd." -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Logga in" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "Logga in på webbplatsen" -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Smeknamn" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Lösenord" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "Kom ihåg mig" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "Logga in automatiskt i framtiden; inte för delade datorer!" -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "Tappat bort eller glömt ditt lösenord?" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1841,7 +1841,7 @@ msgstr "" "Av säkerhetsskäl, var vänlig och skriv in ditt användarnamn och lösenord " "igen innan du ändrar dina inställningar." -#: actions/login.php:289 +#: actions/login.php:290 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1914,7 +1914,7 @@ msgstr "Meddelande skickat" msgid "Direct message to %s sent" msgstr "Direktmeddelande till %s skickat" -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" msgstr "AJAX-fel" @@ -1922,7 +1922,7 @@ msgstr "AJAX-fel" msgid "New notice" msgstr "Ny notis" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 msgid "Notice posted" msgstr "Notis postad" @@ -2004,8 +2004,8 @@ msgstr "innehållstyp " msgid "Only " msgstr "Bara " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "Ett dataformat som inte stödjs" @@ -3559,6 +3559,26 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, php-format +msgid "Notices tagged with %s, page %d" +msgstr "Notiser taggade med %s, sida %d" + +#: actions/tag.php:86 +#, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "Flöde av notiser för tagg %s (RSS 1.0)" + +#: actions/tag.php:92 +#, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "Flöde av notiser för tagg %s (RSS 2.0)" + +#: actions/tag.php:98 +#, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "Flöde av notiser för tagg %s (Atom)" + #: actions/tagother.php:33 msgid "Not logged in" msgstr "Inte inloggad" @@ -3608,26 +3628,6 @@ msgstr "" "Använd detta formulär för att lägga till taggar till dina prenumeranter " "eller prenumerationer." -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Notiser taggade med %s, sida %d" - -#: actions/tag.php:86 -#, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "Flöde av notiser för tagg %s (RSS 1.0)" - -#: actions/tag.php:92 -#, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "Flöde av notiser för tagg %s (RSS 2.0)" - -#: actions/tag.php:98 -#, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "Flöde av notiser för tagg %s (Atom)" - #: actions/tagrss.php:35 msgid "No such tag." msgstr "Ingen sådan tagg." @@ -3934,22 +3934,22 @@ msgstr "Kunde inte uppdatera meddelande med ny URI." msgid "DB error inserting hashtag: %s" msgstr "Databasfel vid infogning av hashtag: %s" -#: classes/Notice.php:179 +#: classes/Notice.php:188 msgid "Problem saving notice. Too long." msgstr "Problem vid sparande av notis. För långt." -#: classes/Notice.php:183 +#: classes/Notice.php:192 msgid "Problem saving notice. Unknown user." msgstr "Problem vid sparande av notis. Okänd användare." -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "För många notiser för snabbt; ta en vilopaus och posta igen om ett par " "minuter." -#: classes/Notice.php:194 +#: classes/Notice.php:203 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -3957,19 +3957,24 @@ msgstr "" "För många duplicerade meddelanden för snabbt; ta en vilopaus och posta igen " "om ett par minuter." -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "Du är utestängd från att posta notiser på denna webbplats." -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "Problem med att spara notis." -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "Databasfel vid infogning av svar: %s" +#: classes/User.php:347 +#, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "Välkommen till %1$s, @%2$s!" + #: classes/User_group.php:380 msgid "Could not create group." msgstr "Kunde inte skapa grupp." @@ -3978,11 +3983,6 @@ msgstr "Kunde inte skapa grupp." msgid "Could not set group membership." msgstr "Kunde inte ställa in gruppmedlemskap." -#: classes/User.php:347 -#, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "Välkommen till %1$s, @%2$s!" - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Ändra dina profilinställningar" @@ -4287,7 +4287,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "Notis med den ID:n finns inte" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 msgid "User has no last notice" msgstr "Användare har ingen sista notis" @@ -4334,98 +4334,98 @@ msgstr "Fel vid sändning av direktmeddelande." msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Notis för långt - maximum är %d tecken, du skickade %d" -#: lib/command.php:439 +#: lib/command.php:440 #, php-format msgid "Reply to %s sent" msgstr "Svar på %s skickat" -#: lib/command.php:441 +#: lib/command.php:442 msgid "Error saving notice." msgstr "Fel vid sparande av notis." -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "Ange namnet på användaren att prenumerara på" -#: lib/command.php:502 +#: lib/command.php:503 #, php-format msgid "Subscribed to %s" msgstr "Prenumerar på %s" -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "Ange namnet på användaren att avsluta prenumeration på" -#: lib/command.php:530 +#: lib/command.php:531 #, php-format msgid "Unsubscribed from %s" msgstr "Prenumeration hos %s avslutad" -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "Kommando inte implementerat än." -#: lib/command.php:551 +#: lib/command.php:552 msgid "Notification off." msgstr "Notifikation av." -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "Kan inte sätta på notifikation." -#: lib/command.php:574 +#: lib/command.php:575 msgid "Notification on." msgstr "Notifikation på." -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "Kan inte stänga av notifikation." -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" msgstr "" -#: lib/command.php:602 +#: lib/command.php:604 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Kunde inte skapa alias." -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:623 +#: lib/command.php:625 msgid "You are not subscribed to anyone." msgstr "Du prenumererar inte på någon." -#: lib/command.php:625 +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Du prenumererar på denna person:" msgstr[1] "Du prenumererar på dessa personer:" -#: lib/command.php:645 +#: lib/command.php:647 msgid "No one is subscribed to you." msgstr "Ingen prenumerar på dig." -#: lib/command.php:647 +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Denna person prenumererar på dig:" msgstr[1] "Dessa personer prenumererar på dig:" -#: lib/command.php:667 +#: lib/command.php:669 msgid "You are not a member of any groups." msgstr "Du är inte medlem i några grupper." -#: lib/command.php:669 +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Du är en medlem i denna grupp:" msgstr[1] "Du är en medlem i dessa grupper:" -#: lib/command.php:683 +#: lib/command.php:685 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4523,10 +4523,6 @@ msgstr "Markera denna notis som favorit" msgid "Favor" msgstr "Markera som favorit" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "Exportdata" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "RSS 1.0" @@ -4543,6 +4539,10 @@ msgstr "Atom" msgid "FOAF" msgstr "FOAF" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "Exportdata" + #: lib/galleryaction.php:121 msgid "Filter tags" msgstr "Filtrera taggar" @@ -4701,23 +4701,6 @@ 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/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "Bara användaren kan läsa sina egna brevlådor." - -#: 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 inga privata meddelanden. Du kan skicka privata meddelanden för att " -"engagera andra användare i konversationen. Folk kan skicka meddelanden till " -"dig som bara du ser." - -#: lib/mailbox.php:227 lib/noticelist.php:452 -msgid "from" -msgstr "från" - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "E-postadressbekräftelse" @@ -4904,6 +4887,23 @@ msgid "" "\n" msgstr "" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "Bara användaren kan läsa sina egna brevlådor." + +#: 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 inga privata meddelanden. Du kan skicka privata meddelanden för att " +"engagera andra användare i konversationen. Folk kan skicka meddelanden till " +"dig som bara du ser." + +#: lib/mailbox.php:227 lib/noticelist.php:452 +msgid "from" +msgstr "från" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -4968,7 +4968,7 @@ msgstr "Skicka ett direktinlägg" msgid "To" msgstr "Till" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 msgid "Available characters" msgstr "Tillgängliga tecken" @@ -4981,11 +4981,11 @@ msgstr "Skicka ett inlägg" msgid "What's up, %s?" msgstr "Vad är på gång, %s?" -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "Bifoga" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "Bifoga en fil" @@ -5054,11 +5054,11 @@ msgstr "Fel vid infogning av fjärrprofilen" msgid "Duplicate notice" msgstr "Duplicera notis" -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 msgid "You have been banned from subscribing." msgstr "Du har blivit utestängd från att prenumerera." -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Kunde inte infoga ny prenumeration." @@ -5220,20 +5220,6 @@ msgstr "Personer som prenumererar på %s" msgid "Groups %s is a member of" msgstr "Grupper %s är en medlem i" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(ingen)" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "Redan prenumerant!" @@ -5262,6 +5248,20 @@ msgstr "Kunde inte ta bort själv-prenumeration." msgid "Couldn't delete subscription." msgstr "Kunde inte ta bort prenumeration." +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "(ingen)" + #: lib/tagcloudsection.php:56 msgid "None" msgstr "Ingen" diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index 4e3b165acf..c3b2dd169d 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-07 21:25+0000\n" -"PO-Revision-Date: 2009-12-07 21:27:26+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:10:31+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: te\n" "X-Message-Group: out-statusnet\n" @@ -26,11 +26,11 @@ msgstr "అటువంటి పేజీ లేదు" #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -43,7 +43,7 @@ msgstr "అటువంటి పేజీ లేదు" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." @@ -55,7 +55,7 @@ msgid "%s and friends, page %d" msgstr "%s మరియు మిత్రులు, పేజీ %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s మరియు మిత్రులు" @@ -106,25 +106,25 @@ msgstr "" msgid "You and friends" msgstr "మీరు మరియు మీ స్నేహితులు" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 #, fuzzy msgid "API method not found." msgstr "నిర్ధారణ సంకేతం కనబడలేదు." #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 @@ -144,9 +144,23 @@ msgstr "" msgid "Could not update user." msgstr "వాడుకరిని తాజాకరించలేకున్నాం." +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "వాడుకరికి ప్రొఫైలు లేదు." + +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "ప్రొఫైలుని భద్రపరచలేకున్నాం." + #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -168,20 +182,6 @@ msgstr "" msgid "Could not update your design." msgstr "వాడుకరిని తాజాకరించలేకున్నాం." -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "వాడుకరికి ప్రొఫైలు లేదు." - -#: actions/apiaccountupdateprofile.php:147 -#, fuzzy -msgid "Could not save profile." -msgstr "ప్రొఫైలుని భద్రపరచలేకున్నాం." - #: actions/apiblockcreate.php:105 #, fuzzy msgid "You cannot block yourself!" @@ -195,6 +195,43 @@ msgstr "వాడుకరి నిరోధం విఫలమైంది." msgid "Unblock user failed." msgstr "" +#: actions/apidirectmessage.php:89 +#, php-format +msgid "Direct messages from %s" +msgstr "%s నుండి నేరు సందేశాలు" + +#: actions/apidirectmessage.php:93 +#, php-format +msgid "All the direct messages sent from %s" +msgstr "" + +#: actions/apidirectmessage.php:101 +#, php-format +msgid "Direct messages to %s" +msgstr "%s కి నేరు సందేశాలు" + +#: actions/apidirectmessage.php:105 +#, php-format +msgid "All the direct messages sent to %s" +msgstr "" + +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "" + #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "సందేశపు పాఠ్యం లేదు!" @@ -212,43 +249,6 @@ msgstr "" msgid "Can't send direct messages to users who aren't your friend." msgstr "" -#: actions/apidirectmessage.php:89 -#, php-format -msgid "Direct messages from %s" -msgstr "" - -#: actions/apidirectmessage.php:93 -#, php-format -msgid "All the direct messages sent from %s" -msgstr "" - -#: actions/apidirectmessage.php:101 -#, php-format -msgid "Direct messages to %s" -msgstr "" - -#: actions/apidirectmessage.php:105 -#, php-format -msgid "All the direct messages sent to %s" -msgstr "" - -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "" - #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -386,25 +386,14 @@ msgid "Could not join user %s to group %s." msgstr "ఓపెన్ఐడీ ఫారమును సృష్టించలేకపోయాం: %s" #: actions/apigroupleave.php:114 -#, fuzzy msgid "You are not a member of this group." -msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!" +msgstr "మీరు ఈ గుంపులో సభ్యులు కాదు." #: actions/apigroupleave.php:124 #, fuzzy, php-format msgid "Could not remove user %s to group %s." msgstr "ఓపెన్ఐడీ ఫారమును సృష్టించలేకపోయాం: %s" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, php-format -msgid "%s groups" -msgstr "%s గుంపులు" - -#: actions/apigrouplistall.php:94 -#, php-format -msgid "groups on %s" -msgstr "%s పై గుంపులు" - #: actions/apigrouplist.php:95 #, php-format msgid "%s's groups" @@ -415,6 +404,16 @@ msgstr "%s యొక్క గుంపులు" msgid "Groups %s is a member of on %s." msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!" +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "%s గుంపులు" + +#: actions/apigrouplistall.php:94 +#, php-format +msgid "groups on %s" +msgstr "%s పై గుంపులు" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "" @@ -433,9 +432,9 @@ msgstr "" #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 -#, fuzzy, php-format +#, php-format msgid "That's too long. Max notice size is %d chars." -msgstr "ఇది చాలా పొడవుంది. గరిష్ఠ సందేశ పరిమాణం 140 అక్షరాలు." +msgstr "అది చాలా పొడవుంది. గరిష్ఠ నోటీసు పరిమాణం %d అక్షరాలు." #: actions/apistatusesupdate.php:198 msgid "Not found" @@ -450,54 +449,54 @@ msgstr "" msgid "Unsupported format." msgstr "" -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, php-format msgid "%s / Favorites from %s" msgstr "" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, php-format msgid "%s updates favorited by %s / %s." msgstr "" -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "%s కాలరేఖ" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "" -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s బహిరంగ కాలరేఖ" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "%s యొక్క మైక్రోబ్లాగు" @@ -533,45 +532,45 @@ msgstr "అవతారం" msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 msgid "User without matching profile" msgstr "" -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 msgid "Avatar settings" msgstr "అవతారపు అమరికలు" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "అసలు" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "మునుజూపు" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 msgid "Delete" msgstr "తొలగించు" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "ఎగుమతించు" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "కత్తిరించు" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -582,80 +581,36 @@ msgstr "కత్తిరించు" msgid "There was a problem with your session token. Try again, please." msgstr "" -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "" -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "అవతారాన్ని తాజాకరించాం." -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "అవతారపు తాజాకరణ విఫలమైంది." -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 msgid "Avatar deleted." msgstr "అవతారాన్ని తొలగించాం." -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 -#, fuzzy -msgid "No nickname" -msgstr "పేరు లేదు." - -#: actions/blockedfromgroup.php:80 actions/editgroup.php:96 -#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 -#: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "అటువంటి గుంపు లేదు" - -#: actions/blockedfromgroup.php:90 -#, fuzzy, php-format -msgid "%s blocked profiles" -msgstr "వాడుకరికి ప్రొఫైలు లేదు." - -#: actions/blockedfromgroup.php:93 -#, fuzzy, php-format -msgid "%s blocked profiles, page %d" -msgstr "%s మరియు మిత్రులు" - -#: actions/blockedfromgroup.php:108 -msgid "A list of the users blocked from joining this group." -msgstr "" - -#: actions/blockedfromgroup.php:281 -#, fuzzy -msgid "Unblock user from group" -msgstr "అటువంటి వాడుకరి లేరు." - -#: actions/blockedfromgroup.php:313 lib/unblockform.php:69 -msgid "Unblock" -msgstr "" - -#: actions/blockedfromgroup.php:313 lib/unblockform.php:80 -#, fuzzy -msgid "Unblock this user" -msgstr "అటువంటి వాడుకరి లేరు." - #: actions/block.php:69 -#, fuzzy msgid "You already blocked that user." -msgstr "మీరు ఇప్పటికే ఈ వాడుకరిని నిరోధించారు." +msgstr "మీరు ఇప్పటికే ఆ వాడుకరిని నిరోధించారు." #: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 msgid "Block user" @@ -690,6 +645,49 @@ msgstr "ఈ వాడుకరిని నిరోధించు" msgid "Failed to save block information." msgstr "నిరోధపు సమాచారాన్ని భద్రపరచడంలో విఫలమయ్యాం." +#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 +#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 +#: actions/groupmembers.php:76 actions/grouprss.php:91 +#: actions/joingroup.php:76 actions/showgroup.php:121 +#, fuzzy +msgid "No nickname" +msgstr "పేరు లేదు." + +#: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 +#: actions/grouplogo.php:99 actions/groupmembers.php:83 +#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +msgid "No such group" +msgstr "అటువంటి గుంపు లేదు" + +#: actions/blockedfromgroup.php:90 +#, fuzzy, php-format +msgid "%s blocked profiles" +msgstr "వాడుకరికి ప్రొఫైలు లేదు." + +#: actions/blockedfromgroup.php:93 +#, fuzzy, php-format +msgid "%s blocked profiles, page %d" +msgstr "%s మరియు మిత్రులు" + +#: actions/blockedfromgroup.php:108 +msgid "A list of the users blocked from joining this group." +msgstr "ఈ గుంపు లోనికి చేరకుండా నిరోధించిన వాడుకరుల యొక్క జాబితా." + +#: actions/blockedfromgroup.php:281 +#, fuzzy +msgid "Unblock user from group" +msgstr "అటువంటి వాడుకరి లేరు." + +#: actions/blockedfromgroup.php:313 lib/unblockform.php:69 +msgid "Unblock" +msgstr "" + +#: actions/blockedfromgroup.php:313 lib/unblockform.php:80 +#, fuzzy +msgid "Unblock this user" +msgstr "అటువంటి వాడుకరి లేరు." + #: actions/bookmarklet.php:50 msgid "Post to " msgstr "" @@ -1152,6 +1150,14 @@ msgstr "" msgid "New incoming email address added." msgstr "" +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "ఈ నోటీసు ఇప్పటికే మీ ఇష్టాంశం!" + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 msgid "Popular notices" @@ -1194,14 +1200,6 @@ msgstr "%sకి ఇష్టమైన నోటీసులు" msgid "Updates favored by %1$s on %2$s!" msgstr "%s యొక్క మైక్రోబ్లాగు" -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "ఈ నోటీసు ఇప్పటికే మీ ఇష్టాంశం!" - -#: actions/favor.php:92 lib/disfavorform.php:140 -msgid "Disfavor favorite" -msgstr "" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1248,7 +1246,7 @@ msgstr "" #: actions/finishremotesubscribe.php:99 msgid "That user has blocked you from subscribing." -msgstr "" +msgstr "ఆ వాడుకరి మిమ్మల్ని చందాచేరకుండా నిరోధించారు." #: actions/finishremotesubscribe.php:110 msgid "You are not authorized." @@ -1323,7 +1321,7 @@ msgstr "" #: actions/groupblock.php:178 msgid "Do not block this user from this group" -msgstr "" +msgstr "ఈ వాడుకరిని ఈ గుంపు నుండి నిరోధించకు" #: actions/groupblock.php:179 msgid "Block this user from this group" @@ -1353,9 +1351,8 @@ msgstr "" #: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 #: lib/designsettings.php:391 lib/designsettings.php:413 -#, fuzzy msgid "Couldn't update your design." -msgstr "వాడుకరిని తాజాకరించలేకున్నాం." +msgstr "మీ రూపురేఖలని తాజాకరించలేకపోయాం." #: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 @@ -1376,7 +1373,7 @@ msgstr "గుంపు చిహ్నం" #, php-format msgid "" "You can upload a logo image for your group. The maximum file size is %s." -msgstr "" +msgstr "మీ గుంపుకి మీరు ఒక చిహ్నాన్ని ఎక్కించవచ్చు. ఆ ఫైలు యొక్క గరిష్ఠ పరిమాణం %s." #: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." @@ -1430,6 +1427,30 @@ msgstr "" msgid "Updates from members of %1$s on %2$s!" msgstr "%s యొక్క మైక్రోబ్లాగు" +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "గుంపులు" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "గుంపులు, పేజీ %d" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +msgid "Create a new group" +msgstr "కొత్త గుంపుని సృష్టించు" + #: actions/groupsearch.php:52 #, fuzzy, php-format msgid "" @@ -1462,30 +1483,6 @@ msgid "" "action.newgroup%%) yourself!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 -#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 -msgid "Groups" -msgstr "గుంపులు" - -#: actions/groups.php:64 -#, php-format -msgid "Groups, page %d" -msgstr "గుంపులు, పేజీ %d" - -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%site.name%%%% groups let you find and talk with people of similar " -"interests. After you join a group you can send messages to all other members " -"using the syntax \"!groupname\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" -msgstr "" - -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -msgid "Create a new group" -msgstr "కొత్త గుంపుని సృష్టించు" - #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "" @@ -1664,7 +1661,7 @@ msgstr "వ్యక్తిగత సందేశం" msgid "Optionally add a personal message to the invitation." msgstr "ఐచ్ఛికంగా ఆహ్వానానికి వ్యక్తిగత సందేశం చేర్చండి." -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "పంపించు" @@ -1720,7 +1717,7 @@ msgstr "" #: actions/joingroup.php:135 lib/command.php:239 #, php-format msgid "%s joined group %s" -msgstr "" +msgstr "%s %s గుంపులో చేరారు" #: actions/leavegroup.php:60 msgid "You must be logged in to leave a group." @@ -1744,63 +1741,63 @@ msgstr "ఓపెన్ఐడీ ఫారమును సృష్టించ msgid "%s left group %s" msgstr "%2$s గుంపు నుండి %1$s వైదొలిగారు" -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "ఇప్పటికే లోనికి ప్రవేశించారు." -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 #, fuzzy msgid "Invalid or expired token." msgstr "సందేశపు విషయం సరైనది కాదు" -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "వాడుకరిపేరు లేదా సంకేతపదం తప్పు." -#: actions/login.php:152 +#: actions/login.php:153 msgid "Error setting user. You are probably not authorized." msgstr "" -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "ప్రవేశించండి" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "" -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "పేరు" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "సంకేతపదం" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "నన్ను గుర్తుంచుకో" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "భవిష్యత్తులో ఆటోమెటిగ్గా లోనికి ప్రవేశించు; బయటి కంప్యూర్ల కొరకు కాదు!" -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "మీ సంకేతపదం మర్చిపోయారా?" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "" "భద్రతా కారణాల దృష్ట్యా, అమరికలు మార్చే ముందు మీ వాడుకరి పేరుని మరియు సంకేతపదాన్ని మరోసారి ఇవ్వండి." -#: actions/login.php:289 +#: actions/login.php:290 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1869,7 +1866,7 @@ msgstr "సందేశాన్ని పంపించాం" msgid "Direct message to %s sent" msgstr "" -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" msgstr "" @@ -1877,7 +1874,7 @@ msgstr "" msgid "New notice" msgstr "కొత్త సందేశం" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 #, fuzzy msgid "Notice posted" msgstr "సందేశాలు" @@ -1954,8 +1951,8 @@ msgstr "విషయ రకం " msgid "Only " msgstr "మాత్రమే " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "" @@ -2297,7 +2294,7 @@ msgstr "కాలమండలం" #: actions/profilesettings.php:155 msgid "What timezone are you normally in?" -msgstr "" +msgstr "మీరు సామాన్యంగా ఉండే కాలమండలం ఏది?" #: actions/profilesettings.php:160 msgid "" @@ -2560,9 +2557,8 @@ msgid "Sorry, only invited people can register." msgstr "క్షమించండి, ఆహ్వానితులు మాత్రమే నమోదుకాగలరు." #: actions/register.php:92 -#, fuzzy msgid "Sorry, invalid invitation code." -msgstr "నిర్ధారణ సంకేతంలో పొరపాటు." +msgstr "క్షమించండి, తప్పు ఆహ్వాన సంకేతం." #: actions/register.php:112 msgid "Registration successful" @@ -2579,7 +2575,7 @@ msgstr "" #: actions/register.php:198 msgid "You can't register if you don't agree to the license." -msgstr "" +msgstr "ఈ లైసెన్సుకి అంగీకరించకపోతే మీరు నమోదుచేసుకోలేరు." #: actions/register.php:201 msgid "Not a valid email address." @@ -2601,7 +2597,7 @@ msgstr "" #: actions/register.php:424 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." -msgstr "" +msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామ చిహ్నాలు లేదా ఖాళీలు లేకుండా. తప్పనిసరి." #: actions/register.php:429 msgid "6 or more characters. Required." @@ -2630,14 +2626,13 @@ msgstr "" #: actions/register.php:495 msgid "Creative Commons Attribution 3.0" -msgstr "" +msgstr "క్రియేటివ్ కామన్స్ అట్రిబ్యూషన్ 3.0" #: actions/register.php:496 -#, fuzzy msgid "" " except this private data: password, email address, IM address, and phone " "number." -msgstr "ఈ అంతరంగిక భోగట్టా తప్ప: సంకేతపదం, ఈమెయిల్ చిరునామా, IM చిరునామా, ఫోన్ నంబర్." +msgstr " ఈ అంతరంగిక భోగట్టా తప్ప: సంకేతపదం, ఈమెయిల్ చిరునామా, IM చిరునామా, మరియు ఫోన్ నంబర్." #: actions/register.php:537 #, php-format @@ -2781,9 +2776,9 @@ msgid "User is already sandboxed." msgstr "వాడుకరిని ఇప్పటికే గుంపునుండి నిరోధించారు." #: actions/showfavorites.php:79 -#, fuzzy, php-format +#, php-format msgid "%s's favorite notices, page %d" -msgstr "అటువంటి సందేశమేమీ లేదు." +msgstr "%sకి ఇష్టమైన నోటీసులు, పేజీ %d" #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." @@ -2827,7 +2822,7 @@ msgstr "" #: actions/showfavorites.php:242 msgid "This is a way to share what you like." -msgstr "" +msgstr "మీకు నచ్చినవి పంచుకోడానికి ఇదొక మార్గం." #: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format @@ -2932,7 +2927,7 @@ msgstr "అటువంటి సందేశం లేదు." #: actions/showmessage.php:98 msgid "Only the sender and recipient may read this message." -msgstr "" +msgstr "పంపినవారు మరియు అందుకున్నవారు మాత్రమే ఈ సందేశాన్ని చదవవచ్చు." #: actions/showmessage.php:108 #, php-format @@ -3036,9 +3031,8 @@ msgid "Site name must have non-zero length." msgstr "" #: actions/siteadminpanel.php:155 -#, fuzzy msgid "You must have a valid contact email address" -msgstr "సరైన ఈమెయిలు చిరునామా కాదు" +msgstr "మీకు సరైన సంప్రదింపు ఈమెయిలు చిరునామా ఉండాలి" #: actions/siteadminpanel.php:173 #, php-format @@ -3067,7 +3061,7 @@ msgstr "" #: actions/siteadminpanel.php:210 msgid "Minimum text limit is 140 characters." -msgstr "" +msgstr "కనిష్ఠ పాఠ్య పరిమితి 140 అక్షరాలు." #: actions/siteadminpanel.php:216 msgid "Dupe limit must 1 or more seconds." @@ -3151,18 +3145,16 @@ msgid "Access" msgstr "అంగీకరించు" #: actions/siteadminpanel.php:334 -#, fuzzy msgid "Private" -msgstr "అంతరంగికత" +msgstr "అంతరంగికం" #: actions/siteadminpanel.php:336 msgid "Prohibit anonymous users (not logged in) from viewing site?" msgstr "" #: actions/siteadminpanel.php:340 -#, fuzzy msgid "Invite only" -msgstr "ఆహ్వానించు" +msgstr "ఆహ్వానితులకు మాత్రమే" #: actions/siteadminpanel.php:342 msgid "Make registration invitation only." @@ -3391,7 +3383,7 @@ msgstr "%s చందాదార్లు" #: actions/subscribers.php:52 #, php-format msgid "%s subscribers, page %d" -msgstr "" +msgstr "%s చందాదార్లు, పేజీ %d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3455,14 +3447,33 @@ msgid "%s is not listening to anyone." msgstr "" #: actions/subscriptions.php:194 -#, fuzzy msgid "Jabber" -msgstr "Jabber ID లేదు." +msgstr "జాబర్" #: actions/subscriptions.php:199 lib/connectsettingsaction.php:115 msgid "SMS" msgstr "" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %s, page %d" +msgstr "%s యొక్క మైక్రోబ్లాగు" + +#: actions/tag.php:86 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "%s యొక్క సందేశముల ఫీడు" + +#: actions/tag.php:92 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "%s యొక్క సందేశముల ఫీడు" + +#: actions/tag.php:98 +#, fuzzy, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "%s యొక్క సందేశముల ఫీడు" + #: actions/tagother.php:33 msgid "Not logged in" msgstr "లోనికి ప్రవేశించలేదు" @@ -3508,30 +3519,9 @@ msgstr "ట్యాగులని భద్రపరచలేకపోయా msgid "Use this form to add tags to your subscribers or subscriptions." msgstr "" -#: actions/tag.php:68 -#, fuzzy, php-format -msgid "Notices tagged with %s, page %d" -msgstr "%s యొక్క మైక్రోబ్లాగు" - -#: actions/tag.php:86 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "%s యొక్క సందేశముల ఫీడు" - -#: actions/tag.php:92 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "%s యొక్క సందేశముల ఫీడు" - -#: actions/tag.php:98 -#, fuzzy, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "%s యొక్క సందేశముల ఫీడు" - #: actions/tagrss.php:35 -#, fuzzy msgid "No such tag." -msgstr "అటువంటి సందేశమేమీ లేదు." +msgstr "అటువంటి ట్యాగు లేదు." #: actions/twitapitrends.php:87 msgid "API method under construction." @@ -3577,7 +3567,7 @@ msgstr "వాడుకరి" #: actions/useradminpanel.php:69 msgid "User settings for this StatusNet site." -msgstr "" +msgstr "ఈ స్టేటస్‌నెట్ సైటుకి వాడుకరి అమరికలు." #: actions/useradminpanel.php:149 msgid "Invalid bio limit. Must be numeric." @@ -3689,9 +3679,8 @@ msgid "Reject" msgstr "తిరస్కరించు" #: actions/userauthorization.php:212 -#, fuzzy msgid "Reject this subscription" -msgstr "అన్ని చందాలు" +msgstr "ఈ చందాని తిరస్కరించు" #: actions/userauthorization.php:225 msgid "No authorization request!" @@ -3759,9 +3748,8 @@ msgid "No id." msgstr "ఐడీ లేదు." #: actions/userdesignsettings.php:76 lib/designsettings.php:65 -#, fuzzy msgid "Profile design" -msgstr "ఫ్రొఫైలు అమరికలు" +msgstr "ఫ్రొఫైలు రూపురేఖలు" #: actions/userdesignsettings.php:87 lib/designsettings.php:76 msgid "" @@ -3780,12 +3768,12 @@ msgstr "%s గుంపులు, పేజీ %d" #: actions/usergroups.php:130 msgid "Search for more groups" -msgstr "" +msgstr "మరిన్ని గుంపులకై వెతుకు" #: actions/usergroups.php:153 -#, fuzzy, php-format +#, php-format msgid "%s is not a member of any group." -msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!" +msgstr "%s ఏ గుంపు లోనూ సభ్యులు కాదు." #: actions/usergroups.php:158 #, php-format @@ -3810,9 +3798,8 @@ msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" #: classes/Message.php:45 -#, fuzzy msgid "You are banned from sending direct messages." -msgstr "మీకు వచ్చిన సందేశాలు" +msgstr "నేరుగా సందేశాలు పంపడం నుండి మిమ్మల్ని నిషేధించారు." #: classes/Message.php:61 msgid "Could not insert message." @@ -3827,40 +3814,45 @@ msgstr "" msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:179 +#: classes/Notice.php:188 #, fuzzy msgid "Problem saving notice. Too long." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." -#: classes/Notice.php:183 +#: classes/Notice.php:192 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:194 +#: classes/Notice.php:203 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "" +#: classes/User.php:347 +#, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "@%2$s, %1$sకి స్వాగతం!" + #: classes/User_group.php:380 msgid "Could not create group." msgstr "గుంపుని సృష్టించలేకపోయాం." @@ -3870,11 +3862,6 @@ msgstr "గుంపుని సృష్టించలేకపోయాం." msgid "Could not set group membership." msgstr "చందాని సృష్టించలేకపోయాం." -#: classes/User.php:347 -#, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "@%2$s, %1$sకి స్వాగతం!" - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "" @@ -3976,9 +3963,8 @@ msgid "Help" msgstr "సహాయం" #: lib/action.php:461 -#, fuzzy msgid "Help me!" -msgstr "సహాయం" +msgstr "సహాయం కావాలి!" #: lib/action.php:464 lib/searchaction.php:127 msgid "Search" @@ -4189,7 +4175,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 msgid "User has no last notice" msgstr "" @@ -4236,102 +4222,99 @@ msgstr "" msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "నోటిసు చాలా పొడవుగా ఉంది - %d అక్షరాలు గరిష్ఠం, మీరు %d పంపించారు" -#: lib/command.php:439 +#: lib/command.php:440 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "%sకి స్పందనలు" -#: lib/command.php:441 +#: lib/command.php:442 #, fuzzy msgid "Error saving notice." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:502 +#: lib/command.php:503 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:530 +#: lib/command.php:531 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:551 +#: lib/command.php:552 msgid "Notification off." msgstr "" -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:574 +#: lib/command.php:575 msgid "Notification on." msgstr "" -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" msgstr "" -#: lib/command.php:602 +#: lib/command.php:604 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "మారుపేర్లని సృష్టించలేకపోయాం." -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:623 -#, fuzzy -msgid "You are not subscribed to anyone." -msgstr "%sకి స్పందనలు" - #: lib/command.php:625 +msgid "You are not subscribed to anyone." +msgstr "మీరు ఎవరికీ చందాచేరలేదు." + +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "%sకి స్పందనలు" msgstr[1] "%sకి స్పందనలు" -#: lib/command.php:645 -#, fuzzy -msgid "No one is subscribed to you." -msgstr "%sకి స్పందనలు" - #: lib/command.php:647 +msgid "No one is subscribed to you." +msgstr "మీకు చందాదార్లు ఎవరూ లేరు." + +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "%sకి స్పందనలు" msgstr[1] "%sకి స్పందనలు" -#: lib/command.php:667 -#, fuzzy -msgid "You are not a member of any groups." -msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!" - #: lib/command.php:669 +msgid "You are not a member of any groups." +msgstr "మీరు ఏ గుంపులోనూ సభ్యులు కాదు." + +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!" msgstr[1] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!" -#: lib/command.php:683 +#: lib/command.php:685 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4404,9 +4387,8 @@ msgid "Database error" msgstr "" #: lib/designsettings.php:105 -#, fuzzy msgid "Upload file" -msgstr "ఎగుమతించు" +msgstr "ఫైలుని ఎక్కించు" #: lib/designsettings.php:109 #, fuzzy @@ -4431,10 +4413,6 @@ msgstr "అటువంటి సందేశమేమీ లేదు." msgid "Favor" msgstr "" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "" @@ -4451,6 +4429,10 @@ msgstr "" msgid "FOAF" msgstr "" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "" + #: lib/galleryaction.php:121 msgid "Filter tags" msgstr "" @@ -4522,7 +4504,7 @@ msgstr "%s నిరోధిత వాడుకరులు" #: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" -msgstr "" +msgstr "%s గుంపు లక్షణాలను మార్చు" #: lib/groupnav.php:113 msgid "Logo" @@ -4615,20 +4597,6 @@ msgstr "వాడుకరిపేరు మరియు సంకేతపద msgid "Sign up for a new account" msgstr "కొత్త ఖాతా సృష్టించుకోండి" -#: lib/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "" - -#: 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 "" - -#: lib/mailbox.php:227 lib/noticelist.php:452 -msgid "from" -msgstr "నుండి" - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "ఈమెయిల్ చిరునామా నిర్ధారణ" @@ -4686,6 +4654,8 @@ msgid "" "Bio: %s\n" "\n" msgstr "" +"స్వపరిచయం: %s\n" +"\n" #: lib/mail.php:286 #, php-format @@ -4805,6 +4775,20 @@ msgid "" "\n" msgstr "" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "" + +#: 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 "" + +#: lib/mailbox.php:227 lib/noticelist.php:452 +msgid "from" +msgstr "నుండి" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -4866,7 +4850,7 @@ msgstr "" msgid "To" msgstr "" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 msgid "Available characters" msgstr "అందుబాటులో ఉన్న అక్షరాలు" @@ -4880,11 +4864,11 @@ msgstr "కొత్త సందేశం" msgid "What's up, %s?" msgstr "%s, సంగతులేమిటి?" -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "జోడించు" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "ఒక ఫైలుని జోడించు" @@ -4894,21 +4878,20 @@ msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" #: lib/noticelist.php:404 -#, fuzzy msgid "N" -msgstr "కాదు" +msgstr "ఉ" #: lib/noticelist.php:404 msgid "S" -msgstr "" +msgstr "ద" #: lib/noticelist.php:405 msgid "E" -msgstr "" +msgstr "తూ" #: lib/noticelist.php:405 msgid "W" -msgstr "" +msgstr "ప" #: lib/noticelist.php:411 msgid "at" @@ -4956,11 +4939,11 @@ msgstr "దూరపు ప్రొపైలుని చేర్చటంల msgid "Duplicate notice" msgstr "కొత్త సందేశం" -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 msgid "You have been banned from subscribing." -msgstr "" +msgstr "చందాచేరడం నుండి మిమ్మల్ని నిషేధించారు." -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "" @@ -4978,7 +4961,7 @@ msgstr "ఇష్టాంశాలు" #: lib/personalgroupnav.php:124 msgid "Inbox" -msgstr "" +msgstr "వచ్చినవి" #: lib/personalgroupnav.php:125 msgid "Your incoming messages" @@ -4986,7 +4969,7 @@ msgstr "మీకు వచ్చిన సందేశాలు" #: lib/personalgroupnav.php:129 msgid "Outbox" -msgstr "" +msgstr "పంపినవి" #: lib/personalgroupnav.php:130 msgid "Your sent messages" @@ -5126,20 +5109,6 @@ msgstr "%sకి స్పందనలు" msgid "Groups %s is a member of" msgstr "%s సభ్యులుగా ఉన్న గుంపులు" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(ఏమీలేవు)" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "" @@ -5170,6 +5139,20 @@ msgstr "చందాని తొలగించలేకపోయాం." msgid "Couldn't delete subscription." msgstr "చందాని తొలగించలేకపోయాం." +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "(ఏమీలేవు)" + #: lib/tagcloudsection.php:56 msgid "None" msgstr "ఏమీలేదు" @@ -5285,7 +5268,7 @@ msgstr "%s అనేది సరైన రంగు కాదు!" #: lib/webcolor.php:123 #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." -msgstr "" +msgstr "%s అనేది సరైన రంగు కాదు! 3 లేదా 6 హెక్స్ అక్షరాలను వాడండి." #: scripts/maildaemon.php:48 msgid "Could not parse message." @@ -5297,7 +5280,7 @@ msgstr "నమోదైన వాడుకరి కాదు." #: scripts/maildaemon.php:57 msgid "Sorry, that is not your incoming email address." -msgstr "" +msgstr "క్షమించండి, అది మీ లోనికివచ్చు ఈమెయిలు చిరునామా కాదు." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index 3d9661e7db..713c2731f8 100644 --- a/locale/tr/LC_MESSAGES/statusnet.po +++ b/locale/tr/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-07 21:25+0000\n" -"PO-Revision-Date: 2009-12-07 21:27:29+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:10:33+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: tr\n" "X-Message-Group: out-statusnet\n" @@ -26,11 +26,11 @@ msgstr "Böyle bir durum mesajı yok." #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -43,7 +43,7 @@ msgstr "Böyle bir durum mesajı yok." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." @@ -55,7 +55,7 @@ msgid "%s and friends, page %d" msgstr "%s ve arkadaşları" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s ve arkadaşları" @@ -107,25 +107,25 @@ msgstr "" msgid "You and friends" msgstr "%s ve arkadaşları" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 #, fuzzy msgid "API method not found." msgstr "Onay kodu bulunamadı." #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 @@ -145,9 +145,23 @@ msgstr "" msgid "Could not update user." msgstr "Kullanıcı güncellenemedi." +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "Kullanıcının profili yok." + +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Profil kaydedilemedi." + #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -169,20 +183,6 @@ msgstr "" msgid "Could not update your design." msgstr "Kullanıcı güncellenemedi." -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "Kullanıcının profili yok." - -#: actions/apiaccountupdateprofile.php:147 -#, fuzzy -msgid "Could not save profile." -msgstr "Profil kaydedilemedi." - #: actions/apiblockcreate.php:105 #, fuzzy msgid "You cannot block yourself!" @@ -196,24 +196,6 @@ msgstr "" msgid "Unblock user failed." msgstr "" -#: actions/apidirectmessagenew.php:126 -msgid "No message text!" -msgstr "" - -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, fuzzy, php-format -msgid "That's too long. Max message size is %d chars." -msgstr "" -"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?" - -#: actions/apidirectmessagenew.php:146 -msgid "Recipient user not found." -msgstr "" - -#: actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." -msgstr "" - #: actions/apidirectmessage.php:89 #, php-format msgid "Direct messages from %s" @@ -239,18 +221,36 @@ msgstr "" #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "" +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, fuzzy, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "" +"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?" + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "" + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -401,16 +401,6 @@ msgstr "Bize o profili yollamadınız" msgid "Could not remove user %s to group %s." msgstr "OpenID formu yaratılamadı: %s" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, php-format -msgid "%s groups" -msgstr "" - -#: actions/apigrouplistall.php:94 -#, php-format -msgid "groups on %s" -msgstr "" - #: actions/apigrouplist.php:95 #, fuzzy, php-format msgid "%s's groups" @@ -421,6 +411,16 @@ msgstr "Profil" msgid "Groups %s is a member of on %s." msgstr "Bize o profili yollamadınız" +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "" + +#: actions/apigrouplistall.php:94 +#, php-format +msgid "groups on %s" +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "" @@ -459,54 +459,54 @@ msgstr "" msgid "Unsupported format." msgstr "Desteklenmeyen görüntü dosyası biçemi." -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, php-format msgid "%s / Favorites from %s" msgstr "" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, php-format msgid "%s updates favorited by %s / %s." msgstr "" -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, fuzzy, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s'in %2$s'deki durum mesajları " -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "%s adli kullanicinin durum mesajlari" @@ -543,46 +543,46 @@ msgstr "Avatar" msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 msgid "User without matching profile" msgstr "" -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 #, fuzzy msgid "Avatar settings" msgstr "Ayarlar" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 msgid "Delete" msgstr "" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "Yükle" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -593,34 +593,75 @@ msgstr "" msgid "There was a problem with your session token. Try again, please." msgstr "" -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Beklenmeğen form girdisi." -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "Avatar güncellendi." -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "Avatar güncellemede hata." -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 #, fuzzy msgid "Avatar deleted." msgstr "Avatar güncellendi." +#: actions/block.php:69 +#, fuzzy +msgid "You already blocked that user." +msgstr "Zaten giriş yapmış durumdasıznız!" + +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#, fuzzy +msgid "Block user" +msgstr "Böyle bir kullanıcı yok." + +#: actions/block.php:130 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" + +#: actions/block.php:143 actions/deletenotice.php:145 +#: actions/deleteuser.php:147 actions/groupblock.php:178 +msgid "No" +msgstr "" + +#: actions/block.php:143 actions/deleteuser.php:147 +#, fuzzy +msgid "Do not block this user" +msgstr "Böyle bir kullanıcı yok." + +#: actions/block.php:144 actions/deletenotice.php:146 +#: actions/deleteuser.php:148 actions/groupblock.php:179 +msgid "Yes" +msgstr "" + +#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 +#, fuzzy +msgid "Block this user" +msgstr "Böyle bir kullanıcı yok." + +#: actions/block.php:162 +msgid "Failed to save block information." +msgstr "" + #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 #: actions/groupmembers.php:76 actions/grouprss.php:91 @@ -665,47 +706,6 @@ msgstr "" msgid "Unblock this user" msgstr "Böyle bir kullanıcı yok." -#: actions/block.php:69 -#, fuzzy -msgid "You already blocked that user." -msgstr "Zaten giriş yapmış durumdasıznız!" - -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 -#, fuzzy -msgid "Block user" -msgstr "Böyle bir kullanıcı yok." - -#: actions/block.php:130 -msgid "" -"Are you sure you want to block this user? Afterwards, they will be " -"unsubscribed from you, unable to subscribe to you in the future, and you " -"will not be notified of any @-replies from them." -msgstr "" - -#: actions/block.php:143 actions/deletenotice.php:145 -#: actions/deleteuser.php:147 actions/groupblock.php:178 -msgid "No" -msgstr "" - -#: actions/block.php:143 actions/deleteuser.php:147 -#, fuzzy -msgid "Do not block this user" -msgstr "Böyle bir kullanıcı yok." - -#: actions/block.php:144 actions/deletenotice.php:146 -#: actions/deleteuser.php:148 actions/groupblock.php:179 -msgid "Yes" -msgstr "" - -#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 -#, fuzzy -msgid "Block this user" -msgstr "Böyle bir kullanıcı yok." - -#: actions/block.php:162 -msgid "Failed to save block information." -msgstr "" - #: actions/bookmarklet.php:50 msgid "Post to " msgstr "" @@ -1181,6 +1181,14 @@ msgstr "" msgid "New incoming email address added." msgstr "" +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "" + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 #, fuzzy @@ -1224,14 +1232,6 @@ msgstr "" msgid "Updates favored by %1$s on %2$s!" msgstr "%s adli kullanicinin durum mesajlari" -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "" - -#: actions/favor.php:92 lib/disfavorform.php:140 -msgid "Disfavor favorite" -msgstr "" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1472,6 +1472,31 @@ msgstr "" msgid "Updates from members of %1$s on %2$s!" msgstr "%s adli kullanicinin durum mesajlari" +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#, fuzzy +msgid "Create a new group" +msgstr "Yeni hesap oluştur" + #: actions/groupsearch.php:52 #, fuzzy, php-format msgid "" @@ -1507,31 +1532,6 @@ msgid "" "action.newgroup%%) yourself!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 -#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 -msgid "Groups" -msgstr "" - -#: actions/groups.php:64 -#, php-format -msgid "Groups, page %d" -msgstr "" - -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%site.name%%%% groups let you find and talk with people of similar " -"interests. After you join a group you can send messages to all other members " -"using the syntax \"!groupname\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" -msgstr "" - -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -#, fuzzy -msgid "Create a new group" -msgstr "Yeni hesap oluştur" - #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "" @@ -1721,7 +1721,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "Gönder" @@ -1803,58 +1803,58 @@ msgstr "OpenID formu yaratılamadı: %s" msgid "%s left group %s" msgstr "" -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "Zaten giriş yapılmış." -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 #, fuzzy msgid "Invalid or expired token." msgstr "Geçersiz durum mesajı" -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "Yanlış kullanıcı adı veya parola." -#: actions/login.php:152 +#: actions/login.php:153 #, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "Yetkilendirilmemiş." -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Giriş" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "" -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Takma ad" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Parola" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "Beni hatırla" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Gelecekte kendiliğinden giriş yap, paylaşılan bilgisayarlar için değildir!" -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "Parolamı unuttum veya kaybettim" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1862,7 +1862,7 @@ msgstr "" "Güvenliğiniz için, ayarlarınızı değiştirmeden önce lütfen kullanıcı adınızı " "ve parolanızı tekrar giriniz." -#: actions/login.php:289 +#: actions/login.php:290 #, fuzzy, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1934,7 +1934,7 @@ msgstr "" msgid "Direct message to %s sent" msgstr "" -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" msgstr "" @@ -1942,7 +1942,7 @@ msgstr "" msgid "New notice" msgstr "Yeni durum mesajı" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 #, fuzzy msgid "Notice posted" msgstr "Durum mesajları" @@ -2020,8 +2020,8 @@ msgstr "Bağlan" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "" @@ -3553,6 +3553,26 @@ msgstr "JabberID yok." msgid "SMS" msgstr "" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %s, page %d" +msgstr "%s adli kullanicinin durum mesajlari" + +#: actions/tag.php:86 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "%s için durum RSS beslemesi" + +#: actions/tag.php:92 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "%s için durum RSS beslemesi" + +#: actions/tag.php:98 +#, fuzzy, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "%s için durum RSS beslemesi" + #: actions/tagother.php:33 #, fuzzy msgid "Not logged in" @@ -3601,26 +3621,6 @@ msgstr "Avatar bilgisi kaydedilemedi" msgid "Use this form to add tags to your subscribers or subscriptions." msgstr "" -#: actions/tag.php:68 -#, fuzzy, php-format -msgid "Notices tagged with %s, page %d" -msgstr "%s adli kullanicinin durum mesajlari" - -#: actions/tag.php:86 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "%s için durum RSS beslemesi" - -#: actions/tag.php:92 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "%s için durum RSS beslemesi" - -#: actions/tag.php:98 -#, fuzzy, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "%s için durum RSS beslemesi" - #: actions/tagrss.php:35 #, fuzzy msgid "No such tag." @@ -3925,40 +3925,45 @@ msgstr "" msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:179 +#: classes/Notice.php:188 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Durum mesajını kaydederken hata oluştu." -#: classes/Notice.php:183 +#: classes/Notice.php:192 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Durum mesajını kaydederken hata oluştu." -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:194 +#: classes/Notice.php:203 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "Durum mesajını kaydederken hata oluştu." -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "Cevap eklenirken veritabanı hatası: %s" +#: classes/User.php:347 +#, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "" + #: classes/User_group.php:380 #, fuzzy msgid "Could not create group." @@ -3969,11 +3974,6 @@ msgstr "Avatar bilgisi kaydedilemedi" msgid "Could not set group membership." msgstr "Abonelik oluşturulamadı." -#: classes/User.php:347 -#, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "" - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "" @@ -4292,7 +4292,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 msgid "User has no last notice" msgstr "" @@ -4339,99 +4339,99 @@ msgstr "" msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:439 +#: lib/command.php:440 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "%s için cevaplar" -#: lib/command.php:441 +#: lib/command.php:442 #, fuzzy msgid "Error saving notice." msgstr "Durum mesajını kaydederken hata oluştu." -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:502 +#: lib/command.php:503 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:530 +#: lib/command.php:531 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:551 +#: lib/command.php:552 msgid "Notification off." msgstr "" -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:574 +#: lib/command.php:575 msgid "Notification on." msgstr "" -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" msgstr "" -#: lib/command.php:602 +#: lib/command.php:604 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Avatar bilgisi kaydedilemedi" -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:623 +#: lib/command.php:625 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Bize o profili yollamadınız" -#: lib/command.php:625 +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Bize o profili yollamadınız" -#: lib/command.php:645 +#: lib/command.php:647 #, fuzzy msgid "No one is subscribed to you." msgstr "Uzaktan abonelik" -#: lib/command.php:647 +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Uzaktan abonelik" -#: lib/command.php:667 +#: lib/command.php:669 #, fuzzy msgid "You are not a member of any groups." msgstr "Bize o profili yollamadınız" -#: lib/command.php:669 +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Bize o profili yollamadınız" -#: lib/command.php:683 +#: lib/command.php:685 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4532,10 +4532,6 @@ msgstr "Böyle bir durum mesajı yok." msgid "Favor" msgstr "" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "" @@ -4552,6 +4548,10 @@ msgstr "" msgid "FOAF" msgstr "" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "" + #: lib/galleryaction.php:121 msgid "Filter tags" msgstr "" @@ -4723,20 +4723,6 @@ msgstr "Geçersiz kullanıcı adı veya parola." msgid "Sign up for a new account" msgstr "Yeni hesap oluştur" -#: lib/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "" - -#: 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 "" - -#: lib/mailbox.php:227 lib/noticelist.php:452 -msgid "from" -msgstr "" - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "Eposta adresi onayı" @@ -4919,6 +4905,20 @@ msgid "" "\n" msgstr "" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "" + +#: 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 "" + +#: lib/mailbox.php:227 lib/noticelist.php:452 +msgid "from" +msgstr "" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -4980,7 +4980,7 @@ msgstr "" msgid "To" msgstr "" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 #, fuzzy msgid "Available characters" msgstr "6 veya daha fazla karakter" @@ -4995,11 +4995,11 @@ msgstr "Yeni durum mesajı" msgid "What's up, %s?" msgstr "N'aber %s?" -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "" @@ -5071,11 +5071,11 @@ msgstr "Uzak profil eklemede hata oluştu" msgid "Duplicate notice" msgstr "Yeni durum mesajı" -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 msgid "You have been banned from subscribing." msgstr "" -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Yeni abonelik eklenemedi." @@ -5243,20 +5243,6 @@ msgstr "Uzaktan abonelik" msgid "Groups %s is a member of" msgstr "" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "" @@ -5288,6 +5274,20 @@ msgstr "Abonelik silinemedi." msgid "Couldn't delete subscription." msgstr "Abonelik silinemedi." +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "" + #: lib/tagcloudsection.php:56 msgid "None" msgstr "" diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index 0d8674bfd5..767c63ca50 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-07 21:25+0000\n" -"PO-Revision-Date: 2009-12-07 21:27:33+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:10:36+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: out-statusnet\n" @@ -28,11 +28,11 @@ msgstr "Немає такої сторінки" #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -45,7 +45,7 @@ msgstr "Немає такої сторінки" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." @@ -57,7 +57,7 @@ msgid "%s and friends, page %d" msgstr "%s з друзями, сторінка %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s з друзями" @@ -114,24 +114,24 @@ msgstr "" msgid "You and friends" msgstr "Ви з друзями" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Оновлення від %1$s та друзів на %2$s!" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 msgid "API method not found." msgstr "API метод не знайдено." #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 @@ -151,9 +151,22 @@ msgstr "" msgid "Could not update user." msgstr "Не вдалося оновити користувача." +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "Користувач не має профілю." + +#: actions/apiaccountupdateprofile.php:147 +msgid "Could not save profile." +msgstr "Не вдалося зберегти профіль." + #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -176,19 +189,6 @@ msgstr "Не маю можливості зберегти налаштуванн msgid "Could not update your design." msgstr "Не вдалося оновити Ваш дизайн." -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "Користувач не має профілю." - -#: actions/apiaccountupdateprofile.php:147 -msgid "Could not save profile." -msgstr "Не вдалося зберегти профіль." - #: actions/apiblockcreate.php:105 msgid "You cannot block yourself!" msgstr "Ви не можете блокувати самого себе!" @@ -201,24 +201,6 @@ msgstr "Спроба заблокувати користувача невдал msgid "Unblock user failed." msgstr "Спроба розблокувати користувача невдала." -#: actions/apidirectmessagenew.php:126 -msgid "No message text!" -msgstr "Повідомлення без тексту!" - -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, php-format -msgid "That's too long. Max message size is %d chars." -msgstr "Надто довго. Максимальний розмір %d знаків." - -#: actions/apidirectmessagenew.php:146 -msgid "Recipient user not found." -msgstr "Отримувача не знайдено." - -#: actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." -msgstr "" -"Не можна надіслати пряме повідомлення користувачеві, який не є Вашим другом." - #: actions/apidirectmessage.php:89 #, php-format msgid "Direct messages from %s" @@ -244,18 +226,36 @@ msgstr "Всі прямі повідомлення надіслані до %s" #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "API метод не знайдено!" +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "Повідомлення без тексту!" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "Надто довго. Максимальний розмір %d знаків." + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "Отримувача не знайдено." + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "" +"Не можна надіслати пряме повідомлення користувачеві, який не є Вашим другом." + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -400,16 +400,6 @@ msgstr "Ви не є учасником цієї групи." msgid "Could not remove user %s to group %s." msgstr "Не вдалося видалити користувача %s з групи %s." -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, php-format -msgid "%s groups" -msgstr "%s групи" - -#: actions/apigrouplistall.php:94 -#, php-format -msgid "groups on %s" -msgstr "групи на %s" - #: actions/apigrouplist.php:95 #, php-format msgid "%s's groups" @@ -420,6 +410,16 @@ msgstr "%s групи" msgid "Groups %s is a member of on %s." msgstr "Групи, в яких %s бере участь на %s." +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "%s групи" + +#: actions/apigrouplistall.php:94 +#, php-format +msgid "groups on %s" +msgstr "групи на %s" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Цей метод потребує або НАПИСАТИ, або ВИДАЛИТИ." @@ -457,54 +457,54 @@ msgstr "" msgid "Unsupported format." msgstr "Формат не підтримується." -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, php-format msgid "%s / Favorites from %s" msgstr "%s / Обрані від %s" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, php-format msgid "%s updates favorited by %s / %s." msgstr "%s оновлення обраних від %s / %s." -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "%s стрічка" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "Оновлення від %1$s на %2$s!" -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Оновленні відповіді %2$s" -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s оновив цю відповідь на допис від %2$s / %3$s." -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s загальна стрічка" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s оновлення від усіх!" -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "Дописи позначені з %s" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Оновлення позначені з %1$s на %2$s!" @@ -539,45 +539,45 @@ msgstr "Аватара" msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "Ви можете завантажити аватару. Максимальний розмір %s." -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 msgid "User without matching profile" msgstr "Користувач з невідповідним профілем" -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 msgid "Avatar settings" msgstr "Налаштування аватари" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "Оригінал" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "Перегляд" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 msgid "Delete" msgstr "Видалити" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "Завантажити" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "Втяти" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -589,73 +589,33 @@ msgid "There was a problem with your session token. Try again, please." msgstr "" "Виникли певні проблеми з токеном поточної сесії. Спробуйте знов, будь ласка." -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Несподіване представлення форми." -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "Оберіть квадратну ділянку зображення, яка й буде Вашою автарою." -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "Дані Вашого файлу десь загубились." -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "Аватару оновлено." -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "Оновлення аватари невдале." -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 msgid "Avatar deleted." msgstr "Аватару видалено." -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 -msgid "No nickname" -msgstr "Немає імені" - -#: actions/blockedfromgroup.php:80 actions/editgroup.php:96 -#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 -#: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "Такої групи немає" - -#: actions/blockedfromgroup.php:90 -#, php-format -msgid "%s blocked profiles" -msgstr "Заблоковані профілі %s" - -#: actions/blockedfromgroup.php:93 -#, php-format -msgid "%s blocked profiles, page %d" -msgstr "Заблоковані профілі %s, сторінка %d" - -#: actions/blockedfromgroup.php:108 -msgid "A list of the users blocked from joining this group." -msgstr "Список користувачів блокованих в цій групі." - -#: actions/blockedfromgroup.php:281 -msgid "Unblock user from group" -msgstr "Розблокувати користувача" - -#: actions/blockedfromgroup.php:313 lib/unblockform.php:69 -msgid "Unblock" -msgstr "Розблокувати" - -#: actions/blockedfromgroup.php:313 lib/unblockform.php:80 -msgid "Unblock this user" -msgstr "Розблокувати цього користувача" - #: actions/block.php:69 msgid "You already blocked that user." msgstr "Цього користувача вже заблоковано." @@ -696,6 +656,46 @@ msgstr "Блокувати користувача" msgid "Failed to save block information." msgstr "Збереження інформації про блокування завершилось невдачею." +#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 +#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 +#: actions/groupmembers.php:76 actions/grouprss.php:91 +#: actions/joingroup.php:76 actions/showgroup.php:121 +msgid "No nickname" +msgstr "Немає імені" + +#: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 +#: actions/grouplogo.php:99 actions/groupmembers.php:83 +#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +msgid "No such group" +msgstr "Такої групи немає" + +#: actions/blockedfromgroup.php:90 +#, php-format +msgid "%s blocked profiles" +msgstr "Заблоковані профілі %s" + +#: actions/blockedfromgroup.php:93 +#, php-format +msgid "%s blocked profiles, page %d" +msgstr "Заблоковані профілі %s, сторінка %d" + +#: actions/blockedfromgroup.php:108 +msgid "A list of the users blocked from joining this group." +msgstr "Список користувачів блокованих в цій групі." + +#: actions/blockedfromgroup.php:281 +msgid "Unblock user from group" +msgstr "Розблокувати користувача" + +#: actions/blockedfromgroup.php:313 lib/unblockform.php:69 +msgid "Unblock" +msgstr "Розблокувати" + +#: actions/blockedfromgroup.php:313 lib/unblockform.php:80 +msgid "Unblock this user" +msgstr "Розблокувати цього користувача" + #: actions/bookmarklet.php:50 msgid "Post to " msgstr "Написати " @@ -1163,6 +1163,14 @@ msgstr "Адресу вхідної пошти видалено." msgid "New incoming email address added." msgstr "Нову адресу для вхідних повідомлень додано." +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "Цей допис вже є обраним!" + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "Видалити з обраних" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 msgid "Popular notices" @@ -1209,14 +1217,6 @@ msgstr "Обрані дописи %s" msgid "Updates favored by %1$s on %2$s!" msgstr "Оновлення обраних дописів %1$s на %2$s!" -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "Цей допис вже є обраним!" - -#: actions/favor.php:92 lib/disfavorform.php:140 -msgid "Disfavor favorite" -msgstr "Видалити з обраних" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1448,6 +1448,35 @@ msgstr "Надати цьому користувачеві права адмін msgid "Updates from members of %1$s on %2$s!" msgstr "Оновлення членів %1$s на %2$s!" +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "Групи" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "Групи, сторінка %d" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" +"Групи на сайті %%%%site.name%%%% дозволять Вам відшукати людей зі спільними " +"інтересами. Лише приєднайтеся до групи і надсилайте повідомлення до усіх її " +"учасників використовуючи просту команду \"!groupname\" у тексті " +"повідомлення. Не бачите групу, яка Вас цікавить? Спробуйте її [знайти](%%%%" +"action.groupsearch%%%%) або [створіть власну!](%%%%action.newgroup%%%%)" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +msgid "Create a new group" +msgstr "Створити нову групу" + #: actions/groupsearch.php:52 #, php-format msgid "" @@ -1485,35 +1514,6 @@ msgstr "" "Чому б не [зареєструватись](%%action.register%%) і не [створити](%%action." "newgroup%%) свою власну групу!" -#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 -#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 -msgid "Groups" -msgstr "Групи" - -#: actions/groups.php:64 -#, php-format -msgid "Groups, page %d" -msgstr "Групи, сторінка %d" - -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%site.name%%%% groups let you find and talk with people of similar " -"interests. After you join a group you can send messages to all other members " -"using the syntax \"!groupname\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" -msgstr "" -"Групи на сайті %%%%site.name%%%% дозволять Вам відшукати людей зі спільними " -"інтересами. Лише приєднайтеся до групи і надсилайте повідомлення до усіх її " -"учасників використовуючи просту команду \"!groupname\" у тексті " -"повідомлення. Не бачите групу, яка Вас цікавить? Спробуйте її [знайти](%%%%" -"action.groupsearch%%%%) або [створіть власну!](%%%%action.newgroup%%%%)" - -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -msgid "Create a new group" -msgstr "Створити нову групу" - #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "Лише адміни можуть розблокувати членів групи." @@ -1709,7 +1709,7 @@ msgstr "Особисті повідомлення" msgid "Optionally add a personal message to the invitation." msgstr "Можна додати персональне повідомлення до запрошення (опціонально)." -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "Так!" @@ -1816,57 +1816,57 @@ msgstr "Не вдалося видалити користувача %s з гру msgid "%s left group %s" msgstr "%s залишив групу %s" -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "Тепер Ви увійшли." -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 msgid "Invalid or expired token." msgstr "Недійсний або неправильний токен." -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "Неточне ім’я або пароль." -#: actions/login.php:152 +#: actions/login.php:153 msgid "Error setting user. You are probably not authorized." msgstr "Помилка. Можливо, Ви не авторизовані." -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Увійти" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "Вхід на сайт" -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Ім’я користувача" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Пароль" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "Пам’ятати мене" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Автоматично входити у майбутньому; не для комп’ютерів загального " "користування!" -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "Загубили або забули пароль?" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1874,7 +1874,7 @@ msgstr "" "З міркувань безпеки, будь ласка, введіть ще раз ім’я та пароль, перед тим як " "змінювати налаштування." -#: actions/login.php:289 +#: actions/login.php:290 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1947,7 +1947,7 @@ msgstr "Повідомлення надіслано" msgid "Direct message to %s sent" msgstr "Пряме повідомлення до %s надіслано" -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" msgstr "Помилка в Ajax" @@ -1955,7 +1955,7 @@ msgstr "Помилка в Ajax" msgid "New notice" msgstr "Новий допис" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 msgid "Notice posted" msgstr "Допис надіслано" @@ -2037,8 +2037,8 @@ msgstr "тип змісту " msgid "Only " msgstr "Лише " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "Такий формат даних не підтримується." @@ -3623,6 +3623,26 @@ msgstr "Jabber" msgid "SMS" msgstr "СМС" +#: actions/tag.php:68 +#, php-format +msgid "Notices tagged with %s, page %d" +msgstr "Дописи позначені %s, сторінка %d" + +#: actions/tag.php:86 +#, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "Стрічка дописів для теґу %s (RSS 1.0)" + +#: actions/tag.php:92 +#, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "Стрічка дописів для теґу %s (RSS 2.0)" + +#: actions/tag.php:98 +#, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "Стрічка дописів для теґу %s (Atom)" + #: actions/tagother.php:33 msgid "Not logged in" msgstr "Не увійшли" @@ -3671,26 +3691,6 @@ msgstr "Не вдалося зберегти теґи." msgid "Use this form to add tags to your subscribers or subscriptions." msgstr "Скористайтесь цією формою, щоб додати теґи підпискам та підписчикам." -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Дописи позначені %s, сторінка %d" - -#: actions/tag.php:86 -#, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "Стрічка дописів для теґу %s (RSS 1.0)" - -#: actions/tag.php:92 -#, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "Стрічка дописів для теґу %s (RSS 2.0)" - -#: actions/tag.php:98 -#, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "Стрічка дописів для теґу %s (Atom)" - #: actions/tagrss.php:35 msgid "No such tag." msgstr "Такого теґу немає." @@ -3994,22 +3994,22 @@ msgstr "Не можна оновити повідомлення з новим UR msgid "DB error inserting hashtag: %s" msgstr "Помилка бази даних при додаванні теґу: %s" -#: classes/Notice.php:179 +#: classes/Notice.php:188 msgid "Problem saving notice. Too long." msgstr "Проблема при збереженні допису. Надто довге." -#: classes/Notice.php:183 +#: classes/Notice.php:192 msgid "Problem saving notice. Unknown user." msgstr "Проблема при збереженні допису. Невідомий користувач." -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Дуже багато дописів за короткий термін; ходіть подихайте повітрям і " "повертайтесь за кілька хвилин." -#: classes/Notice.php:194 +#: classes/Notice.php:203 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4017,19 +4017,24 @@ msgstr "" "Дуже багато повідомлень за короткий термін; ходіть подихайте повітрям і " "повертайтесь за кілька хвилин." -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "Вам заборонено надсилати дописи до цього сайту." -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "Проблема при збереженні допису." -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "Помилка бази даних при додаванні відповіді: %s" +#: classes/User.php:347 +#, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "Вітаємо на %1$s, @%2$s!" + #: classes/User_group.php:380 msgid "Could not create group." msgstr "Не вдалося створити нову групу." @@ -4038,11 +4043,6 @@ msgstr "Не вдалося створити нову групу." msgid "Could not set group membership." msgstr "Не вдалося встановити членство." -#: classes/User.php:347 -#, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "Вітаємо на %1$s, @%2$s!" - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Змінити налаштування профілю" @@ -4347,7 +4347,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "Такого допису не існує" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 msgid "User has no last notice" msgstr "Користувач не має останнього допису" @@ -4394,102 +4394,102 @@ msgstr "Помилка при відправці прямого повідомл msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Допис надто довгий — максимум %d знаків, а ви надсилаєте %d" -#: lib/command.php:439 +#: lib/command.php:440 #, php-format msgid "Reply to %s sent" msgstr "Відповідь до %s надіслано" -#: lib/command.php:441 +#: lib/command.php:442 msgid "Error saving notice." msgstr "Проблема при збереженні допису." -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "Зазначте ім’я користувача, до якого бажаєте підписатись" -#: lib/command.php:502 +#: lib/command.php:503 #, php-format msgid "Subscribed to %s" msgstr "Підписано до %s" -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "Зазначте ім’я користувача, від якого бажаєте відписатись" -#: lib/command.php:530 +#: lib/command.php:531 #, php-format msgid "Unsubscribed from %s" msgstr "Відписано від %s" -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "Виконання команди ще не завершено." -#: lib/command.php:551 +#: lib/command.php:552 msgid "Notification off." msgstr "Сповіщення вимкнуто." -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "Не можна вимкнути сповіщення." -#: lib/command.php:574 +#: lib/command.php:575 msgid "Notification on." msgstr "Сповіщення увімкнуто." -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "Не можна увімкнути сповіщення." -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" -msgstr "" +msgstr "Команду входу відключено" -#: lib/command.php:602 -#, fuzzy, php-format +#: lib/command.php:604 +#, php-format msgid "Could not create login token for %s" -msgstr "Неможна призначити додаткові імена." +msgstr "Не вдалося створити токен входу для %s" -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" +"Це посилання можна використати лише раз, воно дійсне протягом 2 хвилин: %s" -#: lib/command.php:623 +#: lib/command.php:625 msgid "You are not subscribed to anyone." msgstr "Ви не маєте жодних підписок." -#: lib/command.php:625 +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Ви підписані до цієї особи:" msgstr[1] "Ви підписані до цих людей:" msgstr[2] "Ви підписані до цих людей:" -#: lib/command.php:645 +#: lib/command.php:647 msgid "No one is subscribed to you." msgstr "До Вас ніхто не підписаний." -#: lib/command.php:647 +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Ця особа є підписаною до Вас:" msgstr[1] "Ці люди підписані до Вас:" msgstr[2] "Ці люди підписані до Вас:" -#: lib/command.php:667 +#: lib/command.php:669 msgid "You are not a member of any groups." msgstr "Ви не є учасником жодної групи." -#: lib/command.php:669 +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Ви є учасником групи:" msgstr[1] "Ви є учасником таких груп:" msgstr[2] "Ви є учасником таких груп:" -#: lib/command.php:683 -#, fuzzy +#: lib/command.php:685 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4622,10 +4622,6 @@ msgstr "Позначити як обране" msgid "Favor" msgstr "Обрати" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "Експорт даних" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "RSS 1.0" @@ -4642,6 +4638,10 @@ msgstr "Atom" msgid "FOAF" msgstr "FOAF" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "Експорт даних" + #: lib/galleryaction.php:121 msgid "Filter tags" msgstr "Фільтр для теґів" @@ -4801,24 +4801,6 @@ msgstr "Увійти використовуючи ім’я та пароль" msgid "Sign up for a new account" msgstr "Зареєструвати новий акаунт" -#: lib/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "" -"Лише користувач має можливість переглядати свою власну поштову скриньку." - -#: 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 "" -"У Вас немає приватних повідомлень. Зокрема, Ви можете надсилати приватні " -"повідомлення аби долучити користувачів до розмови. Такі повідомлення бачите " -"лише Ви." - -#: lib/mailbox.php:227 lib/noticelist.php:452 -msgid "from" -msgstr "від" - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "Підтвердження електронної адреси" @@ -5079,6 +5061,24 @@ msgstr "" "\t%4$s\n" "\n" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "" +"Лише користувач має можливість переглядати свою власну поштову скриньку." + +#: 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 "" +"У Вас немає приватних повідомлень. Зокрема, Ви можете надсилати приватні " +"повідомлення аби долучити користувачів до розмови. Такі повідомлення бачите " +"лише Ви." + +#: lib/mailbox.php:227 lib/noticelist.php:452 +msgid "from" +msgstr "від" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "Виникла помилка під час завантаження Вашого файлу. Спробуйте ще." @@ -5141,7 +5141,7 @@ msgstr "Надіслати прямий допис" msgid "To" msgstr "До" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 msgid "Available characters" msgstr "Лишилось знаків" @@ -5154,11 +5154,11 @@ msgstr "Надіслати допис" msgid "What's up, %s?" msgstr "Що нового, %s?" -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "Вкласти" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "Вкласти файл" @@ -5227,11 +5227,11 @@ msgstr "Помилка при додаванні віддаленого проф msgid "Duplicate notice" msgstr "Дублікат допису" -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 msgid "You have been banned from subscribing." msgstr "Вас позбавлено можливості підписатись." -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Не вдалося додати нову підписку." @@ -5391,20 +5391,6 @@ msgstr "Люди підписані до %s" msgid "Groups %s is a member of" msgstr "%s бере участь в цих групах" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "Хмарка теґів (позначки самих користувачів)" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "Хмарка теґів (позначки, якими Ви позначили користувачів)" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(пусто)" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "Вже підписаний!" @@ -5433,6 +5419,20 @@ msgstr "Не можу видалити самопідписку." msgid "Couldn't delete subscription." msgstr "Не вдалося видалити підписку." +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "Хмарка теґів (позначки самих користувачів)" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "Хмарка теґів (позначки, якими Ви позначили користувачів)" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "(пусто)" + #: lib/tagcloudsection.php:56 msgid "None" msgstr "Пусто" diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index 8e29eac3c4..362f191082 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: 2009-12-07 21:25+0000\n" -"PO-Revision-Date: 2009-12-07 21:27:36+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:10:39+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: vi\n" "X-Message-Group: out-statusnet\n" @@ -26,11 +26,11 @@ msgstr "Không có tin nhắn nào." #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -43,7 +43,7 @@ msgstr "Không có tin nhắn nào." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." @@ -55,7 +55,7 @@ msgid "%s and friends, page %d" msgstr "%s và bạn bè" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s và bạn bè" @@ -107,25 +107,25 @@ msgstr "" msgid "You and friends" msgstr "%s và bạn bè" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 #, fuzzy msgid "API method not found." msgstr "Phương thức API không tìm thấy!" #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 @@ -145,9 +145,23 @@ msgstr "" msgid "Could not update user." msgstr "Không thể cập nhật thành viên." +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "Người dùng không có thông tin." + +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Không thể lưu hồ sơ cá nhân." + #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -170,20 +184,6 @@ msgstr "Không thể lưu thông tin Twitter của bạn!" msgid "Could not update your design." msgstr "Không thể cập nhật thành viên." -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "Người dùng không có thông tin." - -#: actions/apiaccountupdateprofile.php:147 -#, fuzzy -msgid "Could not save profile." -msgstr "Không thể lưu hồ sơ cá nhân." - #: actions/apiblockcreate.php:105 #, fuzzy msgid "You cannot block yourself!" @@ -197,25 +197,6 @@ msgstr "" msgid "Unblock user failed." msgstr "" -#: actions/apidirectmessagenew.php:126 -#, fuzzy -msgid "No message text!" -msgstr "Không có tin nhắn nào." - -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, fuzzy, php-format -msgid "That's too long. Max message size is %d chars." -msgstr "Quá dài. Tối đa là 140 ký tự." - -#: actions/apidirectmessagenew.php:146 -#, fuzzy -msgid "Recipient user not found." -msgstr "Không tìm thấy user." - -#: actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." -msgstr "" - #: actions/apidirectmessage.php:89 #, fuzzy, php-format msgid "Direct messages from %s" @@ -241,18 +222,37 @@ msgstr "" #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "Phương thức API không tìm thấy!" +#: actions/apidirectmessagenew.php:126 +#, fuzzy +msgid "No message text!" +msgstr "Không có tin nhắn nào." + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, fuzzy, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "Quá dài. Tối đa là 140 ký tự." + +#: actions/apidirectmessagenew.php:146 +#, fuzzy +msgid "Recipient user not found." +msgstr "Không tìm thấy user." + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -405,16 +405,6 @@ msgstr "Bạn chưa cập nhật thông tin riêng" msgid "Could not remove user %s to group %s." msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi." -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, fuzzy, php-format -msgid "%s groups" -msgstr "%s và nhóm" - -#: actions/apigrouplistall.php:94 -#, fuzzy, php-format -msgid "groups on %s" -msgstr "Mã nhóm" - #: actions/apigrouplist.php:95 #, fuzzy, php-format msgid "%s's groups" @@ -425,6 +415,16 @@ msgstr "%s và nhóm" msgid "Groups %s is a member of on %s." msgstr "Bạn chưa cập nhật thông tin riêng" +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, fuzzy, php-format +msgid "%s groups" +msgstr "%s và nhóm" + +#: actions/apigrouplistall.php:94 +#, fuzzy, php-format +msgid "groups on %s" +msgstr "Mã nhóm" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Phương thức này yêu cầu là POST hoặc DELETE" @@ -462,54 +462,54 @@ msgstr "" msgid "Unsupported format." msgstr "Không hỗ trợ kiểu file ảnh này." -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, fuzzy, php-format msgid "%s / Favorites from %s" msgstr "Tìm kiếm các tin nhắn ưa thích của %s" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, fuzzy, php-format msgid "%s updates favorited by %s / %s." msgstr "Tất cả các cập nhật của %s" -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, fuzzy, php-format msgid "%s timeline" msgstr "Dòng tin nhắn của %s" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, fuzzy, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Các cập nhật đang trả lời tới %2$s" -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, fuzzy, php-format msgid "%s public timeline" msgstr "Dòng tin công cộng" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s cập nhật từ tất cả mọi người!" -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "Thông báo được gắn thẻ %s" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Dòng tin nhắn cho %s" @@ -548,48 +548,48 @@ msgstr "" "Bạn có thể cập nhật hồ sơ cá nhân tại đây để mọi người có thể biết thông tin " "về bạn." -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 #, 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" -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 msgid "Avatar settings" msgstr "Thay đổi hình đại diện" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "Xem trước" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 #, fuzzy msgid "Delete" msgstr "Xóa tin nhắn" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "Tải file" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 #, fuzzy msgid "Crop" msgstr "Nhóm" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -600,34 +600,75 @@ msgstr "Nhóm" msgid "There was a problem with your session token. Try again, please." msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa." -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "Bất ngờ gửi mẫu thông tin. " -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "Hình đại diện đã được cập nhật." -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "Cập nhật hình đại diện không thành công." -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 #, fuzzy msgid "Avatar deleted." msgstr "Hình đại diện đã được cập nhật." +#: actions/block.php:69 +#, fuzzy +msgid "You already blocked that user." +msgstr "Bạn đã theo những người này:" + +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#, fuzzy +msgid "Block user" +msgstr "Ban user" + +#: actions/block.php:130 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" + +#: actions/block.php:143 actions/deletenotice.php:145 +#: actions/deleteuser.php:147 actions/groupblock.php:178 +msgid "No" +msgstr "Không" + +#: actions/block.php:143 actions/deleteuser.php:147 +#, fuzzy +msgid "Do not block this user" +msgstr "Bỏ chặn người dùng này" + +#: actions/block.php:144 actions/deletenotice.php:146 +#: actions/deleteuser.php:148 actions/groupblock.php:179 +msgid "Yes" +msgstr "Có" + +#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 +#, fuzzy +msgid "Block this user" +msgstr "Ban user" + +#: actions/block.php:162 +msgid "Failed to save block information." +msgstr "" + #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 #: actions/groupmembers.php:76 actions/grouprss.php:91 @@ -671,47 +712,6 @@ msgstr "Bỏ chặn" msgid "Unblock this user" msgstr "Bỏ chặn người dùng này" -#: actions/block.php:69 -#, fuzzy -msgid "You already blocked that user." -msgstr "Bạn đã theo những người này:" - -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 -#, fuzzy -msgid "Block user" -msgstr "Ban user" - -#: actions/block.php:130 -msgid "" -"Are you sure you want to block this user? Afterwards, they will be " -"unsubscribed from you, unable to subscribe to you in the future, and you " -"will not be notified of any @-replies from them." -msgstr "" - -#: actions/block.php:143 actions/deletenotice.php:145 -#: actions/deleteuser.php:147 actions/groupblock.php:178 -msgid "No" -msgstr "Không" - -#: actions/block.php:143 actions/deleteuser.php:147 -#, fuzzy -msgid "Do not block this user" -msgstr "Bỏ chặn người dùng này" - -#: actions/block.php:144 actions/deletenotice.php:146 -#: actions/deleteuser.php:148 actions/groupblock.php:179 -msgid "Yes" -msgstr "Có" - -#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 -#, fuzzy -msgid "Block this user" -msgstr "Ban user" - -#: actions/block.php:162 -msgid "Failed to save block information." -msgstr "" - #: actions/bookmarklet.php:50 msgid "Post to " msgstr "" @@ -1218,6 +1218,15 @@ msgstr "Địa chỉ email hoặc mật khẩu không đúng." msgid "New incoming email address added." msgstr "Đã xác nhận địa chỉ này." +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!" + +#: actions/favor.php:92 lib/disfavorform.php:140 +#, fuzzy +msgid "Disfavor favorite" +msgstr "Không thích" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 #, fuzzy @@ -1262,15 +1271,6 @@ msgstr "Những tin nhắn ưa thích của %s" msgid "Updates favored by %1$s on %2$s!" msgstr "Dòng tin nhắn cho %s" -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!" - -#: actions/favor.php:92 lib/disfavorform.php:140 -#, fuzzy -msgid "Disfavor favorite" -msgstr "Không thích" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1520,6 +1520,32 @@ msgstr "Kênh mà bạn tham gia" msgid "Updates from members of %1$s on %2$s!" msgstr "Dòng tin nhắn cho %s" +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +#, fuzzy +msgid "Groups" +msgstr "Nhóm" + +#: actions/groups.php:64 +#, fuzzy, php-format +msgid "Groups, page %d" +msgstr "Tên nhóm" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#, fuzzy +msgid "Create a new group" +msgstr "Tạo nhóm" + #: actions/groupsearch.php:52 #, fuzzy, php-format msgid "" @@ -1554,32 +1580,6 @@ msgid "" "action.newgroup%%) yourself!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 -#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 -#, fuzzy -msgid "Groups" -msgstr "Nhóm" - -#: actions/groups.php:64 -#, fuzzy, php-format -msgid "Groups, page %d" -msgstr "Tên nhóm" - -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%site.name%%%% groups let you find and talk with people of similar " -"interests. After you join a group you can send messages to all other members " -"using the syntax \"!groupname\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" -msgstr "" - -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -#, fuzzy -msgid "Create a new group" -msgstr "Tạo nhóm" - #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "" @@ -1777,7 +1777,7 @@ msgstr "Tin nhắn cá nhân" msgid "Optionally add a personal message to the invitation." msgstr "Không bắt buộc phải thêm thông điệp vào thư mời." -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "Gửi" @@ -1888,57 +1888,57 @@ msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè c msgid "%s left group %s" msgstr "%s và nhóm" -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "Đã đăng nhập." -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 #, fuzzy msgid "Invalid or expired token." msgstr "Nội dung tin nhắn không hợp lệ" -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "Sai tên đăng nhập hoặc mật khẩu." -#: actions/login.php:152 +#: actions/login.php:153 #, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "Chưa được phép." -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Đăng nhập" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "" -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Biệt danh" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Mật khẩu" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "Nhớ tôi" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "Sẽ tự động đăng nhập, không dành cho các máy sử dụng chung!" -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "Mất hoặc quên mật khẩu?" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1946,7 +1946,7 @@ msgstr "" "Vì lý do bảo mật, bạn hãy nhập lại tên đăng nhập và mật khẩu trước khi thay " "đổi trong điều chỉnh." -#: actions/login.php:289 +#: actions/login.php:290 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -2022,7 +2022,7 @@ msgstr "Tin mới nhất" msgid "Direct message to %s sent" msgstr "Tin nhắn riêng" -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 #, fuzzy msgid "Ajax Error" msgstr "Lỗi" @@ -2031,7 +2031,7 @@ msgstr "Lỗi" msgid "New notice" msgstr "Thông báo mới" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 #, fuzzy msgid "Notice posted" msgstr "Tin đã gửi" @@ -2111,8 +2111,8 @@ msgstr "Kết nối" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "Không hỗ trợ định dạng dữ liệu này." @@ -3692,6 +3692,26 @@ msgstr "Không có Jabber ID." msgid "SMS" msgstr "SMS" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %s, page %d" +msgstr "Dòng tin nhắn cho %s" + +#: actions/tag.php:86 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "Dòng tin nhắn cho %s" + +#: actions/tag.php:92 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "Dòng tin nhắn cho %s" + +#: actions/tag.php:98 +#, fuzzy, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "Dòng tin nhắn cho %s" + #: actions/tagother.php:33 #, fuzzy msgid "Not logged in" @@ -3741,26 +3761,6 @@ msgstr "Không thể lưu hồ sơ cá nhân." msgid "Use this form to add tags to your subscribers or subscriptions." msgstr "" -#: actions/tag.php:68 -#, fuzzy, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Dòng tin nhắn cho %s" - -#: actions/tag.php:86 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "Dòng tin nhắn cho %s" - -#: actions/tag.php:92 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "Dòng tin nhắn cho %s" - -#: actions/tag.php:98 -#, fuzzy, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "Dòng tin nhắn cho %s" - #: actions/tagrss.php:35 #, fuzzy msgid "No such tag." @@ -4078,40 +4078,45 @@ msgstr "Không thể cập nhật thông tin user với địa chỉ email đã msgid "DB error inserting hashtag: %s" msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s" -#: classes/Notice.php:179 +#: classes/Notice.php:188 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: classes/Notice.php:183 +#: classes/Notice.php:192 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:194 +#: classes/Notice.php:203 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s" +#: classes/User.php:347 +#, fuzzy, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "%s chào mừng bạn " + #: classes/User_group.php:380 #, fuzzy msgid "Could not create group." @@ -4122,11 +4127,6 @@ msgstr "Không thể tạo favorite." msgid "Could not set group membership." msgstr "Không thể tạo đăng nhận." -#: classes/User.php:347 -#, fuzzy, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "%s chào mừng bạn " - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Thay đổi các thiết lập trong hồ sơ cá nhân của bạn" @@ -4455,7 +4455,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 #, fuzzy msgid "User has no last notice" msgstr "Người dùng không có thông tin." @@ -4505,101 +4505,101 @@ msgstr "Thư bạn đã gửi" msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:439 +#: lib/command.php:440 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Trả lời tin nhắn này" -#: lib/command.php:441 +#: lib/command.php:442 #, fuzzy msgid "Error saving notice." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:502 +#: lib/command.php:503 #, fuzzy, php-format msgid "Subscribed to %s" msgstr "Theo nhóm này" -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:530 +#: lib/command.php:531 #, fuzzy, php-format msgid "Unsubscribed from %s" msgstr "Hết theo" -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:551 +#: lib/command.php:552 #, fuzzy msgid "Notification off." msgstr "Không có mã số xác nhận." -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:574 +#: lib/command.php:575 #, fuzzy msgid "Notification on." msgstr "Không có mã số xác nhận." -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" msgstr "" -#: lib/command.php:602 +#: lib/command.php:604 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Không thể tạo favorite." -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:623 +#: lib/command.php:625 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Bạn chưa cập nhật thông tin riêng" -#: lib/command.php:625 +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Bạn đã theo những người này:" -#: lib/command.php:645 +#: lib/command.php:647 #, fuzzy msgid "No one is subscribed to you." msgstr "Không thể tạo favorite." -#: lib/command.php:647 +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Không thể tạo favorite." -#: lib/command.php:667 +#: lib/command.php:669 #, fuzzy msgid "You are not a member of any groups." msgstr "Bạn chưa cập nhật thông tin riêng" -#: lib/command.php:669 +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Bạn chưa cập nhật thông tin riêng" -#: lib/command.php:683 +#: lib/command.php:685 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4703,10 +4703,6 @@ msgstr "Bạn muốn cảnh báo tin nhắn này?" msgid "Favor" msgstr "Ưa thích" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "" @@ -4723,6 +4719,10 @@ msgstr "" msgid "FOAF" msgstr "" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "" + #: lib/galleryaction.php:121 msgid "Filter tags" msgstr "" @@ -4897,21 +4897,6 @@ 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/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "" - -#: 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 "" - -#: lib/mailbox.php:227 lib/noticelist.php:452 -#, fuzzy -msgid "from" -msgstr " từ " - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "Xac nhan dia chi email" @@ -5144,6 +5129,21 @@ msgid "" "\n" msgstr "" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "" + +#: 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 "" + +#: lib/mailbox.php:227 lib/noticelist.php:452 +#, fuzzy +msgid "from" +msgstr " từ " + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5205,7 +5205,7 @@ msgstr "Xóa tin nhắn" msgid "To" msgstr "" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 #, fuzzy msgid "Available characters" msgstr "Nhiều hơn 6 ký tự" @@ -5220,11 +5220,11 @@ msgstr "Thông báo mới" msgid "What's up, %s?" msgstr "Bạn đang làm gì thế, %s?" -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "" @@ -5300,11 +5300,11 @@ msgstr "Lỗi xảy ra khi thêm mới hồ sơ cá nhân" msgid "Duplicate notice" msgstr "Xóa tin nhắn" -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 msgid "You have been banned from subscribing." msgstr "" -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "Không thể chèn thêm vào đăng nhận." @@ -5477,20 +5477,6 @@ msgstr "Theo nhóm này" msgid "Groups %s is a member of" msgstr "" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "" @@ -5524,6 +5510,20 @@ msgstr "Không thể xóa đăng nhận." msgid "Couldn't delete subscription." msgstr "Không thể xóa đăng nhận." +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "" + #: lib/tagcloudsection.php:56 #, fuzzy msgid "None" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index 4e306a76bb..f55e49e885 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.po +++ b/locale/zh_CN/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-07 21:25+0000\n" -"PO-Revision-Date: 2009-12-07 21:27:39+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:10:42+0000\n" "Language-Team: Simplified Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hans\n" "X-Message-Group: out-statusnet\n" @@ -28,11 +28,11 @@ msgstr "未找到此消息。" #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -45,7 +45,7 @@ msgstr "未找到此消息。" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." @@ -57,7 +57,7 @@ msgid "%s and friends, page %d" msgstr "%s 及好友" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s 及好友" @@ -109,25 +109,25 @@ msgstr "" msgid "You and friends" msgstr "%s 及好友" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "%2$s 上 %1$s 和好友的更新！" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 #, fuzzy msgid "API method not found." msgstr "API 方法未实现！" #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 @@ -147,9 +147,23 @@ msgstr "" msgid "Could not update user." msgstr "无法更新用户。" +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "用户没有个人信息。" + +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "无法保存个人信息。" + #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -172,20 +186,6 @@ msgstr "无法保存 Twitter 设置！" msgid "Could not update your design." msgstr "无法更新用户。" -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "用户没有个人信息。" - -#: actions/apiaccountupdateprofile.php:147 -#, fuzzy -msgid "Could not save profile." -msgstr "无法保存个人信息。" - #: actions/apiblockcreate.php:105 #, fuzzy msgid "You cannot block yourself!" @@ -199,23 +199,6 @@ msgstr "阻止用户失败。" msgid "Unblock user failed." msgstr "取消阻止用户失败。" -#: actions/apidirectmessagenew.php:126 -msgid "No message text!" -msgstr "消息没有正文！" - -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, fuzzy, php-format -msgid "That's too long. Max message size is %d chars." -msgstr "超出长度限制。不能超过 140 个字符。" - -#: actions/apidirectmessagenew.php:146 -msgid "Recipient user not found." -msgstr "未找到收件人。" - -#: actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." -msgstr "无法向并非好友的用户发送直接消息。" - #: actions/apidirectmessage.php:89 #, fuzzy, php-format msgid "Direct messages from %s" @@ -241,18 +224,35 @@ msgstr "发给 %s 的直接消息" #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "API 方法未实现！" +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "消息没有正文！" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, fuzzy, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "超出长度限制。不能超过 140 个字符。" + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "未找到收件人。" + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "无法向并非好友的用户发送直接消息。" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -403,16 +403,6 @@ msgstr "您未告知此个人信息" msgid "Could not remove user %s to group %s." msgstr "无法订阅用户：未找到。" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, php-format -msgid "%s groups" -msgstr "%s 群组" - -#: actions/apigrouplistall.php:94 -#, fuzzy, php-format -msgid "groups on %s" -msgstr "组动作" - #: actions/apigrouplist.php:95 #, fuzzy, php-format msgid "%s's groups" @@ -423,6 +413,16 @@ msgstr "%s 群组" msgid "Groups %s is a member of on %s." msgstr "%s 组是成员组成了" +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "%s 群组" + +#: actions/apigrouplistall.php:94 +#, fuzzy, php-format +msgid "groups on %s" +msgstr "组动作" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "此方法接受POST或DELETE请求。" @@ -460,54 +460,54 @@ msgstr "" msgid "Unsupported format." msgstr "不支持这种图像格式。" -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, php-format msgid "%s / Favorites from %s" msgstr "%s 的收藏 / %s" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, php-format msgid "%s updates favorited by %s / %s." msgstr "%s 收藏了 %s 的 %s 通告。" -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "%s 时间表" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "%2$s 上 %1$s 的更新！" -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, fuzzy, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / 回复 %2$s 的消息" -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "回复 %2$s / %3$s 的 %1$s 更新。" -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s 公众时间表" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "来自所有人的 %s 消息！" -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "带 %s 标签的通告" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "%2$s 上 %1$s 的更新！" @@ -544,46 +544,46 @@ msgstr "头像" msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "您可以在这里上传个人头像。" -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 msgid "User without matching profile" msgstr "找不到匹配的用户。" -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 msgid "Avatar settings" msgstr "头像设置" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "原来的" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "预览" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 #, fuzzy msgid "Delete" msgstr "删除" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "上传" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "剪裁" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -594,34 +594,75 @@ msgstr "剪裁" msgid "There was a problem with your session token. Try again, please." msgstr "会话标识有问题，请重试。" -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "未预料的表单提交。" -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "请选择一块方形区域作为你的头像" -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "文件数据丢失" -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "头像已更新。" -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "更新头像失败。" -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 #, fuzzy msgid "Avatar deleted." msgstr "头像已更新。" +#: actions/block.php:69 +#, fuzzy +msgid "You already blocked that user." +msgstr "您已成功阻止该用户：" + +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#, fuzzy +msgid "Block user" +msgstr "阻止用户" + +#: actions/block.php:130 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" + +#: actions/block.php:143 actions/deletenotice.php:145 +#: actions/deleteuser.php:147 actions/groupblock.php:178 +msgid "No" +msgstr "否" + +#: actions/block.php:143 actions/deleteuser.php:147 +#, fuzzy +msgid "Do not block this user" +msgstr "取消阻止次用户" + +#: actions/block.php:144 actions/deletenotice.php:146 +#: actions/deleteuser.php:148 actions/groupblock.php:179 +msgid "Yes" +msgstr "是" + +#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 +#, fuzzy +msgid "Block this user" +msgstr "阻止该用户" + +#: actions/block.php:162 +msgid "Failed to save block information." +msgstr "保存阻止信息失败。" + #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 #: actions/groupmembers.php:76 actions/grouprss.php:91 @@ -666,47 +707,6 @@ msgstr "取消阻止" msgid "Unblock this user" msgstr "取消阻止次用户" -#: actions/block.php:69 -#, fuzzy -msgid "You already blocked that user." -msgstr "您已成功阻止该用户：" - -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 -#, fuzzy -msgid "Block user" -msgstr "阻止用户" - -#: actions/block.php:130 -msgid "" -"Are you sure you want to block this user? Afterwards, they will be " -"unsubscribed from you, unable to subscribe to you in the future, and you " -"will not be notified of any @-replies from them." -msgstr "" - -#: actions/block.php:143 actions/deletenotice.php:145 -#: actions/deleteuser.php:147 actions/groupblock.php:178 -msgid "No" -msgstr "否" - -#: actions/block.php:143 actions/deleteuser.php:147 -#, fuzzy -msgid "Do not block this user" -msgstr "取消阻止次用户" - -#: actions/block.php:144 actions/deletenotice.php:146 -#: actions/deleteuser.php:148 actions/groupblock.php:179 -msgid "Yes" -msgstr "是" - -#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 -#, fuzzy -msgid "Block this user" -msgstr "阻止该用户" - -#: actions/block.php:162 -msgid "Failed to save block information." -msgstr "保存阻止信息失败。" - #: actions/bookmarklet.php:50 #, fuzzy msgid "Post to " @@ -1190,6 +1190,15 @@ msgstr "发布用的电子邮件被移除。" msgid "New incoming email address added." msgstr "已添加新的发布用的电子邮件地址。" +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "已收藏此通告！" + +#: actions/favor.php:92 lib/disfavorform.php:140 +#, fuzzy +msgid "Disfavor favorite" +msgstr "取消收藏" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 #, fuzzy @@ -1234,15 +1243,6 @@ msgstr "%s 收藏的通告" msgid "Updates favored by %1$s on %2$s!" msgstr "%2$s 上 %1$s 的更新！" -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "已收藏此通告！" - -#: actions/favor.php:92 lib/disfavorform.php:140 -#, fuzzy -msgid "Disfavor favorite" -msgstr "取消收藏" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1492,6 +1492,31 @@ msgstr "" msgid "Updates from members of %1$s on %2$s!" msgstr "%2$s 上 %1$s 的更新！" +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "组" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "组，第 %d 页" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#, fuzzy +msgid "Create a new group" +msgstr "创建新组" + #: actions/groupsearch.php:52 #, fuzzy, php-format msgid "" @@ -1525,31 +1550,6 @@ msgid "" "action.newgroup%%) yourself!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 -#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 -msgid "Groups" -msgstr "组" - -#: actions/groups.php:64 -#, php-format -msgid "Groups, page %d" -msgstr "组，第 %d 页" - -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%site.name%%%% groups let you find and talk with people of similar " -"interests. After you join a group you can send messages to all other members " -"using the syntax \"!groupname\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" -msgstr "" - -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -#, fuzzy -msgid "Create a new group" -msgstr "创建新组" - #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "" @@ -1736,7 +1736,7 @@ msgstr "个人消息" msgid "Optionally add a personal message to the invitation." msgstr "在邀请中加几句话(可选)。" -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "发送" @@ -1840,63 +1840,63 @@ msgstr "无法订阅用户：未找到。" msgid "%s left group %s" msgstr "%s 离开群 %s" -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "已登录。" -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 #, fuzzy msgid "Invalid or expired token." msgstr "通告内容不正确" -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "用户名或密码不正确。" -#: actions/login.php:152 +#: actions/login.php:153 #, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "未认证。" -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "登录" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "登录" -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "昵称" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "密码" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "记住登录状态" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "保持这台机器上的登录状态。不要在共用的机器上保持登录！" -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "忘记了密码？" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "由于安全原因，修改设置前需要输入用户名和密码。" -#: actions/login.php:289 +#: actions/login.php:290 #, fuzzy, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1968,7 +1968,7 @@ msgstr "新消息" msgid "Direct message to %s sent" msgstr "已向 %s 发送消息" -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" msgstr "Ajax错误" @@ -1976,7 +1976,7 @@ msgstr "Ajax错误" msgid "New notice" msgstr "新通告" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 msgid "Notice posted" msgstr "消息已发布。" @@ -2053,8 +2053,8 @@ msgstr "连接" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "不支持的数据格式。" @@ -3611,6 +3611,26 @@ msgstr "没有 Jabber ID。" msgid "SMS" msgstr "SMS短信" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %s, page %d" +msgstr "带 %s 标签的通告" + +#: actions/tag.php:86 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "%s 的通告聚合" + +#: actions/tag.php:92 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "%s 的通告聚合" + +#: actions/tag.php:98 +#, fuzzy, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "%s 的通告聚合" + #: actions/tagother.php:33 #, fuzzy msgid "Not logged in" @@ -3661,26 +3681,6 @@ msgstr "无法保存头像" msgid "Use this form to add tags to your subscribers or subscriptions." msgstr "使用这个表格给你的关注者或你的订阅加注标签。" -#: actions/tag.php:68 -#, fuzzy, php-format -msgid "Notices tagged with %s, page %d" -msgstr "带 %s 标签的通告" - -#: actions/tag.php:86 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "%s 的通告聚合" - -#: actions/tag.php:92 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "%s 的通告聚合" - -#: actions/tag.php:98 -#, fuzzy, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "%s 的通告聚合" - #: actions/tagrss.php:35 #, fuzzy msgid "No such tag." @@ -3993,41 +3993,46 @@ msgstr "无法添加新URI的信息。" msgid "DB error inserting hashtag: %s" msgstr "添加标签时数据库出错：%s" -#: classes/Notice.php:179 +#: classes/Notice.php:188 #, fuzzy msgid "Problem saving notice. Too long." msgstr "保存通告时出错。" -#: classes/Notice.php:183 +#: classes/Notice.php:192 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "保存通告时出错。" -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "你在短时间里发布了过多的消息，请深呼吸，过几分钟再发消息。" -#: classes/Notice.php:194 +#: classes/Notice.php:203 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "你在短时间里发布了过多的消息，请深呼吸，过几分钟再发消息。" -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "在这个网站你被禁止发布消息。" -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "保存通告时出错。" -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "添加回复时数据库出错：%s" +#: classes/User.php:347 +#, fuzzy, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "发送给 %1$s 的 %2$s 消息" + #: classes/User_group.php:380 msgid "Could not create group." msgstr "无法创建组。" @@ -4037,11 +4042,6 @@ msgstr "无法创建组。" msgid "Could not set group membership." msgstr "无法删除订阅。" -#: classes/User.php:347 -#, fuzzy, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "发送给 %1$s 的 %2$s 消息" - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "修改您的个人信息" @@ -4365,7 +4365,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 msgid "User has no last notice" msgstr "用户没有通告。" @@ -4412,99 +4412,99 @@ msgstr "发送消息出错。" msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "您的消息包含 %d 个字符，超出长度限制 - 不能超过 140 个字符。" -#: lib/command.php:439 +#: lib/command.php:440 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "无法删除通告。" -#: lib/command.php:441 +#: lib/command.php:442 #, fuzzy msgid "Error saving notice." msgstr "保存通告时出错。" -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "指定要订阅的用户名" -#: lib/command.php:502 +#: lib/command.php:503 #, php-format msgid "Subscribed to %s" msgstr "订阅 %s" -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "指定要取消订阅的用户名" -#: lib/command.php:530 +#: lib/command.php:531 #, php-format msgid "Unsubscribed from %s" msgstr "取消订阅 %s" -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "命令尚未实现。" -#: lib/command.php:551 +#: lib/command.php:552 msgid "Notification off." msgstr "通告关闭。" -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "无法关闭通告。" -#: lib/command.php:574 +#: lib/command.php:575 msgid "Notification on." msgstr "通告开启。" -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "无法开启通告。" -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" msgstr "" -#: lib/command.php:602 +#: lib/command.php:604 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "无法创建收藏。" -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:623 +#: lib/command.php:625 #, fuzzy msgid "You are not subscribed to anyone." msgstr "您未告知此个人信息" -#: lib/command.php:625 +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "您已订阅这些用户：" -#: lib/command.php:645 +#: lib/command.php:647 #, fuzzy msgid "No one is subscribed to you." msgstr "无法订阅他人更新。" -#: lib/command.php:647 +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "无法订阅他人更新。" -#: lib/command.php:667 +#: lib/command.php:669 #, fuzzy msgid "You are not a member of any groups." msgstr "您未告知此个人信息" -#: lib/command.php:669 +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "您未告知此个人信息" -#: lib/command.php:683 +#: lib/command.php:685 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4606,10 +4606,6 @@ msgstr "%s 收藏的通告" msgid "Favor" msgstr "收藏" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "导出数据" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "" @@ -4626,6 +4622,10 @@ msgstr "" msgid "FOAF" msgstr "" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "导出数据" + #: lib/galleryaction.php:121 #, fuzzy msgid "Filter tags" @@ -4798,21 +4798,6 @@ msgstr "输入用户名和密码以登录。" msgid "Sign up for a new account" msgstr "创建新帐号" -#: lib/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "只有用户自己可以访问邮箱。" - -#: 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 "" - -#: lib/mailbox.php:227 lib/noticelist.php:452 -#, fuzzy -msgid "from" -msgstr " 从 " - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "电子邮件地址确认" @@ -5003,6 +4988,21 @@ msgid "" "\n" msgstr "" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "只有用户自己可以访问邮箱。" + +#: 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 "" + +#: lib/mailbox.php:227 lib/noticelist.php:452 +#, fuzzy +msgid "from" +msgstr " 从 " + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5064,7 +5064,7 @@ msgstr "删除通告" msgid "To" msgstr "到" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 #, fuzzy msgid "Available characters" msgstr "6 个或更多字符" @@ -5079,11 +5079,11 @@ msgstr "发送消息" msgid "What's up, %s?" msgstr "怎么样，%s？" -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "" @@ -5158,12 +5158,12 @@ msgstr "添加远程的个人信息出错" msgid "Duplicate notice" msgstr "删除通告" -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 #, fuzzy msgid "You have been banned from subscribing." msgstr "那个用户阻止了你的订阅。" -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "无法添加新的订阅。" @@ -5335,20 +5335,6 @@ msgstr "订阅 %s" msgid "Groups %s is a member of" msgstr "%s 组是成员组成了" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(none 没有)" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "" @@ -5380,6 +5366,20 @@ msgstr "无法删除订阅。" msgid "Couldn't delete subscription." msgstr "无法删除订阅。" +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "(none 没有)" + #: lib/tagcloudsection.php:56 #, fuzzy msgid "None" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index ad7d1fbaea..3d041c4869 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: 2009-12-07 21:25+0000\n" -"PO-Revision-Date: 2009-12-07 21:27:42+0000\n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:10:45+0000\n" "Language-Team: Traditional Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hant\n" "X-Message-Group: out-statusnet\n" @@ -26,11 +26,11 @@ msgstr "無此通知" #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 #: actions/apiaccountupdateprofilebackgroundimage.php:116 -#: actions/apiaccountupdateprofileimage.php:105 -#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 -#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 -#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 @@ -43,7 +43,7 @@ msgstr "無此通知" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 #: lib/subs.php:34 lib/subs.php:116 msgid "No such user." @@ -55,7 +55,7 @@ msgid "%s and friends, page %d" msgstr "%s與好友" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s與好友" @@ -107,25 +107,25 @@ msgstr "" msgid "You and friends" msgstr "%s與好友" -#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#: actions/apiaccountupdateprofile.php:97 #, fuzzy msgid "API method not found." msgstr "確認碼遺失" #: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 #: actions/apiaccountupdateprofilebackgroundimage.php:86 #: actions/apiaccountupdateprofilecolors.php:110 -#: actions/apiaccountupdateprofileimage.php:84 -#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 @@ -145,9 +145,23 @@ msgstr "" msgid "Could not update user." msgstr "無法更新使用者" +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "" + +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "無法儲存個人資料" + #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 #: actions/designadminpanel.php:122 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format @@ -169,20 +183,6 @@ msgstr "" msgid "Could not update your design." msgstr "無法更新使用者" -#: actions/apiaccountupdateprofilebackgroundimage.php:194 -#: actions/apiaccountupdateprofilecolors.php:185 -#: actions/apiaccountupdateprofileimage.php:130 -#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 -msgid "User has no profile." -msgstr "" - -#: actions/apiaccountupdateprofile.php:147 -#, fuzzy -msgid "Could not save profile." -msgstr "無法儲存個人資料" - #: actions/apiblockcreate.php:105 #, fuzzy msgid "You cannot block yourself!" @@ -196,23 +196,6 @@ msgstr "" msgid "Unblock user failed." msgstr "" -#: actions/apidirectmessagenew.php:126 -msgid "No message text!" -msgstr "" - -#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, php-format -msgid "That's too long. Max message size is %d chars." -msgstr "" - -#: actions/apidirectmessagenew.php:146 -msgid "Recipient user not found." -msgstr "" - -#: actions/apidirectmessagenew.php:150 -msgid "Can't send direct messages to users who aren't your friend." -msgstr "" - #: actions/apidirectmessage.php:89 #, php-format msgid "Direct messages from %s" @@ -238,18 +221,35 @@ msgstr "" #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 -#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149 -#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 -#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "" +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "" + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "" + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -397,16 +397,6 @@ msgstr "無法連結到伺服器:%s" msgid "Could not remove user %s to group %s." msgstr "無法從 %s 建立OpenID" -#: actions/apigrouplistall.php:90 actions/usergroups.php:62 -#, php-format -msgid "%s groups" -msgstr "" - -#: actions/apigrouplistall.php:94 -#, php-format -msgid "groups on %s" -msgstr "" - #: actions/apigrouplist.php:95 #, fuzzy, php-format msgid "%s's groups" @@ -417,6 +407,16 @@ msgstr "無此通知" msgid "Groups %s is a member of on %s." msgstr "" +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "" + +#: actions/apigrouplistall.php:94 +#, php-format +msgid "groups on %s" +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "" @@ -453,54 +453,54 @@ msgstr "" msgid "Unsupported format." msgstr "" -#: actions/apitimelinefavorites.php:107 +#: actions/apitimelinefavorites.php:108 #, php-format msgid "%s / Favorites from %s" msgstr "" -#: actions/apitimelinefavorites.php:119 +#: actions/apitimelinefavorites.php:120 #, php-format msgid "%s updates favorited by %s / %s." msgstr "" -#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117 +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "" -#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125 +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" msgstr "" -#: actions/apitimelinementions.php:116 +#: actions/apitimelinementions.php:117 #, fuzzy, php-format msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s的狀態是%2$s" -#: actions/apitimelinementions.php:126 +#: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" -#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelinetag.php:101 actions/tag.php:66 +#: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "&s的微型部落格" @@ -537,46 +537,46 @@ msgstr "個人圖像" msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" -#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 #: actions/userauthorization.php:72 actions/userrss.php:103 msgid "User without matching profile" msgstr "" -#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 #, fuzzy msgid "Avatar settings" msgstr "線上即時通設定" -#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" msgstr "" -#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 msgid "Preview" msgstr "" -#: actions/avatarsettings.php:148 lib/deleteuserform.php:66 +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 #: lib/noticelist.php:550 msgid "Delete" msgstr "" -#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" msgstr "" -#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "" -#: actions/avatarsettings.php:265 actions/disfavor.php:74 +#: actions/avatarsettings.php:268 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 @@ -587,34 +587,75 @@ msgstr "" msgid "There was a problem with your session token. Try again, please." msgstr "" -#: actions/avatarsettings.php:277 actions/designadminpanel.php:103 +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 #: actions/imsettings.php:220 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 msgid "Unexpected form submission." msgstr "" -#: actions/avatarsettings.php:322 +#: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:360 +#: actions/avatarsettings.php:366 msgid "Avatar updated." msgstr "更新個人圖像" -#: actions/avatarsettings.php:363 +#: actions/avatarsettings.php:369 msgid "Failed updating avatar." msgstr "無法上傳個人圖像" -#: actions/avatarsettings.php:387 +#: actions/avatarsettings.php:393 #, fuzzy msgid "Avatar deleted." msgstr "更新個人圖像" +#: actions/block.php:69 +#, fuzzy +msgid "You already blocked that user." +msgstr "無此使用者" + +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +#, fuzzy +msgid "Block user" +msgstr "無此使用者" + +#: actions/block.php:130 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" + +#: actions/block.php:143 actions/deletenotice.php:145 +#: actions/deleteuser.php:147 actions/groupblock.php:178 +msgid "No" +msgstr "" + +#: actions/block.php:143 actions/deleteuser.php:147 +#, fuzzy +msgid "Do not block this user" +msgstr "無此使用者" + +#: actions/block.php:144 actions/deletenotice.php:146 +#: actions/deleteuser.php:148 actions/groupblock.php:179 +msgid "Yes" +msgstr "" + +#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 +#, fuzzy +msgid "Block this user" +msgstr "無此使用者" + +#: actions/block.php:162 +msgid "Failed to save block information." +msgstr "" + #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 #: actions/groupmembers.php:76 actions/grouprss.php:91 @@ -659,47 +700,6 @@ msgstr "" msgid "Unblock this user" msgstr "無此使用者" -#: actions/block.php:69 -#, fuzzy -msgid "You already blocked that user." -msgstr "無此使用者" - -#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 -#, fuzzy -msgid "Block user" -msgstr "無此使用者" - -#: actions/block.php:130 -msgid "" -"Are you sure you want to block this user? Afterwards, they will be " -"unsubscribed from you, unable to subscribe to you in the future, and you " -"will not be notified of any @-replies from them." -msgstr "" - -#: actions/block.php:143 actions/deletenotice.php:145 -#: actions/deleteuser.php:147 actions/groupblock.php:178 -msgid "No" -msgstr "" - -#: actions/block.php:143 actions/deleteuser.php:147 -#, fuzzy -msgid "Do not block this user" -msgstr "無此使用者" - -#: actions/block.php:144 actions/deletenotice.php:146 -#: actions/deleteuser.php:148 actions/groupblock.php:179 -msgid "Yes" -msgstr "" - -#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 -#, fuzzy -msgid "Block this user" -msgstr "無此使用者" - -#: actions/block.php:162 -msgid "Failed to save block information." -msgstr "" - #: actions/bookmarklet.php:50 msgid "Post to " msgstr "" @@ -1172,6 +1172,14 @@ msgstr "" msgid "New incoming email address added." msgstr "" +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "" + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "" + #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 #, fuzzy @@ -1215,14 +1223,6 @@ msgstr "" msgid "Updates favored by %1$s on %2$s!" msgstr "&s的微型部落格" -#: actions/favor.php:79 -msgid "This notice is already a favorite!" -msgstr "" - -#: actions/favor.php:92 lib/disfavorform.php:140 -msgid "Disfavor favorite" -msgstr "" - #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" @@ -1459,6 +1459,31 @@ msgstr "" msgid "Updates from members of %1$s on %2$s!" msgstr "&s的微型部落格" +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +#, fuzzy +msgid "Create a new group" +msgstr "新增帳號" + #: actions/groupsearch.php:52 #, php-format msgid "" @@ -1490,31 +1515,6 @@ msgid "" "action.newgroup%%) yourself!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 -#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 -msgid "Groups" -msgstr "" - -#: actions/groups.php:64 -#, php-format -msgid "Groups, page %d" -msgstr "" - -#: actions/groups.php:90 -#, php-format -msgid "" -"%%%%site.name%%%% groups let you find and talk with people of similar " -"interests. After you join a group you can send messages to all other members " -"using the syntax \"!groupname\". Don't see a group you like? Try [searching " -"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" -"%%%%)" -msgstr "" - -#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -#, fuzzy -msgid "Create a new group" -msgstr "新增帳號" - #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." msgstr "" @@ -1696,7 +1696,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 msgid "Send" msgstr "" @@ -1776,61 +1776,61 @@ msgstr "無法從 %s 建立OpenID" msgid "%s left group %s" msgstr "" -#: actions/login.php:82 actions/register.php:137 +#: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "已登入" -#: actions/login.php:113 actions/login.php:123 +#: actions/login.php:114 actions/login.php:124 msgid "Invalid or expired token." msgstr "" -#: actions/login.php:146 +#: actions/login.php:147 msgid "Incorrect username or password." msgstr "使用者名稱或密碼錯誤" -#: actions/login.php:152 +#: actions/login.php:153 msgid "Error setting user. You are probably not authorized." msgstr "" -#: actions/login.php:207 actions/login.php:260 lib/action.php:458 +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "登入" -#: actions/login.php:246 +#: actions/login.php:247 msgid "Login to site" msgstr "" -#: actions/login.php:249 actions/profilesettings.php:106 +#: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "暱稱" -#: actions/login.php:252 actions/register.php:428 +#: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "" -#: actions/login.php:255 actions/register.php:477 +#: actions/login.php:256 actions/register.php:477 msgid "Remember me" msgstr "" -#: actions/login.php:256 actions/register.php:479 +#: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "未來在同一部電腦自動登入" -#: actions/login.php:266 +#: actions/login.php:267 msgid "Lost or forgotten password?" msgstr "遺失或忘記密碼了嗎？" -#: actions/login.php:285 +#: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "為安全起見，請先重新輸入你的使用者名稱與密碼再更改設定。" -#: actions/login.php:289 +#: actions/login.php:290 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1899,7 +1899,7 @@ msgstr "" msgid "Direct message to %s sent" msgstr "" -#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" msgstr "" @@ -1907,7 +1907,7 @@ msgstr "" msgid "New notice" msgstr "新訊息" -#: actions/newnotice.php:206 +#: actions/newnotice.php:208 msgid "Notice posted" msgstr "" @@ -1982,8 +1982,8 @@ msgstr "連結" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996 -#: lib/api.php:1024 lib/api.php:1134 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 msgid "Not a supported data format." msgstr "" @@ -3487,6 +3487,26 @@ msgstr "查無此Jabber ID" msgid "SMS" msgstr "" +#: actions/tag.php:68 +#, fuzzy, php-format +msgid "Notices tagged with %s, page %d" +msgstr "&s的微型部落格" + +#: actions/tag.php:86 +#, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "" + +#: actions/tag.php:92 +#, fuzzy, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "發送給%s好友的訂閱" + +#: actions/tag.php:98 +#, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "" + #: actions/tagother.php:33 #, fuzzy msgid "Not logged in" @@ -3535,26 +3555,6 @@ msgstr "無法存取個人圖像資料" msgid "Use this form to add tags to your subscribers or subscriptions." msgstr "" -#: actions/tag.php:68 -#, fuzzy, php-format -msgid "Notices tagged with %s, page %d" -msgstr "&s的微型部落格" - -#: actions/tag.php:86 -#, php-format -msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "" - -#: actions/tag.php:92 -#, fuzzy, php-format -msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "發送給%s好友的訂閱" - -#: actions/tag.php:98 -#, php-format -msgid "Notice feed for tag %s (Atom)" -msgstr "" - #: actions/tagrss.php:35 #, fuzzy msgid "No such tag." @@ -3850,40 +3850,45 @@ msgstr "" msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:179 +#: classes/Notice.php:188 #, fuzzy msgid "Problem saving notice. Too long." msgstr "儲存使用者發生錯誤" -#: classes/Notice.php:183 +#: classes/Notice.php:192 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "儲存使用者發生錯誤" -#: classes/Notice.php:188 +#: classes/Notice.php:197 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:194 +#: classes/Notice.php:203 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:200 +#: classes/Notice.php:209 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:265 classes/Notice.php:290 +#: classes/Notice.php:274 classes/Notice.php:299 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:1124 +#: classes/Notice.php:1115 #, php-format msgid "DB error inserting reply: %s" msgstr "增加回覆時,資料庫發生錯誤: %s" +#: classes/User.php:347 +#, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "" + #: classes/User_group.php:380 #, fuzzy msgid "Could not create group." @@ -3894,11 +3899,6 @@ msgstr "無法存取個人圖像資料" msgid "Could not set group membership." msgstr "註冊失敗" -#: classes/User.php:347 -#, php-format -msgid "Welcome to %1$s, @%2$s!" -msgstr "" - #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "" @@ -4210,7 +4210,7 @@ msgstr "" msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 msgid "User has no last notice" msgstr "" @@ -4257,98 +4257,98 @@ msgstr "" msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:439 +#: lib/command.php:440 #, php-format msgid "Reply to %s sent" msgstr "" -#: lib/command.php:441 +#: lib/command.php:442 msgid "Error saving notice." msgstr "儲存使用者發生錯誤" -#: lib/command.php:495 +#: lib/command.php:496 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:502 +#: lib/command.php:503 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:523 +#: lib/command.php:524 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:530 +#: lib/command.php:531 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:548 lib/command.php:571 +#: lib/command.php:549 lib/command.php:572 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:551 +#: lib/command.php:552 msgid "Notification off." msgstr "" -#: lib/command.php:553 +#: lib/command.php:554 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:574 +#: lib/command.php:575 msgid "Notification on." msgstr "" -#: lib/command.php:576 +#: lib/command.php:577 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:588 +#: lib/command.php:590 msgid "Login command is disabled" msgstr "" -#: lib/command.php:602 +#: lib/command.php:604 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "無法存取個人圖像資料" -#: lib/command.php:607 +#: lib/command.php:609 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:623 +#: lib/command.php:625 #, fuzzy msgid "You are not subscribed to anyone." msgstr "此帳號已註冊" -#: lib/command.php:625 +#: lib/command.php:627 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "此帳號已註冊" -#: lib/command.php:645 +#: lib/command.php:647 #, fuzzy msgid "No one is subscribed to you." msgstr "無此訂閱" -#: lib/command.php:647 +#: lib/command.php:649 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "無此訂閱" -#: lib/command.php:667 +#: lib/command.php:669 #, fuzzy msgid "You are not a member of any groups." msgstr "無法連結到伺服器:%s" -#: lib/command.php:669 +#: lib/command.php:671 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "無法連結到伺服器:%s" -#: lib/command.php:683 +#: lib/command.php:685 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4447,10 +4447,6 @@ msgstr "無此通知" msgid "Favor" msgstr "" -#: lib/feedlist.php:64 -msgid "Export data" -msgstr "" - #: lib/feed.php:85 msgid "RSS 1.0" msgstr "" @@ -4467,6 +4463,10 @@ msgstr "" msgid "FOAF" msgstr "" +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "" + #: lib/galleryaction.php:121 msgid "Filter tags" msgstr "" @@ -4633,20 +4633,6 @@ msgstr "使用者名稱或密碼無效" msgid "Sign up for a new account" msgstr "新增帳號" -#: lib/mailbox.php:89 -msgid "Only the user can read their own mailboxes." -msgstr "" - -#: 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 "" - -#: lib/mailbox.php:227 lib/noticelist.php:452 -msgid "from" -msgstr "" - #: lib/mail.php:172 msgid "Email address confirmation" msgstr "確認信箱" @@ -4830,6 +4816,20 @@ msgid "" "\n" msgstr "" +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "" + +#: 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 "" + +#: lib/mailbox.php:227 lib/noticelist.php:452 +msgid "from" +msgstr "" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -4891,7 +4891,7 @@ msgstr "" msgid "To" msgstr "" -#: lib/messageform.php:161 lib/noticeform.php:185 +#: lib/messageform.php:159 lib/noticeform.php:183 #, fuzzy msgid "Available characters" msgstr "6個以上字元" @@ -4906,11 +4906,11 @@ msgstr "新訊息" msgid "What's up, %s?" msgstr "" -#: lib/noticeform.php:192 +#: lib/noticeform.php:190 msgid "Attach" msgstr "" -#: lib/noticeform.php:196 +#: lib/noticeform.php:194 msgid "Attach a file" msgstr "" @@ -4981,11 +4981,11 @@ msgstr "新增外部個人資料發生錯誤(Error inserting remote profile)" msgid "Duplicate notice" msgstr "新訊息" -#: lib/oauthstore.php:467 lib/subs.php:48 +#: lib/oauthstore.php:466 lib/subs.php:48 msgid "You have been banned from subscribing." msgstr "" -#: lib/oauthstore.php:492 +#: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." msgstr "無法新增訂閱" @@ -5150,20 +5150,6 @@ msgstr "此帳號已註冊" msgid "Groups %s is a member of" msgstr "" -#: lib/subscriberspeopleselftagcloudsection.php:48 -#: lib/subscriptionspeopleselftagcloudsection.php:48 -msgid "People Tagcloud as self-tagged" -msgstr "" - -#: lib/subscriberspeopletagcloudsection.php:48 -#: lib/subscriptionspeopletagcloudsection.php:48 -msgid "People Tagcloud as tagged" -msgstr "" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" - #: lib/subs.php:52 msgid "Already subscribed!" msgstr "" @@ -5194,6 +5180,20 @@ msgstr "無法刪除帳號" msgid "Couldn't delete subscription." msgstr "無法刪除帳號" +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "" + #: lib/tagcloudsection.php:56 msgid "None" msgstr "" From 78a649ca0af3ffbf1fd23d5ae9e84def7befa79e Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sat, 12 Dec 2009 18:21:57 +0100 Subject: [PATCH 120/172] Localisation updates for !StatusNet from !translatewiki.net !sntrans * add Egyptian Spoken Arabic (arz) --- lib/language.php | 1 + locale/arz/LC_MESSAGES/statusnet.po | 5214 +++++++++++++++++++++++++++ 2 files changed, 5215 insertions(+) create mode 100644 locale/arz/LC_MESSAGES/statusnet.po diff --git a/lib/language.php b/lib/language.php index 916cee7ed4..c037d30c3e 100644 --- a/lib/language.php +++ b/lib/language.php @@ -272,6 +272,7 @@ function get_nice_language_list() function get_all_languages() { return array( 'ar' => array('q' => 0.8, 'lang' => 'ar', 'name' => 'Arabic', 'direction' => 'rtl'), + 'arz' => array('q' => 0.8, 'lang' => 'arz', 'name' => 'Egyptian Spoken Arabic', 'direction' => 'rtl'), 'bg' => array('q' => 0.8, 'lang' => 'bg', 'name' => 'Bulgarian', 'direction' => 'ltr'), 'ca' => array('q' => 0.5, 'lang' => 'ca', 'name' => 'Catalan', 'direction' => 'ltr'), 'cs' => array('q' => 0.5, 'lang' => 'cs', 'name' => 'Czech', 'direction' => 'ltr'), diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po new file mode 100644 index 0000000000..6a2ccdf617 --- /dev/null +++ b/locale/arz/LC_MESSAGES/statusnet.po @@ -0,0 +1,5214 @@ +# Translation of StatusNet to Egyptian Spoken Arabic +# +# Author@translatewiki.net: Meno25 +# -- +# This file is distributed under the same license as the StatusNet package. +# +msgid "" +msgstr "" +"Project-Id-Version: StatusNet\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"PO-Revision-Date: 2009-12-12 17:09:12+0000\n" +"Language-Team: Arabic\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Translation-Project: translatewiki.net at http://translatewiki.net\n" +"X-Language-Code: arz\n" +"X-Message-Group: out-statusnet\n" +"Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " +"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" + +#: actions/all.php:63 actions/public.php:97 actions/replies.php:92 +#: actions/showfavorites.php:137 actions/tag.php:51 +msgid "No such page" +msgstr "لا صفحه كهذه" + +#: actions/all.php:74 actions/allrss.php:68 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 +#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 +#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 +#: actions/newmessage.php:116 actions/remotesubscribe.php:145 +#: actions/remotesubscribe.php:154 actions/replies.php:73 +#: actions/repliesrss.php:38 actions/showfavorites.php:105 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 +#: lib/command.php:364 lib/command.php:411 lib/command.php:467 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 +msgid "No such user." +msgstr "لا مستخدم كهذا." + +#: actions/all.php:84 +#, php-format +msgid "%s and friends, page %d" +msgstr "" + +#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#, php-format +msgid "%s and friends" +msgstr "%s والأصدقاء" + +#: actions/all.php:99 +#, php-format +msgid "Feed for friends of %s (RSS 1.0)" +msgstr "" + +#: actions/all.php:107 +#, php-format +msgid "Feed for friends of %s (RSS 2.0)" +msgstr "" + +#: actions/all.php:115 +#, php-format +msgid "Feed for friends of %s (Atom)" +msgstr "" + +#: actions/all.php:127 +#, php-format +msgid "" +"This is the timeline for %s and friends but no one has posted anything yet." +msgstr "" + +#: actions/all.php:132 +#, php-format +msgid "" +"Try subscribing to more people, [join a group](%%action.groups%%) or post " +"something yourself." +msgstr "" + +#: actions/all.php:134 +#, php-format +msgid "" +"You can try to [nudge %s](../%s) from his profile or [post something to his " +"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +msgstr "" + +#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 +#, php-format +msgid "" +"Why not [register an account](%%%%action.register%%%%) and then nudge %s or " +"post a notice to his or her attention." +msgstr "" + +#: actions/all.php:165 +msgid "You and friends" +msgstr "أنت والأصدقاء" + +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#, php-format +msgid "Updates from %1$s and friends on %2$s!" +msgstr "" + +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#, fuzzy +msgid "API method not found." +msgstr "لم يوجد رمز التأكيد." + +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 +#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +msgid "This method requires a POST." +msgstr "تتطلب هذه الطريقه POST." + +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +msgid "Could not update user." +msgstr "تعذّر تحديث المستخدم." + +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "ليس للمستخدم ملف شخصى." + +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "تعذّر حفظ الملف الشخصى." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 +#: actions/apiaccountupdateprofileimage.php:97 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: lib/designsettings.php:283 +#, php-format +msgid "" +"The server was unable to handle that much POST data (%s bytes) due to its " +"current configuration." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +msgid "Could not update your design." +msgstr "تعذّر تحديث تصميمك." + +#: actions/apiblockcreate.php:105 +#, fuzzy +msgid "You cannot block yourself!" +msgstr "لا يمكنك حذف المستخدمين." + +#: actions/apiblockcreate.php:119 +msgid "Block user failed." +msgstr "فشل منع المستخدم." + +#: actions/apiblockdestroy.php:107 +msgid "Unblock user failed." +msgstr "فشل إلغاء منع المستخدم." + +#: actions/apidirectmessage.php:89 +#, php-format +msgid "Direct messages from %s" +msgstr "رسائل مباشره من %s" + +#: actions/apidirectmessage.php:93 +#, php-format +msgid "All the direct messages sent from %s" +msgstr "" + +#: actions/apidirectmessage.php:101 +#, php-format +msgid "Direct messages to %s" +msgstr "رساله مباشره %s" + +#: actions/apidirectmessage.php:105 +#, php-format +msgid "All the direct messages sent to %s" +msgstr "" + +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 +#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "" + +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "لا نص فى الرسالة!" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "" + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "لم يُعثر على المستخدم المستلم." + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "" + +#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 +#: actions/apistatusesdestroy.php:113 +msgid "No status found with that ID." +msgstr "" + +#: actions/apifavoritecreate.php:119 +msgid "This status is already a favorite!" +msgstr "" + +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +msgid "Could not create favorite." +msgstr "تعذّر إنشاء مفضله." + +#: actions/apifavoritedestroy.php:122 +msgid "That status is not a favorite!" +msgstr "تلك الحاله ليست مفضلة!" + +#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +msgid "Could not delete favorite." +msgstr "تعذّر حذف المفضله." + +#: actions/apifriendshipscreate.php:109 +msgid "Could not follow user: User not found." +msgstr "" + +#: actions/apifriendshipscreate.php:118 +#, php-format +msgid "Could not follow user: %s is already on your list." +msgstr "" + +#: actions/apifriendshipsdestroy.php:109 +msgid "Could not unfollow user: User not found." +msgstr "" + +#: actions/apifriendshipsdestroy.php:120 +msgid "You cannot unfollow yourself!" +msgstr "" + +#: actions/apifriendshipsexists.php:94 +msgid "Two user ids or screen_names must be supplied." +msgstr "" + +#: actions/apifriendshipsshow.php:135 +msgid "Could not determine source user." +msgstr "" + +#: actions/apifriendshipsshow.php:143 +msgid "Could not find target user." +msgstr "تعذّر إيجاد المستخدم الهدف." + +#: actions/apigroupcreate.php:164 actions/editgroup.php:182 +#: actions/newgroup.php:126 actions/profilesettings.php:208 +#: actions/register.php:205 +msgid "Nickname must have only lowercase letters and numbers and no spaces." +msgstr "" + +#: actions/apigroupcreate.php:173 actions/editgroup.php:186 +#: actions/newgroup.php:130 actions/profilesettings.php:231 +#: actions/register.php:208 +msgid "Nickname already in use. Try another one." +msgstr "" + +#: actions/apigroupcreate.php:180 actions/editgroup.php:189 +#: actions/newgroup.php:133 actions/profilesettings.php:211 +#: actions/register.php:210 +msgid "Not a valid nickname." +msgstr "ليس اسمًا مستعارًا صحيحًا." + +#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/newgroup.php:139 actions/profilesettings.php:215 +#: actions/register.php:217 +msgid "Homepage is not a valid URL." +msgstr "الصفحه الرئيسيه ليست عنونًا صالحًا." + +#: actions/apigroupcreate.php:205 actions/editgroup.php:198 +#: actions/newgroup.php:142 actions/profilesettings.php:218 +#: actions/register.php:220 +msgid "Full name is too long (max 255 chars)." +msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)" + +#: actions/apigroupcreate.php:213 +#, php-format +msgid "Description is too long (max %d chars)." +msgstr "" + +#: actions/apigroupcreate.php:224 actions/editgroup.php:204 +#: actions/newgroup.php:148 actions/profilesettings.php:225 +#: actions/register.php:227 +msgid "Location is too long (max 255 chars)." +msgstr "" + +#: actions/apigroupcreate.php:243 actions/editgroup.php:215 +#: actions/newgroup.php:159 +#, php-format +msgid "Too many aliases! Maximum %d." +msgstr "" + +#: actions/apigroupcreate.php:264 actions/editgroup.php:224 +#: actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "كنيه غير صالحة: \"%s\"" + +#: actions/apigroupcreate.php:273 actions/editgroup.php:228 +#: actions/newgroup.php:172 +#, php-format +msgid "Alias \"%s\" already in use. Try another one." +msgstr "" + +#: actions/apigroupcreate.php:286 actions/editgroup.php:234 +#: actions/newgroup.php:178 +msgid "Alias can't be the same as nickname." +msgstr "" + +#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 +#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 +#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91 +msgid "Group not found!" +msgstr "لم توجد المجموعة!" + +#: actions/apigroupjoin.php:110 +msgid "You are already a member of that group." +msgstr "" + +#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221 +msgid "You have been blocked from that group by the admin." +msgstr "" + +#: actions/apigroupjoin.php:138 +#, php-format +msgid "Could not join user %s to group %s." +msgstr "" + +#: actions/apigroupleave.php:114 +msgid "You are not a member of this group." +msgstr "" + +#: actions/apigroupleave.php:124 +#, php-format +msgid "Could not remove user %s to group %s." +msgstr "" + +#: actions/apigrouplist.php:95 +#, php-format +msgid "%s's groups" +msgstr "مجموعات %s" + +#: actions/apigrouplist.php:103 +#, php-format +msgid "Groups %s is a member of on %s." +msgstr "" + +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "مجموعات %s" + +#: actions/apigrouplistall.php:94 +#, php-format +msgid "groups on %s" +msgstr "مجموعات %s" + +#: actions/apistatusesdestroy.php:107 +msgid "This method requires a POST or DELETE." +msgstr "" + +#: actions/apistatusesdestroy.php:130 +msgid "You may not delete another user's status." +msgstr "" + +#: actions/apistatusesshow.php:138 +msgid "Status deleted." +msgstr "حُذِفت الحاله." + +#: actions/apistatusesshow.php:144 +msgid "No status with that ID found." +msgstr "" + +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: scripts/maildaemon.php:71 +#, php-format +msgid "That's too long. Max notice size is %d chars." +msgstr "" + +#: actions/apistatusesupdate.php:198 +msgid "Not found" +msgstr "لم يوجد" + +#: actions/apistatusesupdate.php:227 actions/newnotice.php:183 +#, php-format +msgid "Max notice size is %d chars, including attachment URL." +msgstr "" + +#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261 +msgid "Unsupported format." +msgstr "نسق غير مدعوم." + +#: actions/apitimelinefavorites.php:108 +#, php-format +msgid "%s / Favorites from %s" +msgstr "" + +#: actions/apitimelinefavorites.php:120 +#, php-format +msgid "%s updates favorited by %s / %s." +msgstr "" + +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 +#: actions/grouprss.php:131 actions/userrss.php:90 +#, php-format +msgid "%s timeline" +msgstr "مسار %s الزمني" + +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 +#: actions/userrss.php:92 +#, php-format +msgid "Updates from %1$s on %2$s!" +msgstr "" + +#: actions/apitimelinementions.php:117 +#, php-format +msgid "%1$s / Updates mentioning %2$s" +msgstr "" + +#: actions/apitimelinementions.php:127 +#, php-format +msgid "%1$s updates that reply to updates from %2$s / %3$s." +msgstr "" + +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#, php-format +msgid "%s public timeline" +msgstr "مسار %s الزمنى العام" + +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#, php-format +msgid "%s updates from everyone!" +msgstr "" + +#: actions/apitimelinetag.php:102 actions/tag.php:66 +#, php-format +msgid "Notices tagged with %s" +msgstr "الإشعارات الموسومه ب%s" + +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 +#, php-format +msgid "Updates tagged with %1$s on %2$s!" +msgstr "" + +#: actions/apiusershow.php:96 +msgid "Not found." +msgstr "لم يوجد." + +#: actions/attachment.php:73 +msgid "No such attachment." +msgstr "لا مرفق كهذا." + +#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +msgid "No nickname." +msgstr "لا اسم مستعار." + +#: actions/avatarbynickname.php:64 +msgid "No size." +msgstr "لا حجم." + +#: actions/avatarbynickname.php:69 +msgid "Invalid size." +msgstr "حجم غير صالح." + +#: actions/avatarsettings.php:67 actions/showgroup.php:221 +#: lib/accountsettingsaction.php:112 +msgid "Avatar" +msgstr "أفتار" + +#: actions/avatarsettings.php:78 +#, php-format +msgid "You can upload your personal avatar. The maximum file size is %s." +msgstr "" + +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 +#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:103 +msgid "User without matching profile" +msgstr "" + +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 +#: actions/grouplogo.php:251 +msgid "Avatar settings" +msgstr "إعدادات الأفتار" + +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 +#: actions/grouplogo.php:199 actions/grouplogo.php:259 +msgid "Original" +msgstr "الأصلي" + +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 +#: actions/grouplogo.php:210 actions/grouplogo.php:271 +msgid "Preview" +msgstr "عاين" + +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 +#: lib/noticelist.php:550 +msgid "Delete" +msgstr "احذف" + +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 +msgid "Upload" +msgstr "ارفع" + +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 +msgid "Crop" +msgstr "" + +#: actions/avatarsettings.php:268 actions/disfavor.php:74 +#: actions/emailsettings.php:238 actions/favor.php:75 +#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:187 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 +#: actions/tagother.php:166 actions/unsubscribe.php:69 +#: actions/userauthorization.php:52 lib/designsettings.php:294 +msgid "There was a problem with your session token. Try again, please." +msgstr "" + +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "" + +#: actions/avatarsettings.php:328 +msgid "Pick a square area of the image to be your avatar" +msgstr "" + +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 +msgid "Lost our file data." +msgstr "" + +#: actions/avatarsettings.php:366 +msgid "Avatar updated." +msgstr "رُفع الأفتار." + +#: actions/avatarsettings.php:369 +msgid "Failed updating avatar." +msgstr "فشل تحديث الأفتار." + +#: actions/avatarsettings.php:393 +msgid "Avatar deleted." +msgstr "حُذف الأفتار." + +#: actions/block.php:69 +msgid "You already blocked that user." +msgstr "لقد منعت مسبقا هذا المستخدم." + +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +msgid "Block user" +msgstr "امنع المستخدم" + +#: actions/block.php:130 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" + +#: actions/block.php:143 actions/deletenotice.php:145 +#: actions/deleteuser.php:147 actions/groupblock.php:178 +msgid "No" +msgstr "لا" + +#: actions/block.php:143 actions/deleteuser.php:147 +msgid "Do not block this user" +msgstr "لا تمنع هذا المستخدم" + +#: actions/block.php:144 actions/deletenotice.php:146 +#: actions/deleteuser.php:148 actions/groupblock.php:179 +msgid "Yes" +msgstr "نعم" + +#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 +msgid "Block this user" +msgstr "امنع هذا المستخدم" + +#: actions/block.php:162 +msgid "Failed to save block information." +msgstr "فشل حفظ معلومات المنع." + +#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 +#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 +#: actions/groupmembers.php:76 actions/grouprss.php:91 +#: actions/joingroup.php:76 actions/showgroup.php:121 +msgid "No nickname" +msgstr "لا اسم مستعار" + +#: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 +#: actions/grouplogo.php:99 actions/groupmembers.php:83 +#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +msgid "No such group" +msgstr "لا مجموعه كهذه" + +#: actions/blockedfromgroup.php:90 +#, php-format +msgid "%s blocked profiles" +msgstr "" + +#: actions/blockedfromgroup.php:93 +#, php-format +msgid "%s blocked profiles, page %d" +msgstr "" + +#: actions/blockedfromgroup.php:108 +msgid "A list of the users blocked from joining this group." +msgstr "" + +#: actions/blockedfromgroup.php:281 +msgid "Unblock user from group" +msgstr "ألغ منع المستخدم من المجموعة" + +#: actions/blockedfromgroup.php:313 lib/unblockform.php:69 +msgid "Unblock" +msgstr "ألغِ المنع" + +#: actions/blockedfromgroup.php:313 lib/unblockform.php:80 +msgid "Unblock this user" +msgstr "ألغِ منع هذا المستخدم" + +#: actions/bookmarklet.php:50 +msgid "Post to " +msgstr "" + +#: actions/confirmaddress.php:75 +msgid "No confirmation code." +msgstr "لا رمز تأكيد." + +#: actions/confirmaddress.php:80 +msgid "Confirmation code not found." +msgstr "لم يوجد رمز التأكيد." + +#: actions/confirmaddress.php:85 +msgid "That confirmation code is not for you!" +msgstr "رمز التأكيد ليس لك!" + +#: actions/confirmaddress.php:90 +#, php-format +msgid "Unrecognized address type %s" +msgstr "" + +#: actions/confirmaddress.php:94 +msgid "That address has already been confirmed." +msgstr "" + +#: actions/confirmaddress.php:114 actions/emailsettings.php:296 +#: actions/emailsettings.php:427 actions/imsettings.php:258 +#: actions/imsettings.php:401 actions/othersettings.php:174 +#: actions/profilesettings.php:276 actions/smssettings.php:278 +#: actions/smssettings.php:420 +msgid "Couldn't update user." +msgstr "تعذّر تحديث المستخدم." + +#: actions/confirmaddress.php:126 actions/emailsettings.php:391 +#: actions/imsettings.php:363 actions/smssettings.php:382 +msgid "Couldn't delete email confirmation." +msgstr "تعذّر حذف تأكيد البريد الإلكترونى." + +#: actions/confirmaddress.php:144 +msgid "Confirm Address" +msgstr "عنوان التأكيد" + +#: actions/confirmaddress.php:159 +#, php-format +msgid "The address \"%s\" has been confirmed for your account." +msgstr "" + +#: actions/conversation.php:99 +msgid "Conversation" +msgstr "محادثة" + +#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 +#: lib/profileaction.php:216 lib/searchgroupnav.php:82 +msgid "Notices" +msgstr "الإشعارات" + +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." +msgstr "لا إشعار كهذا." + +#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 +#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 +#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 +#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 +#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 +#: lib/profileformaction.php:63 lib/settingsaction.php:72 +msgid "Not logged in." +msgstr "لست والجًا." + +#: actions/deletenotice.php:71 +msgid "Can't delete this notice." +msgstr "تعذّر حذف هذا الإشعار." + +#: actions/deletenotice.php:103 +msgid "" +"You are about to permanently delete a notice. Once this is done, it cannot " +"be undone." +msgstr "" + +#: actions/deletenotice.php:109 actions/deletenotice.php:141 +msgid "Delete notice" +msgstr "احذف الإشعار" + +#: actions/deletenotice.php:144 +msgid "Are you sure you want to delete this notice?" +msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟" + +#: actions/deletenotice.php:145 +msgid "Do not delete this notice" +msgstr "لا تحذف هذا الإشعار" + +#: actions/deletenotice.php:146 lib/noticelist.php:550 +msgid "Delete this notice" +msgstr "احذف هذا الإشعار" + +#: actions/deletenotice.php:157 +msgid "There was a problem with your session token. Try again, please." +msgstr "" + +#: actions/deleteuser.php:67 +msgid "You cannot delete users." +msgstr "لا يمكنك حذف المستخدمين." + +#: actions/deleteuser.php:74 +msgid "You can only delete local users." +msgstr "يمكنك حذف المستخدمين المحليين فقط." + +#: actions/deleteuser.php:110 actions/deleteuser.php:133 +msgid "Delete user" +msgstr "احذف المستخدم" + +#: actions/deleteuser.php:135 +msgid "" +"Are you sure you want to delete this user? This will clear all data about " +"the user from the database, without a backup." +msgstr "" + +#: actions/deleteuser.php:148 lib/deleteuserform.php:77 +msgid "Delete this user" +msgstr "احذف هذا المستخدم" + +#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +msgid "Design" +msgstr "التصميم" + +#: actions/designadminpanel.php:73 +msgid "Design settings for this StatusNet site." +msgstr "" + +#: actions/designadminpanel.php:275 +msgid "Invalid logo URL." +msgstr "مسار شعار غير صالح." + +#: actions/designadminpanel.php:279 +#, php-format +msgid "Theme not available: %s" +msgstr "السمه غير متوفرة: %s" + +#: actions/designadminpanel.php:375 +msgid "Change logo" +msgstr "غيّر الشعار" + +#: actions/designadminpanel.php:380 +msgid "Site logo" +msgstr "شعار الموقع" + +#: actions/designadminpanel.php:387 +msgid "Change theme" +msgstr "غيّر السمة" + +#: actions/designadminpanel.php:404 +msgid "Site theme" +msgstr "سمه الموقع" + +#: actions/designadminpanel.php:405 +msgid "Theme for the site." +msgstr "سمه الموقع." + +#: actions/designadminpanel.php:417 lib/designsettings.php:101 +msgid "Change background image" +msgstr "تغيير صوره الخلفية" + +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: lib/designsettings.php:178 +msgid "Background" +msgstr "الخلفية" + +#: actions/designadminpanel.php:427 +#, php-format +msgid "" +"You can upload a background image for the site. The maximum file size is %1" +"$s." +msgstr "" + +#: actions/designadminpanel.php:457 lib/designsettings.php:139 +msgid "On" +msgstr "مكّن" + +#: actions/designadminpanel.php:473 lib/designsettings.php:155 +msgid "Off" +msgstr "عطّل" + +#: actions/designadminpanel.php:474 lib/designsettings.php:156 +msgid "Turn background image on or off." +msgstr "مكّن صوره الخلفيه أو عطّلها." + +#: actions/designadminpanel.php:479 lib/designsettings.php:161 +msgid "Tile background image" +msgstr "" + +#: actions/designadminpanel.php:488 lib/designsettings.php:170 +msgid "Change colours" +msgstr "تغيير الألوان" + +#: actions/designadminpanel.php:510 lib/designsettings.php:191 +msgid "Content" +msgstr "المحتوى" + +#: actions/designadminpanel.php:523 lib/designsettings.php:204 +msgid "Sidebar" +msgstr "الشريط الجانبي" + +#: actions/designadminpanel.php:536 lib/designsettings.php:217 +msgid "Text" +msgstr "النص" + +#: actions/designadminpanel.php:549 lib/designsettings.php:230 +msgid "Links" +msgstr "وصلات" + +#: actions/designadminpanel.php:577 lib/designsettings.php:247 +msgid "Use defaults" +msgstr "استخدم المبدئيات" + +#: actions/designadminpanel.php:578 lib/designsettings.php:248 +msgid "Restore default designs" +msgstr "استعد التصميمات المبدئية" + +#: actions/designadminpanel.php:584 lib/designsettings.php:254 +msgid "Reset back to default" +msgstr "ارجع إلى المبدئي" + +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 +#: actions/imsettings.php:163 actions/othersettings.php:126 +#: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 +#: actions/siteadminpanel.php:421 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: lib/groupeditform.php:202 +msgid "Save" +msgstr "أرسل" + +#: actions/designadminpanel.php:587 lib/designsettings.php:257 +msgid "Save design" +msgstr "احفظ التصميم" + +#: actions/disfavor.php:81 +msgid "This notice is not a favorite!" +msgstr "هذا الشعار ليس مفضلًا!" + +#: actions/disfavor.php:94 +msgid "Add to favorites" +msgstr "أضف إلى المفضلات" + +#: actions/doc.php:69 +msgid "No such document." +msgstr "لا مستند كهذا." + +#: actions/editgroup.php:56 +#, php-format +msgid "Edit %s group" +msgstr "عدّل مجموعه %s" + +#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65 +msgid "You must be logged in to create a group." +msgstr "يجب أن تكون والجًا لتنشئ مجموعه." + +#: actions/editgroup.php:103 actions/editgroup.php:168 +#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 +msgid "You must be an admin to edit the group" +msgstr "يجب أن تكون إداريًا لتعدّل المجموعة" + +#: actions/editgroup.php:154 +msgid "Use this form to edit the group." +msgstr "استخدم هذا النموذج لتعديل المجموعه." + +#: actions/editgroup.php:201 actions/newgroup.php:145 +#, php-format +msgid "description is too long (max %d chars)." +msgstr "" + +#: actions/editgroup.php:253 +msgid "Could not update group." +msgstr "تعذر تحديث المجموعه." + +#: actions/editgroup.php:259 classes/User_group.php:390 +msgid "Could not create aliases." +msgstr "تعذّر إنشاء الكنى." + +#: actions/editgroup.php:269 +msgid "Options saved." +msgstr "حُفظت الخيارات." + +#: actions/emailsettings.php:60 +msgid "Email Settings" +msgstr "إعدادات البريد الإلكتروني" + +#: actions/emailsettings.php:71 +#, php-format +msgid "Manage how you get email from %%site.name%%." +msgstr "أدر كيف تستلم البريد الإلكترونى من %%site.name%%." + +#: actions/emailsettings.php:100 actions/imsettings.php:100 +#: actions/smssettings.php:104 +msgid "Address" +msgstr "العنوان" + +#: actions/emailsettings.php:105 +msgid "Current confirmed email address." +msgstr "عنوان البريد الإلكترونى المُؤكد الحالى." + +#: actions/emailsettings.php:107 actions/emailsettings.php:140 +#: actions/imsettings.php:108 actions/smssettings.php:115 +#: actions/smssettings.php:158 +msgid "Remove" +msgstr "أزل" + +#: actions/emailsettings.php:113 +msgid "" +"Awaiting confirmation on this address. Check your inbox (and spam box!) for " +"a message with further instructions." +msgstr "" + +#: actions/emailsettings.php:117 actions/imsettings.php:120 +#: actions/smssettings.php:126 +msgid "Cancel" +msgstr "ألغِ" + +#: actions/emailsettings.php:121 +msgid "Email Address" +msgstr "عنوان البريد الإلكتروني" + +#: actions/emailsettings.php:123 +msgid "Email address, like \"UserName@example.org\"" +msgstr "عنوان البريد الإلكترونى، مثل \"UserName@example.org\"" + +#: actions/emailsettings.php:126 actions/imsettings.php:133 +#: actions/smssettings.php:145 +msgid "Add" +msgstr "أضف" + +#: actions/emailsettings.php:133 actions/smssettings.php:152 +msgid "Incoming email" +msgstr "البريد الإلكترونى الوارد" + +#: actions/emailsettings.php:138 actions/smssettings.php:157 +msgid "Send email to this address to post new notices." +msgstr "أرسل بريدًا إلكترونيًا إلى هذا العنوان لترسل إشعارات جديده." + +#: actions/emailsettings.php:145 actions/smssettings.php:162 +msgid "Make a new email address for posting to; cancels the old one." +msgstr "أنشئ عنوان بريد إلكترونى لترسل إليه؛ ألغِ القديم." + +#: actions/emailsettings.php:148 actions/smssettings.php:164 +msgid "New" +msgstr "جديد" + +#: actions/emailsettings.php:153 actions/imsettings.php:139 +#: actions/smssettings.php:169 +msgid "Preferences" +msgstr "التفضيلات" + +#: actions/emailsettings.php:158 +msgid "Send me notices of new subscriptions through email." +msgstr "أرسل لى إشعارات بالاشتراكات الجديده عبر البريد الإلكترونى." + +#: actions/emailsettings.php:163 +msgid "Send me email when someone adds my notice as a favorite." +msgstr "أرسل لى بريدًا إلكرتونيًا عندما يضيف أحدهم إشعارى مفضله." + +#: actions/emailsettings.php:169 +msgid "Send me email when someone sends me a private message." +msgstr "" + +#: actions/emailsettings.php:174 +msgid "Send me email when someone sends me an \"@-reply\"." +msgstr "أرسل لى بريدًا إلكترونيًا عندما يرسل لى أحدهم \"@-رد\"." + +#: actions/emailsettings.php:179 +msgid "Allow friends to nudge me and send me an email." +msgstr "" + +#: actions/emailsettings.php:185 +msgid "I want to post notices by email." +msgstr "أريد أن أرسل الملاحظات عبر البريد الإلكترونى." + +#: actions/emailsettings.php:191 +msgid "Publish a MicroID for my email address." +msgstr "" + +#: actions/emailsettings.php:302 actions/imsettings.php:264 +#: actions/othersettings.php:180 actions/smssettings.php:284 +msgid "Preferences saved." +msgstr "حُفِظت التفضيلات." + +#: actions/emailsettings.php:320 +msgid "No email address." +msgstr "لا عنوان بريد إلكترونى." + +#: actions/emailsettings.php:327 +msgid "Cannot normalize that email address" +msgstr "" + +#: actions/emailsettings.php:331 actions/siteadminpanel.php:158 +msgid "Not a valid email address" +msgstr "ليس عنوان بريد صالح" + +#: actions/emailsettings.php:334 +msgid "That is already your email address." +msgstr "هذا هو عنوان بريدك الإكترونى سابقًا." + +#: actions/emailsettings.php:337 +msgid "That email address already belongs to another user." +msgstr "هذا البريد الإلكترونى ملك مستخدم آخر بالفعل." + +#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/smssettings.php:337 +msgid "Couldn't insert confirmation code." +msgstr "تعذّر إدراج رمز التأكيد." + +#: actions/emailsettings.php:359 +msgid "" +"A confirmation code was sent to the email address you added. Check your " +"inbox (and spam box!) for the code and instructions on how to use it." +msgstr "" + +#: actions/emailsettings.php:379 actions/imsettings.php:351 +#: actions/smssettings.php:370 +msgid "No pending confirmation to cancel." +msgstr "" + +#: actions/emailsettings.php:383 actions/imsettings.php:355 +msgid "That is the wrong IM address." +msgstr "هذا عنوان محادثه فوريه خاطئ." + +#: actions/emailsettings.php:395 actions/imsettings.php:367 +#: actions/smssettings.php:386 +msgid "Confirmation cancelled." +msgstr "أُلغى التأكيد." + +#: actions/emailsettings.php:413 +msgid "That is not your email address." +msgstr "هذا ليس عنوان بريدك الإلكترونى." + +#: actions/emailsettings.php:432 actions/imsettings.php:408 +#: actions/smssettings.php:425 +msgid "The address was removed." +msgstr "أزيل هذا العنوان." + +#: actions/emailsettings.php:446 actions/smssettings.php:518 +msgid "No incoming email address." +msgstr "" + +#: actions/emailsettings.php:456 actions/emailsettings.php:478 +#: actions/smssettings.php:528 actions/smssettings.php:552 +msgid "Couldn't update user record." +msgstr "" + +#: actions/emailsettings.php:459 actions/smssettings.php:531 +msgid "Incoming email address removed." +msgstr "" + +#: actions/emailsettings.php:481 actions/smssettings.php:555 +msgid "New incoming email address added." +msgstr "" + +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "هذا الإشعار مفضله مسبقًا!" + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "ألغِ تفضيل المفضلة" + +#: actions/favorited.php:65 lib/popularnoticesection.php:88 +#: lib/publicgroupnav.php:93 +msgid "Popular notices" +msgstr "إشعارات مشهورة" + +#: actions/favorited.php:67 +#, php-format +msgid "Popular notices, page %d" +msgstr "إشعارات مشهوره، الصفحه %d" + +#: actions/favorited.php:79 +msgid "The most popular notices on the site right now." +msgstr "أشهر الإشعارات على الموقع حاليًا." + +#: actions/favorited.php:150 +msgid "Favorite notices appear on this page but no one has favorited one yet." +msgstr "" + +#: 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 "" + +#: actions/favorited.php:156 +#, php-format +msgid "" +"Why not [register an account](%%action.register%%) and be the first to add a " +"notice to your favorites!" +msgstr "" + +#: actions/favoritesrss.php:111 actions/showfavorites.php:77 +#: lib/personalgroupnav.php:115 +#, php-format +msgid "%s's favorite notices" +msgstr "إشعارات %s المُفضلة" + +#: actions/favoritesrss.php:115 +#, php-format +msgid "Updates favored by %1$s on %2$s!" +msgstr "" + +#: actions/featured.php:69 lib/featureduserssection.php:87 +#: lib/publicgroupnav.php:89 +msgid "Featured users" +msgstr "مستخدمون مختارون" + +#: actions/featured.php:71 +#, php-format +msgid "Featured users, page %d" +msgstr "مستخدمون مختارون، صفحه %d" + +#: actions/featured.php:99 +#, php-format +msgid "A selection of some of the great users on %s" +msgstr "قسم للمستخدمين المتميزين على %s" + +#: actions/file.php:34 +msgid "No notice id" +msgstr "لا هويه إشعار" + +#: actions/file.php:38 +msgid "No notice" +msgstr "لا إشعار" + +#: actions/file.php:42 +msgid "No attachments" +msgstr "لا مرفقات" + +#: actions/file.php:51 +msgid "No uploaded attachments" +msgstr "لا مرفقات مرفوعة" + +#: actions/finishremotesubscribe.php:69 +msgid "Not expecting this response!" +msgstr "لم أتوقع هذا الرد!" + +#: actions/finishremotesubscribe.php:80 +msgid "User being listened to does not exist." +msgstr "المستخدم الذى تستمع إليه غير موجود." + +#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59 +msgid "You can use the local subscription!" +msgstr "" + +#: actions/finishremotesubscribe.php:99 +msgid "That user has blocked you from subscribing." +msgstr "" + +#: actions/finishremotesubscribe.php:110 +msgid "You are not authorized." +msgstr "لا تملك تصريحًا." + +#: actions/finishremotesubscribe.php:113 +msgid "Could not convert request token to access token." +msgstr "" + +#: actions/finishremotesubscribe.php:118 +msgid "Remote service uses unknown version of OMB protocol." +msgstr "" + +#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "خطأ أثناء تحديث الملف الشخصى البعيد" + +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 +#: actions/groupunblock.php:86 actions/leavegroup.php:83 +#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +msgid "No such group." +msgstr "لا مجموعه كهذه." + +#: actions/getfile.php:75 +msgid "No such file." +msgstr "لا ملف كهذا." + +#: actions/getfile.php:79 +msgid "Cannot read file." +msgstr "تعذّرت قراءه الملف." + +#: 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 "لا ملف شخصى مُحدّد." + +#: actions/groupblock.php:76 actions/groupunblock.php:76 +#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 +#: lib/profileformaction.php:77 +msgid "No profile with that ID." +msgstr "لا ملف شخصى بهذه الهويه." + +#: actions/groupblock.php:81 actions/groupunblock.php:81 +#: actions/makeadmin.php:81 +msgid "No group specified." +msgstr "لا مجموعه مُحدّده." + +#: actions/groupblock.php:91 +msgid "Only an admin can block group members." +msgstr "" + +#: actions/groupblock.php:95 +msgid "User is already blocked from group." +msgstr "" + +#: actions/groupblock.php:100 +msgid "User is not a member of group." +msgstr "المستخدم ليس عضوًا فى المجموعه." + +#: actions/groupblock.php:136 actions/groupmembers.php:314 +msgid "Block user from group" +msgstr "امنع المستخدم من المجموعة" + +#: actions/groupblock.php:162 +#, php-format +msgid "" +"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " +"be removed from the group, unable to post, and unable to subscribe to the " +"group in the future." +msgstr "" + +#: actions/groupblock.php:178 +msgid "Do not block this user from this group" +msgstr "لا تمنع هذا المستخدم من هذه المجموعة" + +#: actions/groupblock.php:179 +msgid "Block this user from this group" +msgstr "امنع هذا المستخدم من هذه المجموعة" + +#: actions/groupblock.php:196 +msgid "Database error blocking user from group." +msgstr "خطأ فى قاعده البيانات أثناء منع المستخدم من المجموعه." + +#: actions/groupbyid.php:74 +msgid "No ID" +msgstr "لا هوية" + +#: actions/groupdesignsettings.php:68 +msgid "You must be logged in to edit a group." +msgstr "يجب أن تلج لتُعدّل المجموعات." + +#: actions/groupdesignsettings.php:141 +msgid "Group design" +msgstr "تصميم المجموعة" + +#: actions/groupdesignsettings.php:152 +msgid "" +"Customize the way your group looks with a background image and a colour " +"palette of your choice." +msgstr "" + +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 +msgid "Couldn't update your design." +msgstr "تعذّر تحديث تصميمك." + +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 +msgid "Unable to save your design settings!" +msgstr "" + +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 +msgid "Design preferences saved." +msgstr "" + +#: actions/grouplogo.php:139 actions/grouplogo.php:192 +msgid "Group logo" +msgstr "شعار المجموعة" + +#: actions/grouplogo.php:150 +#, php-format +msgid "" +"You can upload a logo image for your group. The maximum file size is %s." +msgstr "" + +#: actions/grouplogo.php:362 +msgid "Pick a square area of the image to be the logo." +msgstr "" + +#: actions/grouplogo.php:396 +msgid "Logo updated." +msgstr "حُدّث الشعار." + +#: actions/grouplogo.php:398 +msgid "Failed updating logo." +msgstr "فشل رفع الشعار." + +#: actions/groupmembers.php:93 lib/groupnav.php:92 +#, php-format +msgid "%s group members" +msgstr "أعضاء مجموعه %s" + +#: actions/groupmembers.php:96 +#, php-format +msgid "%s group members, page %d" +msgstr "" + +#: actions/groupmembers.php:111 +msgid "A list of the users in this group." +msgstr "قائمه بمستخدمى هذه المجموعه." + +#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107 +msgid "Admin" +msgstr "إداري" + +#: actions/groupmembers.php:346 lib/blockform.php:69 +msgid "Block" +msgstr "امنع" + +#: actions/groupmembers.php:441 +msgid "Make user an admin of the group" +msgstr "" + +#: actions/groupmembers.php:473 +msgid "Make Admin" +msgstr "" + +#: actions/groupmembers.php:473 +msgid "Make this user an admin" +msgstr "اجعل هذا المستخدم إداريًا" + +#: actions/grouprss.php:133 +#, php-format +msgid "Updates from members of %1$s on %2$s!" +msgstr "" + +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "مجموعات" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "المجموعات، صفحه %d" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +msgid "Create a new group" +msgstr "أنشئ مجموعه جديدة" + +#: actions/groupsearch.php:52 +#, php-format +msgid "" +"Search for groups on %%site.name%% by their name, location, or description. " +"Separate the terms by spaces; they must be 3 characters or more." +msgstr "" + +#: actions/groupsearch.php:58 +msgid "Group search" +msgstr "بحث فى المجموعات" + +#: actions/groupsearch.php:79 actions/noticesearch.php:117 +#: actions/peoplesearch.php:83 +msgid "No results." +msgstr "لا نتائج." + +#: actions/groupsearch.php:82 +#, php-format +msgid "" +"If you can't find the group you're looking for, you can [create it](%%action." +"newgroup%%) yourself." +msgstr "" + +#: actions/groupsearch.php:85 +#, php-format +msgid "" +"Why not [register an account](%%action.register%%) and [create the group](%%" +"action.newgroup%%) yourself!" +msgstr "" + +#: actions/groupunblock.php:91 +msgid "Only an admin can unblock group members." +msgstr "" + +#: actions/groupunblock.php:95 +msgid "User is not blocked from group." +msgstr "المستخدم ليس ممنوعًا من المجموعه." + +#: actions/groupunblock.php:128 actions/unblock.php:77 +msgid "Error removing the block." +msgstr "خطأ أثناء منع الحجب." + +#: actions/imsettings.php:59 +msgid "IM Settings" +msgstr "إعدادات المراسله الفورية" + +#: actions/imsettings.php:70 +#, php-format +msgid "" +"You can send and receive notices through Jabber/GTalk [instant messages](%%" +"doc.im%%). Configure your address and settings below." +msgstr "" + +#: actions/imsettings.php:89 +msgid "IM is not available." +msgstr "المراسله الفوريه غير متوفره." + +#: actions/imsettings.php:106 +msgid "Current confirmed Jabber/GTalk address." +msgstr "" + +#: actions/imsettings.php:114 +#, php-format +msgid "" +"Awaiting confirmation on this address. Check your Jabber/GTalk account for a " +"message with further instructions. (Did you add %s to your buddy list?)" +msgstr "" + +#: actions/imsettings.php:124 +msgid "IM Address" +msgstr "عنوان المراسله الفورية" + +#: actions/imsettings.php:126 +#, php-format +msgid "" +"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " +"add %s to your buddy list in your IM client or on GTalk." +msgstr "" + +#: actions/imsettings.php:143 +msgid "Send me notices through Jabber/GTalk." +msgstr "" + +#: actions/imsettings.php:148 +msgid "Post a notice when my Jabber/GTalk status changes." +msgstr "" + +#: actions/imsettings.php:153 +msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." +msgstr "" + +#: actions/imsettings.php:159 +msgid "Publish a MicroID for my Jabber/GTalk address." +msgstr "" + +#: actions/imsettings.php:285 +msgid "No Jabber ID." +msgstr "لا هويه جابر." + +#: actions/imsettings.php:292 +msgid "Cannot normalize that Jabber ID" +msgstr "" + +#: actions/imsettings.php:296 +msgid "Not a valid Jabber ID" +msgstr "ليست هويه جابر صالحة" + +#: actions/imsettings.php:299 +msgid "That is already your Jabber ID." +msgstr "" + +#: actions/imsettings.php:302 +msgid "Jabber ID already belongs to another user." +msgstr "" + +#: actions/imsettings.php:327 +#, php-format +msgid "" +"A confirmation code was sent to the IM address you added. You must approve %" +"s for sending messages to you." +msgstr "" + +#: actions/imsettings.php:387 +msgid "That is not your Jabber ID." +msgstr "هذه ليست هويتك فى جابر." + +#: actions/inbox.php:59 +#, php-format +msgid "Inbox for %s - page %d" +msgstr "" + +#: actions/inbox.php:62 +#, php-format +msgid "Inbox for %s" +msgstr "" + +#: actions/inbox.php:115 +msgid "This is your inbox, which lists your incoming private messages." +msgstr "" + +#: actions/invite.php:39 +msgid "Invites have been disabled." +msgstr "" + +#: actions/invite.php:41 +#, php-format +msgid "You must be logged in to invite other users to use %s" +msgstr "" + +#: actions/invite.php:72 +#, php-format +msgid "Invalid email address: %s" +msgstr "عنوان بريد إلكترونى غير صالح: %s" + +#: actions/invite.php:110 +msgid "Invitation(s) sent" +msgstr "أُرسلت الدعوة" + +#: actions/invite.php:112 +msgid "Invite new users" +msgstr "دعوه مستخدمين جدد" + +#: actions/invite.php:128 +msgid "You are already subscribed to these users:" +msgstr "" + +#: actions/invite.php:131 actions/invite.php:139 +#, php-format +msgid "%s (%s)" +msgstr "%s (%s)" + +#: actions/invite.php:136 +msgid "" +"These people are already users and you were automatically subscribed to them:" +msgstr "" + +#: actions/invite.php:144 +msgid "Invitation(s) sent to the following people:" +msgstr "" + +#: actions/invite.php:150 +msgid "" +"You will be notified when your invitees accept the invitation and register " +"on the site. Thanks for growing the community!" +msgstr "" + +#: actions/invite.php:162 +msgid "" +"Use this form to invite your friends and colleagues to use this service." +msgstr "" + +#: actions/invite.php:187 +msgid "Email addresses" +msgstr "عناوين البريد الإلكتروني" + +#: actions/invite.php:189 +msgid "Addresses of friends to invite (one per line)" +msgstr "" + +#: actions/invite.php:192 +msgid "Personal message" +msgstr "رساله شخصية" + +#: actions/invite.php:194 +msgid "Optionally add a personal message to the invitation." +msgstr "" + +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 +msgid "Send" +msgstr "أرسل" + +#: actions/invite.php:226 +#, php-format +msgid "%1$s has invited you to join them on %2$s" +msgstr "" + +#: actions/invite.php:228 +#, php-format +msgid "" +"%1$s has invited you to join them on %2$s (%3$s).\n" +"\n" +"%2$s is a micro-blogging service that lets you keep up-to-date with people " +"you know and people who interest you.\n" +"\n" +"You can also share news about yourself, your thoughts, or your life online " +"with people who know about you. It's also great for meeting new people who " +"share your interests.\n" +"\n" +"%1$s said:\n" +"\n" +"%4$s\n" +"\n" +"You can see %1$s's profile page on %2$s here:\n" +"\n" +"%5$s\n" +"\n" +"If you'd like to try the service, click on the link below to accept the " +"invitation.\n" +"\n" +"%6$s\n" +"\n" +"If not, you can ignore this message. Thanks for your patience and your " +"time.\n" +"\n" +"Sincerely, %2$s\n" +msgstr "" + +#: actions/joingroup.php:60 +msgid "You must be logged in to join a group." +msgstr "" + +#: actions/joingroup.php:90 lib/command.php:217 +msgid "You are already a member of that group" +msgstr "" + +#: actions/joingroup.php:128 lib/command.php:234 +#, php-format +msgid "Could not join user %s to group %s" +msgstr "" + +#: actions/joingroup.php:135 lib/command.php:239 +#, php-format +msgid "%s joined group %s" +msgstr "%s انضم إلى مجموعه %s" + +#: actions/leavegroup.php:60 +msgid "You must be logged in to leave a group." +msgstr "" + +#: actions/leavegroup.php:90 lib/command.php:268 +msgid "You are not a member of that group." +msgstr "لست عضوا فى تلك المجموعه." + +#: actions/leavegroup.php:119 lib/command.php:278 +msgid "Could not find membership record." +msgstr "" + +#: actions/leavegroup.php:127 lib/command.php:284 +#, php-format +msgid "Could not remove user %s to group %s" +msgstr "" + +#: actions/leavegroup.php:134 lib/command.php:289 +#, php-format +msgid "%s left group %s" +msgstr "" + +#: actions/login.php:83 actions/register.php:137 +msgid "Already logged in." +msgstr "والج بالفعل." + +#: actions/login.php:114 actions/login.php:124 +msgid "Invalid or expired token." +msgstr "" + +#: actions/login.php:147 +msgid "Incorrect username or password." +msgstr "اسم المستخدم أو كلمه السر غير صحيحان." + +#: actions/login.php:153 +msgid "Error setting user. You are probably not authorized." +msgstr "خطأ أثناء ضبط المستخدم. لست مُصرحًا على الأرجح." + +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 +#: lib/logingroupnav.php:79 +msgid "Login" +msgstr "لُج" + +#: actions/login.php:247 +msgid "Login to site" +msgstr "لُج إلى الموقع" + +#: actions/login.php:250 actions/profilesettings.php:106 +#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: lib/groupeditform.php:152 lib/userprofile.php:131 +msgid "Nickname" +msgstr "الاسم المستعار" + +#: actions/login.php:253 actions/register.php:428 +#: lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "كلمه السر" + +#: actions/login.php:256 actions/register.php:477 +msgid "Remember me" +msgstr "تذكّرني" + +#: actions/login.php:257 actions/register.php:479 +msgid "Automatically login in the future; not for shared computers!" +msgstr "" + +#: actions/login.php:267 +msgid "Lost or forgotten password?" +msgstr "أنسيت كلمه السر؟" + +#: actions/login.php:286 +msgid "" +"For security reasons, please re-enter your user name and password before " +"changing your settings." +msgstr "" + +#: actions/login.php:290 +#, php-format +msgid "" +"Login with your username and password. Don't have a username yet? [Register]" +"(%%action.register%%) a new account." +msgstr "" + +#: actions/makeadmin.php:91 +msgid "Only an admin can make another user an admin." +msgstr "" + +#: actions/makeadmin.php:95 +#, php-format +msgid "%s is already an admin for group \"%s\"." +msgstr "" + +#: actions/makeadmin.php:132 +#, php-format +msgid "Can't get membership record for %s in group %s" +msgstr "" + +#: actions/makeadmin.php:145 +#, php-format +msgid "Can't make %s an admin for group %s" +msgstr "" + +#: actions/microsummary.php:69 +msgid "No current status" +msgstr "لا حاله حالية" + +#: actions/newgroup.php:53 +msgid "New group" +msgstr "مجموعه جديدة" + +#: actions/newgroup.php:110 +msgid "Use this form to create a new group." +msgstr "استخدم هذا النموذج لإنشاء مجموعه جديده." + +#: actions/newmessage.php:71 actions/newmessage.php:231 +msgid "New message" +msgstr "رساله جديدة" + +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +msgid "You can't send a message to this user." +msgstr "" + +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 +#: lib/command.php:424 +msgid "No content!" +msgstr "لا محتوى!" + +#: actions/newmessage.php:158 +msgid "No recipient specified." +msgstr "لا مستلم حُدّد." + +#: actions/newmessage.php:164 lib/command.php:370 +msgid "" +"Don't send a message to yourself; just say it to yourself quietly instead." +msgstr "" + +#: actions/newmessage.php:181 +msgid "Message sent" +msgstr "أُرسلت الرسالة" + +#: actions/newmessage.php:185 lib/command.php:375 +#, php-format +msgid "Direct message to %s sent" +msgstr "" + +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 +msgid "Ajax Error" +msgstr "خطأ أجاكس" + +#: actions/newnotice.php:69 +msgid "New notice" +msgstr "إشعار جديد" + +#: actions/newnotice.php:208 +msgid "Notice posted" +msgstr "أُرسل الإشعار" + +#: actions/noticesearch.php:68 +#, php-format +msgid "" +"Search for notices on %%site.name%% by their contents. Separate search terms " +"by spaces; they must be 3 characters or more." +msgstr "" + +#: actions/noticesearch.php:78 +msgid "Text search" +msgstr "بحث فى النصوص" + +#: actions/noticesearch.php:91 +#, php-format +msgid "Search results for \"%s\" on %s" +msgstr "نتائج البحث عن \"%s\" فى %s" + +#: actions/noticesearch.php:121 +#, php-format +msgid "" +"Be the first to [post on this topic](%%%%action.newnotice%%%%?" +"status_textarea=%s)!" +msgstr "" + +#: actions/noticesearch.php:124 +#, php-format +msgid "" +"Why not [register an account](%%%%action.register%%%%) and be the first to " +"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" +msgstr "" + +#: actions/noticesearchrss.php:96 +#, php-format +msgid "Updates with \"%s\"" +msgstr "" + +#: actions/noticesearchrss.php:98 +#, php-format +msgid "Updates matching search term \"%1$s\" on %2$s!" +msgstr "" + +#: actions/nudge.php:85 +msgid "" +"This user doesn't allow nudges or hasn't confirmed or set his email yet." +msgstr "" + +#: actions/nudge.php:94 +msgid "Nudge sent" +msgstr "أرسل التنبيه" + +#: actions/nudge.php:97 +msgid "Nudge sent!" +msgstr "أُرسل التنبيه!" + +#: actions/oembed.php:79 actions/shownotice.php:100 +msgid "Notice has no profile" +msgstr "" + +#: actions/oembed.php:86 actions/shownotice.php:180 +#, php-format +msgid "%1$s's status on %2$s" +msgstr "" + +#: actions/oembed.php:157 +msgid "content type " +msgstr "نوع المحتوى " + +#: actions/oembed.php:160 +msgid "Only " +msgstr "" + +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 +#: lib/api.php:1039 lib/api.php:1149 +msgid "Not a supported data format." +msgstr "ليس نسق بيانات مدعوم." + +#: actions/opensearch.php:64 +msgid "People Search" +msgstr "بحث فى الأشخاص" + +#: actions/opensearch.php:67 +msgid "Notice Search" +msgstr "بحث الإشعارات" + +#: actions/othersettings.php:60 +msgid "Other Settings" +msgstr "إعدادات أخرى" + +#: actions/othersettings.php:71 +msgid "Manage various other options." +msgstr "أدر خيارات أخرى عديده." + +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr " (خدمه حرة)" + +#: actions/othersettings.php:116 +msgid "Shorten URLs with" +msgstr "قصّر المسارات بـ" + +#: actions/othersettings.php:117 +msgid "Automatic shortening service to use." +msgstr "خدمه التقصير المطلوب استخدامها." + +#: actions/othersettings.php:122 +msgid "View profile designs" +msgstr "اعرض تصاميم الملف الشخصي" + +#: actions/othersettings.php:123 +msgid "Show or hide profile designs." +msgstr "أظهر أو أخفِ تصاميم الملفات الشخصيه." + +#: actions/othersettings.php:153 +msgid "URL shortening service is too long (max 50 chars)." +msgstr "" + +#: actions/outbox.php:58 +#, php-format +msgid "Outbox for %s - page %d" +msgstr "" + +#: actions/outbox.php:61 +#, php-format +msgid "Outbox for %s" +msgstr "" + +#: actions/outbox.php:116 +msgid "This is your outbox, which lists private messages you have sent." +msgstr "" + +#: actions/passwordsettings.php:58 +msgid "Change password" +msgstr "غيّر كلمه السر" + +#: actions/passwordsettings.php:69 +msgid "Change your password." +msgstr "غيّر كلمه سرك." + +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 +msgid "Password change" +msgstr "تغيير كلمه السر" + +#: actions/passwordsettings.php:104 +msgid "Old password" +msgstr "كلمه السر القديمة" + +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 +msgid "New password" +msgstr "كلمه سر جديدة" + +#: actions/passwordsettings.php:109 +msgid "6 or more characters" +msgstr "" + +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 +#: actions/register.php:432 actions/smssettings.php:134 +msgid "Confirm" +msgstr "أكّد" + +#: actions/passwordsettings.php:113 actions/recoverpassword.php:240 +msgid "Same as password above" +msgstr "نفس كلمه السر أعلاه" + +#: actions/passwordsettings.php:117 +msgid "Change" +msgstr "غيّر" + +#: actions/passwordsettings.php:154 actions/register.php:230 +msgid "Password must be 6 or more characters." +msgstr "يجب أن تكون كلمه السر 6 حروف أو أكثر." + +#: actions/passwordsettings.php:157 actions/register.php:233 +msgid "Passwords don't match." +msgstr "كلمتا السر غير متطابقتين." + +#: actions/passwordsettings.php:165 +msgid "Incorrect old password" +msgstr "كلمه السر القديمه غير صحيحة" + +#: actions/passwordsettings.php:181 +msgid "Error saving user; invalid." +msgstr "خطأ أثناء حفظ المستخدم؛ غير صالح." + +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +msgid "Can't save new password." +msgstr "تعذّر حفظ كلمه السر الجديده." + +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 +msgid "Password saved." +msgstr "حُفظت كلمه السر." + +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +msgid "Paths" +msgstr "المسارات" + +#: actions/pathsadminpanel.php:70 +msgid "Path and server settings for this StatusNet site." +msgstr "" + +#: actions/pathsadminpanel.php:140 +#, php-format +msgid "Theme directory not readable: %s" +msgstr "لا يمكن قراءه دليل السمات: %s" + +#: actions/pathsadminpanel.php:146 +#, php-format +msgid "Avatar directory not writable: %s" +msgstr "لا يمكن الكتابه فى دليل الأفتارات: %s" + +#: actions/pathsadminpanel.php:152 +#, php-format +msgid "Background directory not writable: %s" +msgstr "لا يمكن الكتابه فى دليل الخلفيات: %s" + +#: actions/pathsadminpanel.php:160 +#, php-format +msgid "Locales directory not readable: %s" +msgstr "لا يمكن قراءه دليل المحليات: %s" + +#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58 +#: lib/adminpanelaction.php:299 +msgid "Site" +msgstr "الموقع" + +#: actions/pathsadminpanel.php:216 +msgid "Path" +msgstr "المسار" + +#: actions/pathsadminpanel.php:216 +msgid "Site path" +msgstr "مسار الموقع" + +#: actions/pathsadminpanel.php:220 +msgid "Path to locales" +msgstr "مسار المحليات" + +#: actions/pathsadminpanel.php:220 +msgid "Directory path to locales" +msgstr "مسار دليل المحليات" + +#: actions/pathsadminpanel.php:227 +msgid "Theme" +msgstr "السمة" + +#: actions/pathsadminpanel.php:232 +msgid "Theme server" +msgstr "خادوم السمات" + +#: actions/pathsadminpanel.php:236 +msgid "Theme path" +msgstr "مسار السمات" + +#: actions/pathsadminpanel.php:240 +msgid "Theme directory" +msgstr "دليل السمات" + +#: actions/pathsadminpanel.php:247 +msgid "Avatars" +msgstr "أفتارات" + +#: actions/pathsadminpanel.php:252 +msgid "Avatar server" +msgstr "خادوم الأفتارات" + +#: actions/pathsadminpanel.php:256 +msgid "Avatar path" +msgstr "مسار الأفتارات" + +#: actions/pathsadminpanel.php:260 +msgid "Avatar directory" +msgstr "دليل الأفتار." + +#: actions/pathsadminpanel.php:269 +msgid "Backgrounds" +msgstr "خلفيات" + +#: actions/pathsadminpanel.php:273 +msgid "Background server" +msgstr "خادوم الخلفيات" + +#: actions/pathsadminpanel.php:277 +msgid "Background path" +msgstr "مسار الخلفيات" + +#: actions/pathsadminpanel.php:281 +msgid "Background directory" +msgstr "دليل الخلفيات" + +#: actions/pathsadminpanel.php:297 +msgid "Save paths" +msgstr "احفظ المسارات" + +#: actions/peoplesearch.php:52 +#, php-format +msgid "" +"Search for people on %%site.name%% by their name, location, or interests. " +"Separate the terms by spaces; they must be 3 characters or more." +msgstr "" + +#: actions/peoplesearch.php:58 +msgid "People search" +msgstr "بحث فى الأشخاص" + +#: actions/peopletag.php:70 +#, php-format +msgid "Not a valid people tag: %s" +msgstr "ليس وسم أشخاص صالح: %s" + +#: actions/peopletag.php:144 +#, php-format +msgid "Users self-tagged with %s - page %d" +msgstr "" + +#: actions/postnotice.php:84 +msgid "Invalid notice content" +msgstr "محتوى إشعار غير صالح" + +#: actions/postnotice.php:90 +#, php-format +msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +msgstr "" + +#: actions/profilesettings.php:60 +msgid "Profile settings" +msgstr "إعدادات الملف الشخصي" + +#: actions/profilesettings.php:71 +msgid "" +"You can update your personal profile info here so people know more about you." +msgstr "" + +#: actions/profilesettings.php:99 +msgid "Profile information" +msgstr "معلومات الملف الشخصي" + +#: actions/profilesettings.php:108 lib/groupeditform.php:154 +msgid "1-64 lowercase letters or numbers, no punctuation or spaces" +msgstr "" + +#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/showgroup.php:247 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:149 +msgid "Full name" +msgstr "الاسم الكامل" + +#: actions/profilesettings.php:115 actions/register.php:452 +#: lib/groupeditform.php:161 +msgid "Homepage" +msgstr "الصفحه الرئيسية" + +#: actions/profilesettings.php:117 actions/register.php:454 +msgid "URL of your homepage, blog, or profile on another site" +msgstr "" + +#: actions/profilesettings.php:122 actions/register.php:460 +#, php-format +msgid "Describe yourself and your interests in %d chars" +msgstr "" + +#: actions/profilesettings.php:125 actions/register.php:463 +msgid "Describe yourself and your interests" +msgstr "صِف نفسك واهتماماتك" + +#: actions/profilesettings.php:127 actions/register.php:465 +msgid "Bio" +msgstr "السيرة" + +#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/showgroup.php:256 actions/tagother.php:112 +#: actions/userauthorization.php:158 lib/groupeditform.php:177 +#: lib/userprofile.php:164 +msgid "Location" +msgstr "الموقع" + +#: actions/profilesettings.php:134 actions/register.php:472 +msgid "Where you are, like \"City, State (or Region), Country\"" +msgstr "" + +#: actions/profilesettings.php:138 actions/tagother.php:149 +#: actions/tagother.php:209 lib/subscriptionlist.php:106 +#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +msgid "Tags" +msgstr "الوسوم" + +#: actions/profilesettings.php:140 +msgid "" +"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" +msgstr "" + +#: actions/profilesettings.php:144 actions/siteadminpanel.php:307 +msgid "Language" +msgstr "اللغة" + +#: actions/profilesettings.php:145 +msgid "Preferred language" +msgstr "اللغه المفضلة" + +#: actions/profilesettings.php:154 +msgid "Timezone" +msgstr "المنطقه الزمنية" + +#: actions/profilesettings.php:155 +msgid "What timezone are you normally in?" +msgstr "ما المنطقه الزمنيه التى تتواجد فيها عادة؟" + +#: actions/profilesettings.php:160 +msgid "" +"Automatically subscribe to whoever subscribes to me (best for non-humans)" +msgstr "" + +#: actions/profilesettings.php:221 actions/register.php:223 +#, php-format +msgid "Bio is too long (max %d chars)." +msgstr "" + +#: actions/profilesettings.php:228 actions/siteadminpanel.php:165 +msgid "Timezone not selected." +msgstr "لم تُختر المنطقه الزمنيه." + +#: actions/profilesettings.php:234 +msgid "Language is too long (max 50 chars)." +msgstr "" + +#: actions/profilesettings.php:246 actions/tagother.php:178 +#, php-format +msgid "Invalid tag: \"%s\"" +msgstr "وسم غير صالح: \"%s\"" + +#: actions/profilesettings.php:295 +msgid "Couldn't update user for autosubscribe." +msgstr "" + +#: actions/profilesettings.php:328 +msgid "Couldn't save profile." +msgstr "تعذّر حفظ الملف الشخصى." + +#: actions/profilesettings.php:336 +msgid "Couldn't save tags." +msgstr "تعذّر حفظ الوسوم." + +#: actions/profilesettings.php:344 lib/adminpanelaction.php:126 +msgid "Settings saved." +msgstr "حُفظت الإعدادات." + +#: actions/public.php:83 +#, php-format +msgid "Beyond the page limit (%s)" +msgstr "وراء حد الصفحه (%s)" + +#: actions/public.php:92 +msgid "Could not retrieve public stream." +msgstr "" + +#: actions/public.php:129 +#, php-format +msgid "Public timeline, page %d" +msgstr "المسار الزمنى العام، صفحه %d" + +#: actions/public.php:131 lib/publicgroupnav.php:79 +msgid "Public timeline" +msgstr "المسار الزمنى العام" + +#: actions/public.php:151 +msgid "Public Stream Feed (RSS 1.0)" +msgstr "" + +#: actions/public.php:155 +msgid "Public Stream Feed (RSS 2.0)" +msgstr "" + +#: actions/public.php:159 +msgid "Public Stream Feed (Atom)" +msgstr "" + +#: actions/public.php:179 +#, php-format +msgid "" +"This is the public timeline for %%site.name%% but no one has posted anything " +"yet." +msgstr "" + +#: actions/public.php:182 +msgid "Be the first to post!" +msgstr "كن أول من يُرسل!" + +#: actions/public.php:186 +#, php-format +msgid "" +"Why not [register an account](%%action.register%%) and be the first to post!" +msgstr "" + +#: actions/public.php:233 +#, php-format +msgid "" +"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-" +"blogging) service based on the Free Software [StatusNet](http://status.net/) " +"tool. [Join now](%%action.register%%) to share notices about yourself with " +"friends, family, and colleagues! ([Read more](%%doc.help%%))" +msgstr "" +"هنا %%site.name%%، خدمه [التدوين المُصغّر](http://en.wikipedia.org/wiki/Micro-" +"blogging) المبنيه على البرنامج الحر [StatusNet](http://status.net/). [انضم " +"الآن](%%action.register%%) لتشارك اشعاراتك مع أصدقائك وعائلتك وزملائك! " +"([اقرأ المزيد](%%doc.help%%))" + +#: actions/public.php:238 +#, php-format +msgid "" +"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-" +"blogging) service based on the Free Software [StatusNet](http://status.net/) " +"tool." +msgstr "" +"هنا %%site.name%%، خدمه [التدوين المُصغّر](http://en.wikipedia.org/wiki/Micro-" +"blogging) المبنيه على البرنامج الحر [StatusNet](http://status.net/)." + +#: actions/publictagcloud.php:57 +msgid "Public tag cloud" +msgstr "سحابه الوسوم العمومية" + +#: actions/publictagcloud.php:63 +#, php-format +msgid "These are most popular recent tags on %s " +msgstr "هذه هى أكثر الوسوم شهره على %s " + +#: actions/publictagcloud.php:69 +#, php-format +msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet." +msgstr "" + +#: actions/publictagcloud.php:72 +msgid "Be the first to post one!" +msgstr "كن أول من يُرسل!" + +#: actions/publictagcloud.php:75 +#, php-format +msgid "" +"Why not [register an account](%%action.register%%) and be the first to post " +"one!" +msgstr "" + +#: actions/publictagcloud.php:135 +msgid "Tag cloud" +msgstr "سحابه الوسوم" + +#: actions/recoverpassword.php:36 +msgid "You are already logged in!" +msgstr "أنت والج بالفعل!" + +#: actions/recoverpassword.php:62 +msgid "No such recovery code." +msgstr "لا رمز استعاده كهذا." + +#: actions/recoverpassword.php:66 +msgid "Not a recovery code." +msgstr "ليس رمز استعاده." + +#: actions/recoverpassword.php:73 +msgid "Recovery code for unknown user." +msgstr "رمز استعاده لمستخدم غير معروف." + +#: actions/recoverpassword.php:86 +msgid "Error with confirmation code." +msgstr "خطأ فى رمز التأكيد." + +#: actions/recoverpassword.php:97 +msgid "This confirmation code is too old. Please start again." +msgstr "رمز التأكيد هذا قديم جدًا. من فضلك ابدأ من جديد." + +#: actions/recoverpassword.php:111 +msgid "Could not update user with confirmed email address." +msgstr "" + +#: actions/recoverpassword.php:152 +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 "" + +#: actions/recoverpassword.php:158 +msgid "You have been identified. Enter a new password below. " +msgstr "" + +#: actions/recoverpassword.php:188 +msgid "Password recovery" +msgstr "استعاده كلمه السر" + +#: actions/recoverpassword.php:191 +msgid "Nickname or email address" +msgstr "الاسم المستعار أو البريد الإلكتروني" + +#: actions/recoverpassword.php:193 +msgid "Your nickname on this server, or your registered email address." +msgstr "" + +#: actions/recoverpassword.php:199 actions/recoverpassword.php:200 +msgid "Recover" +msgstr "استرجع" + +#: actions/recoverpassword.php:208 +msgid "Reset password" +msgstr "أعد ضبط كلمه السر" + +#: actions/recoverpassword.php:209 +msgid "Recover password" +msgstr "استعد كلمه السر" + +#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +msgid "Password recovery requested" +msgstr "طُلبت استعاده كلمه السر" + +#: actions/recoverpassword.php:213 +msgid "Unknown action" +msgstr "إجراء غير معروف" + +#: actions/recoverpassword.php:236 +msgid "6 or more characters, and don't forget it!" +msgstr "" + +#: actions/recoverpassword.php:243 +msgid "Reset" +msgstr "أعد الضبط" + +#: actions/recoverpassword.php:252 +msgid "Enter a nickname or email address." +msgstr "أدخل اسمًا مستعارًا أو عنوان بريد إلكترونى." + +#: actions/recoverpassword.php:272 +msgid "No user with that email address or username." +msgstr "" + +#: actions/recoverpassword.php:287 +msgid "No registered email address for that user." +msgstr "" + +#: actions/recoverpassword.php:301 +msgid "Error saving address confirmation." +msgstr "خطأ أثناء حفظ تأكيد العنوان." + +#: actions/recoverpassword.php:325 +msgid "" +"Instructions for recovering your password have been sent to the email " +"address registered to your account." +msgstr "" + +#: actions/recoverpassword.php:344 +msgid "Unexpected password reset." +msgstr "" + +#: actions/recoverpassword.php:352 +msgid "Password must be 6 chars or more." +msgstr "يجب أن تكون كلمه السر 6 محارف أو أكثر." + +#: actions/recoverpassword.php:356 +msgid "Password and confirmation do not match." +msgstr "" + +#: actions/recoverpassword.php:375 actions/register.php:248 +msgid "Error setting user." +msgstr "خطأ أثناء ضبط المستخدم." + +#: actions/recoverpassword.php:382 +msgid "New password successfully saved. You are now logged in." +msgstr "" + +#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +msgid "Sorry, only invited people can register." +msgstr "عذرًا، الأشخاص المدعوون وحدهم يستطيعون التسجيل." + +#: actions/register.php:92 +msgid "Sorry, invalid invitation code." +msgstr "عذرا، رمز دعوه غير صالح." + +#: actions/register.php:112 +msgid "Registration successful" +msgstr "نجح التسجيل" + +#: actions/register.php:114 actions/register.php:502 lib/action.php:455 +#: lib/logingroupnav.php:85 +msgid "Register" +msgstr "سجّل" + +#: actions/register.php:135 +msgid "Registration not allowed." +msgstr "لا يُسمح بالتسجيل." + +#: actions/register.php:198 +msgid "You can't register if you don't agree to the license." +msgstr "" + +#: actions/register.php:201 +msgid "Not a valid email address." +msgstr "ليس عنوان بريد صالح." + +#: actions/register.php:212 +msgid "Email address already exists." +msgstr "عنوان البريد الإلكترونى موجود مسبقًا." + +#: actions/register.php:243 actions/register.php:264 +msgid "Invalid username or password." +msgstr "اسم مستخدم أو كلمه سر غير صالحه." + +#: actions/register.php:342 +msgid "" +"With this form you can create a new account. You can then post notices and " +"link up to friends and colleagues. " +msgstr "" + +#: actions/register.php:424 +msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." +msgstr "" + +#: actions/register.php:429 +msgid "6 or more characters. Required." +msgstr "6 حروف أو أكثر. مطلوب." + +#: actions/register.php:433 +msgid "Same as password above. Required." +msgstr "نفس كلمه السر أعلاه. مطلوب." + +#: actions/register.php:437 actions/register.php:441 +#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120 +msgid "Email" +msgstr "البريد الإلكتروني" + +#: actions/register.php:438 actions/register.php:442 +msgid "Used only for updates, announcements, and password recovery" +msgstr "" + +#: actions/register.php:449 +msgid "Longer name, preferably your \"real\" name" +msgstr "" + +#: actions/register.php:493 +msgid "My text and files are available under " +msgstr "نصوصى وملفاتى متاحه تحت رخصه " + +#: actions/register.php:495 +msgid "Creative Commons Attribution 3.0" +msgstr "المشاع المبدع نسبه المنصف إلى مؤلفه 3.0" + +#: actions/register.php:496 +msgid "" +" except this private data: password, email address, IM address, and phone " +"number." +msgstr "" + +#: actions/register.php:537 +#, php-format +msgid "" +"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"want to...\n" +"\n" +"* Go to [your profile](%s) and post your first message.\n" +"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " +"notices through instant messages.\n" +"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " +"share your interests. \n" +"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell " +"others more about you. \n" +"* Read over the [online docs](%%%%doc.help%%%%) for features you may have " +"missed. \n" +"\n" +"Thanks for signing up and we hope you enjoy using this service." +msgstr "" + +#: actions/register.php:561 +msgid "" +"(You should receive a message by email momentarily, with instructions on how " +"to confirm your email address.)" +msgstr "" + +#: actions/remotesubscribe.php:98 +#, php-format +msgid "" +"To subscribe, you can [login](%%action.login%%), or [register](%%action." +"register%%) a new account. If you already have an account on a [compatible " +"microblogging site](%%doc.openmublog%%), enter your profile URL below." +msgstr "" + +#: actions/remotesubscribe.php:112 +msgid "Remote subscribe" +msgstr "اشتراك بعيد" + +#: actions/remotesubscribe.php:124 +msgid "Subscribe to a remote user" +msgstr "اشترك بمستخدم بعيد" + +#: actions/remotesubscribe.php:129 +msgid "User nickname" +msgstr "اسم المستخدم المستعار" + +#: actions/remotesubscribe.php:130 +msgid "Nickname of the user you want to follow" +msgstr "" + +#: actions/remotesubscribe.php:133 +msgid "Profile URL" +msgstr "مسار الملف الشخصي" + +#: actions/remotesubscribe.php:134 +msgid "URL of your profile on another compatible microblogging service" +msgstr "" + +#: actions/remotesubscribe.php:137 lib/subscribeform.php:139 +#: lib/userprofile.php:365 +msgid "Subscribe" +msgstr "اشترك" + +#: actions/remotesubscribe.php:159 +msgid "Invalid profile URL (bad format)" +msgstr "" + +#: actions/remotesubscribe.php:168 +msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)." +msgstr "" + +#: actions/remotesubscribe.php:176 +msgid "That’s a local profile! Login to subscribe." +msgstr "" + +#: actions/remotesubscribe.php:183 +msgid "Couldn’t get a request token." +msgstr "" + +#: actions/replies.php:125 actions/repliesrss.php:68 +#: lib/personalgroupnav.php:105 +#, php-format +msgid "Replies to %s" +msgstr "الردود على %s" + +#: actions/replies.php:127 +#, php-format +msgid "Replies to %s, page %d" +msgstr "الردود على %s، الصفحه %d" + +#: actions/replies.php:144 +#, php-format +msgid "Replies feed for %s (RSS 1.0)" +msgstr "" + +#: actions/replies.php:151 +#, php-format +msgid "Replies feed for %s (RSS 2.0)" +msgstr "" + +#: actions/replies.php:158 +#, php-format +msgid "Replies feed for %s (Atom)" +msgstr "" + +#: actions/replies.php:198 +#, php-format +msgid "" +"This is the timeline showing replies to %s but %s hasn't received a notice " +"to his attention yet." +msgstr "" + +#: actions/replies.php:203 +#, php-format +msgid "" +"You can engage other users in a conversation, subscribe to more people or " +"[join groups](%%action.groups%%)." +msgstr "" + +#: actions/replies.php:205 +#, php-format +msgid "" +"You can try to [nudge %s](../%s) or [post something to his or her attention]" +"(%%%%action.newnotice%%%%?status_textarea=%s)." +msgstr "" + +#: actions/repliesrss.php:72 +#, php-format +msgid "Replies to %1$s on %2$s!" +msgstr "" + +#: actions/sandbox.php:65 actions/unsandbox.php:65 +msgid "You cannot sandbox users on this site." +msgstr "" + +#: actions/sandbox.php:72 +msgid "User is already sandboxed." +msgstr "" + +#: actions/showfavorites.php:79 +#, php-format +msgid "%s's favorite notices, page %d" +msgstr "" + +#: actions/showfavorites.php:132 +msgid "Could not retrieve favorite notices." +msgstr "" + +#: actions/showfavorites.php:170 +#, php-format +msgid "Feed for favorites of %s (RSS 1.0)" +msgstr "" + +#: actions/showfavorites.php:177 +#, php-format +msgid "Feed for favorites of %s (RSS 2.0)" +msgstr "" + +#: actions/showfavorites.php:184 +#, php-format +msgid "Feed for favorites of %s (Atom)" +msgstr "" + +#: actions/showfavorites.php:205 +msgid "" +"You haven't chosen any favorite notices yet. Click the fave button on " +"notices you like to bookmark them for later or shed a spotlight on them." +msgstr "" + +#: actions/showfavorites.php:207 +#, php-format +msgid "" +"%s hasn't added any notices to his favorites yet. Post something interesting " +"they would add to their favorites :)" +msgstr "" +"%s لم يضف أى إشعارات إلى مفضلته إلى الآن. أرسل شيئًا شيقًا ليضيفه إلى " +"مفضلته. :)" + +#: actions/showfavorites.php:211 +#, php-format +msgid "" +"%s hasn't added any notices to his favorites yet. Why not [register an " +"account](%%%%action.register%%%%) and then post something interesting they " +"would add to their favorites :)" +msgstr "" +"%s لم يضف أى إشعارات إلى مفضلته إلى الآن. لمّ لا [تسجل حسابًا](%%%%action." +"register%%%%) وترسل شيئًا شيقًا ليضيفه إلى مفضلته. :)" + +#: actions/showfavorites.php:242 +msgid "This is a way to share what you like." +msgstr "إنها إحدى وسائل مشاركه ما تحب." + +#: actions/showgroup.php:82 lib/groupnav.php:86 +#, php-format +msgid "%s group" +msgstr "مجموعه %s" + +#: actions/showgroup.php:84 +#, php-format +msgid "%s group, page %d" +msgstr "" + +#: actions/showgroup.php:218 +msgid "Group profile" +msgstr "ملف المجموعه الشخصي" + +#: actions/showgroup.php:263 actions/tagother.php:118 +#: actions/userauthorization.php:167 lib/userprofile.php:177 +msgid "URL" +msgstr "مسار" + +#: actions/showgroup.php:274 actions/tagother.php:128 +#: actions/userauthorization.php:179 lib/userprofile.php:194 +msgid "Note" +msgstr "ملاحظة" + +#: actions/showgroup.php:284 lib/groupeditform.php:184 +msgid "Aliases" +msgstr "الكنى" + +#: actions/showgroup.php:293 +msgid "Group actions" +msgstr "" + +#: actions/showgroup.php:328 +#, php-format +msgid "Notice feed for %s group (RSS 1.0)" +msgstr "" + +#: actions/showgroup.php:334 +#, php-format +msgid "Notice feed for %s group (RSS 2.0)" +msgstr "" + +#: actions/showgroup.php:340 +#, php-format +msgid "Notice feed for %s group (Atom)" +msgstr "" + +#: actions/showgroup.php:345 +#, php-format +msgid "FOAF for %s group" +msgstr "" + +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 +msgid "Members" +msgstr "الأعضاء" + +#: actions/showgroup.php:386 lib/profileaction.php:117 +#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 +#: lib/tagcloudsection.php:71 +msgid "(None)" +msgstr "(لا شيء)" + +#: actions/showgroup.php:392 +msgid "All members" +msgstr "جميع الأعضاء" + +#: actions/showgroup.php:429 lib/profileaction.php:174 +msgid "Statistics" +msgstr "إحصاءات" + +#: actions/showgroup.php:432 +msgid "Created" +msgstr "أنشئ" + +#: actions/showgroup.php:448 +#, php-format +msgid "" +"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." +"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " +"[StatusNet](http://status.net/) tool. Its members share short messages about " +"their life and interests. [Join now](%%%%action.register%%%%) to become part " +"of this group and many more! ([Read more](%%%%doc.help%%%%))" +msgstr "" + +#: actions/showgroup.php:454 +#, php-format +msgid "" +"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." +"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " +"[StatusNet](http://status.net/) tool. Its members share short messages about " +"their life and interests. " +msgstr "" + +#: actions/showgroup.php:482 +msgid "Admins" +msgstr "الإداريون" + +#: actions/showmessage.php:81 +msgid "No such message." +msgstr "لا رساله كهذه." + +#: actions/showmessage.php:98 +msgid "Only the sender and recipient may read this message." +msgstr "يحق للمُرسل والمستلم فقط قراءه هذه الرساله." + +#: actions/showmessage.php:108 +#, php-format +msgid "Message to %1$s on %2$s" +msgstr "" + +#: actions/showmessage.php:113 +#, php-format +msgid "Message from %1$s on %2$s" +msgstr "" + +#: actions/shownotice.php:90 +msgid "Notice deleted." +msgstr "حُذف الإشعار." + +#: actions/showstream.php:73 +#, php-format +msgid " tagged %s" +msgstr "" + +#: actions/showstream.php:79 +#, php-format +msgid "%s, page %d" +msgstr "" + +#: actions/showstream.php:122 +#, php-format +msgid "Notice feed for %s tagged %s (RSS 1.0)" +msgstr "" + +#: actions/showstream.php:129 +#, php-format +msgid "Notice feed for %s (RSS 1.0)" +msgstr "" + +#: actions/showstream.php:136 +#, php-format +msgid "Notice feed for %s (RSS 2.0)" +msgstr "" + +#: actions/showstream.php:143 +#, php-format +msgid "Notice feed for %s (Atom)" +msgstr "" + +#: actions/showstream.php:148 +#, php-format +msgid "FOAF for %s" +msgstr "" + +#: actions/showstream.php:191 +#, php-format +msgid "This is the timeline for %s but %s hasn't posted anything yet." +msgstr "" + +#: actions/showstream.php:196 +msgid "" +"Seen anything interesting recently? You haven't posted any notices yet, now " +"would be a good time to start :)" +msgstr "" + +#: actions/showstream.php:198 +#, php-format +msgid "" +"You can try to nudge %s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%s)." +msgstr "" + +#: actions/showstream.php:234 +#, php-format +msgid "" +"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en." +"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " +"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to " +"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))" +msgstr "" + +#: actions/showstream.php:239 +#, php-format +msgid "" +"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en." +"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " +"[StatusNet](http://status.net/) tool. " +msgstr "" + +#: actions/silence.php:65 actions/unsilence.php:65 +msgid "You cannot silence users on this site." +msgstr "لا يمكنك إسكات المستخدمين على هذا الموقع." + +#: actions/silence.php:72 +msgid "User is already silenced." +msgstr "المستخدم مسكت من قبل." + +#: actions/siteadminpanel.php:69 +msgid "Basic settings for this StatusNet site." +msgstr "الإعدادات الأساسيه لموقع StatusNet هذا." + +#: actions/siteadminpanel.php:147 +msgid "Site name must have non-zero length." +msgstr "يجب ألا يكون طول اسم الموقع صفرًا." + +#: actions/siteadminpanel.php:155 +msgid "You must have a valid contact email address" +msgstr "يجب أن تملك عنوان بريد إلكترونى صالح للاتصال" + +#: actions/siteadminpanel.php:173 +#, php-format +msgid "Unknown language \"%s\"" +msgstr "لغه غير معروفه \"%s\"" + +#: actions/siteadminpanel.php:180 +msgid "Invalid snapshot report URL." +msgstr "" + +#: actions/siteadminpanel.php:186 +msgid "Invalid snapshot run value." +msgstr "" + +#: actions/siteadminpanel.php:192 +msgid "Snapshot frequency must be a number." +msgstr "" + +#: actions/siteadminpanel.php:199 +msgid "You must set an SSL server when enabling SSL." +msgstr "" + +#: actions/siteadminpanel.php:204 +msgid "Invalid SSL server. The maximum length is 255 characters." +msgstr "" + +#: actions/siteadminpanel.php:210 +msgid "Minimum text limit is 140 characters." +msgstr "حد النص الأدنى هو 140 حرفًا." + +#: actions/siteadminpanel.php:216 +msgid "Dupe limit must 1 or more seconds." +msgstr "" + +#: actions/siteadminpanel.php:266 +msgid "General" +msgstr "عام" + +#: actions/siteadminpanel.php:269 +msgid "Site name" +msgstr "اسم الموقع" + +#: actions/siteadminpanel.php:270 +msgid "The name of your site, like \"Yourcompany Microblog\"" +msgstr "اسم موقعك، \"التدوين المصغر لشركتك\" مثلا" + +#: actions/siteadminpanel.php:274 +msgid "Brought by" +msgstr "" + +#: actions/siteadminpanel.php:275 +msgid "Text used for credits link in footer of each page" +msgstr "" + +#: actions/siteadminpanel.php:279 +msgid "Brought by URL" +msgstr "" + +#: actions/siteadminpanel.php:280 +msgid "URL used for credits link in footer of each page" +msgstr "" + +#: actions/siteadminpanel.php:284 +msgid "Contact email address for your site" +msgstr "عنوان البريد الإلكترونى للاتصال بموقعك" + +#: actions/siteadminpanel.php:290 +msgid "Local" +msgstr "محلي" + +#: actions/siteadminpanel.php:301 +msgid "Default timezone" +msgstr "المنطقه الزمنيه المبدئية" + +#: actions/siteadminpanel.php:302 +msgid "Default timezone for the site; usually UTC." +msgstr "المنطقه الزمنيه المبدئيه للموقع؛ ت‌ع‌م عاده." + +#: actions/siteadminpanel.php:308 +msgid "Default site language" +msgstr "لغه الموقع المبدئية" + +#: actions/siteadminpanel.php:316 +msgid "URLs" +msgstr "مسارات" + +#: actions/siteadminpanel.php:319 +msgid "Server" +msgstr "خادوم" + +#: actions/siteadminpanel.php:319 +msgid "Site's server hostname." +msgstr "اسم مضيف خادوم الموقع." + +#: actions/siteadminpanel.php:323 +msgid "Fancy URLs" +msgstr "مسارات فاخرة" + +#: actions/siteadminpanel.php:325 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "أأستخدم مسارات فاخره (يمكن قراءتها وتذكرها بسهوله أكبر)؟" + +#: actions/siteadminpanel.php:331 +msgid "Access" +msgstr "نفاذ" + +#: actions/siteadminpanel.php:334 +msgid "Private" +msgstr "خاص" + +#: actions/siteadminpanel.php:336 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "أأمنع المستخدمين المجهولين (غير الوالجين) من عرض الموقع؟" + +#: actions/siteadminpanel.php:340 +#, fuzzy +msgid "Invite only" +msgstr "ادعُ" + +#: actions/siteadminpanel.php:342 +msgid "Make registration invitation only." +msgstr "" + +#: actions/siteadminpanel.php:346 +msgid "Closed" +msgstr "مُغلق" + +#: actions/siteadminpanel.php:348 +msgid "Disable new registrations." +msgstr "عطّل التسجيل الجديد." + +#: actions/siteadminpanel.php:354 +msgid "Snapshots" +msgstr "" + +#: actions/siteadminpanel.php:357 +msgid "Randomly during Web hit" +msgstr "" + +#: actions/siteadminpanel.php:358 +msgid "In a scheduled job" +msgstr "فى مهمه مُجدولة" + +#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383 +msgid "Never" +msgstr "مطلقا" + +#: actions/siteadminpanel.php:360 +msgid "Data snapshots" +msgstr "" + +#: actions/siteadminpanel.php:361 +msgid "When to send statistical data to status.net servers" +msgstr "" + +#: actions/siteadminpanel.php:366 +msgid "Frequency" +msgstr "التكرار" + +#: actions/siteadminpanel.php:367 +msgid "Snapshots will be sent once every N web hits" +msgstr "" + +#: actions/siteadminpanel.php:372 +msgid "Report URL" +msgstr "بلّغ عن المسار" + +#: actions/siteadminpanel.php:373 +msgid "Snapshots will be sent to this URL" +msgstr "" + +#: actions/siteadminpanel.php:380 +msgid "SSL" +msgstr "SSL" + +#: actions/siteadminpanel.php:384 +msgid "Sometimes" +msgstr "أحيانًا" + +#: actions/siteadminpanel.php:385 +msgid "Always" +msgstr "دائمًا" + +#: actions/siteadminpanel.php:387 +msgid "Use SSL" +msgstr "استخدم SSL" + +#: actions/siteadminpanel.php:388 +msgid "When to use SSL" +msgstr "" + +#: actions/siteadminpanel.php:393 +msgid "SSL Server" +msgstr "خادوم SSL" + +#: actions/siteadminpanel.php:394 +msgid "Server to direct SSL requests to" +msgstr "" + +#: actions/siteadminpanel.php:400 +msgid "Limits" +msgstr "الحدود" + +#: actions/siteadminpanel.php:403 +msgid "Text limit" +msgstr "حد النص" + +#: actions/siteadminpanel.php:403 +msgid "Maximum number of characters for notices." +msgstr "أقصى عدد للحروف فى الإشعارات." + +#: actions/siteadminpanel.php:407 +msgid "Dupe limit" +msgstr "" + +#: actions/siteadminpanel.php:407 +msgid "How long users must wait (in seconds) to post the same thing again." +msgstr "" + +#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313 +msgid "Save site settings" +msgstr "اذف إعدادت الموقع" + +#: actions/smssettings.php:58 +msgid "SMS Settings" +msgstr "إعدادات الرسائل القصيرة" + +#: actions/smssettings.php:69 +#, php-format +msgid "You can receive SMS messages through email from %%site.name%%." +msgstr "لا يمكنك استلام رسائل قصيره عبر البريد الإلكرتونى من %%site.name%%." + +#: actions/smssettings.php:91 +msgid "SMS is not available." +msgstr "الرسائل القصيره غير متوفره." + +#: actions/smssettings.php:112 +msgid "Current confirmed SMS-enabled phone number." +msgstr "" + +#: actions/smssettings.php:123 +msgid "Awaiting confirmation on this phone number." +msgstr "" + +#: actions/smssettings.php:130 +msgid "Confirmation code" +msgstr "رمز التأكيد" + +#: actions/smssettings.php:131 +msgid "Enter the code you received on your phone." +msgstr "" + +#: actions/smssettings.php:138 +msgid "SMS Phone number" +msgstr "" + +#: actions/smssettings.php:140 +msgid "Phone number, no punctuation or spaces, with area code" +msgstr "" + +#: actions/smssettings.php:174 +msgid "" +"Send me notices through SMS; I understand I may incur exorbitant charges " +"from my carrier." +msgstr "" + +#: actions/smssettings.php:306 +msgid "No phone number." +msgstr "لا رقم هاتف." + +#: actions/smssettings.php:311 +msgid "No carrier selected." +msgstr "" + +#: actions/smssettings.php:318 +msgid "That is already your phone number." +msgstr "" + +#: actions/smssettings.php:321 +msgid "That phone number already belongs to another user." +msgstr "" + +#: actions/smssettings.php:347 +msgid "" +"A confirmation code was sent to the phone number you added. Check your phone " +"for the code and instructions on how to use it." +msgstr "" + +#: actions/smssettings.php:374 +msgid "That is the wrong confirmation number." +msgstr "" + +#: actions/smssettings.php:405 +msgid "That is not your phone number." +msgstr "هذا ليس رقم هاتفك." + +#: actions/smssettings.php:465 +msgid "Mobile carrier" +msgstr "" + +#: actions/smssettings.php:469 +msgid "Select a carrier" +msgstr "" + +#: actions/smssettings.php:476 +#, php-format +msgid "" +"Mobile carrier for your phone. If you know a carrier that accepts SMS over " +"email but isn't listed here, send email to let us know at %s." +msgstr "" + +#: actions/smssettings.php:498 +msgid "No code entered" +msgstr "" + +#: actions/subedit.php:70 +msgid "You are not subscribed to that profile." +msgstr "" + +#: actions/subedit.php:83 +msgid "Could not save subscription." +msgstr "تعذّر حفظ الاشتراك." + +#: actions/subscribe.php:55 +msgid "Not a local user." +msgstr "ليس مُستخدمًا محليًا." + +#: actions/subscribe.php:69 +msgid "Subscribed" +msgstr "مُشترك" + +#: actions/subscribers.php:50 +#, php-format +msgid "%s subscribers" +msgstr "مشتركو %s" + +#: actions/subscribers.php:52 +#, php-format +msgid "%s subscribers, page %d" +msgstr "مشتركو %s، الصفحه %d" + +#: actions/subscribers.php:63 +msgid "These are the people who listen to your notices." +msgstr "هؤلاء هم الأشخاص الذين يستمعون إلى إشعاراتك." + +#: actions/subscribers.php:67 +#, php-format +msgid "These are the people who listen to %s's notices." +msgstr "" + +#: actions/subscribers.php:108 +msgid "" +"You have no subscribers. Try subscribing to people you know and they might " +"return the favor" +msgstr "" + +#: actions/subscribers.php:110 +#, php-format +msgid "%s has no subscribers. Want to be the first?" +msgstr "" + +#: actions/subscribers.php:114 +#, php-format +msgid "" +"%s has no subscribers. Why not [register an account](%%%%action.register%%%" +"%) and be the first?" +msgstr "" + +#: actions/subscriptions.php:52 +#, php-format +msgid "%s subscriptions" +msgstr "اشتراكات %s" + +#: actions/subscriptions.php:54 +#, php-format +msgid "%s subscriptions, page %d" +msgstr "اشتراكات %s، الصفحه %d" + +#: actions/subscriptions.php:65 +msgid "These are the people whose notices you listen to." +msgstr "هؤلاء الأشخاص الذى تستمع إليهم." + +#: actions/subscriptions.php:69 +#, php-format +msgid "These are the people whose notices %s listens to." +msgstr "هؤلاء الأشخاص الذى يستمع %s إليهم." + +#: actions/subscriptions.php:121 +#, php-format +msgid "" +"You're not listening to anyone's notices right now, try subscribing to " +"people you know. Try [people search](%%action.peoplesearch%%), look for " +"members in groups you're interested in and in our [featured users](%%action." +"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can " +"automatically subscribe to people you already follow there." +msgstr "" + +#: actions/subscriptions.php:123 actions/subscriptions.php:127 +#, php-format +msgid "%s is not listening to anyone." +msgstr "" + +#: actions/subscriptions.php:194 +msgid "Jabber" +msgstr "جابر" + +#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115 +msgid "SMS" +msgstr "رسائل قصيرة" + +#: actions/tag.php:68 +#, php-format +msgid "Notices tagged with %s, page %d" +msgstr "" + +#: actions/tag.php:86 +#, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "" + +#: actions/tag.php:92 +#, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "" + +#: actions/tag.php:98 +#, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "" + +#: actions/tagother.php:33 +msgid "Not logged in" +msgstr "لست والجًا" + +#: actions/tagother.php:39 +msgid "No id argument." +msgstr "لا مُدخل هويه." + +#: actions/tagother.php:65 +#, php-format +msgid "Tag %s" +msgstr "" + +#: actions/tagother.php:77 lib/userprofile.php:75 +msgid "User profile" +msgstr "ملف المستخدم الشخصي" + +#: actions/tagother.php:81 lib/userprofile.php:102 +msgid "Photo" +msgstr "صورة" + +#: actions/tagother.php:141 +msgid "Tag user" +msgstr "" + +#: actions/tagother.php:151 +msgid "" +"Tags for this user (letters, numbers, -, ., and _), comma- or space- " +"separated" +msgstr "" + +#: actions/tagother.php:193 +msgid "" +"You can only tag people you are subscribed to or who are subscribed to you." +msgstr "" + +#: actions/tagother.php:200 +msgid "Could not save tags." +msgstr "تعذّر حفظ الوسوم." + +#: actions/tagother.php:236 +msgid "Use this form to add tags to your subscribers or subscriptions." +msgstr "" + +#: actions/tagrss.php:35 +msgid "No such tag." +msgstr "لا وسم كهذا." + +#: actions/twitapitrends.php:87 +msgid "API method under construction." +msgstr "" + +#: actions/unblock.php:59 +msgid "You haven't blocked that user." +msgstr "لم تمنع هذا المستخدم." + +#: actions/unsandbox.php:72 +#, fuzzy +msgid "User is not sandboxed." +msgstr "ليس للمستخدم إشعار أخير" + +#: actions/unsilence.php:72 +msgid "User is not silenced." +msgstr "المستخدم ليس مُسكتًا." + +#: actions/unsubscribe.php:77 +msgid "No profile id in request." +msgstr "" + +#: actions/unsubscribe.php:84 +msgid "No profile with that id." +msgstr "لا ملف بهذه الهويه." + +#: actions/unsubscribe.php:98 +msgid "Unsubscribed" +msgstr "" + +#: actions/updateprofile.php:62 actions/userauthorization.php:330 +#, php-format +msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +msgstr "" + +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: lib/personalgroupnav.php:115 +msgid "User" +msgstr "المستخدم" + +#: actions/useradminpanel.php:69 +msgid "User settings for this StatusNet site." +msgstr "" + +#: actions/useradminpanel.php:149 +msgid "Invalid bio limit. Must be numeric." +msgstr "" + +#: actions/useradminpanel.php:155 +msgid "Invalid welcome text. Max length is 255 characters." +msgstr "رساله ترحيب غير صالحه. أقصى طول هو 255 حرف." + +#: actions/useradminpanel.php:165 +#, php-format +msgid "Invalid default subscripton: '%1$s' is not user." +msgstr "" + +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: lib/personalgroupnav.php:109 +msgid "Profile" +msgstr "الملف الشخصي" + +#: actions/useradminpanel.php:222 +msgid "Bio Limit" +msgstr "حد السيرة" + +#: actions/useradminpanel.php:223 +msgid "Maximum length of a profile bio in characters." +msgstr "" + +#: actions/useradminpanel.php:231 +msgid "New users" +msgstr "مستخدمون جدد" + +#: actions/useradminpanel.php:235 +msgid "New user welcome" +msgstr "ترحيب المستخدمين الجدد" + +#: actions/useradminpanel.php:236 +msgid "Welcome text for new users (Max 255 chars)." +msgstr "نص الترحيب بالمستخدمين الجدد (255 حرفًا كحد أقصى)." + +#: actions/useradminpanel.php:241 +msgid "Default subscription" +msgstr "الاشتراك المبدئي" + +#: actions/useradminpanel.php:242 +msgid "Automatically subscribe new users to this user." +msgstr "أشرك المستخدمين الجدد بهذا المستخدم تلقائيًا." + +#: actions/useradminpanel.php:251 +msgid "Invitations" +msgstr "الدعوات" + +#: actions/useradminpanel.php:256 +msgid "Invitations enabled" +msgstr "الدعوات مُفعلة" + +#: actions/useradminpanel.php:258 +msgid "Whether to allow users to invite new users." +msgstr "" + +#: actions/useradminpanel.php:265 +msgid "Sessions" +msgstr "الجلسات" + +#: actions/useradminpanel.php:270 +msgid "Handle sessions" +msgstr "" + +#: actions/useradminpanel.php:272 +msgid "Whether to handle sessions ourselves." +msgstr "" + +#: actions/useradminpanel.php:276 +msgid "Session debugging" +msgstr "تنقيح الجلسة" + +#: actions/useradminpanel.php:278 +msgid "Turn on debugging output for sessions." +msgstr "مكّن تنقيح مُخرجات الجلسه." + +#: actions/userauthorization.php:105 +msgid "Authorize subscription" +msgstr "" + +#: actions/userauthorization.php:110 +msgid "" +"Please check these details to make sure that you want to subscribe to this " +"user’s notices. If you didn’t just ask to subscribe to someone’s notices, " +"click “Reject”." +msgstr "" + +#: actions/userauthorization.php:188 +msgid "License" +msgstr "الرخصة" + +#: actions/userauthorization.php:209 +msgid "Accept" +msgstr "اقبل" + +#: actions/userauthorization.php:210 lib/subscribeform.php:115 +#: lib/subscribeform.php:139 +msgid "Subscribe to this user" +msgstr "اشترك بهذا المستخدم" + +#: actions/userauthorization.php:211 +msgid "Reject" +msgstr "ارفض" + +#: actions/userauthorization.php:212 +msgid "Reject this subscription" +msgstr "ارفض هذا الاشتراك" + +#: actions/userauthorization.php:225 +msgid "No authorization request!" +msgstr "لا طلب استيثاق!" + +#: actions/userauthorization.php:247 +msgid "Subscription authorized" +msgstr "" + +#: actions/userauthorization.php:249 +msgid "" +"The subscription has been authorized, but no callback URL was passed. Check " +"with the site’s instructions for details on how to authorize the " +"subscription. Your subscription token is:" +msgstr "" + +#: actions/userauthorization.php:259 +msgid "Subscription rejected" +msgstr "رُفض الاشتراك" + +#: actions/userauthorization.php:261 +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 "" + +#: actions/userauthorization.php:296 +#, php-format +msgid "Listener URI ‘%s’ not found here" +msgstr "" + +#: actions/userauthorization.php:301 +#, php-format +msgid "Listenee URI ‘%s’ is too long." +msgstr "" + +#: actions/userauthorization.php:307 +#, php-format +msgid "Listenee URI ‘%s’ is a local user." +msgstr "" + +#: actions/userauthorization.php:322 +#, php-format +msgid "Profile URL ‘%s’ is for a local user." +msgstr "" + +#: actions/userauthorization.php:338 +#, php-format +msgid "Avatar URL ‘%s’ is not valid." +msgstr "" + +#: actions/userauthorization.php:343 +#, php-format +msgid "Can’t read avatar URL ‘%s’." +msgstr "" + +#: actions/userauthorization.php:348 +#, php-format +msgid "Wrong image type for avatar URL ‘%s’." +msgstr "" + +#: actions/userbyid.php:70 +msgid "No id." +msgstr "لا هويه." + +#: actions/userdesignsettings.php:76 lib/designsettings.php:65 +msgid "Profile design" +msgstr "تصميم الملف الشخصي" + +#: actions/userdesignsettings.php:87 lib/designsettings.php:76 +msgid "" +"Customize the way your profile looks with a background image and a colour " +"palette of your choice." +msgstr "" + +#: actions/userdesignsettings.php:282 +msgid "Enjoy your hotdog!" +msgstr "استمتع بالنقانق!" + +#: actions/usergroups.php:64 +#, php-format +msgid "%s groups, page %d" +msgstr "مجموعات %s، صفحه %d" + +#: actions/usergroups.php:130 +msgid "Search for more groups" +msgstr "" + +#: actions/usergroups.php:153 +#, php-format +msgid "%s is not a member of any group." +msgstr "" + +#: actions/usergroups.php:158 +#, php-format +msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." +msgstr "" + +#: classes/File.php:137 +#, php-format +msgid "" +"No file may be larger than %d bytes and the file you sent was %d bytes. Try " +"to upload a smaller version." +msgstr "" + +#: classes/File.php:147 +#, php-format +msgid "A file this large would exceed your user quota of %d bytes." +msgstr "" + +#: classes/File.php:154 +#, php-format +msgid "A file this large would exceed your monthly quota of %d bytes." +msgstr "" + +#: classes/Message.php:45 +msgid "You are banned from sending direct messages." +msgstr "أنت ممنوع من إرسال رسائل مباشره." + +#: classes/Message.php:61 +msgid "Could not insert message." +msgstr "تعذّر إدراج الرساله." + +#: classes/Message.php:71 +msgid "Could not update message with new URI." +msgstr "" + +#: classes/Notice.php:164 +#, php-format +msgid "DB error inserting hashtag: %s" +msgstr "" + +#: classes/Notice.php:188 +msgid "Problem saving notice. Too long." +msgstr "مشكله فى حفظ الإشعار. طويل جدًا." + +#: classes/Notice.php:192 +msgid "Problem saving notice. Unknown user." +msgstr "مشكله فى حفظ الإشعار. مستخدم غير معروف." + +#: classes/Notice.php:197 +msgid "" +"Too many notices too fast; take a breather and post again in a few minutes." +msgstr "" + +#: classes/Notice.php:203 +msgid "" +"Too many duplicate messages too quickly; take a breather and post again in a " +"few minutes." +msgstr "" + +#: classes/Notice.php:209 +msgid "You are banned from posting notices on this site." +msgstr "" + +#: classes/Notice.php:274 classes/Notice.php:299 +msgid "Problem saving notice." +msgstr "مشكله أثناء حفظ الإشعار." + +#: classes/Notice.php:1115 +#, php-format +msgid "DB error inserting reply: %s" +msgstr "" + +#: classes/User.php:347 +#, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "أهلا بكم فى %1$s يا @%2$s!" + +#: classes/User_group.php:380 +msgid "Could not create group." +msgstr "تعذّر إنشاء المجموعه." + +#: classes/User_group.php:409 +msgid "Could not set group membership." +msgstr "تعذّر ضبط عضويه المجموعه." + +#: lib/accountsettingsaction.php:108 +msgid "Change your profile settings" +msgstr "غيّر إعدادات ملفك الشخصي" + +#: lib/accountsettingsaction.php:112 +msgid "Upload an avatar" +msgstr "ارفع أفتارًا" + +#: lib/accountsettingsaction.php:116 +msgid "Change your password" +msgstr "غير كلمه سرّك" + +#: lib/accountsettingsaction.php:120 +msgid "Change email handling" +msgstr "غير أسلوب التعامل مع البريد الإلكتروني" + +#: lib/accountsettingsaction.php:124 +msgid "Design your profile" +msgstr "صمّم ملفك الشخصي" + +#: lib/accountsettingsaction.php:128 +msgid "Other" +msgstr "أخرى" + +#: lib/accountsettingsaction.php:128 +msgid "Other options" +msgstr "خيارات أخرى" + +#: lib/action.php:144 +#, php-format +msgid "%s - %s" +msgstr "%s - %s" + +#: lib/action.php:159 +msgid "Untitled page" +msgstr "صفحه غير مُعنونة" + +#: lib/action.php:425 +msgid "Primary site navigation" +msgstr "" + +#: lib/action.php:431 +msgid "Home" +msgstr "الرئيسية" + +#: lib/action.php:431 +msgid "Personal profile and friends timeline" +msgstr "الملف الشخصى ومسار الأصدقاء الزمني" + +#: lib/action.php:433 +msgid "Account" +msgstr "الحساب" + +#: lib/action.php:433 +msgid "Change your email, avatar, password, profile" +msgstr "" + +#: lib/action.php:436 +msgid "Connect" +msgstr "اتصل" + +#: lib/action.php:436 +msgid "Connect to services" +msgstr "" + +#: lib/action.php:440 +msgid "Change site configuration" +msgstr "غيّر ضبط الموقع" + +#: lib/action.php:444 lib/subgroupnav.php:105 +msgid "Invite" +msgstr "ادعُ" + +#: lib/action.php:445 lib/subgroupnav.php:106 +#, php-format +msgid "Invite friends and colleagues to join you on %s" +msgstr "" + +#: lib/action.php:450 +msgid "Logout" +msgstr "اخرج" + +#: lib/action.php:450 +msgid "Logout from the site" +msgstr "اخرج من الموقع" + +#: lib/action.php:455 +msgid "Create an account" +msgstr "أنشئ حسابًا" + +#: lib/action.php:458 +msgid "Login to the site" +msgstr "لُج إلى الموقع" + +#: lib/action.php:461 lib/action.php:724 +msgid "Help" +msgstr "مساعدة" + +#: lib/action.php:461 +msgid "Help me!" +msgstr "ساعدني!" + +#: lib/action.php:464 lib/searchaction.php:127 +msgid "Search" +msgstr "ابحث" + +#: lib/action.php:464 +msgid "Search for people or text" +msgstr "ابحث عن أشخاص أو نص" + +#: lib/action.php:485 +msgid "Site notice" +msgstr "إشعار الموقع" + +#: lib/action.php:551 +msgid "Local views" +msgstr "المشاهدات المحلية" + +#: lib/action.php:617 +msgid "Page notice" +msgstr "إشعار الصفحة" + +#: lib/action.php:719 +msgid "Secondary site navigation" +msgstr "" + +#: lib/action.php:726 +msgid "About" +msgstr "عن" + +#: lib/action.php:728 +msgid "FAQ" +msgstr "الأسئله المكررة" + +#: lib/action.php:732 +msgid "TOS" +msgstr "الشروط" + +#: lib/action.php:735 +msgid "Privacy" +msgstr "خصوصية" + +#: lib/action.php:737 +msgid "Source" +msgstr "المصدر" + +#: lib/action.php:739 +msgid "Contact" +msgstr "اتصل" + +#: lib/action.php:741 +msgid "Badge" +msgstr "" + +#: lib/action.php:769 +msgid "StatusNet software license" +msgstr "" + +#: lib/action.php:772 +#, php-format +msgid "" +"**%%site.name%%** is a microblogging service brought to you by [%%site." +"broughtby%%](%%site.broughtbyurl%%). " +msgstr "" +"**%%site.name%%** خدمه تدوين مصغر يقدمها لك [%%site.broughtby%%](%%site." +"broughtbyurl%%). " + +#: lib/action.php:774 +#, php-format +msgid "**%%site.name%%** is a microblogging service. " +msgstr "" + +#: lib/action.php:776 +#, php-format +msgid "" +"It runs the [StatusNet](http://status.net/) microblogging software, version %" +"s, available under the [GNU Affero General Public License](http://www.fsf." +"org/licensing/licenses/agpl-3.0.html)." +msgstr "" +"يعمل على برنامج التدوين المُصغّر [StatusNet](http://status.net/) -النسخه %s- " +"المتوفر تحت [رخصه غنو أفيرو العمومية](http://www.fsf.org/licensing/licenses/" +"agpl-3.0.html)." + +#: lib/action.php:790 +msgid "Site content license" +msgstr "رخصه محتوى الموقع" + +#: lib/action.php:799 +msgid "All " +msgstr "" + +#: lib/action.php:804 +msgid "license." +msgstr "الرخصه." + +#: lib/action.php:1068 +msgid "Pagination" +msgstr "" + +#: lib/action.php:1077 +msgid "After" +msgstr "بعد" + +#: lib/action.php:1085 +msgid "Before" +msgstr "قبل" + +#: lib/action.php:1133 +msgid "There was a problem with your session token." +msgstr "" + +#: lib/adminpanelaction.php:96 +msgid "You cannot make changes to this site." +msgstr "" + +#: lib/adminpanelaction.php:195 +msgid "showForm() not implemented." +msgstr "" + +#: lib/adminpanelaction.php:224 +msgid "saveSettings() not implemented." +msgstr "" + +#: lib/adminpanelaction.php:247 +msgid "Unable to delete design setting." +msgstr "تعذّر حذف إعدادات التصميم." + +#: lib/adminpanelaction.php:300 +msgid "Basic site configuration" +msgstr "ضبط الموقع الأساسي" + +#: lib/adminpanelaction.php:303 +msgid "Design configuration" +msgstr "ضبط التصميم" + +#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +msgid "Paths configuration" +msgstr "ضبط المسارات" + +#: lib/attachmentlist.php:87 +msgid "Attachments" +msgstr "مرفقات" + +#: lib/attachmentlist.php:265 +msgid "Author" +msgstr "المؤلف" + +#: lib/attachmentlist.php:278 +msgid "Provider" +msgstr "المزود" + +#: lib/attachmentnoticesection.php:67 +msgid "Notices where this attachment appears" +msgstr "" + +#: lib/attachmenttagcloudsection.php:48 +msgid "Tags for this attachment" +msgstr "وسوم هذا المرفق" + +#: lib/channel.php:138 lib/channel.php:158 +msgid "Command results" +msgstr "نتائج الأمر" + +#: lib/channel.php:210 +msgid "Command complete" +msgstr "اكتمل الأمر" + +#: lib/channel.php:221 +msgid "Command failed" +msgstr "فشل الأمر" + +#: lib/command.php:44 +msgid "Sorry, this command is not yet implemented." +msgstr "" + +#: lib/command.php:88 +#, php-format +msgid "Could not find a user with nickname %s" +msgstr "" + +#: lib/command.php:92 +msgid "It does not make a lot of sense to nudge yourself!" +msgstr "" + +#: lib/command.php:99 +#, php-format +msgid "Nudge sent to %s" +msgstr "" + +#: lib/command.php:126 +#, php-format +msgid "" +"Subscriptions: %1$s\n" +"Subscribers: %2$s\n" +"Notices: %3$s" +msgstr "" +"الاشتراكات: %1$s\n" +"المشتركون: %2$s\n" +"الإشعارات: %3$s" + +#: lib/command.php:152 lib/command.php:400 +msgid "Notice with that id does not exist" +msgstr "" + +#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +msgid "User has no last notice" +msgstr "ليس للمستخدم إشعار أخير" + +#: lib/command.php:190 +msgid "Notice marked as fave." +msgstr "" + +#: lib/command.php:315 +#, php-format +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" + +#: lib/command.php:318 +#, php-format +msgid "Fullname: %s" +msgstr "الاسم الكامل: %s" + +#: lib/command.php:321 +#, php-format +msgid "Location: %s" +msgstr "الموقع: %s" + +#: lib/command.php:324 +#, php-format +msgid "Homepage: %s" +msgstr "الصفحه الرئيسية: %s" + +#: lib/command.php:327 +#, php-format +msgid "About: %s" +msgstr "عن: %s" + +#: lib/command.php:358 scripts/xmppdaemon.php:321 +#, php-format +msgid "Message too long - maximum is %d characters, you sent %d" +msgstr "" + +#: lib/command.php:377 +msgid "Error sending direct message." +msgstr "" + +#: lib/command.php:431 +#, php-format +msgid "Notice too long - maximum is %d characters, you sent %d" +msgstr "" + +#: lib/command.php:440 +#, php-format +msgid "Reply to %s sent" +msgstr "رُد على رساله %s" + +#: lib/command.php:442 +msgid "Error saving notice." +msgstr "خطأ أثناء حفظ الإشعار." + +#: lib/command.php:496 +msgid "Specify the name of the user to subscribe to" +msgstr "" + +#: lib/command.php:503 +#, php-format +msgid "Subscribed to %s" +msgstr "مُشترك ب%s" + +#: lib/command.php:524 +msgid "Specify the name of the user to unsubscribe from" +msgstr "" + +#: lib/command.php:531 +#, php-format +msgid "Unsubscribed from %s" +msgstr "" + +#: lib/command.php:549 lib/command.php:572 +msgid "Command not yet implemented." +msgstr "" + +#: lib/command.php:552 +msgid "Notification off." +msgstr "" + +#: lib/command.php:554 +msgid "Can't turn off notification." +msgstr "" + +#: lib/command.php:575 +msgid "Notification on." +msgstr "" + +#: lib/command.php:577 +msgid "Can't turn on notification." +msgstr "" + +#: lib/command.php:590 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:604 +#, php-format +msgid "Could not create login token for %s" +msgstr "" + +#: lib/command.php:609 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:625 +msgid "You are not subscribed to anyone." +msgstr "لست مُشتركًا بأى أحد." + +#: lib/command.php:627 +msgid "You are subscribed to this person:" +msgid_plural "You are subscribed to these people:" +msgstr[0] "لست مشتركًا بأحد." +msgstr[1] "أنت مشترك بهذا الشخص:" +msgstr[2] "أنت مشترك بهذين الشخصين:" +msgstr[3] "أنت مشترك بهؤلاء الأشخاص:" +msgstr[4] "" +msgstr[5] "" + +#: lib/command.php:647 +msgid "No one is subscribed to you." +msgstr "لا أحد مشترك بك." + +#: lib/command.php:649 +msgid "This person is subscribed to you:" +msgid_plural "These people are subscribed to you:" +msgstr[0] "لا أحد مشترك بك." +msgstr[1] "هذا الشخص مشترك بك:" +msgstr[2] "هذان الشخصان مشتركان بك:" +msgstr[3] "هؤلاء الأشخاص مشتركون بك:" +msgstr[4] "" +msgstr[5] "" + +#: lib/command.php:669 +msgid "You are not a member of any groups." +msgstr "لست عضوًا فى أى مجموعه." + +#: lib/command.php:671 +msgid "You are a member of this group:" +msgid_plural "You are a member of these groups:" +msgstr[0] "لست عضوًا فى أى مجموعه." +msgstr[1] "أنت عضو فى هذه المجموعة:" +msgstr[2] "أنت عضو فى هذين المجموعتين:" +msgstr[3] "أنت عضو فى هذه المجموعات:" +msgstr[4] "" +msgstr[5] "" + +#: lib/command.php:685 +msgid "" +"Commands:\n" +"on - turn on notifications\n" +"off - turn off notifications\n" +"help - show this help\n" +"follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" +"leave - unsubscribe from user\n" +"d - direct message to user\n" +"get - get last notice from user\n" +"whois - get profile info on user\n" +"fav - add user's last notice as a 'fave'\n" +"fav # - add notice with the given id as a 'fave'\n" +"reply # - reply to notice with a given id\n" +"reply - reply to the last notice from user\n" +"join - join group\n" +"login - Get a link to login to the web interface\n" +"drop - leave group\n" +"stats - get your stats\n" +"stop - same as 'off'\n" +"quit - same as 'off'\n" +"sub - same as 'follow'\n" +"unsub - same as 'leave'\n" +"last - same as 'get'\n" +"on - not yet implemented.\n" +"off - not yet implemented.\n" +"nudge - remind a user to update.\n" +"invite - not yet implemented.\n" +"track - not yet implemented.\n" +"untrack - not yet implemented.\n" +"track off - not yet implemented.\n" +"untrack all - not yet implemented.\n" +"tracks - not yet implemented.\n" +"tracking - not yet implemented.\n" +msgstr "" + +#: lib/common.php:199 +msgid "No configuration file found. " +msgstr "" + +#: lib/common.php:200 +msgid "I looked for configuration files in the following places: " +msgstr "" + +#: lib/common.php:201 +msgid "You may wish to run the installer to fix this." +msgstr "" + +#: lib/common.php:202 +msgid "Go to the installer." +msgstr "اذهب إلى المُثبّت." + +#: lib/connectsettingsaction.php:110 +msgid "IM" +msgstr "محادثه فورية" + +#: lib/connectsettingsaction.php:111 +msgid "Updates by instant messenger (IM)" +msgstr "" + +#: lib/connectsettingsaction.php:116 +msgid "Updates by SMS" +msgstr "" + +#: lib/dberroraction.php:60 +msgid "Database error" +msgstr "خطأ قاعده بيانات" + +#: lib/designsettings.php:105 +msgid "Upload file" +msgstr "ارفع ملفًا" + +#: lib/designsettings.php:109 +msgid "" +"You can upload your personal background image. The maximum file size is 2MB." +msgstr "تستطيع رفع صورتك الشخصيه. أقصى حجم للملف هو 2 م.ب." + +#: lib/designsettings.php:418 +msgid "Design defaults restored." +msgstr "استعيدت مبدئيات التصميم." + +#: lib/disfavorform.php:114 lib/disfavorform.php:140 +msgid "Disfavor this notice" +msgstr "ألغِ تفضيل هذا الإشعار" + +#: lib/favorform.php:114 lib/favorform.php:140 +msgid "Favor this notice" +msgstr "فضّل هذا الإشعار" + +#: lib/favorform.php:140 +msgid "Favor" +msgstr "فضّل" + +#: lib/feed.php:85 +msgid "RSS 1.0" +msgstr "آرإس​إس 1.0" + +#: lib/feed.php:87 +msgid "RSS 2.0" +msgstr "آرإس​إس 2.0" + +#: lib/feed.php:89 +msgid "Atom" +msgstr "أتوم" + +#: lib/feed.php:91 +msgid "FOAF" +msgstr "FOAF" + +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "تصدير البيانات" + +#: lib/galleryaction.php:121 +msgid "Filter tags" +msgstr "رشّح الوسوم" + +#: lib/galleryaction.php:131 +msgid "All" +msgstr "الكل" + +#: lib/galleryaction.php:139 +msgid "Select tag to filter" +msgstr "اختر وسمًا لترشيحه" + +#: lib/galleryaction.php:140 +msgid "Tag" +msgstr "الوسم" + +#: lib/galleryaction.php:141 +msgid "Choose a tag to narrow list" +msgstr "" + +#: lib/galleryaction.php:143 +msgid "Go" +msgstr "اذهب" + +#: lib/groupeditform.php:163 +msgid "URL of the homepage or blog of the group or topic" +msgstr "" + +#: lib/groupeditform.php:168 +msgid "Describe the group or topic" +msgstr "" + +#: lib/groupeditform.php:170 +#, php-format +msgid "Describe the group or topic in %d characters" +msgstr "" + +#: lib/groupeditform.php:172 +msgid "Description" +msgstr "الوصف" + +#: lib/groupeditform.php:179 +msgid "" +"Location for the group, if any, like \"City, State (or Region), Country\"" +msgstr "" + +#: lib/groupeditform.php:187 +#, php-format +msgid "Extra nicknames for the group, comma- or space- separated, max %d" +msgstr "" + +#: lib/groupnav.php:85 +msgid "Group" +msgstr "مجموعات" + +#: lib/groupnav.php:101 +msgid "Blocked" +msgstr "ممنوع" + +#: lib/groupnav.php:102 +#, php-format +msgid "%s blocked users" +msgstr "" + +#: lib/groupnav.php:108 +#, php-format +msgid "Edit %s group properties" +msgstr "عدّل خصائص مجموعه %s" + +#: lib/groupnav.php:113 +msgid "Logo" +msgstr "الشعار" + +#: lib/groupnav.php:114 +#, php-format +msgid "Add or edit %s logo" +msgstr "أضف أو عدّل شعار %s" + +#: lib/groupnav.php:120 +#, php-format +msgid "Add or edit %s design" +msgstr "" + +#: lib/groupsbymemberssection.php:71 +msgid "Groups with most members" +msgstr "المجموعات الأكثر أعضاءً" + +#: lib/groupsbypostssection.php:71 +msgid "Groups with most posts" +msgstr "المجموعات الأكثر مرسلات" + +#: lib/grouptagcloudsection.php:56 +#, php-format +msgid "Tags in %s group's notices" +msgstr "" + +#: lib/htmloutputter.php:103 +msgid "This page is not available in a media type you accept" +msgstr "" + +#: lib/imagefile.php:75 +#, php-format +msgid "That file is too big. The maximum file size is %s." +msgstr "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %s." + +#: lib/imagefile.php:80 +msgid "Partial upload." +msgstr "" + +#: lib/imagefile.php:88 lib/mediafile.php:170 +msgid "System error uploading file." +msgstr "" + +#: lib/imagefile.php:96 +msgid "Not an image or corrupt file." +msgstr "" + +#: lib/imagefile.php:105 +msgid "Unsupported image file format." +msgstr "" + +#: lib/imagefile.php:118 +msgid "Lost our file." +msgstr "" + +#: lib/imagefile.php:150 lib/imagefile.php:197 +msgid "Unknown file type" +msgstr "نوع ملف غير معروف" + +#: lib/imagefile.php:217 +msgid "MB" +msgstr "" + +#: lib/imagefile.php:219 +msgid "kB" +msgstr "" + +#: lib/jabber.php:191 +#, php-format +msgid "[%s]" +msgstr "[%s]" + +#: lib/joinform.php:114 +msgid "Join" +msgstr "انضم" + +#: lib/leaveform.php:114 +msgid "Leave" +msgstr "غادر" + +#: lib/logingroupnav.php:80 +msgid "Login with a username and password" +msgstr "" + +#: lib/logingroupnav.php:86 +msgid "Sign up for a new account" +msgstr "" + +#: lib/mail.php:172 +msgid "Email address confirmation" +msgstr "تأكيد عنوان البريد الإلكتروني" + +#: lib/mail.php:174 +#, php-format +msgid "" +"Hey, %s.\n" +"\n" +"Someone just entered this email address on %s.\n" +"\n" +"If it was you, and you want to confirm your entry, use the URL below:\n" +"\n" +"\t%s\n" +"\n" +"If not, just ignore this message.\n" +"\n" +"Thanks for your time, \n" +"%s\n" +msgstr "" + +#: lib/mail.php:236 +#, php-format +msgid "%1$s is now listening to your notices on %2$s." +msgstr "" + +#: lib/mail.php:241 +#, php-format +msgid "" +"%1$s is now listening to your notices on %2$s.\n" +"\n" +"\t%3$s\n" +"\n" +"%4$s%5$s%6$s\n" +"Faithfully yours,\n" +"%7$s.\n" +"\n" +"----\n" +"Change your email address or notification options at %8$s\n" +msgstr "" + +#: lib/mail.php:254 +#, php-format +msgid "Location: %s\n" +msgstr "الموقع: %s\n" + +#: lib/mail.php:256 +#, php-format +msgid "Homepage: %s\n" +msgstr "الصفحه الرئيسية: %s\n" + +#: lib/mail.php:258 +#, php-format +msgid "" +"Bio: %s\n" +"\n" +msgstr "السيرة: %s\n" + +#: lib/mail.php:286 +#, php-format +msgid "New email address for posting to %s" +msgstr "" + +#: lib/mail.php:289 +#, php-format +msgid "" +"You have a new posting address on %1$s.\n" +"\n" +"Send email to %2$s to post new messages.\n" +"\n" +"More email instructions at %3$s.\n" +"\n" +"Faithfully yours,\n" +"%4$s" +msgstr "" + +#: lib/mail.php:413 +#, php-format +msgid "%s status" +msgstr "حاله %s" + +#: lib/mail.php:439 +msgid "SMS confirmation" +msgstr "" + +#: lib/mail.php:463 +#, php-format +msgid "You've been nudged by %s" +msgstr "" + +#: lib/mail.php:467 +#, php-format +msgid "" +"%1$s (%2$s) is wondering what you are up to these days and is inviting you " +"to post some news.\n" +"\n" +"So let's hear from you :)\n" +"\n" +"%3$s\n" +"\n" +"Don't reply to this email; it won't get to them.\n" +"\n" +"With kind regards,\n" +"%4$s\n" +msgstr "" + +#: lib/mail.php:510 +#, php-format +msgid "New private message from %s" +msgstr "رساله خاصه جديده من %s" + +#: lib/mail.php:514 +#, php-format +msgid "" +"%1$s (%2$s) sent you a private message:\n" +"\n" +"------------------------------------------------------\n" +"%3$s\n" +"------------------------------------------------------\n" +"\n" +"You can reply to their message here:\n" +"\n" +"%4$s\n" +"\n" +"Don't reply to this email; it won't get to them.\n" +"\n" +"With kind regards,\n" +"%5$s\n" +msgstr "" + +#: lib/mail.php:559 +#, php-format +msgid "%s (@%s) added your notice as a favorite" +msgstr "" + +#: lib/mail.php:561 +#, php-format +msgid "" +"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" +"\n" +"The URL of your notice is:\n" +"\n" +"%3$s\n" +"\n" +"The text of your notice is:\n" +"\n" +"%4$s\n" +"\n" +"You can see the list of %1$s's favorites here:\n" +"\n" +"%5$s\n" +"\n" +"Faithfully yours,\n" +"%6$s\n" +msgstr "" + +#: lib/mail.php:620 +#, php-format +msgid "%s (@%s) sent a notice to your attention" +msgstr "" + +#: lib/mail.php:622 +#, php-format +msgid "" +"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" +"\n" +"The notice is here:\n" +"\n" +"\t%3$s\n" +"\n" +"It reads:\n" +"\n" +"\t%4$s\n" +"\n" +msgstr "" + +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "" + +#: 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 "" + +#: lib/mailbox.php:227 lib/noticelist.php:452 +msgid "from" +msgstr "من" + +#: lib/mediafile.php:98 lib/mediafile.php:123 +msgid "There was a database error while saving your file. Please try again." +msgstr "" + +#: lib/mediafile.php:142 +msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." +msgstr "" + +#: lib/mediafile.php:147 +msgid "" +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " +"the HTML form." +msgstr "" + +#: lib/mediafile.php:152 +msgid "The uploaded file was only partially uploaded." +msgstr "" + +#: lib/mediafile.php:159 +msgid "Missing a temporary folder." +msgstr "" + +#: lib/mediafile.php:162 +msgid "Failed to write file to disk." +msgstr "فشل فى كتابه الملف إلى القرص." + +#: lib/mediafile.php:165 +msgid "File upload stopped by extension." +msgstr "" + +#: lib/mediafile.php:179 lib/mediafile.php:216 +msgid "File exceeds user's quota!" +msgstr "" + +#: lib/mediafile.php:196 lib/mediafile.php:233 +msgid "File could not be moved to destination directory." +msgstr "" + +#: lib/mediafile.php:201 lib/mediafile.php:237 +msgid "Could not determine file's mime-type!" +msgstr "" + +#: lib/mediafile.php:270 +#, php-format +msgid " Try using another %s format." +msgstr "" + +#: lib/mediafile.php:275 +#, php-format +msgid "%s is not a supported filetype on this server." +msgstr "" + +#: lib/messageform.php:120 +msgid "Send a direct notice" +msgstr "أرسل إشعارًا مباشرًا" + +#: lib/messageform.php:146 +msgid "To" +msgstr "إلى" + +#: lib/messageform.php:159 lib/noticeform.php:183 +msgid "Available characters" +msgstr "المحارف المتوفرة" + +#: lib/noticeform.php:158 +msgid "Send a notice" +msgstr "أرسل إشعارًا" + +#: lib/noticeform.php:171 +#, php-format +msgid "What's up, %s?" +msgstr "ما الأخبار يا %s؟" + +#: lib/noticeform.php:190 +msgid "Attach" +msgstr "أرفق" + +#: lib/noticeform.php:194 +msgid "Attach a file" +msgstr "أرفق ملفًا" + +#: lib/noticelist.php:403 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "" + +#: lib/noticelist.php:404 +msgid "N" +msgstr "ش" + +#: lib/noticelist.php:404 +msgid "S" +msgstr "ج" + +#: lib/noticelist.php:405 +msgid "E" +msgstr "ر" + +#: lib/noticelist.php:405 +msgid "W" +msgstr "غ" + +#: lib/noticelist.php:411 +msgid "at" +msgstr "في" + +#: lib/noticelist.php:506 +msgid "in context" +msgstr "فى السياق" + +#: lib/noticelist.php:526 +msgid "Reply to this notice" +msgstr "رُد على هذا الإشعار" + +#: lib/noticelist.php:527 +msgid "Reply" +msgstr "رُد" + +#: lib/nudgeform.php:116 +msgid "Nudge this user" +msgstr "نبّه هذا المستخدم" + +#: lib/nudgeform.php:128 +msgid "Nudge" +msgstr "نبّه" + +#: lib/nudgeform.php:128 +msgid "Send a nudge to this user" +msgstr "" + +#: lib/oauthstore.php:283 +msgid "Error inserting new profile" +msgstr "خطأ أثناء إدراج الملف الشخصى الجديد" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar" +msgstr "خطأ فى إدراج الأفتار" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile" +msgstr "خطأ أثناء إدراج الملف الشخصى البعيد" + +#: lib/oauthstore.php:345 +msgid "Duplicate notice" +msgstr "ضاعف الإشعار" + +#: lib/oauthstore.php:466 lib/subs.php:48 +msgid "You have been banned from subscribing." +msgstr "" + +#: lib/oauthstore.php:491 +msgid "Couldn't insert new subscription." +msgstr "تعذّر إدراج اشتراك جديد." + +#: lib/personalgroupnav.php:99 +msgid "Personal" +msgstr "شخصية" + +#: lib/personalgroupnav.php:104 +msgid "Replies" +msgstr "الردود" + +#: lib/personalgroupnav.php:114 +msgid "Favorites" +msgstr "المفضلات" + +#: lib/personalgroupnav.php:124 +msgid "Inbox" +msgstr "صندوق الوارد" + +#: lib/personalgroupnav.php:125 +msgid "Your incoming messages" +msgstr "رسائلك الواردة" + +#: lib/personalgroupnav.php:129 +msgid "Outbox" +msgstr "صندوق الصادر" + +#: lib/personalgroupnav.php:130 +msgid "Your sent messages" +msgstr "رسائلك المُرسلة" + +#: lib/personaltagcloudsection.php:56 +#, php-format +msgid "Tags in %s's notices" +msgstr "" + +#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 +msgid "Subscriptions" +msgstr "الاشتراكات" + +#: lib/profileaction.php:126 +msgid "All subscriptions" +msgstr "جميع الاشتراكات" + +#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90 +msgid "Subscribers" +msgstr "المشتركون" + +#: lib/profileaction.php:157 +msgid "All subscribers" +msgstr "جميع المشتركين" + +#: lib/profileaction.php:178 +msgid "User ID" +msgstr "هويه المستخدم" + +#: lib/profileaction.php:183 +msgid "Member since" +msgstr "عضو منذ" + +#: lib/profileaction.php:245 +msgid "All groups" +msgstr "كل المجموعات" + +#: lib/profileformaction.php:123 +#, fuzzy +msgid "No return-to arguments" +msgstr "لا مُدخل هويه." + +#: lib/profileformaction.php:137 +msgid "unimplemented method" +msgstr "" + +#: lib/publicgroupnav.php:78 +msgid "Public" +msgstr "عام" + +#: lib/publicgroupnav.php:82 +msgid "User groups" +msgstr "مجموعات المستخدمين" + +#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85 +msgid "Recent tags" +msgstr "الوسوم الحديثة" + +#: lib/publicgroupnav.php:88 +msgid "Featured" +msgstr "مُختارون" + +#: lib/publicgroupnav.php:92 +msgid "Popular" +msgstr "مشهورة" + +#: lib/sandboxform.php:67 +msgid "Sandbox" +msgstr "" + +#: lib/sandboxform.php:78 +#, fuzzy +msgid "Sandbox this user" +msgstr "ألغِ منع هذا المستخدم" + +#: lib/searchaction.php:120 +msgid "Search site" +msgstr "ابحث فى الموقع" + +#: lib/searchaction.php:126 +msgid "Keyword(s)" +msgstr "الكلمات المفتاحية" + +#: lib/searchaction.php:162 +msgid "Search help" +msgstr "ابحث فى المساعدة" + +#: lib/searchgroupnav.php:80 +msgid "People" +msgstr "أشخاص" + +#: lib/searchgroupnav.php:81 +msgid "Find people on this site" +msgstr "ابحث عن أشخاص على هذا الموقع" + +#: lib/searchgroupnav.php:83 +msgid "Find content of notices" +msgstr "ابحث عن محتويات فى الإشعارات" + +#: lib/searchgroupnav.php:85 +msgid "Find groups on this site" +msgstr "ابحث عن مجموعات على هذا الموقع" + +#: lib/section.php:89 +msgid "Untitled section" +msgstr "قسم غير مُعنون" + +#: lib/section.php:106 +msgid "More..." +msgstr "المزيد..." + +#: lib/silenceform.php:67 +msgid "Silence" +msgstr "أسكت" + +#: lib/silenceform.php:78 +msgid "Silence this user" +msgstr "أسكت هذا المستخدم" + +#: lib/subgroupnav.php:83 +#, php-format +msgid "People %s subscribes to" +msgstr "الأشخاص الذين اشترك بهم %s" + +#: lib/subgroupnav.php:91 +#, php-format +msgid "People subscribed to %s" +msgstr "الأشخاص المشتركون ب%s" + +#: lib/subgroupnav.php:99 +#, php-format +msgid "Groups %s is a member of" +msgstr "المجموعات التى %s عضو فيها" + +#: lib/subs.php:52 +msgid "Already subscribed!" +msgstr "مُشترك أصلا!" + +#: lib/subs.php:56 +msgid "User has blocked you." +msgstr "لقد منعك المستخدم." + +#: lib/subs.php:60 +msgid "Could not subscribe." +msgstr "تعذّر الاشتراك." + +#: lib/subs.php:79 +msgid "Could not subscribe other to you." +msgstr "" + +#: lib/subs.php:128 +#, fuzzy +msgid "Not subscribed!" +msgstr "لست مُشتركًا!" + +#: lib/subs.php:133 +#, fuzzy +msgid "Couldn't delete self-subscription." +msgstr "تعذّر حذف الاشتراك." + +#: lib/subs.php:146 +msgid "Couldn't delete subscription." +msgstr "تعذّر حذف الاشتراك." + +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "(لا شيء)" + +#: lib/tagcloudsection.php:56 +msgid "None" +msgstr "لا شيء" + +#: lib/topposterssection.php:74 +msgid "Top posters" +msgstr "أعلى المرسلين" + +#: lib/unsandboxform.php:69 +msgid "Unsandbox" +msgstr "" + +#: lib/unsandboxform.php:80 +#, fuzzy +msgid "Unsandbox this user" +msgstr "ألغِ منع هذا المستخدم" + +#: lib/unsilenceform.php:67 +msgid "Unsilence" +msgstr "ألغِ الإسكات" + +#: lib/unsilenceform.php:78 +msgid "Unsilence this user" +msgstr "ألغِ إسكات هذا المستخدم" + +#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137 +msgid "Unsubscribe from this user" +msgstr "ألغِ الاشتراك مع هذا المستخدم" + +#: lib/unsubscribeform.php:137 +msgid "Unsubscribe" +msgstr "ألغِ الاشتراك" + +#: lib/userprofile.php:116 +msgid "Edit Avatar" +msgstr "عدّل الأفتار" + +#: lib/userprofile.php:236 +msgid "User actions" +msgstr "تصرفات المستخدم" + +#: lib/userprofile.php:248 +msgid "Edit profile settings" +msgstr "عدّل إعدادات الملف الشخصي" + +#: lib/userprofile.php:249 +msgid "Edit" +msgstr "عدّل" + +#: lib/userprofile.php:272 +msgid "Send a direct message to this user" +msgstr "أرسل رساله مباشره إلى هذا المستخدم" + +#: lib/userprofile.php:273 +msgid "Message" +msgstr "رسالة" + +#: lib/userprofile.php:311 +msgid "Moderate" +msgstr "" + +#: lib/util.php:825 +msgid "a few seconds ago" +msgstr "قبل لحظات قليلة" + +#: lib/util.php:827 +msgid "about a minute ago" +msgstr "قبل دقيقه تقريبًا" + +#: lib/util.php:829 +#, php-format +msgid "about %d minutes ago" +msgstr "" + +#: lib/util.php:831 +msgid "about an hour ago" +msgstr "قبل ساعه تقريبًا" + +#: lib/util.php:833 +#, php-format +msgid "about %d hours ago" +msgstr "" + +#: lib/util.php:835 +msgid "about a day ago" +msgstr "قبل يوم تقريبا" + +#: lib/util.php:837 +#, php-format +msgid "about %d days ago" +msgstr "" + +#: lib/util.php:839 +msgid "about a month ago" +msgstr "قبل شهر تقريبًا" + +#: lib/util.php:841 +#, php-format +msgid "about %d months ago" +msgstr "" + +#: lib/util.php:843 +msgid "about a year ago" +msgstr "قبل سنه تقريبًا" + +#: lib/webcolor.php:82 +#, php-format +msgid "%s is not a valid color!" +msgstr "%s ليس لونًا صحيحًا!" + +#: lib/webcolor.php:123 +#, php-format +msgid "%s is not a valid color! Use 3 or 6 hex chars." +msgstr "" + +#: scripts/maildaemon.php:48 +msgid "Could not parse message." +msgstr "تعذّر تحليل الرساله." + +#: scripts/maildaemon.php:53 +msgid "Not a registered user." +msgstr "ليس مستخدمًا مسجلًا." + +#: scripts/maildaemon.php:57 +msgid "Sorry, that is not your incoming email address." +msgstr "" + +#: scripts/maildaemon.php:61 +msgid "Sorry, no incoming email allowed." +msgstr "" From c622d144400026dac65c39303994d11f114c0f5b Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 12 Dec 2009 14:46:24 -0500 Subject: [PATCH 121/172] add statuses/retweets to API --- actions/apistatusesretweets.php | 116 ++++++++++++++++++++++++++++++++ classes/Notice.php | 67 ++++++++++++++++++ lib/router.php | 5 ++ 3 files changed, 188 insertions(+) create mode 100644 actions/apistatusesretweets.php diff --git a/actions/apistatusesretweets.php b/actions/apistatusesretweets.php new file mode 100644 index 0000000000..c54a374e28 --- /dev/null +++ b/actions/apistatusesretweets.php @@ -0,0 +1,116 @@ +. + * + * @category API + * @package StatusNet + * @author Evan Prodromou + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +require_once INSTALLDIR . '/lib/apiauth.php'; +require_once INSTALLDIR . '/lib/mediafile.php'; + +/** + * Show up to 100 repeats of a notice + * + * @category API + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class ApiStatusesRetweetsAction extends ApiAuthAction +{ + const MAXCOUNT = 100; + + var $original = null; + var $cnt = self::MAXCOUNT; + + /** + * Take arguments for running + * + * @param array $args $_REQUEST args + * + * @return boolean success flag + * + */ + + function prepare($args) + { + parent::prepare($args); + + $id = $this->trimmed('id'); + + $this->original = Notice::staticGet('id', $id); + + if (empty($this->original)) { + $this->clientError(_('No such notice'), + 400, $this->format); + return false; + } + + $cnt = $this->trimmed('count'); + + if (empty($cnt) || !is_integer($cnt)) { + $cnt = 100; + } else { + $this->cnt = min((int)$cnt, self::MAXCOUNT); + } + + return true; + } + + /** + * Handle the request + * + * Make a new notice for the update, save it, and show it + * + * @param array $args $_REQUEST data (unused) + * + * @return void + */ + + function handle($args) + { + parent::handle($args); + + $strm = $this->original->repeatStream($this->cnt); + + switch ($this->format) { + case 'xml': + $this->showXmlTimeline($strm); + break; + case 'json': + $this->showJsonTimeline($strm); + break; + default: + $this->clientError(_('API method not found!'), $code = 404); + break; + } + } +} diff --git a/classes/Notice.php b/classes/Notice.php index 82753fbdd6..ec80f763ff 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -441,10 +441,23 @@ class Notice extends Memcached_DataObject $this->blowTagCache($blowLast); $this->blowGroupCache($blowLast); $this->blowConversationCache($blowLast); + $this->blowRepeatCache(); $profile = Profile::staticGet($this->profile_id); $profile->blowNoticeCount(); } + function blowRepeatCache() + { + if (!empty($this->repeat_of)) { + $cache = common_memcache(); + if (!empty($cache)) { + // XXX: only blow if <100 in cache + $ck = common_cache_key('notice:repeats:'.$this->repeat_of); + $result = $cache->delete($ck); + } + } + } + function blowConversationCache($blowLast=false) { $cache = common_memcache(); @@ -1455,4 +1468,58 @@ class Notice extends Memcached_DataObject return self::saveNew($repeater_id, $content, $source, array('repeat_of' => $this->id)); } + + // These are supposed to be in chron order! + + function repeatStream($limit=100) + { + $cache = common_memcache(); + + if (empty($cache)) { + $ids = $this->_repeatStreamDirect($limit); + } else { + $idstr = $cache->get(common_cache_key('notice:repeats:'.$this->id)); + if (!empty($idstr)) { + $ids = explode(',', $idstr); + } else { + $ids = $this->_repeatStreamDirect(100); + $cache->set(common_cache_key('notice:repeats:'.$this->id), implode(',', $ids)); + } + if ($limit < 100) { + // We do a max of 100, so slice down to limit + $ids = array_slice($ids, 0, $limit); + } + } + + return Notice::getStreamByIds($ids); + } + + function _repeatStreamDirect($limit) + { + $notice = new Notice(); + + $notice->selectAdd(); // clears it + $notice->selectAdd('id'); + + $notice->repeat_of = $this->id; + + $notice->orderBy('created'); // NB: asc! + + if (!is_null($offset)) { + $notice->limit($offset, $limit); + } + + $ids = array(); + + if ($notice->find()) { + while ($notice->fetch()) { + $ids[] = $notice->id; + } + } + + $notice->free(); + $notice = NULL; + + return $ids; + } } diff --git a/lib/router.php b/lib/router.php index 835339720d..b0b95b080e 100644 --- a/lib/router.php +++ b/lib/router.php @@ -364,6 +364,11 @@ class Router 'id' => '[0-9]+', 'format' => '(xml|json)')); + $m->connect('api/statuses/retweets/:id.:format', + array('action' => 'ApiStatusesRetweets', + 'id' => '[0-9]+', + 'format' => '(xml|json)')); + // users $m->connect('api/users/show.:format', From b42b2e1d05867b2dd4cdb3e1b7e278c63001d355 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 12 Dec 2009 15:00:09 -0500 Subject: [PATCH 122/172] integer utility for arguments --- lib/action.php | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/lib/action.php b/lib/action.php index 87d8a43993..dac0e2583c 100644 --- a/lib/action.php +++ b/lib/action.php @@ -951,6 +951,36 @@ class Action extends HTMLOutputter // lawsuit } } + /** + * Integer value of an argument + * + * @param string $key query key we're interested in + * @param string $defValue optional default value (default null) + * @param string $maxValue optional max value (default null) + * @param string $minValue optional min value (default null) + * + * @return integer integer value + */ + + function int($key, $defValue=null, $maxValue=null, $minValue=null) + { + $arg = strtolower($this->trimmed($key)); + + if (is_null($arg) || !is_integer($arg)) { + return $defValue; + } + + if (!is_null($maxValue)) { + $arg = min($arg, $maxValue); + } + + if (!is_null($minValue)) { + $arg = max($arg, $minValue); + } + + return $arg; + } + /** * Server error * From 138ce0cd05e2e59c79b29f5eeea5c11d1e56e931 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 12 Dec 2009 15:35:05 -0500 Subject: [PATCH 123/172] add statuses/retweeted_by_me api action --- actions/apitimelineretweetedbyme.php | 126 +++++++++++++++++++++++++++ classes/Notice.php | 9 ++ classes/User.php | 52 +++++++++++ lib/router.php | 4 + 4 files changed, 191 insertions(+) create mode 100644 actions/apitimelineretweetedbyme.php diff --git a/actions/apitimelineretweetedbyme.php b/actions/apitimelineretweetedbyme.php new file mode 100644 index 0000000000..1e65678ad5 --- /dev/null +++ b/actions/apitimelineretweetedbyme.php @@ -0,0 +1,126 @@ +. + * + * @category API + * @package StatusNet + * @author Evan Prodromou + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +require_once INSTALLDIR . '/lib/apiauth.php'; +require_once INSTALLDIR . '/lib/mediafile.php'; + +/** + * Show authenticating user's most recent repeats + * + * @category API + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class ApiTimelineRetweetedByMeAction extends ApiAuthAction +{ + const DEFAULTCOUNT = 20; + const MAXCOUNT = 200; + const MAXNOTICES = 3200; + + var $repeats = null; + var $cnt = self::DEFAULTCOUNT; + var $page = 1; + var $since_id = null; + var $max_id = null; + + /** + * Take arguments for running + * + * @param array $args $_REQUEST args + * + * @return boolean success flag + * + */ + + function prepare($args) + { + parent::prepare($args); + + $cnt = $this->int('count', self::DEFAULTCOUNT, self::MAXCOUNT, 1); + + $page = $this->int('page', 1, (self::MAXNOTICES/$this->cnt)); + + $since_id = $this->int('since_id'); + + $max_id = $this->int('max_id'); + + return true; + } + + /** + * Handle the request + * + * show a timeline of the user's repeated notices + * + * @param array $args $_REQUEST data (unused) + * + * @return void + */ + + function handle($args) + { + parent::handle($args); + + $offset = ($this->page-1) * $this->cnt; + $limit = $this->cnt; + + $strm = $this->auth_user->repeatedByMe($offset, $limit, $this->since_id, $this->max_id); + + switch ($this->format) { + case 'xml': + $this->showXmlTimeline($strm); + break; + case 'json': + $this->showJsonTimeline($strm); + break; + case 'atom': + $profile = $this->auth_user->getProfile(); + + $title = sprintf(_("Repeated by %s"), $this->auth_user->nickname); + $taguribase = common_config('integration', 'taguri'); + $id = "tag:$taguribase:RepeatedByMe:" . $this->auth_user->id; + $link = common_local_url('showstream', + array('nickname' => $this->auth_user->nickname)); + + $this->showAtomTimeline($strm, $title, $id, $link); + break; + + default: + $this->clientError(_('API method not found!'), $code = 404); + break; + } + } +} diff --git a/classes/Notice.php b/classes/Notice.php index ec80f763ff..6a701ae0cd 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -454,6 +454,15 @@ class Notice extends Memcached_DataObject // XXX: only blow if <100 in cache $ck = common_cache_key('notice:repeats:'.$this->repeat_of); $result = $cache->delete($ck); + + $user = User::staticGet('id', $this->profile_id); + + if (!empty($user)) { + $uk = common_cache_key('user:repeated_by_me:'.$user->id); + $cache->delete($uk); + $user->free(); + unset($user); + } } } } diff --git a/classes/User.php b/classes/User.php index 2a4fab7d43..4b7365fc7a 100644 --- a/classes/User.php +++ b/classes/User.php @@ -741,4 +741,56 @@ class User extends Memcached_DataObject $profile = $this->getProfile(); return $profile->isSilenced(); } + + function repeatedByMe($offset=0, $limit=20, $since_id=null, $max_id=null) + { + $ids = Notice::stream(array($this, '_repeatedByMeDirect'), + array(), + 'user:repeated_by_me:'.$this->id, + $offset, $limit, $since_id, $max_id, null); + + return Notice::getStreamByIds($ids); + } + + function _repeatedByMeDirect($offset, $limit, $since_id, $max_id, $since) + { + $notice = new Notice(); + + $notice->selectAdd(); // clears it + $notice->selectAdd('id'); + + $notice->profile_id = $this->id; + $notice->whereAdd('repeat_of IS NOT NULL'); + + $notice->orderBy('id DESC'); + + if (!is_null($offset)) { + $notice->limit($offset, $limit); + } + + if ($since_id != 0) { + $notice->whereAdd('id > ' . $since_id); + } + + if ($max_id != 0) { + $notice->whereAdd('id <= ' . $max_id); + } + + if (!is_null($since)) { + $notice->whereAdd('created > \'' . date('Y-m-d H:i:s', $since) . '\''); + } + + $ids = array(); + + if ($notice->find()) { + while ($notice->fetch()) { + $ids[] = $notice->id; + } + } + + $notice->free(); + $notice = NULL; + + return $ids; + } } diff --git a/lib/router.php b/lib/router.php index b0b95b080e..5c1bd3c4ff 100644 --- a/lib/router.php +++ b/lib/router.php @@ -319,6 +319,10 @@ class Router 'id' => '[a-zA-Z0-9]+', 'format' => '(xml|json|rss|atom)')); + $m->connect('api/statuses/retweeted_by_me.:format', + array('action' => 'ApiTimelineRetweetedByMe', + 'format' => '(xml|json|atom)')); + $m->connect('api/statuses/friends.:format', array('action' => 'ApiUserFriends', 'format' => '(xml|json)')); From cfe67a9c0192129448ea3f0b98aadf49e962fd4d Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 12 Dec 2009 16:00:27 -0500 Subject: [PATCH 124/172] add statuses/retweets_of_me to API --- actions/apitimelineretweetsofme.php | 126 ++++++++++++++++++++++++++++ classes/Notice.php | 14 ++++ classes/User.php | 53 ++++++++++++ lib/router.php | 4 + 4 files changed, 197 insertions(+) create mode 100644 actions/apitimelineretweetsofme.php diff --git a/actions/apitimelineretweetsofme.php b/actions/apitimelineretweetsofme.php new file mode 100644 index 0000000000..479bff4315 --- /dev/null +++ b/actions/apitimelineretweetsofme.php @@ -0,0 +1,126 @@ +. + * + * @category API + * @package StatusNet + * @author Evan Prodromou + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +require_once INSTALLDIR . '/lib/apiauth.php'; +require_once INSTALLDIR . '/lib/mediafile.php'; + +/** + * Show authenticating user's most recent notices that have been repeated + * + * @category API + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class ApiTimelineRetweetsOfMeAction extends ApiAuthAction +{ + const DEFAULTCOUNT = 20; + const MAXCOUNT = 200; + const MAXNOTICES = 3200; + + var $repeats = null; + var $cnt = self::DEFAULTCOUNT; + var $page = 1; + var $since_id = null; + var $max_id = null; + + /** + * Take arguments for running + * + * @param array $args $_REQUEST args + * + * @return boolean success flag + * + */ + + function prepare($args) + { + parent::prepare($args); + + $cnt = $this->int('count', self::DEFAULTCOUNT, self::MAXCOUNT, 1); + + $page = $this->int('page', 1, (self::MAXNOTICES/$this->cnt)); + + $since_id = $this->int('since_id'); + + $max_id = $this->int('max_id'); + + return true; + } + + /** + * Handle the request + * + * show a timeline of the user's repeated notices + * + * @param array $args $_REQUEST data (unused) + * + * @return void + */ + + function handle($args) + { + parent::handle($args); + + $offset = ($this->page-1) * $this->cnt; + $limit = $this->cnt; + + $strm = $this->auth_user->repeatsOfMe($offset, $limit, $this->since_id, $this->max_id); + + switch ($this->format) { + case 'xml': + $this->showXmlTimeline($strm); + break; + case 'json': + $this->showJsonTimeline($strm); + break; + case 'atom': + $profile = $this->auth_user->getProfile(); + + $title = sprintf(_("Repeats of %s"), $this->auth_user->nickname); + $taguribase = common_config('integration', 'taguri'); + $id = "tag:$taguribase:RepeatsOfMe:" . $this->auth_user->id; + $link = common_local_url('showstream', + array('nickname' => $this->auth_user->nickname)); + + $this->showAtomTimeline($strm, $title, $id, $link); + break; + + default: + $this->clientError(_('API method not found!'), $code = 404); + break; + } + } +} diff --git a/classes/Notice.php b/classes/Notice.php index 6a701ae0cd..eb611f314f 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -463,6 +463,20 @@ class Notice extends Memcached_DataObject $user->free(); unset($user); } + + $original = Notice::staticGet('id', $this->repeat_of); + + if (!empty($original)) { + $originalUser = User::staticGet('id', $original->profile_id); + if (!empty($originalUser)) { + $ouk = common_cache_key('user:repeats_of_me:'.$originalUser->id); + $cache->delete($ouk); + $originalUser->free(); + unset($originalUser); + } + $original->free(); + unset($original); + } } } } diff --git a/classes/User.php b/classes/User.php index 4b7365fc7a..b3da448a68 100644 --- a/classes/User.php +++ b/classes/User.php @@ -793,4 +793,57 @@ class User extends Memcached_DataObject return $ids; } + + function repeatsOfMe($offset=0, $limit=20, $since_id=null, $max_id=null) + { + $ids = Notice::stream(array($this, '_repeatsOfMeDirect'), + array(), + 'user:repeats_of_me:'.$this->id, + $offset, $limit, $since_id, $max_id, null); + + return Notice::getStreamByIds($ids); + } + + function _repeatsOfMeDirect($offset, $limit, $since_id, $max_id, $since) + { + $qry = + 'SELECT DISTINCT original.id AS id ' . + 'FROM notice original JOIN notice rept ON original.id = rept.repeat_of ' . + 'WHERE original.profile_id = ' . $this->id . ' '; + + if ($since_id != 0) { + $qry .= 'AND original.id > ' . $since_id . ' '; + } + + if ($max_id != 0) { + $qry .= 'AND original.id <= ' . $max_id . ' '; + } + + if (!is_null($since)) { + $qry .= 'AND original.modified > \'' . date('Y-m-d H:i:s', $since) . '\' '; + } + + // NOTE: we sort by fave time, not by notice time! + + $qry .= 'ORDER BY original.id DESC '; + + if (!is_null($offset)) { + $qry .= "LIMIT $limit OFFSET $offset"; + } + + $ids = array(); + + $notice = new Notice(); + + $notice->query($qry); + + while ($notice->fetch()) { + $ids[] = $notice->id; + } + + $notice->free(); + $notice = NULL; + + return $ids; + } } diff --git a/lib/router.php b/lib/router.php index 5c1bd3c4ff..732caa1c7e 100644 --- a/lib/router.php +++ b/lib/router.php @@ -323,6 +323,10 @@ class Router array('action' => 'ApiTimelineRetweetedByMe', 'format' => '(xml|json|atom)')); + $m->connect('api/statuses/retweets_of_me.:format', + array('action' => 'ApiTimelineRetweetsOfMe', + 'format' => '(xml|json|atom)')); + $m->connect('api/statuses/friends.:format', array('action' => 'ApiUserFriends', 'format' => '(xml|json)')); From 698b28c95c9d4fa5cb404395b2c90b10a438fcd5 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 12 Dec 2009 16:02:44 -0500 Subject: [PATCH 125/172] clear repeat_of flag when a notice is deleted --- classes/Notice.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/classes/Notice.php b/classes/Notice.php index eb611f314f..a7b0f8cdbc 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -115,6 +115,12 @@ class Notice extends Memcached_DataObject //Null any notices that are replies to this notice $this->query(sprintf("UPDATE notice set reply_to = null WHERE reply_to = %d", $this->id)); + + //Null any notices that are repeats of this notice + //XXX: probably need to uncache these, too + + $this->query(sprintf("UPDATE notice set repeat_of = null WHERE repeat_of = %d", $this->id)); + $related = array('Reply', 'Fave', 'Notice_tag', From 1ec54d3433a79f56c14c0a99114bb1e607348899 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 12 Dec 2009 16:15:23 -0500 Subject: [PATCH 126/172] add statuses/retweeted_to_me to API --- actions/apitimelineretweetedtome.php | 125 +++++++++++++++++++++++++++ classes/Notice.php | 14 +++ classes/User.php | 54 ++++++++++++ lib/router.php | 4 + 4 files changed, 197 insertions(+) create mode 100644 actions/apitimelineretweetedtome.php diff --git a/actions/apitimelineretweetedtome.php b/actions/apitimelineretweetedtome.php new file mode 100644 index 0000000000..681b0b9e9e --- /dev/null +++ b/actions/apitimelineretweetedtome.php @@ -0,0 +1,125 @@ +. + * + * @category API + * @package StatusNet + * @author Evan Prodromou + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +require_once INSTALLDIR . '/lib/apiauth.php'; + +/** + * Show most recent notices that are repeats in user's inbox + * + * @category API + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class ApiTimelineRetweetedToMeAction extends ApiAuthAction +{ + const DEFAULTCOUNT = 20; + const MAXCOUNT = 200; + const MAXNOTICES = 3200; + + var $repeats = null; + var $cnt = self::DEFAULTCOUNT; + var $page = 1; + var $since_id = null; + var $max_id = null; + + /** + * Take arguments for running + * + * @param array $args $_REQUEST args + * + * @return boolean success flag + * + */ + + function prepare($args) + { + parent::prepare($args); + + $cnt = $this->int('count', self::DEFAULTCOUNT, self::MAXCOUNT, 1); + + $page = $this->int('page', 1, (self::MAXNOTICES/$this->cnt)); + + $since_id = $this->int('since_id'); + + $max_id = $this->int('max_id'); + + return true; + } + + /** + * Handle the request + * + * show a timeline of the user's repeated notices + * + * @param array $args $_REQUEST data (unused) + * + * @return void + */ + + function handle($args) + { + parent::handle($args); + + $offset = ($this->page-1) * $this->cnt; + $limit = $this->cnt; + + $strm = $this->auth_user->repeatedToMe($offset, $limit, $this->since_id, $this->max_id); + + switch ($this->format) { + case 'xml': + $this->showXmlTimeline($strm); + break; + case 'json': + $this->showJsonTimeline($strm); + break; + case 'atom': + $profile = $this->auth_user->getProfile(); + + $title = sprintf(_("Repeated to %s"), $this->auth_user->nickname); + $taguribase = common_config('integration', 'taguri'); + $id = "tag:$taguribase:RepeatedToMe:" . $this->auth_user->id; + $link = common_local_url('all', + array('nickname' => $this->auth_user->nickname)); + + $this->showAtomTimeline($strm, $title, $id, $link); + break; + + default: + $this->clientError(_('API method not found!'), $code = 404); + break; + } + } +} diff --git a/classes/Notice.php b/classes/Notice.php index a7b0f8cdbc..7d2b898d26 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -483,6 +483,20 @@ class Notice extends Memcached_DataObject $original->free(); unset($original); } + + $ni = new Notice_inbox(); + + $ni->notice_id = $this->id; + + if ($ni->find()) { + while ($ni->fetch()) { + $tmk = common_cache_key('user:repeated_to_me:'.$ni->user_id); + $cache->delete($tmk); + } + } + + $ni->free(); + unset($ni); } } } diff --git a/classes/User.php b/classes/User.php index b3da448a68..9c071e06b0 100644 --- a/classes/User.php +++ b/classes/User.php @@ -846,4 +846,58 @@ class User extends Memcached_DataObject return $ids; } + + function repeatedToMe($offset=0, $limit=20, $since_id=null, $max_id=null) + { + $ids = Notice::stream(array($this, '_repeatedToMeDirect'), + array(), + 'user:repeated_to_me:'.$this->id, + $offset, $limit, $since_id, $max_id, null); + + return Notice::getStreamByIds($ids); + } + + function _repeatedToMeDirect($offset, $limit, $since_id, $max_id, $since) + { + $qry = + 'SELECT notice.id AS id ' . + 'FROM notice JOIN notice_inbox ON notice.id = notice_inbox.notice_id ' . + 'WHERE notice_inbox.user_id = ' . $this->id . ' ' . + 'AND notice.repeat_of IS NOT NULL '; + + if ($since_id != 0) { + $qry .= 'AND notice.id > ' . $since_id . ' '; + } + + if ($max_id != 0) { + $qry .= 'AND notice.id <= ' . $max_id . ' '; + } + + if (!is_null($since)) { + $qry .= 'AND notice.modified > \'' . date('Y-m-d H:i:s', $since) . '\' '; + } + + // NOTE: we sort by fave time, not by notice time! + + $qry .= 'ORDER BY notice.id DESC '; + + if (!is_null($offset)) { + $qry .= "LIMIT $limit OFFSET $offset"; + } + + $ids = array(); + + $notice = new Notice(); + + $notice->query($qry); + + while ($notice->fetch()) { + $ids[] = $notice->id; + } + + $notice->free(); + $notice = NULL; + + return $ids; + } } diff --git a/lib/router.php b/lib/router.php index 732caa1c7e..8f68f86ac7 100644 --- a/lib/router.php +++ b/lib/router.php @@ -323,6 +323,10 @@ class Router array('action' => 'ApiTimelineRetweetedByMe', 'format' => '(xml|json|atom)')); + $m->connect('api/statuses/retweeted_to_me.:format', + array('action' => 'ApiTimelineRetweetedToMe', + 'format' => '(xml|json|atom)')); + $m->connect('api/statuses/retweets_of_me.:format', array('action' => 'ApiTimelineRetweetsOfMe', 'format' => '(xml|json|atom)')); From 304ba80a0f39340c9bb4f15b631cbccf5949afbd Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 12 Dec 2009 16:33:38 -0500 Subject: [PATCH 127/172] make sure to show repeats correctly when original is deleted --- lib/noticelist.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/noticelist.php b/lib/noticelist.php index 7319a62ea7..aa6ea278c9 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -167,8 +167,13 @@ class NoticeListItem extends Widget { parent::__construct($out); if (!empty($notice->repeat_of)) { - $this->notice = Notice::staticGet('id', $notice->repeat_of); - $this->repeat = $notice; + $original = Notice::staticGet('id', $notice->repeat_of); + if (empty($original)) { // could have been deleted + $this->notice = $notice; + } else { + $this->notice = $original; + $this->repeat = $notice; + } } else { $this->notice = $notice; } From 438a0d7f1c23d176f380d6f5dba181ec54722b83 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 12 Dec 2009 16:58:39 -0500 Subject: [PATCH 128/172] remove obsoleted getStream, getStreamDirect, getCachedStream from Notice; use stream() instead --- classes/Notice.php | 187 --------------------------------------------- 1 file changed, 187 deletions(-) diff --git a/classes/Notice.php b/classes/Notice.php index 7d2b898d26..66d9cf5d47 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -655,193 +655,6 @@ class Notice extends Memcached_DataObject } } - # XXX: too many args; we need to move to named params or even a separate - # class for notice streams - - static function getStream($qry, $cachekey, $offset=0, $limit=20, $since_id=0, $max_id=0, $order=null, $since=null) { - - if (common_config('memcached', 'enabled')) { - - # Skip the cache if this is a since, since_id or max_id qry - if ($since_id > 0 || $max_id > 0 || $since) { - return Notice::getStreamDirect($qry, $offset, $limit, $since_id, $max_id, $order, $since); - } else { - return Notice::getCachedStream($qry, $cachekey, $offset, $limit, $order); - } - } - - return Notice::getStreamDirect($qry, $offset, $limit, $since_id, $max_id, $order, $since); - } - - static function getStreamDirect($qry, $offset, $limit, $since_id, $max_id, $order, $since) { - - $needAnd = false; - $needWhere = true; - - if (preg_match('/\bWHERE\b/i', $qry)) { - $needWhere = false; - $needAnd = true; - } - - if ($since_id > 0) { - - if ($needWhere) { - $qry .= ' WHERE '; - $needWhere = false; - } else { - $qry .= ' AND '; - } - - $qry .= ' notice.id > ' . $since_id; - } - - if ($max_id > 0) { - - if ($needWhere) { - $qry .= ' WHERE '; - $needWhere = false; - } else { - $qry .= ' AND '; - } - - $qry .= ' notice.id <= ' . $max_id; - } - - if ($since) { - - if ($needWhere) { - $qry .= ' WHERE '; - $needWhere = false; - } else { - $qry .= ' AND '; - } - - $qry .= ' notice.created > \'' . date('Y-m-d H:i:s', $since) . '\''; - } - - # Allow ORDER override - - if ($order) { - $qry .= $order; - } else { - $qry .= ' ORDER BY notice.created DESC, notice.id DESC '; - } - - if (common_config('db','type') == 'pgsql') { - $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset; - } else { - $qry .= ' LIMIT ' . $offset . ', ' . $limit; - } - - $notice = new Notice(); - - $notice->query($qry); - - return $notice; - } - - # XXX: this is pretty long and should probably be broken up into - # some helper functions - - static function getCachedStream($qry, $cachekey, $offset, $limit, $order) { - - # If outside our cache window, just go to the DB - - if ($offset + $limit > NOTICE_CACHE_WINDOW) { - return Notice::getStreamDirect($qry, $offset, $limit, null, null, $order, null); - } - - # Get the cache; if we can't, just go to the DB - - $cache = common_memcache(); - - if (empty($cache)) { - return Notice::getStreamDirect($qry, $offset, $limit, null, null, $order, null); - } - - # Get the notices out of the cache - - $notices = $cache->get(common_cache_key($cachekey)); - - # On a cache hit, return a DB-object-like wrapper - - if ($notices !== false) { - $wrapper = new ArrayWrapper(array_slice($notices, $offset, $limit)); - return $wrapper; - } - - # If the cache was invalidated because of new data being - # added, we can try and just get the new stuff. We keep an additional - # copy of the data at the key + ';last' - - # No cache hit. Try to get the *last* cached version - - $last_notices = $cache->get(common_cache_key($cachekey) . ';last'); - - if ($last_notices) { - - # Reverse-chron order, so last ID is last. - - $last_id = $last_notices[0]->id; - - # XXX: this assumes monotonically increasing IDs; a fair - # bet with our DB. - - $new_notice = Notice::getStreamDirect($qry, 0, NOTICE_CACHE_WINDOW, - $last_id, null, $order, null); - - if ($new_notice) { - $new_notices = array(); - while ($new_notice->fetch()) { - $new_notices[] = clone($new_notice); - } - $new_notice->free(); - $notices = array_slice(array_merge($new_notices, $last_notices), - 0, NOTICE_CACHE_WINDOW); - - # Store the array in the cache for next time - - $result = $cache->set(common_cache_key($cachekey), $notices); - $result = $cache->set(common_cache_key($cachekey) . ';last', $notices); - - # return a wrapper of the array for use now - - return new ArrayWrapper(array_slice($notices, $offset, $limit)); - } - } - - # Otherwise, get the full cache window out of the DB - - $notice = Notice::getStreamDirect($qry, 0, NOTICE_CACHE_WINDOW, null, null, $order, null); - - # If there are no hits, just return the value - - if (empty($notice)) { - return $notice; - } - - # Pack results into an array - - $notices = array(); - - while ($notice->fetch()) { - $notices[] = clone($notice); - } - - $notice->free(); - - # Store the array in the cache for next time - - $result = $cache->set(common_cache_key($cachekey), $notices); - $result = $cache->set(common_cache_key($cachekey) . ';last', $notices); - - # return a wrapper of the array for use now - - $wrapper = new ArrayWrapper(array_slice($notices, $offset, $limit)); - - return $wrapper; - } - function getStreamByIds($ids) { $cache = common_memcache(); From b9b8e08c104c63602eeb7ffed2167908fb43d15c Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sun, 13 Dec 2009 11:54:05 +1300 Subject: [PATCH 129/172] fix typo / parse error in sql comment syntax --- db/08to09_pg.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql index 0398952f6e..2eac5dadf3 100644 --- a/db/08to09_pg.sql +++ b/db/08to09_pg.sql @@ -74,7 +74,7 @@ ALTER TABLE notice ADD COLUMN lat decimal(10, 7) /* comment 'latitude'*/; ALTER TABLE notice ADD COLUMN lon decimal(10,7) /* comment 'longitude'*/; ALTER TABLE notice ADD COLUMN location_id integer /* comment 'location id if possible'*/ ; ALTER TABLE notice ADD COLUMN location_ns integer /* comment 'namespace for location'*/; -ALTER TABLE notice ADD COLUMN repeat_of integer / * comment 'notice this is a repeat of' */ references notice (id); +ALTER TABLE notice ADD COLUMN repeat_of integer /* comment 'notice this is a repeat of' */ references notice (id); ALTER TABLE profile ADD COLUMN lat decimal(10,7) /*comment 'latitude'*/ ; ALTER TABLE profile ADD COLUMN lon decimal(10,7) /*comment 'longitude'*/; From bed4e1c9e96b2bf2208f987479d15e3f624aac6a Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Sat, 12 Dec 2009 21:24:38 -0500 Subject: [PATCH 130/172] Add repeat command --- lib/command.php | 61 ++++++++++++++++++++++++++++++++++++++ lib/commandinterpreter.php | 13 ++++++++ 2 files changed, 74 insertions(+) diff --git a/lib/command.php b/lib/command.php index 085331f825..222bd76830 100644 --- a/lib/command.php +++ b/lib/command.php @@ -379,6 +379,65 @@ class MessageCommand extends Command } } +class RepeatCommand extends Command +{ + var $other = null; + function __construct($user, $other) + { + parent::__construct($user); + $this->other = $other; + } + + function execute($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; + } + } + + if($this->user->id == $notice->profile_id) + { + $channel->error($this->user, _('Cannot repeat your own notice')); + return; + } + + if ($recipient->hasRepeated($notice->id)) { + $channel->error($this->user, _('Already repeated that notice')); + return; + } + + $repeat = $notice->repeat($this->user->id, $channel->source); + + if ($repeat) { + common_broadcast_notice($repeat); + $channel->output($this->user, sprintf(_('Notice from %s repeated'), $recipient->nickname)); + } else { + $channel->error($this->user, _('Error repeating notice.')); + } + } +} + class ReplyCommand extends Command { var $other = null; @@ -696,6 +755,8 @@ class HelpCommand extends Command "whois - get profile info on user\n". "fav - add user's last notice as a 'fave'\n". "fav # - add notice with the given id as a 'fave'\n". + "repeat # - repeat a notice with a given id\n". + "repeat - repeat the last notice from user\n". "reply # - reply to notice with a given id\n". "reply - reply to the last notice from user\n". "join - join group\n". diff --git a/lib/commandinterpreter.php b/lib/commandinterpreter.php index 665015afcc..c2add7299e 100644 --- a/lib/commandinterpreter.php +++ b/lib/commandinterpreter.php @@ -169,6 +169,19 @@ class CommandInterpreter } else { return new ReplyCommand($user, $other, $extra); } + case 'repeat': + case 'rp': + case 'rt': + case 'rd': + if (!$arg) { + return null; + } + list($other, $extra) = $this->split_arg($arg); + if ($extra) { + return null; + } else { + return new RepeatCommand($user, $other); + } case 'whois': if (!$arg) { return null; From 95a6f2b84e663b73ac0a0be0fa42b480560177d2 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sun, 13 Dec 2009 18:24:12 +0100 Subject: [PATCH 131/172] Localisation updates for !StatusNet from !translatewiki.net !sntrans --- locale/ar/LC_MESSAGES/statusnet.po | 228 +++++++++++++----- locale/arz/LC_MESSAGES/statusnet.po | 230 ++++++++++++------ locale/bg/LC_MESSAGES/statusnet.po | 230 +++++++++++++----- locale/ca/LC_MESSAGES/statusnet.po | 235 ++++++++++++------ locale/cs/LC_MESSAGES/statusnet.po | 233 ++++++++++++------ locale/de/LC_MESSAGES/statusnet.po | 231 +++++++++++++----- locale/el/LC_MESSAGES/statusnet.po | 225 ++++++++++++----- locale/en_GB/LC_MESSAGES/statusnet.po | 230 +++++++++++++----- locale/es/LC_MESSAGES/statusnet.po | 232 ++++++++++++------ locale/fi/LC_MESSAGES/statusnet.po | 233 ++++++++++++------ locale/fr/LC_MESSAGES/statusnet.po | 242 +++++++++++++------ locale/ga/LC_MESSAGES/statusnet.po | 232 ++++++++++++------ locale/he/LC_MESSAGES/statusnet.po | 227 +++++++++++++----- locale/hsb/LC_MESSAGES/statusnet.po | 227 +++++++++++++----- locale/is/LC_MESSAGES/statusnet.po | 232 ++++++++++++------ locale/it/LC_MESSAGES/statusnet.po | 230 +++++++++++++----- locale/ja/LC_MESSAGES/statusnet.po | 228 +++++++++++++----- locale/ko/LC_MESSAGES/statusnet.po | 230 +++++++++++++----- locale/mk/LC_MESSAGES/statusnet.po | 227 +++++++++++++----- locale/nb/LC_MESSAGES/statusnet.po | 226 +++++++++++++----- locale/nl/LC_MESSAGES/statusnet.po | 233 ++++++++++++------ locale/nn/LC_MESSAGES/statusnet.po | 230 +++++++++++++----- locale/pl/LC_MESSAGES/statusnet.po | 234 ++++++++++++------ locale/pt/LC_MESSAGES/statusnet.po | 233 ++++++++++++------ locale/pt_BR/LC_MESSAGES/statusnet.po | 232 ++++++++++++------ locale/ru/LC_MESSAGES/statusnet.po | 233 +++++++++++++----- locale/statusnet.po | 214 ++++++++++++----- locale/sv/LC_MESSAGES/statusnet.po | 250 +++++++++++++------ locale/te/LC_MESSAGES/statusnet.po | 331 +++++++++++++++++--------- locale/tr/LC_MESSAGES/statusnet.po | 232 ++++++++++++------ locale/uk/LC_MESSAGES/statusnet.po | 232 +++++++++++++----- locale/vi/LC_MESSAGES/statusnet.po | 228 +++++++++++++----- locale/zh_CN/LC_MESSAGES/statusnet.po | 230 +++++++++++++----- locale/zh_TW/LC_MESSAGES/statusnet.po | 225 ++++++++++++----- 34 files changed, 5622 insertions(+), 2323 deletions(-) diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index fa5efc4551..bcde7227a3 100644 --- a/locale/ar/LC_MESSAGES/statusnet.po +++ b/locale/ar/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:09:09+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:14:58+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ar\n" "X-Message-Group: out-statusnet\n" @@ -44,9 +44,9 @@ msgstr "لا صفحة كهذه" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "لا مستخدم كهذا." @@ -130,7 +130,8 @@ msgstr "لم يوجد رمز التأكيد." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "تتطلب هذه الطريقة POST." @@ -221,11 +222,14 @@ msgstr "" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "" @@ -417,6 +421,20 @@ msgstr "" msgid "You may not delete another user's status." msgstr "" +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "لا إشعار كهذا." + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +msgid "Cannot repeat your own notice" +msgstr "" + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "احذف هذا الإشعار" + #: actions/apistatusesshow.php:138 msgid "Status deleted." msgstr "حُذِفت الحالة." @@ -486,6 +504,21 @@ msgstr "مسار %s الزمني العام" msgid "%s updates from everyone!" msgstr "" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, fuzzy, php-format +msgid "Repeated to %s" +msgstr "الردود على %s" + +#: actions/apitimelineretweetsofme.php:112 +#, fuzzy, php-format +msgid "Repeats of %s" +msgstr "الردود على %s" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -548,7 +581,7 @@ msgid "Preview" msgstr "عاين" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 msgid "Delete" msgstr "احذف" @@ -569,9 +602,10 @@ msgstr "" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "" @@ -770,7 +804,7 @@ msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟" msgid "Do not delete this notice" msgstr "لا تحذف هذا الإشعار" -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 msgid "Delete this notice" msgstr "احذف هذا الإشعار" @@ -1822,7 +1856,7 @@ msgid "You can't send a message to this user." msgstr "" #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "لا محتوى!" @@ -1926,8 +1960,8 @@ msgstr "نوع المحتوى " msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "ليس نسق بيانات مدعوم." @@ -2678,6 +2712,35 @@ msgstr "" msgid "Couldn’t get a request token." msgstr "" +#: actions/repeat.php:57 +msgid "Only logged-in users can repeat notices." +msgstr "" + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "لا ملف شخصي مُحدّد." + +#: actions/repeat.php:76 +#, fuzzy +msgid "You can't repeat your own notice." +msgstr "لا يمكنك إسكات المستخدمين على هذا الموقع." + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "لقد منعت مسبقا هذا المستخدم." + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "أنشئ" + +#: actions/repeat.php:115 +#, fuzzy +msgid "Repeated!" +msgstr "أنشئ" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -2980,6 +3043,11 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" +#: actions/showstream.php:313 +#, fuzzy, php-format +msgid "Repeat of %s" +msgstr "الردود على %s" + #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." msgstr "لا يمكنك إسكات المستخدمين على هذا الموقع." @@ -3757,43 +3825,48 @@ msgstr "تعذّر إدراج الرسالة." msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:188 +#: classes/Notice.php:196 msgid "Problem saving notice. Too long." msgstr "مشكلة في حفظ الإشعار. طويل جدًا." -#: classes/Notice.php:192 +#: classes/Notice.php:200 msgid "Problem saving notice. Unknown user." msgstr "مشكلة في حفظ الإشعار. مستخدم غير معروف." -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:203 +#: classes/Notice.php:211 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "مشكلة أثناء حفظ الإشعار." -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "" +#: classes/Notice.php:1320 +#, fuzzy, php-format +msgid "RT @%1$s %2$s" +msgstr "%1$s (%2$s)" + #: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" @@ -4002,19 +4075,19 @@ msgstr "" msgid "license." msgstr "الرخصة." -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "" -#: lib/action.php:1077 +#: lib/action.php:1107 msgid "After" msgstr "بعد" -#: lib/action.php:1085 +#: lib/action.php:1115 msgid "Before" msgstr "قبل" -#: lib/action.php:1133 +#: lib/action.php:1163 msgid "There was a problem with your session token." msgstr "" @@ -4107,11 +4180,12 @@ msgstr "" "المشتركون: %2$s\n" "الإشعارات: %3$s" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "ليس للمستخدم إشعار أخير" @@ -4153,77 +4227,87 @@ msgstr "" msgid "Error sending direct message." msgstr "" -#: lib/command.php:431 +#: lib/command.php:434 +#, fuzzy, php-format +msgid "Notice from %s repeated" +msgstr "أُرسل الإشعار" + +#: lib/command.php:436 +#, fuzzy +msgid "Error repeating notice." +msgstr "خطأ أثناء حفظ الإشعار." + +#: lib/command.php:490 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:440 +#: lib/command.php:499 #, php-format msgid "Reply to %s sent" msgstr "رُد على رسالة %s" -#: lib/command.php:442 +#: lib/command.php:501 msgid "Error saving notice." msgstr "خطأ أثناء حفظ الإشعار." -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "مُشترك ب%s" -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "" -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "" -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "" -#: lib/command.php:604 +#: lib/command.php:663 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "تعذّر إنشاء الكنى." -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:625 +#: lib/command.php:684 msgid "You are not subscribed to anyone." msgstr "لست مُشتركًا بأي أحد." -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "لست مشتركًا بأحد." @@ -4233,11 +4317,11 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:647 +#: lib/command.php:706 msgid "No one is subscribed to you." msgstr "لا أحد مشترك بك." -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "لا أحد مشترك بك." @@ -4247,11 +4331,11 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:669 +#: lib/command.php:728 msgid "You are not a member of any groups." msgstr "لست عضوًا في أي مجموعة." -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "لست عضوًا في أي مجموعة." @@ -4261,7 +4345,7 @@ msgstr[3] "أنت عضو في هذه المجموعات:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:685 +#: lib/command.php:744 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4277,6 +4361,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -4721,7 +4807,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 msgid "from" msgstr "من" @@ -4806,40 +4892,40 @@ msgstr "أرفق" msgid "Attach a file" msgstr "أرفق ملفًا" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "N" msgstr "ش" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "ج" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "ر" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "غ" -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "في" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 msgid "in context" msgstr "في السياق" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 msgid "Reply to this notice" msgstr "رُد على هذا الإشعار" -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 msgid "Reply" msgstr "رُد" @@ -4969,6 +5055,16 @@ msgstr "مُختارون" msgid "Popular" msgstr "مشهورة" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "رُد على هذا الإشعار" + +#: lib/repeatform.php:132 +#, fuzzy +msgid "Repeat" +msgstr "أعد الضبط" + #: lib/sandboxform.php:67 msgid "Sandbox" msgstr "" diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po index 6a2ccdf617..c3b33094e3 100644 --- a/locale/arz/LC_MESSAGES/statusnet.po +++ b/locale/arz/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:09:12+0000\n" -"Language-Team: Arabic\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:15:01+0000\n" +"Language-Team: Egyptian Spoken Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: arz\n" "X-Message-Group: out-statusnet\n" @@ -44,9 +44,9 @@ msgstr "لا صفحه كهذه" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "لا مستخدم كهذا." @@ -130,7 +130,8 @@ msgstr "لم يوجد رمز التأكيد." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "تتطلب هذه الطريقه POST." @@ -222,11 +223,14 @@ msgstr "" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "" @@ -418,6 +422,20 @@ msgstr "" msgid "You may not delete another user's status." msgstr "" +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "لا إشعار كهذا." + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +msgid "Cannot repeat your own notice" +msgstr "" + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "احذف هذا الإشعار" + #: actions/apistatusesshow.php:138 msgid "Status deleted." msgstr "حُذِفت الحاله." @@ -487,6 +505,21 @@ msgstr "مسار %s الزمنى العام" msgid "%s updates from everyone!" msgstr "" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, fuzzy, php-format +msgid "Repeated to %s" +msgstr "الردود على %s" + +#: actions/apitimelineretweetsofme.php:112 +#, fuzzy, php-format +msgid "Repeats of %s" +msgstr "الردود على %s" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -549,7 +582,7 @@ msgid "Preview" msgstr "عاين" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 msgid "Delete" msgstr "احذف" @@ -570,9 +603,10 @@ msgstr "" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "" @@ -771,7 +805,7 @@ msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟" msgid "Do not delete this notice" msgstr "لا تحذف هذا الإشعار" -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 msgid "Delete this notice" msgstr "احذف هذا الإشعار" @@ -1823,7 +1857,7 @@ msgid "You can't send a message to this user." msgstr "" #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "لا محتوى!" @@ -1927,8 +1961,8 @@ msgstr "نوع المحتوى " msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "ليس نسق بيانات مدعوم." @@ -2679,6 +2713,35 @@ msgstr "" msgid "Couldn’t get a request token." msgstr "" +#: actions/repeat.php:57 +msgid "Only logged-in users can repeat notices." +msgstr "" + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "لا ملف شخصى مُحدّد." + +#: actions/repeat.php:76 +#, fuzzy +msgid "You can't repeat your own notice." +msgstr "لا يمكنك إسكات المستخدمين على هذا الموقع." + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "لقد منعت مسبقا هذا المستخدم." + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "أنشئ" + +#: actions/repeat.php:115 +#, fuzzy +msgid "Repeated!" +msgstr "أنشئ" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -2981,6 +3044,11 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" +#: actions/showstream.php:313 +#, fuzzy, php-format +msgid "Repeat of %s" +msgstr "الردود على %s" + #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." msgstr "لا يمكنك إسكات المستخدمين على هذا الموقع." @@ -3758,43 +3826,48 @@ msgstr "تعذّر إدراج الرساله." msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:188 +#: classes/Notice.php:196 msgid "Problem saving notice. Too long." msgstr "مشكله فى حفظ الإشعار. طويل جدًا." -#: classes/Notice.php:192 +#: classes/Notice.php:200 msgid "Problem saving notice. Unknown user." msgstr "مشكله فى حفظ الإشعار. مستخدم غير معروف." -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:203 +#: classes/Notice.php:211 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "مشكله أثناء حفظ الإشعار." -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "" +#: classes/Notice.php:1320 +#, fuzzy, php-format +msgid "RT @%1$s %2$s" +msgstr "%1$s (%2$s)" + #: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" @@ -4003,19 +4076,19 @@ msgstr "" msgid "license." msgstr "الرخصه." -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "" -#: lib/action.php:1077 +#: lib/action.php:1107 msgid "After" msgstr "بعد" -#: lib/action.php:1085 +#: lib/action.php:1115 msgid "Before" msgstr "قبل" -#: lib/action.php:1133 +#: lib/action.php:1163 msgid "There was a problem with your session token." msgstr "" @@ -4108,11 +4181,12 @@ msgstr "" "المشتركون: %2$s\n" "الإشعارات: %3$s" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "ليس للمستخدم إشعار أخير" @@ -4154,77 +4228,87 @@ msgstr "" msgid "Error sending direct message." msgstr "" -#: lib/command.php:431 +#: lib/command.php:434 +#, fuzzy, php-format +msgid "Notice from %s repeated" +msgstr "أُرسل الإشعار" + +#: lib/command.php:436 +#, fuzzy +msgid "Error repeating notice." +msgstr "خطأ أثناء حفظ الإشعار." + +#: lib/command.php:490 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:440 +#: lib/command.php:499 #, php-format msgid "Reply to %s sent" msgstr "رُد على رساله %s" -#: lib/command.php:442 +#: lib/command.php:501 msgid "Error saving notice." msgstr "خطأ أثناء حفظ الإشعار." -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "مُشترك ب%s" -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "" -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "" -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "" -#: lib/command.php:604 +#: lib/command.php:663 #, php-format msgid "Could not create login token for %s" msgstr "" -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:625 +#: lib/command.php:684 msgid "You are not subscribed to anyone." msgstr "لست مُشتركًا بأى أحد." -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "لست مشتركًا بأحد." @@ -4234,11 +4318,11 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:647 +#: lib/command.php:706 msgid "No one is subscribed to you." msgstr "لا أحد مشترك بك." -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "لا أحد مشترك بك." @@ -4248,11 +4332,11 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:669 +#: lib/command.php:728 msgid "You are not a member of any groups." msgstr "لست عضوًا فى أى مجموعه." -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "لست عضوًا فى أى مجموعه." @@ -4262,7 +4346,7 @@ msgstr[3] "أنت عضو فى هذه المجموعات:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:685 +#: lib/command.php:744 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4278,6 +4362,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -4722,7 +4808,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 msgid "from" msgstr "من" @@ -4807,40 +4893,40 @@ msgstr "أرفق" msgid "Attach a file" msgstr "أرفق ملفًا" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "N" msgstr "ش" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "ج" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "ر" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "غ" -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "في" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 msgid "in context" msgstr "فى السياق" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 msgid "Reply to this notice" msgstr "رُد على هذا الإشعار" -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 msgid "Reply" msgstr "رُد" @@ -4970,6 +5056,16 @@ msgstr "مُختارون" msgid "Popular" msgstr "مشهورة" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "رُد على هذا الإشعار" + +#: lib/repeatform.php:132 +#, fuzzy +msgid "Repeat" +msgstr "أعد الضبط" + #: lib/sandboxform.php:67 msgid "Sandbox" msgstr "" diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index 0904420e09..e03b33d601 100644 --- a/locale/bg/LC_MESSAGES/statusnet.po +++ b/locale/bg/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:09:15+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:15:04+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: bg\n" "X-Message-Group: out-statusnet\n" @@ -43,9 +43,9 @@ msgstr "Няма такака страница." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Няма такъв потребител" @@ -128,7 +128,8 @@ msgstr "Не е открит методът в API." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Този метод изисква заявка POST." @@ -221,11 +222,14 @@ msgstr "Всички преки съобщения, изпратени до %s" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "Не е открит методът в API." @@ -423,6 +427,21 @@ msgstr "Този метод изисква заявка POST или DELETE." msgid "You may not delete another user's status." msgstr "Не може да изтривате бележки на друг потребител." +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "Няма такава бележка." + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Грешка при включване на уведомлението." + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Изтриване на бележката" + #: actions/apistatusesshow.php:138 msgid "Status deleted." msgstr "Бележката е изтрита." @@ -492,6 +511,21 @@ msgstr "Общ поток на %s" msgid "%s updates from everyone!" msgstr "" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, fuzzy, php-format +msgid "Repeated to %s" +msgstr "Отговори на %s" + +#: actions/apitimelineretweetsofme.php:112 +#, fuzzy, php-format +msgid "Repeats of %s" +msgstr "Отговори на %s" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -555,7 +589,7 @@ msgid "Preview" msgstr "Преглед" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 msgid "Delete" msgstr "Изтриване" @@ -576,9 +610,10 @@ msgstr "Изрязване" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "Имаше проблем със сесията ви в сайта. Моля, опитайте отново!" @@ -783,7 +818,7 @@ msgstr "Наистина ли искате да изтриете тази бел msgid "Do not delete this notice" msgstr "Да не се изтрива бележката" -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 msgid "Delete this notice" msgstr "Изтриване на бележката" @@ -1918,7 +1953,7 @@ msgid "You can't send a message to this user." msgstr "Не може да изпращате съобщения до този потребител." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "Няма съдържание!" @@ -2027,8 +2062,8 @@ msgstr "Свързване" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "Неподдържан формат на данните" @@ -2815,6 +2850,36 @@ msgstr "" msgid "Couldn’t get a request token." msgstr "Не е получен token за одобрение." +#: actions/repeat.php:57 +#, fuzzy +msgid "Only logged-in users can repeat notices." +msgstr "Само потребителят може да отваря собствената си кутия." + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "Не е указан профил." + +#: actions/repeat.php:76 +#, fuzzy +msgid "You can't repeat your own notice." +msgstr "Не можете да се регистрате, ако не сте съгласни с лиценза." + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "Вече сте блокирали този потребител." + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "Създаване" + +#: actions/repeat.php:115 +#, fuzzy +msgid "Repeated!" +msgstr "Създаване" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -3116,6 +3181,11 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" +#: actions/showstream.php:313 +#, fuzzy, php-format +msgid "Repeat of %s" +msgstr "Отговори на %s" + #: actions/silence.php:65 actions/unsilence.php:65 #, fuzzy msgid "You cannot silence users on this site." @@ -3937,28 +4007,28 @@ msgstr "Грешка при вмъкване на съобщението." msgid "Could not update message with new URI." msgstr "Грешка при обновяване на бележката с нов URL-адрес." -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:188 +#: classes/Notice.php:196 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Проблем при записване на бележката." -#: classes/Notice.php:192 +#: classes/Notice.php:200 msgid "Problem saving notice. Unknown user." msgstr "Грешка при записване на бележката. Непознат потребител." -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте " "отново след няколко минути." -#: classes/Notice.php:203 +#: classes/Notice.php:211 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -3967,19 +4037,24 @@ msgstr "" "Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте " "отново след няколко минути." -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "Забранено ви е да публикувате бележки в този сайт." -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "Проблем при записване на бележката." -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "Грешка в базата от данни — отговор при вмъкването: %s" +#: classes/Notice.php:1320 +#, fuzzy, php-format +msgid "RT @%1$s %2$s" +msgstr "%1$s (%2$s)" + #: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" @@ -4197,19 +4272,19 @@ msgstr "Всички " msgid "license." msgstr "лиценз." -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "Страниране" -#: lib/action.php:1077 +#: lib/action.php:1107 msgid "After" msgstr "След" -#: lib/action.php:1085 +#: lib/action.php:1115 msgid "Before" msgstr "Преди" -#: lib/action.php:1133 +#: lib/action.php:1163 msgid "There was a problem with your session token." msgstr "Имаше проблем със сесията ви в сайта." @@ -4307,11 +4382,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "Потребителят няма последна бележка" @@ -4354,107 +4430,117 @@ msgstr "" msgid "Error sending direct message." msgstr "Грешка при изпращане на прякото съобщение" -#: lib/command.php:431 +#: lib/command.php:434 +#, fuzzy, php-format +msgid "Notice from %s repeated" +msgstr "Бележката е публикувана" + +#: lib/command.php:436 +#, fuzzy +msgid "Error repeating notice." +msgstr "Проблем при записване на бележката." + +#: lib/command.php:490 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" "Съобщението е твърде дълго. Най-много може да е 140 знака, а сте въвели %d." -#: lib/command.php:440 +#: lib/command.php:499 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Отговаряне на тази бележка" -#: lib/command.php:442 +#: lib/command.php:501 #, fuzzy msgid "Error saving notice." msgstr "Проблем при записване на бележката." -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "Уточнете името на потребителя, за когото се абонирате." -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "Абонирани сте за %s." -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "Уточнете името на потребителя, от когото се отписвате." -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "Отписани сте от %s." -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "Командата все още не се поддържа." -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "Уведомлението е изключено." -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "Грешка при изключване на уведомлението." -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "Уведомлението е включено." -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "Грешка при включване на уведомлението." -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "" -#: lib/command.php:604 +#: lib/command.php:663 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Грешка при отбелязване като любима." -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:625 +#: lib/command.php:684 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Не сте абонирани за този профил" -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Вече сте абонирани за следните потребители:" msgstr[1] "Вече сте абонирани за следните потребители:" -#: lib/command.php:647 +#: lib/command.php:706 #, fuzzy msgid "No one is subscribed to you." msgstr "Грешка при абониране на друг потребител за вас." -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Грешка при абониране на друг потребител за вас." msgstr[1] "Грешка при абониране на друг потребител за вас." -#: lib/command.php:669 +#: lib/command.php:728 msgid "You are not a member of any groups." msgstr "Не членувате в нито една група." -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Не членувате в тази група." msgstr[1] "Не членувате в тази група." -#: lib/command.php:685 +#: lib/command.php:744 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4470,6 +4556,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -4930,7 +5018,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 msgid "from" msgstr "от" @@ -5015,41 +5103,41 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 #, fuzzy msgid "N" msgstr "Не" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "" -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 msgid "in context" msgstr "в контекст" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 msgid "Reply to this notice" msgstr "Отговаряне на тази бележка" -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 msgid "Reply" msgstr "Отговор" @@ -5182,6 +5270,16 @@ msgstr "Избрано" msgid "Popular" msgstr "Популярно" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "Отговаряне на тази бележка" + +#: lib/repeatform.php:132 +#, fuzzy +msgid "Repeat" +msgstr "Обновяване" + #: lib/sandboxform.php:67 #, fuzzy msgid "Sandbox" diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index 6cb82084c3..d13f729be9 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -1,5 +1,6 @@ # Translation of StatusNet to Catalan # +# Author@translatewiki.net: McDutchie # Author@translatewiki.net: Toniher # -- # This file is distributed under the same license as the StatusNet package. @@ -8,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:09:18+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:15:07+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: out-statusnet\n" @@ -43,9 +44,9 @@ msgstr "No existeix la pàgina." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "No existeix aquest usuari." @@ -131,7 +132,8 @@ msgstr "No s'ha trobat el mètode API!" #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Aquest mètode requereix POST." @@ -226,11 +228,14 @@ msgstr "Tots els missatges directes enviats a %s" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "No s'ha trobat el mètode API!" @@ -429,6 +434,21 @@ msgstr "Aquest mètode requereix POST o DELETE." msgid "You may not delete another user's status." msgstr "No pots eliminar l'estatus d'un altre usuari." +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "No existeix aquest avís." + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "No es poden posar en on les notificacions." + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Eliminar aquesta nota" + #: actions/apistatusesshow.php:138 msgid "Status deleted." msgstr "S'ha suprimit l'estat." @@ -498,6 +518,21 @@ msgstr "%s línia temporal pública" msgid "%s updates from everyone!" msgstr "%s notificacions de tots!" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, fuzzy, php-format +msgid "Repeated to %s" +msgstr "Respostes a %s" + +#: actions/apitimelineretweetsofme.php:112 +#, fuzzy, php-format +msgid "Repeats of %s" +msgstr "Respostes a %s" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -561,7 +596,7 @@ msgid "Preview" msgstr "Previsualitzar" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 msgid "Delete" msgstr "Eliminar" @@ -582,9 +617,10 @@ msgstr "Crop" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "" "Sembla que hi ha hagut un problema amb la teva sessió. Prova-ho de nou, si " @@ -793,7 +829,7 @@ msgstr "N'estàs segur que vols eliminar aquesta notificació?" msgid "Do not delete this notice" msgstr "No es pot esborrar la notificació." -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 msgid "Delete this notice" msgstr "Eliminar aquesta nota" @@ -1577,7 +1613,7 @@ msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." msgstr "" -"Adreça Jabber o GTalk, per exemple \"NomUsuari@exemple.org\". Primer, " +"Adreça Jabber o GTalk, per exemple \"NomUsuari@example.org\". Primer, " "assegura't d'afegir a %s a la teva llista d'amics en el teu client de " "missatgeria instantània o a GTalk." @@ -1727,7 +1763,7 @@ msgid "Send" msgstr "Envia" #: actions/invite.php:226 -#, php-format +#, fuzzy, php-format msgid "%1$s has invited you to join them on %2$s" msgstr "%1$s t'ha convidat us ha convidat a unir-te al grup %2$s" @@ -1938,7 +1974,7 @@ msgid "You can't send a message to this user." msgstr "No podeu enviar un misssatge a aquest usuari." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "Cap contingut!" @@ -2046,8 +2082,8 @@ msgstr "tipus de contingut " msgid "Only " msgstr "Només " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "Format de data no suportat." @@ -2848,6 +2884,36 @@ msgstr "Aquest és un perfil local! Entra per subscriure-t'hi." msgid "Couldn’t get a request token." msgstr "No s'ha pogut obtenir un senyal de petició." +#: actions/repeat.php:57 +#, fuzzy +msgid "Only logged-in users can repeat notices." +msgstr "Només l'usuari pot llegir les seves safates de correu." + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "No s'ha especificat perfil." + +#: actions/repeat.php:76 +#, fuzzy +msgid "You can't repeat your own notice." +msgstr "No pots registrar-te si no estàs d'acord amb la llicència." + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "Ja heu blocat l'usuari." + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "S'ha creat" + +#: actions/repeat.php:115 +#, fuzzy +msgid "Repeated!" +msgstr "S'ha creat" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -3153,6 +3219,11 @@ msgstr "" "**%s** té un compte a %%%%site.name%%%%, un servei de [microblogging](http://" "ca.wikipedia.org/wiki/Microblogging) " +#: actions/showstream.php:313 +#, fuzzy, php-format +msgid "Repeat of %s" +msgstr "Respostes a %s" + #: actions/silence.php:65 actions/unsilence.php:65 #, fuzzy msgid "You cannot silence users on this site." @@ -3977,28 +4048,28 @@ msgstr "No s'ha pogut inserir el missatge." msgid "Could not update message with new URI." msgstr "No s'ha pogut inserir el missatge amb la nova URI." -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Hashtag de l'error de la base de dades:%s" -#: classes/Notice.php:188 +#: classes/Notice.php:196 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Problema en guardar l'avís." -#: classes/Notice.php:192 +#: classes/Notice.php:200 msgid "Problem saving notice. Unknown user." msgstr "Problema al guardar la notificació. Usuari desconegut." -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Masses notificacions massa ràpid; pren un respir i publica de nou en uns " "minuts." -#: classes/Notice.php:203 +#: classes/Notice.php:211 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4007,19 +4078,24 @@ msgstr "" "Masses notificacions massa ràpid; pren un respir i publica de nou en uns " "minuts." -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "Ha estat bandejat de publicar notificacions en aquest lloc." -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "Problema en guardar l'avís." -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "Error de BD en inserir resposta: %s" +#: classes/Notice.php:1320 +#, fuzzy, php-format +msgid "RT @%1$s %2$s" +msgstr "%1$s (%2$s)" + #: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" @@ -4231,19 +4307,19 @@ msgstr "Tot " msgid "license." msgstr "llicència." -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "Paginació" -#: lib/action.php:1077 +#: lib/action.php:1107 msgid "After" msgstr "Posteriors" -#: lib/action.php:1085 +#: lib/action.php:1115 msgid "Before" msgstr "Anteriors" -#: lib/action.php:1133 +#: lib/action.php:1163 msgid "There was a problem with your session token." msgstr "Ha ocorregut algun problema amb la teva sessió." @@ -4337,11 +4413,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "L'usuari no té última nota" @@ -4383,106 +4460,116 @@ msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d" msgid "Error sending direct message." msgstr "Error al enviar el missatge directe." -#: lib/command.php:431 +#: lib/command.php:434 +#, fuzzy, php-format +msgid "Notice from %s repeated" +msgstr "Notificació publicada" + +#: lib/command.php:436 +#, fuzzy +msgid "Error repeating notice." +msgstr "Problema en guardar l'avís." + +#: lib/command.php:490 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d" -#: lib/command.php:440 +#: lib/command.php:499 #, php-format msgid "Reply to %s sent" msgstr "S'ha enviat la resposta a %s" -#: lib/command.php:442 +#: lib/command.php:501 #, fuzzy msgid "Error saving notice." msgstr "Problema en guardar l'avís." -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "Especifica el nom de l'usuari a que vols subscriure't" -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "Subscrit a %s" -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "Especifica el nom de l'usuari del que vols deixar d'estar subscrit" -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "Has deixat d'estar subscrit a %s" -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "Comanda encara no implementada." -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "Notificacions off." -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "No es poden posar en off les notificacions." -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "Notificacions on." -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "No es poden posar en on les notificacions." -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "" -#: lib/command.php:604 +#: lib/command.php:663 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "No s'han pogut crear els àlies." -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:625 +#: lib/command.php:684 #, fuzzy msgid "You are not subscribed to anyone." msgstr "No estàs subscrit a aquest perfil." -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Ja estàs subscrit a aquests usuaris:" msgstr[1] "Ja estàs subscrit a aquests usuaris:" -#: lib/command.php:647 +#: lib/command.php:706 #, fuzzy msgid "No one is subscribed to you." msgstr "No pots subscriure a un altre a tu mateix." -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "No pots subscriure a un altre a tu mateix." msgstr[1] "No pots subscriure a un altre a tu mateix." -#: lib/command.php:669 +#: lib/command.php:728 msgid "You are not a member of any groups." msgstr "No sou membre de cap grup." -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "No sou un membre del grup." msgstr[1] "No sou un membre del grup." -#: lib/command.php:685 +#: lib/command.php:744 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4498,6 +4585,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -4963,7 +5052,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 msgid "from" msgstr "de" @@ -5048,42 +5137,42 @@ msgstr "Adjunta" msgid "Attach a file" msgstr "Adjunta un fitxer" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 #, fuzzy msgid "N" msgstr "No" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "" -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 #, fuzzy msgid "in context" msgstr "Cap contingut!" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 msgid "Reply to this notice" msgstr "respondre a aquesta nota" -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 msgid "Reply" msgstr "Respon" @@ -5216,6 +5305,16 @@ msgstr "Destacat" msgid "Popular" msgstr "Popular" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "respondre a aquesta nota" + +#: lib/repeatform.php:132 +#, fuzzy +msgid "Repeat" +msgstr "Restablir" + #: lib/sandboxform.php:67 #, fuzzy msgid "Sandbox" diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index 36bec9bfe3..ff7e341163 100644 --- a/locale/cs/LC_MESSAGES/statusnet.po +++ b/locale/cs/LC_MESSAGES/statusnet.po @@ -1,6 +1,7 @@ # Translation of StatusNet to Czech # # Author@translatewiki.net: Kuvaly +# Author@translatewiki.net: McDutchie # -- # This file is distributed under the same license as the StatusNet package. # @@ -8,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:09:20+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:15:10+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: cs\n" "X-Message-Group: out-statusnet\n" @@ -44,9 +45,9 @@ msgstr "Žádné takové oznámení." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Žádný takový uživatel." @@ -131,7 +132,8 @@ msgstr "Potvrzující kód nebyl nalezen" #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" @@ -225,11 +227,14 @@ msgstr "" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "" @@ -427,6 +432,20 @@ msgstr "" msgid "You may not delete another user's status." msgstr "" +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "Žádné takové oznámení." + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +msgid "Cannot repeat your own notice" +msgstr "" + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Odstranit toto oznámení" + #: actions/apistatusesshow.php:138 #, fuzzy msgid "Status deleted." @@ -498,6 +517,21 @@ msgstr "" msgid "%s updates from everyone!" msgstr "" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, fuzzy, php-format +msgid "Repeated to %s" +msgstr "Odpovědi na %s" + +#: actions/apitimelineretweetsofme.php:112 +#, fuzzy, php-format +msgid "Repeats of %s" +msgstr "Odpovědi na %s" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -563,7 +597,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 msgid "Delete" msgstr "Odstranit" @@ -584,9 +618,10 @@ msgstr "" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "" @@ -792,7 +827,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "Žádné takové oznámení." -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 msgid "Delete this notice" msgstr "Odstranit toto oznámení" @@ -1574,8 +1609,8 @@ msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." msgstr "" -"Jabber nebo GTalk adresy, například \"jmeno@neco.cz\". Neprve se ujistěte že " -"jste přidal %s do vašeho seznamu kontaktů." +"Jabber nebo GTalk adresy, například \"jmeno@example.org\". Neprve se " +"ujistěte že jste přidal %s do vašeho seznamu kontaktů." #: actions/imsettings.php:143 msgid "Send me notices through Jabber/GTalk." @@ -1895,7 +1930,7 @@ msgid "You can't send a message to this user." msgstr "" #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "Žádný obsah!" @@ -2003,8 +2038,8 @@ msgstr "Připojit" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "" @@ -2782,6 +2817,35 @@ msgstr "" msgid "Couldn’t get a request token." msgstr "Nelze získat řetězec požadavku." +#: actions/repeat.php:57 +msgid "Only logged-in users can repeat notices." +msgstr "" + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "Nové sdělení" + +#: actions/repeat.php:76 +#, fuzzy +msgid "You can't repeat your own notice." +msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí." + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "Již jste přihlášen" + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "Vytvořit" + +#: actions/repeat.php:115 +#, fuzzy +msgid "Repeated!" +msgstr "Vytvořit" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -3086,6 +3150,11 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" +#: actions/showstream.php:313 +#, fuzzy, php-format +msgid "Repeat of %s" +msgstr "Odpovědi na %s" + #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." msgstr "" @@ -3908,45 +3977,50 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:188 +#: classes/Notice.php:196 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Problém při ukládání sdělení" -#: classes/Notice.php:192 +#: classes/Notice.php:200 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Problém při ukládání sdělení" -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:203 +#: classes/Notice.php:211 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "Problém při ukládání sdělení" -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "Chyba v DB při vkládání odpovědi: %s" +#: classes/Notice.php:1320 +#, php-format +msgid "RT @%1$s %2$s" +msgstr "" + #: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" @@ -4167,21 +4241,21 @@ msgstr "" msgid "license." msgstr "" -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "" -#: lib/action.php:1077 +#: lib/action.php:1107 #, fuzzy msgid "After" msgstr "« Novější" -#: lib/action.php:1085 +#: lib/action.php:1115 #, fuzzy msgid "Before" msgstr "Starší »" -#: lib/action.php:1133 +#: lib/action.php:1163 msgid "There was a problem with your session token." msgstr "" @@ -4274,11 +4348,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "" @@ -4320,110 +4395,120 @@ msgstr "" msgid "Error sending direct message." msgstr "" -#: lib/command.php:431 +#: lib/command.php:434 +#, fuzzy, php-format +msgid "Notice from %s repeated" +msgstr "Sdělení" + +#: lib/command.php:436 +#, fuzzy +msgid "Error repeating notice." +msgstr "Problém při ukládání sdělení" + +#: lib/command.php:490 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:440 +#: lib/command.php:499 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Odpovědi na %s" -#: lib/command.php:442 +#: lib/command.php:501 #, fuzzy msgid "Error saving notice." msgstr "Problém při ukládání sdělení" -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "" -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "" -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "" -#: lib/command.php:604 +#: lib/command.php:663 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Nelze uložin informace o obrázku" -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:625 +#: lib/command.php:684 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Neodeslal jste nám profil" -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Neodeslal jste nám profil" msgstr[1] "Neodeslal jste nám profil" msgstr[2] "" -#: lib/command.php:647 +#: lib/command.php:706 #, fuzzy msgid "No one is subscribed to you." msgstr "Vzdálený odběr" -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Vzdálený odběr" msgstr[1] "Vzdálený odběr" msgstr[2] "" -#: lib/command.php:669 +#: lib/command.php:728 #, fuzzy msgid "You are not a member of any groups." msgstr "Neodeslal jste nám profil" -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Neodeslal jste nám profil" msgstr[1] "Neodeslal jste nám profil" msgstr[2] "" -#: lib/command.php:685 +#: lib/command.php:744 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4439,6 +4524,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -4902,7 +4989,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 #, fuzzy msgid "from" msgstr " od " @@ -4991,41 +5078,41 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "N" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "" -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 #, fuzzy msgid "in context" msgstr "Žádný obsah!" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 #, fuzzy msgid "Reply" msgstr "odpověď" @@ -5158,6 +5245,16 @@ msgstr "" msgid "Popular" msgstr "Hledání lidí" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "Odstranit toto oznámení" + +#: lib/repeatform.php:132 +#, fuzzy +msgid "Repeat" +msgstr "Reset" + #: lib/sandboxform.php:67 msgid "Sandbox" msgstr "" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index 37dccbdfcc..a35c4635e8 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:09:23+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:15:13+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: out-statusnet\n" @@ -45,9 +45,9 @@ msgstr "Seite nicht vorhanden" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Unbekannter Benutzer." @@ -130,7 +130,8 @@ msgstr "API-Methode nicht gefunden." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Diese Methode benötigt ein POST." @@ -221,11 +222,14 @@ msgstr "Alle an %s gesendeten direkten Nachrichten" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "API-Methode nicht gefunden!" @@ -423,6 +427,21 @@ msgstr "Diese Methode benötigt ein POST oder DELETE." msgid "You may not delete another user's status." msgstr "Du kannst den Status eines anderen Benutzers nicht löschen." +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "Unbekannte Nachricht." + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Konnte Benachrichtigung nicht aktivieren." + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Nachricht löschen" + #: actions/apistatusesshow.php:138 msgid "Status deleted." msgstr "Status gelöscht." @@ -495,6 +514,21 @@ msgstr "%s öffentliche Zeitleiste" msgid "%s updates from everyone!" msgstr "%s Nachrichten von allen!" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, fuzzy, php-format +msgid "Repeated to %s" +msgstr "Antworten an %s" + +#: actions/apitimelineretweetsofme.php:112 +#, fuzzy, php-format +msgid "Repeats of %s" +msgstr "Antworten an %s" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -558,7 +592,7 @@ msgid "Preview" msgstr "Vorschau" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 msgid "Delete" msgstr "Löschen" @@ -579,9 +613,10 @@ msgstr "Zuschneiden" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut." @@ -783,7 +818,7 @@ msgstr "Bist du sicher, dass du diese Nachricht löschen möchtest?" msgid "Do not delete this notice" msgstr "Diese Nachricht nicht löschen" -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 msgid "Delete this notice" msgstr "Nachricht löschen" @@ -1906,7 +1941,7 @@ msgid "You can't send a message to this user." msgstr "Du kannst diesem Benutzer keine Nachricht schicken." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "Kein Inhalt!" @@ -2016,8 +2051,8 @@ msgstr "Content-Typ " msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "Kein unterstütztes Datenformat." @@ -2807,6 +2842,37 @@ msgstr "Das ist ein lokales Profil! Zum Abonnieren anmelden." msgid "Couldn’t get a request token." msgstr "Konnte keinen Anfrage-Token bekommen." +#: actions/repeat.php:57 +#, fuzzy +msgid "Only logged-in users can repeat notices." +msgstr "Nur der Benutzer selbst kann seinen Posteingang lesen." + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "Kein Profil angegeben." + +#: actions/repeat.php:76 +#, fuzzy +msgid "You can't repeat your own notice." +msgstr "" +"Du kannst dich nicht registrieren, wenn du die Lizenz nicht akzeptierst." + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "Du hast diesen Benutzer bereits blockiert." + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "Erstellt" + +#: actions/repeat.php:115 +#, fuzzy +msgid "Repeated!" +msgstr "Erstellt" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -3114,6 +3180,11 @@ msgstr "" "(http://de.wikipedia.org/wiki/Mikro-blogging) basierend auf der Freien " "Software [StatusNet](http://status.net/). " +#: actions/showstream.php:313 +#, fuzzy, php-format +msgid "Repeat of %s" +msgstr "Antworten an %s" + #: actions/silence.php:65 actions/unsilence.php:65 #, fuzzy msgid "You cannot silence users on this site." @@ -3943,27 +4014,27 @@ msgstr "Konnte Nachricht nicht einfügen." msgid "Could not update message with new URI." msgstr "Konnte Nachricht nicht mit neuer URI versehen." -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Datenbankfehler beim Einfügen des Hashtags: %s" -#: classes/Notice.php:188 +#: classes/Notice.php:196 msgid "Problem saving notice. Too long." msgstr "Problem bei Speichern der Nachricht. Sie ist zu lang." -#: classes/Notice.php:192 +#: classes/Notice.php:200 msgid "Problem saving notice. Unknown user." msgstr "Problem bei Speichern der Nachricht. Unbekannter Benutzer." -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Zu schnell zu viele Nachrichten; atme kurz durch und schicke sie erneut in " "ein paar Minuten ab." -#: classes/Notice.php:203 +#: classes/Notice.php:211 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -3972,20 +4043,25 @@ msgstr "" "Zu schnell zu viele Nachrichten; atme kurz durch und schicke sie erneut in " "ein paar Minuten ab." -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "" "Du wurdest für das Schreiben von Nachrichten auf dieser Seite gesperrt." -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "Problem bei Speichern der Nachricht." -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "Datenbankfehler beim Einfügen der Antwort: %s" +#: classes/Notice.php:1320 +#, fuzzy, php-format +msgid "RT @%1$s %2$s" +msgstr "%1$s (%2$s)" + #: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" @@ -4200,19 +4276,19 @@ msgstr "Alle " msgid "license." msgstr "Lizenz." -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "Seitenerstellung" -#: lib/action.php:1077 +#: lib/action.php:1107 msgid "After" msgstr "Später" -#: lib/action.php:1085 +#: lib/action.php:1115 msgid "Before" msgstr "Vorher" -#: lib/action.php:1133 +#: lib/action.php:1163 msgid "There was a problem with your session token." msgstr "Es gab ein Problem mit deinem Sessiontoken." @@ -4306,11 +4382,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "Nachricht mit dieser ID existiert nicht" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "Benutzer hat keine letzte Nachricht" @@ -4352,106 +4429,116 @@ msgstr "Nachricht zu lang - maximal %d Zeichen erlaubt, du hast %d gesendet" msgid "Error sending direct message." msgstr "Fehler beim Senden der Nachricht" -#: lib/command.php:431 +#: lib/command.php:434 +#, fuzzy, php-format +msgid "Notice from %s repeated" +msgstr "Nachricht hinzugefügt" + +#: lib/command.php:436 +#, fuzzy +msgid "Error repeating notice." +msgstr "Problem beim Speichern der Nachricht." + +#: lib/command.php:490 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Nachricht zu lange - maximal 140 Zeichen erlaubt, du hast %s gesendet" -#: lib/command.php:440 +#: lib/command.php:499 #, php-format msgid "Reply to %s sent" msgstr "Antwort an %s gesendet" -#: lib/command.php:442 +#: lib/command.php:501 msgid "Error saving notice." msgstr "Problem beim Speichern der Nachricht." -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "Gib den Namen des Benutzers an, den du abonnieren möchtest" -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "%s abonniert" -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "Gib den Namen des Benutzers ein, den du nicht mehr abonnieren möchtest" -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "%s nicht mehr abonniert" -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "Befehl noch nicht implementiert." -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "Benachrichtigung deaktiviert." -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "Konnte Benachrichtigung nicht deaktivieren." -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "Benachrichtigung aktiviert." -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "Konnte Benachrichtigung nicht aktivieren." -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "" -#: lib/command.php:604 +#: lib/command.php:663 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Konnte keinen Favoriten erstellen." -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:625 +#: lib/command.php:684 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Du hast dieses Profil nicht abonniert." -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Du hast diese Benutzer bereits abonniert:" msgstr[1] "Du hast diese Benutzer bereits abonniert:" -#: lib/command.php:647 +#: lib/command.php:706 #, fuzzy msgid "No one is subscribed to you." msgstr "Die Gegenseite konnte Dich nicht abonnieren." -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Die Gegenseite konnte Dich nicht abonnieren." msgstr[1] "Die Gegenseite konnte Dich nicht abonnieren." -#: lib/command.php:669 +#: lib/command.php:728 #, fuzzy msgid "You are not a member of any groups." msgstr "Du bist kein Mitglied dieser Gruppe." -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Du bist kein Mitglied dieser Gruppe." msgstr[1] "Du bist kein Mitglied dieser Gruppe." -#: lib/command.php:685 +#: lib/command.php:744 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4467,6 +4554,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -4947,7 +5036,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 #, fuzzy msgid "from" msgstr "von" @@ -5036,41 +5125,41 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 #, fuzzy msgid "N" msgstr "Nein" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "" -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 msgid "in context" msgstr "im Zusammenhang" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 msgid "Reply to this notice" msgstr "Auf diese Nachricht antworten" -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 msgid "Reply" msgstr "Antworten" @@ -5205,6 +5294,16 @@ msgstr "Featured" msgid "Popular" msgstr "Beliebt" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "Auf diese Nachricht antworten" + +#: lib/repeatform.php:132 +#, fuzzy +msgid "Repeat" +msgstr "Zurücksetzen" + #: lib/sandboxform.php:67 #, fuzzy msgid "Sandbox" diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index a072fcbc24..34903dff64 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:09:26+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:15:16+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: el\n" "X-Message-Group: out-statusnet\n" @@ -44,9 +44,9 @@ msgstr "Αδύνατη η αποθήκευση του προφίλ." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Κανένας τέτοιος χρήστης." @@ -131,7 +131,8 @@ msgstr "Η μέθοδος του ΑΡΙ δε βρέθηκε!" #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" @@ -225,11 +226,14 @@ msgstr "" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "Η μέθοδος του ΑΡΙ δε βρέθηκε!" @@ -426,6 +430,20 @@ msgstr "" msgid "You may not delete another user's status." msgstr "" +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "Μήνυμα" + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +msgid "Cannot repeat your own notice" +msgstr "" + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." + #: actions/apistatusesshow.php:138 #, fuzzy msgid "Status deleted." @@ -496,6 +514,21 @@ msgstr "" msgid "%s updates from everyone!" msgstr "" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, php-format +msgid "Repeated to %s" +msgstr "" + +#: actions/apitimelineretweetsofme.php:112 +#, php-format +msgid "Repeats of %s" +msgstr "" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -558,7 +591,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 msgid "Delete" msgstr "" @@ -579,9 +612,10 @@ msgstr "" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "" @@ -786,7 +820,7 @@ msgstr "Είσαι σίγουρος ότι θες να διαγράψεις αυ msgid "Do not delete this notice" msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 msgid "Delete this notice" msgstr "" @@ -1877,7 +1911,7 @@ msgid "You can't send a message to this user." msgstr "" #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "" @@ -1982,8 +2016,8 @@ msgstr "Σύνδεση" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "" @@ -2766,6 +2800,34 @@ msgstr "" msgid "Couldn’t get a request token." msgstr "Απέτυχε η μετατροπή αιτούμενων tokens σε tokens πρόσβασης." +#: actions/repeat.php:57 +msgid "Only logged-in users can repeat notices." +msgstr "" + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "Μήνυμα" + +#: actions/repeat.php:76 +msgid "You can't repeat your own notice." +msgstr "" + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "Δημιουργία" + +#: actions/repeat.php:115 +#, fuzzy +msgid "Repeated!" +msgstr "Δημιουργία" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -3068,6 +3130,11 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" +#: actions/showstream.php:313 +#, php-format +msgid "Repeat of %s" +msgstr "" + #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." msgstr "" @@ -3865,43 +3932,48 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Σφάλμα στη βάση δεδομένων κατά την εισαγωγή hashtag: %s" -#: classes/Notice.php:188 +#: classes/Notice.php:196 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:192 +#: classes/Notice.php:200 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:203 +#: classes/Notice.php:211 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "Σφάλμα βάσης δεδομένων κατά την εισαγωγή απάντησης: %s" +#: classes/Notice.php:1320 +#, php-format +msgid "RT @%1$s %2$s" +msgstr "" + #: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" @@ -4115,19 +4187,19 @@ msgstr "" msgid "license." msgstr "" -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "" -#: lib/action.php:1077 +#: lib/action.php:1107 msgid "After" msgstr "" -#: lib/action.php:1085 +#: lib/action.php:1115 msgid "Before" msgstr "" -#: lib/action.php:1133 +#: lib/action.php:1163 msgid "There was a problem with your session token." msgstr "" @@ -4220,11 +4292,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "" @@ -4266,106 +4339,115 @@ msgstr "" msgid "Error sending direct message." msgstr "" -#: lib/command.php:431 +#: lib/command.php:434 +#, fuzzy, php-format +msgid "Notice from %s repeated" +msgstr "Ρυθμίσεις OpenID" + +#: lib/command.php:436 +msgid "Error repeating notice." +msgstr "" + +#: lib/command.php:490 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:440 +#: lib/command.php:499 #, php-format msgid "Reply to %s sent" msgstr "" -#: lib/command.php:442 +#: lib/command.php:501 msgid "Error saving notice." msgstr "" -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "" -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "" -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "" -#: lib/command.php:604 +#: lib/command.php:663 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Αδύνατη η αποθήκευση του προφίλ." -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:625 +#: lib/command.php:684 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." msgstr[1] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/command.php:647 +#: lib/command.php:706 #, fuzzy msgid "No one is subscribed to you." msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." msgstr[1] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/command.php:669 +#: lib/command.php:728 #, fuzzy msgid "You are not a member of any groups." msgstr "Ομάδες με τα περισσότερα μέλη" -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Ομάδες με τα περισσότερα μέλη" msgstr[1] "Ομάδες με τα περισσότερα μέλη" -#: lib/command.php:685 +#: lib/command.php:744 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4381,6 +4463,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -4833,7 +4917,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 #, fuzzy msgid "from" msgstr "από" @@ -4921,40 +5005,40 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "N" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "" -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 msgid "in context" msgstr "" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 msgid "Reply" msgstr "" @@ -5084,6 +5168,15 @@ msgstr "Προτεινόμενα" msgid "Popular" msgstr "Δημοφιλή" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." + +#: lib/repeatform.php:132 +msgid "Repeat" +msgstr "" + #: lib/sandboxform.php:67 msgid "Sandbox" msgstr "" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index 13172f52a7..2f9d40c5e0 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:09:29+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:15:19+0000\n" "Language-Team: British English\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" "X-Message-Group: out-statusnet\n" @@ -44,9 +44,9 @@ msgstr "No such page" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "No such user." @@ -129,7 +129,8 @@ msgstr "API method not found." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "This method requires a POST." @@ -222,11 +223,14 @@ msgstr "All the direct messages sent to %s" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "API method not found!" @@ -419,6 +423,21 @@ msgstr "This method requires a POST or DELETE." msgid "You may not delete another user's status." msgstr "You may not delete another user's status." +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "No such notice." + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Can't turn on notification." + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Delete this notice" + #: actions/apistatusesshow.php:138 msgid "Status deleted." msgstr "Status deleted." @@ -489,6 +508,21 @@ msgstr "%s public timeline" msgid "%s updates from everyone!" msgstr "%s updates from everyone!" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, fuzzy, php-format +msgid "Repeated to %s" +msgstr "Replies to %s" + +#: actions/apitimelineretweetsofme.php:112 +#, fuzzy, php-format +msgid "Repeats of %s" +msgstr "Replies to %s" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -552,7 +586,7 @@ msgid "Preview" msgstr "Preview" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 msgid "Delete" msgstr "Delete" @@ -573,9 +607,10 @@ msgstr "Crop" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "There was a problem with your session token. Try again, please." @@ -780,7 +815,7 @@ msgstr "Are you sure you want to delete this notice?" msgid "Do not delete this notice" msgstr "Do not delete this notice" -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 msgid "Delete this notice" msgstr "Delete this notice" @@ -1912,7 +1947,7 @@ msgid "You can't send a message to this user." msgstr "You can't send a message to this user." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "No content!" @@ -2021,8 +2056,8 @@ msgstr "Connect" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "Not a supported data format." @@ -2813,6 +2848,36 @@ msgstr "That's a local profile! Login to subscribe." msgid "Couldn’t get a request token." msgstr "Couldn't get a request token." +#: actions/repeat.php:57 +#, fuzzy +msgid "Only logged-in users can repeat notices." +msgstr "Only the user can read their own mailboxes." + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "No profile specified." + +#: actions/repeat.php:76 +#, fuzzy +msgid "You can't repeat your own notice." +msgstr "You can't register if you don't agree to the licence." + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "You have already blocked this user." + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "Created" + +#: actions/repeat.php:115 +#, fuzzy +msgid "Repeated!" +msgstr "Created" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -3117,6 +3182,11 @@ msgstr "" "wikipedia.org/wiki/Micro-blogging) service based on the Free Software " "[StatusNet](http://status.net/) tool. " +#: actions/showstream.php:313 +#, fuzzy, php-format +msgid "Repeat of %s" +msgstr "Replies to %s" + #: actions/silence.php:65 actions/unsilence.php:65 #, fuzzy msgid "You cannot silence users on this site." @@ -3934,27 +4004,27 @@ msgstr "Could not insert message." msgid "Could not update message with new URI." msgstr "Could not update message with new URI." -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "DB error inserting hashtag: %s" -#: classes/Notice.php:188 +#: classes/Notice.php:196 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Problem saving notice." -#: classes/Notice.php:192 +#: classes/Notice.php:200 msgid "Problem saving notice. Unknown user." msgstr "Problem saving notice. Unknown user." -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Too many notices too fast; take a breather and post again in a few minutes." -#: classes/Notice.php:203 +#: classes/Notice.php:211 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -3962,19 +4032,24 @@ msgid "" msgstr "" "Too many notices too fast; take a breather and post again in a few minutes." -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "You are banned from posting notices on this site." -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "Problem saving notice." -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "DB error inserting reply: %s" +#: classes/Notice.php:1320 +#, fuzzy, php-format +msgid "RT @%1$s %2$s" +msgstr "%1$s (%2$s)" + #: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" @@ -4185,19 +4260,19 @@ msgstr "All " msgid "license." msgstr "licence." -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "Pagination" -#: lib/action.php:1077 +#: lib/action.php:1107 msgid "After" msgstr "After" -#: lib/action.php:1085 +#: lib/action.php:1115 msgid "Before" msgstr "Before" -#: lib/action.php:1133 +#: lib/action.php:1163 msgid "There was a problem with your session token." msgstr "There was a problem with your session token." @@ -4294,11 +4369,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "User has no last notice" @@ -4340,106 +4416,116 @@ msgstr "Message too long - maximum is %d characters, you sent %d" msgid "Error sending direct message." msgstr "Error sending direct message." -#: lib/command.php:431 +#: lib/command.php:434 +#, fuzzy, php-format +msgid "Notice from %s repeated" +msgstr "Notice posted" + +#: lib/command.php:436 +#, fuzzy +msgid "Error repeating notice." +msgstr "Error saving notice." + +#: lib/command.php:490 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Notice too long - maximum is %d characters, you sent %d" -#: lib/command.php:440 +#: lib/command.php:499 #, php-format msgid "Reply to %s sent" msgstr "Reply to %s sent" -#: lib/command.php:442 +#: lib/command.php:501 msgid "Error saving notice." msgstr "Error saving notice." -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "Specify the name of the user to subscribe to" -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "Subscribed to %s" -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "Specify the name of the user to unsubscribe from" -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "Unsubscribed from %s" -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "Command not yet implemented." -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "Notification off." -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "Can't turn off notification." -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "Notification on." -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "Can't turn on notification." -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "" -#: lib/command.php:604 +#: lib/command.php:663 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Could not create aliases" -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:625 +#: lib/command.php:684 #, fuzzy msgid "You are not subscribed to anyone." msgstr "You are not subscribed to that profile." -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "You are already subscribed to these users:" msgstr[1] "You are already subscribed to these users:" -#: lib/command.php:647 +#: lib/command.php:706 #, fuzzy msgid "No one is subscribed to you." msgstr "Could not subscribe other to you." -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Could not subscribe other to you." msgstr[1] "Could not subscribe other to you." -#: lib/command.php:669 +#: lib/command.php:728 #, fuzzy msgid "You are not a member of any groups." msgstr "You are not a member of that group." -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "You are not a member of that group." msgstr[1] "You are not a member of that group." -#: lib/command.php:685 +#: lib/command.php:744 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4455,6 +4541,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -4922,7 +5010,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 #, fuzzy msgid "from" msgstr "from" @@ -5008,41 +5096,41 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 #, fuzzy msgid "N" msgstr "No" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "" -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 msgid "in context" msgstr "in context" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 msgid "Reply to this notice" msgstr "Reply to this notice" -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 msgid "Reply" msgstr "Reply" @@ -5172,6 +5260,16 @@ msgstr "Featured" msgid "Popular" msgstr "Popular" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "Reply to this notice" + +#: lib/repeatform.php:132 +#, fuzzy +msgid "Repeat" +msgstr "Reset" + #: lib/sandboxform.php:67 msgid "Sandbox" msgstr "Sandbox" diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index 7973b9eef7..2b7642b8d5 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -11,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:09:33+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:15:22+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: es\n" "X-Message-Group: out-statusnet\n" @@ -46,9 +46,9 @@ msgstr "No existe tal página" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "No existe ese usuario." @@ -132,7 +132,8 @@ msgstr "¡No se encontró el método de la API!" #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Este método requiere un POST." @@ -228,11 +229,14 @@ msgstr "Todos los mensajes directos enviados a %s" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "¡No se encontró el método de la API!" @@ -427,6 +431,21 @@ msgstr "Este método requiere un PUBLICAR O ELIMINAR" msgid "You may not delete another user's status." msgstr "No puedes borrar el estado de otro usuario." +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "No existe ese aviso." + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "No se puede activar notificación." + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Borrar este aviso" + #: actions/apistatusesshow.php:138 msgid "Status deleted." msgstr "Status borrado." @@ -496,6 +515,21 @@ msgstr "línea temporal pública de %s" msgid "%s updates from everyone!" msgstr "¡Actualizaciones de todos en %s!" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, fuzzy, php-format +msgid "Repeated to %s" +msgstr "Respuestas a %s" + +#: actions/apitimelineretweetsofme.php:112 +#, fuzzy, php-format +msgid "Repeats of %s" +msgstr "Respuestas a %s" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -560,7 +594,7 @@ msgid "Preview" msgstr "Vista previa" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 msgid "Delete" msgstr "Borrar" @@ -581,9 +615,10 @@ msgstr "Cortar" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "" "Hubo un problema con tu clave de sesión. Por favor, intenta nuevamente." @@ -794,7 +829,7 @@ msgstr "¿Estás seguro de que quieres eliminar este aviso?" msgid "Do not delete this notice" msgstr "No se puede eliminar este aviso." -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 msgid "Delete this notice" msgstr "Borrar este aviso" @@ -1598,7 +1633,7 @@ msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." msgstr "" -"Dirección Jabber o GTalk, por ejemplo \"NombreUsuario@ejemplo.org\". " +"Dirección Jabber o GTalk, por ejemplo \"NombreUsuario@example.org\". " "Primero, asegúrate de agregar a %s a tu lista de amigos en tu cliente de " "mensajería instantánea o en GTalk." @@ -1958,7 +1993,7 @@ msgid "You can't send a message to this user." msgstr "No puedes enviar mensaje a este usuario." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "¡Ningún contenido!" @@ -2070,8 +2105,8 @@ msgstr "Conectarse" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "No es un formato de dato soportado" @@ -2882,6 +2917,36 @@ msgstr "¡Es un perfil local! Ingresa para suscribirte" msgid "Couldn’t get a request token." msgstr "No se pudo obtener la señal de petición." +#: actions/repeat.php:57 +#, fuzzy +msgid "Only logged-in users can repeat notices." +msgstr "Sólo el usuario puede leer sus bandejas de correo." + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "No se especificó perfil." + +#: actions/repeat.php:76 +#, fuzzy +msgid "You can't repeat your own notice." +msgstr "No puedes registrarte si no estás de acuerdo con la licencia." + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "Ya has bloqueado este usuario." + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "Crear" + +#: actions/repeat.php:115 +#, fuzzy +msgid "Repeated!" +msgstr "Crear" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -3191,6 +3256,11 @@ msgstr "" "**%s** tiene una cuenta en %%%%site.name%%%%, un servicio [micro-blogging]" "(http://en.wikipedia.org/wiki/Micro-blogging) " +#: actions/showstream.php:313 +#, fuzzy, php-format +msgid "Repeat of %s" +msgstr "Respuestas a %s" + #: actions/silence.php:65 actions/unsilence.php:65 #, fuzzy msgid "You cannot silence users on this site." @@ -4035,29 +4105,29 @@ msgstr "No se pudo insertar mensaje." msgid "Could not update message with new URI." msgstr "No se pudo actualizar mensaje con nuevo URI." -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Error de la BD al insertar la etiqueta clave: %s" -#: classes/Notice.php:188 +#: classes/Notice.php:196 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Hubo un problema al guardar el aviso." -#: classes/Notice.php:192 +#: classes/Notice.php:200 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Hubo problemas al guardar el aviso. Usuario desconocido." -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Demasiados avisos demasiado rápido; para y publicar nuevamente en unos " "minutos." -#: classes/Notice.php:203 +#: classes/Notice.php:211 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4066,19 +4136,24 @@ msgstr "" "Demasiados avisos demasiado rápido; para y publicar nuevamente en unos " "minutos." -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "Tienes prohibido publicar avisos en este sitio." -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "Hubo un problema al guardar el aviso." -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "Error de BD al insertar respuesta: %s" +#: classes/Notice.php:1320 +#, fuzzy, php-format +msgid "RT @%1$s %2$s" +msgstr "%1$s (%2$s)" + #: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" @@ -4297,19 +4372,19 @@ msgstr "Todo" msgid "license." msgstr "Licencia." -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "Paginación" -#: lib/action.php:1077 +#: lib/action.php:1107 msgid "After" msgstr "Después" -#: lib/action.php:1085 +#: lib/action.php:1115 msgid "Before" msgstr "Antes" -#: lib/action.php:1133 +#: lib/action.php:1163 msgid "There was a problem with your session token." msgstr "Hubo problemas con tu clave de sesión." @@ -4407,11 +4482,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "Usuario no tiene último aviso" @@ -4453,107 +4529,117 @@ msgstr "Mensaje muy largo - máximo 140 caracteres, enviaste %d" msgid "Error sending direct message." msgstr "Error al enviar mensaje directo." -#: lib/command.php:431 +#: lib/command.php:434 +#, fuzzy, php-format +msgid "Notice from %s repeated" +msgstr "Aviso publicado" + +#: lib/command.php:436 +#, fuzzy +msgid "Error repeating notice." +msgstr "Hubo un problema al guardar el aviso." + +#: lib/command.php:490 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Mensaje muy largo - máximo 140 caracteres, enviaste %d" -#: lib/command.php:440 +#: lib/command.php:499 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Responder este aviso." -#: lib/command.php:442 +#: lib/command.php:501 #, fuzzy msgid "Error saving notice." msgstr "Hubo un problema al guardar el aviso." -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "Especificar el nombre del usuario a suscribir" -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "Suscrito a %s" -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "Especificar el nombre del usuario para desuscribirse de" -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "Desuscrito de %s" -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "Todavía no se implementa comando." -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "Notificación no activa." -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "No se puede desactivar notificación." -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "Notificación activada." -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "No se puede activar notificación." -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "" -#: lib/command.php:604 +#: lib/command.php:663 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "No se pudo crear favorito." -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:625 +#: lib/command.php:684 #, fuzzy msgid "You are not subscribed to anyone." msgstr "No estás suscrito a ese perfil." -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Ya estás suscrito a estos usuarios:" msgstr[1] "Ya estás suscrito a estos usuarios:" -#: lib/command.php:647 +#: lib/command.php:706 #, fuzzy msgid "No one is subscribed to you." msgstr "No se pudo suscribir otro a ti." -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "No se pudo suscribir otro a ti." msgstr[1] "No se pudo suscribir otro a ti." -#: lib/command.php:669 +#: lib/command.php:728 #, fuzzy msgid "You are not a member of any groups." msgstr "No eres miembro de ese grupo" -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "No eres miembro de este grupo." msgstr[1] "No eres miembro de este grupo." -#: lib/command.php:685 +#: lib/command.php:744 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4569,6 +4655,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -5038,7 +5126,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 msgid "from" msgstr "desde" @@ -5125,41 +5213,41 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 #, fuzzy msgid "N" msgstr "No" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "" -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 msgid "in context" msgstr "en contexto" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 msgid "Reply to this notice" msgstr "Responder este aviso." -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 msgid "Reply" msgstr "Responder" @@ -5291,6 +5379,16 @@ msgstr "Destacado" msgid "Popular" msgstr "Popular" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "Responder este aviso." + +#: lib/repeatform.php:132 +#, fuzzy +msgid "Repeat" +msgstr "Restablecer" + #: lib/sandboxform.php:67 #, fuzzy msgid "Sandbox" diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index 4a49508576..417d9d9df1 100644 --- a/locale/fi/LC_MESSAGES/statusnet.po +++ b/locale/fi/LC_MESSAGES/statusnet.po @@ -2,6 +2,7 @@ # # Author@translatewiki.net: Crt # Author@translatewiki.net: Jaakko +# Author@translatewiki.net: McDutchie # -- # 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: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:09:38+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:15:25+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fi\n" "X-Message-Group: out-statusnet\n" @@ -44,9 +45,9 @@ msgstr "Sivua ei ole." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Käyttäjää ei ole." @@ -134,7 +135,8 @@ msgstr "API-metodia ei löytynyt!" #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Tämä metodi edellyttää POST sanoman." @@ -229,11 +231,14 @@ msgstr "Kaikki suorat viestit käyttäjälle %s" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "API-metodia ei löytynyt!" @@ -430,6 +435,21 @@ msgstr "Tämä metodi edellyttää joko POST tai DELETE sanoman." msgid "You may not delete another user's status." msgstr "Et voi poistaa toisen käyttäjän päivitystä." +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "Päivitystä ei ole." + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Ilmoituksia ei voi pistää päälle." + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Poista tämä päivitys" + #: actions/apistatusesshow.php:138 msgid "Status deleted." msgstr "Päivitys poistettu." @@ -500,6 +520,21 @@ msgstr "%s julkinen aikajana" msgid "%s updates from everyone!" msgstr "%s päivitykset kaikilta!" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, fuzzy, php-format +msgid "Repeated to %s" +msgstr "Vastaukset käyttäjälle %s" + +#: actions/apitimelineretweetsofme.php:112 +#, fuzzy, php-format +msgid "Repeats of %s" +msgstr "Vastaukset käyttäjälle %s" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -562,7 +597,7 @@ msgid "Preview" msgstr "Esikatselu" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 msgid "Delete" msgstr "Poista" @@ -583,9 +618,10 @@ msgstr "Rajaa" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "" "Istuntosi avaimen kanssa oli ongelmia. Olisitko ystävällinen ja kokeilisit " @@ -790,7 +826,7 @@ msgstr "Oletko varma että haluat poistaa tämän päivityksen?" msgid "Do not delete this notice" msgstr "Älä poista tätä päivitystä" -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 msgid "Delete this notice" msgstr "Poista tämä päivitys" @@ -1564,7 +1600,7 @@ msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." msgstr "" -"Jabber ja GTalk -osoite, esimerkiksi \"käyttäjätunnus@esimerkki.org\". " +"Jabber ja GTalk -osoite, esimerkiksi \"käyttäjätunnus@example.org\". " "Varmista että olet lisännyt %s kaverilistaasi pikaviestiohjelmassasi tai " "GTalkissa." @@ -1923,7 +1959,7 @@ msgid "You can't send a message to this user." msgstr "Et voi lähettää viestiä tälle käyttäjälle." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "Ei sisältöä!" @@ -2034,8 +2070,8 @@ msgstr "Yhdistä" msgid "Only " msgstr "Vain " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "Tuo ei ole tuettu tietomuoto." @@ -2839,6 +2875,36 @@ msgstr "" msgid "Couldn’t get a request token." msgstr "Ei saatu request tokenia." +#: actions/repeat.php:57 +#, fuzzy +msgid "Only logged-in users can repeat notices." +msgstr "Vain käyttäjä voi lukea omaa postilaatikkoaan." + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "Profiilia ei ole määritelty." + +#: actions/repeat.php:76 +#, fuzzy +msgid "You can't repeat your own notice." +msgstr "Et voi rekisteröityä, jos et hyväksy lisenssiehtoja." + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "Sinä olet jo estänyt tämän käyttäjän." + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "Luotu" + +#: actions/repeat.php:115 +#, fuzzy +msgid "Repeated!" +msgstr "Luotu" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -3145,6 +3211,11 @@ msgstr "" "Käyttäjällä **%s** on käyttäjätili palvelussa %%%%site.name%%%%, joka on " "[mikroblogauspalvelu](http://en.wikipedia.org/wiki/Micro-blogging)" +#: actions/showstream.php:313 +#, fuzzy, php-format +msgid "Repeat of %s" +msgstr "Vastaukset käyttäjälle %s" + #: actions/silence.php:65 actions/unsilence.php:65 #, fuzzy msgid "You cannot silence users on this site." @@ -3976,28 +4047,28 @@ msgstr "Viestin tallennus ei onnistunut." msgid "Could not update message with new URI." msgstr "Viestin päivittäminen uudella URI-osoitteella ei onnistunut." -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Tietokantavirhe tallennettaessa risutagiä: %s" -#: classes/Notice.php:188 +#: classes/Notice.php:196 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Ongelma päivityksen tallentamisessa." -#: classes/Notice.php:192 +#: classes/Notice.php:200 msgid "Problem saving notice. Unknown user." msgstr "Virhe tapahtui päivityksen tallennuksessa. Tuntematon käyttäjä." -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Liian monta päivitystä liian nopeasti; pidä pieni hengähdystauko ja jatka " "päivityksien lähettämista muutaman minuutin päästä." -#: classes/Notice.php:203 +#: classes/Notice.php:211 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4005,19 +4076,24 @@ msgstr "" "Liian monta päivitystä liian nopeasti; pidä pieni hengähdystauko ja jatka " "päivityksien lähettämista muutaman minuutin päästä." -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "Päivityksesi tähän palveluun on estetty." -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "Ongelma päivityksen tallentamisessa." -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "Tietokantavirhe tallennettaessa vastausta: %s" +#: classes/Notice.php:1320 +#, fuzzy, php-format +msgid "RT @%1$s %2$s" +msgstr "%1$s (%2$s)" + #: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" @@ -4231,19 +4307,19 @@ msgstr "Kaikki " msgid "license." msgstr "lisenssi." -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "Sivutus" -#: lib/action.php:1077 +#: lib/action.php:1107 msgid "After" msgstr "Myöhemmin" -#: lib/action.php:1085 +#: lib/action.php:1115 msgid "Before" msgstr "Aiemmin" -#: lib/action.php:1133 +#: lib/action.php:1163 msgid "There was a problem with your session token." msgstr "Istuntoavaimesi kanssa oli ongelma." @@ -4341,11 +4417,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "Käyttäjällä ei ole viimeistä päivitystä" @@ -4387,107 +4464,117 @@ msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d" msgid "Error sending direct message." msgstr "Tapahtui virhe suoran viestin lähetyksessä." -#: lib/command.php:431 +#: lib/command.php:434 +#, fuzzy, php-format +msgid "Notice from %s repeated" +msgstr "Päivitys lähetetty" + +#: lib/command.php:436 +#, fuzzy +msgid "Error repeating notice." +msgstr "Ongelma päivityksen tallentamisessa." + +#: lib/command.php:490 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d" -#: lib/command.php:440 +#: lib/command.php:499 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Vastaa tähän päivitykseen" -#: lib/command.php:442 +#: lib/command.php:501 #, fuzzy msgid "Error saving notice." msgstr "Ongelma päivityksen tallentamisessa." -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "Anna käyttäjätunnus, jonka päivitykset haluat tilata" -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "Käyttäjän %s päivitykset tilattu" -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "Anna käyttäjätunnus, jonka päivityksien tilauksen haluat lopettaa" -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "Käyttäjän %s päivitysten tilaus lopetettu" -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "Komentoa ei ole vielä toteutettu." -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "Ilmoitukset pois päältä." -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "Ilmoituksia ei voi pistää pois päältä." -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "Ilmoitukset päällä." -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "Ilmoituksia ei voi pistää päälle." -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "" -#: lib/command.php:604 +#: lib/command.php:663 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Ei voitu lisätä aliasta." -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:625 +#: lib/command.php:684 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Et ole tilannut tämän käyttäjän päivityksiä." -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Olet jos tilannut seuraavien käyttäjien päivitykset:" msgstr[1] "Olet jos tilannut seuraavien käyttäjien päivitykset:" -#: lib/command.php:647 +#: lib/command.php:706 #, fuzzy msgid "No one is subscribed to you." msgstr "Toista ei voitu asettaa tilaamaan sinua." -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Toista ei voitu asettaa tilaamaan sinua." msgstr[1] "Toista ei voitu asettaa tilaamaan sinua." -#: lib/command.php:669 +#: lib/command.php:728 #, fuzzy msgid "You are not a member of any groups." msgstr "Sinä et kuulu tähän ryhmään." -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Sinä et kuulu tähän ryhmään." msgstr[1] "Sinä et kuulu tähän ryhmään." -#: lib/command.php:685 +#: lib/command.php:744 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4503,6 +4590,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -4976,7 +5065,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 #, fuzzy msgid "from" msgstr " lähteestä " @@ -5062,42 +5151,42 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 #, fuzzy msgid "N" msgstr "Ei" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "" -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 #, fuzzy msgid "in context" msgstr "Ei sisältöä!" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 msgid "Reply to this notice" msgstr "Vastaa tähän päivitykseen" -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 msgid "Reply" msgstr "Vastaus" @@ -5230,6 +5319,16 @@ msgstr "Esittelyssä" msgid "Popular" msgstr "Suosituimmat" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "Vastaa tähän päivitykseen" + +#: lib/repeatform.php:132 +#, fuzzy +msgid "Repeat" +msgstr "Vaihda" + #: lib/sandboxform.php:67 #, fuzzy msgid "Sandbox" diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 1ed66b9054..35d78d777d 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -13,12 +13,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:09:41+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:15:28+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" "X-Message-Group: out-statusnet\n" @@ -48,9 +48,9 @@ msgstr "Page non trouvée" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Utilisateur non trouvé." @@ -142,7 +142,8 @@ msgstr "Méthode API non trouvée !" #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Ce processus requiert un POST." @@ -236,11 +237,14 @@ msgstr "Tous les messages envoyés à %s" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "Méthode API non trouvée !" @@ -436,6 +440,21 @@ msgstr "Ce processus requiert un POST ou un DELETE." msgid "You may not delete another user's status." msgstr "Vous ne pouvez pas supprimer le statut d’un autre utilisateur." +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "Avis non trouvé." + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Impossible d’activer les avertissements." + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Supprimer cet avis" + #: actions/apistatusesshow.php:138 msgid "Status deleted." msgstr "Statut supprimé." @@ -507,6 +526,21 @@ msgstr "Activité publique %s" msgid "%s updates from everyone!" msgstr "%s statuts de tout le monde !" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, fuzzy, php-format +msgid "Repeated to %s" +msgstr "Réponses à %s" + +#: actions/apitimelineretweetsofme.php:112 +#, fuzzy, php-format +msgid "Repeats of %s" +msgstr "Réponses à %s" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -571,7 +605,7 @@ msgid "Preview" msgstr "Aperçu" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 msgid "Delete" msgstr "Supprimer" @@ -592,9 +626,10 @@ msgstr "Recadrer" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "" "Un problème est survenu avec votre jeton de session. Veuillez essayer à " @@ -800,7 +835,7 @@ msgstr "Êtes-vous sûr(e) de vouloir supprimer cet avis ?" msgid "Do not delete this notice" msgstr "Ne pas supprimer cet avis" -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 msgid "Delete this notice" msgstr "Supprimer cet avis" @@ -1024,13 +1059,12 @@ msgid "Remove" msgstr "Retirer" #: actions/emailsettings.php:113 -#, fuzzy msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." msgstr "" -"En attente d’une confirmation pour cette adresse. Vérifiez votre compte " -"Jabber/GTalk pour recevoir de nouvelles instructions." +"En attente d’une confirmation pour cette adresse. Vérifiez votre boîte de " +"réception (et celle de spam !) pour recevoir de nouvelles instructions." #: actions/emailsettings.php:117 actions/imsettings.php:120 #: actions/smssettings.php:126 @@ -1588,8 +1622,8 @@ msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." msgstr "" -"Adresse Jabber ou GTalk (ex : nom@mondomaine.com). Assurez-vous d’ajouter %s " -"à votre liste d’amis dans votre logiciel de messagerie instantanée ou dans " +"Adresse Jabber ou GTalk (ex : nom@example.org). Assurez-vous d’ajouter %s à " +"votre liste d’amis dans votre logiciel de messagerie instantanée ou dans " "GTalk." #: actions/imsettings.php:143 @@ -1662,7 +1696,7 @@ msgstr "" #: actions/invite.php:39 msgid "Invites have been disabled." -msgstr "Les invitation ont été désactivées." +msgstr "Les invitations ont été désactivées." #: actions/invite.php:41 #, php-format @@ -1952,7 +1986,7 @@ msgid "You can't send a message to this user." msgstr "Vous ne pouvez pas envoyer de messages à cet utilisateur." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "Aucun contenu !" @@ -2066,8 +2100,8 @@ msgstr "type de contenu " msgid "Only " msgstr "Seulement " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "Format de données non supporté." @@ -2875,6 +2909,36 @@ msgstr "Ce profil est local ! Connectez-vous pour vous abonner." msgid "Couldn’t get a request token." msgstr "Impossible d’obtenir un jeton de requête." +#: actions/repeat.php:57 +#, fuzzy +msgid "Only logged-in users can repeat notices." +msgstr "L’accès à cette boîte de réception est réservé à son utilisateur." + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "Aucun profil n’a été spécifié." + +#: actions/repeat.php:76 +#, fuzzy +msgid "You can't repeat your own notice." +msgstr "Vous devez accepter les termes de la licence pour créer un compte." + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "Vous avez déjà bloqué cet utilisateur." + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "Créé" + +#: actions/repeat.php:115 +#, fuzzy +msgid "Repeated!" +msgstr "Créé" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -3213,6 +3277,11 @@ msgstr "" "wikipedia.org/wiki/Microblog) basé sur le logiciel libre [StatusNet](http://" "status.net/). " +#: actions/showstream.php:313 +#, fuzzy, php-format +msgid "Repeat of %s" +msgstr "Réponses à %s" + #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." msgstr "Vous ne pouvez pas réduire des utilisateurs au silence sur ce site." @@ -4036,27 +4105,27 @@ msgstr "Impossible d’insérer le message." msgid "Could not update message with new URI." msgstr "Impossible de mettre à jour le message avec un nouvel URI." -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Erreur de base de donnée en insérant la marque (hashtag) : %s" -#: classes/Notice.php:188 +#: classes/Notice.php:196 msgid "Problem saving notice. Too long." msgstr "Problème lors de l’enregistrement de l’avis ; trop long." -#: classes/Notice.php:192 +#: classes/Notice.php:200 msgid "Problem saving notice. Unknown user." msgstr "Erreur lors de l’enregistrement de l’avis. Utilisateur inconnu." -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Trop d’avis, trop vite ! Faites une pause et publiez à nouveau dans quelques " "minutes." -#: classes/Notice.php:203 +#: classes/Notice.php:211 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4064,19 +4133,24 @@ msgstr "" "Trop de messages en double trop vite ! Prenez une pause et publiez à nouveau " "dans quelques minutes." -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "Il vous est interdit de poster des avis sur ce site." -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "Problème lors de l’enregistrement de l’avis." -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "Erreur de base de donnée en insérant la réponse :%s" +#: classes/Notice.php:1320 +#, fuzzy, php-format +msgid "RT @%1$s %2$s" +msgstr "%1$s (%2$s)" + #: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" @@ -4285,19 +4359,19 @@ msgstr "Tous " msgid "license." msgstr "licence." -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "Pagination" -#: lib/action.php:1077 +#: lib/action.php:1107 msgid "After" msgstr "Après" -#: lib/action.php:1085 +#: lib/action.php:1115 msgid "Before" msgstr "Avant" -#: lib/action.php:1133 +#: lib/action.php:1163 msgid "There was a problem with your session token." msgstr "Un problème est survenu avec votre jeton de session." @@ -4390,11 +4464,12 @@ msgstr "" "Abonnés : %2$s\n" "Messages : %3$s" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "Aucun avis avec cet identifiant n’existe" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "Aucun avis récent pour cet utilisateur" @@ -4438,107 +4513,118 @@ msgstr "" msgid "Error sending direct message." msgstr "Une erreur est survenue pendant l’envoi de votre message." -#: lib/command.php:431 +#: lib/command.php:434 +#, fuzzy, php-format +msgid "Notice from %s repeated" +msgstr "Avis publié" + +#: lib/command.php:436 +#, fuzzy +msgid "Error repeating notice." +msgstr "Problème lors de l’enregistrement de l’avis." + +#: lib/command.php:490 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" "Avis trop long ! La taille maximale est de %d caractères ; vous en avez " "entré %d." -#: lib/command.php:440 +#: lib/command.php:499 #, php-format msgid "Reply to %s sent" msgstr "Réponse à %s envoyée" -#: lib/command.php:442 +#: lib/command.php:501 msgid "Error saving notice." msgstr "Problème lors de l’enregistrement de l’avis." -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "Indiquez le nom de l’utilisateur auquel vous souhaitez vous abonner" -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "Abonné à %s" -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "Indiquez le nom de l’utilisateur duquel vous souhaitez vous désabonner" -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "Désabonné de %s" -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "Cette commande n’a pas encore été implémentée." -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "Avertissements désactivés." -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "Impossible de désactiver les avertissements." -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "Avertissements activés." -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "Impossible d’activer les avertissements." -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "La commande d'ouverture de session est désactivée" -#: lib/command.php:604 +#: lib/command.php:663 #, php-format msgid "Could not create login token for %s" msgstr "Impossible de créer le jeton d'ouverture de session pour %s" -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" "Ce lien n’est utilisable qu’une seule fois, et est valable uniquement " "pendant 2 minutes : %s" -#: lib/command.php:625 +#: lib/command.php:684 msgid "You are not subscribed to anyone." msgstr "Vous n'êtes pas abonné(e) à personne." -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Vous êtes abonné à cette personne :" msgstr[1] "Vous êtes abonné à ces personnes :" -#: lib/command.php:647 +#: lib/command.php:706 msgid "No one is subscribed to you." msgstr "Personne ne s'est abonné à vous." -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Cette personne est abonnée à vous :" msgstr[1] "Ces personnes sont abonnées à vous :" -#: lib/command.php:669 +#: lib/command.php:728 msgid "You are not a member of any groups." msgstr "Vous n'êtes pas membre d'aucun groupe." -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Vous êtes membre de ce groupe :" msgstr[1] "Vous êtes membre de ces groupes :" -#: lib/command.php:685 +#: lib/command.php:744 +#, fuzzy msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4554,6 +4640,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -5130,7 +5218,7 @@ msgstr "" "pour démarrer des conversations avec d’autres utilisateurs. Ceux-ci peuvent " "vous envoyer des messages destinés à vous seul(e)." -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 msgid "from" msgstr "de" @@ -5219,40 +5307,40 @@ msgstr "Attacher" msgid "Attach a file" msgstr "Attacher un fichier" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "%1$u° %2$u' %3$u\" %4$s %5$u° %6$u' %7$u\" %8$s" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "N" msgstr "N" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "S" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "E" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "O" -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "chez" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 msgid "in context" msgstr "dans le contexte" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 msgid "Reply to this notice" msgstr "Répondre à cet avis" -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 msgid "Reply" msgstr "Répondre" @@ -5381,6 +5469,16 @@ msgstr "En vedette" msgid "Popular" msgstr "Populaires" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "Répondre à cet avis" + +#: lib/repeatform.php:132 +#, fuzzy +msgid "Repeat" +msgstr "Réinitialiser" + #: lib/sandboxform.php:67 msgid "Sandbox" msgstr "Bac à sable" diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index 793b136e97..06ef1595b1 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: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:09:43+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:15:31+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ga\n" "X-Message-Group: out-statusnet\n" @@ -45,9 +45,9 @@ msgstr "Non existe a etiqueta." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Ningún usuario." @@ -132,7 +132,8 @@ msgstr "Método da API non atopado" #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Este método require un POST." @@ -227,11 +228,14 @@ msgstr "Tódalas mensaxes directas enviadas a %s" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "Método da API non atopado" @@ -433,6 +437,21 @@ msgstr "Este método require un POST ou DELETE." msgid "You may not delete another user's status." msgstr "Non deberías eliminar o estado de outro usuario" +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "Ningún chío." + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Non se pode activar a notificación." + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Eliminar chío" + #: actions/apistatusesshow.php:138 #, fuzzy msgid "Status deleted." @@ -505,6 +524,21 @@ msgstr "Liña de tempo pública de %s" msgid "%s updates from everyone!" msgstr "%s chíos de calquera!" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, fuzzy, php-format +msgid "Repeated to %s" +msgstr "Replies to %s" + +#: actions/apitimelineretweetsofme.php:112 +#, fuzzy, php-format +msgid "Repeats of %s" +msgstr "Replies to %s" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -569,7 +603,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 #, fuzzy msgid "Delete" msgstr "eliminar" @@ -591,9 +625,10 @@ msgstr "" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..." @@ -809,7 +844,7 @@ msgstr "Estas seguro que queres eliminar este chío?" msgid "Do not delete this notice" msgstr "Non se pode eliminar este chíos." -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 #, fuzzy msgid "Delete this notice" msgstr "Eliminar chío" @@ -1609,7 +1644,7 @@ msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." msgstr "" -"Enderezo Jabber ou GTalk, coma \"NomeUsuario@Exemplo.org\". Primeiro, " +"Enderezo Jabber ou GTalk, coma \"NomeUsuario@example.org\". Primeiro, " "asegurate de engadir %s á tua lista de contactos no teu cliente de IM ou no " "GTalk." @@ -1966,7 +2001,7 @@ msgid "You can't send a message to this user." msgstr "Non podes enviar mensaxes a este usurio." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "Sen contido!" @@ -2078,8 +2113,8 @@ msgstr "Conectar" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "Non é un formato de datos soportado." @@ -2894,6 +2929,36 @@ msgstr "Este é un perfil local! Rexístrate para suscribirte." msgid "Couldn’t get a request token." msgstr "Non se puido recoller o token de petición." +#: actions/repeat.php:57 +#, fuzzy +msgid "Only logged-in users can repeat notices." +msgstr "Só o usuario pode ler os seus propios buzóns." + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "Non se especificou ningún perfil." + +#: actions/repeat.php:76 +#, fuzzy +msgid "You can't repeat your own notice." +msgstr "Non podes rexistrarte se non estas de acordo coa licenza." + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "Xa bloqueaches a este usuario." + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "Crear" + +#: actions/repeat.php:115 +#, fuzzy +msgid "Repeated!" +msgstr "Crear" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -3217,6 +3282,11 @@ msgstr "" "(http://status.net/). [Únete agora](%%action.register%%) para compartir " "chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))" +#: actions/showstream.php:313 +#, fuzzy, php-format +msgid "Repeat of %s" +msgstr "Replies to %s" + #: actions/silence.php:65 actions/unsilence.php:65 #, fuzzy msgid "You cannot silence users on this site." @@ -4051,28 +4121,28 @@ msgstr "Non se pode inserir unha mensaxe." msgid "Could not update message with new URI." msgstr "Non se puido actualizar a mensaxe coa nova URI." -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Erro ó inserir o hashtag na BD: %s" -#: classes/Notice.php:188 +#: classes/Notice.php:196 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Aconteceu un erro ó gardar o chío." -#: classes/Notice.php:192 +#: classes/Notice.php:200 msgid "Problem saving notice. Unknown user." msgstr "Aconteceu un erro ó gardar o chío. Usuario descoñecido." -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro " "duns minutos." -#: classes/Notice.php:203 +#: classes/Notice.php:211 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4081,19 +4151,24 @@ msgstr "" "Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro " "duns minutos." -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "Tes restrinxido o envio de chíos neste sitio." -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "Aconteceu un erro ó gardar o chío." -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "Erro ó inserir a contestación na BD: %s" +#: classes/Notice.php:1320 +#, fuzzy, php-format +msgid "RT @%1$s %2$s" +msgstr "%1$s (%2$s)" + #: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" @@ -4319,21 +4394,21 @@ msgstr "Todos" msgid "license." msgstr "" -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "" -#: lib/action.php:1077 +#: lib/action.php:1107 #, fuzzy msgid "After" msgstr "« Despois" -#: lib/action.php:1085 +#: lib/action.php:1115 #, fuzzy msgid "Before" msgstr "Antes »" -#: lib/action.php:1133 +#: lib/action.php:1163 #, fuzzy msgid "There was a problem with your session token." msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..." @@ -4435,11 +4510,12 @@ msgstr "" "Suscriptores: %2$s\n" "Chíos: %3$s" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "O usuario non ten último chio." @@ -4481,79 +4557,89 @@ msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d " msgid "Error sending direct message." msgstr "Erro ó enviar a mensaxe directa." -#: lib/command.php:431 +#: lib/command.php:434 +#, fuzzy, php-format +msgid "Notice from %s repeated" +msgstr "Chío publicado" + +#: lib/command.php:436 +#, fuzzy +msgid "Error repeating notice." +msgstr "Aconteceu un erro ó gardar o chío." + +#: lib/command.php:490 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d " -#: lib/command.php:440 +#: lib/command.php:499 #, php-format msgid "Reply to %s sent" msgstr "Non se pode eliminar este chíos." -#: lib/command.php:442 +#: lib/command.php:501 #, fuzzy msgid "Error saving notice." msgstr "Aconteceu un erro ó gardar o chío." -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "Especifica o nome do usuario ó que queres suscribirte" -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "Suscrito a %s" -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "Especifica o nome de usuario ó que queres deixar de seguir" -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "Desuscribir de %s" -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "Comando non implementado." -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "Notificación desactivada." -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "No se pode desactivar a notificación." -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "Notificación habilitada." -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "Non se pode activar a notificación." -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "" -#: lib/command.php:604 +#: lib/command.php:663 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Non se puido crear o favorito." -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:625 +#: lib/command.php:684 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Non estás suscrito a ese perfil" -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Xa estas suscrito a estes usuarios:" @@ -4562,12 +4648,12 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: lib/command.php:647 +#: lib/command.php:706 #, fuzzy msgid "No one is subscribed to you." msgstr "Outro usuario non se puido suscribir a ti." -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Outro usuario non se puido suscribir a ti." @@ -4576,12 +4662,12 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: lib/command.php:669 +#: lib/command.php:728 #, fuzzy msgid "You are not a member of any groups." msgstr "Non estás suscrito a ese perfil" -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Non estás suscrito a ese perfil" @@ -4590,7 +4676,7 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: lib/command.php:685 +#: lib/command.php:744 #, fuzzy msgid "" "Commands:\n" @@ -4607,6 +4693,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -5157,7 +5245,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 #, fuzzy msgid "from" msgstr " dende " @@ -5246,43 +5334,43 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 #, fuzzy msgid "N" msgstr "No" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "" -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 #, fuzzy msgid "in context" msgstr "Sen contido!" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 #, fuzzy msgid "Reply to this notice" msgstr "Non se pode eliminar este chíos." -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 #, fuzzy msgid "Reply" msgstr "contestar" @@ -5422,6 +5510,16 @@ msgstr "Destacado" msgid "Popular" msgstr "Popular" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "Non se pode eliminar este chíos." + +#: lib/repeatform.php:132 +#, fuzzy +msgid "Repeat" +msgstr "Restaurar" + #: lib/sandboxform.php:67 #, fuzzy msgid "Sandbox" diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 48606c28a0..27f2433e60 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: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:09:46+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:15:34+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: he\n" "X-Message-Group: out-statusnet\n" @@ -43,9 +43,9 @@ msgstr "אין הודעה כזו." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "אין משתמש כזה." @@ -130,7 +130,8 @@ msgstr "קוד האישור לא נמצא." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" @@ -224,11 +225,14 @@ msgstr "" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "" @@ -426,6 +430,19 @@ msgstr "" msgid "You may not delete another user's status." msgstr "" +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "אין הודעה כזו." + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +msgid "Cannot repeat your own notice" +msgstr "" + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +msgid "Already repeated that notice" +msgstr "" + #: actions/apistatusesshow.php:138 #, fuzzy msgid "Status deleted." @@ -497,6 +514,21 @@ msgstr "" msgid "%s updates from everyone!" msgstr "" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, fuzzy, php-format +msgid "Repeated to %s" +msgstr "תגובת עבור %s" + +#: actions/apitimelineretweetsofme.php:112 +#, fuzzy, php-format +msgid "Repeats of %s" +msgstr "תגובת עבור %s" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -562,7 +594,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 #, fuzzy msgid "Delete" msgstr "מחק" @@ -584,9 +616,10 @@ msgstr "" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "" @@ -796,7 +829,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "אין הודעה כזו." -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 msgid "Delete this notice" msgstr "" @@ -1907,7 +1940,7 @@ msgid "You can't send a message to this user." msgstr "" #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "אין תוכן!" @@ -2016,8 +2049,8 @@ msgstr "התחבר" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "" @@ -2789,6 +2822,35 @@ msgstr "" msgid "Couldn’t get a request token." msgstr "אסימון הבקשה לא התקבל." +#: actions/repeat.php:57 +msgid "Only logged-in users can repeat notices." +msgstr "" + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "הודעה חדשה" + +#: actions/repeat.php:76 +#, fuzzy +msgid "You can't repeat your own notice." +msgstr "לא ניתן להירשם ללא הסכמה לרשיון" + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "כבר נכנסת למערכת!" + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "צור" + +#: actions/repeat.php:115 +#, fuzzy +msgid "Repeated!" +msgstr "צור" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -3094,6 +3156,11 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" +#: actions/showstream.php:313 +#, fuzzy, php-format +msgid "Repeat of %s" +msgstr "תגובת עבור %s" + #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." msgstr "" @@ -3914,45 +3981,50 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:188 +#: classes/Notice.php:196 #, fuzzy msgid "Problem saving notice. Too long." msgstr "בעיה בשמירת ההודעה." -#: classes/Notice.php:192 +#: classes/Notice.php:200 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "בעיה בשמירת ההודעה." -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:203 +#: classes/Notice.php:211 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "בעיה בשמירת ההודעה." -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "שגיאת מסד נתונים בהכנסת התגובה: %s" +#: classes/Notice.php:1320 +#, php-format +msgid "RT @%1$s %2$s" +msgstr "" + #: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" @@ -4174,21 +4246,21 @@ msgstr "" msgid "license." msgstr "" -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "" -#: lib/action.php:1077 +#: lib/action.php:1107 #, fuzzy msgid "After" msgstr "<< אחרי" -#: lib/action.php:1085 +#: lib/action.php:1115 #, fuzzy msgid "Before" msgstr "לפני >>" -#: lib/action.php:1133 +#: lib/action.php:1163 msgid "There was a problem with your session token." msgstr "" @@ -4281,11 +4353,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "" @@ -4327,107 +4400,117 @@ msgstr "" msgid "Error sending direct message." msgstr "" -#: lib/command.php:431 +#: lib/command.php:434 +#, fuzzy, php-format +msgid "Notice from %s repeated" +msgstr "הודעות" + +#: lib/command.php:436 +#, fuzzy +msgid "Error repeating notice." +msgstr "בעיה בשמירת ההודעה." + +#: lib/command.php:490 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:440 +#: lib/command.php:499 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "תגובת עבור %s" -#: lib/command.php:442 +#: lib/command.php:501 #, fuzzy msgid "Error saving notice." msgstr "בעיה בשמירת ההודעה." -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "" -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "" -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "" -#: lib/command.php:604 +#: lib/command.php:663 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "שמירת מידע התמונה נכשל" -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:625 +#: lib/command.php:684 #, fuzzy msgid "You are not subscribed to anyone." msgstr "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "לא שלחנו אלינו את הפרופיל הזה" msgstr[1] "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:647 +#: lib/command.php:706 #, fuzzy msgid "No one is subscribed to you." msgstr "הרשמה מרוחקת" -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "הרשמה מרוחקת" msgstr[1] "הרשמה מרוחקת" -#: lib/command.php:669 +#: lib/command.php:728 #, fuzzy msgid "You are not a member of any groups." msgstr "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "לא שלחנו אלינו את הפרופיל הזה" msgstr[1] "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:685 +#: lib/command.php:744 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4443,6 +4526,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -4907,7 +4992,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 msgid "from" msgstr "" @@ -4995,42 +5080,42 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 #, fuzzy msgid "N" msgstr "לא" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "" -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 #, fuzzy msgid "in context" msgstr "אין תוכן!" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 #, fuzzy msgid "Reply" msgstr "הגב" @@ -5165,6 +5250,16 @@ msgstr "" msgid "Popular" msgstr "אנשים" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "אין הודעה כזו." + +#: lib/repeatform.php:132 +#, fuzzy +msgid "Repeat" +msgstr "איפוס" + #: lib/sandboxform.php:67 msgid "Sandbox" msgstr "" diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index 4ef3a75860..70d4f1cd5d 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: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:09:49+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:15:37+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: hsb\n" "X-Message-Group: out-statusnet\n" @@ -45,9 +45,9 @@ msgstr "Strona njeeksistuje" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Wužiwar njeeksistuje" @@ -130,7 +130,8 @@ msgstr "API-metoda njenamakana." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Tuta metoda wužaduje sej POST." @@ -220,11 +221,14 @@ msgstr "Wšě do %s pósłane direktne powěsće" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "API-metoda njenamakana!" @@ -416,6 +420,20 @@ msgstr "Tuta metoda wužaduje sej POST abo DELETE." msgid "You may not delete another user's status." msgstr "Njemóžeš status druheho wužiwarja zničić." +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "Zdźělenka njeeksistuje." + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +msgid "Cannot repeat your own notice" +msgstr "" + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Tutu zdźělenku wušmórnyć" + #: actions/apistatusesshow.php:138 msgid "Status deleted." msgstr "Status zničeny." @@ -485,6 +503,21 @@ msgstr "" msgid "%s updates from everyone!" msgstr "" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, php-format +msgid "Repeated to %s" +msgstr "" + +#: actions/apitimelineretweetsofme.php:112 +#, php-format +msgid "Repeats of %s" +msgstr "" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -548,7 +581,7 @@ msgid "Preview" msgstr "Přehlad" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 msgid "Delete" msgstr "Zničić" @@ -569,9 +602,10 @@ msgstr "" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "" @@ -770,7 +804,7 @@ msgstr "Chceš woprawdźe tutu zdźělenku wušmórnyć?" msgid "Do not delete this notice" msgstr "Tutu zdźělenku njewušmórnyć" -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 msgid "Delete this notice" msgstr "Tutu zdźělenku wušmórnyć" @@ -1827,7 +1861,7 @@ msgid "You can't send a message to this user." msgstr "Njemóžeš tutomu wužiwarju powěsć pósłać." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "Žadyn wobsah!" @@ -1931,8 +1965,8 @@ msgstr "" msgid "Only " msgstr "Jenož " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "Njeje podpěrany datowy format." @@ -2678,6 +2712,34 @@ msgstr "" msgid "Couldn’t get a request token." msgstr "" +#: actions/repeat.php:57 +msgid "Only logged-in users can repeat notices." +msgstr "" + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "Žadyn profil podaty." + +#: actions/repeat.php:76 +msgid "You can't repeat your own notice." +msgstr "" + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "Sy tutoho wužiwarja hižo zablokował." + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "Wutworjeny" + +#: actions/repeat.php:115 +#, fuzzy +msgid "Repeated!" +msgstr "Wutworjeny" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -2976,6 +3038,11 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" +#: actions/showstream.php:313 +#, php-format +msgid "Repeat of %s" +msgstr "" + #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." msgstr "" @@ -3751,43 +3818,48 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:188 +#: classes/Notice.php:196 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:192 +#: classes/Notice.php:200 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:203 +#: classes/Notice.php:211 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "" +#: classes/Notice.php:1320 +#, php-format +msgid "RT @%1$s %2$s" +msgstr "" + #: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" @@ -3991,19 +4063,19 @@ msgstr "" msgid "license." msgstr "" -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "" -#: lib/action.php:1077 +#: lib/action.php:1107 msgid "After" msgstr "" -#: lib/action.php:1085 +#: lib/action.php:1115 msgid "Before" msgstr "" -#: lib/action.php:1133 +#: lib/action.php:1163 msgid "There was a problem with your session token." msgstr "" @@ -4093,11 +4165,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "" @@ -4139,77 +4212,87 @@ msgstr "" msgid "Error sending direct message." msgstr "" -#: lib/command.php:431 +#: lib/command.php:434 +#, fuzzy, php-format +msgid "Notice from %s repeated" +msgstr "Zdźělenka wotpósłana" + +#: lib/command.php:436 +#, fuzzy +msgid "Error repeating notice." +msgstr "Zmylk při zasunjenju noweho profila" + +#: lib/command.php:490 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:440 +#: lib/command.php:499 #, php-format msgid "Reply to %s sent" msgstr "" -#: lib/command.php:442 +#: lib/command.php:501 msgid "Error saving notice." msgstr "" -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "" -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "" -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "" -#: lib/command.php:604 +#: lib/command.php:663 #, php-format msgid "Could not create login token for %s" msgstr "Njeje móžno było, přizjewjenske znamješko za %s wutworić" -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:625 +#: lib/command.php:684 msgid "You are not subscribed to anyone." msgstr "" -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Sy tutu wosobu abonował:" @@ -4217,11 +4300,11 @@ msgstr[1] "Sy tutej wosobje abonował:" msgstr[2] "Sy tute wosoby abonował:" msgstr[3] "Sy tute wosoby abonował:" -#: lib/command.php:647 +#: lib/command.php:706 msgid "No one is subscribed to you." msgstr "" -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Tuta wosoba je će abonowała:" @@ -4229,11 +4312,11 @@ msgstr[1] "Tutej wosobje stej će abonowałoj:" msgstr[2] "Tute wosoby su će abonowali:" msgstr[3] "Tute wosoby su će abonowali:" -#: lib/command.php:669 +#: lib/command.php:728 msgid "You are not a member of any groups." msgstr "" -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Sy čłon tuteje skupiny:" @@ -4241,7 +4324,7 @@ msgstr[1] "Sy čłon tuteju skupinow:" msgstr[2] "Sy čłon tutych skupinow:" msgstr[3] "Sy čłon tutych skupinow:" -#: lib/command.php:685 +#: lib/command.php:744 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4257,6 +4340,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -4703,7 +4788,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 msgid "from" msgstr "wot" @@ -4788,40 +4873,40 @@ msgstr "Připowěsnyć" msgid "Attach a file" msgstr "Dataju připowěsnyć" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "N" msgstr "S" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "J" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "W" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "Z" -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 msgid "in context" msgstr "" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 msgid "Reply to this notice" msgstr "Na tutu zdźělenku wotmołwić" -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 msgid "Reply" msgstr "Wotmołwić" @@ -4950,6 +5035,16 @@ msgstr "" msgid "Popular" msgstr "Woblubowany" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "Na tutu zdźělenku wotmołwić" + +#: lib/repeatform.php:132 +#, fuzzy +msgid "Repeat" +msgstr "Wróćo stajić" + #: lib/sandboxform.php:67 msgid "Sandbox" msgstr "" diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index 2eb8678b6e..f1ace2a339 100644 --- a/locale/is/LC_MESSAGES/statusnet.po +++ b/locale/is/LC_MESSAGES/statusnet.po @@ -1,5 +1,6 @@ # Translation of StatusNet to Icelandic # +# Author@translatewiki.net: McDutchie # -- # This file is distributed under the same license as the StatusNet package. # @@ -7,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:09:52+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:15:42+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: is\n" "X-Message-Group: out-statusnet\n" @@ -45,9 +46,9 @@ msgstr "Ekkert þannig merki." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Enginn svoleiðis notandi." @@ -131,7 +132,8 @@ msgstr "Aðferð í forritsskilum fannst ekki!" #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Þessi aðferð krefst POST." @@ -225,11 +227,14 @@ msgstr "Öll bein skilaboð til %s" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "Aðferð í forritsskilum fannst ekki!" @@ -426,6 +431,21 @@ msgstr "Þessi aðferð krefst POST eða DELETE." msgid "You may not delete another user's status." msgstr "Þú getur ekki eytt stöðu annars notanda." +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "Ekkert svoleiðis babl." + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Get ekki kveikt á tilkynningum." + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Eyða þessu babli" + #: actions/apistatusesshow.php:138 msgid "Status deleted." msgstr "" @@ -496,6 +516,21 @@ msgstr "Almenningsrás %s" msgid "%s updates from everyone!" msgstr "%s færslur frá öllum!" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, fuzzy, php-format +msgid "Repeated to %s" +msgstr "Svör við %s" + +#: actions/apitimelineretweetsofme.php:112 +#, fuzzy, php-format +msgid "Repeats of %s" +msgstr "Svör við %s" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -558,7 +593,7 @@ msgid "Preview" msgstr "Forsýn" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 msgid "Delete" msgstr "Eyða" @@ -579,9 +614,10 @@ msgstr "Skera af" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "Það kom upp vandamál með setutókann þinn. Vinsamlegast reyndu aftur." @@ -785,7 +821,7 @@ msgstr "Ertu viss um að þú viljir eyða þessu babli?" msgid "Do not delete this notice" msgstr "" -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 msgid "Delete this notice" msgstr "Eyða þessu babli" @@ -1555,7 +1591,7 @@ msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." msgstr "" -"Jabber eða GTalk netfang eins og \"notandi@eitthvað.is\". Fyrst skaltu vera " +"Jabber eða GTalk netfang eins og \"notandi@example.org\". Fyrst skaltu vera " "viss um að bæta %s við í vinalistann þinn í snarskilaboðaforritinu þínu eða " "á GTalk." @@ -1912,7 +1948,7 @@ msgid "You can't send a message to this user." msgstr "Þú getur ekki sent þessum notanda skilaboð." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "Ekkert innihald!" @@ -2022,8 +2058,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "Enginn stuðningur við gagnasnið." @@ -2818,6 +2854,35 @@ msgstr "" msgid "Couldn’t get a request token." msgstr "Gat ekki komist yfir beiðnistóka." +#: actions/repeat.php:57 +#, fuzzy +msgid "Only logged-in users can repeat notices." +msgstr "Aðeins notandinn getur lesið hans eigin pósthólf." + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "Engin persónuleg síða tilgreind" + +#: actions/repeat.php:76 +#, fuzzy +msgid "You can't repeat your own notice." +msgstr "Þú getur ekki nýskráð þig nema þú samþykkir leyfið." + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "Þú hefur nú þegar lokað á þennan notanda." + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "Í sviðsljósinu" + +#: actions/repeat.php:115 +msgid "Repeated!" +msgstr "" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -3118,6 +3183,11 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" +#: actions/showstream.php:313 +#, fuzzy, php-format +msgid "Repeat of %s" +msgstr "Svör við %s" + #: actions/silence.php:65 actions/unsilence.php:65 #, fuzzy msgid "You cannot silence users on this site." @@ -3942,45 +4012,50 @@ msgstr "Gat ekki skeytt skilaboðum inn í." msgid "Could not update message with new URI." msgstr "Gat ekki uppfært skilaboð með nýju veffangi." -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Gagnagrunnsvilla við innsetningu myllumerkis: %s" -#: classes/Notice.php:188 +#: classes/Notice.php:196 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:192 +#: classes/Notice.php:200 msgid "Problem saving notice. Unknown user." msgstr "Gat ekki vistað babl. Óþekktur notandi." -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Of mikið babl í einu; slakaðu aðeins á og haltu svo áfram eftir nokkrar " "mínútur." -#: classes/Notice.php:203 +#: classes/Notice.php:211 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "Það hefur verið lagt bann við babli frá þér á þessari síðu." -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "Vandamál komu upp við að vista babl." -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "Gagnagrunnsvilla við innsetningu svars: %s" +#: classes/Notice.php:1320 +#, fuzzy, php-format +msgid "RT @%1$s %2$s" +msgstr "%1$s (%2$s)" + #: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" @@ -4194,19 +4269,19 @@ msgstr "Allt " msgid "license." msgstr "leyfi." -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "Uppröðun" -#: lib/action.php:1077 +#: lib/action.php:1107 msgid "After" msgstr "Eftir" -#: lib/action.php:1085 +#: lib/action.php:1115 msgid "Before" msgstr "Áður" -#: lib/action.php:1133 +#: lib/action.php:1163 msgid "There was a problem with your session token." msgstr "Það komu upp vandamál varðandi setutókann þinn." @@ -4302,11 +4377,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "Notandi hefur ekkert nýtt babl" @@ -4348,107 +4424,117 @@ msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú send msgid "Error sending direct message." msgstr "Villa kom upp við að senda bein skilaboð" -#: lib/command.php:431 +#: lib/command.php:434 +#, fuzzy, php-format +msgid "Notice from %s repeated" +msgstr "Babl sent inn" + +#: lib/command.php:436 +#, fuzzy +msgid "Error repeating notice." +msgstr "Vandamál komu upp við að vista babl." + +#: lib/command.php:490 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d" -#: lib/command.php:440 +#: lib/command.php:499 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Svara þessu babli" -#: lib/command.php:442 +#: lib/command.php:501 #, fuzzy msgid "Error saving notice." msgstr "Vandamál komu upp við að vista babl." -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "Tilgreindu nafn notandans sem þú vilt gerast áskrifandi að" -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "Nú ert þú áskrifandi að %s" -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "Tilgreindu nafn notandans sem þú vilt hætta sem áskrifandi að" -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "Nú ert þú ekki lengur áskrifandi að %s" -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "Skipun hefur ekki verið fullbúin" -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "Tilkynningar af." -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "Get ekki slökkt á tilkynningum." -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "Tilkynningar á." -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "Get ekki kveikt á tilkynningum." -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "" -#: lib/command.php:604 +#: lib/command.php:663 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Gat ekki búið til uppáhald." -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:625 +#: lib/command.php:684 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Þú ert ekki áskrifandi." -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Þú ert nú þegar í áskrift að þessum notendum:" msgstr[1] "Þú ert nú þegar í áskrift að þessum notendum:" -#: lib/command.php:647 +#: lib/command.php:706 #, fuzzy msgid "No one is subscribed to you." msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér." -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Gat ekki leyft öðrum að gerast áskrifandi að þér." msgstr[1] "Gat ekki leyft öðrum að gerast áskrifandi að þér." -#: lib/command.php:669 +#: lib/command.php:728 #, fuzzy msgid "You are not a member of any groups." msgstr "Þú ert ekki meðlimur í þessum hópi." -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Þú ert ekki meðlimur í þessum hópi." msgstr[1] "Þú ert ekki meðlimur í þessum hópi." -#: lib/command.php:685 +#: lib/command.php:744 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4464,6 +4550,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -4924,7 +5012,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 #, fuzzy msgid "from" msgstr "frá" @@ -5011,41 +5099,41 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 #, fuzzy msgid "N" msgstr "Nei" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "" -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 msgid "in context" msgstr "" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 msgid "Reply to this notice" msgstr "Svara þessu babli" -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 msgid "Reply" msgstr "Svara" @@ -5177,6 +5265,16 @@ msgstr "Í sviðsljósinu" msgid "Popular" msgstr "Vinsælt" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "Svara þessu babli" + +#: lib/repeatform.php:132 +#, fuzzy +msgid "Repeat" +msgstr "Endurstilla" + #: lib/sandboxform.php:67 #, fuzzy msgid "Sandbox" diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index 6a85f3dc25..8fe0e93ab2 100644 --- a/locale/it/LC_MESSAGES/statusnet.po +++ b/locale/it/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:09:55+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:15:45+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: it\n" "X-Message-Group: out-statusnet\n" @@ -44,9 +44,9 @@ msgstr "Nessuna tale etichetta." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Nessun tale utente." @@ -131,7 +131,8 @@ msgstr "Metodo delle API non trovato!" #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Questo metodo richiede POST." @@ -226,11 +227,14 @@ msgstr "Tutti i messaggi diretti inviati a %s" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "Metodo delle API non trovato!" @@ -432,6 +436,21 @@ msgstr "Questo metodo richiede POST o DELETE." msgid "You may not delete another user's status." msgstr "Non puoi eliminare lo stato di un altro utente." +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "Nessun tale messaggio." + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Impossibile attivare le notifiche." + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Elimina questo messaggio" + #: actions/apistatusesshow.php:138 #, fuzzy msgid "Status deleted." @@ -503,6 +522,21 @@ msgstr "attività pubblica di %s" msgid "%s updates from everyone!" msgstr "Aggiornamenti di %s da tutti!" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, fuzzy, php-format +msgid "Repeated to %s" +msgstr "Risposte a %s" + +#: actions/apitimelineretweetsofme.php:112 +#, fuzzy, php-format +msgid "Repeats of %s" +msgstr "Risposte a %s" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -566,7 +600,7 @@ msgid "Preview" msgstr "Anteprima" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 msgid "Delete" msgstr "Elimina" @@ -587,9 +621,10 @@ msgstr "Ritaglia" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "C'è stato un problema con il tuo token di sessione. Prova di nuovo." @@ -799,7 +834,7 @@ msgstr "Sei sicuro di voler eliminare questo messaggio?" msgid "Do not delete this notice" msgstr "Impossibile eliminare questo messaggio." -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 msgid "Delete this notice" msgstr "Elimina questo messaggio" @@ -1955,7 +1990,7 @@ msgid "You can't send a message to this user." msgstr "Non puoi inviare un messaggio a questo utente." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "Nessun contenuto!" @@ -2065,8 +2100,8 @@ msgstr "Connetti" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "Non è un formato di dati supportato." @@ -2867,6 +2902,36 @@ msgstr "Quello è un profilo locale! Accedi per abbonarti." msgid "Couldn’t get a request token." msgstr "Impossibile ottenere un token di richiesta." +#: actions/repeat.php:57 +#, fuzzy +msgid "Only logged-in users can repeat notices." +msgstr "Solo l'utente può leggere la propria casella di posta." + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "Nessun profilo specificato." + +#: actions/repeat.php:76 +#, fuzzy +msgid "You can't repeat your own notice." +msgstr "Non puoi registrarti se non accetti la licenza." + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "Hai già bloccato questo utente." + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "Crea" + +#: actions/repeat.php:115 +#, fuzzy +msgid "Repeated!" +msgstr "Crea" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -3174,6 +3239,11 @@ msgstr "" "**%s** ha un account su %%%%site.name%%%%, un servizio di [micro-blog]" "(http://it.wikipedia.org/wiki/Microblogging) " +#: actions/showstream.php:313 +#, fuzzy, php-format +msgid "Repeat of %s" +msgstr "Risposte a %s" + #: actions/silence.php:65 actions/unsilence.php:65 #, fuzzy msgid "You cannot silence users on this site." @@ -4006,28 +4076,28 @@ msgstr "Impossibile inserire messaggio." msgid "Could not update message with new URI." msgstr "Impossibile aggiornare il messaggio con il nuovo URI." -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Errore del DB nell'inserire un hashtag: %s" -#: classes/Notice.php:188 +#: classes/Notice.php:196 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Problema nel salvare il messaggio." -#: classes/Notice.php:192 +#: classes/Notice.php:200 msgid "Problem saving notice. Unknown user." msgstr "Problema nel salvare il messaggio. Utente sconosciuto." -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Troppi messaggi troppo velocemente; fai una pausa e scrivi di nuovo tra " "qualche minuto." -#: classes/Notice.php:203 +#: classes/Notice.php:211 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4036,19 +4106,24 @@ msgstr "" "Troppi messaggi troppo velocemente; fai una pausa e scrivi di nuovo tra " "qualche minuto." -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "Ti è proibito inviare messaggi su questo sito." -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "Problema nel salvare il messaggio." -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "Errore del DB nell'inserire la risposta: %s" +#: classes/Notice.php:1320 +#, fuzzy, php-format +msgid "RT @%1$s %2$s" +msgstr "%1$s (%2$s)" + #: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" @@ -4262,19 +4337,19 @@ msgstr "Tutto " msgid "license." msgstr "licenza." -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "Paginazione" -#: lib/action.php:1077 +#: lib/action.php:1107 msgid "After" msgstr "Successivi" -#: lib/action.php:1085 +#: lib/action.php:1115 msgid "Before" msgstr "Precedenti" -#: lib/action.php:1133 +#: lib/action.php:1163 msgid "There was a problem with your session token." msgstr "C'è stato un problema con il tuo token di sessione." @@ -4372,11 +4447,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "L'utente non ha un ultimo messaggio" @@ -4418,107 +4494,117 @@ msgstr "Messaggio troppo lungo - massimo 140 caratteri, inviati %d" msgid "Error sending direct message." msgstr "Errore nell'inviare il messaggio diretto." -#: lib/command.php:431 +#: lib/command.php:434 +#, fuzzy, php-format +msgid "Notice from %s repeated" +msgstr "Messaggio inviato" + +#: lib/command.php:436 +#, fuzzy +msgid "Error repeating notice." +msgstr "Problema nel salvare il messaggio." + +#: lib/command.php:490 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Messaggio troppo lungo - massimo 140 caratteri, inviati %d" -#: lib/command.php:440 +#: lib/command.php:499 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Rispondi a questo messaggio" -#: lib/command.php:442 +#: lib/command.php:501 #, fuzzy msgid "Error saving notice." msgstr "Problema nel salvare il messaggio." -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "Specifica il nome dell'utente a cui abbonarti" -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "Abbonato a %s" -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "Specifica il nome dell'utente da cui annullare l'abbonamento" -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "Abbonamento a %s annullato" -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "Comando non ancora implementato." -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "Notifiche disattivate." -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "Impossibile disattivare le notifiche." -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "Notifiche attivate." -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "Impossibile attivare le notifiche." -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "" -#: lib/command.php:604 +#: lib/command.php:663 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Impossibile creare il modulo OpenID: %s" -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:625 +#: lib/command.php:684 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Non sei abbonato a quel profilo." -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Sei già abbonato a questi utenti:" msgstr[1] "Sei già abbonato a questi utenti:" -#: lib/command.php:647 +#: lib/command.php:706 #, fuzzy msgid "No one is subscribed to you." msgstr "Impossibile abbonare altri a te." -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Impossibile abbonare altri a te." msgstr[1] "Impossibile abbonare altri a te." -#: lib/command.php:669 +#: lib/command.php:728 #, fuzzy msgid "You are not a member of any groups." msgstr "Non sei un membro di quel gruppo." -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Non sei un membro di quel gruppo." msgstr[1] "Non sei un membro di quel gruppo." -#: lib/command.php:685 +#: lib/command.php:744 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4534,6 +4620,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -5001,7 +5089,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 #, fuzzy msgid "from" msgstr " via " @@ -5087,42 +5175,42 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 #, fuzzy msgid "N" msgstr "No" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "" -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 #, fuzzy msgid "in context" msgstr "Nessun contenuto!" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 msgid "Reply to this notice" msgstr "Rispondi a questo messaggio" -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 msgid "Reply" msgstr "Rispondi" @@ -5255,6 +5343,16 @@ msgstr "In evidenza" msgid "Popular" msgstr "Famosi" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "Rispondi a questo messaggio" + +#: lib/repeatform.php:132 +#, fuzzy +msgid "Repeat" +msgstr "Reimposta" + #: lib/sandboxform.php:67 #, fuzzy msgid "Sandbox" diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index 3880ce1551..ed37aa5490 100644 --- a/locale/ja/LC_MESSAGES/statusnet.po +++ b/locale/ja/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:09:58+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:15:48+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ja\n" "X-Message-Group: out-statusnet\n" @@ -45,9 +45,9 @@ msgstr "そのようなページはありません。" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "そのような利用者はいません。" @@ -136,7 +136,8 @@ msgstr "API メソッドが見つかりません。" #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "このメソッドには POST が必要です。" @@ -230,11 +231,14 @@ msgstr "" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "API メソッドが見つかりません！" @@ -434,6 +438,20 @@ msgstr "" msgid "You may not delete another user's status." msgstr "" +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "そのような通知はありません。" + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +msgid "Cannot repeat your own notice" +msgstr "" + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "この通知を削除" + #: actions/apistatusesshow.php:138 #, fuzzy msgid "Status deleted." @@ -505,6 +523,21 @@ msgstr "%s の公開タイムライン" msgid "%s updates from everyone!" msgstr "" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, fuzzy, php-format +msgid "Repeated to %s" +msgstr "%s への返信" + +#: actions/apitimelineretweetsofme.php:112 +#, fuzzy, php-format +msgid "Repeats of %s" +msgstr "%s への返信" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -568,7 +601,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 msgid "Delete" msgstr "削除" @@ -589,9 +622,10 @@ msgstr "" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "" @@ -799,7 +833,7 @@ msgstr "本当にこの通知を削除しますか？" msgid "Do not delete this notice" msgstr "この通知を削除できません。" -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 msgid "Delete this notice" msgstr "この通知を削除" @@ -1929,7 +1963,7 @@ msgid "You can't send a message to this user." msgstr "" #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "コンテンツがありません！" @@ -2034,8 +2068,8 @@ msgstr "内容種別 " msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "" @@ -2826,6 +2860,35 @@ msgstr "" msgid "Couldn’t get a request token." msgstr "リクエストトークンを取得できません" +#: actions/repeat.php:57 +msgid "Only logged-in users can repeat notices." +msgstr "" + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "新しい通知" + +#: actions/repeat.php:76 +#, fuzzy +msgid "You can't repeat your own notice." +msgstr "ライセンスに同意頂けない場合は登録できません。" + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "既にログイン済みです。" + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "作成" + +#: actions/repeat.php:115 +#, fuzzy +msgid "Repeated!" +msgstr "作成" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -3132,6 +3195,11 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" +#: actions/showstream.php:313 +#, fuzzy, php-format +msgid "Repeat of %s" +msgstr "%s への返信" + #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." msgstr "" @@ -3945,45 +4013,50 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:188 +#: classes/Notice.php:196 #, fuzzy msgid "Problem saving notice. Too long." msgstr "通知を保存する際に問題が発生しました。" -#: classes/Notice.php:192 +#: classes/Notice.php:200 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "通知を保存する際に問題が発生しました。" -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:203 +#: classes/Notice.php:211 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "通知を保存する際に問題が発生しました。" -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "返信を追加する際にデータベースエラー : %s" +#: classes/Notice.php:1320 +#, php-format +msgid "RT @%1$s %2$s" +msgstr "" + #: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" @@ -4202,21 +4275,21 @@ msgstr "" msgid "license." msgstr "ライセンス。" -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "" -#: lib/action.php:1077 +#: lib/action.php:1107 #, fuzzy msgid "After" msgstr "<< 前" -#: lib/action.php:1085 +#: lib/action.php:1115 #, fuzzy msgid "Before" msgstr "前 >>" -#: lib/action.php:1133 +#: lib/action.php:1163 msgid "There was a problem with your session token." msgstr "" @@ -4310,11 +4383,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "" @@ -4356,104 +4430,114 @@ msgstr "" msgid "Error sending direct message." msgstr "" -#: lib/command.php:431 +#: lib/command.php:434 +#, fuzzy, php-format +msgid "Notice from %s repeated" +msgstr "通知" + +#: lib/command.php:436 +#, fuzzy +msgid "Error repeating notice." +msgstr "通知を保存する際に問題が発生しました。" + +#: lib/command.php:490 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:440 +#: lib/command.php:499 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "この通知へ返信" -#: lib/command.php:442 +#: lib/command.php:501 #, fuzzy msgid "Error saving notice." msgstr "通知を保存する際に問題が発生しました。" -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "" -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "" -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "" -#: lib/command.php:604 +#: lib/command.php:663 #, php-format msgid "Could not create login token for %s" msgstr "%s 用のログイン・トークンを作成できませんでした" -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:625 +#: lib/command.php:684 #, fuzzy msgid "You are not subscribed to anyone." msgstr "そのプロファイルは送信されていません。" -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "そのプロファイルは送信されていません。" -#: lib/command.php:647 +#: lib/command.php:706 #, fuzzy msgid "No one is subscribed to you." msgstr "リモートサブスクライブ" -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "リモートサブスクライブ" -#: lib/command.php:669 +#: lib/command.php:728 #, fuzzy msgid "You are not a member of any groups." msgstr "そのプロファイルは送信されていません。" -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "そのプロファイルは送信されていません。" -#: lib/command.php:685 +#: lib/command.php:744 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4469,6 +4553,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -4927,7 +5013,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 msgid "from" msgstr "から " @@ -5013,41 +5099,41 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "N" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "" -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 #, fuzzy msgid "in context" msgstr "コンテンツがありません！" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 msgid "Reply to this notice" msgstr "この通知へ返信" -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 msgid "Reply" msgstr "返信" @@ -5179,6 +5265,16 @@ msgstr "" msgid "Popular" msgstr "人気" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "この通知へ返信" + +#: lib/repeatform.php:132 +#, fuzzy +msgid "Repeat" +msgstr "リセット" + #: lib/sandboxform.php:67 msgid "Sandbox" msgstr "" diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index 8bc4175fac..eed6df26de 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: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:10:00+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:15:51+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ko\n" "X-Message-Group: out-statusnet\n" @@ -43,9 +43,9 @@ msgstr "그러한 태그가 없습니다." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "그러한 사용자는 없습니다." @@ -130,7 +130,8 @@ msgstr "API 메서드를 찾을 수 없습니다." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "이 메서드는 등록을 요구합니다." @@ -225,11 +226,14 @@ msgstr "%s에게 모든 직접 메시지" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "API 메서드를 찾을 수 없습니다." @@ -431,6 +435,21 @@ msgstr "이 메서드는 등록 또는 삭제를 요구합니다." msgid "You may not delete another user's status." msgstr "당신은 다른 사용자의 상태를 삭제하지 않아도 된다." +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "그러한 통지는 없습니다." + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "알림을 켤 수 없습니다." + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "이 게시글 삭제하기" + #: actions/apistatusesshow.php:138 #, fuzzy msgid "Status deleted." @@ -502,6 +521,21 @@ msgstr "%s 공개 타임라인" msgid "%s updates from everyone!" msgstr "모두로부터의 업데이트 %s개!" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, fuzzy, php-format +msgid "Repeated to %s" +msgstr "%s에 답신" + +#: actions/apitimelineretweetsofme.php:112 +#, fuzzy, php-format +msgid "Repeats of %s" +msgstr "%s에 답신" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -565,7 +599,7 @@ msgid "Preview" msgstr "미리보기" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 msgid "Delete" msgstr "삭제" @@ -586,9 +620,10 @@ msgstr "자르기" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "세션토큰에 문제가 있습니다. 다시 시도해주세요." @@ -797,7 +832,7 @@ msgstr "정말로 통지를 삭제하시겠습니까?" msgid "Do not delete this notice" msgstr "이 통지를 지울 수 없습니다." -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 msgid "Delete this notice" msgstr "이 게시글 삭제하기" @@ -1935,7 +1970,7 @@ msgid "You can't send a message to this user." msgstr "당신은 이 사용자에게 메시지를 보낼 수 없습니다." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "내용이 없습니다!" @@ -2045,8 +2080,8 @@ msgstr "연결" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "지원하는 형식의 데이터가 아닙니다." @@ -2837,6 +2872,36 @@ msgstr "그것은 로컬프로필입니다. 구독을 위해서는 로그인하 msgid "Couldn’t get a request token." msgstr "리퀘스트 토큰을 취득 할 수 없습니다." +#: actions/repeat.php:57 +#, fuzzy +msgid "Only logged-in users can repeat notices." +msgstr "오직 해당 사용자만 자신의 메일박스를 열람할 수 있습니다." + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "프로필을 지정하지 않았습니다." + +#: actions/repeat.php:76 +#, fuzzy +msgid "You can't repeat your own notice." +msgstr "라이선스에 동의하지 않는다면 등록할 수 없습니다." + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "당신은 이미 이 사용자를 차단하고 있습니다." + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "생성" + +#: actions/repeat.php:115 +#, fuzzy +msgid "Repeated!" +msgstr "생성" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -3144,6 +3209,11 @@ msgstr "" "**%s**는 %%%%site.name%%%% [마이크로블로깅](http://en.wikipedia.org/wiki/" "Micro-blogging) 서비스에 계정을 갖고 있습니다." +#: actions/showstream.php:313 +#, fuzzy, php-format +msgid "Repeat of %s" +msgstr "%s에 답신" + #: actions/silence.php:65 actions/unsilence.php:65 #, fuzzy msgid "You cannot silence users on this site." @@ -3968,28 +4038,28 @@ msgstr "메시지를 삽입할 수 없습니다." msgid "Could not update message with new URI." msgstr "새 URI와 함께 메시지를 업데이트할 수 없습니다." -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "해쉬테그를 추가 할 때에 데이타베이스 에러 : %s" -#: classes/Notice.php:188 +#: classes/Notice.php:196 #, fuzzy msgid "Problem saving notice. Too long." msgstr "통지를 저장하는데 문제가 발생했습니다." -#: classes/Notice.php:192 +#: classes/Notice.php:200 msgid "Problem saving notice. Unknown user." msgstr "게시글 저장문제. 알려지지않은 회원" -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "너무 많은 게시글이 너무 빠르게 올라옵니다. 한숨고르고 몇분후에 다시 포스트를 " "해보세요." -#: classes/Notice.php:203 +#: classes/Notice.php:211 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -3998,19 +4068,24 @@ msgstr "" "너무 많은 게시글이 너무 빠르게 올라옵니다. 한숨고르고 몇분후에 다시 포스트를 " "해보세요." -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "이 사이트에 게시글 포스팅으로부터 당신은 금지되었습니다." -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "통지를 저장하는데 문제가 발생했습니다." -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "답신을 추가 할 때에 데이타베이스 에러 : %s" +#: classes/Notice.php:1320 +#, fuzzy, php-format +msgid "RT @%1$s %2$s" +msgstr "%1$s (%2$s)" + #: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" @@ -4224,19 +4299,19 @@ msgstr "모든 것" msgid "license." msgstr "라이선스" -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "페이지수" -#: lib/action.php:1077 +#: lib/action.php:1107 msgid "After" msgstr "뒷 페이지" -#: lib/action.php:1085 +#: lib/action.php:1115 msgid "Before" msgstr "앞 페이지" -#: lib/action.php:1133 +#: lib/action.php:1163 msgid "There was a problem with your session token." msgstr "당신의 세션토큰관련 문제가 있습니다." @@ -4334,11 +4409,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "이용자의 지속적인 게시글이 없습니다." @@ -4380,104 +4456,114 @@ msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지 msgid "Error sending direct message." msgstr "직접 메시지 보내기 오류." -#: lib/command.php:431 +#: lib/command.php:434 +#, fuzzy, php-format +msgid "Notice from %s repeated" +msgstr "게시글이 등록되었습니다." + +#: lib/command.php:436 +#, fuzzy +msgid "Error repeating notice." +msgstr "통지를 저장하는데 문제가 발생했습니다." + +#: lib/command.php:490 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다." -#: lib/command.php:440 +#: lib/command.php:499 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "이 게시글에 대해 답장하기" -#: lib/command.php:442 +#: lib/command.php:501 #, fuzzy msgid "Error saving notice." msgstr "통지를 저장하는데 문제가 발생했습니다." -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "구독하려는 사용자의 이름을 지정하십시오." -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "%s에게 구독되었습니다." -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "구독을 해제하려는 사용자의 이름을 지정하십시오." -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "%s에서 구독을 해제했습니다." -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "명령이 아직 실행되지 않았습니다." -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "알림끄기." -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "알림을 끌 수 없습니다." -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "알림이 켜졌습니다." -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "알림을 켤 수 없습니다." -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "" -#: lib/command.php:604 +#: lib/command.php:663 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "OpenID를 작성 할 수 없습니다 : %s" -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:625 +#: lib/command.php:684 #, fuzzy msgid "You are not subscribed to anyone." msgstr "당신은 이 프로필에 구독되지 않고있습니다." -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "당신은 다음 사용자를 이미 구독하고 있습니다." -#: lib/command.php:647 +#: lib/command.php:706 #, fuzzy msgid "No one is subscribed to you." msgstr "다른 사람을 구독 하실 수 없습니다." -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "다른 사람을 구독 하실 수 없습니다." -#: lib/command.php:669 +#: lib/command.php:728 #, fuzzy msgid "You are not a member of any groups." msgstr "당신은 해당 그룹의 멤버가 아닙니다." -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "당신은 해당 그룹의 멤버가 아닙니다." -#: lib/command.php:685 +#: lib/command.php:744 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4493,6 +4579,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -4952,7 +5040,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 #, fuzzy msgid "from" msgstr "다음에서:" @@ -5038,42 +5126,42 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 #, fuzzy msgid "N" msgstr "아니오" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "" -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 #, fuzzy msgid "in context" msgstr "내용이 없습니다!" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 msgid "Reply to this notice" msgstr "이 게시글에 대해 답장하기" -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 msgid "Reply" msgstr "답장하기" @@ -5206,6 +5294,16 @@ msgstr "피쳐링됨" msgid "Popular" msgstr "인기있는" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "이 게시글에 대해 답장하기" + +#: lib/repeatform.php:132 +#, fuzzy +msgid "Repeat" +msgstr "초기화" + #: lib/sandboxform.php:67 #, fuzzy msgid "Sandbox" diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index cd03f9c995..1397b809c8 100644 --- a/locale/mk/LC_MESSAGES/statusnet.po +++ b/locale/mk/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:10:04+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:15:55+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: mk\n" "X-Message-Group: out-statusnet\n" @@ -44,9 +44,9 @@ msgstr "Нема такво известување." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Нема таков корисник." @@ -131,7 +131,8 @@ msgstr "Кодот за потврда не е пронајден." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" @@ -225,11 +226,14 @@ msgstr "" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "" @@ -427,6 +431,19 @@ msgstr "" msgid "You may not delete another user's status." msgstr "" +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "Нема такво известување." + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +msgid "Cannot repeat your own notice" +msgstr "" + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +msgid "Already repeated that notice" +msgstr "" + #: actions/apistatusesshow.php:138 #, fuzzy msgid "Status deleted." @@ -498,6 +515,21 @@ msgstr "" msgid "%s updates from everyone!" msgstr "" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, fuzzy, php-format +msgid "Repeated to %s" +msgstr "Одговори испратени до %s" + +#: actions/apitimelineretweetsofme.php:112 +#, fuzzy, php-format +msgid "Repeats of %s" +msgstr "Одговори испратени до %s" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -563,7 +595,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 msgid "Delete" msgstr "" @@ -584,9 +616,10 @@ msgstr "" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "" @@ -795,7 +828,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "Нема такво известување." -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 msgid "Delete this notice" msgstr "" @@ -1907,7 +1940,7 @@ msgid "You can't send a message to this user." msgstr "" #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "Нема содржина!" @@ -2015,8 +2048,8 @@ msgstr "Поврзи се" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "" @@ -2798,6 +2831,35 @@ msgstr "" msgid "Couldn’t get a request token." msgstr "Не може да се земе белег за барање." +#: actions/repeat.php:57 +msgid "Only logged-in users can repeat notices." +msgstr "" + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "Ново известување" + +#: actions/repeat.php:76 +#, fuzzy +msgid "You can't repeat your own notice." +msgstr "Не може да се регистрирате ако не ја прифаќате лиценцата." + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "Веќе сте пријавени!" + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "Креирај" + +#: actions/repeat.php:115 +#, fuzzy +msgid "Repeated!" +msgstr "Креирај" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -3103,6 +3165,11 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" +#: actions/showstream.php:313 +#, fuzzy, php-format +msgid "Repeat of %s" +msgstr "Одговори испратени до %s" + #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." msgstr "" @@ -3924,45 +3991,50 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:188 +#: classes/Notice.php:196 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Проблем во снимањето на известувањето." -#: classes/Notice.php:192 +#: classes/Notice.php:200 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Проблем во снимањето на известувањето." -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:203 +#: classes/Notice.php:211 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "Проблем во снимањето на известувањето." -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "Одговор од внесот во базата: %s" +#: classes/Notice.php:1320 +#, php-format +msgid "RT @%1$s %2$s" +msgstr "" + #: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" @@ -4184,21 +4256,21 @@ msgstr "" msgid "license." msgstr "" -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "" -#: lib/action.php:1077 +#: lib/action.php:1107 #, fuzzy msgid "After" msgstr "« Следни" -#: lib/action.php:1085 +#: lib/action.php:1115 #, fuzzy msgid "Before" msgstr "Предходни »" -#: lib/action.php:1133 +#: lib/action.php:1163 msgid "There was a problem with your session token." msgstr "" @@ -4292,11 +4364,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "" @@ -4338,107 +4411,117 @@ msgstr "" msgid "Error sending direct message." msgstr "" -#: lib/command.php:431 +#: lib/command.php:434 +#, fuzzy, php-format +msgid "Notice from %s repeated" +msgstr "Известувања" + +#: lib/command.php:436 +#, fuzzy +msgid "Error repeating notice." +msgstr "Проблем во снимањето на известувањето." + +#: lib/command.php:490 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:440 +#: lib/command.php:499 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Одговори испратени до %s" -#: lib/command.php:442 +#: lib/command.php:501 #, fuzzy msgid "Error saving notice." msgstr "Проблем во снимањето на известувањето." -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "" -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "" -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "" -#: lib/command.php:604 +#: lib/command.php:663 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "OpenID формуларот не може да се креира:%s" -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:625 +#: lib/command.php:684 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Не ни го испративте тој профил." -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Не ни го испративте тој профил." msgstr[1] "Не ни го испративте тој профил." -#: lib/command.php:647 +#: lib/command.php:706 #, fuzzy msgid "No one is subscribed to you." msgstr "Оддалечена претплата" -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Оддалечена претплата" msgstr[1] "Оддалечена претплата" -#: lib/command.php:669 +#: lib/command.php:728 #, fuzzy msgid "You are not a member of any groups." msgstr "Не ни го испративте тој профил." -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Не ни го испративте тој профил." msgstr[1] "Не ни го испративте тој профил." -#: lib/command.php:685 +#: lib/command.php:744 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4454,6 +4537,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -4919,7 +5004,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 msgid "from" msgstr "" @@ -5007,41 +5092,41 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "N" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "" -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 #, fuzzy msgid "in context" msgstr "Нема содржина!" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 #, fuzzy msgid "Reply" msgstr "одговор" @@ -5174,6 +5259,16 @@ msgstr "" msgid "Popular" msgstr "Пребарување на луѓе" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "Нема такво известување." + +#: lib/repeatform.php:132 +#, fuzzy +msgid "Repeat" +msgstr "Ресетирај" + #: lib/sandboxform.php:67 msgid "Sandbox" msgstr "" diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index cd4d46b5dc..704ad6e9b5 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:10:06+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:15:58+0000\n" "Language-Team: Norwegian (bokmål)‬\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: no\n" "X-Message-Group: out-statusnet\n" @@ -43,9 +43,9 @@ msgstr "Klarte ikke å lagre profil." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "" @@ -130,7 +130,8 @@ msgstr "API-metode ikke funnet!" #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" @@ -224,11 +225,14 @@ msgstr "" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "API-metode ikke funnet!" @@ -427,6 +431,20 @@ msgstr "" msgid "You may not delete another user's status." msgstr "" +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "Nytt nick" + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +msgid "Cannot repeat your own notice" +msgstr "" + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Kan ikke slette notisen." + #: actions/apistatusesshow.php:138 msgid "Status deleted." msgstr "" @@ -496,6 +514,21 @@ msgstr "%s offentlig tidslinje" msgid "%s updates from everyone!" msgstr "%s oppdateringer fra alle sammen!" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, fuzzy, php-format +msgid "Repeated to %s" +msgstr "Svar til %s" + +#: actions/apitimelineretweetsofme.php:112 +#, fuzzy, php-format +msgid "Repeats of %s" +msgstr "Svar til %s" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -560,7 +593,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 #, fuzzy msgid "Delete" msgstr "slett" @@ -582,9 +615,10 @@ msgstr "" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "" @@ -790,7 +824,7 @@ msgstr "Er du sikker på at du vil slette denne notisen?" msgid "Do not delete this notice" msgstr "Kan ikke slette notisen." -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 msgid "Delete this notice" msgstr "" @@ -1899,7 +1933,7 @@ msgid "You can't send a message to this user." msgstr "" #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "" @@ -2003,8 +2037,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "" @@ -2783,6 +2817,34 @@ msgstr "" msgid "Couldn’t get a request token." msgstr "" +#: actions/repeat.php:57 +msgid "Only logged-in users can repeat notices." +msgstr "" + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "Nytt nick" + +#: actions/repeat.php:76 +msgid "You can't repeat your own notice." +msgstr "" + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "Du er allerede logget inn!" + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "Opprett" + +#: actions/repeat.php:115 +#, fuzzy +msgid "Repeated!" +msgstr "Opprett" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -3086,6 +3148,11 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" +#: actions/showstream.php:313 +#, fuzzy, php-format +msgid "Repeat of %s" +msgstr "Svar til %s" + #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." msgstr "" @@ -3885,43 +3952,48 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:188 +#: classes/Notice.php:196 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:192 +#: classes/Notice.php:200 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:203 +#: classes/Notice.php:211 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "" +#: classes/Notice.php:1320 +#, php-format +msgid "RT @%1$s %2$s" +msgstr "" + #: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" @@ -4133,20 +4205,20 @@ msgstr "" msgid "license." msgstr "" -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "" -#: lib/action.php:1077 +#: lib/action.php:1107 msgid "After" msgstr "" -#: lib/action.php:1085 +#: lib/action.php:1115 #, fuzzy msgid "Before" msgstr "Tidligere »" -#: lib/action.php:1133 +#: lib/action.php:1163 msgid "There was a problem with your session token." msgstr "" @@ -4237,11 +4309,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "" @@ -4283,106 +4356,115 @@ msgstr "" msgid "Error sending direct message." msgstr "" -#: lib/command.php:431 +#: lib/command.php:434 +#, php-format +msgid "Notice from %s repeated" +msgstr "" + +#: lib/command.php:436 +msgid "Error repeating notice." +msgstr "" + +#: lib/command.php:490 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:440 +#: lib/command.php:499 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Svar til %s" -#: lib/command.php:442 +#: lib/command.php:501 msgid "Error saving notice." msgstr "" -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "" -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "" -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "" -#: lib/command.php:604 +#: lib/command.php:663 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Klarte ikke å lagre avatar-informasjonen" -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:625 +#: lib/command.php:684 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Ikke autorisert." -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Ikke autorisert." msgstr[1] "Ikke autorisert." -#: lib/command.php:647 +#: lib/command.php:706 #, fuzzy msgid "No one is subscribed to you." msgstr "Svar til %s" -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Svar til %s" msgstr[1] "Svar til %s" -#: lib/command.php:669 +#: lib/command.php:728 #, fuzzy msgid "You are not a member of any groups." msgstr "Du er allerede logget inn!" -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Du er allerede logget inn!" msgstr[1] "Du er allerede logget inn!" -#: lib/command.php:685 +#: lib/command.php:744 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4398,6 +4480,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -4861,7 +4945,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 #, fuzzy msgid "from" msgstr "fra" @@ -4948,40 +5032,40 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "N" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "" -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 msgid "in context" msgstr "" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 #, fuzzy msgid "Reply" msgstr "svar" @@ -5114,6 +5198,16 @@ msgstr "" msgid "Popular" msgstr "" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "Kan ikke slette notisen." + +#: lib/repeatform.php:132 +#, fuzzy +msgid "Repeat" +msgstr "Nullstill" + #: lib/sandboxform.php:67 msgid "Sandbox" msgstr "" diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index c17a03a539..ee0608c12b 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:10:12+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:16:04+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: out-statusnet\n" @@ -44,9 +44,9 @@ msgstr "Deze pagina bestaat niet" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Onbekende gebruiker." @@ -138,7 +138,8 @@ msgstr "De API-functie is niet aangetroffen." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Deze methode heeft een POST nodig." @@ -232,11 +233,14 @@ msgstr "Alle directe berichten verzonden aan %s" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "De API-functie is niet aangetroffen!" @@ -436,6 +440,21 @@ msgstr "Deze methode heeft een POST of DELETE nodig." msgid "You may not delete another user's status." msgstr "U kunt de status van een andere gebruiker niet verwijderen." +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "De mededeling bestaat niet." + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Het is niet mogelijk de notificatie uit te schakelen." + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Deze mededeling verwijderen" + #: actions/apistatusesshow.php:138 msgid "Status deleted." msgstr "De status is verwijderd." @@ -507,6 +526,21 @@ msgstr "%s publieke tijdlijn" msgid "%s updates from everyone!" msgstr "%s updates van iedereen" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, fuzzy, php-format +msgid "Repeated to %s" +msgstr "Antwoorden aan %s" + +#: actions/apitimelineretweetsofme.php:112 +#, fuzzy, php-format +msgid "Repeats of %s" +msgstr "Antwoorden aan %s" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -570,7 +604,7 @@ msgid "Preview" msgstr "Voorvertoning" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 msgid "Delete" msgstr "Verwijderen" @@ -591,9 +625,10 @@ msgstr "Uitsnijden" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "" "Er is een probleem ontstaan met uw sessie. Probeer het nog een keer, " @@ -800,7 +835,7 @@ msgstr "Weet u zeker dat u deze aankondiging wilt verwijderen?" msgid "Do not delete this notice" msgstr "Deze mededeling niet verwijderen" -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 msgid "Delete this notice" msgstr "Deze mededeling verwijderen" @@ -1392,7 +1427,7 @@ msgid "" "Customize the way your group looks with a background image and a colour " "palette of your choice." msgstr "" -"De vormgeving van uw groep aanpassen met een achtergrondafbeeldingen en een " +"De vormgeving van uw groep aanpassen met een achtergrondafbeelding en een " "kleurenpalet van uw keuze." #: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 @@ -1949,7 +1984,7 @@ msgid "You can't send a message to this user." msgstr "U kunt geen bericht naar deze gebruiker zenden." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "Geen inhoud!" @@ -2062,8 +2097,8 @@ msgstr "inhoudstype " msgid "Only " msgstr "Alleen " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "Geen ondersteund gegevensformaat." @@ -2871,6 +2906,36 @@ msgstr "Dat is een lokaal profiel. Meld u aan om te abonneren." msgid "Couldn’t get a request token." msgstr "Het was niet mogelijk een verzoektoken te krijgen." +#: actions/repeat.php:57 +#, fuzzy +msgid "Only logged-in users can repeat notices." +msgstr "Gebruikers kunnen alleen hun eigen postvakken lezen." + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "Er is geen profiel opgegeven." + +#: actions/repeat.php:76 +#, fuzzy +msgid "You can't repeat your own notice." +msgstr "U kunt zich niet registreren als u niet met de licentie akkoord gaat." + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "U hebt deze gebruiker reeds geblokkeerd." + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "Aangemaakt" + +#: actions/repeat.php:115 +#, fuzzy +msgid "Repeated!" +msgstr "Aangemaakt" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -3207,6 +3272,11 @@ msgstr "" "(http://en.wikipedia.org/wiki/Micro-blogging) gebaseerd op de Vrije Software " "[StatusNet](http://status.net/). " +#: actions/showstream.php:313 +#, fuzzy, php-format +msgid "Repeat of %s" +msgstr "Antwoorden aan %s" + #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." msgstr "U kunt gebruikers op deze website niet muilkorven." @@ -4032,31 +4102,31 @@ msgstr "Het was niet mogelijk het bericht in te voegen." msgid "Could not update message with new URI." msgstr "Het was niet mogelijk het bericht bij te werken met de nieuwe URI." -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Er is een databasefout opgetreden bij de invoer van de hashtag: %s" -#: classes/Notice.php:188 +#: classes/Notice.php:196 msgid "Problem saving notice. Too long." msgstr "" "Er is een probleem opgetreden bij het opslaan van de mededeling. Deze is te " "lang." -#: classes/Notice.php:192 +#: classes/Notice.php:200 msgid "Problem saving notice. Unknown user." msgstr "" "Er was een probleem bij het opslaan van de mededeling. De gebruiker is " "onbekend." -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "U hebt te snel te veel mededelingen verstuurd. Kom even op adem en probeer " "het over enige tijd weer." -#: classes/Notice.php:203 +#: classes/Notice.php:211 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4064,21 +4134,26 @@ msgstr "" "Te veel duplicaatberichten te snel achter elkaar. Neem een adempauze en " "plaats over een aantal minuten pas weer een bericht." -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "" "U bent geblokkeerd en mag geen mededelingen meer achterlaten op deze site." -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "Er is een probleem opgetreden bij het opslaan van de mededeling." -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "" "Er is een databasefout opgetreden bij het invoegen van het antwoord: %s" +#: classes/Notice.php:1320 +#, fuzzy, php-format +msgid "RT @%1$s %2$s" +msgstr "%1$s (%2$s)" + #: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" @@ -4287,19 +4362,19 @@ msgstr "Alle " msgid "license." msgstr "licentie." -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "Paginering" -#: lib/action.php:1077 +#: lib/action.php:1107 msgid "After" msgstr "Later" -#: lib/action.php:1085 +#: lib/action.php:1115 msgid "Before" msgstr "Eerder" -#: lib/action.php:1133 +#: lib/action.php:1163 msgid "There was a problem with your session token." msgstr "Er is een probleem met uw sessietoken." @@ -4392,11 +4467,12 @@ msgstr "" "Abonnees: %2$s\n" "Mededelingen: %3$s" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "Er bestaat geen mededeling met dat ID" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "Deze gebruiker heeft geen laatste mededeling" @@ -4440,108 +4516,119 @@ msgstr "" msgid "Error sending direct message." msgstr "Er is een fout opgetreden bij het verzonden van het directe bericht." -#: lib/command.php:431 +#: lib/command.php:434 +#, fuzzy, php-format +msgid "Notice from %s repeated" +msgstr "De mededeling is verzonden" + +#: lib/command.php:436 +#, fuzzy +msgid "Error repeating notice." +msgstr "Er is een fout opgetreden bij het opslaan van de mededeling." + +#: lib/command.php:490 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" "De mededeling is te lang. De maximale lengte is %d tekens. Uw mededeling " "bevatte %d tekens" -#: lib/command.php:440 +#: lib/command.php:499 #, php-format msgid "Reply to %s sent" msgstr "Het antwoord aan %s is verzonden" -#: lib/command.php:442 +#: lib/command.php:501 msgid "Error saving notice." msgstr "Er is een fout opgetreden bij het opslaan van de mededeling." -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "Geef de naam op van de gebruiker waarop u wilt abonneren" -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "Geabonneerd op %s" -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "" "Geef de naam op van de gebruiker waarvoor u het abonnement wilt opzeggen" -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "Uw abonnement op %s is opgezegd" -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "Dit commando is nog niet geïmplementeerd." -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "Notificaties uitgeschakeld." -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "Het is niet mogelijk de mededelingen uit te schakelen." -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "Notificaties ingeschakeld." -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "Het is niet mogelijk de notificatie uit te schakelen." -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "Het aanmeldcommando is uitgeschakeld" -#: lib/command.php:604 +#: lib/command.php:663 #, php-format msgid "Could not create login token for %s" msgstr "Het was niet mogelijk een aanmeldtoken aan te maken voor %s" -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" "Deze verwijzing kan slechts één keer gebruikt worden en is twee minuten " "geldig: %s" -#: lib/command.php:625 +#: lib/command.php:684 msgid "You are not subscribed to anyone." msgstr "U bent op geen enkele gebruiker geabonneerd." -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "U bent geabonneerd op deze gebruiker:" msgstr[1] "U bent geabonneerd op deze gebruikers:" -#: lib/command.php:647 +#: lib/command.php:706 msgid "No one is subscribed to you." msgstr "Niemand heeft een abonnenment op u." -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Deze gebruiker is op u geabonneerd:" msgstr[1] "Deze gebruikers zijn op u geabonneerd:" -#: lib/command.php:669 +#: lib/command.php:728 msgid "You are not a member of any groups." msgstr "U bent lid van geen enkele groep." -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "U bent lid van deze groep:" msgstr[1] "U bent lid van deze groepen:" -#: lib/command.php:685 +#: lib/command.php:744 +#, fuzzy msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4557,6 +4644,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -5132,7 +5221,7 @@ msgstr "" "U hebt geen privéberichten. U kunt privéberichten verzenden aan andere " "gebruikers. Mensen kunnen u privéberichten sturen die alleen u kunt lezen." -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 msgid "from" msgstr "van" @@ -5223,40 +5312,40 @@ msgstr "Toevoegen" msgid "Attach a file" msgstr "Bestand toevoegen" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "N" msgstr "N" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "Z" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "O" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "W" -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "op" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 msgid "in context" msgstr "in context" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 msgid "Reply to this notice" msgstr "Op deze mededeling antwoorden" -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 msgid "Reply" msgstr "Antwoorden" @@ -5386,6 +5475,16 @@ msgstr "Uitgelicht" msgid "Popular" msgstr "Populair" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "Op deze mededeling antwoorden" + +#: lib/repeatform.php:132 +#, fuzzy +msgid "Repeat" +msgstr "Herstellen" + #: lib/sandboxform.php:67 msgid "Sandbox" msgstr "Zandbak" diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index fe4af0f156..7ba503c79a 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: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:10:09+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:16:00+0000\n" "Language-Team: Norwegian Nynorsk\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nn\n" "X-Message-Group: out-statusnet\n" @@ -43,9 +43,9 @@ msgstr "Dette emneord finst ikkje." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Brukaren finst ikkje." @@ -130,7 +130,8 @@ msgstr "Fann ikkje API-metode." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Dette krev ein POST." @@ -225,11 +226,14 @@ msgstr "Alle direkte meldingar sendt til %s" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "Fann ikkje API-metode." @@ -429,6 +433,21 @@ msgstr "Dette krev anten ein POST eller DELETE." msgid "You may not delete another user's status." msgstr "Du kan ikkje sletta statusen til ein annan brukar." +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "Denne notisen finst ikkje." + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Kan ikkje slå på notifikasjon." + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Slett denne notisen" + #: actions/apistatusesshow.php:138 #, fuzzy msgid "Status deleted." @@ -500,6 +519,21 @@ msgstr "%s offentleg tidsline" msgid "%s updates from everyone!" msgstr "%s oppdateringar frå alle saman!" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, fuzzy, php-format +msgid "Repeated to %s" +msgstr "Svar til %s" + +#: actions/apitimelineretweetsofme.php:112 +#, fuzzy, php-format +msgid "Repeats of %s" +msgstr "Svar til %s" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -563,7 +597,7 @@ msgid "Preview" msgstr "Forhandsvis" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 msgid "Delete" msgstr "Slett" @@ -584,9 +618,10 @@ msgstr "Skaler" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "Der var eit problem med sesjonen din. Vennlegst prøv på nytt." @@ -796,7 +831,7 @@ msgstr "Sikker på at du vil sletta notisen?" msgid "Do not delete this notice" msgstr "Kan ikkje sletta notisen." -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 msgid "Delete this notice" msgstr "Slett denne notisen" @@ -1938,7 +1973,7 @@ msgid "You can't send a message to this user." msgstr "Du kan ikkje sende melding til denne brukaren." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "Ingen innhald." @@ -2050,8 +2085,8 @@ msgstr "Kopla til" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "Ikkje eit støtta dataformat." @@ -2850,6 +2885,36 @@ msgstr "Det er ikkje ein lokal profil! Log inn for å tinge." msgid "Couldn’t get a request token." msgstr "Fekk ikkje spørjingsbillett (request token)." +#: actions/repeat.php:57 +#, fuzzy +msgid "Only logged-in users can repeat notices." +msgstr "Kun brukaren kan lese sine eigne meldingar." + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "Ingen vald profil." + +#: actions/repeat.php:76 +#, fuzzy +msgid "You can't repeat your own notice." +msgstr "Du kan ikkje registrera deg om du ikkje godtek vilkåra i lisensen." + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "Du har allereie blokkert denne brukaren." + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "Lag" + +#: actions/repeat.php:115 +#, fuzzy +msgid "Repeated!" +msgstr "Lag" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -3157,6 +3222,11 @@ msgstr "" "**%s** har ein konto på %%%%site.name%%%%, ei [mikroblogging](http://en." "wikipedia.org/wiki/Micro-blogging)-teneste" +#: actions/showstream.php:313 +#, fuzzy, php-format +msgid "Repeat of %s" +msgstr "Svar til %s" + #: actions/silence.php:65 actions/unsilence.php:65 #, fuzzy msgid "You cannot silence users on this site." @@ -3987,27 +4057,27 @@ msgstr "Kunne ikkje lagre melding." msgid "Could not update message with new URI." msgstr "Kunne ikkje oppdatere melding med ny URI." -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s" -#: classes/Notice.php:188 +#: classes/Notice.php:196 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Eit problem oppstod ved lagring av notis." -#: classes/Notice.php:192 +#: classes/Notice.php:200 msgid "Problem saving notice. Unknown user." msgstr "Feil ved lagring av notis. Ukjend brukar." -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt." -#: classes/Notice.php:203 +#: classes/Notice.php:211 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4015,19 +4085,24 @@ msgid "" msgstr "" "For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt." -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "Du kan ikkje lengre legge inn notisar på denne sida." -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "Eit problem oppstod ved lagring av notis." -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "Databasefeil, kan ikkje lagra svar: %s" +#: classes/Notice.php:1320 +#, fuzzy, php-format +msgid "RT @%1$s %2$s" +msgstr "%1$s (%2$s)" + #: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" @@ -4241,19 +4316,19 @@ msgstr "Alle" msgid "license." msgstr "lisens." -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "Paginering" -#: lib/action.php:1077 +#: lib/action.php:1107 msgid "After" msgstr "« Etter" -#: lib/action.php:1085 +#: lib/action.php:1115 msgid "Before" msgstr "Før »" -#: lib/action.php:1133 +#: lib/action.php:1163 msgid "There was a problem with your session token." msgstr "Det var eit problem med sesjons billetten din." @@ -4351,11 +4426,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "Brukaren har ikkje siste notis" @@ -4397,107 +4473,117 @@ msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d" msgid "Error sending direct message." msgstr "Ein feil oppstod ved sending av direkte melding." -#: lib/command.php:431 +#: lib/command.php:434 +#, fuzzy, php-format +msgid "Notice from %s repeated" +msgstr "Melding lagra" + +#: lib/command.php:436 +#, fuzzy +msgid "Error repeating notice." +msgstr "Eit problem oppstod ved lagring av notis." + +#: lib/command.php:490 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d" -#: lib/command.php:440 +#: lib/command.php:499 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Svar på denne notisen" -#: lib/command.php:442 +#: lib/command.php:501 #, fuzzy msgid "Error saving notice." msgstr "Eit problem oppstod ved lagring av notis." -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "Spesifer namnet til brukaren du vil tinge" -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "Tingar %s" -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "Spesifer namnet til brukar du vil fjerne tinging på" -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "Tingar ikkje %s lengre" -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "Kommando ikkje implementert." -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "Notifikasjon av." -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "Kan ikkje skru av notifikasjon." -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "Notifikasjon på." -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "Kan ikkje slå på notifikasjon." -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "" -#: lib/command.php:604 +#: lib/command.php:663 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Kunne ikkje lagre favoritt." -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:625 +#: lib/command.php:684 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Du tingar ikkje oppdateringar til den profilen." -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Du tingar allereie oppdatering frå desse brukarane:" msgstr[1] "Du tingar allereie oppdatering frå desse brukarane:" -#: lib/command.php:647 +#: lib/command.php:706 #, fuzzy msgid "No one is subscribed to you." msgstr "Kan ikkje tinga andre til deg." -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Kan ikkje tinga andre til deg." msgstr[1] "Kan ikkje tinga andre til deg." -#: lib/command.php:669 +#: lib/command.php:728 #, fuzzy msgid "You are not a member of any groups." msgstr "Du er ikkje medlem av den gruppa." -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Du er ikkje medlem av den gruppa." msgstr[1] "Du er ikkje medlem av den gruppa." -#: lib/command.php:685 +#: lib/command.php:744 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4513,6 +4599,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -4979,7 +5067,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 #, fuzzy msgid "from" msgstr " frå " @@ -5065,42 +5153,42 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 #, fuzzy msgid "N" msgstr "Nei" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "" -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 #, fuzzy msgid "in context" msgstr "Ingen innhald." -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 msgid "Reply to this notice" msgstr "Svar på denne notisen" -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 msgid "Reply" msgstr "Svar" @@ -5233,6 +5321,16 @@ msgstr "Framheva" msgid "Popular" msgstr "Populære" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "Svar på denne notisen" + +#: lib/repeatform.php:132 +#, fuzzy +msgid "Repeat" +msgstr "Avbryt" + #: lib/sandboxform.php:67 #, fuzzy msgid "Sandbox" diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index 9fbafcb0a2..317291be4a 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: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:10:15+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:16:07+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -19,7 +19,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pl\n" "X-Message-Group: out-statusnet\n" @@ -48,9 +48,9 @@ msgstr "Nie ma takiej strony" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Brak takiego użytkownika." @@ -142,7 +142,8 @@ msgstr "Nie odnaleziono metody API." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Ta metoda wymaga POST." @@ -235,11 +236,14 @@ msgstr "Wszystkie bezpośrednie wiadomości wysłane do użytkownika %s" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "Nie odnaleziono metody API." @@ -434,6 +438,21 @@ msgstr "Ta metoda wymaga POST lub DELETE." msgid "You may not delete another user's status." msgstr "Nie można usuwać stanów innych użytkowników." +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "Nie ma takiego wpisu." + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Nie można włączyć powiadomień." + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Usuń ten wpis" + #: actions/apistatusesshow.php:138 msgid "Status deleted." msgstr "Usunięto stan." @@ -503,6 +522,21 @@ msgstr "Publiczna oś czasu użytkownika %s" msgid "%s updates from everyone!" msgstr "Użytkownik %s aktualizuje od każdego." +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, fuzzy, php-format +msgid "Repeated to %s" +msgstr "Odpowiedzi na %s" + +#: actions/apitimelineretweetsofme.php:112 +#, fuzzy, php-format +msgid "Repeats of %s" +msgstr "Odpowiedzi na %s" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -565,7 +599,7 @@ msgid "Preview" msgstr "Podgląd" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 msgid "Delete" msgstr "Usuń" @@ -586,9 +620,10 @@ msgstr "Przytnij" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "Wystąpił problem z tokenem sesji. Spróbuj ponownie." @@ -792,7 +827,7 @@ msgstr "Jesteś pewien, że chcesz usunąć ten wpis?" msgid "Do not delete this notice" msgstr "Nie usuwaj tego wpisu" -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 msgid "Delete this notice" msgstr "Usuń ten wpis" @@ -1567,7 +1602,7 @@ msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." msgstr "" -"Adres Jabber lub GTalk, taki jak \"NazwaUżytkownika@przykład.org\". Najpierw " +"Adres Jabber lub GTalk, taki jak \"NazwaUżytkownika@example.org\". Najpierw " "upewnij się, że dodałeś %s do listy znajomych w komunikatorze lub na GTalk." #: actions/imsettings.php:143 @@ -1921,7 +1956,7 @@ msgid "You can't send a message to this user." msgstr "Nie można wysłać wiadomości do tego użytkownika." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "Brak zawartości." @@ -2034,8 +2069,8 @@ msgstr "typ zawartości " msgid "Only " msgstr "Tylko " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "To nie jest obsługiwany format danych." @@ -2833,6 +2868,37 @@ msgstr "To jest profil lokalny. Zaloguj się, aby subskrybować." msgid "Couldn’t get a request token." msgstr "Nie można uzyskać tokenu żądana." +#: actions/repeat.php:57 +#, fuzzy +msgid "Only logged-in users can repeat notices." +msgstr "Tylko użytkownik może czytać swoje skrzynki pocztowe." + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "Nie podano profilu." + +#: actions/repeat.php:76 +#, fuzzy +msgid "You can't repeat your own notice." +msgstr "" +"Nie można się zarejestrować, jeśli nie zgadzasz się z warunkami licencji." + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "Użytkownik jest już zablokowany." + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "Utworzono" + +#: actions/repeat.php:115 +#, fuzzy +msgid "Repeated!" +msgstr "Utworzono" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -3168,6 +3234,11 @@ msgstr "" "pl.wikipedia.org/wiki/Mikroblog) opartej na wolnym narzędziu [StatusNet]" "(http://status.net/). " +#: actions/showstream.php:313 +#, fuzzy, php-format +msgid "Repeat of %s" +msgstr "Odpowiedzi na %s" + #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." msgstr "Nie można wyciszać użytkowników na tej stronie." @@ -3984,27 +4055,27 @@ msgstr "Nie można wprowadzić wiadomości." msgid "Could not update message with new URI." msgstr "Nie można zaktualizować wiadomości za pomocą nowego adresu URL." -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Błąd bazy danych podczas wprowadzania znacznika mieszania: %s" -#: classes/Notice.php:188 +#: classes/Notice.php:196 msgid "Problem saving notice. Too long." msgstr "Problem podczas zapisywania wpisu. Za długi." -#: classes/Notice.php:192 +#: classes/Notice.php:200 msgid "Problem saving notice. Unknown user." msgstr "Problem podczas zapisywania wpisu. Nieznany użytkownik." -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Za dużo wpisów w za krótkim czasie, weź głęboki oddech i wyślij ponownie za " "kilka minut." -#: classes/Notice.php:203 +#: classes/Notice.php:211 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4012,19 +4083,24 @@ msgstr "" "Za dużo takich samych wiadomości w za krótkim czasie, weź głęboki oddech i " "wyślij ponownie za kilka minut." -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "Zabroniono ci wysyłania wpisów na tej stronie." -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "Problem podczas zapisywania wpisu." -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "Błąd bazy danych podczas wprowadzania odpowiedzi: %s" +#: classes/Notice.php:1320 +#, fuzzy, php-format +msgid "RT @%1$s %2$s" +msgstr "%1$s (%2$s)" + #: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" @@ -4233,19 +4309,19 @@ msgstr "Wszystko " msgid "license." msgstr "licencja." -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "Paginacja" -#: lib/action.php:1077 +#: lib/action.php:1107 msgid "After" msgstr "Później" -#: lib/action.php:1085 +#: lib/action.php:1115 msgid "Before" msgstr "Wcześniej" -#: lib/action.php:1133 +#: lib/action.php:1163 msgid "There was a problem with your session token." msgstr "Wystąpił problem z tokenem sesji." @@ -4338,11 +4414,12 @@ msgstr "" "Subskrybenci: %2$s\n" "Wpisy: %3$s" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "Wpis z tym identyfikatorem nie istnieje" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "Użytkownik nie posiada ostatniego wpisu" @@ -4384,108 +4461,119 @@ msgstr "Wiadomość jest za długa - maksymalnie %d znaków, wysłano %d" msgid "Error sending direct message." msgstr "Błąd podczas wysyłania bezpośredniej wiadomości." -#: lib/command.php:431 +#: lib/command.php:434 +#, fuzzy, php-format +msgid "Notice from %s repeated" +msgstr "Wysłano wpis" + +#: lib/command.php:436 +#, fuzzy +msgid "Error repeating notice." +msgstr "Błąd podczas zapisywania wpisu." + +#: lib/command.php:490 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Wpis jest za długi - maksymalnie %d znaków, wysłano %d" -#: lib/command.php:440 +#: lib/command.php:499 #, php-format msgid "Reply to %s sent" msgstr "Wysłano odpowiedź do %s" -#: lib/command.php:442 +#: lib/command.php:501 msgid "Error saving notice." msgstr "Błąd podczas zapisywania wpisu." -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "Podaj nazwę użytkownika do subskrybowania" -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "Subskrybowano użytkownika %s" -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "Podaj nazwę użytkownika do usunięcia subskrypcji" -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "Usunięto subskrypcję użytkownika %s" -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "Nie zaimplementowano polecenia." -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "Wyłączono powiadomienia." -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "Nie można wyłączyć powiadomień." -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "Włączono powiadomienia." -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "Nie można włączyć powiadomień." -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "Polecenie logowania jest wyłączone" -#: lib/command.php:604 +#: lib/command.php:663 #, php-format msgid "Could not create login token for %s" msgstr "Nie można utworzyć tokenów loginów dla %s" -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" "Ten odnośnik można użyć tylko raz i będzie prawidłowy tylko przez dwie " "minuty: %s" -#: lib/command.php:625 +#: lib/command.php:684 msgid "You are not subscribed to anyone." msgstr "Nie subskrybujesz nikogo." -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Subskrybujesz tę osobę:" msgstr[1] "Subskrybujesz te osoby:" msgstr[2] "Subskrybujesz te osoby:" -#: lib/command.php:647 +#: lib/command.php:706 msgid "No one is subscribed to you." msgstr "Nikt cię nie subskrybuje." -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Ta osoba cię subskrybuje:" msgstr[1] "Te osoby cię subskrybują:" msgstr[2] "Te osoby cię subskrybują:" -#: lib/command.php:669 +#: lib/command.php:728 msgid "You are not a member of any groups." msgstr "Nie jesteś członkiem żadnej grupy." -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Jesteś członkiem tej grupy:" msgstr[1] "Jesteś członkiem tych grup:" msgstr[2] "Jesteś członkiem tych grup:" -#: lib/command.php:685 +#: lib/command.php:744 +#, fuzzy msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4501,6 +4589,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -5074,7 +5164,7 @@ msgstr "" "rozmowę z innymi użytkownikami. Inni mogą wysyłać ci wiadomości tylko dla " "twoich oczu." -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 msgid "from" msgstr "z" @@ -5160,40 +5250,40 @@ msgstr "Załącz" msgid "Attach a file" msgstr "Załącz plik" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "N" msgstr "Północ" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "Południe" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "Wschód" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "Zachód" -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "w" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 msgid "in context" msgstr "w rozmowie" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 msgid "Reply to this notice" msgstr "Odpowiedz na ten wpis" -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 msgid "Reply" msgstr "Odpowiedz" @@ -5322,6 +5412,16 @@ msgstr "Znane" msgid "Popular" msgstr "Popularne" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "Odpowiedz na ten wpis" + +#: lib/repeatform.php:132 +#, fuzzy +msgid "Repeat" +msgstr "Przywróć" + #: lib/sandboxform.php:67 msgid "Sandbox" msgstr "Ogranicz" diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index 96869a74a7..73d58c9c33 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: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:10:18+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:16:10+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt\n" "X-Message-Group: out-statusnet\n" @@ -44,9 +44,9 @@ msgstr "Página não encontrada." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Utilizador não encontrado." @@ -136,7 +136,8 @@ msgstr "Método da API não encontrado." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Este método requer um POST." @@ -229,11 +230,14 @@ msgstr "Todas as mensagens directas enviadas para %s" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "Método da API não encontrado!" @@ -427,6 +431,21 @@ msgstr "Este método requer um POST ou DELETE." msgid "You may not delete another user's status." msgstr "Não pode apagar o estado de outro utilizador." +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "Nota não encontrada." + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Não foi possível ligar a notificação." + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Apagar esta nota" + #: actions/apistatusesshow.php:138 msgid "Status deleted." msgstr "Estado apagado." @@ -496,6 +515,21 @@ msgstr "Notas públicas de %s" msgid "%s updates from everyone!" msgstr "%s actualizações de todos!" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, fuzzy, php-format +msgid "Repeated to %s" +msgstr "Respostas a %s" + +#: actions/apitimelineretweetsofme.php:112 +#, fuzzy, php-format +msgid "Repeats of %s" +msgstr "Respostas a %s" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -558,7 +592,7 @@ msgid "Preview" msgstr "Antevisão" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 msgid "Delete" msgstr "Apagar" @@ -579,9 +613,10 @@ msgstr "Cortar" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "" "Ocorreu um problema com a sua chave de sessão. Por favor, tente novamente." @@ -786,7 +821,7 @@ msgstr "Tem a certeza de que quer apagar esta nota?" msgid "Do not delete this notice" msgstr "Não apagar esta nota" -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 msgid "Delete this notice" msgstr "Apagar esta nota" @@ -1571,7 +1606,7 @@ msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." msgstr "" -"Endereço Jabber ou GTalk, por exemplo \"NomeDeUtilizador@exemplo.org\". " +"Endereço Jabber ou GTalk, por exemplo \"NomeDeUtilizador@example.org\". " "Primeiro, certifique-se de que adicionou %s à sua lista de amigos no cliente " "IM ou no GTalk." @@ -1925,7 +1960,7 @@ msgid "You can't send a message to this user." msgstr "Não pode enviar uma mensagem a este utilizador." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "Sem conteúdo!" @@ -2037,8 +2072,8 @@ msgstr "tipo de conteúdo " msgid "Only " msgstr "Apenas " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "Formato de dados não suportado." @@ -2843,6 +2878,36 @@ msgstr "Esse perfil é local! Inicie uma sessão para o subscrever." msgid "Couldn’t get a request token." msgstr "Não foi possível obter uma chave de pedido." +#: actions/repeat.php:57 +#, fuzzy +msgid "Only logged-in users can repeat notices." +msgstr "Só o próprio utilizador pode ler a sua caixa de correio." + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "Não foi especificado um perfil." + +#: actions/repeat.php:76 +#, fuzzy +msgid "You can't repeat your own notice." +msgstr "Não se pode registar se não aceita a licença." + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "Já bloqueou esse utilizador." + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "Criado" + +#: actions/repeat.php:115 +#, fuzzy +msgid "Repeated!" +msgstr "Criado" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -3177,6 +3242,11 @@ msgstr "" "(http://en.wikipedia.org/wiki/Micro-blogging) baseado na aplicação de " "Software Livre [StatusNet](http://status.net/). " +#: actions/showstream.php:313 +#, fuzzy, php-format +msgid "Repeat of %s" +msgstr "Respostas a %s" + #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." msgstr "Não pode silenciar utilizadores neste site." @@ -3991,27 +4061,27 @@ msgstr "Não foi possível inserir a mensagem." msgid "Could not update message with new URI." msgstr "Não foi possível actualizar a mensagem com a nova URI." -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Erro na base de dados ao inserir a hashtag: %s" -#: classes/Notice.php:188 +#: classes/Notice.php:196 msgid "Problem saving notice. Too long." msgstr "Problema na gravação da nota. Demasiado longa." -#: classes/Notice.php:192 +#: classes/Notice.php:200 msgid "Problem saving notice. Unknown user." msgstr "Problema na gravação da nota. Utilizador desconhecido." -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Demasiadas notas, demasiado rápido; descanse e volte a publicar daqui a " "alguns minutos." -#: classes/Notice.php:203 +#: classes/Notice.php:211 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4019,19 +4089,24 @@ msgstr "" "Demasiadas mensagens duplicadas, demasiado rápido; descanse e volte a " "publicar daqui a alguns minutos." -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "Está proibido de publicar notas neste site." -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "Problema na gravação da nota." -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "Ocorreu um erro na base de dados ao inserir a resposta: %s" +#: classes/Notice.php:1320 +#, fuzzy, php-format +msgid "RT @%1$s %2$s" +msgstr "%1$s (%2$s)" + #: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" @@ -4240,19 +4315,19 @@ msgstr "Tudo " msgid "license." msgstr "licença." -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "Paginação" -#: lib/action.php:1077 +#: lib/action.php:1107 msgid "After" msgstr "Depois" -#: lib/action.php:1085 +#: lib/action.php:1115 msgid "Before" msgstr "Antes" -#: lib/action.php:1133 +#: lib/action.php:1163 msgid "There was a problem with your session token." msgstr "Ocorreu um problema com a sua chave de sessão." @@ -4345,11 +4420,12 @@ msgstr "" "Subscritores: %2$s\n" "Notas: %3$s" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "Não existe nenhuma nota com essa identificação" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "Utilizador não tem nenhuma última nota" @@ -4391,105 +4467,116 @@ msgstr "Mensagem demasiado extensa - máx. %d caracteres, enviou %d" msgid "Error sending direct message." msgstr "Erro no envio da mensagem directa." -#: lib/command.php:431 +#: lib/command.php:434 +#, fuzzy, php-format +msgid "Notice from %s repeated" +msgstr "Nota publicada" + +#: lib/command.php:436 +#, fuzzy +msgid "Error repeating notice." +msgstr "Erro ao gravar nota." + +#: lib/command.php:490 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Nota demasiado extensa - máx. %d caracteres, enviou %d" -#: lib/command.php:440 +#: lib/command.php:499 #, php-format msgid "Reply to %s sent" msgstr "Resposta a %s enviada" -#: lib/command.php:442 +#: lib/command.php:501 msgid "Error saving notice." msgstr "Erro ao gravar nota." -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "Introduza o nome do utilizador para subscrever" -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "Subscreveu %s" -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "Introduza o nome do utilizador para deixar de subscrever" -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "Deixou de subscrever %s" -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "Comando ainda não implementado." -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "Notificação desligada." -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "Não foi possível desligar a notificação." -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "Notificação ligada." -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "Não foi possível ligar a notificação." -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "Comando para iniciar sessão foi desactivado" -#: lib/command.php:604 +#: lib/command.php:663 #, php-format msgid "Could not create login token for %s" msgstr "Não foi possível criar a chave de entrada para %s" -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" "Esta ligação é utilizável uma única vez e só durante os próximos 2 minutos: %" "s" -#: lib/command.php:625 +#: lib/command.php:684 msgid "You are not subscribed to anyone." msgstr "Não subscreveu ninguém." -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Subscreve esta pessoa:" msgstr[1] "Subscreve estas pessoas:" -#: lib/command.php:647 +#: lib/command.php:706 msgid "No one is subscribed to you." msgstr "Ninguém subscreve as suas notas." -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Esta pessoa subscreve as suas notas:" msgstr[1] "Estas pessoas subscrevem as suas notas:" -#: lib/command.php:669 +#: lib/command.php:728 msgid "You are not a member of any groups." msgstr "Não está em nenhum grupo." -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Está no grupo:" msgstr[1] "Está nos grupos:" -#: lib/command.php:685 +#: lib/command.php:744 +#, fuzzy msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4505,6 +4592,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -5076,7 +5165,7 @@ msgstr "" "conversas com outros utilizadores. Outros podem enviar-lhe mensagens, a que " "só você terá acesso." -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 msgid "from" msgstr "de" @@ -5165,40 +5254,40 @@ msgstr "Anexar" msgid "Attach a file" msgstr "Anexar um ficheiro" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "N" msgstr "N" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "S" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "E" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "O" -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "coords." -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 msgid "in context" msgstr "em contexto" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 msgid "Reply to this notice" msgstr "Responder a esta nota" -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 msgid "Reply" msgstr "Responder" @@ -5327,6 +5416,16 @@ msgstr "Destaques" msgid "Popular" msgstr "Populares" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "Responder a esta nota" + +#: lib/repeatform.php:132 +#, fuzzy +msgid "Repeat" +msgstr "Reiniciar" + #: lib/sandboxform.php:67 msgid "Sandbox" msgstr "Impedir notas públicas" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index eb81de65f6..6fd338fcf1 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:10:21+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:16:14+0000\n" "Language-Team: Brazilian Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt-br\n" "X-Message-Group: out-statusnet\n" @@ -45,9 +45,9 @@ msgstr "Essa página não existe." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Usuário não encontrado." @@ -131,7 +131,8 @@ msgstr "O método da API não foi encontrado!" #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Este método requer um POST." @@ -226,11 +227,14 @@ msgstr "Todas as mensagens diretas enviadas para %s" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "O método da API não foi encontrado!" @@ -428,6 +432,21 @@ msgstr "Este método requer POSTAGEM ou EXCLUSÃO." msgid "You may not delete another user's status." msgstr "Você não pode apagar o status de outro usuário." +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "Essa mensagem não existe." + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Não é possível ligar a notificação." + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Excluir esta mensagem" + #: actions/apistatusesshow.php:138 msgid "Status deleted." msgstr "" @@ -498,6 +517,21 @@ msgstr "Mensagens públicas de %s" msgid "%s updates from everyone!" msgstr "%s atualizações de todo mundo!" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, fuzzy, php-format +msgid "Repeated to %s" +msgstr "Respostas para %s" + +#: actions/apitimelineretweetsofme.php:112 +#, fuzzy, php-format +msgid "Repeats of %s" +msgstr "Respostas para %s" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -561,7 +595,7 @@ msgid "Preview" msgstr "Visualização" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 msgid "Delete" msgstr "Excluir" @@ -582,9 +616,10 @@ msgstr "Cortar" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "" "Ocorreu um problema com o seu token de sessão. Tente novamente, por favor." @@ -791,7 +826,7 @@ msgstr "Você tem certeza que deseja excluir esta mensagem?" msgid "Do not delete this notice" msgstr "Não é possível excluir esta mensagem." -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 msgid "Delete this notice" msgstr "Excluir esta mensagem" @@ -1596,7 +1631,7 @@ msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." msgstr "" -"Endereço de Jabber ou GTalk, ex: \"usuario@exemplo.org\". Primeiro, " +"Endereço de Jabber ou GTalk, ex: \"usuario@example.org\". Primeiro, " "certifique-se de adicionar %s à sua lista de contatos no seu cliente de IM " "ou no GTalk." @@ -1962,7 +1997,7 @@ msgid "You can't send a message to this user." msgstr "Você não pode enviar uma mensagem para esse usuário." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "Nenhum conteúdo!" @@ -2073,8 +2108,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "Formato de dados não suportado." @@ -2881,6 +2916,36 @@ msgstr "Esse é um perfil local! Autentique-se para assinar." msgid "Couldn’t get a request token." msgstr "Não foi possível obter um token de requisição." +#: actions/repeat.php:57 +#, fuzzy +msgid "Only logged-in users can repeat notices." +msgstr "As caixas postais são legíveis somente pelo seu próprio usuário." + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "Não foi especificado nenhum perfil." + +#: actions/repeat.php:76 +#, fuzzy +msgid "You can't repeat your own notice." +msgstr "Você não pode se registrar se não aceitar a licença." + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "Você já bloqueou esse usuário." + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "Criar" + +#: actions/repeat.php:115 +#, fuzzy +msgid "Repeated!" +msgstr "Criar" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -3193,6 +3258,11 @@ msgstr "" "Este é %%site.name%%, um serviço de [micro-blogging](http://pt.wikipedia.org/" "wiki/Microblogging)" +#: actions/showstream.php:313 +#, fuzzy, php-format +msgid "Repeat of %s" +msgstr "Respostas para %s" + #: actions/silence.php:65 actions/unsilence.php:65 #, fuzzy msgid "You cannot silence users on this site." @@ -4025,28 +4095,28 @@ msgstr "Não foi possível inserir a mensagem." msgid "Could not update message with new URI." msgstr "Não foi possível atualizar a mensagem com a nova URI." -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Erro no banco de dados durante a inserção de hashtag: %s" -#: classes/Notice.php:188 +#: classes/Notice.php:196 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Problema ao salvar a mensagem." -#: classes/Notice.php:192 +#: classes/Notice.php:200 msgid "Problem saving notice. Unknown user." msgstr "Problema no salvamento da mensagem. Usuário desconhecido." -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Muitas mensagens em um período curto de tempo; dê uma respirada e publique " "novamente daqui a alguns minutos." -#: classes/Notice.php:203 +#: classes/Notice.php:211 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4055,19 +4125,24 @@ msgstr "" "Muitas mensagens em um período curto de tempo; dê uma respirada e publique " "novamente daqui a alguns minutos." -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "Você foi banido de publicar mensagens nesse site." -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "Problema ao salvar a mensagem." -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "Erro no banco de dados na inserção da reposta: %s" +#: classes/Notice.php:1320 +#, fuzzy, php-format +msgid "RT @%1$s %2$s" +msgstr "%1$s (%2$s)" + #: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" @@ -4286,19 +4361,19 @@ msgstr "Todas" msgid "license." msgstr "licença" -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "Paginação" -#: lib/action.php:1077 +#: lib/action.php:1107 msgid "After" msgstr "Próximo" -#: lib/action.php:1085 +#: lib/action.php:1115 msgid "Before" msgstr "Anterior" -#: lib/action.php:1133 +#: lib/action.php:1163 msgid "There was a problem with your session token." msgstr "" "Ocorreu um problema com o seu token de sessão. Tente novamente, por favor." @@ -4398,11 +4473,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "O usuário não tem uma \"última mensagem\"" @@ -4445,108 +4521,118 @@ msgstr "" msgid "Error sending direct message." msgstr "Ocorreu um erro durante o envio da mensagem direta." -#: lib/command.php:431 +#: lib/command.php:434 +#, fuzzy, php-format +msgid "Notice from %s repeated" +msgstr "Mensagem publicada" + +#: lib/command.php:436 +#, fuzzy +msgid "Error repeating notice." +msgstr "Problema ao salvar a mensagem." + +#: lib/command.php:490 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" "A mensagem é muito extensa - o máximo são 140 caracteres e você enviou %d" -#: lib/command.php:440 +#: lib/command.php:499 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Responder a esta mensagem" -#: lib/command.php:442 +#: lib/command.php:501 #, fuzzy msgid "Error saving notice." msgstr "Problema ao salvar a mensagem." -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "Especifique o nome do usuário que será assinado" -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "Efetuada a assinatura de %s" -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "Especifique o nome do usuário que deixará de ser assinado" -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "Cancelada a assinatura de %s" -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "O comando não foi implementado ainda." -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "Notificação desligada." -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "Não é possível desligar a notificação" -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "Notificação ligada." -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "Não é possível ligar a notificação." -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "" -#: lib/command.php:604 +#: lib/command.php:663 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Não foi possível criar a favorita." -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:625 +#: lib/command.php:684 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Você não está assinando esse perfil." -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Você já está assinando esses usuários:" msgstr[1] "Você já está assinando esses usuários:" -#: lib/command.php:647 +#: lib/command.php:706 #, fuzzy msgid "No one is subscribed to you." msgstr "Não foi possível fazer com que o outros o sigam." -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Não foi possível fazer com que o outros o sigam." msgstr[1] "Não foi possível fazer com que o outros o sigam." -#: lib/command.php:669 +#: lib/command.php:728 #, fuzzy msgid "You are not a member of any groups." msgstr "Você não está assinando esse perfil." -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Você não é membro deste grupo." msgstr[1] "Você não é membro deste grupo." -#: lib/command.php:685 +#: lib/command.php:744 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4562,6 +4648,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -5029,7 +5117,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 #, fuzzy msgid "from" msgstr " de " @@ -5116,42 +5204,42 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 #, fuzzy msgid "N" msgstr "Não" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "" -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 #, fuzzy msgid "in context" msgstr "Nenhum conteúdo!" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 msgid "Reply to this notice" msgstr "Responder a esta mensagem" -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 msgid "Reply" msgstr "Responder" @@ -5285,6 +5373,16 @@ msgstr "Destacada" msgid "Popular" msgstr "Popular" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "Responder a esta mensagem" + +#: lib/repeatform.php:132 +#, fuzzy +msgid "Repeat" +msgstr "Restaurar" + #: lib/sandboxform.php:67 #, fuzzy msgid "Sandbox" diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index b8ed5d97a6..5259ec4b7a 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:10:25+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:16:17+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ru\n" "X-Message-Group: out-statusnet\n" @@ -46,9 +46,9 @@ msgstr "Нет такой страницы" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Нет такого пользователя." @@ -138,7 +138,8 @@ msgstr "Метод API не найден." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Этот метод требует POST." @@ -230,11 +231,14 @@ msgstr "Все прямые сообщения посланные для %s" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "Метод API не найден!" @@ -433,6 +437,21 @@ msgstr "Этот метод требует POST или DELETE." msgid "You may not delete another user's status." msgstr "Вы не можете удалять статус других пользователей." +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "Нет такой записи." + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Есть оповещение." + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Удалить эту запись" + #: actions/apistatusesshow.php:138 msgid "Status deleted." msgstr "Статус удалён." @@ -502,6 +521,21 @@ msgstr "Общая лента %s" msgid "%s updates from everyone!" msgstr "Обновления %s от всех!" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, fuzzy, php-format +msgid "Repeated to %s" +msgstr "Ответы для %s" + +#: actions/apitimelineretweetsofme.php:112 +#, fuzzy, php-format +msgid "Repeats of %s" +msgstr "Ответы для %s" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -565,7 +599,7 @@ msgid "Preview" msgstr "Просмотр" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 msgid "Delete" msgstr "Удалить" @@ -586,9 +620,10 @@ msgstr "Обрезать" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "Проблема с Вашей сессией. Попробуйте ещё раз, пожалуйста." @@ -792,7 +827,7 @@ msgstr "Вы уверены, что хотите удалить эту запи msgid "Do not delete this notice" msgstr "Не удалять эту запись" -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 msgid "Delete this notice" msgstr "Удалить эту запись" @@ -1936,7 +1971,7 @@ msgid "You can't send a message to this user." msgstr "Вы не можете послать сообщение этому пользователю." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "Нет контента!" @@ -2048,8 +2083,8 @@ msgstr "тип содержимого " msgid "Only " msgstr "Только " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "Неподдерживаемый формат данных." @@ -2846,6 +2881,38 @@ msgstr "Это локальный профиль! Авторизуйтесь д msgid "Couldn’t get a request token." msgstr "Не удаётся получить получить ключ запроса." +#: actions/repeat.php:57 +#, fuzzy +msgid "Only logged-in users can repeat notices." +msgstr "Только сам пользователь может читать собственный почтовый ящик." + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "Профиль не определен." + +#: actions/repeat.php:76 +#, fuzzy +msgid "You can't repeat your own notice." +msgstr "" +"Вы не можете зарегистрироваться, если Вы не подтверждаете лицензионного " +"соглашения." + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "Вы уже заблокировали этого пользователя." + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "Создано" + +#: actions/repeat.php:115 +#, fuzzy +msgid "Repeated!" +msgstr "Создано" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -3182,6 +3249,11 @@ msgstr "" "использованием свободного программного обеспечения [StatusNet](http://status." "net/)." +#: actions/showstream.php:313 +#, fuzzy, php-format +msgid "Repeat of %s" +msgstr "Ответы для %s" + #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." msgstr "Вы не можете заглушать пользователей на этом сайте." @@ -3999,27 +4071,27 @@ msgstr "Не удаётся вставить сообщение." msgid "Could not update message with new URI." msgstr "Не удаётся обновить сообщение с новым URI." -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Ошибка баз данных при вставке хеш-тегов для %s" -#: classes/Notice.php:188 +#: classes/Notice.php:196 msgid "Problem saving notice. Too long." msgstr "Проблемы с сохранением записи. Слишком длинно." -#: classes/Notice.php:192 +#: classes/Notice.php:200 msgid "Problem saving notice. Unknown user." msgstr "Проблема при сохранении записи. Неизвестный пользователь." -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Слишком много записей за столь короткий срок; передохните немного и " "попробуйте вновь через пару минут." -#: classes/Notice.php:203 +#: classes/Notice.php:211 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4027,19 +4099,24 @@ msgstr "" "Слишком много одинаковых записей за столь короткий срок; передохните немного " "и попробуйте вновь через пару минут." -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "Вам запрещено поститься на этом сайте (бан)" -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "Проблемы с сохранением записи." -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "Ошибка баз данных при вставке ответа для %s" +#: classes/Notice.php:1320 +#, fuzzy, php-format +msgid "RT @%1$s %2$s" +msgstr "%1$s (%2$s)" + #: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" @@ -4249,19 +4326,19 @@ msgstr "All " msgid "license." msgstr "license." -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "Разбиение на страницы" -#: lib/action.php:1077 +#: lib/action.php:1107 msgid "After" msgstr "Сюда" -#: lib/action.php:1085 +#: lib/action.php:1115 msgid "Before" msgstr "Туда" -#: lib/action.php:1133 +#: lib/action.php:1163 msgid "There was a problem with your session token." msgstr "Проблема с Вашей сессией. Попробуйте ещё раз, пожалуйста." @@ -4354,11 +4431,12 @@ msgstr "" "Подписчиков: %2$s\n" "Записей: %3$s" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "Записи с таким id не существует" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "У пользователя нет записей" @@ -4400,106 +4478,117 @@ msgstr "Сообщение слишком длинное — не больше % msgid "Error sending direct message." msgstr "Ошибка при отправке прямого сообщения." -#: lib/command.php:431 +#: lib/command.php:434 +#, fuzzy, php-format +msgid "Notice from %s repeated" +msgstr "Запись опубликована" + +#: lib/command.php:436 +#, fuzzy +msgid "Error repeating notice." +msgstr "Проблемы с сохранением записи." + +#: lib/command.php:490 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Запись слишком длинная — не больше %d символов, вы посылаете %d" -#: lib/command.php:440 +#: lib/command.php:499 #, php-format msgid "Reply to %s sent" msgstr "Ответ %s отправлен" -#: lib/command.php:442 +#: lib/command.php:501 msgid "Error saving notice." msgstr "Проблемы с сохранением записи." -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "Определите имя пользователя при подписке на" -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "Подписано на %s" -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "Определите имя пользователя для отписки от" -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "Отписано от %s" -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "Команда ещё не выполнена." -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "Оповещение отсутствует." -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "Нет оповещения." -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "Есть оповещение." -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "Есть оповещение." -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "Команда входа отключена" -#: lib/command.php:604 +#: lib/command.php:663 #, php-format msgid "Could not create login token for %s" msgstr "Не удаётся создать токен входа для %s" -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "Эта ссылка действительна только один раз в течение 2 минут: %s" -#: lib/command.php:625 +#: lib/command.php:684 msgid "You are not subscribed to anyone." msgstr "Вы ни на кого не подписаны." -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Вы подписаны на этих людей:" msgstr[1] "Вы подписаны на этих людей:" msgstr[2] "Вы подписаны на этих людей:" -#: lib/command.php:647 +#: lib/command.php:706 msgid "No one is subscribed to you." msgstr "Никто не подписан на вас." -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Эти люди подписались на вас:" msgstr[1] "Эти люди подписались на вас:" msgstr[2] "Эти люди подписались на вас:" -#: lib/command.php:669 +#: lib/command.php:728 msgid "You are not a member of any groups." msgstr "Вы не состоите ни в одной группе." -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Вы являетесь участником следующих групп:" msgstr[1] "Вы являетесь участником следующих групп:" msgstr[2] "Вы являетесь участником следующих групп:" -#: lib/command.php:685 +#: lib/command.php:744 +#, fuzzy msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4515,6 +4604,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -5086,7 +5177,7 @@ msgstr "" "вовлечения других пользователей в разговор. Сообщения, получаемые от других " "людей, видите только вы." -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 msgid "from" msgstr "от " @@ -5174,40 +5265,40 @@ msgstr "Прикрепить" msgid "Attach a file" msgstr "Прикрепить файл" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "%1$u°%2$u'%3$u\" %4$s %5$u°%6$u'%7$u\" %8$s" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "N" msgstr "с. ш." -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "ю. ш." -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "в. д." -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "з. д." -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "на" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 msgid "in context" msgstr "в контексте" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 msgid "Reply to this notice" msgstr "Ответить на эту запись" -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 msgid "Reply" msgstr "Ответить" @@ -5336,6 +5427,16 @@ msgstr "Особые" msgid "Popular" msgstr "Популярное" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "Ответить на эту запись" + +#: lib/repeatform.php:132 +#, fuzzy +msgid "Repeat" +msgstr "Сбросить" + #: lib/sandboxform.php:67 msgid "Sandbox" msgstr "Песочница" diff --git a/locale/statusnet.po b/locale/statusnet.po index 50510715f6..29961af940 100644 --- a/locale/statusnet.po +++ b/locale/statusnet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-12 17:09+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -41,9 +41,9 @@ msgstr "" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "" @@ -126,7 +126,8 @@ msgstr "" #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" @@ -216,11 +217,14 @@ msgstr "" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "" @@ -412,6 +416,18 @@ msgstr "" msgid "You may not delete another user's status." msgstr "" +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +msgid "No such notice" +msgstr "" + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +msgid "Cannot repeat your own notice" +msgstr "" + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +msgid "Already repeated that notice" +msgstr "" + #: actions/apistatusesshow.php:138 msgid "Status deleted." msgstr "" @@ -481,6 +497,21 @@ msgstr "" msgid "%s updates from everyone!" msgstr "" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, php-format +msgid "Repeated to %s" +msgstr "" + +#: actions/apitimelineretweetsofme.php:112 +#, php-format +msgid "Repeats of %s" +msgstr "" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -543,7 +574,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 msgid "Delete" msgstr "" @@ -564,9 +595,10 @@ msgstr "" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "" @@ -765,7 +797,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "" -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 msgid "Delete this notice" msgstr "" @@ -1817,7 +1849,7 @@ msgid "You can't send a message to this user." msgstr "" #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "" @@ -1921,8 +1953,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "" @@ -2667,6 +2699,30 @@ msgstr "" msgid "Couldn’t get a request token." msgstr "" +#: actions/repeat.php:57 +msgid "Only logged-in users can repeat notices." +msgstr "" + +#: actions/repeat.php:64 actions/repeat.php:71 +msgid "No notice specified." +msgstr "" + +#: actions/repeat.php:76 +msgid "You can't repeat your own notice." +msgstr "" + +#: actions/repeat.php:90 +msgid "You already repeated that notice." +msgstr "" + +#: actions/repeat.php:112 lib/noticelist.php:628 +msgid "Repeated" +msgstr "" + +#: actions/repeat.php:115 +msgid "Repeated!" +msgstr "" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -2965,6 +3021,11 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" +#: actions/showstream.php:313 +#, php-format +msgid "Repeat of %s" +msgstr "" + #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." msgstr "" @@ -3740,43 +3801,48 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:188 +#: classes/Notice.php:196 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:192 +#: classes/Notice.php:200 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:203 +#: classes/Notice.php:211 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "" +#: classes/Notice.php:1320 +#, php-format +msgid "RT @%1$s %2$s" +msgstr "" + #: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" @@ -3980,19 +4046,19 @@ msgstr "" msgid "license." msgstr "" -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "" -#: lib/action.php:1077 +#: lib/action.php:1107 msgid "After" msgstr "" -#: lib/action.php:1085 +#: lib/action.php:1115 msgid "Before" msgstr "" -#: lib/action.php:1133 +#: lib/action.php:1163 msgid "There was a problem with your session token." msgstr "" @@ -4082,11 +4148,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "" @@ -4128,103 +4195,112 @@ msgstr "" msgid "Error sending direct message." msgstr "" -#: lib/command.php:431 +#: lib/command.php:434 +#, php-format +msgid "Notice from %s repeated" +msgstr "" + +#: lib/command.php:436 +msgid "Error repeating notice." +msgstr "" + +#: lib/command.php:490 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:440 +#: lib/command.php:499 #, php-format msgid "Reply to %s sent" msgstr "" -#: lib/command.php:442 +#: lib/command.php:501 msgid "Error saving notice." msgstr "" -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "" -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "" -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "" -#: lib/command.php:604 +#: lib/command.php:663 #, php-format msgid "Could not create login token for %s" msgstr "" -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:625 +#: lib/command.php:684 msgid "You are not subscribed to anyone." msgstr "" -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:647 +#: lib/command.php:706 msgid "No one is subscribed to you." msgstr "" -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:669 +#: lib/command.php:728 msgid "You are not a member of any groups." msgstr "" -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:685 +#: lib/command.php:744 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4240,6 +4316,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -4684,7 +4762,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 msgid "from" msgstr "" @@ -4769,40 +4847,40 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "N" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "" -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 msgid "in context" msgstr "" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 msgid "Reply" msgstr "" @@ -4931,6 +5009,14 @@ msgstr "" msgid "Popular" msgstr "" +#: lib/repeatform.php:107 lib/repeatform.php:132 +msgid "Repeat this notice" +msgstr "" + +#: lib/repeatform.php:132 +msgid "Repeat" +msgstr "" + #: lib/sandboxform.php:67 msgid "Sandbox" msgstr "" diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index 60e4f72011..cede511a06 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: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:10:28+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:16:20+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: sv\n" "X-Message-Group: out-statusnet\n" @@ -44,9 +44,9 @@ msgstr "Ingen sådan sida" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Ingen sådan användare." @@ -136,7 +136,8 @@ msgstr "API-metoden hittades inte" #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Denna metod kräver en POST." @@ -228,11 +229,14 @@ msgstr "Alla direktmeddelanden skickade till %s" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "API-metoden hittades inte!" @@ -425,6 +429,21 @@ msgstr "Denna metod kräver en POST eller en DELETE." msgid "You may not delete another user's status." msgstr "Du kan inte ta bort en annan användares status." +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "Ingen sådan notis." + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Kan inte stänga av notifikation." + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Ta bort denna notis" + #: actions/apistatusesshow.php:138 msgid "Status deleted." msgstr "Status borttagen." @@ -494,6 +513,21 @@ msgstr "%s publika tidslinje" msgid "%s updates from everyone!" msgstr "%s uppdateringar från alla!" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, fuzzy, php-format +msgid "Repeated to %s" +msgstr "Svarat på %s" + +#: actions/apitimelineretweetsofme.php:112 +#, fuzzy, php-format +msgid "Repeats of %s" +msgstr "Svarat på %s" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -557,7 +591,7 @@ msgid "Preview" msgstr "Förhandsgranska" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 msgid "Delete" msgstr "Ta bort" @@ -578,9 +612,10 @@ msgstr "Beskär" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "Det var ett problem med din sessions-token. Var vänlig försök igen." @@ -785,7 +820,7 @@ msgstr "Är du säker på att du vill ta bort denna notis?" msgid "Do not delete this notice" msgstr "Ta inte bort denna notis" -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 msgid "Delete this notice" msgstr "Ta bort denna notis" @@ -1218,17 +1253,17 @@ msgstr "Uppdateringar markerade som favorit av %1$s på %2$s!" #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" -msgstr "" +msgstr "Profilerade användare" #: actions/featured.php:71 #, php-format msgid "Featured users, page %d" -msgstr "" +msgstr "Profilerade användare, sida %d" #: actions/featured.php:99 #, php-format msgid "A selection of some of the great users on %s" -msgstr "" +msgstr "Ett urval av några av de stora användarna på% s" #: actions/file.php:34 msgid "No notice id" @@ -1563,8 +1598,8 @@ msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." msgstr "" -"Jabber- eller GTalk-adress liknande \"användare@exempel.se\". Se först till " -"att lägga till %s i din kompislista i din IM-klient eller hos GTalk." +"Jabber- eller GTalk-adress liknande \"användarnamn@example.org\". Se först " +"till att lägga till %s i din kompislista i din IM-klient eller hos GTalk." #: actions/imsettings.php:143 msgid "Send me notices through Jabber/GTalk." @@ -1890,7 +1925,7 @@ msgid "You can't send a message to this user." msgstr "Du kan inte skicka ett meddelande till den användaren." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "Inget innehåll!" @@ -2004,8 +2039,8 @@ msgstr "innehållstyp " msgid "Only " msgstr "Bara " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "Ett dataformat som inte stödjs" @@ -2791,6 +2826,36 @@ msgstr "Det där är en lokal profil! Logga in för att prenumerera." msgid "Couldn’t get a request token." msgstr "Kunde inte få en förfrågnings-token." +#: actions/repeat.php:57 +#, fuzzy +msgid "Only logged-in users can repeat notices." +msgstr "Bara användaren kan läsa sina egna brevlådor." + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "Ingen profil angiven." + +#: actions/repeat.php:76 +#, fuzzy +msgid "You can't repeat your own notice." +msgstr "Du kan inte registrera dig om du inte godkänner licensen." + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "Du har redan blockerat denna användare." + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "Skapad" + +#: actions/repeat.php:115 +#, fuzzy +msgid "Repeated!" +msgstr "Skapad" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -3117,6 +3182,11 @@ msgstr "" "wikipedia.org/wiki/Micro-blogging)-tjänst baserad på den fria programvaran " "[StatusNet](http://status.net/). " +#: actions/showstream.php:313 +#, fuzzy, php-format +msgid "Repeat of %s" +msgstr "Svarat på %s" + #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." msgstr "Du kan inte tysta ned användare på denna webbplats." @@ -3929,27 +3999,27 @@ msgstr "Kunde inte infoga meddelande." msgid "Could not update message with new URI." msgstr "Kunde inte uppdatera meddelande med ny URI." -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Databasfel vid infogning av hashtag: %s" -#: classes/Notice.php:188 +#: classes/Notice.php:196 msgid "Problem saving notice. Too long." msgstr "Problem vid sparande av notis. För långt." -#: classes/Notice.php:192 +#: classes/Notice.php:200 msgid "Problem saving notice. Unknown user." msgstr "Problem vid sparande av notis. Okänd användare." -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "För många notiser för snabbt; ta en vilopaus och posta igen om ett par " "minuter." -#: classes/Notice.php:203 +#: classes/Notice.php:211 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -3957,19 +4027,24 @@ msgstr "" "För många duplicerade meddelanden för snabbt; ta en vilopaus och posta igen " "om ett par minuter." -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "Du är utestängd från att posta notiser på denna webbplats." -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "Problem med att spara notis." -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "Databasfel vid infogning av svar: %s" +#: classes/Notice.php:1320 +#, php-format +msgid "RT @%1$s %2$s" +msgstr "" + #: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" @@ -4178,19 +4253,19 @@ msgstr "Alla " msgid "license." msgstr "licens." -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "Numrering av sidor" -#: lib/action.php:1077 +#: lib/action.php:1107 msgid "After" msgstr "Senare" -#: lib/action.php:1085 +#: lib/action.php:1115 msgid "Before" msgstr "Tidigare" -#: lib/action.php:1133 +#: lib/action.php:1163 msgid "There was a problem with your session token." msgstr "Det var ett problem med din sessions-token." @@ -4283,11 +4358,12 @@ msgstr "" "Prenumeranter: %2$s\n" "Notiser: %3$s" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "Notis med den ID:n finns inte" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "Användare har ingen sista notis" @@ -4329,103 +4405,114 @@ msgstr "Meddelande för långt - maximum är %d tecken, du skickade %d" msgid "Error sending direct message." msgstr "Fel vid sändning av direktmeddelande." -#: lib/command.php:431 +#: lib/command.php:434 +#, fuzzy, php-format +msgid "Notice from %s repeated" +msgstr "Notis postad" + +#: lib/command.php:436 +#, fuzzy +msgid "Error repeating notice." +msgstr "Fel vid sparande av notis." + +#: lib/command.php:490 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Notis för långt - maximum är %d tecken, du skickade %d" -#: lib/command.php:440 +#: lib/command.php:499 #, php-format msgid "Reply to %s sent" msgstr "Svar på %s skickat" -#: lib/command.php:442 +#: lib/command.php:501 msgid "Error saving notice." msgstr "Fel vid sparande av notis." -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "Ange namnet på användaren att prenumerara på" -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "Prenumerar på %s" -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "Ange namnet på användaren att avsluta prenumeration på" -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "Prenumeration hos %s avslutad" -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "Kommando inte implementerat än." -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "Notifikation av." -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "Kan inte sätta på notifikation." -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "Notifikation på." -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "Kan inte stänga av notifikation." -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" -msgstr "" +msgstr "Inloggningskommando är inaktiverat" -#: lib/command.php:604 +#: lib/command.php:663 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Kunde inte skapa alias." -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" +"Denna länk är endast användbar en gång, och gäller bara i 2 minuter: %s" -#: lib/command.php:625 +#: lib/command.php:684 msgid "You are not subscribed to anyone." msgstr "Du prenumererar inte på någon." -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Du prenumererar på denna person:" msgstr[1] "Du prenumererar på dessa personer:" -#: lib/command.php:647 +#: lib/command.php:706 msgid "No one is subscribed to you." msgstr "Ingen prenumerar på dig." -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Denna person prenumererar på dig:" msgstr[1] "Dessa personer prenumererar på dig:" -#: lib/command.php:669 +#: lib/command.php:728 msgid "You are not a member of any groups." msgstr "Du är inte medlem i några grupper." -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Du är en medlem i denna grupp:" msgstr[1] "Du är en medlem i dessa grupper:" -#: lib/command.php:685 +#: lib/command.php:744 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4441,6 +4528,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -4900,7 +4989,7 @@ msgstr "" "engagera andra användare i konversationen. Folk kan skicka meddelanden till " "dig som bara du ser." -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 msgid "from" msgstr "från" @@ -4989,40 +5078,40 @@ msgstr "Bifoga" msgid "Attach a file" msgstr "Bifoga en fil" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, 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:404 +#: lib/noticelist.php:420 msgid "N" msgstr "N" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "S" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "Ö" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "V" -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "på" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 msgid "in context" msgstr "i sammanhang" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 msgid "Reply to this notice" msgstr "Svara på detta inlägg" -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 msgid "Reply" msgstr "Svara" @@ -5145,12 +5234,22 @@ msgstr "Senaste taggar" #: lib/publicgroupnav.php:88 msgid "Featured" -msgstr "" +msgstr "Profilerade" #: lib/publicgroupnav.php:92 msgid "Popular" msgstr "Populärt" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "Svara på detta inlägg" + +#: lib/repeatform.php:132 +#, fuzzy +msgid "Repeat" +msgstr "Återställ" + #: lib/sandboxform.php:67 #, fuzzy msgid "Sandbox" @@ -5321,8 +5420,9 @@ msgid "Message" msgstr "Meddelande" #: lib/userprofile.php:311 +#, fuzzy msgid "Moderate" -msgstr "" +msgstr "Moderera" #: lib/util.php:825 msgid "a few seconds ago" diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index c3b2dd169d..c69b8dbf0d 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:10:31+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:16:23+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: te\n" "X-Message-Group: out-statusnet\n" @@ -43,9 +43,9 @@ msgstr "అటువంటి పేజీ లేదు" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "అటువంటి వాడుకరి లేరు." @@ -86,7 +86,7 @@ msgstr "ఇది %s మరియు మిత్రుల కాలరేఖ msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " "something yourself." -msgstr "" +msgstr "ఇతరులకి చందా చేరండి, [ఏదైనా గుంపులో చేరండి](%%action.groups%%) లేదా మీరే ఏదైనా వ్రాయండి." #: actions/all.php:134 #, php-format @@ -129,7 +129,8 @@ msgstr "నిర్ధారణ సంకేతం కనబడలేదు." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" @@ -183,9 +184,8 @@ msgid "Could not update your design." msgstr "వాడుకరిని తాజాకరించలేకున్నాం." #: actions/apiblockcreate.php:105 -#, fuzzy msgid "You cannot block yourself!" -msgstr "వాడుకరిని తాజాకరించలేకున్నాం." +msgstr "మిమ్మల్ని మీరే నిరోధించుకోలేరు!" #: actions/apiblockcreate.php:119 msgid "Block user failed." @@ -223,11 +223,14 @@ msgstr "" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "" @@ -422,6 +425,20 @@ msgstr "" msgid "You may not delete another user's status." msgstr "ఇతర వాడుకరుల స్థితిని మీరు తొలగించలేరు." +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "అటువంటి సందేశమేమీ లేదు." + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +msgid "Cannot repeat your own notice" +msgstr "" + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "ఈ నోటీసుని తొలగించు" + #: actions/apistatusesshow.php:138 msgid "Status deleted." msgstr "స్థితిని తొలగించాం." @@ -491,6 +508,21 @@ msgstr "%s బహిరంగ కాలరేఖ" msgid "%s updates from everyone!" msgstr "" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, fuzzy, php-format +msgid "Repeated to %s" +msgstr "%sకి స్పందనలు" + +#: actions/apitimelineretweetsofme.php:112 +#, fuzzy, php-format +msgid "Repeats of %s" +msgstr "%sకి స్పందనలు" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -530,7 +562,7 @@ msgstr "అవతారం" #: actions/avatarsettings.php:78 #, php-format msgid "You can upload your personal avatar. The maximum file size is %s." -msgstr "" +msgstr "మీ వ్యక్తిగత అవతారాన్ని మీరు ఎక్కించవచ్చు. గరిష్ఠ ఫైలు పరిమాణం %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 @@ -554,7 +586,7 @@ msgid "Preview" msgstr "మునుజూపు" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 msgid "Delete" msgstr "తొలగించు" @@ -575,9 +607,10 @@ msgstr "కత్తిరించు" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "" @@ -590,7 +623,7 @@ msgstr "" #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" -msgstr "" +msgstr "మీ అవతారానికి గానూ ఈ చిత్రం నుండి ఒక చతురస్రపు ప్రదేశాన్ని ఎంచుకోండి" #: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." @@ -765,7 +798,7 @@ msgstr "ఈ నోటీసుని తొలగించలేము." msgid "" "You are about to permanently delete a notice. Once this is done, it cannot " "be undone." -msgstr "" +msgstr "మీరు ఒక నోటీసుని శాశ్వతంగా తొలగించబోతున్నారు. ఇది ఒక్కసారి పూర్తయితే, దాన్నిక వెనక్కి తేలేరు." #: actions/deletenotice.php:109 actions/deletenotice.php:141 msgid "Delete notice" @@ -780,7 +813,7 @@ msgstr "మీరు నిజంగానే ఈ నోటీసుని త msgid "Do not delete this notice" msgstr "ఈ నోటీసుని తొలగించలేము." -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 msgid "Delete this notice" msgstr "ఈ నోటీసుని తొలగించు" @@ -789,14 +822,12 @@ msgid "There was a problem with your session token. Try again, please." msgstr "" #: actions/deleteuser.php:67 -#, fuzzy msgid "You cannot delete users." -msgstr "వాడుకరిని తాజాకరించలేకున్నాం." +msgstr "మీరు వాడుకరులని తొలగించలేరు." #: actions/deleteuser.php:74 -#, fuzzy msgid "You can only delete local users." -msgstr "ఇతర వాడుకరుల స్థితిని మీరు తొలగించలేరు." +msgstr "మీరు స్థానిక వాడుకరులను మాత్రమే తొలగించగలరు." #: actions/deleteuser.php:110 actions/deleteuser.php:133 msgid "Delete user" @@ -807,6 +838,8 @@ msgid "" "Are you sure you want to delete this user? This will clear all data about " "the user from the database, without a backup." msgstr "" +"మీరు నిజంగానే ఈ వాడుకరిని తొలగించాలనుకుంటున్నారా? ఇది ఆ వాడుకరి భోగట్టాని డాటాబేసు నుండి తొలగిస్తుంది, " +"వెనక్కి తేలేకుండా." #: actions/deleteuser.php:148 lib/deleteuserform.php:77 msgid "Delete this user" @@ -861,11 +894,11 @@ msgid "Background" msgstr "నేపథ్యం" #: actions/designadminpanel.php:427 -#, fuzzy, php-format +#, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." -msgstr "మీ స్వంత నేపథ్యపు చిత్రాన్ని మీరు ఎక్కించవచ్చు. గరిష్ఠ ఫైలు పరిమాణం 2మెబై." +msgstr "సైటుకి మీరు నేపథ్యపు చిత్రాన్ని ఎక్కించవచ్చు. గరిష్ఠ ఫైలు పరిమాణం %1$s." #: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" @@ -948,16 +981,16 @@ msgstr "%s గుంపుని మార్చు" #: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65 msgid "You must be logged in to create a group." -msgstr "" +msgstr "గుంపుని సృష్టించడానికి మీరు లోనికి ప్రవేశించాలి." #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 msgid "You must be an admin to edit the group" -msgstr "" +msgstr "గుంపుని మార్చడానికి మీరు నిర్వాహకులయి ఉండాలి." #: actions/editgroup.php:154 msgid "Use this form to edit the group." -msgstr "" +msgstr "గుంపుని మార్చడానికి ఈ ఫారాన్ని ఉపయోగించండి." #: actions/editgroup.php:201 actions/newgroup.php:145 #, php-format @@ -965,9 +998,8 @@ msgid "description is too long (max %d chars)." msgstr "వివరణ చాలా పెద్దదిగా ఉంది (140 అక్షరాలు గరిష్ఠం)." #: actions/editgroup.php:253 -#, fuzzy msgid "Could not update group." -msgstr "వాడుకరిని తాజాకరించలేకున్నాం." +msgstr "గుంపుని తాజాకరించలేకున్నాం." #: actions/editgroup.php:259 classes/User_group.php:390 msgid "Could not create aliases." @@ -993,7 +1025,7 @@ msgstr "చిరునామా" #: actions/emailsettings.php:105 msgid "Current confirmed email address." -msgstr "" +msgstr "ప్రస్తుత నిర్ధారిత ఈమెయిలు చిరునామా." #: actions/emailsettings.php:107 actions/emailsettings.php:140 #: actions/imsettings.php:108 actions/smssettings.php:115 @@ -1170,7 +1202,7 @@ msgstr "ప్రాచుర్య నోటీసులు, పేజీ %d" #: actions/favorited.php:79 msgid "The most popular notices on the site right now." -msgstr "" +msgstr "ప్రస్తుతం ఈ సైటులో అత్యంత ప్రాచుర్య నోటీసులు." #: actions/favorited.php:150 msgid "Favorite notices appear on this page but no one has favorited one yet." @@ -1420,7 +1452,7 @@ msgstr "నిర్వాహకున్ని చేయి" #: actions/groupmembers.php:473 msgid "Make this user an admin" -msgstr "" +msgstr "ఈ వాడుకరిని నిర్వాహకున్ని చేయి" #: actions/grouprss.php:133 #, fuzzy, php-format @@ -1452,13 +1484,13 @@ msgid "Create a new group" msgstr "కొత్త గుంపుని సృష్టించు" #: actions/groupsearch.php:52 -#, fuzzy, php-format +#, php-format msgid "" "Search for groups on %%site.name%% by their name, location, or description. " "Separate the terms by spaces; they must be 3 characters or more." msgstr "" -"%%site.name%%లో వ్యక్తులను వారి పేరు, ప్రాంతం, లేదా ఆసక్తులను బట్టి వెతకండి. అన్వేషించే పదాలను " -"ఖాళీలతో వేరుచేయండి; ఒక్కో పదంలో 3 లేదా అంతకంటే ఎక్కువ అక్షరాలు ఉండాలి." +"%%site.name%%లో గుంపులను వాటి పేరు, ప్రాంతం, లేదా వివరణని బట్టి వెతకండి. అన్వేషించే పదాలను ఖాళీలతో " +"వేరుచేయండి; ఒక్కో పదంలో 3 లేదా అంతకంటే ఎక్కువ అక్షరాలు ఉండాలి." #: actions/groupsearch.php:58 msgid "Group search" @@ -1475,6 +1507,7 @@ msgid "" "If you can't find the group you're looking for, you can [create it](%%action." "newgroup%%) yourself." msgstr "" +"మీరు వెతుకున్న గుంపు మీకు కనబడకపోతే, మీరే [దాన్ని సృష్టించవచ్చు](%%action.newgroup%%)." #: actions/groupsearch.php:85 #, php-format @@ -1507,9 +1540,8 @@ msgid "" msgstr "" #: actions/imsettings.php:89 -#, fuzzy msgid "IM is not available." -msgstr "హోమ్ పేజీ URL సరైనది కాదు." +msgstr "IM అందుబాటులో లేదు." #: actions/imsettings.php:106 msgid "Current confirmed Jabber/GTalk address." @@ -1712,7 +1744,7 @@ msgstr "మీరు ఇప్పటికే ఆ గుంపులో సభ #: actions/joingroup.php:128 lib/command.php:234 #, php-format msgid "Could not join user %s to group %s" -msgstr "" +msgstr "వాడుకరి %sని %s గుంపులో చేర్చలేకపోయాం" #: actions/joingroup.php:135 lib/command.php:239 #, php-format @@ -1721,20 +1753,20 @@ msgstr "%s %s గుంపులో చేరారు" #: actions/leavegroup.php:60 msgid "You must be logged in to leave a group." -msgstr "" +msgstr "గుంపుని వదిలివెళ్ళడానికి మీరు ప్రవేశించి ఉండాలి." #: actions/leavegroup.php:90 lib/command.php:268 msgid "You are not a member of that group." -msgstr "" +msgstr "మీరు ఆ గుంపులో సభ్యులు కాదు." #: actions/leavegroup.php:119 lib/command.php:278 msgid "Could not find membership record." msgstr "" #: actions/leavegroup.php:127 lib/command.php:284 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %s to group %s" -msgstr "ఓపెన్ఐడీ ఫారమును సృష్టించలేకపోయాం: %s" +msgstr "వాడుకరి %sని %s గుంపు నుండి తొలగించలేకపోయాం" #: actions/leavegroup.php:134 lib/command.php:289 #, php-format @@ -1765,7 +1797,7 @@ msgstr "ప్రవేశించండి" #: actions/login.php:247 msgid "Login to site" -msgstr "" +msgstr "సైటు లోనికి ప్రవేశించు" #: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 @@ -1803,15 +1835,17 @@ msgid "" "Login with your username and password. Don't have a username yet? [Register]" "(%%action.register%%) a new account." msgstr "" +"మీ వాడుకరిపేరు మరియు సంకేతపదాలతో ప్రవేశించండి. మీకు ఇంకా వాడుకరిపేరు లేదా? కొత్త ఖాతాని [నమోదుచేసుకోండి]" +"(%%action.register%%)." #: actions/makeadmin.php:91 msgid "Only an admin can make another user an admin." -msgstr "" +msgstr "నిర్వాహకులు మాత్రమే మరొక వాడుకరిని నిర్వాహకునిగా చేయగలరు." #: actions/makeadmin.php:95 #, php-format msgid "%s is already an admin for group \"%s\"." -msgstr "" +msgstr "%s ఇప్పటికే \"%s\" గుంపు యొక్క ఒక నిర్వాకులు." #: actions/makeadmin.php:132 #, php-format @@ -1833,7 +1867,7 @@ msgstr "కొత్త గుంపు" #: actions/newgroup.php:110 msgid "Use this form to create a new group." -msgstr "" +msgstr "కొత్త గుంపుని సృష్టిండానికి ఈ ఫారాన్ని ఉపయోగించండి." #: actions/newmessage.php:71 actions/newmessage.php:231 msgid "New message" @@ -1841,10 +1875,10 @@ msgstr "కొత్త సందేశం" #: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 msgid "You can't send a message to this user." -msgstr "" +msgstr "ఈ వాడుకరికి మీరు సందేశాన్ని పంపించలేరు." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "విషయం లేదు!" @@ -1855,7 +1889,7 @@ msgstr "" #: actions/newmessage.php:164 lib/command.php:370 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." -msgstr "" +msgstr "మీకు మీరే సందేశాన్ని పంపుకోకండి; దాని బదులు మీలో మీరే మెల్లగా చెప్పుకోండి." #: actions/newmessage.php:181 msgid "Message sent" @@ -1864,7 +1898,7 @@ msgstr "సందేశాన్ని పంపించాం" #: actions/newmessage.php:185 lib/command.php:375 #, php-format msgid "Direct message to %s sent" -msgstr "" +msgstr "%sకి నేరు సందేశాన్ని పంపించాం" #: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" @@ -1951,8 +1985,8 @@ msgstr "విషయ రకం " msgid "Only " msgstr "మాత్రమే " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "" @@ -1970,7 +2004,7 @@ msgstr "ఇతర అమరికలు" #: actions/othersettings.php:71 msgid "Manage various other options." -msgstr "" +msgstr "వేరే ఇతర ఎంపికలని సంభాళించండి." #: actions/othersettings.php:108 msgid " (free service)" @@ -2050,7 +2084,7 @@ msgstr "మార్చు" #: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." -msgstr "" +msgstr "సంకేతపదం తప్పనిసరిగా 6 లేదా అంతకంటే ఎక్కువ అక్షరాలుండాలి." #: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." @@ -2221,6 +2255,8 @@ msgstr "ఫ్రొఫైలు అమరికలు" msgid "" "You can update your personal profile info here so people know more about you." msgstr "" +"మీ వ్యక్తిగత ప్రవర సమాచారాన్ని ఇక్కడ తాజాకరించండి, అప్పుడు మీ గురించి ప్రజలు ఎక్కువ " +"తెలుసుకోగలుగుతారు." #: actions/profilesettings.php:99 msgid "Profile information" @@ -2465,10 +2501,11 @@ 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 "" +"మీరు మీ సంకేతపదాన్ని మర్చిపోతే, మీ ఖాతాలో నమోదైన ఈమెయిలు చిరునామాకి కొత్త సంకేతపదం వచ్చేలా చేసుకోవచ్చు." #: actions/recoverpassword.php:158 msgid "You have been identified. Enter a new password below. " -msgstr "" +msgstr "మిమ్మల్ని గుర్తించాం. మీ కొత్త సంకేతపదాన్ని క్రింత ఇవ్వండి. " #: actions/recoverpassword.php:188 msgid "Password recovery" @@ -2622,7 +2659,7 @@ msgstr "పొడుగాటి పేరు, మీ \"అసలు\" పేర #: actions/register.php:493 msgid "My text and files are available under " -msgstr "" +msgstr "నా పాఠ్యం మరియు ఫైళ్ళు లభ్యమయ్యే లైసెన్సు " #: actions/register.php:495 msgid "Creative Commons Attribution 3.0" @@ -2713,6 +2750,35 @@ msgstr "" msgid "Couldn’t get a request token." msgstr "" +#: actions/repeat.php:57 +msgid "Only logged-in users can repeat notices." +msgstr "" + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "కొత్త సందేశం" + +#: actions/repeat.php:76 +#, fuzzy +msgid "You can't repeat your own notice." +msgstr "ఈ లైసెన్సుకి అంగీకరించకపోతే మీరు నమోదుచేసుకోలేరు." + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "మీరు ఇప్పటికే ఆ వాడుకరిని నిరోధించారు." + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "సృష్టితం" + +#: actions/repeat.php:115 +#, fuzzy +msgid "Repeated!" +msgstr "సృష్టితం" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -3013,6 +3079,11 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" +#: actions/showstream.php:313 +#, fuzzy, php-format +msgid "Repeat of %s" +msgstr "%sకి స్పందనలు" + #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." msgstr "" @@ -3366,9 +3437,8 @@ msgid "Could not save subscription." msgstr "చందాని సృష్టించలేకపోయాం." #: actions/subscribe.php:55 -#, fuzzy msgid "Not a local user." -msgstr "అటువంటి వాడుకరి లేరు." +msgstr "స్థానిక వాడుకరి కాదు." #: actions/subscribe.php:69 #, fuzzy @@ -3528,9 +3598,8 @@ msgid "API method under construction." msgstr "" #: actions/unblock.php:59 -#, fuzzy msgid "You haven't blocked that user." -msgstr "మీరు ఇప్పటికే ఈ వాడుకరిని నిరోధించారు." +msgstr "మీరు ఆ వాడుకరిని నిరోధించలేదు." #: actions/unsandbox.php:72 #, fuzzy @@ -3778,7 +3847,7 @@ msgstr "%s ఏ గుంపు లోనూ సభ్యులు కాదు." #: actions/usergroups.php:158 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." -msgstr "" +msgstr "[గుంపులని వెతికి](%%action.groupsearch%%) వాటిలో చేరడానికి ప్రయత్నించండి." #: classes/File.php:137 #, php-format @@ -3809,45 +3878,50 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:188 +#: classes/Notice.php:196 #, fuzzy msgid "Problem saving notice. Too long." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." -#: classes/Notice.php:192 +#: classes/Notice.php:200 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:203 +#: classes/Notice.php:211 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "" +#: classes/Notice.php:1320 +#, fuzzy, php-format +msgid "RT @%1$s %2$s" +msgstr "%1$s (%2$s)" + #: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" @@ -3918,7 +3992,7 @@ msgstr "ఖాతా" #: lib/action.php:433 msgid "Change your email, avatar, password, profile" -msgstr "" +msgstr "మీ ఈమెయిలు, అవతారం, సంకేతపదం మరియు ప్రౌఫైళ్ళను మార్చుకోండి" #: lib/action.php:436 msgid "Connect" @@ -3956,7 +4030,7 @@ msgstr "కొత్త ఖాతా సృష్టించు" #: lib/action.php:458 msgid "Login to the site" -msgstr "" +msgstr "సైటులోని ప్రవేశించు" #: lib/action.php:461 lib/action.php:724 msgid "Help" @@ -3981,7 +4055,7 @@ msgstr "కొత్త సందేశం" #: lib/action.php:551 msgid "Local views" -msgstr "" +msgstr "స్థానిక వీక్షణలు" #: lib/action.php:617 #, fuzzy @@ -4063,19 +4137,19 @@ msgstr "అన్నీ " msgid "license." msgstr "" -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "పేజీకరణ" -#: lib/action.php:1077 +#: lib/action.php:1107 msgid "After" msgstr "తర్వాత" -#: lib/action.php:1085 +#: lib/action.php:1115 msgid "Before" msgstr "ఇంతక్రితం" -#: lib/action.php:1133 +#: lib/action.php:1163 msgid "There was a problem with your session token." msgstr "" @@ -4171,11 +4245,12 @@ msgstr "" "చందాదార్లు: %2$s\n" "నోటీసులు: %3$s" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "" @@ -4217,104 +4292,114 @@ msgstr "" msgid "Error sending direct message." msgstr "" -#: lib/command.php:431 +#: lib/command.php:434 +#, fuzzy, php-format +msgid "Notice from %s repeated" +msgstr "సందేశాలు" + +#: lib/command.php:436 +#, fuzzy +msgid "Error repeating notice." +msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." + +#: lib/command.php:490 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "నోటిసు చాలా పొడవుగా ఉంది - %d అక్షరాలు గరిష్ఠం, మీరు %d పంపించారు" -#: lib/command.php:440 +#: lib/command.php:499 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "%sకి స్పందనలు" -#: lib/command.php:442 +#: lib/command.php:501 #, fuzzy msgid "Error saving notice." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "" -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "" -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "" -#: lib/command.php:604 +#: lib/command.php:663 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "మారుపేర్లని సృష్టించలేకపోయాం." -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" -msgstr "" +msgstr "ఈ లంకెని ఒకే సారి ఉపయోగించగలరు, మరియు అది పనిచేసేది 2 నిమిషాలు మాత్రమే: %s" -#: lib/command.php:625 +#: lib/command.php:684 msgid "You are not subscribed to anyone." msgstr "మీరు ఎవరికీ చందాచేరలేదు." -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "%sకి స్పందనలు" msgstr[1] "%sకి స్పందనలు" -#: lib/command.php:647 +#: lib/command.php:706 msgid "No one is subscribed to you." msgstr "మీకు చందాదార్లు ఎవరూ లేరు." -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "%sకి స్పందనలు" msgstr[1] "%sకి స్పందనలు" -#: lib/command.php:669 +#: lib/command.php:728 msgid "You are not a member of any groups." msgstr "మీరు ఏ గుంపులోనూ సభ్యులు కాదు." -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!" msgstr[1] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!" -#: lib/command.php:685 +#: lib/command.php:744 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4330,6 +4415,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -4785,7 +4872,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 msgid "from" msgstr "నుండి" @@ -4872,40 +4959,40 @@ msgstr "జోడించు" msgid "Attach a file" msgstr "ఒక ఫైలుని జోడించు" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "N" msgstr "ఉ" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "ద" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "తూ" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "ప" -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 msgid "in context" msgstr "సందర్భంలో" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 msgid "Reply to this notice" msgstr "ఈ నోటీసుపై స్పందించండి" -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 msgid "Reply" msgstr "స్పందించండి" @@ -5037,6 +5124,16 @@ msgstr "విశేషం" msgid "Popular" msgstr "ప్రాచుర్యం" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "ఈ నోటీసుపై స్పందించండి" + +#: lib/repeatform.php:132 +#, fuzzy +msgid "Repeat" +msgstr "తిరస్కరించు" + #: lib/sandboxform.php:67 msgid "Sandbox" msgstr "" @@ -5181,7 +5278,7 @@ msgstr "అటువంటి వాడుకరి లేరు." #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137 msgid "Unsubscribe from this user" -msgstr "" +msgstr "ఈ వాడుకరి నుండి చందామాను" #: lib/unsubscribeform.php:137 msgid "Unsubscribe" diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index 713c2731f8..921537bcce 100644 --- a/locale/tr/LC_MESSAGES/statusnet.po +++ b/locale/tr/LC_MESSAGES/statusnet.po @@ -1,5 +1,6 @@ # Translation of StatusNet to Turkish # +# Author@translatewiki.net: McDutchie # -- # This file is distributed under the same license as the StatusNet package. # @@ -7,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:10:33+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:16:26+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: tr\n" "X-Message-Group: out-statusnet\n" @@ -43,9 +44,9 @@ msgstr "Böyle bir durum mesajı yok." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Böyle bir kullanıcı yok." @@ -130,7 +131,8 @@ msgstr "Onay kodu bulunamadı." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" @@ -224,11 +226,14 @@ msgstr "" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "" @@ -429,6 +434,19 @@ msgstr "" msgid "You may not delete another user's status." msgstr "" +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "Böyle bir durum mesajı yok." + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +msgid "Cannot repeat your own notice" +msgstr "" + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +msgid "Already repeated that notice" +msgstr "" + #: actions/apistatusesshow.php:138 #, fuzzy msgid "Status deleted." @@ -501,6 +519,21 @@ msgstr "" msgid "%s updates from everyone!" msgstr "" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, fuzzy, php-format +msgid "Repeated to %s" +msgstr "%s için cevaplar" + +#: actions/apitimelineretweetsofme.php:112 +#, fuzzy, php-format +msgid "Repeats of %s" +msgstr "%s için cevaplar" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -566,7 +599,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 msgid "Delete" msgstr "" @@ -587,9 +620,10 @@ msgstr "" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "" @@ -799,7 +833,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "Böyle bir durum mesajı yok." -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 msgid "Delete this notice" msgstr "" @@ -1587,8 +1621,8 @@ msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." msgstr "" -"Jabber veya Gtalk adresi: \"KullaniciAdi@ornek.org\" gibi. Öncelikle %s, IM " -"istemcisi veya Gtalk arkadaşlar listenize eklenmiş olmalıdır." +"Jabber veya Gtalk adresi: \"KullaniciAdi@example.org\" gibi. Öncelikle %s, " +"IM istemcisi veya Gtalk arkadaşlar listenize eklenmiş olmalıdır." #: actions/imsettings.php:143 msgid "Send me notices through Jabber/GTalk." @@ -1912,7 +1946,7 @@ msgid "You can't send a message to this user." msgstr "" #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "İçerik yok!" @@ -2020,8 +2054,8 @@ msgstr "Bağlan" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "" @@ -2801,6 +2835,35 @@ msgstr "" msgid "Couldn’t get a request token." msgstr "" +#: actions/repeat.php:57 +msgid "Only logged-in users can repeat notices." +msgstr "" + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "Yeni durum mesajı" + +#: actions/repeat.php:76 +#, fuzzy +msgid "You can't repeat your own notice." +msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız." + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "Zaten giriş yapmış durumdasıznız!" + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "Yarat" + +#: actions/repeat.php:115 +#, fuzzy +msgid "Repeated!" +msgstr "Yarat" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -3106,6 +3169,11 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" +#: actions/showstream.php:313 +#, fuzzy, php-format +msgid "Repeat of %s" +msgstr "%s için cevaplar" + #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." msgstr "" @@ -3920,45 +3988,50 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:188 +#: classes/Notice.php:196 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Durum mesajını kaydederken hata oluştu." -#: classes/Notice.php:192 +#: classes/Notice.php:200 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Durum mesajını kaydederken hata oluştu." -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:203 +#: classes/Notice.php:211 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "Durum mesajını kaydederken hata oluştu." -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "Cevap eklenirken veritabanı hatası: %s" +#: classes/Notice.php:1320 +#, php-format +msgid "RT @%1$s %2$s" +msgstr "" + #: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" @@ -4180,21 +4253,21 @@ msgstr "" msgid "license." msgstr "" -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "" -#: lib/action.php:1077 +#: lib/action.php:1107 #, fuzzy msgid "After" msgstr "« Sonra" -#: lib/action.php:1085 +#: lib/action.php:1115 #, fuzzy msgid "Before" msgstr "Önce »" -#: lib/action.php:1133 +#: lib/action.php:1163 msgid "There was a problem with your session token." msgstr "" @@ -4288,11 +4361,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "" @@ -4334,104 +4408,114 @@ msgstr "" msgid "Error sending direct message." msgstr "" -#: lib/command.php:431 +#: lib/command.php:434 +#, fuzzy, php-format +msgid "Notice from %s repeated" +msgstr "Durum mesajları" + +#: lib/command.php:436 +#, fuzzy +msgid "Error repeating notice." +msgstr "Durum mesajını kaydederken hata oluştu." + +#: lib/command.php:490 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:440 +#: lib/command.php:499 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "%s için cevaplar" -#: lib/command.php:442 +#: lib/command.php:501 #, fuzzy msgid "Error saving notice." msgstr "Durum mesajını kaydederken hata oluştu." -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "" -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "" -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "" -#: lib/command.php:604 +#: lib/command.php:663 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Avatar bilgisi kaydedilemedi" -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:625 +#: lib/command.php:684 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Bize o profili yollamadınız" -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Bize o profili yollamadınız" -#: lib/command.php:647 +#: lib/command.php:706 #, fuzzy msgid "No one is subscribed to you." msgstr "Uzaktan abonelik" -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Uzaktan abonelik" -#: lib/command.php:669 +#: lib/command.php:728 #, fuzzy msgid "You are not a member of any groups." msgstr "Bize o profili yollamadınız" -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Bize o profili yollamadınız" -#: lib/command.php:685 +#: lib/command.php:744 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4447,6 +4531,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -4915,7 +5001,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 msgid "from" msgstr "" @@ -5003,41 +5089,41 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "N" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "" -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 #, fuzzy msgid "in context" msgstr "İçerik yok!" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 #, fuzzy msgid "Reply" msgstr "cevapla" @@ -5171,6 +5257,16 @@ msgstr "" msgid "Popular" msgstr "Kişi Arama" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "Böyle bir durum mesajı yok." + +#: lib/repeatform.php:132 +#, fuzzy +msgid "Repeat" +msgstr "Sıfırla" + #: lib/sandboxform.php:67 msgid "Sandbox" msgstr "" diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index 767c63ca50..8659251157 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:10:36+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:16:29+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: out-statusnet\n" @@ -45,9 +45,9 @@ msgstr "Немає такої сторінки" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Такого користувача немає." @@ -136,7 +136,8 @@ msgstr "API метод не знайдено." #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Цей метод потребує POST." @@ -229,11 +230,14 @@ msgstr "Всі прямі повідомлення надіслані до %s" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "API метод не знайдено!" @@ -428,6 +432,21 @@ msgstr "Цей метод потребує або НАПИСАТИ, або ВИ msgid "You may not delete another user's status." msgstr "Ви не можете видалити статус іншого користувача." +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "Такого допису немає." + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Не можна увімкнути сповіщення." + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Видалити допис" + #: actions/apistatusesshow.php:138 msgid "Status deleted." msgstr "Статус видалено." @@ -499,6 +518,21 @@ msgstr "%s загальна стрічка" msgid "%s updates from everyone!" msgstr "%s оновлення від усіх!" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, fuzzy, php-format +msgid "Repeated to %s" +msgstr "Відповіді до %s" + +#: actions/apitimelineretweetsofme.php:112 +#, fuzzy, php-format +msgid "Repeats of %s" +msgstr "Відповіді до %s" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -561,7 +595,7 @@ msgid "Preview" msgstr "Перегляд" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 msgid "Delete" msgstr "Видалити" @@ -582,9 +616,10 @@ msgstr "Втяти" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "" "Виникли певні проблеми з токеном поточної сесії. Спробуйте знов, будь ласка." @@ -787,7 +822,7 @@ msgstr "Ви впевненні, що бажаєте видалити цей д msgid "Do not delete this notice" msgstr "Не видаляти цей допис" -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 msgid "Delete this notice" msgstr "Видалити допис" @@ -1924,7 +1959,7 @@ msgid "You can't send a message to this user." msgstr "Ви не можете надіслати повідомлення цьому користувачеві." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "Немає змісту!" @@ -2037,8 +2072,8 @@ msgstr "тип змісту " msgid "Only " msgstr "Лише " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "Такий формат даних не підтримується." @@ -2839,6 +2874,37 @@ msgstr "Це локальний профіль! Увійдіть аби підп msgid "Couldn’t get a request token." msgstr "Не вдалося отримати токен запиту." +#: actions/repeat.php:57 +#, fuzzy +msgid "Only logged-in users can repeat notices." +msgstr "" +"Лише користувач має можливість переглядати свою власну поштову скриньку." + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "Не визначено жодного профілю." + +#: actions/repeat.php:76 +#, fuzzy +msgid "You can't repeat your own notice." +msgstr "Ви не зможете зареєструватись, якщо не погодитесь з умовами ліцензії." + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "Цього користувача вже заблоковано." + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "Створено" + +#: actions/repeat.php:115 +#, fuzzy +msgid "Repeated!" +msgstr "Створено" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -3172,6 +3238,11 @@ msgstr "" "(http://uk.wikipedia.org/wiki/Мікроблоґ), який працює на вільному " "програмному забезпеченні [StatusNet](http://status.net/). " +#: actions/showstream.php:313 +#, fuzzy, php-format +msgid "Repeat of %s" +msgstr "Відповіді до %s" + #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." msgstr "Ви не можете позбавляти користувачів права голосу на цьому сайті." @@ -3989,27 +4060,27 @@ msgstr "Не можна долучити повідомлення." msgid "Could not update message with new URI." msgstr "Не можна оновити повідомлення з новим URI." -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Помилка бази даних при додаванні теґу: %s" -#: classes/Notice.php:188 +#: classes/Notice.php:196 msgid "Problem saving notice. Too long." msgstr "Проблема при збереженні допису. Надто довге." -#: classes/Notice.php:192 +#: classes/Notice.php:200 msgid "Problem saving notice. Unknown user." msgstr "Проблема при збереженні допису. Невідомий користувач." -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Дуже багато дописів за короткий термін; ходіть подихайте повітрям і " "повертайтесь за кілька хвилин." -#: classes/Notice.php:203 +#: classes/Notice.php:211 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4017,19 +4088,24 @@ msgstr "" "Дуже багато повідомлень за короткий термін; ходіть подихайте повітрям і " "повертайтесь за кілька хвилин." -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "Вам заборонено надсилати дописи до цього сайту." -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "Проблема при збереженні допису." -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "Помилка бази даних при додаванні відповіді: %s" +#: classes/Notice.php:1320 +#, fuzzy, php-format +msgid "RT @%1$s %2$s" +msgstr "%1$s (%2$s)" + #: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" @@ -4238,19 +4314,19 @@ msgstr "Всі " msgid "license." msgstr "ліцензія." -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "Нумерація сторінок" -#: lib/action.php:1077 +#: lib/action.php:1107 msgid "After" msgstr "Вперед" -#: lib/action.php:1085 +#: lib/action.php:1115 msgid "Before" msgstr "Назад" -#: lib/action.php:1133 +#: lib/action.php:1163 msgid "There was a problem with your session token." msgstr "Виникли певні проблеми з токеном поточної сесії." @@ -4343,11 +4419,12 @@ msgstr "" "Підписчики: %2$s\n" "Дописи: %3$s" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "Такого допису не існує" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "Користувач не має останнього допису" @@ -4389,107 +4466,118 @@ msgstr "Повідомлення надто довге — максимум %d msgid "Error sending direct message." msgstr "Помилка при відправці прямого повідомлення." -#: lib/command.php:431 +#: lib/command.php:434 +#, fuzzy, php-format +msgid "Notice from %s repeated" +msgstr "Допис надіслано" + +#: lib/command.php:436 +#, fuzzy +msgid "Error repeating notice." +msgstr "Проблема при збереженні допису." + +#: lib/command.php:490 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Допис надто довгий — максимум %d знаків, а ви надсилаєте %d" -#: lib/command.php:440 +#: lib/command.php:499 #, php-format msgid "Reply to %s sent" msgstr "Відповідь до %s надіслано" -#: lib/command.php:442 +#: lib/command.php:501 msgid "Error saving notice." msgstr "Проблема при збереженні допису." -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "Зазначте ім’я користувача, до якого бажаєте підписатись" -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "Підписано до %s" -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "Зазначте ім’я користувача, від якого бажаєте відписатись" -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "Відписано від %s" -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "Виконання команди ще не завершено." -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "Сповіщення вимкнуто." -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "Не можна вимкнути сповіщення." -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "Сповіщення увімкнуто." -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "Не можна увімкнути сповіщення." -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "Команду входу відключено" -#: lib/command.php:604 +#: lib/command.php:663 #, php-format msgid "Could not create login token for %s" msgstr "Не вдалося створити токен входу для %s" -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" "Це посилання можна використати лише раз, воно дійсне протягом 2 хвилин: %s" -#: lib/command.php:625 +#: lib/command.php:684 msgid "You are not subscribed to anyone." msgstr "Ви не маєте жодних підписок." -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Ви підписані до цієї особи:" msgstr[1] "Ви підписані до цих людей:" msgstr[2] "Ви підписані до цих людей:" -#: lib/command.php:647 +#: lib/command.php:706 msgid "No one is subscribed to you." msgstr "До Вас ніхто не підписаний." -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Ця особа є підписаною до Вас:" msgstr[1] "Ці люди підписані до Вас:" msgstr[2] "Ці люди підписані до Вас:" -#: lib/command.php:669 +#: lib/command.php:728 msgid "You are not a member of any groups." msgstr "Ви не є учасником жодної групи." -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Ви є учасником групи:" msgstr[1] "Ви є учасником таких груп:" msgstr[2] "Ви є учасником таких груп:" -#: lib/command.php:685 +#: lib/command.php:744 +#, fuzzy msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4505,6 +4593,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -5075,7 +5165,7 @@ msgstr "" "повідомлення аби долучити користувачів до розмови. Такі повідомлення бачите " "лише Ви." -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 msgid "from" msgstr "від" @@ -5162,40 +5252,40 @@ msgstr "Вкласти" msgid "Attach a file" msgstr "Вкласти файл" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "N" msgstr "Півн." -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "Півд." -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "Сх." -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "Зах." -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "в" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 msgid "in context" msgstr "в контексті" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 msgid "Reply to this notice" msgstr "Відповісти на цей допис" -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 msgid "Reply" msgstr "Відповісти" @@ -5324,6 +5414,16 @@ msgstr "Постаті" msgid "Popular" msgstr "Популярне" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "Відповісти на цей допис" + +#: lib/repeatform.php:132 +#, fuzzy +msgid "Repeat" +msgstr "Скинути" + #: lib/sandboxform.php:67 msgid "Sandbox" msgstr "Пісочниця" diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index 362f191082..921b61cc22 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: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:10:39+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:16:32+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: vi\n" "X-Message-Group: out-statusnet\n" @@ -43,9 +43,9 @@ msgstr "Không có tin nhắn nào." #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Không có user nào." @@ -130,7 +130,8 @@ msgstr "Phương thức API không tìm thấy!" #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Phương thức này yêu cầu là POST." @@ -225,11 +226,14 @@ msgstr "" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "Phương thức API không tìm thấy!" @@ -433,6 +437,20 @@ msgstr "Phương thức này yêu cầu là POST hoặc DELETE" msgid "You may not delete another user's status." msgstr "Bạn đã không xóa trạng thái của những người khác." +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "Không có tin nhắn nào." + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +msgid "Cannot repeat your own notice" +msgstr "" + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Xóa tin nhắn" + #: actions/apistatusesshow.php:138 #, fuzzy msgid "Status deleted." @@ -504,6 +522,21 @@ msgstr "Dòng tin công cộng" msgid "%s updates from everyone!" msgstr "%s cập nhật từ tất cả mọi người!" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, fuzzy, php-format +msgid "Repeated to %s" +msgstr "Trả lời cho %s" + +#: actions/apitimelineretweetsofme.php:112 +#, fuzzy, php-format +msgid "Repeats of %s" +msgstr "Trả lời cho %s" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -571,7 +604,7 @@ msgid "Preview" msgstr "Xem trước" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 #, fuzzy msgid "Delete" msgstr "Xóa tin nhắn" @@ -594,9 +627,10 @@ msgstr "Nhóm" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa." @@ -806,7 +840,7 @@ msgstr "Bạn có chắc chắn là muốn xóa tin nhắn này không?" msgid "Do not delete this notice" msgstr "Không thể xóa tin nhắn này." -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 #, fuzzy msgid "Delete this notice" msgstr "Xóa tin nhắn" @@ -1999,7 +2033,7 @@ msgid "You can't send a message to this user." msgstr "Bạn đã theo những người này:" #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "Không có nội dung!" @@ -2111,8 +2145,8 @@ msgstr "Kết nối" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "Không hỗ trợ định dạng dữ liệu này." @@ -2920,6 +2954,35 @@ msgstr "" msgid "Couldn’t get a request token." msgstr "Không thể lấy token yêu cầu." +#: actions/repeat.php:57 +msgid "Only logged-in users can repeat notices." +msgstr "" + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "Thông báo mới" + +#: actions/repeat.php:76 +#, fuzzy +msgid "You can't repeat your own notice." +msgstr "Bạn không thể đăng ký nếu không đồng ý các điều khoản." + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "Bạn đã theo những người này:" + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "Tạo" + +#: actions/repeat.php:115 +#, fuzzy +msgid "Repeated!" +msgstr "Tạo" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -3227,6 +3290,11 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" +#: actions/showstream.php:313 +#, fuzzy, php-format +msgid "Repeat of %s" +msgstr "Trả lời cho %s" + #: actions/silence.php:65 actions/unsilence.php:65 #, fuzzy msgid "You cannot silence users on this site." @@ -4073,45 +4141,50 @@ msgstr "Không thể chèn thêm vào đăng nhận." msgid "Could not update message with new URI." msgstr "Không thể cập nhật thông tin user với địa chỉ email đã được xác nhận." -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, fuzzy, php-format msgid "DB error inserting hashtag: %s" msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s" -#: classes/Notice.php:188 +#: classes/Notice.php:196 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: classes/Notice.php:192 +#: classes/Notice.php:200 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:203 +#: classes/Notice.php:211 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s" +#: classes/Notice.php:1320 +#, fuzzy, php-format +msgid "RT @%1$s %2$s" +msgstr "%s (%s)" + #: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" @@ -4338,21 +4411,21 @@ msgstr "" msgid "license." msgstr "" -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "" -#: lib/action.php:1077 +#: lib/action.php:1107 #, fuzzy msgid "After" msgstr "Sau" -#: lib/action.php:1085 +#: lib/action.php:1115 #, fuzzy msgid "Before" msgstr "Trước" -#: lib/action.php:1133 +#: lib/action.php:1163 #, fuzzy msgid "There was a problem with your session token." msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa." @@ -4451,11 +4524,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 #, fuzzy msgid "User has no last notice" msgstr "Người dùng không có thông tin." @@ -4500,106 +4574,116 @@ msgstr "" msgid "Error sending direct message." msgstr "Thư bạn đã gửi" -#: lib/command.php:431 +#: lib/command.php:434 +#, fuzzy, php-format +msgid "Notice from %s repeated" +msgstr "Tin đã gửi" + +#: lib/command.php:436 +#, fuzzy +msgid "Error repeating notice." +msgstr "Có lỗi xảy ra khi lưu tin nhắn." + +#: lib/command.php:490 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:440 +#: lib/command.php:499 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Trả lời tin nhắn này" -#: lib/command.php:442 +#: lib/command.php:501 #, fuzzy msgid "Error saving notice." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:503 +#: lib/command.php:562 #, fuzzy, php-format msgid "Subscribed to %s" msgstr "Theo nhóm này" -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:531 +#: lib/command.php:590 #, fuzzy, php-format msgid "Unsubscribed from %s" msgstr "Hết theo" -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:552 +#: lib/command.php:611 #, fuzzy msgid "Notification off." msgstr "Không có mã số xác nhận." -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:575 +#: lib/command.php:634 #, fuzzy msgid "Notification on." msgstr "Không có mã số xác nhận." -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "" -#: lib/command.php:604 +#: lib/command.php:663 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Không thể tạo favorite." -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:625 +#: lib/command.php:684 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Bạn chưa cập nhật thông tin riêng" -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Bạn đã theo những người này:" -#: lib/command.php:647 +#: lib/command.php:706 #, fuzzy msgid "No one is subscribed to you." msgstr "Không thể tạo favorite." -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Không thể tạo favorite." -#: lib/command.php:669 +#: lib/command.php:728 #, fuzzy msgid "You are not a member of any groups." msgstr "Bạn chưa cập nhật thông tin riêng" -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Bạn chưa cập nhật thông tin riêng" -#: lib/command.php:685 +#: lib/command.php:744 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4615,6 +4699,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -5139,7 +5225,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 #, fuzzy msgid "from" msgstr " từ " @@ -5228,43 +5314,43 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 #, fuzzy msgid "N" msgstr "Không" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "" -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 #, fuzzy msgid "in context" msgstr "Không có nội dung!" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 #, fuzzy msgid "Reply to this notice" msgstr "Trả lời tin nhắn này" -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 msgid "Reply" msgstr "Trả lời" @@ -5403,6 +5489,16 @@ msgstr "" msgid "Popular" msgstr "Tên tài khoản" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "Trả lời tin nhắn này" + +#: lib/repeatform.php:132 +#, fuzzy +msgid "Repeat" +msgstr "Khởi tạo" + #: lib/sandboxform.php:67 #, fuzzy msgid "Sandbox" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index f55e49e885..11aefb86a2 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.po +++ b/locale/zh_CN/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:10:42+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:16:35+0000\n" "Language-Team: Simplified Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hans\n" "X-Message-Group: out-statusnet\n" @@ -45,9 +45,9 @@ msgstr "未找到此消息。" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "没有这个用户。" @@ -132,7 +132,8 @@ msgstr "API 方法未实现！" #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "此方法接受POST请求。" @@ -227,11 +228,14 @@ msgstr "发给 %s 的直接消息" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "API 方法未实现！" @@ -431,6 +435,21 @@ msgstr "此方法接受POST或DELETE请求。" msgid "You may not delete another user's status." msgstr "您不能删除其他用户的状态。" +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "没有这份通告。" + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "无法开启通告。" + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "删除通告" + #: actions/apistatusesshow.php:138 #, fuzzy msgid "Status deleted." @@ -502,6 +521,21 @@ msgstr "%s 公众时间表" msgid "%s updates from everyone!" msgstr "来自所有人的 %s 消息！" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, fuzzy, php-format +msgid "Repeated to %s" +msgstr "%s 的回复" + +#: actions/apitimelineretweetsofme.php:112 +#, fuzzy, php-format +msgid "Repeats of %s" +msgstr "%s 的回复" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -566,7 +600,7 @@ msgid "Preview" msgstr "预览" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 #, fuzzy msgid "Delete" msgstr "删除" @@ -588,9 +622,10 @@ msgstr "剪裁" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "会话标识有问题，请重试。" @@ -802,7 +837,7 @@ msgstr "确定要删除这条消息吗？" msgid "Do not delete this notice" msgstr "无法删除通告。" -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 #, fuzzy msgid "Delete this notice" msgstr "删除通告" @@ -1945,7 +1980,7 @@ msgid "You can't send a message to this user." msgstr "无法向此用户发送消息。" #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "没有内容！" @@ -2053,8 +2088,8 @@ msgstr "连接" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "不支持的数据格式。" @@ -2844,6 +2879,36 @@ msgstr "那是一个本地资料！需要登录才能订阅。" msgid "Couldn’t get a request token." msgstr "无法获得一份请求标记。" +#: actions/repeat.php:57 +#, fuzzy +msgid "Only logged-in users can repeat notices." +msgstr "只有用户自己可以访问邮箱。" + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "没有收件人。" + +#: actions/repeat.php:76 +#, fuzzy +msgid "You can't repeat your own notice." +msgstr "您必须同意此授权方可注册。" + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "您已成功阻止该用户：" + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "创建" + +#: actions/repeat.php:115 +#, fuzzy +msgid "Repeated!" +msgstr "创建" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -3154,6 +3219,11 @@ msgstr "" "**%s** 有一个帐号在 %%%%site.name%%%%, 一个微博客服务 [micro-blogging]" "(http://en.wikipedia.org/wiki/Micro-blogging)" +#: actions/showstream.php:313 +#, fuzzy, php-format +msgid "Repeat of %s" +msgstr "%s 的回复" + #: actions/silence.php:65 actions/unsilence.php:65 #, fuzzy msgid "You cannot silence users on this site." @@ -3988,46 +4058,51 @@ msgstr "无法添加信息。" msgid "Could not update message with new URI." msgstr "无法添加新URI的信息。" -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "添加标签时数据库出错：%s" -#: classes/Notice.php:188 +#: classes/Notice.php:196 #, fuzzy msgid "Problem saving notice. Too long." msgstr "保存通告时出错。" -#: classes/Notice.php:192 +#: classes/Notice.php:200 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "保存通告时出错。" -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "你在短时间里发布了过多的消息，请深呼吸，过几分钟再发消息。" -#: classes/Notice.php:203 +#: classes/Notice.php:211 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "你在短时间里发布了过多的消息，请深呼吸，过几分钟再发消息。" -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "在这个网站你被禁止发布消息。" -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "保存通告时出错。" -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "添加回复时数据库出错：%s" +#: classes/Notice.php:1320 +#, fuzzy, php-format +msgid "RT @%1$s %2$s" +msgstr "%1$s (%2$s)" + #: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" @@ -4248,21 +4323,21 @@ msgstr "全部" msgid "license." msgstr "注册证" -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "分页" -#: lib/action.php:1077 +#: lib/action.php:1107 #, fuzzy msgid "After" msgstr "« 之后" -#: lib/action.php:1085 +#: lib/action.php:1115 #, fuzzy msgid "Before" msgstr "之前 »" -#: lib/action.php:1133 +#: lib/action.php:1163 #, fuzzy msgid "There was a problem with your session token." msgstr "会话标识有问题，请重试。" @@ -4361,11 +4436,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "用户没有通告。" @@ -4407,104 +4483,114 @@ msgstr "您的消息包含 %d 个字符，超出长度限制 - 不能超过 140 msgid "Error sending direct message." msgstr "发送消息出错。" -#: lib/command.php:431 +#: lib/command.php:434 +#, fuzzy, php-format +msgid "Notice from %s repeated" +msgstr "消息已发布。" + +#: lib/command.php:436 +#, fuzzy +msgid "Error repeating notice." +msgstr "保存通告时出错。" + +#: lib/command.php:490 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "您的消息包含 %d 个字符，超出长度限制 - 不能超过 140 个字符。" -#: lib/command.php:440 +#: lib/command.php:499 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "无法删除通告。" -#: lib/command.php:442 +#: lib/command.php:501 #, fuzzy msgid "Error saving notice." msgstr "保存通告时出错。" -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "指定要订阅的用户名" -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "订阅 %s" -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "指定要取消订阅的用户名" -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "取消订阅 %s" -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "命令尚未实现。" -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "通告关闭。" -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "无法关闭通告。" -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "通告开启。" -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "无法开启通告。" -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "" -#: lib/command.php:604 +#: lib/command.php:663 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "无法创建收藏。" -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:625 +#: lib/command.php:684 #, fuzzy msgid "You are not subscribed to anyone." msgstr "您未告知此个人信息" -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "您已订阅这些用户：" -#: lib/command.php:647 +#: lib/command.php:706 #, fuzzy msgid "No one is subscribed to you." msgstr "无法订阅他人更新。" -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "无法订阅他人更新。" -#: lib/command.php:669 +#: lib/command.php:728 #, fuzzy msgid "You are not a member of any groups." msgstr "您未告知此个人信息" -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "您未告知此个人信息" -#: lib/command.php:685 +#: lib/command.php:744 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4520,6 +4606,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -4998,7 +5086,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 #, fuzzy msgid "from" msgstr " 从 " @@ -5087,43 +5175,43 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 #, fuzzy msgid "N" msgstr "否" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "" -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 #, fuzzy msgid "in context" msgstr "没有内容！" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 #, fuzzy msgid "Reply to this notice" msgstr "无法删除通告。" -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 #, fuzzy msgid "Reply" msgstr "回复" @@ -5261,6 +5349,16 @@ msgstr "特征" msgid "Popular" msgstr "用户" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "无法删除通告。" + +#: lib/repeatform.php:132 +#, fuzzy +msgid "Repeat" +msgstr "重置" + #: lib/sandboxform.php:67 #, fuzzy msgid "Sandbox" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index 3d041c4869..ca46fe613a 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: 2009-12-12 17:09+0000\n" -"PO-Revision-Date: 2009-12-12 17:10:45+0000\n" +"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"PO-Revision-Date: 2009-12-13 17:16:38+0000\n" "Language-Team: Traditional Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hant\n" "X-Message-Group: out-statusnet\n" @@ -43,9 +43,9 @@ msgstr "無此通知" #: actions/repliesrss.php:38 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:411 lib/command.php:467 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "無此使用者" @@ -130,7 +130,8 @@ msgstr "確認碼遺失" #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" @@ -224,11 +225,14 @@ msgstr "" #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 -#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156 -#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" msgstr "" @@ -425,6 +429,19 @@ msgstr "" msgid "You may not delete another user's status." msgstr "" +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "無此通知" + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +msgid "Cannot repeat your own notice" +msgstr "" + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +msgid "Already repeated that notice" +msgstr "" + #: actions/apistatusesshow.php:138 #, fuzzy msgid "Status deleted." @@ -495,6 +512,21 @@ msgstr "" msgid "%s updates from everyone!" msgstr "" +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, php-format +msgid "Repeated to %s" +msgstr "" + +#: actions/apitimelineretweetsofme.php:112 +#, php-format +msgid "Repeats of %s" +msgstr "" + #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" @@ -560,7 +592,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:550 +#: lib/noticelist.php:612 msgid "Delete" msgstr "" @@ -581,9 +613,10 @@ msgstr "" #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 -#: actions/tagother.php:166 actions/unsubscribe.php:69 -#: actions/userauthorization.php:52 lib/designsettings.php:294 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." msgstr "" @@ -793,7 +826,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "無此通知" -#: actions/deletenotice.php:146 lib/noticelist.php:550 +#: actions/deletenotice.php:146 lib/noticelist.php:612 msgid "Delete this notice" msgstr "" @@ -1877,7 +1910,7 @@ msgid "You can't send a message to this user." msgstr "" #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:424 +#: lib/command.php:483 msgid "No content!" msgstr "無內容" @@ -1982,8 +2015,8 @@ msgstr "連結" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011 -#: lib/api.php:1039 lib/api.php:1149 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 msgid "Not a supported data format." msgstr "" @@ -2743,6 +2776,34 @@ msgstr "" msgid "Couldn’t get a request token." msgstr "無法取得轉換標記" +#: actions/repeat.php:57 +msgid "Only logged-in users can repeat notices." +msgstr "" + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "新訊息" + +#: actions/repeat.php:76 +msgid "You can't repeat your own notice." +msgstr "" + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "無此使用者" + +#: actions/repeat.php:112 lib/noticelist.php:628 +#, fuzzy +msgid "Repeated" +msgstr "新增" + +#: actions/repeat.php:115 +#, fuzzy +msgid "Repeated!" +msgstr "新增" + #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format @@ -3046,6 +3107,11 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" +#: actions/showstream.php:313 +#, php-format +msgid "Repeat of %s" +msgstr "" + #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." msgstr "" @@ -3845,45 +3911,50 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:164 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:188 +#: classes/Notice.php:196 #, fuzzy msgid "Problem saving notice. Too long." msgstr "儲存使用者發生錯誤" -#: classes/Notice.php:192 +#: classes/Notice.php:200 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "儲存使用者發生錯誤" -#: classes/Notice.php:197 +#: classes/Notice.php:205 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:203 +#: classes/Notice.php:211 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:209 +#: classes/Notice.php:217 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:274 classes/Notice.php:299 +#: classes/Notice.php:289 classes/Notice.php:314 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:1115 +#: classes/Notice.php:993 #, php-format msgid "DB error inserting reply: %s" msgstr "增加回覆時,資料庫發生錯誤: %s" +#: classes/Notice.php:1320 +#, php-format +msgid "RT @%1$s %2$s" +msgstr "" + #: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" @@ -4100,20 +4171,20 @@ msgstr "" msgid "license." msgstr "" -#: lib/action.php:1068 +#: lib/action.php:1098 msgid "Pagination" msgstr "" -#: lib/action.php:1077 +#: lib/action.php:1107 msgid "After" msgstr "" -#: lib/action.php:1085 +#: lib/action.php:1115 #, fuzzy msgid "Before" msgstr "之前的內容»" -#: lib/action.php:1133 +#: lib/action.php:1163 msgid "There was a problem with your session token." msgstr "" @@ -4206,11 +4277,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:400 +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:416 lib/command.php:472 +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 msgid "User has no last notice" msgstr "" @@ -4252,103 +4324,113 @@ msgstr "" msgid "Error sending direct message." msgstr "" -#: lib/command.php:431 +#: lib/command.php:434 +#, fuzzy, php-format +msgid "Notice from %s repeated" +msgstr "更新個人圖像" + +#: lib/command.php:436 +#, fuzzy +msgid "Error repeating notice." +msgstr "儲存使用者發生錯誤" + +#: lib/command.php:490 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:440 +#: lib/command.php:499 #, php-format msgid "Reply to %s sent" msgstr "" -#: lib/command.php:442 +#: lib/command.php:501 msgid "Error saving notice." msgstr "儲存使用者發生錯誤" -#: lib/command.php:496 +#: lib/command.php:555 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:503 +#: lib/command.php:562 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:524 +#: lib/command.php:583 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:531 +#: lib/command.php:590 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:549 lib/command.php:572 +#: lib/command.php:608 lib/command.php:631 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:552 +#: lib/command.php:611 msgid "Notification off." msgstr "" -#: lib/command.php:554 +#: lib/command.php:613 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:575 +#: lib/command.php:634 msgid "Notification on." msgstr "" -#: lib/command.php:577 +#: lib/command.php:636 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:590 +#: lib/command.php:649 msgid "Login command is disabled" msgstr "" -#: lib/command.php:604 +#: lib/command.php:663 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "無法存取個人圖像資料" -#: lib/command.php:609 +#: lib/command.php:668 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:625 +#: lib/command.php:684 #, fuzzy msgid "You are not subscribed to anyone." msgstr "此帳號已註冊" -#: lib/command.php:627 +#: lib/command.php:686 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "此帳號已註冊" -#: lib/command.php:647 +#: lib/command.php:706 #, fuzzy msgid "No one is subscribed to you." msgstr "無此訂閱" -#: lib/command.php:649 +#: lib/command.php:708 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "無此訂閱" -#: lib/command.php:669 +#: lib/command.php:728 #, fuzzy msgid "You are not a member of any groups." msgstr "無法連結到伺服器:%s" -#: lib/command.php:671 +#: lib/command.php:730 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "無法連結到伺服器:%s" -#: lib/command.php:685 +#: lib/command.php:744 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4364,6 +4446,8 @@ msgid "" "whois - get profile info on user\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" "reply # - reply to notice with a given id\n" "reply - reply to the last notice from user\n" "join - join group\n" @@ -4826,7 +4910,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:452 +#: lib/mailbox.php:227 lib/noticelist.php:468 msgid "from" msgstr "" @@ -4914,41 +4998,41 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:403 +#: lib/noticelist.php:419 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "N" msgstr "" -#: lib/noticelist.php:404 +#: lib/noticelist.php:420 msgid "S" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "E" msgstr "" -#: lib/noticelist.php:405 +#: lib/noticelist.php:421 msgid "W" msgstr "" -#: lib/noticelist.php:411 +#: lib/noticelist.php:427 msgid "at" msgstr "" -#: lib/noticelist.php:506 +#: lib/noticelist.php:522 #, fuzzy msgid "in context" msgstr "無內容" -#: lib/noticelist.php:526 +#: lib/noticelist.php:588 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:527 +#: lib/noticelist.php:589 msgid "Reply" msgstr "" @@ -5080,6 +5164,15 @@ msgstr "" msgid "Popular" msgstr "" +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "無此通知" + +#: lib/repeatform.php:132 +msgid "Repeat" +msgstr "" + #: lib/sandboxform.php:67 msgid "Sandbox" msgstr "" From 954eb411e038745ee3e7995364a79d2fbda909bc Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sun, 13 Dec 2009 18:31:14 +0100 Subject: [PATCH 132/172] Localisation updates for !StatusNet from !translatewiki.net !sntrans * add Interlingua (ia) --- lib/language.php | 1 + locale/ia/LC_MESSAGES/statusnet.po | 5363 ++++++++++++++++++++++++++++ 2 files changed, 5364 insertions(+) create mode 100644 locale/ia/LC_MESSAGES/statusnet.po diff --git a/lib/language.php b/lib/language.php index c037d30c3e..d8f529201e 100644 --- a/lib/language.php +++ b/lib/language.php @@ -287,6 +287,7 @@ function get_all_languages() { 'ga' => array('q' => 0.5, 'lang' => 'ga', 'name' => 'Galician', 'direction' => 'ltr'), 'he' => array('q' => 0.5, 'lang' => 'he', 'name' => 'Hebrew', 'direction' => 'rtl'), 'hsb' => array('q' => 0.8, 'lang' => 'hsb', 'name' => 'Upper Sorbian', 'direction' => 'ltr'), + 'ia' => array('q' => 0.8, 'lang' => 'ia', 'name' => 'Interlingua', 'direction' => 'ltr'), 'is' => array('q' => 0.1, 'lang' => 'is', 'name' => 'Icelandic', 'direction' => 'ltr'), 'it' => array('q' => 1, 'lang' => 'it', 'name' => 'Italian', 'direction' => 'ltr'), 'jp' => array('q' => 0.5, 'lang' => 'ja', 'name' => 'Japanese', 'direction' => 'ltr'), diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po new file mode 100644 index 0000000000..99c3d9ec59 --- /dev/null +++ b/locale/ia/LC_MESSAGES/statusnet.po @@ -0,0 +1,5363 @@ +# Translation of StatusNet to Interlingua +# +# Author@translatewiki.net: McDutchie +# -- +# This file is distributed under the same license as the StatusNet package. +# +msgid "" +msgstr "" +"Project-Id-Version: StatusNet\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-13 17:29+0000\n" +"PO-Revision-Date: 2009-12-13 17:30:36+0000\n" +"Language-Team: Interlingua\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Translation-Project: translatewiki.net at http://translatewiki.net\n" +"X-Language-Code: ia\n" +"X-Message-Group: out-statusnet\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: actions/all.php:63 actions/public.php:97 actions/replies.php:92 +#: actions/showfavorites.php:137 actions/tag.php:51 +msgid "No such page" +msgstr "Pagina non existe" + +#: actions/all.php:74 actions/allrss.php:68 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofile.php:105 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77 +#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 +#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 +#: actions/apigroupleave.php:99 actions/apigrouplist.php:90 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 +#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 +#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 +#: actions/newmessage.php:116 actions/remotesubscribe.php:145 +#: actions/remotesubscribe.php:154 actions/replies.php:73 +#: actions/repliesrss.php:38 actions/showfavorites.php:105 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 +#: lib/command.php:364 lib/command.php:409 lib/command.php:470 +#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +msgid "No such user." +msgstr "Usator non existe." + +#: actions/all.php:84 +#, php-format +msgid "%s and friends, page %d" +msgstr "%s e amicos, pagina %d" + +#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 +#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#, php-format +msgid "%s and friends" +msgstr "%s e amicos" + +#: actions/all.php:99 +#, php-format +msgid "Feed for friends of %s (RSS 1.0)" +msgstr "Syndication pro le amicos de %s (RSS 1.0)" + +#: actions/all.php:107 +#, php-format +msgid "Feed for friends of %s (RSS 2.0)" +msgstr "Syndication pro le amicos de %s (RSS 2.0)" + +#: actions/all.php:115 +#, php-format +msgid "Feed for friends of %s (Atom)" +msgstr "Syndication pro le amicos de %s (Atom)" + +#: actions/all.php:127 +#, php-format +msgid "" +"This is the timeline for %s and friends but no one has posted anything yet." +msgstr "" +"Isto es le chronologia pro %s e su amicos, ma necuno ha ancora publicate " +"alique." + +#: actions/all.php:132 +#, php-format +msgid "" +"Try subscribing to more people, [join a group](%%action.groups%%) or post " +"something yourself." +msgstr "" +"Proba subscriber te a altere personas, [face te membro de un gruppo](%%" +"action.groups%%) o publica alique tu mesme." + +#: actions/all.php:134 +#, php-format +msgid "" +"You can try to [nudge %s](../%s) from his profile or [post something to his " +"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +msgstr "" +"Tu pote tentar [dar un pulsata a %s](../%s) in su profilo o [publicar un " +"message a su attention](%%%%action.newnotice%%%%?status_textarea=%s)." + +#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 +#, php-format +msgid "" +"Why not [register an account](%%%%action.register%%%%) and then nudge %s or " +"post a notice to his or her attention." +msgstr "" +"Proque non [registrar un conto](%%%%action.register%%%%) e postea dar un " +"pulsata a %s o publicar un message a su attention." + +#: actions/all.php:165 +msgid "You and friends" +msgstr "Tu e amicos" + +#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#, php-format +msgid "Updates from %1$s and friends on %2$s!" +msgstr "Actualisationes de %1$s e su amicos in %2$s!" + +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofile.php:97 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +msgid "API method not found." +msgstr "Methodo API non trovate." + +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofile.php:89 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 +#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 +#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 +#: actions/apistatusesupdate.php:114 +msgid "This method requires a POST." +msgstr "Iste methodo require un POST." + +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" +"Tu debe specificar un parametro nominate 'device' con un del valores: sms, " +"im, none" + +#: actions/apiaccountupdatedeliverydevice.php:132 +msgid "Could not update user." +msgstr "Non poteva actualisar le usator." + +#: actions/apiaccountupdateprofile.php:112 +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "Le usator non ha un profilo." + +#: actions/apiaccountupdateprofile.php:147 +msgid "Could not save profile." +msgstr "Non poteva salveguardar le profilo." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 +#: actions/apiaccountupdateprofileimage.php:97 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: lib/designsettings.php:283 +#, php-format +msgid "" +"The server was unable to handle that much POST data (%s bytes) due to its " +"current configuration." +msgstr "" +"Le servitor non ha potite tractar tante datos POST (%s bytes) a causa de su " +"configuration actual." + +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "Impossibile salveguardar le configurationes del apparentia." + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +msgid "Could not update your design." +msgstr "Non poteva actualisar le apparentia." + +#: actions/apiblockcreate.php:105 +msgid "You cannot block yourself!" +msgstr "Tu non pote blocar te mesme!" + +#: actions/apiblockcreate.php:119 +msgid "Block user failed." +msgstr "Le blocada del usator ha fallite." + +#: actions/apiblockdestroy.php:107 +msgid "Unblock user failed." +msgstr "Le disblocada del usator ha fallite." + +#: actions/apidirectmessage.php:89 +#, php-format +msgid "Direct messages from %s" +msgstr "Messages directe de %s" + +#: actions/apidirectmessage.php:93 +#, php-format +msgid "All the direct messages sent from %s" +msgstr "Tote le messages directe inviate de %s" + +#: actions/apidirectmessage.php:101 +#, php-format +msgid "Direct messages to %s" +msgstr "Messages directe a %s" + +#: actions/apidirectmessage.php:105 +#, php-format +msgid "All the direct messages sent to %s" +msgstr "Tote le messages directe inviate a %s" + +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 +#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "Methodo API non trovate!" + +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "Message sin texto!" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "Isto es troppo longe. Le maximo es %d characteres." + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "Usator destinatario non trovate." + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "Non pote inviar messages directe a usatores que non es tu amicos." + +#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 +#: actions/apistatusesdestroy.php:113 +msgid "No status found with that ID." +msgstr "Nulle stato trovate con iste ID." + +#: actions/apifavoritecreate.php:119 +msgid "This status is already a favorite!" +msgstr "Iste stato es ja favorite!" + +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +msgid "Could not create favorite." +msgstr "Non poteva crear le favorite." + +#: actions/apifavoritedestroy.php:122 +msgid "That status is not a favorite!" +msgstr "Iste stato non es favorite!" + +#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +msgid "Could not delete favorite." +msgstr "Non poteva deler le favorite." + +#: actions/apifriendshipscreate.php:109 +msgid "Could not follow user: User not found." +msgstr "Non poteva sequer le usator: Usator non trovate." + +#: actions/apifriendshipscreate.php:118 +#, php-format +msgid "Could not follow user: %s is already on your list." +msgstr "Non poteva sequer le usator: %s es ja in tu lista." + +#: actions/apifriendshipsdestroy.php:109 +msgid "Could not unfollow user: User not found." +msgstr "Non poteva cessar de sequer le usator: Usator non trovate." + +#: actions/apifriendshipsdestroy.php:120 +msgid "You cannot unfollow yourself!" +msgstr "Tu non pote cessar de sequer te mesme!" + +#: actions/apifriendshipsexists.php:94 +msgid "Two user ids or screen_names must be supplied." +msgstr "Duo IDs de usator o pseudonymos debe esser fornite." + +#: actions/apifriendshipsshow.php:135 +msgid "Could not determine source user." +msgstr "Non poteva determinar le usator de origine." + +#: actions/apifriendshipsshow.php:143 +msgid "Could not find target user." +msgstr "Non poteva trovar le usator de destination." + +#: actions/apigroupcreate.php:164 actions/editgroup.php:182 +#: actions/newgroup.php:126 actions/profilesettings.php:208 +#: actions/register.php:205 +msgid "Nickname must have only lowercase letters and numbers and no spaces." +msgstr "Le pseudonymo pote solmente haber minusculas e numeros, sin spatios." + +#: actions/apigroupcreate.php:173 actions/editgroup.php:186 +#: actions/newgroup.php:130 actions/profilesettings.php:231 +#: actions/register.php:208 +msgid "Nickname already in use. Try another one." +msgstr "Pseudonymo ja in uso. Proba un altere." + +#: actions/apigroupcreate.php:180 actions/editgroup.php:189 +#: actions/newgroup.php:133 actions/profilesettings.php:211 +#: actions/register.php:210 +msgid "Not a valid nickname." +msgstr "Non un pseudonymo valide." + +#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/newgroup.php:139 actions/profilesettings.php:215 +#: actions/register.php:217 +msgid "Homepage is not a valid URL." +msgstr "Le pagina personal non es un URL valide." + +#: actions/apigroupcreate.php:205 actions/editgroup.php:198 +#: actions/newgroup.php:142 actions/profilesettings.php:218 +#: actions/register.php:220 +msgid "Full name is too long (max 255 chars)." +msgstr "Le nomine complete es troppo longe (max. 255 characteres)." + +#: actions/apigroupcreate.php:213 +#, php-format +msgid "Description is too long (max %d chars)." +msgstr "Description es troppo longe (max %d charachteres)." + +#: actions/apigroupcreate.php:224 actions/editgroup.php:204 +#: actions/newgroup.php:148 actions/profilesettings.php:225 +#: actions/register.php:227 +msgid "Location is too long (max 255 chars)." +msgstr "Loco es troppo longe (max. 255 characteres)." + +#: actions/apigroupcreate.php:243 actions/editgroup.php:215 +#: actions/newgroup.php:159 +#, php-format +msgid "Too many aliases! Maximum %d." +msgstr "Troppo de aliases! Maximo: %d." + +#: actions/apigroupcreate.php:264 actions/editgroup.php:224 +#: actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "Alias invalide: \"%s\"" + +#: actions/apigroupcreate.php:273 actions/editgroup.php:228 +#: actions/newgroup.php:172 +#, php-format +msgid "Alias \"%s\" already in use. Try another one." +msgstr "Le alias \"%s\" es ja in uso. Proba un altere." + +#: actions/apigroupcreate.php:286 actions/editgroup.php:234 +#: actions/newgroup.php:178 +msgid "Alias can't be the same as nickname." +msgstr "Le alias non pote esser identic al pseudonymo." + +#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 +#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 +#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91 +msgid "Group not found!" +msgstr "Gruppo non trovate!" + +#: actions/apigroupjoin.php:110 +msgid "You are already a member of that group." +msgstr "Tu es ja membro de iste gruppo." + +#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221 +msgid "You have been blocked from that group by the admin." +msgstr "Le administrator te ha blocate de iste gruppo." + +#: actions/apigroupjoin.php:138 +#, php-format +msgid "Could not join user %s to group %s." +msgstr "Non poteva inscriber le usator %s in le gruppo %s." + +#: actions/apigroupleave.php:114 +msgid "You are not a member of this group." +msgstr "Tu non es membro de iste gruppo." + +#: actions/apigroupleave.php:124 +#, php-format +msgid "Could not remove user %s to group %s." +msgstr "Non poteva remover le usator %s del gruppo %s." + +#: actions/apigrouplist.php:95 +#, php-format +msgid "%s's groups" +msgstr "Gruppos de %s" + +#: actions/apigrouplist.php:103 +#, php-format +msgid "Groups %s is a member of on %s." +msgstr "Le gruppos del quales %s es membro in %s." + +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "Gruppos de %s" + +#: actions/apigrouplistall.php:94 +#, php-format +msgid "groups on %s" +msgstr "gruppos in %s" + +#: actions/apistatusesdestroy.php:107 +msgid "This method requires a POST or DELETE." +msgstr "Iste methodo require un commando POST o DELETE." + +#: actions/apistatusesdestroy.php:130 +msgid "You may not delete another user's status." +msgstr "Tu non pote deler le stato de un altere usator." + +#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 +#, fuzzy +msgid "No such notice" +msgstr "Nota non trovate." + +#: actions/apistatusesretweet.php:83 lib/command.php:421 +msgid "Cannot repeat your own notice" +msgstr "" + +#: actions/apistatusesretweet.php:91 lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Deler iste nota" + +#: actions/apistatusesshow.php:138 +msgid "Status deleted." +msgstr "Stato delite." + +#: actions/apistatusesshow.php:144 +msgid "No status with that ID found." +msgstr "Nulle stato trovate con iste ID." + +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: scripts/maildaemon.php:71 +#, php-format +msgid "That's too long. Max notice size is %d chars." +msgstr "" +"Isto es troppo longe. Le longitude maximal del notas es %d characteres." + +#: actions/apistatusesupdate.php:198 +msgid "Not found" +msgstr "Non trovate" + +#: actions/apistatusesupdate.php:227 actions/newnotice.php:183 +#, php-format +msgid "Max notice size is %d chars, including attachment URL." +msgstr "" +"Le longitude maximal del notas es %d characteres, includente le URL " +"adjungite." + +#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261 +msgid "Unsupported format." +msgstr "Formato non supportate." + +#: actions/apitimelinefavorites.php:108 +#, php-format +msgid "%s / Favorites from %s" +msgstr "%s / Favorites de %s" + +#: actions/apitimelinefavorites.php:120 +#, php-format +msgid "%s updates favorited by %s / %s." +msgstr "%s actualisationes favoritisate per %s / %s." + +#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 +#: actions/grouprss.php:131 actions/userrss.php:90 +#, php-format +msgid "%s timeline" +msgstr "Chronologia de %s" + +#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 +#: actions/userrss.php:92 +#, php-format +msgid "Updates from %1$s on %2$s!" +msgstr "Actualisationes de %1$s in %2$s!" + +#: actions/apitimelinementions.php:117 +#, php-format +msgid "%1$s / Updates mentioning %2$s" +msgstr "%1$s / Actualisationes que mentiona %2$s" + +#: actions/apitimelinementions.php:127 +#, php-format +msgid "%1$s updates that reply to updates from %2$s / %3$s." +msgstr "" +"Actualisationes de %1$s que responde al actualisationes de %2$s / %3$s." + +#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#, php-format +msgid "%s public timeline" +msgstr "Chronologia public de %s" + +#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#, php-format +msgid "%s updates from everyone!" +msgstr "Actualisationes de totes in %s!" + +#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#, php-format +msgid "Repeated by %s" +msgstr "" + +#: actions/apitimelineretweetedtome.php:111 +#, php-format +msgid "Repeated to %s" +msgstr "" + +#: actions/apitimelineretweetsofme.php:112 +#, php-format +msgid "Repeats of %s" +msgstr "" + +#: actions/apitimelinetag.php:102 actions/tag.php:66 +#, php-format +msgid "Notices tagged with %s" +msgstr "Notas con etiquetta %s" + +#: actions/apitimelinetag.php:108 actions/tagrss.php:64 +#, php-format +msgid "Updates tagged with %1$s on %2$s!" +msgstr "Actualisationes con etiquetta %1$s in %2$s!" + +#: actions/apiusershow.php:96 +msgid "Not found." +msgstr "Non trovate." + +#: actions/attachment.php:73 +msgid "No such attachment." +msgstr "Attachamento non existe." + +#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +msgid "No nickname." +msgstr "Nulle pseudonymo." + +#: actions/avatarbynickname.php:64 +msgid "No size." +msgstr "Nulle dimension." + +#: actions/avatarbynickname.php:69 +msgid "Invalid size." +msgstr "Dimension invalide." + +#: actions/avatarsettings.php:67 actions/showgroup.php:221 +#: lib/accountsettingsaction.php:112 +msgid "Avatar" +msgstr "Avatar" + +#: actions/avatarsettings.php:78 +#, php-format +msgid "You can upload your personal avatar. The maximum file size is %s." +msgstr "Tu pote cargar tu avatar personal. Le dimension maxime del file es %s." + +#: actions/avatarsettings.php:106 actions/avatarsettings.php:185 +#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:103 +msgid "User without matching profile" +msgstr "Usator sin profilo correspondente" + +#: actions/avatarsettings.php:119 actions/avatarsettings.php:197 +#: actions/grouplogo.php:251 +msgid "Avatar settings" +msgstr "Configuration del avatar" + +#: actions/avatarsettings.php:127 actions/avatarsettings.php:205 +#: actions/grouplogo.php:199 actions/grouplogo.php:259 +msgid "Original" +msgstr "Original" + +#: actions/avatarsettings.php:142 actions/avatarsettings.php:217 +#: actions/grouplogo.php:210 actions/grouplogo.php:271 +msgid "Preview" +msgstr "Previsualisation" + +#: actions/avatarsettings.php:149 lib/deleteuserform.php:66 +#: lib/noticelist.php:612 +msgid "Delete" +msgstr "Deler" + +#: actions/avatarsettings.php:166 actions/grouplogo.php:233 +msgid "Upload" +msgstr "Cargar" + +#: actions/avatarsettings.php:231 actions/grouplogo.php:286 +msgid "Crop" +msgstr "Taliar" + +#: actions/avatarsettings.php:268 actions/disfavor.php:74 +#: actions/emailsettings.php:238 actions/favor.php:75 +#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:187 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: actions/unsubscribe.php:69 actions/userauthorization.php:52 +#: lib/designsettings.php:294 +msgid "There was a problem with your session token. Try again, please." +msgstr "Occurreva un problema con le indicio de tu session. Per favor reproba." + +#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "Submission de formulario inexpectate." + +#: actions/avatarsettings.php:328 +msgid "Pick a square area of the image to be your avatar" +msgstr "Selige un area quadrate del imagine pro facer lo tu avatar" + +#: actions/avatarsettings.php:343 actions/grouplogo.php:377 +msgid "Lost our file data." +msgstr "Datos del file perdite." + +#: actions/avatarsettings.php:366 +msgid "Avatar updated." +msgstr "Avatar actualisate." + +#: actions/avatarsettings.php:369 +msgid "Failed updating avatar." +msgstr "Actualisation del avatar fallite." + +#: actions/avatarsettings.php:393 +msgid "Avatar deleted." +msgstr "Avatar delite." + +#: actions/block.php:69 +msgid "You already blocked that user." +msgstr "Tu ha ja blocate iste usator." + +#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 +msgid "Block user" +msgstr "Blocar usator" + +#: actions/block.php:130 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" +"Es tu secur de voler blocar iste usator? Postea, su subscription a te essera " +"cancellate, ille non potera resubscriber se a te in le futuro, e tu non " +"recipera notification de su @-responsas." + +#: actions/block.php:143 actions/deletenotice.php:145 +#: actions/deleteuser.php:147 actions/groupblock.php:178 +msgid "No" +msgstr "No" + +#: actions/block.php:143 actions/deleteuser.php:147 +msgid "Do not block this user" +msgstr "Non blocar iste usator" + +#: actions/block.php:144 actions/deletenotice.php:146 +#: actions/deleteuser.php:148 actions/groupblock.php:179 +msgid "Yes" +msgstr "Si" + +#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 +msgid "Block this user" +msgstr "Blocar iste usator" + +#: actions/block.php:162 +msgid "Failed to save block information." +msgstr "Falleva de salveguardar le information del blocada." + +#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 +#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 +#: actions/groupmembers.php:76 actions/grouprss.php:91 +#: actions/joingroup.php:76 actions/showgroup.php:121 +msgid "No nickname" +msgstr "Nulle pseudonymo" + +#: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 +#: actions/grouplogo.php:99 actions/groupmembers.php:83 +#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +msgid "No such group" +msgstr "Gruppo non existe" + +#: actions/blockedfromgroup.php:90 +#, php-format +msgid "%s blocked profiles" +msgstr "%s profilos blocate" + +#: actions/blockedfromgroup.php:93 +#, php-format +msgid "%s blocked profiles, page %d" +msgstr "%s profilos blocate, pagina %d" + +#: actions/blockedfromgroup.php:108 +msgid "A list of the users blocked from joining this group." +msgstr "Un lista del usatores excludite del membrato de iste gruppo." + +#: actions/blockedfromgroup.php:281 +msgid "Unblock user from group" +msgstr "Disblocar le usator del gruppo" + +#: actions/blockedfromgroup.php:313 lib/unblockform.php:69 +msgid "Unblock" +msgstr "Disblocar" + +#: actions/blockedfromgroup.php:313 lib/unblockform.php:80 +msgid "Unblock this user" +msgstr "Disblocar iste usator" + +#: actions/bookmarklet.php:50 +msgid "Post to " +msgstr "Publicar in " + +#: actions/confirmaddress.php:75 +msgid "No confirmation code." +msgstr "Nulle codice de confirmation." + +#: actions/confirmaddress.php:80 +msgid "Confirmation code not found." +msgstr "Codice de confirmation non trovate." + +#: actions/confirmaddress.php:85 +msgid "That confirmation code is not for you!" +msgstr "Iste codice de confirmation non es pro te!" + +#: actions/confirmaddress.php:90 +#, php-format +msgid "Unrecognized address type %s" +msgstr "Typo de adresse %s non recognoscite" + +#: actions/confirmaddress.php:94 +msgid "That address has already been confirmed." +msgstr "Iste adresse ha ja essite confirmate." + +#: actions/confirmaddress.php:114 actions/emailsettings.php:296 +#: actions/emailsettings.php:427 actions/imsettings.php:258 +#: actions/imsettings.php:401 actions/othersettings.php:174 +#: actions/profilesettings.php:276 actions/smssettings.php:278 +#: actions/smssettings.php:420 +msgid "Couldn't update user." +msgstr "Non poteva actualisar usator." + +#: actions/confirmaddress.php:126 actions/emailsettings.php:391 +#: actions/imsettings.php:363 actions/smssettings.php:382 +msgid "Couldn't delete email confirmation." +msgstr "Non poteva deler confirmation de e-mail." + +#: actions/confirmaddress.php:144 +msgid "Confirm Address" +msgstr "Confirmar adresse" + +#: actions/confirmaddress.php:159 +#, php-format +msgid "The address \"%s\" has been confirmed for your account." +msgstr "Le adresse \"%s\" ha essite confirmate pro tu conto." + +#: actions/conversation.php:99 +msgid "Conversation" +msgstr "Conversation" + +#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 +#: lib/profileaction.php:216 lib/searchgroupnav.php:82 +msgid "Notices" +msgstr "Notas" + +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." +msgstr "Nota non trovate." + +#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 +#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 +#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 +#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 +#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 +#: lib/profileformaction.php:63 lib/settingsaction.php:72 +msgid "Not logged in." +msgstr "Non identificate." + +#: actions/deletenotice.php:71 +msgid "Can't delete this notice." +msgstr "Non pote deler iste nota." + +#: actions/deletenotice.php:103 +msgid "" +"You are about to permanently delete a notice. Once this is done, it cannot " +"be undone." +msgstr "" +"Tu es super le puncto de deler permanentemente un nota. Un vice facite, isto " +"non pote esser disfacite." + +#: actions/deletenotice.php:109 actions/deletenotice.php:141 +msgid "Delete notice" +msgstr "Deler nota" + +#: actions/deletenotice.php:144 +msgid "Are you sure you want to delete this notice?" +msgstr "Es tu secur de voler deler iste nota?" + +#: actions/deletenotice.php:145 +msgid "Do not delete this notice" +msgstr "Non deler iste nota" + +#: actions/deletenotice.php:146 lib/noticelist.php:612 +msgid "Delete this notice" +msgstr "Deler iste nota" + +#: actions/deletenotice.php:157 +msgid "There was a problem with your session token. Try again, please." +msgstr "Occurreva un problema con le indicio de tu session. Per favor reproba." + +#: actions/deleteuser.php:67 +msgid "You cannot delete users." +msgstr "Tu non pote deler usatores." + +#: actions/deleteuser.php:74 +msgid "You can only delete local users." +msgstr "Tu pote solmente deler usatores local." + +#: actions/deleteuser.php:110 actions/deleteuser.php:133 +msgid "Delete user" +msgstr "Deler usator" + +#: actions/deleteuser.php:135 +msgid "" +"Are you sure you want to delete this user? This will clear all data about " +"the user from the database, without a backup." +msgstr "" +"Es tu secur de voler deler iste usator? Isto radera tote le datos super le " +"usator del base de datos, sin copia de reserva." + +#: actions/deleteuser.php:148 lib/deleteuserform.php:77 +msgid "Delete this user" +msgstr "Deler iste usator" + +#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 +#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +msgid "Design" +msgstr "Apparentia" + +#: actions/designadminpanel.php:73 +msgid "Design settings for this StatusNet site." +msgstr "Configuration del apparentia de iste sito StatusNet." + +#: actions/designadminpanel.php:275 +msgid "Invalid logo URL." +msgstr "URL de logotypo invalide." + +#: actions/designadminpanel.php:279 +#, php-format +msgid "Theme not available: %s" +msgstr "Thema non disponibile: %s" + +#: actions/designadminpanel.php:375 +msgid "Change logo" +msgstr "Cambiar logotypo" + +#: actions/designadminpanel.php:380 +msgid "Site logo" +msgstr "Logotypo del sito" + +#: actions/designadminpanel.php:387 +msgid "Change theme" +msgstr "Cambiar thema" + +#: actions/designadminpanel.php:404 +msgid "Site theme" +msgstr "Thema del sito" + +#: actions/designadminpanel.php:405 +msgid "Theme for the site." +msgstr "Le thema de apparentia pro le sito." + +#: actions/designadminpanel.php:417 lib/designsettings.php:101 +msgid "Change background image" +msgstr "Cambiar imagine de fundo" + +#: actions/designadminpanel.php:422 actions/designadminpanel.php:497 +#: lib/designsettings.php:178 +msgid "Background" +msgstr "Fundo" + +#: actions/designadminpanel.php:427 +#, php-format +msgid "" +"You can upload a background image for the site. The maximum file size is %1" +"$s." +msgstr "" +"Tu pote cargar un imagine de fundo pro le sito. Le dimension maxime del file " +"es %1$s." + +#: actions/designadminpanel.php:457 lib/designsettings.php:139 +msgid "On" +msgstr "Active" + +#: actions/designadminpanel.php:473 lib/designsettings.php:155 +msgid "Off" +msgstr "Non active" + +#: actions/designadminpanel.php:474 lib/designsettings.php:156 +msgid "Turn background image on or off." +msgstr "Activar o disactivar le imagine de fundo." + +#: actions/designadminpanel.php:479 lib/designsettings.php:161 +msgid "Tile background image" +msgstr "Tegular le imagine de fundo" + +#: actions/designadminpanel.php:488 lib/designsettings.php:170 +msgid "Change colours" +msgstr "Cambiar colores" + +#: actions/designadminpanel.php:510 lib/designsettings.php:191 +msgid "Content" +msgstr "Contento" + +#: actions/designadminpanel.php:523 lib/designsettings.php:204 +msgid "Sidebar" +msgstr "Barra lateral" + +#: actions/designadminpanel.php:536 lib/designsettings.php:217 +msgid "Text" +msgstr "Texto" + +#: actions/designadminpanel.php:549 lib/designsettings.php:230 +msgid "Links" +msgstr "Ligamines" + +#: actions/designadminpanel.php:577 lib/designsettings.php:247 +msgid "Use defaults" +msgstr "Usar predefinitiones" + +#: actions/designadminpanel.php:578 lib/designsettings.php:248 +msgid "Restore default designs" +msgstr "Restaurar apparentias predefinite" + +#: actions/designadminpanel.php:584 lib/designsettings.php:254 +msgid "Reset back to default" +msgstr "Revenir al predefinitiones" + +#: actions/designadminpanel.php:586 actions/emailsettings.php:195 +#: actions/imsettings.php:163 actions/othersettings.php:126 +#: actions/pathsadminpanel.php:296 actions/profilesettings.php:167 +#: actions/siteadminpanel.php:421 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: lib/groupeditform.php:202 +msgid "Save" +msgstr "Salveguardar" + +#: actions/designadminpanel.php:587 lib/designsettings.php:257 +msgid "Save design" +msgstr "Salveguardar apparentia" + +#: actions/disfavor.php:81 +msgid "This notice is not a favorite!" +msgstr "Iste nota non es favorite!" + +#: actions/disfavor.php:94 +msgid "Add to favorites" +msgstr "Adder al favorites" + +#: actions/doc.php:69 +msgid "No such document." +msgstr "Documento non existe." + +#: actions/editgroup.php:56 +#, php-format +msgid "Edit %s group" +msgstr "Modificar gruppo %s" + +#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65 +msgid "You must be logged in to create a group." +msgstr "Tu debe aperir un session pro crear un gruppo." + +#: actions/editgroup.php:103 actions/editgroup.php:168 +#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 +msgid "You must be an admin to edit the group" +msgstr "Tu debe esser administrator pro modificar le gruppo." + +#: actions/editgroup.php:154 +msgid "Use this form to edit the group." +msgstr "Usa iste formulario pro modificar le gruppo." + +#: actions/editgroup.php:201 actions/newgroup.php:145 +#, php-format +msgid "description is too long (max %d chars)." +msgstr "description es troppo longe (max %d chars)." + +#: actions/editgroup.php:253 +msgid "Could not update group." +msgstr "Non poteva actualisar gruppo." + +#: actions/editgroup.php:259 classes/User_group.php:390 +msgid "Could not create aliases." +msgstr "Non poteva crear aliases." + +#: actions/editgroup.php:269 +msgid "Options saved." +msgstr "Optiones salveguardate." + +#: actions/emailsettings.php:60 +msgid "Email Settings" +msgstr "Configuration de e-mail" + +#: actions/emailsettings.php:71 +#, php-format +msgid "Manage how you get email from %%site.name%%." +msgstr "Configurar como reciper e-mail de %%site.name%%." + +#: actions/emailsettings.php:100 actions/imsettings.php:100 +#: actions/smssettings.php:104 +msgid "Address" +msgstr "Adresse" + +#: actions/emailsettings.php:105 +msgid "Current confirmed email address." +msgstr "Adresse de e-mail actualmente confirmate." + +#: actions/emailsettings.php:107 actions/emailsettings.php:140 +#: actions/imsettings.php:108 actions/smssettings.php:115 +#: actions/smssettings.php:158 +msgid "Remove" +msgstr "Remover" + +#: actions/emailsettings.php:113 +msgid "" +"Awaiting confirmation on this address. Check your inbox (and spam box!) for " +"a message with further instructions." +msgstr "" +"Attende confirmation de iste adresse. Verifica tu cassa de entrata (e de " +"spam!) pro un message con ulterior instructiones." + +#: actions/emailsettings.php:117 actions/imsettings.php:120 +#: actions/smssettings.php:126 +msgid "Cancel" +msgstr "Cancellar" + +#: actions/emailsettings.php:121 +msgid "Email Address" +msgstr "Adresse de e-mail" + +#: actions/emailsettings.php:123 +msgid "Email address, like \"UserName@example.org\"" +msgstr "Le adresse de e-mail, como \"nomine@example.org\"" + +#: actions/emailsettings.php:126 actions/imsettings.php:133 +#: actions/smssettings.php:145 +msgid "Add" +msgstr "Adder" + +#: actions/emailsettings.php:133 actions/smssettings.php:152 +msgid "Incoming email" +msgstr "E-mail entrante" + +#: actions/emailsettings.php:138 actions/smssettings.php:157 +msgid "Send email to this address to post new notices." +msgstr "Invia e-mail a iste adresse pro publicar nove notas." + +#: actions/emailsettings.php:145 actions/smssettings.php:162 +msgid "Make a new email address for posting to; cancels the old one." +msgstr "" +"Face un nove adresse de e-mail per le qual publicar; cancella le vetule." + +#: actions/emailsettings.php:148 actions/smssettings.php:164 +msgid "New" +msgstr "Nove" + +#: actions/emailsettings.php:153 actions/imsettings.php:139 +#: actions/smssettings.php:169 +msgid "Preferences" +msgstr "Preferentias" + +#: actions/emailsettings.php:158 +msgid "Send me notices of new subscriptions through email." +msgstr "Inviar me notificationes de nove subscriptiones per e-mail." + +#: actions/emailsettings.php:163 +msgid "Send me email when someone adds my notice as a favorite." +msgstr "Inviar me e-mail quando alcuno adde mi nota al favorites." + +#: actions/emailsettings.php:169 +msgid "Send me email when someone sends me a private message." +msgstr "Inviar me e-mail quando alcuno me invia un message private." + +#: actions/emailsettings.php:174 +msgid "Send me email when someone sends me an \"@-reply\"." +msgstr "Inviar me e-mail quando alcuno me invia un \"@-responsa\"." + +#: actions/emailsettings.php:179 +msgid "Allow friends to nudge me and send me an email." +msgstr "Permitte que amicos me pulsa e me invia e-mail." + +#: actions/emailsettings.php:185 +msgid "I want to post notices by email." +msgstr "Io vole publicar notas per e-mail." + +#: actions/emailsettings.php:191 +msgid "Publish a MicroID for my email address." +msgstr "Publicar un MicroID pro mi adresse de e-mail." + +#: actions/emailsettings.php:302 actions/imsettings.php:264 +#: actions/othersettings.php:180 actions/smssettings.php:284 +msgid "Preferences saved." +msgstr "Preferentias confirmate." + +#: actions/emailsettings.php:320 +msgid "No email address." +msgstr "Nulle adresse de e-mail." + +#: actions/emailsettings.php:327 +msgid "Cannot normalize that email address" +msgstr "Non pote normalisar iste adresse de e-mail" + +#: actions/emailsettings.php:331 actions/siteadminpanel.php:158 +msgid "Not a valid email address" +msgstr "Adresse de e-mail invalide" + +#: actions/emailsettings.php:334 +msgid "That is already your email address." +msgstr "Isto es ja tu adresse de e-mail." + +#: actions/emailsettings.php:337 +msgid "That email address already belongs to another user." +msgstr "Iste adresse de e-mail pertine ja a un altere usator." + +#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/smssettings.php:337 +msgid "Couldn't insert confirmation code." +msgstr "Non poteva inserer le codice de confirmation." + +#: actions/emailsettings.php:359 +msgid "" +"A confirmation code was sent to the email address you added. Check your " +"inbox (and spam box!) for the code and instructions on how to use it." +msgstr "" +"Un codice de confirmation ha essite inviate al adresse de e-mail que tu " +"addeva. Verifica tu cassa de entrata (e de spam!) pro le codice e le " +"instructiones pro usar lo." + +#: actions/emailsettings.php:379 actions/imsettings.php:351 +#: actions/smssettings.php:370 +msgid "No pending confirmation to cancel." +msgstr "Nulle confirmation pendente a cancellar." + +#: actions/emailsettings.php:383 actions/imsettings.php:355 +msgid "That is the wrong IM address." +msgstr "Iste adresse de messageria instantanee es erronee." + +#: actions/emailsettings.php:395 actions/imsettings.php:367 +#: actions/smssettings.php:386 +msgid "Confirmation cancelled." +msgstr "Confirmation cancellate." + +#: actions/emailsettings.php:413 +msgid "That is not your email address." +msgstr "Isto non es tu adresse de e-mail." + +#: actions/emailsettings.php:432 actions/imsettings.php:408 +#: actions/smssettings.php:425 +msgid "The address was removed." +msgstr "Le adresse ha essite removite." + +#: actions/emailsettings.php:446 actions/smssettings.php:518 +msgid "No incoming email address." +msgstr "Nulle adresse de e-mail entrante." + +#: actions/emailsettings.php:456 actions/emailsettings.php:478 +#: actions/smssettings.php:528 actions/smssettings.php:552 +msgid "Couldn't update user record." +msgstr "Non poteva actualisar le datos del usator." + +#: actions/emailsettings.php:459 actions/smssettings.php:531 +msgid "Incoming email address removed." +msgstr "Adresse de e-mail entrante removite." + +#: actions/emailsettings.php:481 actions/smssettings.php:555 +msgid "New incoming email address added." +msgstr "Nove adresse de e-mail entrante addite." + +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "Iste nota es ja favorite!" + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "Disfavorir favorite" + +#: actions/favorited.php:65 lib/popularnoticesection.php:88 +#: lib/publicgroupnav.php:93 +msgid "Popular notices" +msgstr "Notas popular" + +#: actions/favorited.php:67 +#, php-format +msgid "Popular notices, page %d" +msgstr "Notas popular, pagina %d" + +#: actions/favorited.php:79 +msgid "The most popular notices on the site right now." +msgstr "Le notas le plus popular del sito in iste momento." + +#: actions/favorited.php:150 +msgid "Favorite notices appear on this page but no one has favorited one yet." +msgstr "" +"Le notas favorite appare in iste pagina, ma necuno ha ancora favoritisate un." + +#: 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 "" +"Sia le prime a adder un nota a tu favorites per cliccar le button Favorite " +"juxta un nota que te place." + +#: actions/favorited.php:156 +#, php-format +msgid "" +"Why not [register an account](%%action.register%%) and be the first to add a " +"notice to your favorites!" +msgstr "" +"Proque non [crear un conto](%%action.register%%) e esser le prime a adder un " +"nota a tu favorites!" + +#: actions/favoritesrss.php:111 actions/showfavorites.php:77 +#: lib/personalgroupnav.php:115 +#, php-format +msgid "%s's favorite notices" +msgstr "Notas favorite de %s" + +#: actions/favoritesrss.php:115 +#, php-format +msgid "Updates favored by %1$s on %2$s!" +msgstr "Actualisationes favorite per %1$s in %2$s!" + +#: actions/featured.php:69 lib/featureduserssection.php:87 +#: lib/publicgroupnav.php:89 +msgid "Featured users" +msgstr "Usatores in evidentia" + +#: actions/featured.php:71 +#, php-format +msgid "Featured users, page %d" +msgstr "Usatores in evidentia, pagina %d" + +#: actions/featured.php:99 +#, php-format +msgid "A selection of some of the great users on %s" +msgstr "Un selection de usatores eminente in %s" + +#: actions/file.php:34 +msgid "No notice id" +msgstr "Nulle ID de nota" + +#: actions/file.php:38 +msgid "No notice" +msgstr "Nulle nota" + +#: actions/file.php:42 +msgid "No attachments" +msgstr "Nulle attachamento" + +#: actions/file.php:51 +msgid "No uploaded attachments" +msgstr "Nulle attachamento cargate" + +#: actions/finishremotesubscribe.php:69 +msgid "Not expecting this response!" +msgstr "Non expectava iste responsa!" + +#: actions/finishremotesubscribe.php:80 +msgid "User being listened to does not exist." +msgstr "Le usator sequite non existe." + +#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59 +msgid "You can use the local subscription!" +msgstr "Tu pote usar le subscription local!" + +#: actions/finishremotesubscribe.php:99 +msgid "That user has blocked you from subscribing." +msgstr "Iste usator te ha blocate de subscriber." + +#: actions/finishremotesubscribe.php:110 +msgid "You are not authorized." +msgstr "Tu non es autorisate." + +#: actions/finishremotesubscribe.php:113 +msgid "Could not convert request token to access token." +msgstr "Non poteva converter le indicio de requesta in un indicio de accesso." + +#: actions/finishremotesubscribe.php:118 +msgid "Remote service uses unknown version of OMB protocol." +msgstr "Le servicio remote usa un version incognite del protocollo OMB." + +#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "Error in actualisar le profilo remote" + +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 +#: actions/groupunblock.php:86 actions/leavegroup.php:83 +#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +msgid "No such group." +msgstr "Gruppo non existe." + +#: actions/getfile.php:75 +msgid "No such file." +msgstr "File non existe." + +#: actions/getfile.php:79 +msgid "Cannot read file." +msgstr "Non pote leger file." + +#: 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 "Nulle profilo specificate." + +#: actions/groupblock.php:76 actions/groupunblock.php:76 +#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 +#: lib/profileformaction.php:77 +msgid "No profile with that ID." +msgstr "Non existe un profilo con iste ID." + +#: actions/groupblock.php:81 actions/groupunblock.php:81 +#: actions/makeadmin.php:81 +msgid "No group specified." +msgstr "Nulle gruppo specificate." + +#: actions/groupblock.php:91 +msgid "Only an admin can block group members." +msgstr "Solmente un administrator pote blocar membros de un gruppo." + +#: actions/groupblock.php:95 +msgid "User is already blocked from group." +msgstr "Le usator es ja blocate del gruppo." + +#: actions/groupblock.php:100 +msgid "User is not a member of group." +msgstr "Le usator non es membro del gruppo." + +#: actions/groupblock.php:136 actions/groupmembers.php:314 +msgid "Block user from group" +msgstr "Blocar usator del gruppo" + +#: actions/groupblock.php:162 +#, php-format +msgid "" +"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " +"be removed from the group, unable to post, and unable to subscribe to the " +"group in the future." +msgstr "" +"Es tu secur de voler blocar le usator \"%s\" del gruppo \"%s\"? Ille essera " +"removite del gruppo, non potera publicar messages, e non potera subscriber " +"se al gruppo in le futuro." + +#: actions/groupblock.php:178 +msgid "Do not block this user from this group" +msgstr "Non blocar iste usator de iste gruppo" + +#: actions/groupblock.php:179 +msgid "Block this user from this group" +msgstr "Blocar iste usator de iste gruppo" + +#: actions/groupblock.php:196 +msgid "Database error blocking user from group." +msgstr "Error del base de datos al blocar le usator del gruppo." + +#: actions/groupbyid.php:74 +msgid "No ID" +msgstr "Nulle ID" + +#: actions/groupdesignsettings.php:68 +msgid "You must be logged in to edit a group." +msgstr "Tu debe aperir un session pro modificar un gruppo." + +#: actions/groupdesignsettings.php:141 +msgid "Group design" +msgstr "Apparentia del gruppo" + +#: actions/groupdesignsettings.php:152 +msgid "" +"Customize the way your group looks with a background image and a colour " +"palette of your choice." +msgstr "" +"Personalisa le apparentia de tu gruppo con un imagine de fundo e un paletta " +"de colores de tu preferentia." + +#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: lib/designsettings.php:391 lib/designsettings.php:413 +msgid "Couldn't update your design." +msgstr "Non poteva actualisar tu apparentia." + +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 +msgid "Unable to save your design settings!" +msgstr "Impossibile salveguardar le configuration de tu apparentia!" + +#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 +msgid "Design preferences saved." +msgstr "Preferentias de apparentia salveguardate." + +#: actions/grouplogo.php:139 actions/grouplogo.php:192 +msgid "Group logo" +msgstr "Logotypo del gruppo" + +#: actions/grouplogo.php:150 +#, php-format +msgid "" +"You can upload a logo image for your group. The maximum file size is %s." +msgstr "" +"Tu pote cargar un imagine pro le logotypo de tu gruppo. Le dimension maxime " +"del file es %s." + +#: actions/grouplogo.php:362 +msgid "Pick a square area of the image to be the logo." +msgstr "Selige un area quadrate del imagine que devenira le logotypo." + +#: actions/grouplogo.php:396 +msgid "Logo updated." +msgstr "Logotypo actualisate." + +#: actions/grouplogo.php:398 +msgid "Failed updating logo." +msgstr "Falleva de actualisar le logotypo." + +#: actions/groupmembers.php:93 lib/groupnav.php:92 +#, php-format +msgid "%s group members" +msgstr "Membros del gruppo %s" + +#: actions/groupmembers.php:96 +#, php-format +msgid "%s group members, page %d" +msgstr "Membros del gruppo %s, pagina %d" + +#: actions/groupmembers.php:111 +msgid "A list of the users in this group." +msgstr "Un lista de usatores in iste gruppo." + +#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107 +msgid "Admin" +msgstr "Administrator" + +#: actions/groupmembers.php:346 lib/blockform.php:69 +msgid "Block" +msgstr "Blocar" + +#: actions/groupmembers.php:441 +msgid "Make user an admin of the group" +msgstr "Facer le usator administrator del gruppo" + +#: actions/groupmembers.php:473 +msgid "Make Admin" +msgstr "Facer administrator" + +#: actions/groupmembers.php:473 +msgid "Make this user an admin" +msgstr "Facer iste usator administrator" + +#: actions/grouprss.php:133 +#, php-format +msgid "Updates from members of %1$s on %2$s!" +msgstr "Actualisationes de membros de %1$s in %2$s!" + +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +msgid "Groups" +msgstr "Gruppos" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "Gruppos, pagina %d" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" +"Le gruppos de %%%%site.name%%%% permitte trovar e parlar con personas que ha " +"interesses similar al tues. Post haber unite se a un gruppo, tu pote inviar " +"messages a tote le altere membros usante le syntaxe \"!groupname\". Tu non " +"vide un gruppo que te place? Tenta [cercar un](%%%%action.groupsearch%%%%) o " +"[crear le tue!](%%%%action.newgroup%%%%)" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +msgid "Create a new group" +msgstr "Crear un nove gruppo" + +#: actions/groupsearch.php:52 +#, php-format +msgid "" +"Search for groups on %%site.name%% by their name, location, or description. " +"Separate the terms by spaces; they must be 3 characters or more." +msgstr "" +"Cercar gruppos in %%site.name%% per nomine, loco o description. Separa le " +"terminos con spatios; illos debe haber al minus 3 characteres." + +#: actions/groupsearch.php:58 +msgid "Group search" +msgstr "Recerca de gruppos" + +#: actions/groupsearch.php:79 actions/noticesearch.php:117 +#: actions/peoplesearch.php:83 +msgid "No results." +msgstr "Nulle resultato." + +#: actions/groupsearch.php:82 +#, php-format +msgid "" +"If you can't find the group you're looking for, you can [create it](%%action." +"newgroup%%) yourself." +msgstr "" +"Si tu non trova le gruppo que tu cerca, tu pote [crear lo](%%action.newgroup%" +"%) tu mesme." + +#: actions/groupsearch.php:85 +#, php-format +msgid "" +"Why not [register an account](%%action.register%%) and [create the group](%%" +"action.newgroup%%) yourself!" +msgstr "" +"Proque non [registrar un conto](%%action.register%%) e [crear le gruppo](%%" +"action.newgroup%%) tu mesme?" + +#: actions/groupunblock.php:91 +msgid "Only an admin can unblock group members." +msgstr "Solmente un administrator pote disblocar membros de un gruppo." + +#: actions/groupunblock.php:95 +msgid "User is not blocked from group." +msgstr "Le usator non es blocate del gruppo." + +#: actions/groupunblock.php:128 actions/unblock.php:77 +msgid "Error removing the block." +msgstr "Error de remover le blocada." + +#: actions/imsettings.php:59 +msgid "IM Settings" +msgstr "Configuration de messageria instantanee" + +#: actions/imsettings.php:70 +#, php-format +msgid "" +"You can send and receive notices through Jabber/GTalk [instant messages](%%" +"doc.im%%). Configure your address and settings below." +msgstr "" +"Tu pote inviar e reciper notas per [messages instantanee](%%doc.im%%) de " +"Jabber/GTalk. Configura tu adresse e parametros hic infra." + +#: actions/imsettings.php:89 +msgid "IM is not available." +msgstr "Messageria instantanee non disponibile." + +#: actions/imsettings.php:106 +msgid "Current confirmed Jabber/GTalk address." +msgstr "Adresse Jabber/GTalk actualmente confirmate." + +#: actions/imsettings.php:114 +#, php-format +msgid "" +"Awaiting confirmation on this address. Check your Jabber/GTalk account for a " +"message with further instructions. (Did you add %s to your buddy list?)" +msgstr "" +"Attende confirmation de iste adresse. Verifica tu conto Jabber/GTalk pro un " +"message con ulterior instructiones. (Ha tu addite %s a tu lista de amicos?)" + +#: actions/imsettings.php:124 +msgid "IM Address" +msgstr "Adresse de messageria instantanee" + +#: actions/imsettings.php:126 +#, php-format +msgid "" +"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " +"add %s to your buddy list in your IM client or on GTalk." +msgstr "" +"Un adresse Jabber o GTalk, como \"nomine@example.org\". Primo, assecura te " +"de adder %s a tu lista de amicos in tu cliente de messageria instantanee o " +"in GTalk." + +#: actions/imsettings.php:143 +msgid "Send me notices through Jabber/GTalk." +msgstr "Inviar me notas per Jabber/GTalk." + +#: actions/imsettings.php:148 +msgid "Post a notice when my Jabber/GTalk status changes." +msgstr "Publicar un nota quando mi stato de Jabber/GTalk cambia." + +#: actions/imsettings.php:153 +msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." +msgstr "" +"Inviar me responsas per Jabber/GTalk de personas al quales io non es " +"subscribite." + +#: actions/imsettings.php:159 +msgid "Publish a MicroID for my Jabber/GTalk address." +msgstr "Publicar un MicroID pro mi adresse Jabber/GTalk." + +#: actions/imsettings.php:285 +msgid "No Jabber ID." +msgstr "Nulle ID de Jabber." + +#: actions/imsettings.php:292 +msgid "Cannot normalize that Jabber ID" +msgstr "Non pote normalisar iste ID de Jabber" + +#: actions/imsettings.php:296 +msgid "Not a valid Jabber ID" +msgstr "ID de Jabber non valide" + +#: actions/imsettings.php:299 +msgid "That is already your Jabber ID." +msgstr "Isto es ja tu ID de Jabber." + +#: actions/imsettings.php:302 +msgid "Jabber ID already belongs to another user." +msgstr "Le ID de Jabber pertine ja a un altere usator." + +#: actions/imsettings.php:327 +#, php-format +msgid "" +"A confirmation code was sent to the IM address you added. You must approve %" +"s for sending messages to you." +msgstr "" +"Un codice de confirmation ha essite inviate al adresse de messageria " +"instantanee specificate. Tu debe approbar que %s invia messages a te." + +#: actions/imsettings.php:387 +msgid "That is not your Jabber ID." +msgstr "Isto non es tu ID de Jabber." + +#: actions/inbox.php:59 +#, php-format +msgid "Inbox for %s - page %d" +msgstr "Cassa de entrata de %s - pagina %d" + +#: actions/inbox.php:62 +#, php-format +msgid "Inbox for %s" +msgstr "Cassa de entrata de %s" + +#: actions/inbox.php:115 +msgid "This is your inbox, which lists your incoming private messages." +msgstr "" +"Isto es tu cassa de entrata, que lista le messages private que tu ha " +"recipite." + +#: actions/invite.php:39 +msgid "Invites have been disabled." +msgstr "Le invitationes ha essite disactivate." + +#: actions/invite.php:41 +#, php-format +msgid "You must be logged in to invite other users to use %s" +msgstr "Tu debe aperir un session pro invitar altere usatores a usar %s" + +#: actions/invite.php:72 +#, php-format +msgid "Invalid email address: %s" +msgstr "Adresse de e-mail invalide: %s" + +#: actions/invite.php:110 +msgid "Invitation(s) sent" +msgstr "Invitation(es) inviate" + +#: actions/invite.php:112 +msgid "Invite new users" +msgstr "Invitar nove usatores" + +#: actions/invite.php:128 +msgid "You are already subscribed to these users:" +msgstr "Tu es a subscribite a iste usatores:" + +#: actions/invite.php:131 actions/invite.php:139 +#, php-format +msgid "%s (%s)" +msgstr "%s (%s)" + +#: actions/invite.php:136 +msgid "" +"These people are already users and you were automatically subscribed to them:" +msgstr "" +"Iste personas es ja usatores e tu ha essite automaticamente subscribite a " +"illes:" + +#: actions/invite.php:144 +msgid "Invitation(s) sent to the following people:" +msgstr "Invitation(es) inviate al sequente personas:" + +#: actions/invite.php:150 +msgid "" +"You will be notified when your invitees accept the invitation and register " +"on the site. Thanks for growing the community!" +msgstr "" +"Tu recipera notification quando tu invitatos accepta le invitation e se " +"registra in le sito. Gratias pro facer crescer le communitate!" + +#: actions/invite.php:162 +msgid "" +"Use this form to invite your friends and colleagues to use this service." +msgstr "" +"Usa iste formulario pro invitar tu amicos e collegas a usar iste servicio." + +#: actions/invite.php:187 +msgid "Email addresses" +msgstr "Adresses de e-mail" + +#: actions/invite.php:189 +msgid "Addresses of friends to invite (one per line)" +msgstr "Adresses de amicos a invitar (un per linea)" + +#: actions/invite.php:192 +msgid "Personal message" +msgstr "Message personal" + +#: actions/invite.php:194 +msgid "Optionally add a personal message to the invitation." +msgstr "Si tu vole, adde un message personal al invitation." + +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222 +msgid "Send" +msgstr "Inviar" + +#: actions/invite.php:226 +#, php-format +msgid "%1$s has invited you to join them on %2$s" +msgstr "%1$s te ha invitate a accompaniar le/la in %2$s" + +#: actions/invite.php:228 +#, php-format +msgid "" +"%1$s has invited you to join them on %2$s (%3$s).\n" +"\n" +"%2$s is a micro-blogging service that lets you keep up-to-date with people " +"you know and people who interest you.\n" +"\n" +"You can also share news about yourself, your thoughts, or your life online " +"with people who know about you. It's also great for meeting new people who " +"share your interests.\n" +"\n" +"%1$s said:\n" +"\n" +"%4$s\n" +"\n" +"You can see %1$s's profile page on %2$s here:\n" +"\n" +"%5$s\n" +"\n" +"If you'd like to try the service, click on the link below to accept the " +"invitation.\n" +"\n" +"%6$s\n" +"\n" +"If not, you can ignore this message. Thanks for your patience and your " +"time.\n" +"\n" +"Sincerely, %2$s\n" +msgstr "" +"%1$s te ha invitate a accompaniar le/la in %2$s (%3$s).\n" +"\n" +"%2$s es un servicio de micro-blogging que te permitte tener te al currente " +"con personas que tu cognosce o que te interessa.\n" +"\n" +"Tu pote condivider novas super te, tu pensamentos o tu vita con personas que " +"sape de te. Es anque optime pro cognoscer nove personas con interesses " +"commun al tues.\n" +"\n" +"%1$s diceva:\n" +"\n" +"%4$s\n" +"\n" +"Tu pote vider le profilo de %1$s's in %2$s hic:\n" +"\n" +"%5$s\n" +"\n" +"Si tu vole probar le servicio, clicca super le ligamine sequente pro " +"acceptar le invitation.\n" +"\n" +"%6$s\n" +"\n" +"Si non, tu pote ignorar iste message. Gratias pro tu patientia e tu " +"tempore.\n" +"\n" +"Sincermente, %2$s\n" + +#: actions/joingroup.php:60 +msgid "You must be logged in to join a group." +msgstr "Tu debe aperir un session pro facer te membro de un gruppo." + +#: actions/joingroup.php:90 lib/command.php:217 +msgid "You are already a member of that group" +msgstr "Tu es ja membro de iste gruppo" + +#: actions/joingroup.php:128 lib/command.php:234 +#, php-format +msgid "Could not join user %s to group %s" +msgstr "Non poteva facer le usator %s membro del gruppo %s" + +#: actions/joingroup.php:135 lib/command.php:239 +#, php-format +msgid "%s joined group %s" +msgstr "%s se faceva membro del gruppo %s" + +#: actions/leavegroup.php:60 +msgid "You must be logged in to leave a group." +msgstr "Tu debe aperir un session pro quitar un gruppo." + +#: actions/leavegroup.php:90 lib/command.php:268 +msgid "You are not a member of that group." +msgstr "" + +#: actions/leavegroup.php:119 lib/command.php:278 +msgid "Could not find membership record." +msgstr "" + +#: actions/leavegroup.php:127 lib/command.php:284 +#, php-format +msgid "Could not remove user %s to group %s" +msgstr "" + +#: actions/leavegroup.php:134 lib/command.php:289 +#, php-format +msgid "%s left group %s" +msgstr "" + +#: actions/login.php:83 actions/register.php:137 +msgid "Already logged in." +msgstr "" + +#: actions/login.php:114 actions/login.php:124 +msgid "Invalid or expired token." +msgstr "" + +#: actions/login.php:147 +msgid "Incorrect username or password." +msgstr "" + +#: actions/login.php:153 +msgid "Error setting user. You are probably not authorized." +msgstr "" + +#: actions/login.php:208 actions/login.php:261 lib/action.php:458 +#: lib/logingroupnav.php:79 +msgid "Login" +msgstr "" + +#: actions/login.php:247 +msgid "Login to site" +msgstr "" + +#: actions/login.php:250 actions/profilesettings.php:106 +#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: lib/groupeditform.php:152 lib/userprofile.php:131 +msgid "Nickname" +msgstr "" + +#: actions/login.php:253 actions/register.php:428 +#: lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "" + +#: actions/login.php:256 actions/register.php:477 +msgid "Remember me" +msgstr "" + +#: actions/login.php:257 actions/register.php:479 +msgid "Automatically login in the future; not for shared computers!" +msgstr "" + +#: actions/login.php:267 +msgid "Lost or forgotten password?" +msgstr "" + +#: actions/login.php:286 +msgid "" +"For security reasons, please re-enter your user name and password before " +"changing your settings." +msgstr "" + +#: actions/login.php:290 +#, php-format +msgid "" +"Login with your username and password. Don't have a username yet? [Register]" +"(%%action.register%%) a new account." +msgstr "" + +#: actions/makeadmin.php:91 +msgid "Only an admin can make another user an admin." +msgstr "" + +#: actions/makeadmin.php:95 +#, php-format +msgid "%s is already an admin for group \"%s\"." +msgstr "" + +#: actions/makeadmin.php:132 +#, php-format +msgid "Can't get membership record for %s in group %s" +msgstr "" + +#: actions/makeadmin.php:145 +#, php-format +msgid "Can't make %s an admin for group %s" +msgstr "" + +#: actions/microsummary.php:69 +msgid "No current status" +msgstr "" + +#: actions/newgroup.php:53 +msgid "New group" +msgstr "" + +#: actions/newgroup.php:110 +msgid "Use this form to create a new group." +msgstr "" + +#: actions/newmessage.php:71 actions/newmessage.php:231 +msgid "New message" +msgstr "" + +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +msgid "You can't send a message to this user." +msgstr "" + +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 +#: lib/command.php:483 +msgid "No content!" +msgstr "" + +#: actions/newmessage.php:158 +msgid "No recipient specified." +msgstr "" + +#: actions/newmessage.php:164 lib/command.php:370 +msgid "" +"Don't send a message to yourself; just say it to yourself quietly instead." +msgstr "" + +#: actions/newmessage.php:181 +msgid "Message sent" +msgstr "" + +#: actions/newmessage.php:185 lib/command.php:375 +#, php-format +msgid "Direct message to %s sent" +msgstr "" + +#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 +msgid "Ajax Error" +msgstr "" + +#: actions/newnotice.php:69 +msgid "New notice" +msgstr "" + +#: actions/newnotice.php:208 +msgid "Notice posted" +msgstr "" + +#: actions/noticesearch.php:68 +#, php-format +msgid "" +"Search for notices on %%site.name%% by their contents. Separate search terms " +"by spaces; they must be 3 characters or more." +msgstr "" + +#: actions/noticesearch.php:78 +msgid "Text search" +msgstr "" + +#: actions/noticesearch.php:91 +#, php-format +msgid "Search results for \"%s\" on %s" +msgstr "" + +#: actions/noticesearch.php:121 +#, php-format +msgid "" +"Be the first to [post on this topic](%%%%action.newnotice%%%%?" +"status_textarea=%s)!" +msgstr "" + +#: actions/noticesearch.php:124 +#, php-format +msgid "" +"Why not [register an account](%%%%action.register%%%%) and be the first to " +"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" +msgstr "" + +#: actions/noticesearchrss.php:96 +#, php-format +msgid "Updates with \"%s\"" +msgstr "" + +#: actions/noticesearchrss.php:98 +#, php-format +msgid "Updates matching search term \"%1$s\" on %2$s!" +msgstr "" + +#: actions/nudge.php:85 +msgid "" +"This user doesn't allow nudges or hasn't confirmed or set his email yet." +msgstr "" + +#: actions/nudge.php:94 +msgid "Nudge sent" +msgstr "" + +#: actions/nudge.php:97 +msgid "Nudge sent!" +msgstr "" + +#: actions/oembed.php:79 actions/shownotice.php:100 +msgid "Notice has no profile" +msgstr "" + +#: actions/oembed.php:86 actions/shownotice.php:180 +#, php-format +msgid "%1$s's status on %2$s" +msgstr "" + +#: actions/oembed.php:157 +msgid "content type " +msgstr "" + +#: actions/oembed.php:160 +msgid "Only " +msgstr "" + +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 +#: lib/api.php:1056 lib/api.php:1166 +msgid "Not a supported data format." +msgstr "" + +#: actions/opensearch.php:64 +msgid "People Search" +msgstr "" + +#: actions/opensearch.php:67 +msgid "Notice Search" +msgstr "" + +#: actions/othersettings.php:60 +msgid "Other Settings" +msgstr "" + +#: actions/othersettings.php:71 +msgid "Manage various other options." +msgstr "" + +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 +msgid "Shorten URLs with" +msgstr "" + +#: actions/othersettings.php:117 +msgid "Automatic shortening service to use." +msgstr "" + +#: actions/othersettings.php:122 +msgid "View profile designs" +msgstr "" + +#: actions/othersettings.php:123 +msgid "Show or hide profile designs." +msgstr "" + +#: actions/othersettings.php:153 +msgid "URL shortening service is too long (max 50 chars)." +msgstr "" + +#: actions/outbox.php:58 +#, php-format +msgid "Outbox for %s - page %d" +msgstr "" + +#: actions/outbox.php:61 +#, php-format +msgid "Outbox for %s" +msgstr "" + +#: actions/outbox.php:116 +msgid "This is your outbox, which lists private messages you have sent." +msgstr "" + +#: actions/passwordsettings.php:58 +msgid "Change password" +msgstr "" + +#: actions/passwordsettings.php:69 +msgid "Change your password." +msgstr "" + +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 +msgid "Password change" +msgstr "" + +#: actions/passwordsettings.php:104 +msgid "Old password" +msgstr "" + +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 +msgid "New password" +msgstr "" + +#: actions/passwordsettings.php:109 +msgid "6 or more characters" +msgstr "" + +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 +#: actions/register.php:432 actions/smssettings.php:134 +msgid "Confirm" +msgstr "" + +#: actions/passwordsettings.php:113 actions/recoverpassword.php:240 +msgid "Same as password above" +msgstr "" + +#: actions/passwordsettings.php:117 +msgid "Change" +msgstr "" + +#: actions/passwordsettings.php:154 actions/register.php:230 +msgid "Password must be 6 or more characters." +msgstr "" + +#: actions/passwordsettings.php:157 actions/register.php:233 +msgid "Passwords don't match." +msgstr "" + +#: actions/passwordsettings.php:165 +msgid "Incorrect old password" +msgstr "" + +#: actions/passwordsettings.php:181 +msgid "Error saving user; invalid." +msgstr "" + +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +msgid "Can't save new password." +msgstr "" + +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 +msgid "Password saved." +msgstr "" + +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +msgid "Paths" +msgstr "" + +#: actions/pathsadminpanel.php:70 +msgid "Path and server settings for this StatusNet site." +msgstr "" + +#: actions/pathsadminpanel.php:140 +#, php-format +msgid "Theme directory not readable: %s" +msgstr "" + +#: actions/pathsadminpanel.php:146 +#, php-format +msgid "Avatar directory not writable: %s" +msgstr "" + +#: actions/pathsadminpanel.php:152 +#, php-format +msgid "Background directory not writable: %s" +msgstr "" + +#: actions/pathsadminpanel.php:160 +#, php-format +msgid "Locales directory not readable: %s" +msgstr "" + +#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58 +#: lib/adminpanelaction.php:299 +msgid "Site" +msgstr "" + +#: actions/pathsadminpanel.php:216 +msgid "Path" +msgstr "" + +#: actions/pathsadminpanel.php:216 +msgid "Site path" +msgstr "" + +#: actions/pathsadminpanel.php:220 +msgid "Path to locales" +msgstr "" + +#: actions/pathsadminpanel.php:220 +msgid "Directory path to locales" +msgstr "" + +#: actions/pathsadminpanel.php:227 +msgid "Theme" +msgstr "" + +#: actions/pathsadminpanel.php:232 +msgid "Theme server" +msgstr "" + +#: actions/pathsadminpanel.php:236 +msgid "Theme path" +msgstr "" + +#: actions/pathsadminpanel.php:240 +msgid "Theme directory" +msgstr "" + +#: actions/pathsadminpanel.php:247 +msgid "Avatars" +msgstr "" + +#: actions/pathsadminpanel.php:252 +msgid "Avatar server" +msgstr "" + +#: actions/pathsadminpanel.php:256 +msgid "Avatar path" +msgstr "" + +#: actions/pathsadminpanel.php:260 +msgid "Avatar directory" +msgstr "" + +#: actions/pathsadminpanel.php:269 +msgid "Backgrounds" +msgstr "" + +#: actions/pathsadminpanel.php:273 +msgid "Background server" +msgstr "" + +#: actions/pathsadminpanel.php:277 +msgid "Background path" +msgstr "" + +#: actions/pathsadminpanel.php:281 +msgid "Background directory" +msgstr "" + +#: actions/pathsadminpanel.php:297 +msgid "Save paths" +msgstr "" + +#: actions/peoplesearch.php:52 +#, php-format +msgid "" +"Search for people on %%site.name%% by their name, location, or interests. " +"Separate the terms by spaces; they must be 3 characters or more." +msgstr "" + +#: actions/peoplesearch.php:58 +msgid "People search" +msgstr "" + +#: actions/peopletag.php:70 +#, php-format +msgid "Not a valid people tag: %s" +msgstr "" + +#: actions/peopletag.php:144 +#, php-format +msgid "Users self-tagged with %s - page %d" +msgstr "" + +#: actions/postnotice.php:84 +msgid "Invalid notice content" +msgstr "" + +#: actions/postnotice.php:90 +#, php-format +msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +msgstr "" + +#: actions/profilesettings.php:60 +msgid "Profile settings" +msgstr "" + +#: actions/profilesettings.php:71 +msgid "" +"You can update your personal profile info here so people know more about you." +msgstr "" + +#: actions/profilesettings.php:99 +msgid "Profile information" +msgstr "" + +#: actions/profilesettings.php:108 lib/groupeditform.php:154 +msgid "1-64 lowercase letters or numbers, no punctuation or spaces" +msgstr "" + +#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/showgroup.php:247 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:149 +msgid "Full name" +msgstr "" + +#: actions/profilesettings.php:115 actions/register.php:452 +#: lib/groupeditform.php:161 +msgid "Homepage" +msgstr "" + +#: actions/profilesettings.php:117 actions/register.php:454 +msgid "URL of your homepage, blog, or profile on another site" +msgstr "" + +#: actions/profilesettings.php:122 actions/register.php:460 +#, php-format +msgid "Describe yourself and your interests in %d chars" +msgstr "" + +#: actions/profilesettings.php:125 actions/register.php:463 +msgid "Describe yourself and your interests" +msgstr "" + +#: actions/profilesettings.php:127 actions/register.php:465 +msgid "Bio" +msgstr "" + +#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/showgroup.php:256 actions/tagother.php:112 +#: actions/userauthorization.php:158 lib/groupeditform.php:177 +#: lib/userprofile.php:164 +msgid "Location" +msgstr "" + +#: actions/profilesettings.php:134 actions/register.php:472 +msgid "Where you are, like \"City, State (or Region), Country\"" +msgstr "" + +#: actions/profilesettings.php:138 actions/tagother.php:149 +#: actions/tagother.php:209 lib/subscriptionlist.php:106 +#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +msgid "Tags" +msgstr "" + +#: actions/profilesettings.php:140 +msgid "" +"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" +msgstr "" + +#: actions/profilesettings.php:144 actions/siteadminpanel.php:307 +msgid "Language" +msgstr "" + +#: actions/profilesettings.php:145 +msgid "Preferred language" +msgstr "" + +#: actions/profilesettings.php:154 +msgid "Timezone" +msgstr "" + +#: actions/profilesettings.php:155 +msgid "What timezone are you normally in?" +msgstr "" + +#: actions/profilesettings.php:160 +msgid "" +"Automatically subscribe to whoever subscribes to me (best for non-humans)" +msgstr "" + +#: actions/profilesettings.php:221 actions/register.php:223 +#, php-format +msgid "Bio is too long (max %d chars)." +msgstr "" + +#: actions/profilesettings.php:228 actions/siteadminpanel.php:165 +msgid "Timezone not selected." +msgstr "" + +#: actions/profilesettings.php:234 +msgid "Language is too long (max 50 chars)." +msgstr "" + +#: actions/profilesettings.php:246 actions/tagother.php:178 +#, php-format +msgid "Invalid tag: \"%s\"" +msgstr "" + +#: actions/profilesettings.php:295 +msgid "Couldn't update user for autosubscribe." +msgstr "" + +#: actions/profilesettings.php:328 +msgid "Couldn't save profile." +msgstr "" + +#: actions/profilesettings.php:336 +msgid "Couldn't save tags." +msgstr "" + +#: actions/profilesettings.php:344 lib/adminpanelaction.php:126 +msgid "Settings saved." +msgstr "" + +#: actions/public.php:83 +#, php-format +msgid "Beyond the page limit (%s)" +msgstr "" + +#: actions/public.php:92 +msgid "Could not retrieve public stream." +msgstr "" + +#: actions/public.php:129 +#, php-format +msgid "Public timeline, page %d" +msgstr "" + +#: actions/public.php:131 lib/publicgroupnav.php:79 +msgid "Public timeline" +msgstr "" + +#: actions/public.php:151 +msgid "Public Stream Feed (RSS 1.0)" +msgstr "" + +#: actions/public.php:155 +msgid "Public Stream Feed (RSS 2.0)" +msgstr "" + +#: actions/public.php:159 +msgid "Public Stream Feed (Atom)" +msgstr "" + +#: actions/public.php:179 +#, php-format +msgid "" +"This is the public timeline for %%site.name%% but no one has posted anything " +"yet." +msgstr "" + +#: actions/public.php:182 +msgid "Be the first to post!" +msgstr "" + +#: actions/public.php:186 +#, php-format +msgid "" +"Why not [register an account](%%action.register%%) and be the first to post!" +msgstr "" + +#: actions/public.php:233 +#, php-format +msgid "" +"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-" +"blogging) service based on the Free Software [StatusNet](http://status.net/) " +"tool. [Join now](%%action.register%%) to share notices about yourself with " +"friends, family, and colleagues! ([Read more](%%doc.help%%))" +msgstr "" + +#: actions/public.php:238 +#, php-format +msgid "" +"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-" +"blogging) service based on the Free Software [StatusNet](http://status.net/) " +"tool." +msgstr "" + +#: actions/publictagcloud.php:57 +msgid "Public tag cloud" +msgstr "" + +#: actions/publictagcloud.php:63 +#, php-format +msgid "These are most popular recent tags on %s " +msgstr "" + +#: actions/publictagcloud.php:69 +#, php-format +msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet." +msgstr "" + +#: actions/publictagcloud.php:72 +msgid "Be the first to post one!" +msgstr "" + +#: actions/publictagcloud.php:75 +#, php-format +msgid "" +"Why not [register an account](%%action.register%%) and be the first to post " +"one!" +msgstr "" + +#: actions/publictagcloud.php:135 +msgid "Tag cloud" +msgstr "" + +#: actions/recoverpassword.php:36 +msgid "You are already logged in!" +msgstr "" + +#: actions/recoverpassword.php:62 +msgid "No such recovery code." +msgstr "" + +#: actions/recoverpassword.php:66 +msgid "Not a recovery code." +msgstr "" + +#: actions/recoverpassword.php:73 +msgid "Recovery code for unknown user." +msgstr "" + +#: actions/recoverpassword.php:86 +msgid "Error with confirmation code." +msgstr "" + +#: actions/recoverpassword.php:97 +msgid "This confirmation code is too old. Please start again." +msgstr "" + +#: actions/recoverpassword.php:111 +msgid "Could not update user with confirmed email address." +msgstr "" + +#: actions/recoverpassword.php:152 +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 "" + +#: actions/recoverpassword.php:158 +msgid "You have been identified. Enter a new password below. " +msgstr "" + +#: actions/recoverpassword.php:188 +msgid "Password recovery" +msgstr "" + +#: actions/recoverpassword.php:191 +msgid "Nickname or email address" +msgstr "" + +#: actions/recoverpassword.php:193 +msgid "Your nickname on this server, or your registered email address." +msgstr "" + +#: actions/recoverpassword.php:199 actions/recoverpassword.php:200 +msgid "Recover" +msgstr "" + +#: actions/recoverpassword.php:208 +msgid "Reset password" +msgstr "" + +#: actions/recoverpassword.php:209 +msgid "Recover password" +msgstr "" + +#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +msgid "Password recovery requested" +msgstr "" + +#: actions/recoverpassword.php:213 +msgid "Unknown action" +msgstr "" + +#: actions/recoverpassword.php:236 +msgid "6 or more characters, and don't forget it!" +msgstr "" + +#: actions/recoverpassword.php:243 +msgid "Reset" +msgstr "" + +#: actions/recoverpassword.php:252 +msgid "Enter a nickname or email address." +msgstr "" + +#: actions/recoverpassword.php:272 +msgid "No user with that email address or username." +msgstr "" + +#: actions/recoverpassword.php:287 +msgid "No registered email address for that user." +msgstr "" + +#: actions/recoverpassword.php:301 +msgid "Error saving address confirmation." +msgstr "" + +#: actions/recoverpassword.php:325 +msgid "" +"Instructions for recovering your password have been sent to the email " +"address registered to your account." +msgstr "" + +#: actions/recoverpassword.php:344 +msgid "Unexpected password reset." +msgstr "" + +#: actions/recoverpassword.php:352 +msgid "Password must be 6 chars or more." +msgstr "" + +#: actions/recoverpassword.php:356 +msgid "Password and confirmation do not match." +msgstr "" + +#: actions/recoverpassword.php:375 actions/register.php:248 +msgid "Error setting user." +msgstr "" + +#: actions/recoverpassword.php:382 +msgid "New password successfully saved. You are now logged in." +msgstr "" + +#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +msgid "Sorry, only invited people can register." +msgstr "" + +#: actions/register.php:92 +msgid "Sorry, invalid invitation code." +msgstr "" + +#: actions/register.php:112 +msgid "Registration successful" +msgstr "" + +#: actions/register.php:114 actions/register.php:502 lib/action.php:455 +#: lib/logingroupnav.php:85 +msgid "Register" +msgstr "" + +#: actions/register.php:135 +msgid "Registration not allowed." +msgstr "" + +#: actions/register.php:198 +msgid "You can't register if you don't agree to the license." +msgstr "" + +#: actions/register.php:201 +msgid "Not a valid email address." +msgstr "" + +#: actions/register.php:212 +msgid "Email address already exists." +msgstr "" + +#: actions/register.php:243 actions/register.php:264 +msgid "Invalid username or password." +msgstr "" + +#: actions/register.php:342 +msgid "" +"With this form you can create a new account. You can then post notices and " +"link up to friends and colleagues. " +msgstr "" + +#: actions/register.php:424 +msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." +msgstr "" + +#: actions/register.php:429 +msgid "6 or more characters. Required." +msgstr "" + +#: actions/register.php:433 +msgid "Same as password above. Required." +msgstr "" + +#: actions/register.php:437 actions/register.php:441 +#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120 +msgid "Email" +msgstr "" + +#: actions/register.php:438 actions/register.php:442 +msgid "Used only for updates, announcements, and password recovery" +msgstr "" + +#: actions/register.php:449 +msgid "Longer name, preferably your \"real\" name" +msgstr "" + +#: actions/register.php:493 +msgid "My text and files are available under " +msgstr "" + +#: actions/register.php:495 +msgid "Creative Commons Attribution 3.0" +msgstr "" + +#: actions/register.php:496 +msgid "" +" except this private data: password, email address, IM address, and phone " +"number." +msgstr "" + +#: actions/register.php:537 +#, php-format +msgid "" +"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"want to...\n" +"\n" +"* Go to [your profile](%s) and post your first message.\n" +"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " +"notices through instant messages.\n" +"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " +"share your interests. \n" +"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell " +"others more about you. \n" +"* Read over the [online docs](%%%%doc.help%%%%) for features you may have " +"missed. \n" +"\n" +"Thanks for signing up and we hope you enjoy using this service." +msgstr "" + +#: actions/register.php:561 +msgid "" +"(You should receive a message by email momentarily, with instructions on how " +"to confirm your email address.)" +msgstr "" + +#: actions/remotesubscribe.php:98 +#, php-format +msgid "" +"To subscribe, you can [login](%%action.login%%), or [register](%%action." +"register%%) a new account. If you already have an account on a [compatible " +"microblogging site](%%doc.openmublog%%), enter your profile URL below." +msgstr "" + +#: actions/remotesubscribe.php:112 +msgid "Remote subscribe" +msgstr "" + +#: actions/remotesubscribe.php:124 +msgid "Subscribe to a remote user" +msgstr "" + +#: actions/remotesubscribe.php:129 +msgid "User nickname" +msgstr "" + +#: actions/remotesubscribe.php:130 +msgid "Nickname of the user you want to follow" +msgstr "" + +#: actions/remotesubscribe.php:133 +msgid "Profile URL" +msgstr "" + +#: actions/remotesubscribe.php:134 +msgid "URL of your profile on another compatible microblogging service" +msgstr "" + +#: actions/remotesubscribe.php:137 lib/subscribeform.php:139 +#: lib/userprofile.php:365 +msgid "Subscribe" +msgstr "" + +#: actions/remotesubscribe.php:159 +msgid "Invalid profile URL (bad format)" +msgstr "" + +#: actions/remotesubscribe.php:168 +msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)." +msgstr "" + +#: actions/remotesubscribe.php:176 +msgid "That’s a local profile! Login to subscribe." +msgstr "" + +#: actions/remotesubscribe.php:183 +msgid "Couldn’t get a request token." +msgstr "" + +#: actions/repeat.php:57 +msgid "Only logged-in users can repeat notices." +msgstr "" + +#: actions/repeat.php:64 actions/repeat.php:71 +#, fuzzy +msgid "No notice specified." +msgstr "Nulle profilo specificate." + +#: actions/repeat.php:76 +msgid "You can't repeat your own notice." +msgstr "" + +#: actions/repeat.php:90 +#, fuzzy +msgid "You already repeated that notice." +msgstr "Tu ha ja blocate iste usator." + +#: actions/repeat.php:112 lib/noticelist.php:628 +msgid "Repeated" +msgstr "" + +#: actions/repeat.php:115 +msgid "Repeated!" +msgstr "" + +#: actions/replies.php:125 actions/repliesrss.php:68 +#: lib/personalgroupnav.php:105 +#, php-format +msgid "Replies to %s" +msgstr "" + +#: actions/replies.php:127 +#, php-format +msgid "Replies to %s, page %d" +msgstr "" + +#: actions/replies.php:144 +#, php-format +msgid "Replies feed for %s (RSS 1.0)" +msgstr "" + +#: actions/replies.php:151 +#, php-format +msgid "Replies feed for %s (RSS 2.0)" +msgstr "" + +#: actions/replies.php:158 +#, php-format +msgid "Replies feed for %s (Atom)" +msgstr "" + +#: actions/replies.php:198 +#, php-format +msgid "" +"This is the timeline showing replies to %s but %s hasn't received a notice " +"to his attention yet." +msgstr "" + +#: actions/replies.php:203 +#, php-format +msgid "" +"You can engage other users in a conversation, subscribe to more people or " +"[join groups](%%action.groups%%)." +msgstr "" + +#: actions/replies.php:205 +#, php-format +msgid "" +"You can try to [nudge %s](../%s) or [post something to his or her attention]" +"(%%%%action.newnotice%%%%?status_textarea=%s)." +msgstr "" + +#: actions/repliesrss.php:72 +#, php-format +msgid "Replies to %1$s on %2$s!" +msgstr "" + +#: actions/sandbox.php:65 actions/unsandbox.php:65 +msgid "You cannot sandbox users on this site." +msgstr "" + +#: actions/sandbox.php:72 +msgid "User is already sandboxed." +msgstr "" + +#: actions/showfavorites.php:79 +#, php-format +msgid "%s's favorite notices, page %d" +msgstr "" + +#: actions/showfavorites.php:132 +msgid "Could not retrieve favorite notices." +msgstr "" + +#: actions/showfavorites.php:170 +#, php-format +msgid "Feed for favorites of %s (RSS 1.0)" +msgstr "" + +#: actions/showfavorites.php:177 +#, php-format +msgid "Feed for favorites of %s (RSS 2.0)" +msgstr "" + +#: actions/showfavorites.php:184 +#, php-format +msgid "Feed for favorites of %s (Atom)" +msgstr "" + +#: actions/showfavorites.php:205 +msgid "" +"You haven't chosen any favorite notices yet. Click the fave button on " +"notices you like to bookmark them for later or shed a spotlight on them." +msgstr "" + +#: actions/showfavorites.php:207 +#, php-format +msgid "" +"%s hasn't added any notices to his favorites yet. Post something interesting " +"they would add to their favorites :)" +msgstr "" + +#: actions/showfavorites.php:211 +#, php-format +msgid "" +"%s hasn't added any notices to his favorites yet. Why not [register an " +"account](%%%%action.register%%%%) and then post something interesting they " +"would add to their favorites :)" +msgstr "" + +#: actions/showfavorites.php:242 +msgid "This is a way to share what you like." +msgstr "" + +#: actions/showgroup.php:82 lib/groupnav.php:86 +#, php-format +msgid "%s group" +msgstr "" + +#: actions/showgroup.php:84 +#, php-format +msgid "%s group, page %d" +msgstr "" + +#: actions/showgroup.php:218 +msgid "Group profile" +msgstr "" + +#: actions/showgroup.php:263 actions/tagother.php:118 +#: actions/userauthorization.php:167 lib/userprofile.php:177 +msgid "URL" +msgstr "" + +#: actions/showgroup.php:274 actions/tagother.php:128 +#: actions/userauthorization.php:179 lib/userprofile.php:194 +msgid "Note" +msgstr "" + +#: actions/showgroup.php:284 lib/groupeditform.php:184 +msgid "Aliases" +msgstr "" + +#: actions/showgroup.php:293 +msgid "Group actions" +msgstr "" + +#: actions/showgroup.php:328 +#, php-format +msgid "Notice feed for %s group (RSS 1.0)" +msgstr "" + +#: actions/showgroup.php:334 +#, php-format +msgid "Notice feed for %s group (RSS 2.0)" +msgstr "" + +#: actions/showgroup.php:340 +#, php-format +msgid "Notice feed for %s group (Atom)" +msgstr "" + +#: actions/showgroup.php:345 +#, php-format +msgid "FOAF for %s group" +msgstr "" + +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 +msgid "Members" +msgstr "" + +#: actions/showgroup.php:386 lib/profileaction.php:117 +#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 +#: lib/tagcloudsection.php:71 +msgid "(None)" +msgstr "" + +#: actions/showgroup.php:392 +msgid "All members" +msgstr "" + +#: actions/showgroup.php:429 lib/profileaction.php:174 +msgid "Statistics" +msgstr "" + +#: actions/showgroup.php:432 +msgid "Created" +msgstr "" + +#: actions/showgroup.php:448 +#, php-format +msgid "" +"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." +"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " +"[StatusNet](http://status.net/) tool. Its members share short messages about " +"their life and interests. [Join now](%%%%action.register%%%%) to become part " +"of this group and many more! ([Read more](%%%%doc.help%%%%))" +msgstr "" + +#: actions/showgroup.php:454 +#, php-format +msgid "" +"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." +"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " +"[StatusNet](http://status.net/) tool. Its members share short messages about " +"their life and interests. " +msgstr "" + +#: actions/showgroup.php:482 +msgid "Admins" +msgstr "" + +#: actions/showmessage.php:81 +msgid "No such message." +msgstr "" + +#: actions/showmessage.php:98 +msgid "Only the sender and recipient may read this message." +msgstr "" + +#: actions/showmessage.php:108 +#, php-format +msgid "Message to %1$s on %2$s" +msgstr "" + +#: actions/showmessage.php:113 +#, php-format +msgid "Message from %1$s on %2$s" +msgstr "" + +#: actions/shownotice.php:90 +msgid "Notice deleted." +msgstr "" + +#: actions/showstream.php:73 +#, php-format +msgid " tagged %s" +msgstr "" + +#: actions/showstream.php:79 +#, php-format +msgid "%s, page %d" +msgstr "" + +#: actions/showstream.php:122 +#, php-format +msgid "Notice feed for %s tagged %s (RSS 1.0)" +msgstr "" + +#: actions/showstream.php:129 +#, php-format +msgid "Notice feed for %s (RSS 1.0)" +msgstr "" + +#: actions/showstream.php:136 +#, php-format +msgid "Notice feed for %s (RSS 2.0)" +msgstr "" + +#: actions/showstream.php:143 +#, php-format +msgid "Notice feed for %s (Atom)" +msgstr "" + +#: actions/showstream.php:148 +#, php-format +msgid "FOAF for %s" +msgstr "" + +#: actions/showstream.php:191 +#, php-format +msgid "This is the timeline for %s but %s hasn't posted anything yet." +msgstr "" + +#: actions/showstream.php:196 +msgid "" +"Seen anything interesting recently? You haven't posted any notices yet, now " +"would be a good time to start :)" +msgstr "" + +#: actions/showstream.php:198 +#, php-format +msgid "" +"You can try to nudge %s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%s)." +msgstr "" + +#: actions/showstream.php:234 +#, php-format +msgid "" +"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en." +"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " +"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to " +"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))" +msgstr "" + +#: actions/showstream.php:239 +#, php-format +msgid "" +"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en." +"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " +"[StatusNet](http://status.net/) tool. " +msgstr "" + +#: actions/showstream.php:313 +#, php-format +msgid "Repeat of %s" +msgstr "" + +#: actions/silence.php:65 actions/unsilence.php:65 +msgid "You cannot silence users on this site." +msgstr "" + +#: actions/silence.php:72 +msgid "User is already silenced." +msgstr "" + +#: actions/siteadminpanel.php:69 +msgid "Basic settings for this StatusNet site." +msgstr "" + +#: actions/siteadminpanel.php:147 +msgid "Site name must have non-zero length." +msgstr "" + +#: actions/siteadminpanel.php:155 +msgid "You must have a valid contact email address" +msgstr "" + +#: actions/siteadminpanel.php:173 +#, php-format +msgid "Unknown language \"%s\"" +msgstr "" + +#: actions/siteadminpanel.php:180 +msgid "Invalid snapshot report URL." +msgstr "" + +#: actions/siteadminpanel.php:186 +msgid "Invalid snapshot run value." +msgstr "" + +#: actions/siteadminpanel.php:192 +msgid "Snapshot frequency must be a number." +msgstr "" + +#: actions/siteadminpanel.php:199 +msgid "You must set an SSL server when enabling SSL." +msgstr "" + +#: actions/siteadminpanel.php:204 +msgid "Invalid SSL server. The maximum length is 255 characters." +msgstr "" + +#: actions/siteadminpanel.php:210 +msgid "Minimum text limit is 140 characters." +msgstr "" + +#: actions/siteadminpanel.php:216 +msgid "Dupe limit must 1 or more seconds." +msgstr "" + +#: actions/siteadminpanel.php:266 +msgid "General" +msgstr "" + +#: actions/siteadminpanel.php:269 +msgid "Site name" +msgstr "" + +#: actions/siteadminpanel.php:270 +msgid "The name of your site, like \"Yourcompany Microblog\"" +msgstr "" + +#: actions/siteadminpanel.php:274 +msgid "Brought by" +msgstr "" + +#: actions/siteadminpanel.php:275 +msgid "Text used for credits link in footer of each page" +msgstr "" + +#: actions/siteadminpanel.php:279 +msgid "Brought by URL" +msgstr "" + +#: actions/siteadminpanel.php:280 +msgid "URL used for credits link in footer of each page" +msgstr "" + +#: actions/siteadminpanel.php:284 +msgid "Contact email address for your site" +msgstr "" + +#: actions/siteadminpanel.php:290 +msgid "Local" +msgstr "" + +#: actions/siteadminpanel.php:301 +msgid "Default timezone" +msgstr "" + +#: actions/siteadminpanel.php:302 +msgid "Default timezone for the site; usually UTC." +msgstr "" + +#: actions/siteadminpanel.php:308 +msgid "Default site language" +msgstr "" + +#: actions/siteadminpanel.php:316 +msgid "URLs" +msgstr "" + +#: actions/siteadminpanel.php:319 +msgid "Server" +msgstr "" + +#: actions/siteadminpanel.php:319 +msgid "Site's server hostname." +msgstr "" + +#: actions/siteadminpanel.php:323 +msgid "Fancy URLs" +msgstr "" + +#: actions/siteadminpanel.php:325 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "" + +#: actions/siteadminpanel.php:331 +msgid "Access" +msgstr "" + +#: actions/siteadminpanel.php:334 +msgid "Private" +msgstr "" + +#: actions/siteadminpanel.php:336 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "" + +#: actions/siteadminpanel.php:340 +msgid "Invite only" +msgstr "" + +#: actions/siteadminpanel.php:342 +msgid "Make registration invitation only." +msgstr "" + +#: actions/siteadminpanel.php:346 +msgid "Closed" +msgstr "" + +#: actions/siteadminpanel.php:348 +msgid "Disable new registrations." +msgstr "" + +#: actions/siteadminpanel.php:354 +msgid "Snapshots" +msgstr "" + +#: actions/siteadminpanel.php:357 +msgid "Randomly during Web hit" +msgstr "" + +#: actions/siteadminpanel.php:358 +msgid "In a scheduled job" +msgstr "" + +#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383 +msgid "Never" +msgstr "" + +#: actions/siteadminpanel.php:360 +msgid "Data snapshots" +msgstr "" + +#: actions/siteadminpanel.php:361 +msgid "When to send statistical data to status.net servers" +msgstr "" + +#: actions/siteadminpanel.php:366 +msgid "Frequency" +msgstr "" + +#: actions/siteadminpanel.php:367 +msgid "Snapshots will be sent once every N web hits" +msgstr "" + +#: actions/siteadminpanel.php:372 +msgid "Report URL" +msgstr "" + +#: actions/siteadminpanel.php:373 +msgid "Snapshots will be sent to this URL" +msgstr "" + +#: actions/siteadminpanel.php:380 +msgid "SSL" +msgstr "" + +#: actions/siteadminpanel.php:384 +msgid "Sometimes" +msgstr "" + +#: actions/siteadminpanel.php:385 +msgid "Always" +msgstr "" + +#: actions/siteadminpanel.php:387 +msgid "Use SSL" +msgstr "" + +#: actions/siteadminpanel.php:388 +msgid "When to use SSL" +msgstr "" + +#: actions/siteadminpanel.php:393 +msgid "SSL Server" +msgstr "" + +#: actions/siteadminpanel.php:394 +msgid "Server to direct SSL requests to" +msgstr "" + +#: actions/siteadminpanel.php:400 +msgid "Limits" +msgstr "" + +#: actions/siteadminpanel.php:403 +msgid "Text limit" +msgstr "" + +#: actions/siteadminpanel.php:403 +msgid "Maximum number of characters for notices." +msgstr "" + +#: actions/siteadminpanel.php:407 +msgid "Dupe limit" +msgstr "" + +#: actions/siteadminpanel.php:407 +msgid "How long users must wait (in seconds) to post the same thing again." +msgstr "" + +#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313 +msgid "Save site settings" +msgstr "" + +#: actions/smssettings.php:58 +msgid "SMS Settings" +msgstr "" + +#: actions/smssettings.php:69 +#, php-format +msgid "You can receive SMS messages through email from %%site.name%%." +msgstr "" + +#: actions/smssettings.php:91 +msgid "SMS is not available." +msgstr "" + +#: actions/smssettings.php:112 +msgid "Current confirmed SMS-enabled phone number." +msgstr "" + +#: actions/smssettings.php:123 +msgid "Awaiting confirmation on this phone number." +msgstr "" + +#: actions/smssettings.php:130 +msgid "Confirmation code" +msgstr "" + +#: actions/smssettings.php:131 +msgid "Enter the code you received on your phone." +msgstr "" + +#: actions/smssettings.php:138 +msgid "SMS Phone number" +msgstr "" + +#: actions/smssettings.php:140 +msgid "Phone number, no punctuation or spaces, with area code" +msgstr "" + +#: actions/smssettings.php:174 +msgid "" +"Send me notices through SMS; I understand I may incur exorbitant charges " +"from my carrier." +msgstr "" + +#: actions/smssettings.php:306 +msgid "No phone number." +msgstr "" + +#: actions/smssettings.php:311 +msgid "No carrier selected." +msgstr "" + +#: actions/smssettings.php:318 +msgid "That is already your phone number." +msgstr "" + +#: actions/smssettings.php:321 +msgid "That phone number already belongs to another user." +msgstr "" + +#: actions/smssettings.php:347 +msgid "" +"A confirmation code was sent to the phone number you added. Check your phone " +"for the code and instructions on how to use it." +msgstr "" + +#: actions/smssettings.php:374 +msgid "That is the wrong confirmation number." +msgstr "" + +#: actions/smssettings.php:405 +msgid "That is not your phone number." +msgstr "" + +#: actions/smssettings.php:465 +msgid "Mobile carrier" +msgstr "" + +#: actions/smssettings.php:469 +msgid "Select a carrier" +msgstr "" + +#: actions/smssettings.php:476 +#, php-format +msgid "" +"Mobile carrier for your phone. If you know a carrier that accepts SMS over " +"email but isn't listed here, send email to let us know at %s." +msgstr "" + +#: actions/smssettings.php:498 +msgid "No code entered" +msgstr "" + +#: actions/subedit.php:70 +msgid "You are not subscribed to that profile." +msgstr "" + +#: actions/subedit.php:83 +msgid "Could not save subscription." +msgstr "" + +#: actions/subscribe.php:55 +msgid "Not a local user." +msgstr "" + +#: actions/subscribe.php:69 +msgid "Subscribed" +msgstr "" + +#: actions/subscribers.php:50 +#, php-format +msgid "%s subscribers" +msgstr "" + +#: actions/subscribers.php:52 +#, php-format +msgid "%s subscribers, page %d" +msgstr "" + +#: actions/subscribers.php:63 +msgid "These are the people who listen to your notices." +msgstr "" + +#: actions/subscribers.php:67 +#, php-format +msgid "These are the people who listen to %s's notices." +msgstr "" + +#: actions/subscribers.php:108 +msgid "" +"You have no subscribers. Try subscribing to people you know and they might " +"return the favor" +msgstr "" + +#: actions/subscribers.php:110 +#, php-format +msgid "%s has no subscribers. Want to be the first?" +msgstr "" + +#: actions/subscribers.php:114 +#, php-format +msgid "" +"%s has no subscribers. Why not [register an account](%%%%action.register%%%" +"%) and be the first?" +msgstr "" + +#: actions/subscriptions.php:52 +#, php-format +msgid "%s subscriptions" +msgstr "" + +#: actions/subscriptions.php:54 +#, php-format +msgid "%s subscriptions, page %d" +msgstr "" + +#: actions/subscriptions.php:65 +msgid "These are the people whose notices you listen to." +msgstr "" + +#: actions/subscriptions.php:69 +#, php-format +msgid "These are the people whose notices %s listens to." +msgstr "" + +#: actions/subscriptions.php:121 +#, php-format +msgid "" +"You're not listening to anyone's notices right now, try subscribing to " +"people you know. Try [people search](%%action.peoplesearch%%), look for " +"members in groups you're interested in and in our [featured users](%%action." +"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can " +"automatically subscribe to people you already follow there." +msgstr "" + +#: actions/subscriptions.php:123 actions/subscriptions.php:127 +#, php-format +msgid "%s is not listening to anyone." +msgstr "" + +#: actions/subscriptions.php:194 +msgid "Jabber" +msgstr "" + +#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115 +msgid "SMS" +msgstr "" + +#: actions/tag.php:68 +#, php-format +msgid "Notices tagged with %s, page %d" +msgstr "" + +#: actions/tag.php:86 +#, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "" + +#: actions/tag.php:92 +#, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "" + +#: actions/tag.php:98 +#, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "" + +#: actions/tagother.php:33 +msgid "Not logged in" +msgstr "" + +#: actions/tagother.php:39 +msgid "No id argument." +msgstr "" + +#: actions/tagother.php:65 +#, php-format +msgid "Tag %s" +msgstr "" + +#: actions/tagother.php:77 lib/userprofile.php:75 +msgid "User profile" +msgstr "" + +#: actions/tagother.php:81 lib/userprofile.php:102 +msgid "Photo" +msgstr "" + +#: actions/tagother.php:141 +msgid "Tag user" +msgstr "" + +#: actions/tagother.php:151 +msgid "" +"Tags for this user (letters, numbers, -, ., and _), comma- or space- " +"separated" +msgstr "" + +#: actions/tagother.php:193 +msgid "" +"You can only tag people you are subscribed to or who are subscribed to you." +msgstr "" + +#: actions/tagother.php:200 +msgid "Could not save tags." +msgstr "" + +#: actions/tagother.php:236 +msgid "Use this form to add tags to your subscribers or subscriptions." +msgstr "" + +#: actions/tagrss.php:35 +msgid "No such tag." +msgstr "" + +#: actions/twitapitrends.php:87 +msgid "API method under construction." +msgstr "" + +#: actions/unblock.php:59 +msgid "You haven't blocked that user." +msgstr "" + +#: actions/unsandbox.php:72 +msgid "User is not sandboxed." +msgstr "" + +#: actions/unsilence.php:72 +msgid "User is not silenced." +msgstr "" + +#: actions/unsubscribe.php:77 +msgid "No profile id in request." +msgstr "" + +#: actions/unsubscribe.php:84 +msgid "No profile with that id." +msgstr "" + +#: actions/unsubscribe.php:98 +msgid "Unsubscribed" +msgstr "" + +#: actions/updateprofile.php:62 actions/userauthorization.php:330 +#, php-format +msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +msgstr "" + +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: lib/personalgroupnav.php:115 +msgid "User" +msgstr "" + +#: actions/useradminpanel.php:69 +msgid "User settings for this StatusNet site." +msgstr "" + +#: actions/useradminpanel.php:149 +msgid "Invalid bio limit. Must be numeric." +msgstr "" + +#: actions/useradminpanel.php:155 +msgid "Invalid welcome text. Max length is 255 characters." +msgstr "" + +#: actions/useradminpanel.php:165 +#, php-format +msgid "Invalid default subscripton: '%1$s' is not user." +msgstr "" + +#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: lib/personalgroupnav.php:109 +msgid "Profile" +msgstr "" + +#: actions/useradminpanel.php:222 +msgid "Bio Limit" +msgstr "" + +#: actions/useradminpanel.php:223 +msgid "Maximum length of a profile bio in characters." +msgstr "" + +#: actions/useradminpanel.php:231 +msgid "New users" +msgstr "" + +#: actions/useradminpanel.php:235 +msgid "New user welcome" +msgstr "" + +#: actions/useradminpanel.php:236 +msgid "Welcome text for new users (Max 255 chars)." +msgstr "" + +#: actions/useradminpanel.php:241 +msgid "Default subscription" +msgstr "" + +#: actions/useradminpanel.php:242 +msgid "Automatically subscribe new users to this user." +msgstr "" + +#: actions/useradminpanel.php:251 +msgid "Invitations" +msgstr "" + +#: actions/useradminpanel.php:256 +msgid "Invitations enabled" +msgstr "" + +#: actions/useradminpanel.php:258 +msgid "Whether to allow users to invite new users." +msgstr "" + +#: actions/useradminpanel.php:265 +msgid "Sessions" +msgstr "" + +#: actions/useradminpanel.php:270 +msgid "Handle sessions" +msgstr "" + +#: actions/useradminpanel.php:272 +msgid "Whether to handle sessions ourselves." +msgstr "" + +#: actions/useradminpanel.php:276 +msgid "Session debugging" +msgstr "" + +#: actions/useradminpanel.php:278 +msgid "Turn on debugging output for sessions." +msgstr "" + +#: actions/userauthorization.php:105 +msgid "Authorize subscription" +msgstr "" + +#: actions/userauthorization.php:110 +msgid "" +"Please check these details to make sure that you want to subscribe to this " +"user’s notices. If you didn’t just ask to subscribe to someone’s notices, " +"click “Reject”." +msgstr "" + +#: actions/userauthorization.php:188 +msgid "License" +msgstr "" + +#: actions/userauthorization.php:209 +msgid "Accept" +msgstr "" + +#: actions/userauthorization.php:210 lib/subscribeform.php:115 +#: lib/subscribeform.php:139 +msgid "Subscribe to this user" +msgstr "" + +#: actions/userauthorization.php:211 +msgid "Reject" +msgstr "" + +#: actions/userauthorization.php:212 +msgid "Reject this subscription" +msgstr "" + +#: actions/userauthorization.php:225 +msgid "No authorization request!" +msgstr "" + +#: actions/userauthorization.php:247 +msgid "Subscription authorized" +msgstr "" + +#: actions/userauthorization.php:249 +msgid "" +"The subscription has been authorized, but no callback URL was passed. Check " +"with the site’s instructions for details on how to authorize the " +"subscription. Your subscription token is:" +msgstr "" + +#: actions/userauthorization.php:259 +msgid "Subscription rejected" +msgstr "" + +#: actions/userauthorization.php:261 +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 "" + +#: actions/userauthorization.php:296 +#, php-format +msgid "Listener URI ‘%s’ not found here" +msgstr "" + +#: actions/userauthorization.php:301 +#, php-format +msgid "Listenee URI ‘%s’ is too long." +msgstr "" + +#: actions/userauthorization.php:307 +#, php-format +msgid "Listenee URI ‘%s’ is a local user." +msgstr "" + +#: actions/userauthorization.php:322 +#, php-format +msgid "Profile URL ‘%s’ is for a local user." +msgstr "" + +#: actions/userauthorization.php:338 +#, php-format +msgid "Avatar URL ‘%s’ is not valid." +msgstr "" + +#: actions/userauthorization.php:343 +#, php-format +msgid "Can’t read avatar URL ‘%s’." +msgstr "" + +#: actions/userauthorization.php:348 +#, php-format +msgid "Wrong image type for avatar URL ‘%s’." +msgstr "" + +#: actions/userbyid.php:70 +msgid "No id." +msgstr "" + +#: actions/userdesignsettings.php:76 lib/designsettings.php:65 +msgid "Profile design" +msgstr "" + +#: actions/userdesignsettings.php:87 lib/designsettings.php:76 +msgid "" +"Customize the way your profile looks with a background image and a colour " +"palette of your choice." +msgstr "" + +#: actions/userdesignsettings.php:282 +msgid "Enjoy your hotdog!" +msgstr "" + +#: actions/usergroups.php:64 +#, php-format +msgid "%s groups, page %d" +msgstr "" + +#: actions/usergroups.php:130 +msgid "Search for more groups" +msgstr "" + +#: actions/usergroups.php:153 +#, php-format +msgid "%s is not a member of any group." +msgstr "" + +#: actions/usergroups.php:158 +#, php-format +msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." +msgstr "" + +#: classes/File.php:137 +#, php-format +msgid "" +"No file may be larger than %d bytes and the file you sent was %d bytes. Try " +"to upload a smaller version." +msgstr "" + +#: classes/File.php:147 +#, php-format +msgid "A file this large would exceed your user quota of %d bytes." +msgstr "" + +#: classes/File.php:154 +#, php-format +msgid "A file this large would exceed your monthly quota of %d bytes." +msgstr "" + +#: classes/Message.php:45 +msgid "You are banned from sending direct messages." +msgstr "" + +#: classes/Message.php:61 +msgid "Could not insert message." +msgstr "" + +#: classes/Message.php:71 +msgid "Could not update message with new URI." +msgstr "" + +#: classes/Notice.php:172 +#, php-format +msgid "DB error inserting hashtag: %s" +msgstr "" + +#: classes/Notice.php:196 +msgid "Problem saving notice. Too long." +msgstr "" + +#: classes/Notice.php:200 +msgid "Problem saving notice. Unknown user." +msgstr "" + +#: classes/Notice.php:205 +msgid "" +"Too many notices too fast; take a breather and post again in a few minutes." +msgstr "" + +#: classes/Notice.php:211 +msgid "" +"Too many duplicate messages too quickly; take a breather and post again in a " +"few minutes." +msgstr "" + +#: classes/Notice.php:217 +msgid "You are banned from posting notices on this site." +msgstr "" + +#: classes/Notice.php:289 classes/Notice.php:314 +msgid "Problem saving notice." +msgstr "" + +#: classes/Notice.php:993 +#, php-format +msgid "DB error inserting reply: %s" +msgstr "" + +#: classes/Notice.php:1320 +#, php-format +msgid "RT @%1$s %2$s" +msgstr "" + +#: classes/User.php:347 +#, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "" + +#: classes/User_group.php:380 +msgid "Could not create group." +msgstr "" + +#: classes/User_group.php:409 +msgid "Could not set group membership." +msgstr "" + +#: lib/accountsettingsaction.php:108 +msgid "Change your profile settings" +msgstr "" + +#: lib/accountsettingsaction.php:112 +msgid "Upload an avatar" +msgstr "" + +#: lib/accountsettingsaction.php:116 +msgid "Change your password" +msgstr "" + +#: lib/accountsettingsaction.php:120 +msgid "Change email handling" +msgstr "" + +#: lib/accountsettingsaction.php:124 +msgid "Design your profile" +msgstr "" + +#: lib/accountsettingsaction.php:128 +msgid "Other" +msgstr "" + +#: lib/accountsettingsaction.php:128 +msgid "Other options" +msgstr "" + +#: lib/action.php:144 +#, php-format +msgid "%s - %s" +msgstr "" + +#: lib/action.php:159 +msgid "Untitled page" +msgstr "" + +#: lib/action.php:425 +msgid "Primary site navigation" +msgstr "" + +#: lib/action.php:431 +msgid "Home" +msgstr "" + +#: lib/action.php:431 +msgid "Personal profile and friends timeline" +msgstr "" + +#: lib/action.php:433 +msgid "Account" +msgstr "" + +#: lib/action.php:433 +msgid "Change your email, avatar, password, profile" +msgstr "" + +#: lib/action.php:436 +msgid "Connect" +msgstr "" + +#: lib/action.php:436 +msgid "Connect to services" +msgstr "" + +#: lib/action.php:440 +msgid "Change site configuration" +msgstr "" + +#: lib/action.php:444 lib/subgroupnav.php:105 +msgid "Invite" +msgstr "" + +#: lib/action.php:445 lib/subgroupnav.php:106 +#, php-format +msgid "Invite friends and colleagues to join you on %s" +msgstr "" + +#: lib/action.php:450 +msgid "Logout" +msgstr "" + +#: lib/action.php:450 +msgid "Logout from the site" +msgstr "" + +#: lib/action.php:455 +msgid "Create an account" +msgstr "" + +#: lib/action.php:458 +msgid "Login to the site" +msgstr "" + +#: lib/action.php:461 lib/action.php:724 +msgid "Help" +msgstr "" + +#: lib/action.php:461 +msgid "Help me!" +msgstr "" + +#: lib/action.php:464 lib/searchaction.php:127 +msgid "Search" +msgstr "" + +#: lib/action.php:464 +msgid "Search for people or text" +msgstr "" + +#: lib/action.php:485 +msgid "Site notice" +msgstr "" + +#: lib/action.php:551 +msgid "Local views" +msgstr "" + +#: lib/action.php:617 +msgid "Page notice" +msgstr "" + +#: lib/action.php:719 +msgid "Secondary site navigation" +msgstr "" + +#: lib/action.php:726 +msgid "About" +msgstr "" + +#: lib/action.php:728 +msgid "FAQ" +msgstr "" + +#: lib/action.php:732 +msgid "TOS" +msgstr "" + +#: lib/action.php:735 +msgid "Privacy" +msgstr "" + +#: lib/action.php:737 +msgid "Source" +msgstr "" + +#: lib/action.php:739 +msgid "Contact" +msgstr "" + +#: lib/action.php:741 +msgid "Badge" +msgstr "" + +#: lib/action.php:769 +msgid "StatusNet software license" +msgstr "" + +#: lib/action.php:772 +#, php-format +msgid "" +"**%%site.name%%** is a microblogging service brought to you by [%%site." +"broughtby%%](%%site.broughtbyurl%%). " +msgstr "" + +#: lib/action.php:774 +#, php-format +msgid "**%%site.name%%** is a microblogging service. " +msgstr "" + +#: lib/action.php:776 +#, php-format +msgid "" +"It runs the [StatusNet](http://status.net/) microblogging software, version %" +"s, available under the [GNU Affero General Public License](http://www.fsf." +"org/licensing/licenses/agpl-3.0.html)." +msgstr "" + +#: lib/action.php:790 +msgid "Site content license" +msgstr "" + +#: lib/action.php:799 +msgid "All " +msgstr "" + +#: lib/action.php:804 +msgid "license." +msgstr "" + +#: lib/action.php:1098 +msgid "Pagination" +msgstr "" + +#: lib/action.php:1107 +msgid "After" +msgstr "" + +#: lib/action.php:1115 +msgid "Before" +msgstr "" + +#: lib/action.php:1163 +msgid "There was a problem with your session token." +msgstr "" + +#: lib/adminpanelaction.php:96 +msgid "You cannot make changes to this site." +msgstr "" + +#: lib/adminpanelaction.php:195 +msgid "showForm() not implemented." +msgstr "" + +#: lib/adminpanelaction.php:224 +msgid "saveSettings() not implemented." +msgstr "" + +#: lib/adminpanelaction.php:247 +msgid "Unable to delete design setting." +msgstr "" + +#: lib/adminpanelaction.php:300 +msgid "Basic site configuration" +msgstr "" + +#: lib/adminpanelaction.php:303 +msgid "Design configuration" +msgstr "" + +#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +msgid "Paths configuration" +msgstr "" + +#: lib/attachmentlist.php:87 +msgid "Attachments" +msgstr "" + +#: lib/attachmentlist.php:265 +msgid "Author" +msgstr "" + +#: lib/attachmentlist.php:278 +msgid "Provider" +msgstr "" + +#: lib/attachmentnoticesection.php:67 +msgid "Notices where this attachment appears" +msgstr "" + +#: lib/attachmenttagcloudsection.php:48 +msgid "Tags for this attachment" +msgstr "" + +#: lib/channel.php:138 lib/channel.php:158 +msgid "Command results" +msgstr "" + +#: lib/channel.php:210 +msgid "Command complete" +msgstr "" + +#: lib/channel.php:221 +msgid "Command failed" +msgstr "" + +#: lib/command.php:44 +msgid "Sorry, this command is not yet implemented." +msgstr "" + +#: lib/command.php:88 +#, php-format +msgid "Could not find a user with nickname %s" +msgstr "" + +#: lib/command.php:92 +msgid "It does not make a lot of sense to nudge yourself!" +msgstr "" + +#: lib/command.php:99 +#, php-format +msgid "Nudge sent to %s" +msgstr "" + +#: lib/command.php:126 +#, php-format +msgid "" +"Subscriptions: %1$s\n" +"Subscribers: %2$s\n" +"Notices: %3$s" +msgstr "" + +#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +msgid "Notice with that id does not exist" +msgstr "" + +#: lib/command.php:168 lib/command.php:414 lib/command.php:475 +#: lib/command.php:531 +msgid "User has no last notice" +msgstr "" + +#: lib/command.php:190 +msgid "Notice marked as fave." +msgstr "" + +#: lib/command.php:315 +#, php-format +msgid "%1$s (%2$s)" +msgstr "" + +#: lib/command.php:318 +#, php-format +msgid "Fullname: %s" +msgstr "" + +#: lib/command.php:321 +#, php-format +msgid "Location: %s" +msgstr "" + +#: lib/command.php:324 +#, php-format +msgid "Homepage: %s" +msgstr "" + +#: lib/command.php:327 +#, php-format +msgid "About: %s" +msgstr "" + +#: lib/command.php:358 scripts/xmppdaemon.php:321 +#, php-format +msgid "Message too long - maximum is %d characters, you sent %d" +msgstr "" + +#: lib/command.php:377 +msgid "Error sending direct message." +msgstr "" + +#: lib/command.php:434 +#, php-format +msgid "Notice from %s repeated" +msgstr "" + +#: lib/command.php:436 +#, fuzzy +msgid "Error repeating notice." +msgstr "Error in actualisar le profilo remote" + +#: lib/command.php:490 +#, php-format +msgid "Notice too long - maximum is %d characters, you sent %d" +msgstr "" + +#: lib/command.php:499 +#, php-format +msgid "Reply to %s sent" +msgstr "" + +#: lib/command.php:501 +msgid "Error saving notice." +msgstr "" + +#: lib/command.php:555 +msgid "Specify the name of the user to subscribe to" +msgstr "" + +#: lib/command.php:562 +#, php-format +msgid "Subscribed to %s" +msgstr "" + +#: lib/command.php:583 +msgid "Specify the name of the user to unsubscribe from" +msgstr "" + +#: lib/command.php:590 +#, php-format +msgid "Unsubscribed from %s" +msgstr "" + +#: lib/command.php:608 lib/command.php:631 +msgid "Command not yet implemented." +msgstr "" + +#: lib/command.php:611 +msgid "Notification off." +msgstr "" + +#: lib/command.php:613 +msgid "Can't turn off notification." +msgstr "" + +#: lib/command.php:634 +msgid "Notification on." +msgstr "" + +#: lib/command.php:636 +msgid "Can't turn on notification." +msgstr "" + +#: lib/command.php:649 +msgid "Login command is disabled" +msgstr "" + +#: lib/command.php:663 +#, php-format +msgid "Could not create login token for %s" +msgstr "" + +#: lib/command.php:668 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:684 +msgid "You are not subscribed to anyone." +msgstr "" + +#: lib/command.php:686 +msgid "You are subscribed to this person:" +msgid_plural "You are subscribed to these people:" +msgstr[0] "" +msgstr[1] "" + +#: lib/command.php:706 +msgid "No one is subscribed to you." +msgstr "" + +#: lib/command.php:708 +msgid "This person is subscribed to you:" +msgid_plural "These people are subscribed to you:" +msgstr[0] "" +msgstr[1] "" + +#: lib/command.php:728 +msgid "You are not a member of any groups." +msgstr "" + +#: lib/command.php:730 +msgid "You are a member of this group:" +msgid_plural "You are a member of these groups:" +msgstr[0] "" +msgstr[1] "" + +#: lib/command.php:744 +msgid "" +"Commands:\n" +"on - turn on notifications\n" +"off - turn off notifications\n" +"help - show this help\n" +"follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" +"leave - unsubscribe from user\n" +"d - direct message to user\n" +"get - get last notice from user\n" +"whois - get profile info on user\n" +"fav - add user's last notice as a 'fave'\n" +"fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" +"reply # - reply to notice with a given id\n" +"reply - reply to the last notice from user\n" +"join - join group\n" +"login - Get a link to login to the web interface\n" +"drop - leave group\n" +"stats - get your stats\n" +"stop - same as 'off'\n" +"quit - same as 'off'\n" +"sub - same as 'follow'\n" +"unsub - same as 'leave'\n" +"last - same as 'get'\n" +"on - not yet implemented.\n" +"off - not yet implemented.\n" +"nudge - remind a user to update.\n" +"invite - not yet implemented.\n" +"track - not yet implemented.\n" +"untrack - not yet implemented.\n" +"track off - not yet implemented.\n" +"untrack all - not yet implemented.\n" +"tracks - not yet implemented.\n" +"tracking - not yet implemented.\n" +msgstr "" + +#: lib/common.php:199 +msgid "No configuration file found. " +msgstr "" + +#: lib/common.php:200 +msgid "I looked for configuration files in the following places: " +msgstr "" + +#: lib/common.php:201 +msgid "You may wish to run the installer to fix this." +msgstr "" + +#: lib/common.php:202 +msgid "Go to the installer." +msgstr "" + +#: lib/connectsettingsaction.php:110 +msgid "IM" +msgstr "" + +#: lib/connectsettingsaction.php:111 +msgid "Updates by instant messenger (IM)" +msgstr "" + +#: lib/connectsettingsaction.php:116 +msgid "Updates by SMS" +msgstr "" + +#: lib/dberroraction.php:60 +msgid "Database error" +msgstr "" + +#: lib/designsettings.php:105 +msgid "Upload file" +msgstr "" + +#: lib/designsettings.php:109 +msgid "" +"You can upload your personal background image. The maximum file size is 2MB." +msgstr "" + +#: lib/designsettings.php:418 +msgid "Design defaults restored." +msgstr "" + +#: lib/disfavorform.php:114 lib/disfavorform.php:140 +msgid "Disfavor this notice" +msgstr "" + +#: lib/favorform.php:114 lib/favorform.php:140 +msgid "Favor this notice" +msgstr "" + +#: lib/favorform.php:140 +msgid "Favor" +msgstr "" + +#: lib/feed.php:85 +msgid "RSS 1.0" +msgstr "" + +#: lib/feed.php:87 +msgid "RSS 2.0" +msgstr "" + +#: lib/feed.php:89 +msgid "Atom" +msgstr "" + +#: lib/feed.php:91 +msgid "FOAF" +msgstr "" + +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "" + +#: lib/galleryaction.php:121 +msgid "Filter tags" +msgstr "" + +#: lib/galleryaction.php:131 +msgid "All" +msgstr "" + +#: lib/galleryaction.php:139 +msgid "Select tag to filter" +msgstr "" + +#: lib/galleryaction.php:140 +msgid "Tag" +msgstr "" + +#: lib/galleryaction.php:141 +msgid "Choose a tag to narrow list" +msgstr "" + +#: lib/galleryaction.php:143 +msgid "Go" +msgstr "" + +#: lib/groupeditform.php:163 +msgid "URL of the homepage or blog of the group or topic" +msgstr "" + +#: lib/groupeditform.php:168 +msgid "Describe the group or topic" +msgstr "" + +#: lib/groupeditform.php:170 +#, php-format +msgid "Describe the group or topic in %d characters" +msgstr "" + +#: lib/groupeditform.php:172 +msgid "Description" +msgstr "" + +#: lib/groupeditform.php:179 +msgid "" +"Location for the group, if any, like \"City, State (or Region), Country\"" +msgstr "" + +#: lib/groupeditform.php:187 +#, php-format +msgid "Extra nicknames for the group, comma- or space- separated, max %d" +msgstr "" + +#: lib/groupnav.php:85 +msgid "Group" +msgstr "" + +#: lib/groupnav.php:101 +msgid "Blocked" +msgstr "" + +#: lib/groupnav.php:102 +#, php-format +msgid "%s blocked users" +msgstr "" + +#: lib/groupnav.php:108 +#, php-format +msgid "Edit %s group properties" +msgstr "" + +#: lib/groupnav.php:113 +msgid "Logo" +msgstr "" + +#: lib/groupnav.php:114 +#, php-format +msgid "Add or edit %s logo" +msgstr "" + +#: lib/groupnav.php:120 +#, php-format +msgid "Add or edit %s design" +msgstr "" + +#: lib/groupsbymemberssection.php:71 +msgid "Groups with most members" +msgstr "" + +#: lib/groupsbypostssection.php:71 +msgid "Groups with most posts" +msgstr "" + +#: lib/grouptagcloudsection.php:56 +#, php-format +msgid "Tags in %s group's notices" +msgstr "" + +#: lib/htmloutputter.php:103 +msgid "This page is not available in a media type you accept" +msgstr "" + +#: lib/imagefile.php:75 +#, php-format +msgid "That file is too big. The maximum file size is %s." +msgstr "" + +#: lib/imagefile.php:80 +msgid "Partial upload." +msgstr "" + +#: lib/imagefile.php:88 lib/mediafile.php:170 +msgid "System error uploading file." +msgstr "" + +#: lib/imagefile.php:96 +msgid "Not an image or corrupt file." +msgstr "" + +#: lib/imagefile.php:105 +msgid "Unsupported image file format." +msgstr "" + +#: lib/imagefile.php:118 +msgid "Lost our file." +msgstr "" + +#: lib/imagefile.php:150 lib/imagefile.php:197 +msgid "Unknown file type" +msgstr "" + +#: lib/imagefile.php:217 +msgid "MB" +msgstr "" + +#: lib/imagefile.php:219 +msgid "kB" +msgstr "" + +#: lib/jabber.php:191 +#, php-format +msgid "[%s]" +msgstr "" + +#: lib/joinform.php:114 +msgid "Join" +msgstr "" + +#: lib/leaveform.php:114 +msgid "Leave" +msgstr "" + +#: lib/logingroupnav.php:80 +msgid "Login with a username and password" +msgstr "" + +#: lib/logingroupnav.php:86 +msgid "Sign up for a new account" +msgstr "" + +#: lib/mail.php:172 +msgid "Email address confirmation" +msgstr "" + +#: lib/mail.php:174 +#, php-format +msgid "" +"Hey, %s.\n" +"\n" +"Someone just entered this email address on %s.\n" +"\n" +"If it was you, and you want to confirm your entry, use the URL below:\n" +"\n" +"\t%s\n" +"\n" +"If not, just ignore this message.\n" +"\n" +"Thanks for your time, \n" +"%s\n" +msgstr "" + +#: lib/mail.php:236 +#, php-format +msgid "%1$s is now listening to your notices on %2$s." +msgstr "" + +#: lib/mail.php:241 +#, php-format +msgid "" +"%1$s is now listening to your notices on %2$s.\n" +"\n" +"\t%3$s\n" +"\n" +"%4$s%5$s%6$s\n" +"Faithfully yours,\n" +"%7$s.\n" +"\n" +"----\n" +"Change your email address or notification options at %8$s\n" +msgstr "" + +#: lib/mail.php:254 +#, php-format +msgid "Location: %s\n" +msgstr "" + +#: lib/mail.php:256 +#, php-format +msgid "Homepage: %s\n" +msgstr "" + +#: lib/mail.php:258 +#, php-format +msgid "" +"Bio: %s\n" +"\n" +msgstr "" + +#: lib/mail.php:286 +#, php-format +msgid "New email address for posting to %s" +msgstr "" + +#: lib/mail.php:289 +#, php-format +msgid "" +"You have a new posting address on %1$s.\n" +"\n" +"Send email to %2$s to post new messages.\n" +"\n" +"More email instructions at %3$s.\n" +"\n" +"Faithfully yours,\n" +"%4$s" +msgstr "" + +#: lib/mail.php:413 +#, php-format +msgid "%s status" +msgstr "" + +#: lib/mail.php:439 +msgid "SMS confirmation" +msgstr "" + +#: lib/mail.php:463 +#, php-format +msgid "You've been nudged by %s" +msgstr "" + +#: lib/mail.php:467 +#, php-format +msgid "" +"%1$s (%2$s) is wondering what you are up to these days and is inviting you " +"to post some news.\n" +"\n" +"So let's hear from you :)\n" +"\n" +"%3$s\n" +"\n" +"Don't reply to this email; it won't get to them.\n" +"\n" +"With kind regards,\n" +"%4$s\n" +msgstr "" + +#: lib/mail.php:510 +#, php-format +msgid "New private message from %s" +msgstr "" + +#: lib/mail.php:514 +#, php-format +msgid "" +"%1$s (%2$s) sent you a private message:\n" +"\n" +"------------------------------------------------------\n" +"%3$s\n" +"------------------------------------------------------\n" +"\n" +"You can reply to their message here:\n" +"\n" +"%4$s\n" +"\n" +"Don't reply to this email; it won't get to them.\n" +"\n" +"With kind regards,\n" +"%5$s\n" +msgstr "" + +#: lib/mail.php:559 +#, php-format +msgid "%s (@%s) added your notice as a favorite" +msgstr "" + +#: lib/mail.php:561 +#, php-format +msgid "" +"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" +"\n" +"The URL of your notice is:\n" +"\n" +"%3$s\n" +"\n" +"The text of your notice is:\n" +"\n" +"%4$s\n" +"\n" +"You can see the list of %1$s's favorites here:\n" +"\n" +"%5$s\n" +"\n" +"Faithfully yours,\n" +"%6$s\n" +msgstr "" + +#: lib/mail.php:620 +#, php-format +msgid "%s (@%s) sent a notice to your attention" +msgstr "" + +#: lib/mail.php:622 +#, php-format +msgid "" +"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" +"\n" +"The notice is here:\n" +"\n" +"\t%3$s\n" +"\n" +"It reads:\n" +"\n" +"\t%4$s\n" +"\n" +msgstr "" + +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "" + +#: 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 "" + +#: lib/mailbox.php:227 lib/noticelist.php:468 +msgid "from" +msgstr "" + +#: lib/mediafile.php:98 lib/mediafile.php:123 +msgid "There was a database error while saving your file. Please try again." +msgstr "" + +#: lib/mediafile.php:142 +msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." +msgstr "" + +#: lib/mediafile.php:147 +msgid "" +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " +"the HTML form." +msgstr "" + +#: lib/mediafile.php:152 +msgid "The uploaded file was only partially uploaded." +msgstr "" + +#: lib/mediafile.php:159 +msgid "Missing a temporary folder." +msgstr "" + +#: lib/mediafile.php:162 +msgid "Failed to write file to disk." +msgstr "" + +#: lib/mediafile.php:165 +msgid "File upload stopped by extension." +msgstr "" + +#: lib/mediafile.php:179 lib/mediafile.php:216 +msgid "File exceeds user's quota!" +msgstr "" + +#: lib/mediafile.php:196 lib/mediafile.php:233 +msgid "File could not be moved to destination directory." +msgstr "" + +#: lib/mediafile.php:201 lib/mediafile.php:237 +msgid "Could not determine file's mime-type!" +msgstr "" + +#: lib/mediafile.php:270 +#, php-format +msgid " Try using another %s format." +msgstr "" + +#: lib/mediafile.php:275 +#, php-format +msgid "%s is not a supported filetype on this server." +msgstr "" + +#: lib/messageform.php:120 +msgid "Send a direct notice" +msgstr "" + +#: lib/messageform.php:146 +msgid "To" +msgstr "" + +#: lib/messageform.php:159 lib/noticeform.php:183 +msgid "Available characters" +msgstr "" + +#: lib/noticeform.php:158 +msgid "Send a notice" +msgstr "" + +#: lib/noticeform.php:171 +#, php-format +msgid "What's up, %s?" +msgstr "" + +#: lib/noticeform.php:190 +msgid "Attach" +msgstr "" + +#: lib/noticeform.php:194 +msgid "Attach a file" +msgstr "" + +#: lib/noticelist.php:419 +#, php-format +msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" +msgstr "" + +#: lib/noticelist.php:420 +msgid "N" +msgstr "" + +#: lib/noticelist.php:420 +msgid "S" +msgstr "" + +#: lib/noticelist.php:421 +msgid "E" +msgstr "" + +#: lib/noticelist.php:421 +msgid "W" +msgstr "" + +#: lib/noticelist.php:427 +msgid "at" +msgstr "" + +#: lib/noticelist.php:522 +msgid "in context" +msgstr "" + +#: lib/noticelist.php:588 +msgid "Reply to this notice" +msgstr "" + +#: lib/noticelist.php:589 +msgid "Reply" +msgstr "" + +#: lib/nudgeform.php:116 +msgid "Nudge this user" +msgstr "" + +#: lib/nudgeform.php:128 +msgid "Nudge" +msgstr "" + +#: lib/nudgeform.php:128 +msgid "Send a nudge to this user" +msgstr "" + +#: lib/oauthstore.php:283 +msgid "Error inserting new profile" +msgstr "" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar" +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile" +msgstr "" + +#: lib/oauthstore.php:345 +msgid "Duplicate notice" +msgstr "" + +#: lib/oauthstore.php:466 lib/subs.php:48 +msgid "You have been banned from subscribing." +msgstr "" + +#: lib/oauthstore.php:491 +msgid "Couldn't insert new subscription." +msgstr "" + +#: lib/personalgroupnav.php:99 +msgid "Personal" +msgstr "" + +#: lib/personalgroupnav.php:104 +msgid "Replies" +msgstr "" + +#: lib/personalgroupnav.php:114 +msgid "Favorites" +msgstr "" + +#: lib/personalgroupnav.php:124 +msgid "Inbox" +msgstr "" + +#: lib/personalgroupnav.php:125 +msgid "Your incoming messages" +msgstr "" + +#: lib/personalgroupnav.php:129 +msgid "Outbox" +msgstr "" + +#: lib/personalgroupnav.php:130 +msgid "Your sent messages" +msgstr "" + +#: lib/personaltagcloudsection.php:56 +#, php-format +msgid "Tags in %s's notices" +msgstr "" + +#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 +msgid "Subscriptions" +msgstr "" + +#: lib/profileaction.php:126 +msgid "All subscriptions" +msgstr "" + +#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90 +msgid "Subscribers" +msgstr "" + +#: lib/profileaction.php:157 +msgid "All subscribers" +msgstr "" + +#: lib/profileaction.php:178 +msgid "User ID" +msgstr "" + +#: lib/profileaction.php:183 +msgid "Member since" +msgstr "" + +#: lib/profileaction.php:245 +msgid "All groups" +msgstr "" + +#: lib/profileformaction.php:123 +msgid "No return-to arguments" +msgstr "" + +#: lib/profileformaction.php:137 +msgid "unimplemented method" +msgstr "" + +#: lib/publicgroupnav.php:78 +msgid "Public" +msgstr "" + +#: lib/publicgroupnav.php:82 +msgid "User groups" +msgstr "" + +#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85 +msgid "Recent tags" +msgstr "" + +#: lib/publicgroupnav.php:88 +msgid "Featured" +msgstr "" + +#: lib/publicgroupnav.php:92 +msgid "Popular" +msgstr "" + +#: lib/repeatform.php:107 lib/repeatform.php:132 +#, fuzzy +msgid "Repeat this notice" +msgstr "Deler iste nota" + +#: lib/repeatform.php:132 +msgid "Repeat" +msgstr "" + +#: lib/sandboxform.php:67 +msgid "Sandbox" +msgstr "" + +#: lib/sandboxform.php:78 +msgid "Sandbox this user" +msgstr "" + +#: lib/searchaction.php:120 +msgid "Search site" +msgstr "" + +#: lib/searchaction.php:126 +msgid "Keyword(s)" +msgstr "" + +#: lib/searchaction.php:162 +msgid "Search help" +msgstr "" + +#: lib/searchgroupnav.php:80 +msgid "People" +msgstr "" + +#: lib/searchgroupnav.php:81 +msgid "Find people on this site" +msgstr "" + +#: lib/searchgroupnav.php:83 +msgid "Find content of notices" +msgstr "" + +#: lib/searchgroupnav.php:85 +msgid "Find groups on this site" +msgstr "" + +#: lib/section.php:89 +msgid "Untitled section" +msgstr "" + +#: lib/section.php:106 +msgid "More..." +msgstr "" + +#: lib/silenceform.php:67 +msgid "Silence" +msgstr "" + +#: lib/silenceform.php:78 +msgid "Silence this user" +msgstr "" + +#: lib/subgroupnav.php:83 +#, php-format +msgid "People %s subscribes to" +msgstr "" + +#: lib/subgroupnav.php:91 +#, php-format +msgid "People subscribed to %s" +msgstr "" + +#: lib/subgroupnav.php:99 +#, php-format +msgid "Groups %s is a member of" +msgstr "" + +#: lib/subs.php:52 +msgid "Already subscribed!" +msgstr "" + +#: lib/subs.php:56 +msgid "User has blocked you." +msgstr "" + +#: lib/subs.php:60 +msgid "Could not subscribe." +msgstr "" + +#: lib/subs.php:79 +msgid "Could not subscribe other to you." +msgstr "" + +#: lib/subs.php:128 +msgid "Not subscribed!" +msgstr "" + +#: lib/subs.php:133 +msgid "Couldn't delete self-subscription." +msgstr "" + +#: lib/subs.php:146 +msgid "Couldn't delete subscription." +msgstr "" + +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "" + +#: lib/tagcloudsection.php:56 +msgid "None" +msgstr "" + +#: lib/topposterssection.php:74 +msgid "Top posters" +msgstr "" + +#: lib/unsandboxform.php:69 +msgid "Unsandbox" +msgstr "" + +#: lib/unsandboxform.php:80 +msgid "Unsandbox this user" +msgstr "" + +#: lib/unsilenceform.php:67 +msgid "Unsilence" +msgstr "" + +#: lib/unsilenceform.php:78 +msgid "Unsilence this user" +msgstr "" + +#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137 +msgid "Unsubscribe from this user" +msgstr "" + +#: lib/unsubscribeform.php:137 +msgid "Unsubscribe" +msgstr "" + +#: lib/userprofile.php:116 +msgid "Edit Avatar" +msgstr "" + +#: lib/userprofile.php:236 +msgid "User actions" +msgstr "" + +#: lib/userprofile.php:248 +msgid "Edit profile settings" +msgstr "" + +#: lib/userprofile.php:249 +msgid "Edit" +msgstr "" + +#: lib/userprofile.php:272 +msgid "Send a direct message to this user" +msgstr "" + +#: lib/userprofile.php:273 +msgid "Message" +msgstr "" + +#: lib/userprofile.php:311 +msgid "Moderate" +msgstr "" + +#: lib/util.php:825 +msgid "a few seconds ago" +msgstr "" + +#: lib/util.php:827 +msgid "about a minute ago" +msgstr "" + +#: lib/util.php:829 +#, php-format +msgid "about %d minutes ago" +msgstr "" + +#: lib/util.php:831 +msgid "about an hour ago" +msgstr "" + +#: lib/util.php:833 +#, php-format +msgid "about %d hours ago" +msgstr "" + +#: lib/util.php:835 +msgid "about a day ago" +msgstr "" + +#: lib/util.php:837 +#, php-format +msgid "about %d days ago" +msgstr "" + +#: lib/util.php:839 +msgid "about a month ago" +msgstr "" + +#: lib/util.php:841 +#, php-format +msgid "about %d months ago" +msgstr "" + +#: lib/util.php:843 +msgid "about a year ago" +msgstr "" + +#: lib/webcolor.php:82 +#, php-format +msgid "%s is not a valid color!" +msgstr "" + +#: lib/webcolor.php:123 +#, php-format +msgid "%s is not a valid color! Use 3 or 6 hex chars." +msgstr "" + +#: scripts/maildaemon.php:48 +msgid "Could not parse message." +msgstr "" + +#: scripts/maildaemon.php:53 +msgid "Not a registered user." +msgstr "" + +#: scripts/maildaemon.php:57 +msgid "Sorry, that is not your incoming email address." +msgstr "" + +#: scripts/maildaemon.php:61 +msgid "Sorry, no incoming email allowed." +msgstr "" From 745e35ac1fcee01298db09a8649f79f410138652 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sun, 13 Dec 2009 18:55:17 +0100 Subject: [PATCH 133/172] (Puctuation) consistency in clientError() calls. --- actions/apistatusesretweet.php | 6 +++--- actions/apistatusesretweets.php | 2 +- actions/file.php | 8 ++++---- actions/grouprss.php | 4 ++-- actions/tagother.php | 4 ++-- actions/userbyid.php | 9 ++++----- lib/profileformaction.php | 4 ++-- plugins/OpenID/openidserver.php | 2 +- plugins/TemplatePlugin.php | 2 +- 9 files changed, 20 insertions(+), 21 deletions(-) diff --git a/actions/apistatusesretweet.php b/actions/apistatusesretweet.php index fc71d22743..85de79d5c8 100644 --- a/actions/apistatusesretweet.php +++ b/actions/apistatusesretweet.php @@ -72,7 +72,7 @@ class ApiStatusesRetweetAction extends ApiAuthAction $this->original = Notice::staticGet('id', $id); if (empty($this->original)) { - $this->clientError(_('No such notice'), + $this->clientError(_('No such notice.'), 400, $this->format); return false; } @@ -80,7 +80,7 @@ class ApiStatusesRetweetAction extends ApiAuthAction $this->user = $this->auth_user; if ($this->user->id == $notice->profile_id) { - $this->clientError(_('Cannot repeat your own notice')); + $this->clientError(_('Cannot repeat your own notice.')); 400, $this->format); return false; } @@ -88,7 +88,7 @@ class ApiStatusesRetweetAction extends ApiAuthAction $profile = $this->user->getProfile(); if ($profile->hasRepeated($id)) { - $this->clientError(_('Already repeated that notice'), + $this->clientError(_('Already repeated that notice.'), 400, $this->format); return false; } diff --git a/actions/apistatusesretweets.php b/actions/apistatusesretweets.php index c54a374e28..2efd59b37f 100644 --- a/actions/apistatusesretweets.php +++ b/actions/apistatusesretweets.php @@ -69,7 +69,7 @@ class ApiStatusesRetweetsAction extends ApiAuthAction $this->original = Notice::staticGet('id', $id); if (empty($this->original)) { - $this->clientError(_('No such notice'), + $this->clientError(_('No such notice.'), 400, $this->format); return false; } diff --git a/actions/file.php b/actions/file.php index 10c59a9612..c6f7b998a2 100644 --- a/actions/file.php +++ b/actions/file.php @@ -31,15 +31,15 @@ class FileAction extends Action parent::prepare($args); $this->id = $this->trimmed('notice'); if (empty($this->id)) { - $this->clientError(_('No notice id')); + $this->clientError(_('No notice ID.')); } $notice = Notice::staticGet('id', $this->id); if (empty($notice)) { - $this->clientError(_('No notice')); + $this->clientError(_('No notice.')); } $atts = $notice->attachments(); if (empty($atts)) { - $this->clientError(_('No attachments')); + $this->clientError(_('No attachments.')); } foreach ($atts as $att) { if (!empty($att->filename)) { @@ -48,7 +48,7 @@ class FileAction extends Action } } if (empty($this->filerec)) { - $this->clientError(_('No uploaded attachments')); + $this->clientError(_('No uploaded attachments.')); } return true; } diff --git a/actions/grouprss.php b/actions/grouprss.php index 50e48a67e9..866fc66eb1 100644 --- a/actions/grouprss.php +++ b/actions/grouprss.php @@ -88,14 +88,14 @@ class groupRssAction extends Rss10Action } if (!$nickname) { - $this->clientError(_('No nickname'), 404); + $this->clientError(_('No nickname.'), 404); return false; } $this->group = User_group::staticGet('nickname', $nickname); if (!$this->group) { - $this->clientError(_('No such group'), 404); + $this->clientError(_('No such group.'), 404); return false; } diff --git a/actions/tagother.php b/actions/tagother.php index c3f43be8ba..e9e13b939b 100644 --- a/actions/tagother.php +++ b/actions/tagother.php @@ -30,13 +30,13 @@ class TagotherAction extends Action { parent::prepare($args); if (!common_logged_in()) { - $this->clientError(_('Not logged in'), 403); + $this->clientError(_('Not logged in.'), 403); return false; } $id = $this->trimmed('id'); if (!$id) { - $this->clientError(_('No id argument.')); + $this->clientError(_('No ID argument.')); return false; } diff --git a/actions/userbyid.php b/actions/userbyid.php index ebff7e4a72..f3e1556f3f 100644 --- a/actions/userbyid.php +++ b/actions/userbyid.php @@ -47,17 +47,17 @@ class UserbyidAction extends Action { /** * Is read only? - * + * * @return boolean true */ function isReadOnly($args) - { + { return true; } /** * Class handler. - * + * * @param array $args array of arguments * * @return nothing @@ -67,7 +67,7 @@ class UserbyidAction extends Action parent::handle($args); $id = $this->trimmed('id'); if (!$id) { - $this->clientError(_('No id.')); + $this->clientError(_('No ID.')); } $user = User::staticGet($id); if (!$user) { @@ -88,4 +88,3 @@ class UserbyidAction extends Action common_redirect($url, 303); } } - diff --git a/lib/profileformaction.php b/lib/profileformaction.php index 8cb5f6a932..8a934666e3 100644 --- a/lib/profileformaction.php +++ b/lib/profileformaction.php @@ -120,7 +120,7 @@ class ProfileFormAction extends Action if ($action) { common_redirect(common_local_url($action, $args), 303); } else { - $this->clientError(_("No return-to arguments")); + $this->clientError(_("No return-to arguments.")); } } @@ -134,6 +134,6 @@ class ProfileFormAction extends Action function handlePost() { - $this->serverError(_("unimplemented method")); + $this->serverError(_("Unimplemented method.")); } } diff --git a/plugins/OpenID/openidserver.php b/plugins/OpenID/openidserver.php index 181cbdf45e..afbca553f5 100644 --- a/plugins/OpenID/openidserver.php +++ b/plugins/OpenID/openidserver.php @@ -103,7 +103,7 @@ class OpenidserverAction extends Action $response = $this->generateDenyResponse($request); } else { //invalid - $this->clientError(sprintf(_m('You are not authorized to use the identity %s'),$request->identity),$code=403); + $this->clientError(sprintf(_m('You are not authorized to use the identity %s.'),$request->identity),$code=403); } } else { $response = $this->oserver->handleRequest($request); diff --git a/plugins/TemplatePlugin.php b/plugins/TemplatePlugin.php index 5f3ad81f52..18aa8034ca 100644 --- a/plugins/TemplatePlugin.php +++ b/plugins/TemplatePlugin.php @@ -300,7 +300,7 @@ class TemplateAction extends Action // verify that user is admin if (!($user->id == 1)) - $this->clientError(_('only User #1 can update the template'), $code = 401); + $this->clientError(_('Only User #1 can update the template.'), $code = 401); // open the old template $tpl_file = $this->templateFolder() . '/index.html'; From 49ac5937c0dee0150ba0ef767413425af06045a8 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 14 Dec 2009 00:21:36 +0100 Subject: [PATCH 134/172] Initial UI for form repeat --- theme/base/css/display.css | 1 - theme/base/images/icons/icons-01.gif | Bin 3097 -> 3154 bytes .../images/icons/twotone/green/recycle.gif | Bin 0 -> 87 bytes theme/default/css/display.css | 4 ++++ theme/identica/css/display.css | 4 ++++ 5 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 theme/base/images/icons/twotone/green/recycle.gif diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 7446a42cdd..bab6431b9a 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -1000,7 +1000,6 @@ float:left; float:left; margin-left:20%; } -.notice-options .form_repeat, .notice-options .form_favor, .notice-options .form_disfavor { margin-left:0; diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif index e910c86c002fb7f303963108ac2d6fe1163b736a..5909d7b19cdee858a479674064bff32745ebc122 100644 GIT binary patch delta 110 zcmbO!aY=&5-P6s&GEs`bj_vvXjXeLDME?K(ulSRNk&EF!gAM}_fTT9dF@NK*+xu?2 z#rePQs^|CZS#D|km^b7_vdq!A_+Z^fq{uZhXDvc@(fHGA$>EKz2#t<@&1gr k?6jS+w?iK-pOA3ERiJ7ef0ygV@3|(aU3`n#ofsLc0gB=r!2kdN literal 0 HcmV?d00001 diff --git a/theme/default/css/display.css b/theme/default/css/display.css index d4fcb23434..e0dda3de28 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -160,6 +160,7 @@ opacity:0; .notice-options form.form_favor input.submit, .notice-options form.form_disfavor input.submit, .notice-options .notice_delete, +.notice-options form.form_repeat input.submit, #new_group a, .pagination .nav_prev a, .pagination .nav_next a, @@ -334,6 +335,9 @@ background-position:0 -526px; .notice-options .notice_delete { background-position:0 -658px; } +.notice-options form.form_repeat input.submit { +background-position:0 -1582px; +} .notices div.entry-content, .notices div.notice-options { diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 0e8fa6d793..999af973c6 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -160,6 +160,7 @@ opacity:0; .notice-options form.form_favor input.submit, .notice-options form.form_disfavor input.submit, .notice-options .notice_delete, +.notice-options form.form_repeat input.submit, #new_group a, .pagination .nav_prev a, .pagination .nav_next a, @@ -333,6 +334,9 @@ background-position:0 -526px; .notice-options .notice_delete { background-position:0 -658px; } +.notice-options form.form_repeat input.submit { +background-position:0 -1582px; +} .notices div.entry-content, .notices div.notice-options { From 7dc9f7ad069164674abb4b761bc7faf9eca4c61f Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 13 Dec 2009 20:00:09 -0500 Subject: [PATCH 135/172] Init UI for Repeated by --- lib/noticelist.php | 11 +++++------ theme/base/css/display.css | 11 +++++++++++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/lib/noticelist.php b/lib/noticelist.php index aa6ea278c9..a106478edd 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -535,17 +535,19 @@ class NoticeListItem extends Widget $repeater = Profile::staticGet('id', $this->repeat->profile_id); - $attrs = array('href' => $repeater->profileurl, + $attrs = array('href' => $this->profile->profileurl, 'class' => 'url'); if (!empty($repeater->fullname)) { $attrs['title'] = $repeater->fullname . ' (' . $repeater->nickname . ')'; } - $this->out->elementStart('span', 'repeat'); + $this->out->elementStart('span', 'repeat vcard'); $this->out->elementStart('a', $attrs); + $this->out->raw(_('Repeated by')); + $avatar = $repeater->getAvatar(AVATAR_MINI_SIZE); $this->out->element('img', array('src' => ($avatar) ? @@ -559,12 +561,9 @@ class NoticeListItem extends Widget $repeater->fullname : $repeater->nickname)); + $this->out->element('span', 'nickname', $repeater->nickname); $this->out->elementEnd('a'); - $text_link = XMLStringer::estring('a', $attrs, $repeater->nickname); - - $this->out->raw(sprintf(_('Repeated by %s'), $text_link)); - $this->out->elementEnd('span'); } } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index bab6431b9a..0173d2fbb2 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -982,6 +982,17 @@ font-size:1.025em; display:inline-block; } +.entry-content .repeat { +display:block; +} +.entry-content .repeat .photo { +float:none; +margin-right:1px; +position:relative; +top:4px; +left:0; +} + .notice-options { position:relative; font-size:0.95em; From 656d29080a3369d3037959e3ecdd62d36a7cc5e1 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Mon, 14 Dec 2009 07:33:29 +0000 Subject: [PATCH 136/172] Fix Twitter bridge so it responds reasonably to authorization errors. --- plugins/TwitterBridge/twitter.php | 96 +++++++++++-------- .../TwitterBridge/twitterbasicauthclient.php | 23 ++++- 2 files changed, 77 insertions(+), 42 deletions(-) diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php index b338a200de..003b52682f 100644 --- a/plugins/TwitterBridge/twitter.php +++ b/plugins/TwitterBridge/twitter.php @@ -179,7 +179,7 @@ function broadcast_oauth($notice, $flink) { try { $status = $client->statusesUpdate($statustxt); } catch (OAuthClientException $e) { - return process_error($e, $flink); + return process_error($e, $flink, $notice); } if (empty($status)) { @@ -188,8 +188,11 @@ function broadcast_oauth($notice, $flink) { // or the Twitter API might just be behaving flakey. $errmsg = sprintf('Twitter bridge - No data returned by Twitter API when ' . - 'trying to send update for %1$s (user id %2$s).', - $user->nickname, $user->id); + 'trying to post notice %d for User %s (user id %d).', + $notice->id, + $user->nickname, + $user->id); + common_log(LOG_WARNING, $errmsg); return false; @@ -197,8 +200,12 @@ function broadcast_oauth($notice, $flink) { // Notice crossed the great divide - $msg = sprintf('Twitter bridge - posted notice %s to Twitter using OAuth.', - $notice->id); + $msg = sprintf('Twitter bridge - posted notice %d to Twitter using ' . + 'OAuth for User %s (user id %d).', + $notice->id, + $user->nickname, + $user->id); + common_log(LOG_INFO, $msg); return true; @@ -215,62 +222,69 @@ function broadcast_basicauth($notice, $flink) try { $status = $client->statusesUpdate($statustxt); - } catch (HTTP_Request2_Exception $e) { - return process_error($e, $flink); + } catch (BasicAuthException $e) { + return process_error($e, $flink, $notice); } if (empty($status)) { $errmsg = sprintf('Twitter bridge - No data returned by Twitter API when ' . - 'trying to send update for %1$s (user id %2$s).', - $user->nickname, $user->id); + 'trying to post notice %d for %s (user id %d).', + $notice->id, + $user->nickname, + $user->id); + common_log(LOG_WARNING, $errmsg); - $errmsg = sprintf('No data returned by Twitter API when ' . - 'trying to send update for %1$s (user id %2$s).', - $user->nickname, $user->id); - common_log(LOG_WARNING, $errmsg); + $errmsg = sprintf('No data returned by Twitter API when ' . + 'trying to post notice %d for %s (user id %d).', + $notice->id, + $user->nickname, + $user->id); + common_log(LOG_WARNING, $errmsg); return false; } - $msg = sprintf('Twitter bridge - posted notice %s to Twitter using basic auth.', - $notice->id); + $msg = sprintf('Twitter bridge - posted notice %d to Twitter using ' . + 'HTTP basic auth for User %s (user id %d).', + $notice->id, + $user->nickname, + $user->id); + common_log(LOG_INFO, $msg); return true; } -function process_error($e, $flink) +function process_error($e, $flink, $notice) { - $user = $flink->getUser(); - $errmsg = $e->getMessage(); - $delivered = false; + $user = $flink->getUser(); + $code = $e->getCode(); - switch($errmsg) { - case 'The requested URL returned error: 401': - $logmsg = sprintf('Twiter bridge - User %1$s (user id: %2$s) has an invalid ' . - 'Twitter screen_name/password combo or an invalid acesss token.', - $user->nickname, $user->id); - $delivered = true; - remove_twitter_link($flink); - break; - case 'The requested URL returned error: 403': - $logmsg = sprintf('Twitter bridge - User %1$s (user id: %2$s) has exceeded ' . - 'his/her Twitter request limit.', - $user->nickname, $user->id); - break; - default: - $logmsg = sprintf('Twitter bridge - cURL error trying to send notice to Twitter ' . - 'for user %1$s (user id: %2$s) - ' . - 'code: %3$s message: %4$s.', - $user->nickname, $user->id, - $e->getCode(), $e->getMessage()); - break; - } + $logmsg = sprintf('Twitter bridge - %d posting notice %d for ' . + 'User %s (user id: %d): %s.', + $code, + $notice->id, + $user->nickname, + $user->id, + $e->getMessage()); common_log(LOG_WARNING, $logmsg); - return $delivered; + if ($code == 401) { + + // Probably a revoked or otherwise bad access token - nuke! + + remove_twitter_link($flink); + return true; + + } else { + + // For every other case, it's probably some flakiness so try + // sending the notice again later (requeue). + + return false; + } } function format_status($notice) diff --git a/plugins/TwitterBridge/twitterbasicauthclient.php b/plugins/TwitterBridge/twitterbasicauthclient.php index 7ee8d7d4c4..fd26293f9e 100644 --- a/plugins/TwitterBridge/twitterbasicauthclient.php +++ b/plugins/TwitterBridge/twitterbasicauthclient.php @@ -31,6 +31,20 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } +/** + * General Exception wrapper for HTTP basic auth errors + * + * @category Integration + * @package StatusNet + * @author Zach Copley + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + * + */ +class BasicAuthException extends Exception +{ +} + /** * Class for talking to the Twitter API with HTTP Basic Auth. * @@ -169,12 +183,13 @@ class TwitterBasicAuthClient } /** - * Make a HTTP request using cURL. + * Make an HTTP request * * @param string $url Where to make the request * @param array $params post parameters * * @return mixed the request + * @throws BasicAuthException */ function httpRequest($url, $params = null, $auth = true) { @@ -199,6 +214,12 @@ class TwitterBasicAuthClient $response = $request->get($url); } + $code = $response->getStatus(); + + if ($code < 200 || $code >= 400) { + throw new BasicAuthException($response->getBody(), $code); + } + return $response->getBody(); } From a199bd808a9dce64dd1d9a137b853b6ba0f6811b Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Mon, 14 Dec 2009 18:16:45 +0000 Subject: [PATCH 137/172] Fix issue with favorited/following always being set to false --- lib/api.php | 22 ++++++++++++---------- lib/apiauth.php | 2 -- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/api.php b/lib/api.php index b7ab407a1a..0c66501116 100644 --- a/lib/api.php +++ b/lib/api.php @@ -53,13 +53,14 @@ if (!defined('STATUSNET')) { class ApiAction extends Action { - var $format = null; - var $user = null; - var $page = null; - var $count = null; - var $max_id = null; - var $since_id = null; - var $since = null; + var $format = null; + var $user = null; + var $auth_user = null; + var $page = null; + var $count = null; + var $max_id = null; + var $since_id = null; + var $since = null; /** * Initialization. @@ -190,13 +191,14 @@ class ApiAction extends Action $twitter_user['following'] = false; $twitter_user['notifications'] = false; - if (isset($apidata['user'])) { + if (isset($this->auth_user)) { - $twitter_user['following'] = $apidata['user']->isSubscribed($profile); + $twitter_user['following'] = $this->auth_user->isSubscribed($profile); // Notifications on? $sub = Subscription::pkeyGet(array('subscriber' => - $apidata['user']->id, 'subscribed' => $profile->id)); + $this->auth_user->id, + 'subscribed' => $profile->id)); if ($sub) { $twitter_user['notifications'] = ($sub->jabber || $sub->sms); diff --git a/lib/apiauth.php b/lib/apiauth.php index 0d1613d381..7102764cba 100644 --- a/lib/apiauth.php +++ b/lib/apiauth.php @@ -53,8 +53,6 @@ require_once INSTALLDIR . '/lib/api.php'; class ApiAuthAction extends ApiAction { - var $auth_user = null; - /** * Take arguments for running, and output basic auth header if needed * From 364038ce2acc1f02fbd0850c0371c97d1e9044a3 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Mon, 14 Dec 2009 07:33:29 +0000 Subject: [PATCH 138/172] Fix Twitter bridge so it responds reasonably to authorization errors. --- plugins/TwitterBridge/twitter.php | 96 +++++++++++-------- .../TwitterBridge/twitterbasicauthclient.php | 23 ++++- 2 files changed, 77 insertions(+), 42 deletions(-) diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php index fd51506388..202cbdc4f2 100644 --- a/plugins/TwitterBridge/twitter.php +++ b/plugins/TwitterBridge/twitter.php @@ -179,7 +179,7 @@ function broadcast_oauth($notice, $flink) { try { $status = $client->statusesUpdate($statustxt); } catch (OAuthClientException $e) { - return process_error($e, $flink); + return process_error($e, $flink, $notice); } if (empty($status)) { @@ -188,8 +188,11 @@ function broadcast_oauth($notice, $flink) { // or the Twitter API might just be behaving flakey. $errmsg = sprintf('Twitter bridge - No data returned by Twitter API when ' . - 'trying to send update for %1$s (user id %2$s).', - $user->nickname, $user->id); + 'trying to post notice %d for User %s (user id %d).', + $notice->id, + $user->nickname, + $user->id); + common_log(LOG_WARNING, $errmsg); return false; @@ -197,8 +200,12 @@ function broadcast_oauth($notice, $flink) { // Notice crossed the great divide - $msg = sprintf('Twitter bridge - posted notice %s to Twitter using OAuth.', - $notice->id); + $msg = sprintf('Twitter bridge - posted notice %d to Twitter using ' . + 'OAuth for User %s (user id %d).', + $notice->id, + $user->nickname, + $user->id); + common_log(LOG_INFO, $msg); return true; @@ -215,62 +222,69 @@ function broadcast_basicauth($notice, $flink) try { $status = $client->statusesUpdate($statustxt); - } catch (HTTP_Request2_Exception $e) { - return process_error($e, $flink); + } catch (BasicAuthException $e) { + return process_error($e, $flink, $notice); } if (empty($status)) { $errmsg = sprintf('Twitter bridge - No data returned by Twitter API when ' . - 'trying to send update for %1$s (user id %2$s).', - $user->nickname, $user->id); + 'trying to post notice %d for %s (user id %d).', + $notice->id, + $user->nickname, + $user->id); + common_log(LOG_WARNING, $errmsg); - $errmsg = sprintf('No data returned by Twitter API when ' . - 'trying to send update for %1$s (user id %2$s).', - $user->nickname, $user->id); - common_log(LOG_WARNING, $errmsg); + $errmsg = sprintf('No data returned by Twitter API when ' . + 'trying to post notice %d for %s (user id %d).', + $notice->id, + $user->nickname, + $user->id); + common_log(LOG_WARNING, $errmsg); return false; } - $msg = sprintf('Twitter bridge - posted notice %s to Twitter using basic auth.', - $notice->id); + $msg = sprintf('Twitter bridge - posted notice %d to Twitter using ' . + 'HTTP basic auth for User %s (user id %d).', + $notice->id, + $user->nickname, + $user->id); + common_log(LOG_INFO, $msg); return true; } -function process_error($e, $flink) +function process_error($e, $flink, $notice) { - $user = $flink->getUser(); - $errmsg = $e->getMessage(); - $delivered = false; + $user = $flink->getUser(); + $code = $e->getCode(); - switch($errmsg) { - case 'The requested URL returned error: 401': - $logmsg = sprintf('Twiter bridge - User %1$s (user id: %2$s) has an invalid ' . - 'Twitter screen_name/password combo or an invalid acesss token.', - $user->nickname, $user->id); - $delivered = true; - remove_twitter_link($flink); - break; - case 'The requested URL returned error: 403': - $logmsg = sprintf('Twitter bridge - User %1$s (user id: %2$s) has exceeded ' . - 'his/her Twitter request limit.', - $user->nickname, $user->id); - break; - default: - $logmsg = sprintf('Twitter bridge - cURL error trying to send notice to Twitter ' . - 'for user %1$s (user id: %2$s) - ' . - 'code: %3$s message: %4$s.', - $user->nickname, $user->id, - $e->getCode(), $e->getMessage()); - break; - } + $logmsg = sprintf('Twitter bridge - %d posting notice %d for ' . + 'User %s (user id: %d): %s.', + $code, + $notice->id, + $user->nickname, + $user->id, + $e->getMessage()); common_log(LOG_WARNING, $logmsg); - return $delivered; + if ($code == 401) { + + // Probably a revoked or otherwise bad access token - nuke! + + remove_twitter_link($flink); + return true; + + } else { + + // For every other case, it's probably some flakiness so try + // sending the notice again later (requeue). + + return false; + } } function format_status($notice) diff --git a/plugins/TwitterBridge/twitterbasicauthclient.php b/plugins/TwitterBridge/twitterbasicauthclient.php index 7ee8d7d4c4..fd26293f9e 100644 --- a/plugins/TwitterBridge/twitterbasicauthclient.php +++ b/plugins/TwitterBridge/twitterbasicauthclient.php @@ -31,6 +31,20 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } +/** + * General Exception wrapper for HTTP basic auth errors + * + * @category Integration + * @package StatusNet + * @author Zach Copley + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + * + */ +class BasicAuthException extends Exception +{ +} + /** * Class for talking to the Twitter API with HTTP Basic Auth. * @@ -169,12 +183,13 @@ class TwitterBasicAuthClient } /** - * Make a HTTP request using cURL. + * Make an HTTP request * * @param string $url Where to make the request * @param array $params post parameters * * @return mixed the request + * @throws BasicAuthException */ function httpRequest($url, $params = null, $auth = true) { @@ -199,6 +214,12 @@ class TwitterBasicAuthClient $response = $request->get($url); } + $code = $response->getStatus(); + + if ($code < 200 || $code >= 400) { + throw new BasicAuthException($response->getBody(), $code); + } + return $response->getBody(); } From 918b662568c2d06a3fb41b4f82bc336f47f06166 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Mon, 14 Dec 2009 18:16:45 +0000 Subject: [PATCH 139/172] Fix issue with favorited/following always being set to false --- lib/api.php | 22 ++++++++++++---------- lib/apiauth.php | 2 -- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/api.php b/lib/api.php index eacb80dbea..ae47434a50 100644 --- a/lib/api.php +++ b/lib/api.php @@ -53,13 +53,14 @@ if (!defined('STATUSNET')) { class ApiAction extends Action { - var $format = null; - var $user = null; - var $page = null; - var $count = null; - var $max_id = null; - var $since_id = null; - var $since = null; + var $format = null; + var $user = null; + var $auth_user = null; + var $page = null; + var $count = null; + var $max_id = null; + var $since_id = null; + var $since = null; /** * Initialization. @@ -188,13 +189,14 @@ class ApiAction extends Action $twitter_user['following'] = false; $twitter_user['notifications'] = false; - if (isset($apidata['user'])) { + if (isset($this->auth_user)) { - $twitter_user['following'] = $apidata['user']->isSubscribed($profile); + $twitter_user['following'] = $this->auth_user->isSubscribed($profile); // Notifications on? $sub = Subscription::pkeyGet(array('subscriber' => - $apidata['user']->id, 'subscribed' => $profile->id)); + $this->auth_user->id, + 'subscribed' => $profile->id)); if ($sub) { $twitter_user['notifications'] = ($sub->jabber || $sub->sms); diff --git a/lib/apiauth.php b/lib/apiauth.php index 0d1613d381..7102764cba 100644 --- a/lib/apiauth.php +++ b/lib/apiauth.php @@ -53,8 +53,6 @@ require_once INSTALLDIR . '/lib/api.php'; class ApiAuthAction extends ApiAction { - var $auth_user = null; - /** * Take arguments for running, and output basic auth header if needed * From b93068083e4366aa6847471c5fae34d770bbad18 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 14 Dec 2009 11:51:38 -0800 Subject: [PATCH 140/172] Clean up console output for non-interactive mode (handy for batch setup scripts) --- scripts/console.php | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/scripts/console.php b/scripts/console.php index 210d2b6b2f..329caf4724 100755 --- a/scripts/console.php +++ b/scripts/console.php @@ -73,7 +73,7 @@ function read_input_line($prompt) */ function readline_emulation($prompt) { - if(file_exists(trim(shell_exec('which bash')))) { + if(CONSOLE_INTERACTIVE && file_exists(trim(shell_exec('which bash')))) { $encPrompt = escapeshellarg($prompt); $command = "read -er -p $encPrompt && echo \"\$REPLY\""; $encCommand = escapeshellarg($command); @@ -103,7 +103,9 @@ function readline_emulation($prompt) if (feof(STDIN)) { return false; } - print $prompt; + if (CONSOLE_INTERACTIVE) { + print $prompt; + } return fgets(STDIN); } @@ -123,13 +125,16 @@ function console_help() print "Type ctrl+D or enter 'exit' to exit.\n"; } - -print "StatusNet interactive PHP console... type ctrl+D or enter 'exit' to exit.\n"; -$prompt = common_config('site', 'name') . '> '; +if (CONSOLE_INTERACTIVE) { + print "StatusNet interactive PHP console... type ctrl+D or enter 'exit' to exit.\n"; + $prompt = common_config('site', 'name') . '> '; +} while (!feof(STDIN)) { $line = read_input_line($prompt); if ($line === false) { - print "\n"; + if (CONSOLE_INTERACTIVE) { + print "\n"; + } break; } elseif ($line !== '') { try { @@ -154,5 +159,7 @@ while (!feof(STDIN)) { print get_class($e) . ": " . $e->getMessage() . "\n"; } } - print "\n"; + if (CONSOLE_INTERACTIVE) { + print "\n"; + } } From 8ab21542d2102c678c4d667a1fec44d2c3f67712 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Mon, 14 Dec 2009 21:42:30 +0100 Subject: [PATCH 141/172] Localisation updates for !StatusNet from !translatewiki.net !sntrans --- locale/ar/LC_MESSAGES/statusnet.po | 106 ++++---- locale/arz/LC_MESSAGES/statusnet.po | 106 ++++---- locale/bg/LC_MESSAGES/statusnet.po | 102 ++++---- locale/ca/LC_MESSAGES/statusnet.po | 99 ++++---- locale/cs/LC_MESSAGES/statusnet.po | 107 ++++---- locale/de/LC_MESSAGES/statusnet.po | 104 ++++---- locale/el/LC_MESSAGES/statusnet.po | 96 ++++---- locale/en_GB/LC_MESSAGES/statusnet.po | 106 ++++---- locale/es/LC_MESSAGES/statusnet.po | 103 ++++---- locale/fi/LC_MESSAGES/statusnet.po | 102 ++++---- locale/fr/LC_MESSAGES/statusnet.po | 105 ++++---- locale/ga/LC_MESSAGES/statusnet.po | 100 ++++---- locale/he/LC_MESSAGES/statusnet.po | 104 ++++---- locale/hsb/LC_MESSAGES/statusnet.po | 167 +++++++------ locale/ia/LC_MESSAGES/statusnet.po | 339 ++++++++++++++------------ locale/is/LC_MESSAGES/statusnet.po | 105 ++++---- locale/it/LC_MESSAGES/statusnet.po | 102 ++++---- locale/ja/LC_MESSAGES/statusnet.po | 104 ++++---- locale/ko/LC_MESSAGES/statusnet.po | 102 ++++---- locale/mk/LC_MESSAGES/statusnet.po | 104 ++++---- locale/nb/LC_MESSAGES/statusnet.po | 98 ++++---- locale/nl/LC_MESSAGES/statusnet.po | 157 ++++++------ locale/nn/LC_MESSAGES/statusnet.po | 102 ++++---- locale/pl/LC_MESSAGES/statusnet.po | 104 ++++---- locale/pt/LC_MESSAGES/statusnet.po | 184 +++++++------- locale/pt_BR/LC_MESSAGES/statusnet.po | 100 ++++---- locale/ru/LC_MESSAGES/statusnet.po | 104 ++++---- locale/statusnet.po | 84 ++++--- locale/sv/LC_MESSAGES/statusnet.po | 104 ++++---- locale/te/LC_MESSAGES/statusnet.po | 131 +++++----- locale/tr/LC_MESSAGES/statusnet.po | 104 ++++---- locale/uk/LC_MESSAGES/statusnet.po | 104 ++++---- locale/vi/LC_MESSAGES/statusnet.po | 104 ++++---- locale/zh_CN/LC_MESSAGES/statusnet.po | 102 ++++---- locale/zh_TW/LC_MESSAGES/statusnet.po | 106 ++++---- 35 files changed, 2274 insertions(+), 1777 deletions(-) diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index bcde7227a3..5da69b9b71 100644 --- a/locale/ar/LC_MESSAGES/statusnet.po +++ b/locale/ar/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:14:58+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:34:16+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ar\n" "X-Message-Group: out-statusnet\n" @@ -422,17 +422,18 @@ msgid "You may not delete another user's status." msgstr "" #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "لا إشعار كهذا." -#: actions/apistatusesretweet.php:83 lib/command.php:421 -msgid "Cannot repeat your own notice" -msgstr "" - -#: actions/apistatusesretweet.php:91 lib/command.php:426 +#: actions/apistatusesretweet.php:83 #, fuzzy -msgid "Already repeated that notice" +msgid "Cannot repeat your own notice." +msgstr "لا يمكنك إسكات المستخدمين على هذا الموقع." + +#: actions/apistatusesretweet.php:91 +#, fuzzy +msgid "Already repeated that notice." msgstr "احذف هذا الإشعار" #: actions/apistatusesshow.php:138 @@ -504,7 +505,7 @@ msgstr "مسار %s الزمني العام" msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" msgstr "" @@ -537,7 +538,8 @@ msgstr "لم يوجد." msgid "No such attachment." msgstr "لا مرفق كهذا." -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "لا اسم مستعار." @@ -581,7 +583,7 @@ msgid "Preview" msgstr "عاين" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 msgid "Delete" msgstr "احذف" @@ -675,15 +677,15 @@ msgstr "فشل حفظ معلومات المنع." #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname" msgstr "لا اسم مستعار" #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 msgid "No such group" msgstr "لا مجموعة كهذه" @@ -769,16 +771,13 @@ msgstr "محادثة" msgid "Notices" msgstr "الإشعارات" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "لا إشعار كهذا." - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "لست والجًا." @@ -804,7 +803,7 @@ msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟" msgid "Do not delete this notice" msgstr "لا تحذف هذا الإشعار" -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 msgid "Delete this notice" msgstr "احذف هذا الإشعار" @@ -1236,19 +1235,23 @@ msgid "A selection of some of the great users on %s" msgstr "قسم للمستخدمين المتميزين على %s" #: actions/file.php:34 -msgid "No notice id" -msgstr "لا هوية إشعار" +#, fuzzy +msgid "No notice ID." +msgstr "لا إشعار" #: actions/file.php:38 -msgid "No notice" +#, fuzzy +msgid "No notice." msgstr "لا إشعار" #: actions/file.php:42 -msgid "No attachments" +#, fuzzy +msgid "No attachments." msgstr "لا مرفقات" #: actions/file.php:51 -msgid "No uploaded attachments" +#, fuzzy +msgid "No uploaded attachments." msgstr "لا مرفقات مرفوعة" #: actions/finishremotesubscribe.php:69 @@ -1284,8 +1287,9 @@ msgid "Error updating remote profile" msgstr "خطأ أثناء تحديث الملف الشخصي البعيد" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 msgid "No such group." msgstr "لا مجموعة كهذه." @@ -1960,8 +1964,8 @@ msgstr "نوع المحتوى " msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "ليس نسق بيانات مدعوم." @@ -2731,7 +2735,7 @@ msgstr "لا يمكنك إسكات المستخدمين على هذا الموق msgid "You already repeated that notice." msgstr "لقد منعت مسبقا هذا المستخدم." -#: actions/repeat.php:112 lib/noticelist.php:628 +#: actions/repeat.php:112 lib/noticelist.php:627 #, fuzzy msgid "Repeated" msgstr "أنشئ" @@ -3497,12 +3501,9 @@ msgstr "" msgid "Notice feed for tag %s (Atom)" msgstr "" -#: actions/tagother.php:33 -msgid "Not logged in" -msgstr "لست والجًا" - #: actions/tagother.php:39 -msgid "No id argument." +#, fuzzy +msgid "No ID argument." msgstr "لا مُدخل هوية." #: actions/tagother.php:65 @@ -3760,8 +3761,9 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "" #: actions/userbyid.php:70 -msgid "No id." -msgstr "لا هوية." +#, fuzzy +msgid "No ID." +msgstr "لا هوية" #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" @@ -4227,6 +4229,15 @@ msgstr "" msgid "Error sending direct message." msgstr "" +#: lib/command.php:421 +msgid "Cannot repeat your own notice" +msgstr "" + +#: lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "احذف هذا الإشعار" + #: lib/command.php:434 #, fuzzy, php-format msgid "Notice from %s repeated" @@ -4921,11 +4932,16 @@ msgstr "في" msgid "in context" msgstr "في السياق" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "أنشئ" + +#: lib/noticelist.php:587 msgid "Reply to this notice" msgstr "رُد على هذا الإشعار" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 msgid "Reply" msgstr "رُد" @@ -5028,11 +5044,11 @@ msgstr "كل المجموعات" #: lib/profileformaction.php:123 #, fuzzy -msgid "No return-to arguments" +msgid "No return-to arguments." msgstr "لا مُدخل هوية." #: lib/profileformaction.php:137 -msgid "unimplemented method" +msgid "Unimplemented method." msgstr "" #: lib/publicgroupnav.php:78 diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po index c3b33094e3..2b3aa0e80a 100644 --- a/locale/arz/LC_MESSAGES/statusnet.po +++ b/locale/arz/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:15:01+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:34: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.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: arz\n" "X-Message-Group: out-statusnet\n" @@ -423,17 +423,18 @@ msgid "You may not delete another user's status." msgstr "" #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "لا إشعار كهذا." -#: actions/apistatusesretweet.php:83 lib/command.php:421 -msgid "Cannot repeat your own notice" -msgstr "" - -#: actions/apistatusesretweet.php:91 lib/command.php:426 +#: actions/apistatusesretweet.php:83 #, fuzzy -msgid "Already repeated that notice" +msgid "Cannot repeat your own notice." +msgstr "لا يمكنك إسكات المستخدمين على هذا الموقع." + +#: actions/apistatusesretweet.php:91 +#, fuzzy +msgid "Already repeated that notice." msgstr "احذف هذا الإشعار" #: actions/apistatusesshow.php:138 @@ -505,7 +506,7 @@ msgstr "مسار %s الزمنى العام" msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" msgstr "" @@ -538,7 +539,8 @@ msgstr "لم يوجد." msgid "No such attachment." msgstr "لا مرفق كهذا." -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "لا اسم مستعار." @@ -582,7 +584,7 @@ msgid "Preview" msgstr "عاين" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 msgid "Delete" msgstr "احذف" @@ -676,15 +678,15 @@ msgstr "فشل حفظ معلومات المنع." #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname" msgstr "لا اسم مستعار" #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 msgid "No such group" msgstr "لا مجموعه كهذه" @@ -770,16 +772,13 @@ msgstr "محادثة" msgid "Notices" msgstr "الإشعارات" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "لا إشعار كهذا." - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "لست والجًا." @@ -805,7 +804,7 @@ msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟" msgid "Do not delete this notice" msgstr "لا تحذف هذا الإشعار" -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 msgid "Delete this notice" msgstr "احذف هذا الإشعار" @@ -1237,19 +1236,23 @@ msgid "A selection of some of the great users on %s" msgstr "قسم للمستخدمين المتميزين على %s" #: actions/file.php:34 -msgid "No notice id" -msgstr "لا هويه إشعار" +#, fuzzy +msgid "No notice ID." +msgstr "لا إشعار" #: actions/file.php:38 -msgid "No notice" +#, fuzzy +msgid "No notice." msgstr "لا إشعار" #: actions/file.php:42 -msgid "No attachments" +#, fuzzy +msgid "No attachments." msgstr "لا مرفقات" #: actions/file.php:51 -msgid "No uploaded attachments" +#, fuzzy +msgid "No uploaded attachments." msgstr "لا مرفقات مرفوعة" #: actions/finishremotesubscribe.php:69 @@ -1285,8 +1288,9 @@ msgid "Error updating remote profile" msgstr "خطأ أثناء تحديث الملف الشخصى البعيد" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 msgid "No such group." msgstr "لا مجموعه كهذه." @@ -1961,8 +1965,8 @@ msgstr "نوع المحتوى " msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "ليس نسق بيانات مدعوم." @@ -2732,7 +2736,7 @@ msgstr "لا يمكنك إسكات المستخدمين على هذا الموق msgid "You already repeated that notice." msgstr "لقد منعت مسبقا هذا المستخدم." -#: actions/repeat.php:112 lib/noticelist.php:628 +#: actions/repeat.php:112 lib/noticelist.php:627 #, fuzzy msgid "Repeated" msgstr "أنشئ" @@ -3498,12 +3502,9 @@ msgstr "" msgid "Notice feed for tag %s (Atom)" msgstr "" -#: actions/tagother.php:33 -msgid "Not logged in" -msgstr "لست والجًا" - #: actions/tagother.php:39 -msgid "No id argument." +#, fuzzy +msgid "No ID argument." msgstr "لا مُدخل هويه." #: actions/tagother.php:65 @@ -3761,8 +3762,9 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "" #: actions/userbyid.php:70 -msgid "No id." -msgstr "لا هويه." +#, fuzzy +msgid "No ID." +msgstr "لا هوية" #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" @@ -4228,6 +4230,15 @@ msgstr "" msgid "Error sending direct message." msgstr "" +#: lib/command.php:421 +msgid "Cannot repeat your own notice" +msgstr "" + +#: lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "احذف هذا الإشعار" + #: lib/command.php:434 #, fuzzy, php-format msgid "Notice from %s repeated" @@ -4922,11 +4933,16 @@ msgstr "في" msgid "in context" msgstr "فى السياق" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "أنشئ" + +#: lib/noticelist.php:587 msgid "Reply to this notice" msgstr "رُد على هذا الإشعار" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 msgid "Reply" msgstr "رُد" @@ -5029,11 +5045,11 @@ msgstr "كل المجموعات" #: lib/profileformaction.php:123 #, fuzzy -msgid "No return-to arguments" +msgid "No return-to arguments." msgstr "لا مُدخل هويه." #: lib/profileformaction.php:137 -msgid "unimplemented method" +msgid "Unimplemented method." msgstr "" #: lib/publicgroupnav.php:78 diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index e03b33d601..26d4216929 100644 --- a/locale/bg/LC_MESSAGES/statusnet.po +++ b/locale/bg/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:15:04+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:34:22+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: bg\n" "X-Message-Group: out-statusnet\n" @@ -428,18 +428,18 @@ msgid "You may not delete another user's status." msgstr "Не може да изтривате бележки на друг потребител." #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "Няма такава бележка." -#: actions/apistatusesretweet.php:83 lib/command.php:421 +#: actions/apistatusesretweet.php:83 #, fuzzy -msgid "Cannot repeat your own notice" +msgid "Cannot repeat your own notice." msgstr "Грешка при включване на уведомлението." -#: actions/apistatusesretweet.php:91 lib/command.php:426 +#: actions/apistatusesretweet.php:91 #, fuzzy -msgid "Already repeated that notice" +msgid "Already repeated that notice." msgstr "Изтриване на бележката" #: actions/apistatusesshow.php:138 @@ -511,7 +511,7 @@ msgstr "Общ поток на %s" msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" msgstr "" @@ -545,7 +545,8 @@ msgstr "Не е открито." msgid "No such attachment." msgstr "Няма такъв документ." -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "Няма псевдоним." @@ -589,7 +590,7 @@ msgid "Preview" msgstr "Преглед" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 msgid "Delete" msgstr "Изтриване" @@ -685,15 +686,15 @@ msgstr "Грешка при записване данните за блокир #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname" msgstr "Няма псевдоним." #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 msgid "No such group" msgstr "Няма такава група." @@ -782,16 +783,13 @@ msgstr "Разговор" msgid "Notices" msgstr "Бележки" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "Няма такава бележка." - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Не сте влезли в системата." @@ -818,7 +816,7 @@ msgstr "Наистина ли искате да изтриете тази бел msgid "Do not delete this notice" msgstr "Да не се изтрива бележката" -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 msgid "Delete this notice" msgstr "Изтриване на бележката" @@ -1266,21 +1264,23 @@ msgstr "" #: actions/file.php:34 #, fuzzy -msgid "No notice id" +msgid "No notice ID." msgstr "Нова бележка" #: actions/file.php:38 #, fuzzy -msgid "No notice" +msgid "No notice." msgstr "Нова бележка" #: actions/file.php:42 -msgid "No attachments" -msgstr "" +#, fuzzy +msgid "No attachments." +msgstr "Няма такъв документ." #: actions/file.php:51 -msgid "No uploaded attachments" -msgstr "" +#, fuzzy +msgid "No uploaded attachments." +msgstr "Няма такъв документ." #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1319,8 +1319,9 @@ msgid "Error updating remote profile" msgstr "Грешка при обновяване на отдалечен профил" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 msgid "No such group." msgstr "Няма такава група" @@ -2062,8 +2063,8 @@ msgstr "Свързване" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "Неподдържан формат на данните" @@ -2870,7 +2871,7 @@ msgstr "Не можете да се регистрате, ако не сте с msgid "You already repeated that notice." msgstr "Вече сте блокирали този потребител." -#: actions/repeat.php:112 lib/noticelist.php:628 +#: actions/repeat.php:112 lib/noticelist.php:627 #, fuzzy msgid "Repeated" msgstr "Създаване" @@ -3653,14 +3654,9 @@ msgstr "Емисия с бележки на %s" msgid "Notice feed for tag %s (Atom)" msgstr "Емисия с бележки на %s" -#: actions/tagother.php:33 -#, fuzzy -msgid "Not logged in" -msgstr "Не сте влезли в системата." - #: actions/tagother.php:39 #, fuzzy -msgid "No id argument." +msgid "No ID argument." msgstr "Няма такъв документ." #: actions/tagother.php:65 @@ -3939,8 +3935,9 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "Грешен вид изображение за '%s'" #: actions/userbyid.php:70 -msgid "No id." -msgstr "Няма id." +#, fuzzy +msgid "No ID." +msgstr "Липсва ID" #: actions/userdesignsettings.php:76 lib/designsettings.php:65 #, fuzzy @@ -4430,6 +4427,16 @@ msgstr "" msgid "Error sending direct message." msgstr "Грешка при изпращане на прякото съобщение" +#: lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Грешка при включване на уведомлението." + +#: lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Изтриване на бележката" + #: lib/command.php:434 #, fuzzy, php-format msgid "Notice from %s repeated" @@ -5133,11 +5140,16 @@ msgstr "" msgid "in context" msgstr "в контекст" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "Създаване" + +#: lib/noticelist.php:587 msgid "Reply to this notice" msgstr "Отговаряне на тази бележка" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 msgid "Reply" msgstr "Отговор" @@ -5243,11 +5255,11 @@ msgstr "Всички групи" #: lib/profileformaction.php:123 #, fuzzy -msgid "No return-to arguments" +msgid "No return-to arguments." msgstr "Няма такъв документ." #: lib/profileformaction.php:137 -msgid "unimplemented method" +msgid "Unimplemented method." msgstr "" #: lib/publicgroupnav.php:78 diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index d13f729be9..2b82ef877c 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:15:07+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:34:24+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: out-statusnet\n" @@ -435,18 +435,18 @@ msgid "You may not delete another user's status." msgstr "No pots eliminar l'estatus d'un altre usuari." #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "No existeix aquest avís." -#: actions/apistatusesretweet.php:83 lib/command.php:421 +#: actions/apistatusesretweet.php:83 #, fuzzy -msgid "Cannot repeat your own notice" +msgid "Cannot repeat your own notice." msgstr "No es poden posar en on les notificacions." -#: actions/apistatusesretweet.php:91 lib/command.php:426 +#: actions/apistatusesretweet.php:91 #, fuzzy -msgid "Already repeated that notice" +msgid "Already repeated that notice." msgstr "Eliminar aquesta nota" #: actions/apistatusesshow.php:138 @@ -518,7 +518,7 @@ msgstr "%s línia temporal pública" msgid "%s updates from everyone!" msgstr "%s notificacions de tots!" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" msgstr "" @@ -552,7 +552,8 @@ msgstr "No s'ha trobat." msgid "No such attachment." msgstr "No existeix aquest document." -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "Cap sobrenom." @@ -596,7 +597,7 @@ msgid "Preview" msgstr "Previsualitzar" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 msgid "Delete" msgstr "Eliminar" @@ -694,15 +695,15 @@ msgstr "Error al guardar la informació del block." #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname" msgstr "Cap sobrenom." #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 msgid "No such group" msgstr "No existeix tal grup" @@ -790,16 +791,13 @@ msgstr "Conversa" msgid "Notices" msgstr "Avisos" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "No existeix aquest avís." - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "No connectat." @@ -829,7 +827,7 @@ msgstr "N'estàs segur que vols eliminar aquesta notificació?" msgid "Do not delete this notice" msgstr "No es pot esborrar la notificació." -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 msgid "Delete this notice" msgstr "Eliminar aquesta nota" @@ -1276,20 +1274,22 @@ msgstr "Una selecció d'alguns dels millors usuaris a %s" #: actions/file.php:34 #, fuzzy -msgid "No notice id" +msgid "No notice ID." msgstr "Nou avís" #: actions/file.php:38 #, fuzzy -msgid "No notice" +msgid "No notice." msgstr "Nou avís" #: actions/file.php:42 -msgid "No attachments" +#, fuzzy +msgid "No attachments." msgstr "Sense adjuncions" #: actions/file.php:51 -msgid "No uploaded attachments" +#, fuzzy +msgid "No uploaded attachments." msgstr "No s'ha pujat cap adjunció" #: actions/finishremotesubscribe.php:69 @@ -1328,8 +1328,9 @@ msgid "Error updating remote profile" msgstr "Error en actualitzar el perfil remot" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 msgid "No such group." msgstr "No s'ha trobat el grup." @@ -2082,8 +2083,8 @@ msgstr "tipus de contingut " msgid "Only " msgstr "Només " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "Format de data no suportat." @@ -2904,7 +2905,7 @@ msgstr "No pots registrar-te si no estàs d'acord amb la llicència." msgid "You already repeated that notice." msgstr "Ja heu blocat l'usuari." -#: actions/repeat.php:112 lib/noticelist.php:628 +#: actions/repeat.php:112 lib/noticelist.php:627 #, fuzzy msgid "Repeated" msgstr "S'ha creat" @@ -3692,12 +3693,9 @@ msgstr "Feed d'avisos de %s" msgid "Notice feed for tag %s (Atom)" msgstr "Feed d'avisos de %s" -#: actions/tagother.php:33 -msgid "Not logged in" -msgstr "No connectat." - #: actions/tagother.php:39 -msgid "No id argument." +#, fuzzy +msgid "No ID argument." msgstr "No argument de la id." #: actions/tagother.php:65 @@ -3981,8 +3979,9 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "Tipus d'imatge incorrecte per a '%s'" #: actions/userbyid.php:70 -msgid "No id." -msgstr "Cap identificador." +#, fuzzy +msgid "No ID." +msgstr "No ID" #: actions/userdesignsettings.php:76 lib/designsettings.php:65 #, fuzzy @@ -4460,6 +4459,16 @@ msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d" msgid "Error sending direct message." msgstr "Error al enviar el missatge directe." +#: lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "No es poden posar en on les notificacions." + +#: lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Eliminar aquesta nota" + #: lib/command.php:434 #, fuzzy, php-format msgid "Notice from %s repeated" @@ -5168,11 +5177,16 @@ msgstr "" msgid "in context" msgstr "Cap contingut!" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "S'ha creat" + +#: lib/noticelist.php:587 msgid "Reply to this notice" msgstr "respondre a aquesta nota" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 msgid "Reply" msgstr "Respon" @@ -5278,11 +5292,12 @@ msgstr "Tots els grups" #: lib/profileformaction.php:123 #, fuzzy -msgid "No return-to arguments" +msgid "No return-to arguments." msgstr "No argument de la id." #: lib/profileformaction.php:137 -msgid "unimplemented method" +#, fuzzy +msgid "Unimplemented method." msgstr "mètode no implementat" #: lib/publicgroupnav.php:78 diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index ff7e341163..a207778b43 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: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:15:10+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:34:27+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: cs\n" "X-Message-Group: out-statusnet\n" @@ -433,17 +433,18 @@ msgid "You may not delete another user's status." msgstr "" #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "Žádné takové oznámení." -#: actions/apistatusesretweet.php:83 lib/command.php:421 -msgid "Cannot repeat your own notice" -msgstr "" - -#: actions/apistatusesretweet.php:91 lib/command.php:426 +#: actions/apistatusesretweet.php:83 #, fuzzy -msgid "Already repeated that notice" +msgid "Cannot repeat your own notice." +msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí." + +#: actions/apistatusesretweet.php:91 +#, fuzzy +msgid "Already repeated that notice." msgstr "Odstranit toto oznámení" #: actions/apistatusesshow.php:138 @@ -517,7 +518,7 @@ msgstr "" msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" msgstr "" @@ -552,7 +553,8 @@ msgstr "Žádný požadavek nebyl nalezen!" msgid "No such attachment." msgstr "Žádný takový dokument." -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "Žádná přezdívka." @@ -597,7 +599,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 msgid "Delete" msgstr "Odstranit" @@ -694,15 +696,15 @@ msgstr "" #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname" msgstr "Žádná přezdívka" #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 msgid "No such group" msgstr "Žádná taková skupina" @@ -791,16 +793,13 @@ msgstr "Umístění" msgid "Notices" msgstr "Sdělení" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "Žádné takové oznámení." - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Nepřihlášen" @@ -827,7 +826,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "Žádné takové oznámení." -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 msgid "Delete this notice" msgstr "Odstranit toto oznámení" @@ -1271,20 +1270,23 @@ msgstr "" #: actions/file.php:34 #, fuzzy -msgid "No notice id" -msgstr "Nové sdělení" +msgid "No notice ID." +msgstr "Žádné oznámení" #: actions/file.php:38 -msgid "No notice" +#, fuzzy +msgid "No notice." msgstr "Žádné oznámení" #: actions/file.php:42 -msgid "No attachments" -msgstr "" +#, fuzzy +msgid "No attachments." +msgstr "Žádný takový dokument." #: actions/file.php:51 -msgid "No uploaded attachments" -msgstr "" +#, fuzzy +msgid "No uploaded attachments." +msgstr "Žádný takový dokument." #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1323,8 +1325,9 @@ msgid "Error updating remote profile" msgstr "Chyba při aktualizaci vzdáleného profilu" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 #, fuzzy msgid "No such group." msgstr "Žádné takové oznámení." @@ -2038,8 +2041,8 @@ msgstr "Připojit" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "" @@ -2836,7 +2839,7 @@ msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí." msgid "You already repeated that notice." msgstr "Již jste přihlášen" -#: actions/repeat.php:112 lib/noticelist.php:628 +#: actions/repeat.php:112 lib/noticelist.php:627 #, fuzzy msgid "Repeated" msgstr "Vytvořit" @@ -3622,14 +3625,9 @@ msgstr "Feed sdělení pro %s" msgid "Notice feed for tag %s (Atom)" msgstr "Feed sdělení pro %s" -#: actions/tagother.php:33 -#, fuzzy -msgid "Not logged in" -msgstr "Nepřihlášen" - #: actions/tagother.php:39 #, fuzzy -msgid "No id argument." +msgid "No ID argument." msgstr "Žádný takový dokument." #: actions/tagother.php:65 @@ -3911,7 +3909,8 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "Neplatný typ obrázku pro '%s'" #: actions/userbyid.php:70 -msgid "No id." +#, fuzzy +msgid "No ID." msgstr "Žádné id" #: actions/userdesignsettings.php:76 lib/designsettings.php:65 @@ -4395,6 +4394,15 @@ msgstr "" msgid "Error sending direct message." msgstr "" +#: lib/command.php:421 +msgid "Cannot repeat your own notice" +msgstr "" + +#: lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Odstranit toto oznámení" + #: lib/command.php:434 #, fuzzy, php-format msgid "Notice from %s repeated" @@ -5108,11 +5116,16 @@ msgstr "" msgid "in context" msgstr "Žádný obsah!" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "Vytvořit" + +#: lib/noticelist.php:587 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 #, fuzzy msgid "Reply" msgstr "odpověď" @@ -5217,11 +5230,11 @@ msgstr "" #: lib/profileformaction.php:123 #, fuzzy -msgid "No return-to arguments" +msgid "No return-to arguments." msgstr "Žádný takový dokument." #: lib/profileformaction.php:137 -msgid "unimplemented method" +msgid "Unimplemented method." msgstr "" #: lib/publicgroupnav.php:78 diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index a35c4635e8..0ba36e589f 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:15:13+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:34:30+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: out-statusnet\n" @@ -428,18 +428,18 @@ msgid "You may not delete another user's status." msgstr "Du kannst den Status eines anderen Benutzers nicht löschen." #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "Unbekannte Nachricht." -#: actions/apistatusesretweet.php:83 lib/command.php:421 +#: actions/apistatusesretweet.php:83 #, fuzzy -msgid "Cannot repeat your own notice" +msgid "Cannot repeat your own notice." msgstr "Konnte Benachrichtigung nicht aktivieren." -#: actions/apistatusesretweet.php:91 lib/command.php:426 +#: actions/apistatusesretweet.php:91 #, fuzzy -msgid "Already repeated that notice" +msgid "Already repeated that notice." msgstr "Nachricht löschen" #: actions/apistatusesshow.php:138 @@ -514,7 +514,7 @@ msgstr "%s öffentliche Zeitleiste" msgid "%s updates from everyone!" msgstr "%s Nachrichten von allen!" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" msgstr "" @@ -547,7 +547,8 @@ msgstr "Nicht gefunden." msgid "No such attachment." msgstr "Kein solcher Anhang." -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "Kein Nutzername." @@ -592,7 +593,7 @@ msgid "Preview" msgstr "Vorschau" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 msgid "Delete" msgstr "Löschen" @@ -687,15 +688,15 @@ msgstr "Konnte Blockierungsdaten nicht speichern." #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname" msgstr "Kein Benutzername" #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 msgid "No such group" msgstr "Keine derartige Gruppe" @@ -781,16 +782,13 @@ msgstr "Unterhaltung" msgid "Notices" msgstr "Nachrichten" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "Unbekannte Nachricht." - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Nicht angemeldet." @@ -818,7 +816,7 @@ msgstr "Bist du sicher, dass du diese Nachricht löschen möchtest?" msgid "Do not delete this notice" msgstr "Diese Nachricht nicht löschen" -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 msgid "Delete this notice" msgstr "Nachricht löschen" @@ -1261,20 +1259,24 @@ msgid "A selection of some of the great users on %s" msgstr "Eine Auswahl der tollen Benutzer auf %s" #: actions/file.php:34 -msgid "No notice id" -msgstr "Keine Nachrichten ID" +#, fuzzy +msgid "No notice ID." +msgstr "Keine Nachricht" #: actions/file.php:38 -msgid "No notice" +#, fuzzy +msgid "No notice." msgstr "Keine Nachricht" #: actions/file.php:42 -msgid "No attachments" +#, fuzzy +msgid "No attachments." msgstr "Keine Anhänge vorhanden" #: actions/file.php:51 -msgid "No uploaded attachments" -msgstr "" +#, fuzzy +msgid "No uploaded attachments." +msgstr "Kein solcher Anhang." #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1309,8 +1311,9 @@ msgid "Error updating remote profile" msgstr "Fehler beim Aktualisieren des entfernten Profils" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 msgid "No such group." msgstr "Keine derartige Gruppe." @@ -2051,8 +2054,8 @@ msgstr "Content-Typ " msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "Kein unterstütztes Datenformat." @@ -2863,7 +2866,7 @@ msgstr "" msgid "You already repeated that notice." msgstr "Du hast diesen Benutzer bereits blockiert." -#: actions/repeat.php:112 lib/noticelist.php:628 +#: actions/repeat.php:112 lib/noticelist.php:627 #, fuzzy msgid "Repeated" msgstr "Erstellt" @@ -3658,12 +3661,9 @@ msgstr "Feed der Nachrichten von %s" msgid "Notice feed for tag %s (Atom)" msgstr "Feed der Nachrichten von %s" -#: actions/tagother.php:33 -msgid "Not logged in" -msgstr "Nicht angemeldet" - #: actions/tagother.php:39 -msgid "No id argument." +#, fuzzy +msgid "No ID argument." msgstr "Kein id Argument." #: actions/tagother.php:65 @@ -3948,8 +3948,9 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "Falscher Bildtyp für „%s“" #: actions/userbyid.php:70 -msgid "No id." -msgstr "Keine ID." +#, fuzzy +msgid "No ID." +msgstr "Keine ID" #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" @@ -4429,6 +4430,16 @@ msgstr "Nachricht zu lang - maximal %d Zeichen erlaubt, du hast %d gesendet" msgid "Error sending direct message." msgstr "Fehler beim Senden der Nachricht" +#: lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Konnte Benachrichtigung nicht aktivieren." + +#: lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Nachricht löschen" + #: lib/command.php:434 #, fuzzy, php-format msgid "Notice from %s repeated" @@ -5155,11 +5166,16 @@ msgstr "" msgid "in context" msgstr "im Zusammenhang" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "Erstellt" + +#: lib/noticelist.php:587 msgid "Reply to this notice" msgstr "Auf diese Nachricht antworten" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 msgid "Reply" msgstr "Antworten" @@ -5267,11 +5283,11 @@ msgstr "Alle Gruppen" #: lib/profileformaction.php:123 #, fuzzy -msgid "No return-to arguments" +msgid "No return-to arguments." msgstr "Kein id Argument." #: lib/profileformaction.php:137 -msgid "unimplemented method" +msgid "Unimplemented method." msgstr "" #: lib/publicgroupnav.php:78 diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index 34903dff64..e27435c77b 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:15:16+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:34:33+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: el\n" "X-Message-Group: out-statusnet\n" @@ -431,17 +431,18 @@ msgid "You may not delete another user's status." msgstr "" #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" -msgstr "Μήνυμα" - -#: actions/apistatusesretweet.php:83 lib/command.php:421 -msgid "Cannot repeat your own notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "" -#: actions/apistatusesretweet.php:91 lib/command.php:426 +#: actions/apistatusesretweet.php:83 #, fuzzy -msgid "Already repeated that notice" +msgid "Cannot repeat your own notice." +msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." + +#: actions/apistatusesretweet.php:91 +#, fuzzy +msgid "Already repeated that notice." msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." #: actions/apistatusesshow.php:138 @@ -514,7 +515,7 @@ msgstr "" msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" msgstr "" @@ -547,7 +548,8 @@ msgstr "" msgid "No such attachment." msgstr "" -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "" @@ -591,7 +593,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 msgid "Delete" msgstr "" @@ -688,15 +690,15 @@ msgstr "" #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname" msgstr "Κανένα ψευδώνυμο" #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 #, fuzzy msgid "No such group" msgstr "Αδύνατη η αποθήκευση του προφίλ." @@ -783,16 +785,13 @@ msgstr "Συζήτηση" msgid "Notices" msgstr "" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "" - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "" @@ -820,7 +819,7 @@ msgstr "Είσαι σίγουρος ότι θες να διαγράψεις αυ msgid "Do not delete this notice" msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 msgid "Delete this notice" msgstr "" @@ -1270,20 +1269,20 @@ msgstr "" #: actions/file.php:34 #, fuzzy -msgid "No notice id" +msgid "No notice ID." msgstr "Μήνυμα" #: actions/file.php:38 #, fuzzy -msgid "No notice" +msgid "No notice." msgstr "Μήνυμα" #: actions/file.php:42 -msgid "No attachments" +msgid "No attachments." msgstr "" #: actions/file.php:51 -msgid "No uploaded attachments" +msgid "No uploaded attachments." msgstr "" #: actions/finishremotesubscribe.php:69 @@ -1320,8 +1319,9 @@ msgid "Error updating remote profile" msgstr "" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 #, fuzzy msgid "No such group." msgstr "Αδύνατη η αποθήκευση του προφίλ." @@ -2016,8 +2016,8 @@ msgstr "Σύνδεση" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "" @@ -2818,7 +2818,7 @@ msgstr "" msgid "You already repeated that notice." msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." -#: actions/repeat.php:112 lib/noticelist.php:628 +#: actions/repeat.php:112 lib/noticelist.php:627 #, fuzzy msgid "Repeated" msgstr "Δημιουργία" @@ -3595,12 +3595,8 @@ msgstr "Ροή φίλων του/της %s" msgid "Notice feed for tag %s (Atom)" msgstr "" -#: actions/tagother.php:33 -msgid "Not logged in" -msgstr "" - #: actions/tagother.php:39 -msgid "No id argument." +msgid "No ID argument." msgstr "" #: actions/tagother.php:65 @@ -3867,7 +3863,7 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "" #: actions/userbyid.php:70 -msgid "No id." +msgid "No ID." msgstr "" #: actions/userdesignsettings.php:76 lib/designsettings.php:65 @@ -4339,6 +4335,15 @@ msgstr "" msgid "Error sending direct message." msgstr "" +#: lib/command.php:421 +msgid "Cannot repeat your own notice" +msgstr "" + +#: lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." + #: lib/command.php:434 #, fuzzy, php-format msgid "Notice from %s repeated" @@ -5034,11 +5039,16 @@ msgstr "" msgid "in context" msgstr "" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "Δημιουργία" + +#: lib/noticelist.php:587 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 msgid "Reply" msgstr "" @@ -5141,11 +5151,11 @@ msgid "All groups" msgstr "" #: lib/profileformaction.php:123 -msgid "No return-to arguments" +msgid "No return-to arguments." msgstr "" #: lib/profileformaction.php:137 -msgid "unimplemented method" +msgid "Unimplemented method." msgstr "" #: lib/publicgroupnav.php:78 diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index 2f9d40c5e0..ade686de7c 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:15:19+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:34:36+0000\n" "Language-Team: British English\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" "X-Message-Group: out-statusnet\n" @@ -424,18 +424,18 @@ msgid "You may not delete another user's status." msgstr "You may not delete another user's status." #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "No such notice." -#: actions/apistatusesretweet.php:83 lib/command.php:421 +#: actions/apistatusesretweet.php:83 #, fuzzy -msgid "Cannot repeat your own notice" +msgid "Cannot repeat your own notice." msgstr "Can't turn on notification." -#: actions/apistatusesretweet.php:91 lib/command.php:426 +#: actions/apistatusesretweet.php:91 #, fuzzy -msgid "Already repeated that notice" +msgid "Already repeated that notice." msgstr "Delete this notice" #: actions/apistatusesshow.php:138 @@ -508,7 +508,7 @@ msgstr "%s public timeline" msgid "%s updates from everyone!" msgstr "%s updates from everyone!" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" msgstr "" @@ -542,7 +542,8 @@ msgstr "Not found." msgid "No such attachment." msgstr "No such document." -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "No nickname." @@ -586,7 +587,7 @@ msgid "Preview" msgstr "Preview" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 msgid "Delete" msgstr "Delete" @@ -683,15 +684,15 @@ msgstr "Failed to save block information." #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname" msgstr "No nickname" #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 msgid "No such group" msgstr "No such group" @@ -777,16 +778,13 @@ msgstr "Conversation" msgid "Notices" msgstr "Notices" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "No such notice." - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Not logged in." @@ -815,7 +813,7 @@ msgstr "Are you sure you want to delete this notice?" msgid "Do not delete this notice" msgstr "Do not delete this notice" -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 msgid "Delete this notice" msgstr "Delete this notice" @@ -1266,20 +1264,24 @@ msgid "A selection of some of the great users on %s" msgstr "A selection of some of the great users on %s" #: actions/file.php:34 -msgid "No notice id" -msgstr "No notice id" +#, fuzzy +msgid "No notice ID." +msgstr "No notice." #: actions/file.php:38 -msgid "No notice" +#, fuzzy +msgid "No notice." msgstr "No notice." #: actions/file.php:42 -msgid "No attachments" -msgstr "" +#, fuzzy +msgid "No attachments." +msgstr "No such document." #: actions/file.php:51 -msgid "No uploaded attachments" -msgstr "" +#, fuzzy +msgid "No uploaded attachments." +msgstr "No such document." #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1315,8 +1317,9 @@ msgid "Error updating remote profile" msgstr "Error updating remote profile." #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 msgid "No such group." msgstr "No such group." @@ -2056,8 +2059,8 @@ msgstr "Connect" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "Not a supported data format." @@ -2868,7 +2871,7 @@ msgstr "You can't register if you don't agree to the licence." msgid "You already repeated that notice." msgstr "You have already blocked this user." -#: actions/repeat.php:112 lib/noticelist.php:628 +#: actions/repeat.php:112 lib/noticelist.php:627 #, fuzzy msgid "Repeated" msgstr "Created" @@ -3652,12 +3655,9 @@ msgstr "Notice feed for %s" msgid "Notice feed for tag %s (Atom)" msgstr "Notice feed for %s" -#: actions/tagother.php:33 -msgid "Not logged in" -msgstr "Not logged in" - #: actions/tagother.php:39 -msgid "No id argument." +#, fuzzy +msgid "No ID argument." msgstr "No id argument." #: actions/tagother.php:65 @@ -3936,8 +3936,9 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "Wrong image type for '%s'" #: actions/userbyid.php:70 -msgid "No id." -msgstr "No id." +#, fuzzy +msgid "No ID." +msgstr "No ID" #: actions/userdesignsettings.php:76 lib/designsettings.php:65 #, fuzzy @@ -4416,6 +4417,16 @@ msgstr "Message too long - maximum is %d characters, you sent %d" msgid "Error sending direct message." msgstr "Error sending direct message." +#: lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Can't turn on notification." + +#: lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Delete this notice" + #: lib/command.php:434 #, fuzzy, php-format msgid "Notice from %s repeated" @@ -5126,11 +5137,16 @@ msgstr "" msgid "in context" msgstr "in context" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "Created" + +#: lib/noticelist.php:587 msgid "Reply to this notice" msgstr "Reply to this notice" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 msgid "Reply" msgstr "Reply" @@ -5233,11 +5249,11 @@ msgstr "All groups" #: lib/profileformaction.php:123 #, fuzzy -msgid "No return-to arguments" +msgid "No return-to arguments." msgstr "No id argument." #: lib/profileformaction.php:137 -msgid "unimplemented method" +msgid "Unimplemented method." msgstr "" #: lib/publicgroupnav.php:78 diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index 2b7642b8d5..5229e13157 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -11,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:15:22+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:34:39+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: es\n" "X-Message-Group: out-statusnet\n" @@ -432,18 +432,18 @@ msgid "You may not delete another user's status." msgstr "No puedes borrar el estado de otro usuario." #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "No existe ese aviso." -#: actions/apistatusesretweet.php:83 lib/command.php:421 +#: actions/apistatusesretweet.php:83 #, fuzzy -msgid "Cannot repeat your own notice" +msgid "Cannot repeat your own notice." msgstr "No se puede activar notificación." -#: actions/apistatusesretweet.php:91 lib/command.php:426 +#: actions/apistatusesretweet.php:91 #, fuzzy -msgid "Already repeated that notice" +msgid "Already repeated that notice." msgstr "Borrar este aviso" #: actions/apistatusesshow.php:138 @@ -515,7 +515,7 @@ msgstr "línea temporal pública de %s" msgid "%s updates from everyone!" msgstr "¡Actualizaciones de todos en %s!" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" msgstr "" @@ -550,7 +550,8 @@ msgstr "No se encontró." msgid "No such attachment." msgstr "No existe ese documento." -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "Ningún apodo." @@ -594,7 +595,7 @@ msgid "Preview" msgstr "Vista previa" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 msgid "Delete" msgstr "Borrar" @@ -692,15 +693,15 @@ msgstr "No se guardó información de bloqueo." #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname" msgstr "Ningún apodo." #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 msgid "No such group" msgstr "No existe ese grupo" @@ -790,16 +791,13 @@ msgstr "Código de confirmación" msgid "Notices" msgstr "Avisos" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "No existe ese aviso." - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "No conectado." @@ -829,7 +827,7 @@ msgstr "¿Estás seguro de que quieres eliminar este aviso?" msgid "Do not delete this notice" msgstr "No se puede eliminar este aviso." -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 msgid "Delete this notice" msgstr "Borrar este aviso" @@ -1287,21 +1285,23 @@ msgstr "Una selección de algunos de los grandes usuarios en %s" #: actions/file.php:34 #, fuzzy -msgid "No notice id" +msgid "No notice ID." msgstr "Nuevo aviso" #: actions/file.php:38 #, fuzzy -msgid "No notice" +msgid "No notice." msgstr "Nuevo aviso" #: actions/file.php:42 -msgid "No attachments" -msgstr "" +#, fuzzy +msgid "No attachments." +msgstr "No existe ese documento." #: actions/file.php:51 -msgid "No uploaded attachments" -msgstr "" +#, fuzzy +msgid "No uploaded attachments." +msgstr "No existe ese documento." #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1340,8 +1340,9 @@ msgid "Error updating remote profile" msgstr "Error al actualizar el perfil remoto" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 #, fuzzy msgid "No such group." msgstr "No existe ese grupo." @@ -2105,8 +2106,8 @@ msgstr "Conectarse" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "No es un formato de dato soportado" @@ -2937,7 +2938,7 @@ msgstr "No puedes registrarte si no estás de acuerdo con la licencia." msgid "You already repeated that notice." msgstr "Ya has bloqueado este usuario." -#: actions/repeat.php:112 lib/noticelist.php:628 +#: actions/repeat.php:112 lib/noticelist.php:627 #, fuzzy msgid "Repeated" msgstr "Crear" @@ -3742,13 +3743,9 @@ msgstr "Feed de avisos de %s" msgid "Notice feed for tag %s (Atom)" msgstr "Feed de avisos de %s" -#: actions/tagother.php:33 -#, fuzzy -msgid "Not logged in" -msgstr "No conectado." - #: actions/tagother.php:39 -msgid "No id argument." +#, fuzzy +msgid "No ID argument." msgstr "No existe argumento de ID." #: actions/tagother.php:65 @@ -4037,8 +4034,9 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "Tipo de imagen incorrecto para '%s'" #: actions/userbyid.php:70 -msgid "No id." -msgstr "Ningún identificador." +#, fuzzy +msgid "No ID." +msgstr "Sin ID" #: actions/userdesignsettings.php:76 lib/designsettings.php:65 #, fuzzy @@ -4529,6 +4527,16 @@ msgstr "Mensaje muy largo - máximo 140 caracteres, enviaste %d" msgid "Error sending direct message." msgstr "Error al enviar mensaje directo." +#: lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "No se puede activar notificación." + +#: lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Borrar este aviso" + #: lib/command.php:434 #, fuzzy, php-format msgid "Notice from %s repeated" @@ -5243,11 +5251,16 @@ msgstr "" msgid "in context" msgstr "en contexto" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "Crear" + +#: lib/noticelist.php:587 msgid "Reply to this notice" msgstr "Responder este aviso." -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 msgid "Reply" msgstr "Responder" @@ -5352,11 +5365,11 @@ msgstr "Todos los grupos" #: lib/profileformaction.php:123 #, fuzzy -msgid "No return-to arguments" +msgid "No return-to arguments." msgstr "No existe argumento de ID." #: lib/profileformaction.php:137 -msgid "unimplemented method" +msgid "Unimplemented method." msgstr "" #: lib/publicgroupnav.php:78 diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index 417d9d9df1..57469a98e8 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: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:15:25+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:34:42+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fi\n" "X-Message-Group: out-statusnet\n" @@ -436,18 +436,18 @@ msgid "You may not delete another user's status." msgstr "Et voi poistaa toisen käyttäjän päivitystä." #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "Päivitystä ei ole." -#: actions/apistatusesretweet.php:83 lib/command.php:421 +#: actions/apistatusesretweet.php:83 #, fuzzy -msgid "Cannot repeat your own notice" +msgid "Cannot repeat your own notice." msgstr "Ilmoituksia ei voi pistää päälle." -#: actions/apistatusesretweet.php:91 lib/command.php:426 +#: actions/apistatusesretweet.php:91 #, fuzzy -msgid "Already repeated that notice" +msgid "Already repeated that notice." msgstr "Poista tämä päivitys" #: actions/apistatusesshow.php:138 @@ -520,7 +520,7 @@ msgstr "%s julkinen aikajana" msgid "%s updates from everyone!" msgstr "%s päivitykset kaikilta!" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" msgstr "" @@ -553,7 +553,8 @@ msgstr "Ei löytynyt." msgid "No such attachment." msgstr "Liitettä ei ole." -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "Tunnusta ei ole." @@ -597,7 +598,7 @@ msgid "Preview" msgstr "Esikatselu" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 msgid "Delete" msgstr "Poista" @@ -694,15 +695,15 @@ msgstr "Käyttäjän estotiedon tallennus epäonnistui." #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname" msgstr "Tunnusta ei ole." #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 msgid "No such group" msgstr "Tuota ryhmää ei ole." @@ -789,16 +790,13 @@ msgstr "Keskustelu" msgid "Notices" msgstr "Päivitykset" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "Päivitystä ei ole." - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Et ole kirjautunut sisään." @@ -826,7 +824,7 @@ msgstr "Oletko varma että haluat poistaa tämän päivityksen?" msgid "Do not delete this notice" msgstr "Älä poista tätä päivitystä" -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 msgid "Delete this notice" msgstr "Poista tämä päivitys" @@ -1277,19 +1275,23 @@ msgid "A selection of some of the great users on %s" msgstr "Valikoima joitakin loistavia palvelun %s käyttäjiä" #: actions/file.php:34 -msgid "No notice id" -msgstr "Ei päivitystä id-tunnusta" +#, fuzzy +msgid "No notice ID." +msgstr "Ei päivitystä" #: actions/file.php:38 -msgid "No notice" +#, fuzzy +msgid "No notice." msgstr "Ei päivitystä" #: actions/file.php:42 -msgid "No attachments" +#, fuzzy +msgid "No attachments." msgstr "Ei liitteitä" #: actions/file.php:51 -msgid "No uploaded attachments" +#, fuzzy +msgid "No uploaded attachments." msgstr "Ei ladattuja liitteitä" #: actions/finishremotesubscribe.php:69 @@ -1328,8 +1330,9 @@ msgid "Error updating remote profile" msgstr "Virhe tapahtui etäprofiilin päivittämisessä" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 msgid "No such group." msgstr "Tuota ryhmää ei ole." @@ -2070,8 +2073,8 @@ msgstr "Yhdistä" msgid "Only " msgstr "Vain " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "Tuo ei ole tuettu tietomuoto." @@ -2895,7 +2898,7 @@ msgstr "Et voi rekisteröityä, jos et hyväksy lisenssiehtoja." msgid "You already repeated that notice." msgstr "Sinä olet jo estänyt tämän käyttäjän." -#: actions/repeat.php:112 lib/noticelist.php:628 +#: actions/repeat.php:112 lib/noticelist.php:627 #, fuzzy msgid "Repeated" msgstr "Luotu" @@ -3690,12 +3693,9 @@ msgstr "Päivityksien syöte käyttäjälle %s" msgid "Notice feed for tag %s (Atom)" msgstr "Päivityksien syöte käyttäjälle %s" -#: actions/tagother.php:33 -msgid "Not logged in" -msgstr "Et ole kirjautunut sisään" - #: actions/tagother.php:39 -msgid "No id argument." +#, fuzzy +msgid "No ID argument." msgstr "Ei id parametria." #: actions/tagother.php:65 @@ -3980,8 +3980,9 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "Kuvan '%s' tyyppi on väärä" #: actions/userbyid.php:70 -msgid "No id." -msgstr "Id puuttuu." +#, fuzzy +msgid "No ID." +msgstr "ID-tunnusta ei ole" #: actions/userdesignsettings.php:76 lib/designsettings.php:65 #, fuzzy @@ -4464,6 +4465,16 @@ msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d" msgid "Error sending direct message." msgstr "Tapahtui virhe suoran viestin lähetyksessä." +#: lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Ilmoituksia ei voi pistää päälle." + +#: lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Poista tämä päivitys" + #: lib/command.php:434 #, fuzzy, php-format msgid "Notice from %s repeated" @@ -5182,11 +5193,16 @@ msgstr "" msgid "in context" msgstr "Ei sisältöä!" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "Luotu" + +#: lib/noticelist.php:587 msgid "Reply to this notice" msgstr "Vastaa tähän päivitykseen" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 msgid "Reply" msgstr "Vastaus" @@ -5292,11 +5308,11 @@ msgstr "Kaikki ryhmät" #: lib/profileformaction.php:123 #, fuzzy -msgid "No return-to arguments" +msgid "No return-to arguments." msgstr "Ei id parametria." #: lib/profileformaction.php:137 -msgid "unimplemented method" +msgid "Unimplemented method." msgstr "" #: lib/publicgroupnav.php:78 diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 35d78d777d..4c2942a9c2 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -13,12 +13,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:15:28+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:34:44+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" "X-Message-Group: out-statusnet\n" @@ -441,18 +441,18 @@ msgid "You may not delete another user's status." msgstr "Vous ne pouvez pas supprimer le statut d’un autre utilisateur." #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "Avis non trouvé." -#: actions/apistatusesretweet.php:83 lib/command.php:421 +#: actions/apistatusesretweet.php:83 #, fuzzy -msgid "Cannot repeat your own notice" +msgid "Cannot repeat your own notice." msgstr "Impossible d’activer les avertissements." -#: actions/apistatusesretweet.php:91 lib/command.php:426 +#: actions/apistatusesretweet.php:91 #, fuzzy -msgid "Already repeated that notice" +msgid "Already repeated that notice." msgstr "Supprimer cet avis" #: actions/apistatusesshow.php:138 @@ -526,7 +526,7 @@ msgstr "Activité publique %s" msgid "%s updates from everyone!" msgstr "%s statuts de tout le monde !" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" msgstr "" @@ -559,7 +559,8 @@ msgstr "Non trouvé." msgid "No such attachment." msgstr "Pièce jointe non trouvée." -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "Aucun pseudo." @@ -605,7 +606,7 @@ msgid "Preview" msgstr "Aperçu" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 msgid "Delete" msgstr "Supprimer" @@ -704,15 +705,15 @@ msgstr "Impossible d’enregistrer les informations de blocage." #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname" msgstr "Aucun pseudo" #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 msgid "No such group" msgstr "Aucun groupe trouvé" @@ -798,16 +799,13 @@ msgstr "Conversation" msgid "Notices" msgstr "Avis" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "Avis non trouvé." - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Non connecté." @@ -835,7 +833,7 @@ msgstr "Êtes-vous sûr(e) de vouloir supprimer cet avis ?" msgid "Do not delete this notice" msgstr "Ne pas supprimer cet avis" -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 msgid "Delete this notice" msgstr "Supprimer cet avis" @@ -1285,19 +1283,23 @@ msgid "A selection of some of the great users on %s" msgstr "Les utilisateurs à ne pas manquer dans %s" #: actions/file.php:34 -msgid "No notice id" -msgstr "Pas d’identifiant d’avis" +#, fuzzy +msgid "No notice ID." +msgstr "Aucun avis" #: actions/file.php:38 -msgid "No notice" +#, fuzzy +msgid "No notice." msgstr "Aucun avis" #: actions/file.php:42 -msgid "No attachments" +#, fuzzy +msgid "No attachments." msgstr "Aucune pièce jointe" #: actions/file.php:51 -msgid "No uploaded attachments" +#, fuzzy +msgid "No uploaded attachments." msgstr "Aucune pièce jointe importée" #: actions/finishremotesubscribe.php:69 @@ -1333,8 +1335,9 @@ msgid "Error updating remote profile" msgstr "Erreur lors de la mise à jour du profil distant" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 msgid "No such group." msgstr "Aucun groupe trouvé." @@ -1888,6 +1891,7 @@ msgid "Incorrect username or password." msgstr "Identifiant ou mot de passe incorrect." #: actions/login.php:153 +#, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "Abonnements par défaut" @@ -2100,8 +2104,8 @@ msgstr "type de contenu " msgid "Only " msgstr "Seulement " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "Format de données non supporté." @@ -2929,7 +2933,7 @@ msgstr "Vous devez accepter les termes de la licence pour créer un compte." msgid "You already repeated that notice." msgstr "Vous avez déjà bloqué cet utilisateur." -#: actions/repeat.php:112 lib/noticelist.php:628 +#: actions/repeat.php:112 lib/noticelist.php:627 #, fuzzy msgid "Repeated" msgstr "Créé" @@ -3753,12 +3757,9 @@ msgstr "Flux des avis pour la marque %s (RSS 2.0)" msgid "Notice feed for tag %s (Atom)" msgstr "Flux des avis pour la marque %s (Atom)" -#: actions/tagother.php:33 -msgid "Not logged in" -msgstr "Aucune session ouverte" - #: actions/tagother.php:39 -msgid "No id argument." +#, fuzzy +msgid "No ID argument." msgstr "Aucun argument d’identification." #: actions/tagother.php:65 @@ -4034,8 +4035,9 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "Format d’image invalide pour l’URL de l’avatar « %s »." #: actions/userbyid.php:70 -msgid "No id." -msgstr "Aucun identifiant." +#, fuzzy +msgid "No ID." +msgstr "Aucun identifiant" #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" @@ -4513,6 +4515,16 @@ msgstr "" msgid "Error sending direct message." msgstr "Une erreur est survenue pendant l’envoi de votre message." +#: lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Impossible d’activer les avertissements." + +#: lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Supprimer cet avis" + #: lib/command.php:434 #, fuzzy, php-format msgid "Notice from %s repeated" @@ -5336,11 +5348,16 @@ msgstr "chez" msgid "in context" msgstr "dans le contexte" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "Créé" + +#: lib/noticelist.php:587 msgid "Reply to this notice" msgstr "Répondre à cet avis" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 msgid "Reply" msgstr "Répondre" @@ -5442,11 +5459,13 @@ msgid "All groups" msgstr "Tous les groupes" #: lib/profileformaction.php:123 -msgid "No return-to arguments" +#, fuzzy +msgid "No return-to arguments." msgstr "Aucun argument de retour." #: lib/profileformaction.php:137 -msgid "unimplemented method" +#, fuzzy +msgid "Unimplemented method." msgstr "méthode non implémentée" #: lib/publicgroupnav.php:78 diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index 06ef1595b1..37f7a4ce44 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: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:15:31+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:34:47+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ga\n" "X-Message-Group: out-statusnet\n" @@ -438,18 +438,18 @@ msgid "You may not delete another user's status." msgstr "Non deberías eliminar o estado de outro usuario" #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "Ningún chío." -#: actions/apistatusesretweet.php:83 lib/command.php:421 +#: actions/apistatusesretweet.php:83 #, fuzzy -msgid "Cannot repeat your own notice" +msgid "Cannot repeat your own notice." msgstr "Non se pode activar a notificación." -#: actions/apistatusesretweet.php:91 lib/command.php:426 +#: actions/apistatusesretweet.php:91 #, fuzzy -msgid "Already repeated that notice" +msgid "Already repeated that notice." msgstr "Eliminar chío" #: actions/apistatusesshow.php:138 @@ -524,7 +524,7 @@ msgstr "Liña de tempo pública de %s" msgid "%s updates from everyone!" msgstr "%s chíos de calquera!" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" msgstr "" @@ -558,7 +558,8 @@ msgstr "Non atopado" msgid "No such attachment." msgstr "Ningún documento." -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "Sen alcume." @@ -603,7 +604,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 #, fuzzy msgid "Delete" msgstr "eliminar" @@ -705,8 +706,8 @@ msgstr "Erro ao gardar información de bloqueo." #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 #, fuzzy msgid "No nickname" msgstr "Sen alcume." @@ -714,7 +715,7 @@ msgstr "Sen alcume." #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 #, fuzzy msgid "No such group" msgstr "Non é o usuario" @@ -805,16 +806,13 @@ msgstr "Código de confirmación." msgid "Notices" msgstr "Chíos" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "Ningún chío." - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Non está logueado." @@ -844,7 +842,7 @@ msgstr "Estas seguro que queres eliminar este chío?" msgid "Do not delete this notice" msgstr "Non se pode eliminar este chíos." -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 #, fuzzy msgid "Delete this notice" msgstr "Eliminar chío" @@ -1305,21 +1303,23 @@ msgstr "" #: actions/file.php:34 #, fuzzy -msgid "No notice id" +msgid "No notice ID." msgstr "Novo chío" #: actions/file.php:38 #, fuzzy -msgid "No notice" +msgid "No notice." msgstr "Novo chío" #: actions/file.php:42 -msgid "No attachments" -msgstr "" +#, fuzzy +msgid "No attachments." +msgstr "Ningún documento." #: actions/file.php:51 -msgid "No uploaded attachments" -msgstr "" +#, fuzzy +msgid "No uploaded attachments." +msgstr "Ningún documento." #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1358,8 +1358,9 @@ msgid "Error updating remote profile" msgstr "Acounteceu un erro actualizando o perfil remoto" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 #, fuzzy msgid "No such group." msgstr "Non existe a etiqueta." @@ -2113,8 +2114,8 @@ msgstr "Conectar" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "Non é un formato de datos soportado." @@ -2949,7 +2950,7 @@ msgstr "Non podes rexistrarte se non estas de acordo coa licenza." msgid "You already repeated that notice." msgstr "Xa bloqueaches a este usuario." -#: actions/repeat.php:112 lib/noticelist.php:628 +#: actions/repeat.php:112 lib/noticelist.php:627 #, fuzzy msgid "Repeated" msgstr "Crear" @@ -3760,12 +3761,9 @@ msgstr "Fonte de chíos para %s" msgid "Notice feed for tag %s (Atom)" msgstr "Fonte de chíos para %s" -#: actions/tagother.php:33 -msgid "Not logged in" -msgstr "Non estás logueado." - #: actions/tagother.php:39 -msgid "No id argument." +#, fuzzy +msgid "No ID argument." msgstr "Non hai argumento id." #: actions/tagother.php:65 @@ -4054,7 +4052,8 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "Tipo de imaxe incorrecto para '%s'" #: actions/userbyid.php:70 -msgid "No id." +#, fuzzy +msgid "No ID." msgstr "Sen id." #: actions/userdesignsettings.php:76 lib/designsettings.php:65 @@ -4557,6 +4556,16 @@ msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d " msgid "Error sending direct message." msgstr "Erro ó enviar a mensaxe directa." +#: lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Non se pode activar a notificación." + +#: lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Eliminar chío" + #: lib/command.php:434 #, fuzzy, php-format msgid "Notice from %s repeated" @@ -5365,12 +5374,17 @@ msgstr "" msgid "in context" msgstr "Sen contido!" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "Crear" + +#: lib/noticelist.php:587 #, fuzzy msgid "Reply to this notice" msgstr "Non se pode eliminar este chíos." -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 #, fuzzy msgid "Reply" msgstr "contestar" @@ -5482,11 +5496,11 @@ msgstr "Tódalas etiquetas" #: lib/profileformaction.php:123 #, fuzzy -msgid "No return-to arguments" +msgid "No return-to arguments." msgstr "Non hai argumento id." #: lib/profileformaction.php:137 -msgid "unimplemented method" +msgid "Unimplemented method." msgstr "" #: lib/publicgroupnav.php:78 diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 27f2433e60..156b745f65 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: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:15:34+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:34:50+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: he\n" "X-Message-Group: out-statusnet\n" @@ -431,17 +431,19 @@ msgid "You may not delete another user's status." msgstr "" #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "אין הודעה כזו." -#: actions/apistatusesretweet.php:83 lib/command.php:421 -msgid "Cannot repeat your own notice" -msgstr "" +#: actions/apistatusesretweet.php:83 +#, fuzzy +msgid "Cannot repeat your own notice." +msgstr "לא ניתן להירשם ללא הסכמה לרשיון" -#: actions/apistatusesretweet.php:91 lib/command.php:426 -msgid "Already repeated that notice" -msgstr "" +#: actions/apistatusesretweet.php:91 +#, fuzzy +msgid "Already repeated that notice." +msgstr "כבר נכנסת למערכת!" #: actions/apistatusesshow.php:138 #, fuzzy @@ -514,7 +516,7 @@ msgstr "" msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" msgstr "" @@ -549,7 +551,8 @@ msgstr "לא נמצא" msgid "No such attachment." msgstr "אין מסמך כזה." -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "אין כינוי" @@ -594,7 +597,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 #, fuzzy msgid "Delete" msgstr "מחק" @@ -694,8 +697,8 @@ msgstr "" #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 #, fuzzy msgid "No nickname" msgstr "אין כינוי" @@ -703,7 +706,7 @@ msgstr "אין כינוי" #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 #, fuzzy msgid "No such group" msgstr "אין הודעה כזו." @@ -793,16 +796,13 @@ msgstr "מיקום" msgid "Notices" msgstr "הודעות" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "אין הודעה כזו." - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "לא מחובר." @@ -829,7 +829,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "אין הודעה כזו." -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 msgid "Delete this notice" msgstr "" @@ -1280,21 +1280,23 @@ msgstr "" #: actions/file.php:34 #, fuzzy -msgid "No notice id" +msgid "No notice ID." msgstr "הודעה חדשה" #: actions/file.php:38 #, fuzzy -msgid "No notice" +msgid "No notice." msgstr "הודעה חדשה" #: actions/file.php:42 -msgid "No attachments" -msgstr "" +#, fuzzy +msgid "No attachments." +msgstr "אין מסמך כזה." #: actions/file.php:51 -msgid "No uploaded attachments" -msgstr "" +#, fuzzy +msgid "No uploaded attachments." +msgstr "אין מסמך כזה." #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1333,8 +1335,9 @@ msgid "Error updating remote profile" msgstr "שגיאה בעדכון פרופיל מרוחק" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 #, fuzzy msgid "No such group." msgstr "אין הודעה כזו." @@ -2049,8 +2052,8 @@ msgstr "התחבר" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "" @@ -2841,7 +2844,7 @@ msgstr "לא ניתן להירשם ללא הסכמה לרשיון" msgid "You already repeated that notice." msgstr "כבר נכנסת למערכת!" -#: actions/repeat.php:112 lib/noticelist.php:628 +#: actions/repeat.php:112 lib/noticelist.php:627 #, fuzzy msgid "Repeated" msgstr "צור" @@ -3627,14 +3630,9 @@ msgstr "הזנת הודעות של %s" msgid "Notice feed for tag %s (Atom)" msgstr "הזנת הודעות של %s" -#: actions/tagother.php:33 -#, fuzzy -msgid "Not logged in" -msgstr "לא מחובר." - #: actions/tagother.php:39 #, fuzzy -msgid "No id argument." +msgid "No ID argument." msgstr "אין מסמך כזה." #: actions/tagother.php:65 @@ -3915,7 +3913,8 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "סוג התמונה של '%s' אינו מתאים" #: actions/userbyid.php:70 -msgid "No id." +#, fuzzy +msgid "No ID." msgstr "אין זיהוי." #: actions/userdesignsettings.php:76 lib/designsettings.php:65 @@ -4400,6 +4399,14 @@ msgstr "" msgid "Error sending direct message." msgstr "" +#: lib/command.php:421 +msgid "Cannot repeat your own notice" +msgstr "" + +#: lib/command.php:426 +msgid "Already repeated that notice" +msgstr "" + #: lib/command.php:434 #, fuzzy, php-format msgid "Notice from %s repeated" @@ -5111,11 +5118,16 @@ msgstr "" msgid "in context" msgstr "אין תוכן!" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "צור" + +#: lib/noticelist.php:587 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 #, fuzzy msgid "Reply" msgstr "הגב" @@ -5222,11 +5234,11 @@ msgstr "" #: lib/profileformaction.php:123 #, fuzzy -msgid "No return-to arguments" +msgid "No return-to arguments." msgstr "אין מסמך כזה." #: lib/profileformaction.php:137 -msgid "unimplemented method" +msgid "Unimplemented method." msgstr "" #: lib/publicgroupnav.php:78 diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index 70d4f1cd5d..f8b56d6e9f 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: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:15:37+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:34:53+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: hsb\n" "X-Message-Group: out-statusnet\n" @@ -421,18 +421,19 @@ msgid "You may not delete another user's status." msgstr "Njemóžeš status druheho wužiwarja zničić." #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "Zdźělenka njeeksistuje." -#: actions/apistatusesretweet.php:83 lib/command.php:421 -msgid "Cannot repeat your own notice" -msgstr "" - -#: actions/apistatusesretweet.php:91 lib/command.php:426 +#: actions/apistatusesretweet.php:83 #, fuzzy -msgid "Already repeated that notice" -msgstr "Tutu zdźělenku wušmórnyć" +msgid "Cannot repeat your own notice." +msgstr "Njemóžeš swójsku zdźělenku wospjetować." + +#: actions/apistatusesretweet.php:91 +#, fuzzy +msgid "Already repeated that notice." +msgstr "Tuta zdźělenka bu hižo wospjetowana" #: actions/apistatusesshow.php:138 msgid "Status deleted." @@ -503,7 +504,7 @@ msgstr "" msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" msgstr "" @@ -536,7 +537,8 @@ msgstr "Njenamakany." msgid "No such attachment." msgstr "Přiwěšk njeeksistuje." -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "Žane přimjeno." @@ -581,7 +583,7 @@ msgid "Preview" msgstr "Přehlad" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 msgid "Delete" msgstr "Zničić" @@ -675,15 +677,15 @@ msgstr "" #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname" msgstr "Žane přimjeno" #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 msgid "No such group" msgstr "Skupina njeeksistuje" @@ -769,16 +771,13 @@ msgstr "Konwersacija" msgid "Notices" msgstr "Zdźělenki" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "Zdźělenka njeeksistuje." - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Njepřizjewjeny." @@ -804,7 +803,7 @@ msgstr "Chceš woprawdźe tutu zdźělenku wušmórnyć?" msgid "Do not delete this notice" msgstr "Tutu zdźělenku njewušmórnyć" -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 msgid "Delete this notice" msgstr "Tutu zdźělenku wušmórnyć" @@ -1237,19 +1236,23 @@ msgid "A selection of some of the great users on %s" msgstr "" #: actions/file.php:34 -msgid "No notice id" -msgstr "Žadyn ID zdźělenki" +#, fuzzy +msgid "No notice ID." +msgstr "Žana zdźělenka" #: actions/file.php:38 -msgid "No notice" +#, fuzzy +msgid "No notice." msgstr "Žana zdźělenka" #: actions/file.php:42 -msgid "No attachments" +#, fuzzy +msgid "No attachments." msgstr "Žane přiwěški" #: actions/file.php:51 -msgid "No uploaded attachments" +#, fuzzy +msgid "No uploaded attachments." msgstr "Žane nahrate přiwěški" #: actions/finishremotesubscribe.php:69 @@ -1285,8 +1288,9 @@ msgid "Error updating remote profile" msgstr "" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 msgid "No such group." msgstr "Skupina njeeksistuje." @@ -1965,8 +1969,8 @@ msgstr "" msgid "Only " msgstr "Jenož " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "Njeje podpěrany datowy format." @@ -2717,28 +2721,24 @@ msgid "Only logged-in users can repeat notices." msgstr "" #: actions/repeat.php:64 actions/repeat.php:71 -#, fuzzy msgid "No notice specified." -msgstr "Žadyn profil podaty." +msgstr "Žana zdźělenka podata." #: actions/repeat.php:76 msgid "You can't repeat your own notice." -msgstr "" +msgstr "Njemóžeš swójsku zdźělenku wospjetować." #: actions/repeat.php:90 -#, fuzzy msgid "You already repeated that notice." -msgstr "Sy tutoho wužiwarja hižo zablokował." +msgstr "Sy tutu zdźělenku hižo wospjetował." -#: actions/repeat.php:112 lib/noticelist.php:628 -#, fuzzy +#: actions/repeat.php:112 lib/noticelist.php:627 msgid "Repeated" -msgstr "Wutworjeny" +msgstr "Wospjetowany" #: actions/repeat.php:115 -#, fuzzy msgid "Repeated!" -msgstr "Wutworjeny" +msgstr "Wospjetowany!" #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 @@ -3491,12 +3491,9 @@ msgstr "" msgid "Notice feed for tag %s (Atom)" msgstr "" -#: actions/tagother.php:33 -msgid "Not logged in" -msgstr "Njepřizjewjeny" - #: actions/tagother.php:39 -msgid "No id argument." +#, fuzzy +msgid "No ID argument." msgstr "Žadyn argument ID." #: actions/tagother.php:65 @@ -3753,8 +3750,9 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "" #: actions/userbyid.php:70 -msgid "No id." -msgstr "" +#, fuzzy +msgid "No ID." +msgstr "Žadyn ID" #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" @@ -3895,20 +3893,20 @@ msgstr "" #: lib/accountsettingsaction.php:128 msgid "Other" -msgstr "" +msgstr "Druhe" #: lib/accountsettingsaction.php:128 msgid "Other options" -msgstr "" +msgstr "Druhe opcije" #: lib/action.php:144 #, php-format msgid "%s - %s" -msgstr "" +msgstr "%s - %s" #: lib/action.php:159 msgid "Untitled page" -msgstr "" +msgstr "Strona bjez titula" #: lib/action.php:425 msgid "Primary site navigation" @@ -3924,7 +3922,7 @@ msgstr "" #: lib/action.php:433 msgid "Account" -msgstr "" +msgstr "Konto" #: lib/action.php:433 msgid "Change your email, avatar, password, profile" @@ -3932,7 +3930,7 @@ msgstr "" #: lib/action.php:436 msgid "Connect" -msgstr "" +msgstr "Zwjazać" #: lib/action.php:436 msgid "Connect to services" @@ -3944,7 +3942,7 @@ msgstr "" #: lib/action.php:444 lib/subgroupnav.php:105 msgid "Invite" -msgstr "" +msgstr "Přeprosyć" #: lib/action.php:445 lib/subgroupnav.php:106 #, php-format @@ -3969,7 +3967,7 @@ msgstr "" #: lib/action.php:461 lib/action.php:724 msgid "Help" -msgstr "" +msgstr "Pomoc" #: lib/action.php:461 msgid "Help me!" @@ -4201,7 +4199,7 @@ msgstr "" #: lib/command.php:327 #, php-format msgid "About: %s" -msgstr "" +msgstr "Wo: %s" #: lib/command.php:358 scripts/xmppdaemon.php:321 #, php-format @@ -4212,15 +4210,22 @@ msgstr "" msgid "Error sending direct message." msgstr "" +#: lib/command.php:421 +msgid "Cannot repeat your own notice" +msgstr "" + +#: lib/command.php:426 +msgid "Already repeated that notice" +msgstr "Tuta zdźělenka bu hižo wospjetowana" + #: lib/command.php:434 -#, fuzzy, php-format +#, php-format msgid "Notice from %s repeated" -msgstr "Zdźělenka wotpósłana" +msgstr "Zdźělenka wot %s wospjetowana" #: lib/command.php:436 -#, fuzzy msgid "Error repeating notice." -msgstr "Zmylk při zasunjenju noweho profila" +msgstr "Zmylk při wospjetowanju zdźělenki" #: lib/command.php:490 #, php-format @@ -4367,7 +4372,7 @@ msgstr "" #: lib/common.php:199 msgid "No configuration file found. " -msgstr "" +msgstr "Žana konfiguraciska dataja namakana. " #: lib/common.php:200 msgid "I looked for configuration files in the following places: " @@ -4383,7 +4388,7 @@ msgstr "" #: lib/connectsettingsaction.php:110 msgid "IM" -msgstr "" +msgstr "IM" #: lib/connectsettingsaction.php:111 msgid "Updates by instant messenger (IM)" @@ -4395,11 +4400,11 @@ msgstr "" #: lib/dberroraction.php:60 msgid "Database error" -msgstr "" +msgstr "Zmylk w datowej bance" #: lib/designsettings.php:105 msgid "Upload file" -msgstr "" +msgstr "Dataju nahrać" #: lib/designsettings.php:109 msgid "" @@ -4573,11 +4578,11 @@ msgstr "Njeznaty datajowy typ" #: lib/imagefile.php:217 msgid "MB" -msgstr "" +msgstr "MB" #: lib/imagefile.php:219 msgid "kB" -msgstr "" +msgstr "KB" #: lib/jabber.php:191 #, php-format @@ -4902,11 +4907,16 @@ msgstr "" msgid "in context" msgstr "" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "Wospjetowany" + +#: lib/noticelist.php:587 msgid "Reply to this notice" msgstr "Na tutu zdźělenku wotmołwić" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 msgid "Reply" msgstr "Wotmołwić" @@ -5008,11 +5018,12 @@ msgid "All groups" msgstr "Wšě skupiny" #: lib/profileformaction.php:123 -msgid "No return-to arguments" -msgstr "" +#, fuzzy +msgid "No return-to arguments." +msgstr "Žadyn argument ID." #: lib/profileformaction.php:137 -msgid "unimplemented method" +msgid "Unimplemented method." msgstr "" #: lib/publicgroupnav.php:78 @@ -5036,14 +5047,12 @@ msgid "Popular" msgstr "Woblubowany" #: lib/repeatform.php:107 lib/repeatform.php:132 -#, fuzzy msgid "Repeat this notice" -msgstr "Na tutu zdźělenku wotmołwić" +msgstr "Tutu zdźělenku wospjetować" #: lib/repeatform.php:132 -#, fuzzy msgid "Repeat" -msgstr "Wróćo stajić" +msgstr "Wospjetować" #: lib/sandboxform.php:67 msgid "Sandbox" diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po index 99c3d9ec59..2562a6400f 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: 2009-12-13 17:29+0000\n" -"PO-Revision-Date: 2009-12-13 17:30:36+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:34:56+0000\n" "Language-Team: Interlingua\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ia\n" "X-Message-Group: out-statusnet\n" @@ -431,18 +431,19 @@ msgid "You may not delete another user's status." msgstr "Tu non pote deler le stato de un altere usator." #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "Nota non trovate." -#: actions/apistatusesretweet.php:83 lib/command.php:421 -msgid "Cannot repeat your own notice" -msgstr "" - -#: actions/apistatusesretweet.php:91 lib/command.php:426 +#: actions/apistatusesretweet.php:83 #, fuzzy -msgid "Already repeated that notice" -msgstr "Deler iste nota" +msgid "Cannot repeat your own notice." +msgstr "Non pote repeter tu proprie nota" + +#: actions/apistatusesretweet.php:91 +#, fuzzy +msgid "Already repeated that notice." +msgstr "Iste nota ha ja essite repetite" #: actions/apistatusesshow.php:138 msgid "Status deleted." @@ -517,20 +518,20 @@ msgstr "Chronologia public de %s" msgid "%s updates from everyone!" msgstr "Actualisationes de totes in %s!" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" -msgstr "" +msgstr "Repetite per %s" #: actions/apitimelineretweetedtome.php:111 #, php-format msgid "Repeated to %s" -msgstr "" +msgstr "Repetite a %s" #: actions/apitimelineretweetsofme.php:112 #, php-format msgid "Repeats of %s" -msgstr "" +msgstr "Repetitiones de %s" #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format @@ -550,7 +551,8 @@ msgstr "Non trovate." msgid "No such attachment." msgstr "Attachamento non existe." -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "Nulle pseudonymo." @@ -594,7 +596,7 @@ msgid "Preview" msgstr "Previsualisation" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 msgid "Delete" msgstr "Deler" @@ -691,15 +693,15 @@ msgstr "Falleva de salveguardar le information del blocada." #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname" msgstr "Nulle pseudonymo" #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 msgid "No such group" msgstr "Gruppo non existe" @@ -785,16 +787,13 @@ msgstr "Conversation" msgid "Notices" msgstr "Notas" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "Nota non trovate." - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Non identificate." @@ -822,7 +821,7 @@ msgstr "Es tu secur de voler deler iste nota?" msgid "Do not delete this notice" msgstr "Non deler iste nota" -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 msgid "Delete this notice" msgstr "Deler iste nota" @@ -1269,19 +1268,23 @@ msgid "A selection of some of the great users on %s" msgstr "Un selection de usatores eminente in %s" #: actions/file.php:34 -msgid "No notice id" -msgstr "Nulle ID de nota" +#, fuzzy +msgid "No notice ID." +msgstr "Nulle nota" #: actions/file.php:38 -msgid "No notice" +#, fuzzy +msgid "No notice." msgstr "Nulle nota" #: actions/file.php:42 -msgid "No attachments" +#, fuzzy +msgid "No attachments." msgstr "Nulle attachamento" #: actions/file.php:51 -msgid "No uploaded attachments" +#, fuzzy +msgid "No uploaded attachments." msgstr "Nulle attachamento cargate" #: actions/finishremotesubscribe.php:69 @@ -1317,8 +1320,9 @@ msgid "Error updating remote profile" msgstr "Error in actualisar le profilo remote" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 msgid "No such group." msgstr "Gruppo non existe." @@ -1834,75 +1838,80 @@ msgstr "Tu debe aperir un session pro quitar un gruppo." #: actions/leavegroup.php:90 lib/command.php:268 msgid "You are not a member of that group." -msgstr "" +msgstr "Tu non es membro de iste gruppo." #: actions/leavegroup.php:119 lib/command.php:278 msgid "Could not find membership record." -msgstr "" +msgstr "Non poteva trovar le datos del membrato." #: actions/leavegroup.php:127 lib/command.php:284 #, php-format msgid "Could not remove user %s to group %s" -msgstr "" +msgstr "Non poteva remover le usator %s del gruppo %s" #: actions/leavegroup.php:134 lib/command.php:289 #, php-format msgid "%s left group %s" -msgstr "" +msgstr "%s quitava le gruppo %s" #: actions/login.php:83 actions/register.php:137 msgid "Already logged in." -msgstr "" +msgstr "Tu es ja identificate." #: actions/login.php:114 actions/login.php:124 msgid "Invalid or expired token." -msgstr "" +msgstr "Indicio invalide o expirate." #: actions/login.php:147 msgid "Incorrect username or password." -msgstr "" +msgstr "Nomine de usator o contrasigno incorrecte." #: actions/login.php:153 msgid "Error setting user. You are probably not authorized." msgstr "" +"Error de acceder al conto de usator. Tu probabilemente non es autorisate." #: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" -msgstr "" +msgstr "Aperir session" #: actions/login.php:247 msgid "Login to site" -msgstr "" +msgstr "Identificar te a iste sito" #: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" -msgstr "" +msgstr "Pseudonymo" #: actions/login.php:253 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" -msgstr "" +msgstr "Contrasigno" #: actions/login.php:256 actions/register.php:477 msgid "Remember me" -msgstr "" +msgstr "Memorar me" #: actions/login.php:257 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "" +"Aperir session automaticamente in le futuro; non pro computatores usate in " +"commun!" #: actions/login.php:267 msgid "Lost or forgotten password?" -msgstr "" +msgstr "Contrasigno perdite o oblidate?" #: actions/login.php:286 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "" +"Pro motivos de securitate, per favor re-entra tu nomine de usator e " +"contrasigno ante de cambiar tu configurationes." #: actions/login.php:290 #, php-format @@ -1910,80 +1919,84 @@ msgid "" "Login with your username and password. Don't have a username yet? [Register]" "(%%action.register%%) a new account." msgstr "" +"Aperi un session con tu nomine de usator e contrasigno. Non ha ancora un " +"nomine de usator? [Registra](%%action.register%%) un nove conto." #: actions/makeadmin.php:91 msgid "Only an admin can make another user an admin." -msgstr "" +msgstr "Solmente un administrator pote facer un altere usator administrator." #: actions/makeadmin.php:95 #, php-format msgid "%s is already an admin for group \"%s\"." -msgstr "" +msgstr "%s es ja administrator del gruppo \"%s\"." #: actions/makeadmin.php:132 #, php-format msgid "Can't get membership record for %s in group %s" -msgstr "" +msgstr "Non poteva obtener le datos del membrato de %s in le gruppo %s" #: actions/makeadmin.php:145 #, php-format msgid "Can't make %s an admin for group %s" -msgstr "" +msgstr "Non pote facer %s administrator del gruppo %s" #: actions/microsummary.php:69 msgid "No current status" -msgstr "" +msgstr "Nulle stato actual" #: actions/newgroup.php:53 msgid "New group" -msgstr "" +msgstr "Nove gruppo" #: actions/newgroup.php:110 msgid "Use this form to create a new group." -msgstr "" +msgstr "Usa iste formulario pro crear un nove gruppo." #: actions/newmessage.php:71 actions/newmessage.php:231 msgid "New message" -msgstr "" +msgstr "Nove message" #: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 msgid "You can't send a message to this user." -msgstr "" +msgstr "Tu non pote inviar un message a iste usator." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 #: lib/command.php:483 msgid "No content!" -msgstr "" +msgstr "Nulle contento!" #: actions/newmessage.php:158 msgid "No recipient specified." -msgstr "" +msgstr "Nulle destinatario specificate." #: actions/newmessage.php:164 lib/command.php:370 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" +"Non invia un message a te mesme; il suffice sussurar lo a te mesme in su " +"loco." #: actions/newmessage.php:181 msgid "Message sent" -msgstr "" +msgstr "Message inviate" #: actions/newmessage.php:185 lib/command.php:375 #, php-format msgid "Direct message to %s sent" -msgstr "" +msgstr "Message directe a %s inviate" #: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" -msgstr "" +msgstr "Error de Ajax" #: actions/newnotice.php:69 msgid "New notice" -msgstr "" +msgstr "Nove nota" #: actions/newnotice.php:208 msgid "Notice posted" -msgstr "" +msgstr "Nota publicate" #: actions/noticesearch.php:68 #, php-format @@ -1991,15 +2004,17 @@ msgid "" "Search for notices on %%site.name%% by their contents. Separate search terms " "by spaces; they must be 3 characters or more." msgstr "" +"Cerca notas in %%site.name%% per contento. Separa terminos de recerca per " +"spatios; illos debe haber al minus 3 characteres." #: actions/noticesearch.php:78 msgid "Text search" -msgstr "" +msgstr "Recerca de texto" #: actions/noticesearch.php:91 #, php-format msgid "Search results for \"%s\" on %s" -msgstr "" +msgstr "Resultatos del recerca de \"%s\" in %s" #: actions/noticesearch.php:121 #, php-format @@ -2007,6 +2022,8 @@ msgid "" "Be the first to [post on this topic](%%%%action.newnotice%%%%?" "status_textarea=%s)!" msgstr "" +"Sia le prime a [publicar un nota super iste topico](%%%%action.newnotice%%%%?" +"status_textarea=%s)!" #: actions/noticesearch.php:124 #, php-format @@ -2014,267 +2031,273 @@ msgid "" "Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" +"Proque non [registrar un conto](%%%%action.register%%%%) e devenir le prime " +"a [publicar un nota super iste topico](%%%%action.newnotice%%%%?" +"status_textarea=%s)?" #: actions/noticesearchrss.php:96 #, php-format msgid "Updates with \"%s\"" -msgstr "" +msgstr "Actualisationes con \"%s\"" #: actions/noticesearchrss.php:98 #, php-format msgid "Updates matching search term \"%1$s\" on %2$s!" -msgstr "" +msgstr "Actualisationes correspondente al termino de recerca \"%1$s\" in %2$s!" #: actions/nudge.php:85 msgid "" "This user doesn't allow nudges or hasn't confirmed or set his email yet." msgstr "" +"Iste usator non accepta pulsatas o non ha ancora confirmate o fornite su " +"adresse de e-mail." #: actions/nudge.php:94 msgid "Nudge sent" -msgstr "" +msgstr "Pulsata inviate" #: actions/nudge.php:97 msgid "Nudge sent!" -msgstr "" +msgstr "Pulsata inviate!" #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" -msgstr "" +msgstr "Le nota ha nulle profilo" #: actions/oembed.php:86 actions/shownotice.php:180 #, php-format msgid "%1$s's status on %2$s" -msgstr "" +msgstr "Le stato de %1$s in %2$s" #: actions/oembed.php:157 msgid "content type " -msgstr "" +msgstr "typo de contento " #: actions/oembed.php:160 msgid "Only " -msgstr "" +msgstr "Solmente " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." -msgstr "" +msgstr "Formato de datos non supportate." #: actions/opensearch.php:64 msgid "People Search" -msgstr "" +msgstr "Recerca de personas" #: actions/opensearch.php:67 msgid "Notice Search" -msgstr "" +msgstr "Rercerca de notas" #: actions/othersettings.php:60 msgid "Other Settings" -msgstr "" +msgstr "Altere configurationes" #: actions/othersettings.php:71 msgid "Manage various other options." -msgstr "" +msgstr "Gestion de varie altere optiones." #: actions/othersettings.php:108 msgid " (free service)" -msgstr "" +msgstr " (servicio gratuite)" #: actions/othersettings.php:116 msgid "Shorten URLs with" -msgstr "" +msgstr "Accurtar URLs con" #: actions/othersettings.php:117 msgid "Automatic shortening service to use." -msgstr "" +msgstr "Le servicio de accurtamento automatic a usar." #: actions/othersettings.php:122 msgid "View profile designs" -msgstr "" +msgstr "Vider apparentias de profilo" #: actions/othersettings.php:123 msgid "Show or hide profile designs." -msgstr "" +msgstr "Monstrar o celar apparentias de profilo." #: actions/othersettings.php:153 msgid "URL shortening service is too long (max 50 chars)." -msgstr "" +msgstr "Le servicio de accurtamento de URL es troppo longe (max 50 chars)." #: actions/outbox.php:58 #, php-format msgid "Outbox for %s - page %d" -msgstr "" +msgstr "Cassa de exito pro %s - pagina %d" #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" -msgstr "" +msgstr "Cassa de exito pro %s" #: actions/outbox.php:116 msgid "This is your outbox, which lists private messages you have sent." msgstr "" +"Isto es tu cassa de exito, que lista le messages private que tu ha inviate." #: actions/passwordsettings.php:58 msgid "Change password" -msgstr "" +msgstr "Cambiar contrasigno" #: actions/passwordsettings.php:69 msgid "Change your password." -msgstr "" +msgstr "Cambiar tu contrasigno." #: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" -msgstr "" +msgstr "Cambio del contrasigno" #: actions/passwordsettings.php:104 msgid "Old password" -msgstr "" +msgstr "Ancian contrasigno" #: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" -msgstr "" +msgstr "Nove contrasigno" #: actions/passwordsettings.php:109 msgid "6 or more characters" -msgstr "" +msgstr "6 o plus characteres" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" -msgstr "" +msgstr "Confirmar" #: actions/passwordsettings.php:113 actions/recoverpassword.php:240 msgid "Same as password above" -msgstr "" +msgstr "Identic al contrasigno hic supra" #: actions/passwordsettings.php:117 msgid "Change" -msgstr "" +msgstr "Cambiar" #: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." -msgstr "" +msgstr "Le contrasigno debe haber al minus 6 characteres." #: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." -msgstr "" +msgstr "Le contrasignos non corresponde." #: actions/passwordsettings.php:165 msgid "Incorrect old password" -msgstr "" +msgstr "Ancian contrasigno incorrecte" #: actions/passwordsettings.php:181 msgid "Error saving user; invalid." -msgstr "" +msgstr "Error de salveguardar le usator; invalide." #: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." -msgstr "" +msgstr "Non pote salveguardar le nove contrasigno." #: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." -msgstr "" +msgstr "Contrasigno salveguardate." #: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 msgid "Paths" -msgstr "" +msgstr "Camminos" #: actions/pathsadminpanel.php:70 msgid "Path and server settings for this StatusNet site." -msgstr "" +msgstr "Configuration de cammino e servitor pro iste sito StatusNet." #: actions/pathsadminpanel.php:140 #, php-format msgid "Theme directory not readable: %s" -msgstr "" +msgstr "Directorio de thema non legibile: %s" #: actions/pathsadminpanel.php:146 #, php-format msgid "Avatar directory not writable: %s" -msgstr "" +msgstr "Directorio de avatar non scriptibile: %s" #: actions/pathsadminpanel.php:152 #, php-format msgid "Background directory not writable: %s" -msgstr "" +msgstr "Directorio de fundo non scriptibile: %s" #: actions/pathsadminpanel.php:160 #, php-format msgid "Locales directory not readable: %s" -msgstr "" +msgstr "Directorio de localitates non scriptibile: %s" #: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:299 msgid "Site" -msgstr "" +msgstr "Sito" #: actions/pathsadminpanel.php:216 msgid "Path" -msgstr "" +msgstr "Cammino" #: actions/pathsadminpanel.php:216 msgid "Site path" -msgstr "" +msgstr "Cammino del sito" #: actions/pathsadminpanel.php:220 msgid "Path to locales" -msgstr "" +msgstr "Cammino al localitates" #: actions/pathsadminpanel.php:220 msgid "Directory path to locales" -msgstr "" +msgstr "Cammino al directorio de localitates" #: actions/pathsadminpanel.php:227 msgid "Theme" -msgstr "" +msgstr "Thema" #: actions/pathsadminpanel.php:232 msgid "Theme server" -msgstr "" +msgstr "Servitor de themas" #: actions/pathsadminpanel.php:236 msgid "Theme path" -msgstr "" +msgstr "Cammino al themas" #: actions/pathsadminpanel.php:240 msgid "Theme directory" -msgstr "" +msgstr "Directorio del themas" #: actions/pathsadminpanel.php:247 msgid "Avatars" -msgstr "" +msgstr "Avatares" #: actions/pathsadminpanel.php:252 msgid "Avatar server" -msgstr "" +msgstr "Servitor de avatares" #: actions/pathsadminpanel.php:256 msgid "Avatar path" -msgstr "" +msgstr "Cammino al avatares" #: actions/pathsadminpanel.php:260 msgid "Avatar directory" -msgstr "" +msgstr "Directorio del avatares" #: actions/pathsadminpanel.php:269 msgid "Backgrounds" -msgstr "" +msgstr "Fundos" #: actions/pathsadminpanel.php:273 msgid "Background server" -msgstr "" +msgstr "Servitor de fundos" #: actions/pathsadminpanel.php:277 msgid "Background path" -msgstr "" +msgstr "Cammino al fundos" #: actions/pathsadminpanel.php:281 msgid "Background directory" -msgstr "" +msgstr "Directorio al fundos" #: actions/pathsadminpanel.php:297 msgid "Save paths" -msgstr "" +msgstr "Salveguardar camminos" #: actions/peoplesearch.php:52 #, php-format @@ -2282,57 +2305,62 @@ msgid "" "Search for people on %%site.name%% by their name, location, or interests. " "Separate the terms by spaces; they must be 3 characters or more." msgstr "" +"Cerca personas in %%site.name%% per nomine, loco o interesses. Separa le " +"terminos per spatios; illos debe haber 3 characteres o plus." #: actions/peoplesearch.php:58 msgid "People search" -msgstr "" +msgstr "Recerca de personas" #: actions/peopletag.php:70 #, php-format msgid "Not a valid people tag: %s" -msgstr "" +msgstr "Etiquetta de personas invalide: %s" #: actions/peopletag.php:144 #, php-format msgid "Users self-tagged with %s - page %d" -msgstr "" +msgstr "Usatores auto-etiquettate con %s - pagina %d" #: actions/postnotice.php:84 msgid "Invalid notice content" -msgstr "" +msgstr "Le contento del nota es invalide" #: actions/postnotice.php:90 #, php-format msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." msgstr "" +"Le licentia del nota '%s' non es compatibile con le licentia del sito '%s'." #: actions/profilesettings.php:60 msgid "Profile settings" -msgstr "" +msgstr "Configurationes del profilo" #: actions/profilesettings.php:71 msgid "" "You can update your personal profile info here so people know more about you." msgstr "" +"Tu pote actualisar hic le informationes personal de tu profilo a fin que le " +"gente pote facer plus de te." #: actions/profilesettings.php:99 msgid "Profile information" -msgstr "" +msgstr "Information de profilo" #: actions/profilesettings.php:108 lib/groupeditform.php:154 msgid "1-64 lowercase letters or numbers, no punctuation or spaces" -msgstr "" +msgstr "1-64 minusculas o numeros, sin punctuation o spatios" #: actions/profilesettings.php:111 actions/register.php:447 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" -msgstr "" +msgstr "Nomine complete" #: actions/profilesettings.php:115 actions/register.php:452 #: lib/groupeditform.php:161 msgid "Homepage" -msgstr "" +msgstr "Pagina personal" #: actions/profilesettings.php:117 actions/register.php:454 msgid "URL of your homepage, blog, or profile on another site" @@ -2819,7 +2847,7 @@ msgstr "" msgid "You already repeated that notice." msgstr "Tu ha ja blocate iste usator." -#: actions/repeat.php:112 lib/noticelist.php:628 +#: actions/repeat.php:112 lib/noticelist.php:627 msgid "Repeated" msgstr "" @@ -3578,13 +3606,10 @@ msgstr "" msgid "Notice feed for tag %s (Atom)" msgstr "" -#: actions/tagother.php:33 -msgid "Not logged in" -msgstr "" - #: actions/tagother.php:39 -msgid "No id argument." -msgstr "" +#, fuzzy +msgid "No ID argument." +msgstr "Documento non existe." #: actions/tagother.php:65 #, php-format @@ -3840,8 +3865,9 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "" #: actions/userbyid.php:70 -msgid "No id." -msgstr "" +#, fuzzy +msgid "No ID." +msgstr "Nulle ID" #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" @@ -4299,6 +4325,14 @@ msgstr "" msgid "Error sending direct message." msgstr "" +#: lib/command.php:421 +msgid "Cannot repeat your own notice" +msgstr "Non pote repeter tu proprie nota" + +#: lib/command.php:426 +msgid "Already repeated that notice" +msgstr "Iste nota ha ja essite repetite" + #: lib/command.php:434 #, php-format msgid "Notice from %s repeated" @@ -4981,11 +5015,16 @@ msgstr "" msgid "in context" msgstr "" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "Repetite per %s" + +#: lib/noticelist.php:587 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 msgid "Reply" msgstr "" @@ -5087,11 +5126,11 @@ msgid "All groups" msgstr "" #: lib/profileformaction.php:123 -msgid "No return-to arguments" +msgid "No return-to arguments." msgstr "" #: lib/profileformaction.php:137 -msgid "unimplemented method" +msgid "Unimplemented method." msgstr "" #: lib/publicgroupnav.php:78 diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index f1ace2a339..75a577d031 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: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:15:42+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:34:59+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: is\n" "X-Message-Group: out-statusnet\n" @@ -432,18 +432,18 @@ msgid "You may not delete another user's status." msgstr "Þú getur ekki eytt stöðu annars notanda." #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "Ekkert svoleiðis babl." -#: actions/apistatusesretweet.php:83 lib/command.php:421 +#: actions/apistatusesretweet.php:83 #, fuzzy -msgid "Cannot repeat your own notice" +msgid "Cannot repeat your own notice." msgstr "Get ekki kveikt á tilkynningum." -#: actions/apistatusesretweet.php:91 lib/command.php:426 +#: actions/apistatusesretweet.php:91 #, fuzzy -msgid "Already repeated that notice" +msgid "Already repeated that notice." msgstr "Eyða þessu babli" #: actions/apistatusesshow.php:138 @@ -516,7 +516,7 @@ msgstr "Almenningsrás %s" msgid "%s updates from everyone!" msgstr "%s færslur frá öllum!" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" msgstr "" @@ -549,7 +549,8 @@ msgstr "Fannst ekki." msgid "No such attachment." msgstr "" -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "Ekkert stuttnefni." @@ -593,7 +594,7 @@ msgid "Preview" msgstr "Forsýn" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 msgid "Delete" msgstr "Eyða" @@ -690,15 +691,15 @@ msgstr "Mistókst að vista upplýsingar um notendalokun" #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname" msgstr "Ekkert stuttnefni" #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 msgid "No such group" msgstr "Enginn þannig hópur" @@ -786,16 +787,13 @@ msgstr "" msgid "Notices" msgstr "Babl" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "Ekkert svoleiðis babl." - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Ekki innskráð(ur)." @@ -821,7 +819,7 @@ msgstr "Ertu viss um að þú viljir eyða þessu babli?" msgid "Do not delete this notice" msgstr "" -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 msgid "Delete this notice" msgstr "Eyða þessu babli" @@ -1268,19 +1266,22 @@ msgid "A selection of some of the great users on %s" msgstr "Úrval nokkurra frábærra notenda á %s" #: actions/file.php:34 -msgid "No notice id" -msgstr "" +#, fuzzy +msgid "No notice ID." +msgstr "Ekkert svoleiðis babl." #: actions/file.php:38 -msgid "No notice" -msgstr "" +#, fuzzy +msgid "No notice." +msgstr "Ekkert svoleiðis babl." #: actions/file.php:42 -msgid "No attachments" -msgstr "" +#, fuzzy +msgid "No attachments." +msgstr "Ekkert svoleiðis skjal." #: actions/file.php:51 -msgid "No uploaded attachments" +msgid "No uploaded attachments." msgstr "" #: actions/finishremotesubscribe.php:69 @@ -1320,8 +1321,9 @@ msgid "Error updating remote profile" msgstr "Villa kom upp í uppfærslu persónulegrar fjarsíðu" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 msgid "No such group." msgstr "Enginn þannig hópur." @@ -2058,8 +2060,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "Enginn stuðningur við gagnasnið." @@ -2874,7 +2876,7 @@ msgstr "Þú getur ekki nýskráð þig nema þú samþykkir leyfið." msgid "You already repeated that notice." msgstr "Þú hefur nú þegar lokað á þennan notanda." -#: actions/repeat.php:112 lib/noticelist.php:628 +#: actions/repeat.php:112 lib/noticelist.php:627 #, fuzzy msgid "Repeated" msgstr "Í sviðsljósinu" @@ -3657,12 +3659,9 @@ msgstr "Bablveita fyrir %s" msgid "Notice feed for tag %s (Atom)" msgstr "" -#: actions/tagother.php:33 -msgid "Not logged in" -msgstr "Ekki innskráð(ur)" - #: actions/tagother.php:39 -msgid "No id argument." +#, fuzzy +msgid "No ID argument." msgstr "Ekkert einkenni gefið upp." #: actions/tagother.php:65 @@ -3946,8 +3945,9 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "Röng gerð myndar fyrir '%s'" #: actions/userbyid.php:70 -msgid "No id." -msgstr "Ekkert kenni." +#, fuzzy +msgid "No ID." +msgstr "Ekkert einkenni" #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" @@ -4424,6 +4424,16 @@ msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú send msgid "Error sending direct message." msgstr "Villa kom upp við að senda bein skilaboð" +#: lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Get ekki kveikt á tilkynningum." + +#: lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Eyða þessu babli" + #: lib/command.php:434 #, fuzzy, php-format msgid "Notice from %s repeated" @@ -5129,11 +5139,16 @@ msgstr "" msgid "in context" msgstr "" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "Í sviðsljósinu" + +#: lib/noticelist.php:587 msgid "Reply to this notice" msgstr "Svara þessu babli" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 msgid "Reply" msgstr "Svara" @@ -5238,11 +5253,11 @@ msgstr "Allir hópar" #: lib/profileformaction.php:123 #, fuzzy -msgid "No return-to arguments" +msgid "No return-to arguments." msgstr "Ekkert einkenni gefið upp." #: lib/profileformaction.php:137 -msgid "unimplemented method" +msgid "Unimplemented method." msgstr "" #: lib/publicgroupnav.php:78 diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index 8fe0e93ab2..36d0eb289c 100644 --- a/locale/it/LC_MESSAGES/statusnet.po +++ b/locale/it/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:15:45+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:35:02+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: it\n" "X-Message-Group: out-statusnet\n" @@ -437,18 +437,18 @@ msgid "You may not delete another user's status." msgstr "Non puoi eliminare lo stato di un altro utente." #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "Nessun tale messaggio." -#: actions/apistatusesretweet.php:83 lib/command.php:421 +#: actions/apistatusesretweet.php:83 #, fuzzy -msgid "Cannot repeat your own notice" +msgid "Cannot repeat your own notice." msgstr "Impossibile attivare le notifiche." -#: actions/apistatusesretweet.php:91 lib/command.php:426 +#: actions/apistatusesretweet.php:91 #, fuzzy -msgid "Already repeated that notice" +msgid "Already repeated that notice." msgstr "Elimina questo messaggio" #: actions/apistatusesshow.php:138 @@ -522,7 +522,7 @@ msgstr "attività pubblica di %s" msgid "%s updates from everyone!" msgstr "Aggiornamenti di %s da tutti!" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" msgstr "" @@ -556,7 +556,8 @@ msgstr "Non trovato" msgid "No such attachment." msgstr "Nessun tale documento." -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "Nessun soprannome." @@ -600,7 +601,7 @@ msgid "Preview" msgstr "Anteprima" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 msgid "Delete" msgstr "Elimina" @@ -697,15 +698,15 @@ msgstr "Salvataggio delle informazioni per il blocco non riuscito." #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname" msgstr "Nessun soprannome" #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 msgid "No such group" msgstr "Nessun tale gruppo" @@ -795,16 +796,13 @@ msgstr "Codice di conferma" msgid "Notices" msgstr "Messaggi" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "Nessun tale messaggio." - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Non connesso." @@ -834,7 +832,7 @@ msgstr "Sei sicuro di voler eliminare questo messaggio?" msgid "Do not delete this notice" msgstr "Impossibile eliminare questo messaggio." -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 msgid "Delete this notice" msgstr "Elimina questo messaggio" @@ -1292,21 +1290,23 @@ msgstr "Una selezione dei migliori utenti su %s" #: actions/file.php:34 #, fuzzy -msgid "No notice id" +msgid "No notice ID." msgstr "Nuovo messaggio" #: actions/file.php:38 #, fuzzy -msgid "No notice" +msgid "No notice." msgstr "Nuovo messaggio" #: actions/file.php:42 -msgid "No attachments" -msgstr "" +#, fuzzy +msgid "No attachments." +msgstr "Nessun tale documento." #: actions/file.php:51 -msgid "No uploaded attachments" -msgstr "" +#, fuzzy +msgid "No uploaded attachments." +msgstr "Nessun tale documento." #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1346,8 +1346,9 @@ msgid "Error updating remote profile" msgstr "Errore nell'aggiornare il profilo remoto" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 msgid "No such group." msgstr "Nessuna tale gruppo." @@ -2100,8 +2101,8 @@ msgstr "Connetti" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "Non è un formato di dati supportato." @@ -2922,7 +2923,7 @@ msgstr "Non puoi registrarti se non accetti la licenza." msgid "You already repeated that notice." msgstr "Hai già bloccato questo utente." -#: actions/repeat.php:112 lib/noticelist.php:628 +#: actions/repeat.php:112 lib/noticelist.php:627 #, fuzzy msgid "Repeated" msgstr "Crea" @@ -3718,12 +3719,9 @@ msgstr "Feed dei messaggi per %s" msgid "Notice feed for tag %s (Atom)" msgstr "Feed dei messaggi per %s" -#: actions/tagother.php:33 -msgid "Not logged in" -msgstr "Non connesso" - #: actions/tagother.php:39 -msgid "No id argument." +#, fuzzy +msgid "No ID argument." msgstr "Nessun argomento ID." #: actions/tagother.php:65 @@ -4008,8 +4006,9 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "Tipo di immagine errata per \"%s\"" #: actions/userbyid.php:70 -msgid "No id." -msgstr "Nessun ID." +#, fuzzy +msgid "No ID." +msgstr "Nessun ID" #: actions/userdesignsettings.php:76 lib/designsettings.php:65 #, fuzzy @@ -4494,6 +4493,16 @@ msgstr "Messaggio troppo lungo - massimo 140 caratteri, inviati %d" msgid "Error sending direct message." msgstr "Errore nell'inviare il messaggio diretto." +#: lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Impossibile attivare le notifiche." + +#: lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Elimina questo messaggio" + #: lib/command.php:434 #, fuzzy, php-format msgid "Notice from %s repeated" @@ -5206,11 +5215,16 @@ msgstr "" msgid "in context" msgstr "Nessun contenuto!" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "Crea" + +#: lib/noticelist.php:587 msgid "Reply to this notice" msgstr "Rispondi a questo messaggio" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 msgid "Reply" msgstr "Rispondi" @@ -5316,11 +5330,11 @@ msgstr "Tutti i gruppi" #: lib/profileformaction.php:123 #, fuzzy -msgid "No return-to arguments" +msgid "No return-to arguments." msgstr "Nessun argomento ID." #: lib/profileformaction.php:137 -msgid "unimplemented method" +msgid "Unimplemented method." msgstr "" #: lib/publicgroupnav.php:78 diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index ed37aa5490..8c62f70cca 100644 --- a/locale/ja/LC_MESSAGES/statusnet.po +++ b/locale/ja/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:15:48+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:35:05+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ja\n" "X-Message-Group: out-statusnet\n" @@ -439,17 +439,18 @@ msgid "You may not delete another user's status." msgstr "" #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "そのような通知はありません。" -#: actions/apistatusesretweet.php:83 lib/command.php:421 -msgid "Cannot repeat your own notice" -msgstr "" - -#: actions/apistatusesretweet.php:91 lib/command.php:426 +#: actions/apistatusesretweet.php:83 #, fuzzy -msgid "Already repeated that notice" +msgid "Cannot repeat your own notice." +msgstr "ライセンスに同意頂けない場合は登録できません。" + +#: actions/apistatusesretweet.php:91 +#, fuzzy +msgid "Already repeated that notice." msgstr "この通知を削除" #: actions/apistatusesshow.php:138 @@ -523,7 +524,7 @@ msgstr "%s の公開タイムライン" msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" msgstr "" @@ -557,7 +558,8 @@ msgstr "見つかりません。" msgid "No such attachment." msgstr "そのようなドキュメントはありません。" -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "ニックネームがありません。" @@ -601,7 +603,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 msgid "Delete" msgstr "削除" @@ -699,8 +701,8 @@ msgstr "" #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 #, fuzzy msgid "No nickname" msgstr "ニックネームがありません。" @@ -708,7 +710,7 @@ msgstr "ニックネームがありません。" #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 #, fuzzy msgid "No such group" msgstr "そのような通知はありません。" @@ -797,16 +799,13 @@ msgstr "確認コード" msgid "Notices" msgstr "通知" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "そのような通知はありません。" - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "ログインしていません。" @@ -833,7 +832,7 @@ msgstr "本当にこの通知を削除しますか？" msgid "Do not delete this notice" msgstr "この通知を削除できません。" -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 msgid "Delete this notice" msgstr "この通知を削除" @@ -1286,21 +1285,23 @@ msgstr "" #: actions/file.php:34 #, fuzzy -msgid "No notice id" +msgid "No notice ID." msgstr "新しい通知" #: actions/file.php:38 #, fuzzy -msgid "No notice" +msgid "No notice." msgstr "新しい通知" #: actions/file.php:42 -msgid "No attachments" -msgstr "" +#, fuzzy +msgid "No attachments." +msgstr "そのようなドキュメントはありません。" #: actions/file.php:51 -msgid "No uploaded attachments" -msgstr "" +#, fuzzy +msgid "No uploaded attachments." +msgstr "そのようなドキュメントはありません。" #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1339,8 +1340,9 @@ msgid "Error updating remote profile" msgstr "リモートプロファイル更新エラー" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 msgid "No such group." msgstr "そのようなグループはありません。" @@ -2068,8 +2070,8 @@ msgstr "内容種別 " msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "" @@ -2879,7 +2881,7 @@ msgstr "ライセンスに同意頂けない場合は登録できません。" msgid "You already repeated that notice." msgstr "既にログイン済みです。" -#: actions/repeat.php:112 lib/noticelist.php:628 +#: actions/repeat.php:112 lib/noticelist.php:627 #, fuzzy msgid "Repeated" msgstr "作成" @@ -3667,14 +3669,9 @@ msgstr "%sの通知フィード" msgid "Notice feed for tag %s (Atom)" msgstr "%sの通知フィード" -#: actions/tagother.php:33 -#, fuzzy -msgid "Not logged in" -msgstr "ログインしていません。" - #: actions/tagother.php:39 #, fuzzy -msgid "No id argument." +msgid "No ID argument." msgstr "そのようなドキュメントはありません。" #: actions/tagother.php:65 @@ -3946,7 +3943,8 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "不正な画像形式。'%s'" #: actions/userbyid.php:70 -msgid "No id." +#, fuzzy +msgid "No ID." msgstr "id がありません。" #: actions/userdesignsettings.php:76 lib/designsettings.php:65 @@ -4430,6 +4428,15 @@ msgstr "" msgid "Error sending direct message." msgstr "" +#: lib/command.php:421 +msgid "Cannot repeat your own notice" +msgstr "" + +#: lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "この通知を削除" + #: lib/command.php:434 #, fuzzy, php-format msgid "Notice from %s repeated" @@ -5129,11 +5136,16 @@ msgstr "" msgid "in context" msgstr "コンテンツがありません！" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "作成" + +#: lib/noticelist.php:587 msgid "Reply to this notice" msgstr "この通知へ返信" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 msgid "Reply" msgstr "返信" @@ -5238,11 +5250,11 @@ msgstr "" #: lib/profileformaction.php:123 #, fuzzy -msgid "No return-to arguments" +msgid "No return-to arguments." msgstr "そのようなドキュメントはありません。" #: lib/profileformaction.php:137 -msgid "unimplemented method" +msgid "Unimplemented method." msgstr "" #: lib/publicgroupnav.php:78 diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index eed6df26de..1045836a84 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: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:15:51+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:35:09+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ko\n" "X-Message-Group: out-statusnet\n" @@ -436,18 +436,18 @@ msgid "You may not delete another user's status." msgstr "당신은 다른 사용자의 상태를 삭제하지 않아도 된다." #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "그러한 통지는 없습니다." -#: actions/apistatusesretweet.php:83 lib/command.php:421 +#: actions/apistatusesretweet.php:83 #, fuzzy -msgid "Cannot repeat your own notice" +msgid "Cannot repeat your own notice." msgstr "알림을 켤 수 없습니다." -#: actions/apistatusesretweet.php:91 lib/command.php:426 +#: actions/apistatusesretweet.php:91 #, fuzzy -msgid "Already repeated that notice" +msgid "Already repeated that notice." msgstr "이 게시글 삭제하기" #: actions/apistatusesshow.php:138 @@ -521,7 +521,7 @@ msgstr "%s 공개 타임라인" msgid "%s updates from everyone!" msgstr "모두로부터의 업데이트 %s개!" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" msgstr "" @@ -555,7 +555,8 @@ msgstr "찾을 수가 없습니다." msgid "No such attachment." msgstr "그러한 문서는 없습니다." -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "별명이 없습니다." @@ -599,7 +600,7 @@ msgid "Preview" msgstr "미리보기" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 msgid "Delete" msgstr "삭제" @@ -696,15 +697,15 @@ msgstr "정보차단을 저장하는데 실패했습니다." #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname" msgstr "닉네임이 없습니다" #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 msgid "No such group" msgstr "그러한 그룹이 없습니다." @@ -794,16 +795,13 @@ msgstr "인증 코드" msgid "Notices" msgstr "통지" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "그러한 통지는 없습니다." - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "로그인하고 있지 않습니다." @@ -832,7 +830,7 @@ msgstr "정말로 통지를 삭제하시겠습니까?" msgid "Do not delete this notice" msgstr "이 통지를 지울 수 없습니다." -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 msgid "Delete this notice" msgstr "이 게시글 삭제하기" @@ -1286,21 +1284,23 @@ msgstr "%s의 훌륭한 회원의 일부 선택" #: actions/file.php:34 #, fuzzy -msgid "No notice id" +msgid "No notice ID." msgstr "새로운 통지" #: actions/file.php:38 #, fuzzy -msgid "No notice" +msgid "No notice." msgstr "새로운 통지" #: actions/file.php:42 -msgid "No attachments" -msgstr "" +#, fuzzy +msgid "No attachments." +msgstr "그러한 문서는 없습니다." #: actions/file.php:51 -msgid "No uploaded attachments" -msgstr "" +#, fuzzy +msgid "No uploaded attachments." +msgstr "그러한 문서는 없습니다." #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1339,8 +1339,9 @@ msgid "Error updating remote profile" msgstr "리모트 프로필 업데이트 오류" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 msgid "No such group." msgstr "그러한 그룹이 없습니다." @@ -2080,8 +2081,8 @@ msgstr "연결" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "지원하는 형식의 데이터가 아닙니다." @@ -2892,7 +2893,7 @@ msgstr "라이선스에 동의하지 않는다면 등록할 수 없습니다." msgid "You already repeated that notice." msgstr "당신은 이미 이 사용자를 차단하고 있습니다." -#: actions/repeat.php:112 lib/noticelist.php:628 +#: actions/repeat.php:112 lib/noticelist.php:627 #, fuzzy msgid "Repeated" msgstr "생성" @@ -3686,12 +3687,9 @@ msgstr "%s의 통지 피드" msgid "Notice feed for tag %s (Atom)" msgstr "%s의 통지 피드" -#: actions/tagother.php:33 -msgid "Not logged in" -msgstr "로그인되지 않았습니다." - #: actions/tagother.php:39 -msgid "No id argument." +#, fuzzy +msgid "No ID argument." msgstr "id 인자가 없습니다." #: actions/tagother.php:65 @@ -3970,8 +3968,9 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "%S 잘못된 그림 파일 타입입니다. " #: actions/userbyid.php:70 -msgid "No id." -msgstr "id가 없습니다." +#, fuzzy +msgid "No ID." +msgstr "ID가 없습니다." #: actions/userdesignsettings.php:76 lib/designsettings.php:65 #, fuzzy @@ -4456,6 +4455,16 @@ msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지 msgid "Error sending direct message." msgstr "직접 메시지 보내기 오류." +#: lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "알림을 켤 수 없습니다." + +#: lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "이 게시글 삭제하기" + #: lib/command.php:434 #, fuzzy, php-format msgid "Notice from %s repeated" @@ -5157,11 +5166,16 @@ msgstr "" msgid "in context" msgstr "내용이 없습니다!" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "생성" + +#: lib/noticelist.php:587 msgid "Reply to this notice" msgstr "이 게시글에 대해 답장하기" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 msgid "Reply" msgstr "답장하기" @@ -5267,11 +5281,11 @@ msgstr "모든 그룹" #: lib/profileformaction.php:123 #, fuzzy -msgid "No return-to arguments" +msgid "No return-to arguments." msgstr "id 인자가 없습니다." #: lib/profileformaction.php:137 -msgid "unimplemented method" +msgid "Unimplemented method." msgstr "" #: lib/publicgroupnav.php:78 diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 1397b809c8..154749c832 100644 --- a/locale/mk/LC_MESSAGES/statusnet.po +++ b/locale/mk/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:15:55+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:35:13+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: mk\n" "X-Message-Group: out-statusnet\n" @@ -432,17 +432,19 @@ msgid "You may not delete another user's status." msgstr "" #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "Нема такво известување." -#: actions/apistatusesretweet.php:83 lib/command.php:421 -msgid "Cannot repeat your own notice" -msgstr "" +#: actions/apistatusesretweet.php:83 +#, fuzzy +msgid "Cannot repeat your own notice." +msgstr "Не може да се регистрирате ако не ја прифаќате лиценцата." -#: actions/apistatusesretweet.php:91 lib/command.php:426 -msgid "Already repeated that notice" -msgstr "" +#: actions/apistatusesretweet.php:91 +#, fuzzy +msgid "Already repeated that notice." +msgstr "Веќе сте пријавени!" #: actions/apistatusesshow.php:138 #, fuzzy @@ -515,7 +517,7 @@ msgstr "" msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" msgstr "" @@ -550,7 +552,8 @@ msgstr "Не е пронаједено барање." msgid "No such attachment." msgstr "Нема таков документ." -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "Нема прекар." @@ -595,7 +598,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 msgid "Delete" msgstr "" @@ -694,15 +697,15 @@ msgstr "" #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname" msgstr "Нема прекар" #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 #, fuzzy msgid "No such group" msgstr "Нема такво известување." @@ -792,16 +795,13 @@ msgstr "Локација" msgid "Notices" msgstr "Известувања" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "Нема такво известување." - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Не сте пријавени." @@ -828,7 +828,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "Нема такво известување." -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 msgid "Delete this notice" msgstr "" @@ -1277,21 +1277,23 @@ msgstr "" #: actions/file.php:34 #, fuzzy -msgid "No notice id" +msgid "No notice ID." msgstr "Ново известување" #: actions/file.php:38 #, fuzzy -msgid "No notice" +msgid "No notice." msgstr "Ново известување" #: actions/file.php:42 -msgid "No attachments" -msgstr "" +#, fuzzy +msgid "No attachments." +msgstr "Нема таков документ." #: actions/file.php:51 -msgid "No uploaded attachments" -msgstr "" +#, fuzzy +msgid "No uploaded attachments." +msgstr "Нема таков документ." #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1330,8 +1332,9 @@ msgid "Error updating remote profile" msgstr "Грешка во освежувањето на оддалечениот профил" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 #, fuzzy msgid "No such group." msgstr "Нема такво известување." @@ -2048,8 +2051,8 @@ msgstr "Поврзи се" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "" @@ -2850,7 +2853,7 @@ msgstr "Не може да се регистрирате ако не ја при msgid "You already repeated that notice." msgstr "Веќе сте пријавени!" -#: actions/repeat.php:112 lib/noticelist.php:628 +#: actions/repeat.php:112 lib/noticelist.php:627 #, fuzzy msgid "Repeated" msgstr "Креирај" @@ -3637,14 +3640,9 @@ msgstr "Канал со известувања на %s" msgid "Notice feed for tag %s (Atom)" msgstr "Канал со известувања на %s" -#: actions/tagother.php:33 -#, fuzzy -msgid "Not logged in" -msgstr "Не сте пријавени." - #: actions/tagother.php:39 #, fuzzy -msgid "No id argument." +msgid "No ID argument." msgstr "Нема таков документ." #: actions/tagother.php:65 @@ -3925,7 +3923,8 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "Погрешен тип на слика за '%s'" #: actions/userbyid.php:70 -msgid "No id." +#, fuzzy +msgid "No ID." msgstr "Нема id." #: actions/userdesignsettings.php:76 lib/designsettings.php:65 @@ -4411,6 +4410,14 @@ msgstr "" msgid "Error sending direct message." msgstr "" +#: lib/command.php:421 +msgid "Cannot repeat your own notice" +msgstr "" + +#: lib/command.php:426 +msgid "Already repeated that notice" +msgstr "" + #: lib/command.php:434 #, fuzzy, php-format msgid "Notice from %s repeated" @@ -5122,11 +5129,16 @@ msgstr "" msgid "in context" msgstr "Нема содржина!" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "Креирај" + +#: lib/noticelist.php:587 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 #, fuzzy msgid "Reply" msgstr "одговор" @@ -5231,11 +5243,11 @@ msgstr "" #: lib/profileformaction.php:123 #, fuzzy -msgid "No return-to arguments" +msgid "No return-to arguments." msgstr "Нема таков документ." #: lib/profileformaction.php:137 -msgid "unimplemented method" +msgid "Unimplemented method." msgstr "" #: lib/publicgroupnav.php:78 diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index 704ad6e9b5..247bf3d4e6 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:15:58+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:35:16+0000\n" "Language-Team: Norwegian (bokmål)‬\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: no\n" "X-Message-Group: out-statusnet\n" @@ -432,17 +432,18 @@ msgid "You may not delete another user's status." msgstr "" #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" -msgstr "Nytt nick" - -#: actions/apistatusesretweet.php:83 lib/command.php:421 -msgid "Cannot repeat your own notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "" -#: actions/apistatusesretweet.php:91 lib/command.php:426 +#: actions/apistatusesretweet.php:83 #, fuzzy -msgid "Already repeated that notice" +msgid "Cannot repeat your own notice." +msgstr "Kan ikke slette notisen." + +#: actions/apistatusesretweet.php:91 +#, fuzzy +msgid "Already repeated that notice." msgstr "Kan ikke slette notisen." #: actions/apistatusesshow.php:138 @@ -514,7 +515,7 @@ msgstr "%s offentlig tidslinje" msgid "%s updates from everyone!" msgstr "%s oppdateringer fra alle sammen!" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" msgstr "" @@ -548,7 +549,8 @@ msgstr "Ingen id." msgid "No such attachment." msgstr "" -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "" @@ -593,7 +595,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 #, fuzzy msgid "Delete" msgstr "slett" @@ -691,8 +693,8 @@ msgstr "" #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 #, fuzzy msgid "No nickname" msgstr "Nytt nick" @@ -700,7 +702,7 @@ msgstr "Nytt nick" #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 #, fuzzy msgid "No such group" msgstr "Klarte ikke å lagre profil." @@ -788,16 +790,13 @@ msgstr "Bekreftelseskode" msgid "Notices" msgstr "" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "" - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Ikke logget inn." @@ -824,7 +823,7 @@ msgstr "Er du sikker på at du vil slette denne notisen?" msgid "Do not delete this notice" msgstr "Kan ikke slette notisen." -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 msgid "Delete this notice" msgstr "" @@ -1275,20 +1274,20 @@ msgstr "" #: actions/file.php:34 #, fuzzy -msgid "No notice id" +msgid "No notice ID." msgstr "Nytt nick" #: actions/file.php:38 #, fuzzy -msgid "No notice" +msgid "No notice." msgstr "Nytt nick" #: actions/file.php:42 -msgid "No attachments" +msgid "No attachments." msgstr "" #: actions/file.php:51 -msgid "No uploaded attachments" +msgid "No uploaded attachments." msgstr "" #: actions/finishremotesubscribe.php:69 @@ -1325,8 +1324,9 @@ msgid "Error updating remote profile" msgstr "" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 #, fuzzy msgid "No such group." msgstr "Klarte ikke å lagre profil." @@ -2037,8 +2037,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "" @@ -2835,7 +2835,7 @@ msgstr "" msgid "You already repeated that notice." msgstr "Du er allerede logget inn!" -#: actions/repeat.php:112 lib/noticelist.php:628 +#: actions/repeat.php:112 lib/noticelist.php:627 #, fuzzy msgid "Repeated" msgstr "Opprett" @@ -3613,13 +3613,8 @@ msgstr "" msgid "Notice feed for tag %s (Atom)" msgstr "Feed for taggen %s" -#: actions/tagother.php:33 -#, fuzzy -msgid "Not logged in" -msgstr "Ikke logget inn." - #: actions/tagother.php:39 -msgid "No id argument." +msgid "No ID argument." msgstr "" #: actions/tagother.php:65 @@ -3886,7 +3881,8 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "" #: actions/userbyid.php:70 -msgid "No id." +#, fuzzy +msgid "No ID." msgstr "Ingen id." #: actions/userdesignsettings.php:76 lib/designsettings.php:65 @@ -4356,6 +4352,15 @@ msgstr "" msgid "Error sending direct message." msgstr "" +#: lib/command.php:421 +msgid "Cannot repeat your own notice" +msgstr "" + +#: lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Kan ikke slette notisen." + #: lib/command.php:434 #, php-format msgid "Notice from %s repeated" @@ -5061,11 +5066,16 @@ msgstr "" msgid "in context" msgstr "" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "Opprett" + +#: lib/noticelist.php:587 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 #, fuzzy msgid "Reply" msgstr "svar" @@ -5169,11 +5179,11 @@ msgid "All groups" msgstr "" #: lib/profileformaction.php:123 -msgid "No return-to arguments" +msgid "No return-to arguments." msgstr "" #: lib/profileformaction.php:137 -msgid "unimplemented method" +msgid "Unimplemented method." msgstr "" #: lib/publicgroupnav.php:78 diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index ee0608c12b..6865f3f24b 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:16:04+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:35:22+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: out-statusnet\n" @@ -441,19 +441,19 @@ msgid "You may not delete another user's status." msgstr "U kunt de status van een andere gebruiker niet verwijderen." #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "De mededeling bestaat niet." -#: actions/apistatusesretweet.php:83 lib/command.php:421 +#: actions/apistatusesretweet.php:83 #, fuzzy -msgid "Cannot repeat your own notice" -msgstr "Het is niet mogelijk de notificatie uit te schakelen." +msgid "Cannot repeat your own notice." +msgstr "U kunt uw eigen mededelingen niet herhalen." -#: actions/apistatusesretweet.php:91 lib/command.php:426 +#: actions/apistatusesretweet.php:91 #, fuzzy -msgid "Already repeated that notice" -msgstr "Deze mededeling verwijderen" +msgid "Already repeated that notice." +msgstr "U hebt die mededeling al herhaald." #: actions/apistatusesshow.php:138 msgid "Status deleted." @@ -526,20 +526,20 @@ msgstr "%s publieke tijdlijn" msgid "%s updates from everyone!" msgstr "%s updates van iedereen" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" -msgstr "" +msgstr "Herhaald door %s" #: actions/apitimelineretweetedtome.php:111 -#, fuzzy, php-format +#, php-format msgid "Repeated to %s" -msgstr "Antwoorden aan %s" +msgstr "Herhaald naar %s" #: actions/apitimelineretweetsofme.php:112 -#, fuzzy, php-format +#, php-format msgid "Repeats of %s" -msgstr "Antwoorden aan %s" +msgstr "Herhaald van %s" #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format @@ -559,7 +559,8 @@ msgstr "Niet aangetroffen." msgid "No such attachment." msgstr "Dat document bestaat niet." -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "Geen gebruikersnaam." @@ -604,7 +605,7 @@ msgid "Preview" msgstr "Voorvertoning" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 msgid "Delete" msgstr "Verwijderen" @@ -704,15 +705,15 @@ msgstr "Het was niet mogelijk om de blokkadeinformatie op te slaan." #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname" msgstr "Geen gebruikersnaam" #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 msgid "No such group" msgstr "Deze groep bestaat niet" @@ -798,16 +799,13 @@ msgstr "Dialoog" msgid "Notices" msgstr "Mededelingen" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "De mededeling bestaat niet." - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Niet aangemeld." @@ -835,7 +833,7 @@ msgstr "Weet u zeker dat u deze aankondiging wilt verwijderen?" msgid "Do not delete this notice" msgstr "Deze mededeling niet verwijderen" -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 msgid "Delete this notice" msgstr "Deze mededeling verwijderen" @@ -1287,19 +1285,23 @@ msgid "A selection of some of the great users on %s" msgstr "Een selectie van de actieve gebruikers op %s" #: actions/file.php:34 -msgid "No notice id" -msgstr "Geen mededelings-ID" +#, fuzzy +msgid "No notice ID." +msgstr "Geen mededeling" #: actions/file.php:38 -msgid "No notice" +#, fuzzy +msgid "No notice." msgstr "Geen mededeling" #: actions/file.php:42 -msgid "No attachments" +#, fuzzy +msgid "No attachments." msgstr "Geen bijlagen" #: actions/file.php:51 -msgid "No uploaded attachments" +#, fuzzy +msgid "No uploaded attachments." msgstr "Geen toegevoegde bijlagen" #: actions/finishremotesubscribe.php:69 @@ -1339,8 +1341,9 @@ msgstr "" "Er is een fout opgetreden tijdens het bijwerken van het profiel op afstand." #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 msgid "No such group." msgstr "De opgegeven groep bestaat niet." @@ -1870,7 +1873,7 @@ msgstr "Er is geen groepslidmaatschap aangetroffen." #: actions/leavegroup.php:127 lib/command.php:284 #, php-format msgid "Could not remove user %s to group %s" -msgstr "De gebruiker %s kon niet uit de groet %s verwijderd worden" +msgstr "De gebruiker %s kon niet uit de groep %s verwijderd worden" #: actions/leavegroup.php:134 lib/command.php:289 #, php-format @@ -2097,8 +2100,8 @@ msgstr "inhoudstype " msgid "Only " msgstr "Alleen " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "Geen ondersteund gegevensformaat." @@ -2907,34 +2910,28 @@ msgid "Couldn’t get a request token." msgstr "Het was niet mogelijk een verzoektoken te krijgen." #: actions/repeat.php:57 -#, fuzzy msgid "Only logged-in users can repeat notices." -msgstr "Gebruikers kunnen alleen hun eigen postvakken lezen." +msgstr "Alleen aangemelde gebruikers kunnen hun mededelingen herhalen." #: actions/repeat.php:64 actions/repeat.php:71 -#, fuzzy msgid "No notice specified." -msgstr "Er is geen profiel opgegeven." +msgstr "Er is geen mededeling opgegeven." #: actions/repeat.php:76 -#, fuzzy msgid "You can't repeat your own notice." -msgstr "U kunt zich niet registreren als u niet met de licentie akkoord gaat." +msgstr "U kunt uw eigen mededeling niet herhalen." #: actions/repeat.php:90 -#, fuzzy msgid "You already repeated that notice." -msgstr "U hebt deze gebruiker reeds geblokkeerd." +msgstr "U hent die mededeling al herhaald." -#: actions/repeat.php:112 lib/noticelist.php:628 -#, fuzzy +#: actions/repeat.php:112 lib/noticelist.php:627 msgid "Repeated" -msgstr "Aangemaakt" +msgstr "Herhaald" #: actions/repeat.php:115 -#, fuzzy msgid "Repeated!" -msgstr "Aangemaakt" +msgstr "Herhaald!" #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 @@ -3273,9 +3270,9 @@ msgstr "" "[StatusNet](http://status.net/). " #: actions/showstream.php:313 -#, fuzzy, php-format +#, php-format msgid "Repeat of %s" -msgstr "Antwoorden aan %s" +msgstr "Herhaald van %s" #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." @@ -3750,12 +3747,9 @@ msgstr "Mededelingenfeed voor label %s (RSS 2.0)" msgid "Notice feed for tag %s (Atom)" msgstr "Mededelingenfeed voor label %s (Atom)" -#: actions/tagother.php:33 -msgid "Not logged in" -msgstr "Niet aangemeld." - #: actions/tagother.php:39 -msgid "No id argument." +#, fuzzy +msgid "No ID argument." msgstr "Geen ID-argument." #: actions/tagother.php:65 @@ -4030,8 +4024,9 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "Er staat een verkeerd afbeeldingsttype op de avatar-URL \"%s\"." #: actions/userbyid.php:70 -msgid "No id." -msgstr "Geen ID." +#, fuzzy +msgid "No ID." +msgstr "Geen ID" #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" @@ -4150,9 +4145,9 @@ msgstr "" "Er is een databasefout opgetreden bij het invoegen van het antwoord: %s" #: classes/Notice.php:1320 -#, fuzzy, php-format +#, php-format msgid "RT @%1$s %2$s" -msgstr "%1$s (%2$s)" +msgstr "RT @%1$s %2$s" #: classes/User.php:347 #, php-format @@ -4516,15 +4511,22 @@ msgstr "" msgid "Error sending direct message." msgstr "Er is een fout opgetreden bij het verzonden van het directe bericht." +#: lib/command.php:421 +msgid "Cannot repeat your own notice" +msgstr "U kunt uw eigen mededelingen niet herhalen." + +#: lib/command.php:426 +msgid "Already repeated that notice" +msgstr "U hebt die mededeling al herhaald." + #: lib/command.php:434 -#, fuzzy, php-format +#, php-format msgid "Notice from %s repeated" -msgstr "De mededeling is verzonden" +msgstr "De mededeling van %s is herhaald" #: lib/command.php:436 -#, fuzzy msgid "Error repeating notice." -msgstr "Er is een fout opgetreden bij het opslaan van de mededeling." +msgstr "Er is een fout opgetreden bij het herhalen van de mededeling." #: lib/command.php:490 #, php-format @@ -5341,11 +5343,16 @@ msgstr "op" msgid "in context" msgstr "in context" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "Herhaald door %s" + +#: lib/noticelist.php:587 msgid "Reply to this notice" msgstr "Op deze mededeling antwoorden" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 msgid "Reply" msgstr "Antwoorden" @@ -5448,11 +5455,13 @@ msgid "All groups" msgstr "Alle groepen" #: lib/profileformaction.php:123 -msgid "No return-to arguments" +#, fuzzy +msgid "No return-to arguments." msgstr "Er zijn geen \"terug naar\"-parameters opgegeven" #: lib/profileformaction.php:137 -msgid "unimplemented method" +#, fuzzy +msgid "Unimplemented method." msgstr "methode niet geïmplementeerd" #: lib/publicgroupnav.php:78 @@ -5476,14 +5485,12 @@ msgid "Popular" msgstr "Populair" #: lib/repeatform.php:107 lib/repeatform.php:132 -#, fuzzy msgid "Repeat this notice" -msgstr "Op deze mededeling antwoorden" +msgstr "Deze mededeling herhalen" #: lib/repeatform.php:132 -#, fuzzy msgid "Repeat" -msgstr "Herstellen" +msgstr "Herhalen" #: lib/sandboxform.php:67 msgid "Sandbox" diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index 7ba503c79a..7ad1dfd933 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: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:16:00+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:35:19+0000\n" "Language-Team: Norwegian Nynorsk\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nn\n" "X-Message-Group: out-statusnet\n" @@ -434,18 +434,18 @@ msgid "You may not delete another user's status." msgstr "Du kan ikkje sletta statusen til ein annan brukar." #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "Denne notisen finst ikkje." -#: actions/apistatusesretweet.php:83 lib/command.php:421 +#: actions/apistatusesretweet.php:83 #, fuzzy -msgid "Cannot repeat your own notice" +msgid "Cannot repeat your own notice." msgstr "Kan ikkje slå på notifikasjon." -#: actions/apistatusesretweet.php:91 lib/command.php:426 +#: actions/apistatusesretweet.php:91 #, fuzzy -msgid "Already repeated that notice" +msgid "Already repeated that notice." msgstr "Slett denne notisen" #: actions/apistatusesshow.php:138 @@ -519,7 +519,7 @@ msgstr "%s offentleg tidsline" msgid "%s updates from everyone!" msgstr "%s oppdateringar frå alle saman!" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" msgstr "" @@ -553,7 +553,8 @@ msgstr "Finst ikkje." msgid "No such attachment." msgstr "Slikt dokument finst ikkje." -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "Ingen kallenamn." @@ -597,7 +598,7 @@ msgid "Preview" msgstr "Forhandsvis" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 msgid "Delete" msgstr "Slett" @@ -694,15 +695,15 @@ msgstr "Lagring av informasjon feila." #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname" msgstr "Ingen kallenamn" #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 msgid "No such group" msgstr "Fann ikkje gruppa" @@ -792,16 +793,13 @@ msgstr "Stadfestingskode" msgid "Notices" msgstr "Notisar" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "Denne notisen finst ikkje." - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Ikkje logga inn" @@ -831,7 +829,7 @@ msgstr "Sikker på at du vil sletta notisen?" msgid "Do not delete this notice" msgstr "Kan ikkje sletta notisen." -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 msgid "Delete this notice" msgstr "Slett denne notisen" @@ -1286,21 +1284,23 @@ msgstr "Eit utval av nokre av dei flotte folka på %s" #: actions/file.php:34 #, fuzzy -msgid "No notice id" +msgid "No notice ID." msgstr "Ny notis" #: actions/file.php:38 #, fuzzy -msgid "No notice" +msgid "No notice." msgstr "Ny notis" #: actions/file.php:42 -msgid "No attachments" -msgstr "" +#, fuzzy +msgid "No attachments." +msgstr "Slikt dokument finst ikkje." #: actions/file.php:51 -msgid "No uploaded attachments" -msgstr "" +#, fuzzy +msgid "No uploaded attachments." +msgstr "Slikt dokument finst ikkje." #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1339,8 +1339,9 @@ msgid "Error updating remote profile" msgstr "Feil ved oppdatering av ekstern profil" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 msgid "No such group." msgstr "Denne gruppa finst ikkje." @@ -2085,8 +2086,8 @@ msgstr "Kopla til" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "Ikkje eit støtta dataformat." @@ -2905,7 +2906,7 @@ msgstr "Du kan ikkje registrera deg om du ikkje godtek vilkåra i lisensen." msgid "You already repeated that notice." msgstr "Du har allereie blokkert denne brukaren." -#: actions/repeat.php:112 lib/noticelist.php:628 +#: actions/repeat.php:112 lib/noticelist.php:627 #, fuzzy msgid "Repeated" msgstr "Lag" @@ -3700,12 +3701,9 @@ msgstr "Notisstraum for %s" msgid "Notice feed for tag %s (Atom)" msgstr "Notisstraum for %s" -#: actions/tagother.php:33 -msgid "Not logged in" -msgstr "Ikkje logga inn" - #: actions/tagother.php:39 -msgid "No id argument." +#, fuzzy +msgid "No ID argument." msgstr "Manglar argumentet ID." #: actions/tagother.php:65 @@ -3989,8 +3987,9 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "Feil biletetype for '%s'" #: actions/userbyid.php:70 -msgid "No id." -msgstr "Ingen ID." +#, fuzzy +msgid "No ID." +msgstr "Ingen ID" #: actions/userdesignsettings.php:76 lib/designsettings.php:65 #, fuzzy @@ -4473,6 +4472,16 @@ msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d" msgid "Error sending direct message." msgstr "Ein feil oppstod ved sending av direkte melding." +#: lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Kan ikkje slå på notifikasjon." + +#: lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Slett denne notisen" + #: lib/command.php:434 #, fuzzy, php-format msgid "Notice from %s repeated" @@ -5184,11 +5193,16 @@ msgstr "" msgid "in context" msgstr "Ingen innhald." -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "Lag" + +#: lib/noticelist.php:587 msgid "Reply to this notice" msgstr "Svar på denne notisen" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 msgid "Reply" msgstr "Svar" @@ -5294,11 +5308,11 @@ msgstr "Alle gruppar" #: lib/profileformaction.php:123 #, fuzzy -msgid "No return-to arguments" +msgid "No return-to arguments." msgstr "Manglar argumentet ID." #: lib/profileformaction.php:137 -msgid "unimplemented method" +msgid "Unimplemented method." msgstr "" #: lib/publicgroupnav.php:78 diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index 317291be4a..35202771a2 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: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:16:07+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:35:25+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -19,7 +19,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pl\n" "X-Message-Group: out-statusnet\n" @@ -439,18 +439,18 @@ msgid "You may not delete another user's status." msgstr "Nie można usuwać stanów innych użytkowników." #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "Nie ma takiego wpisu." -#: actions/apistatusesretweet.php:83 lib/command.php:421 +#: actions/apistatusesretweet.php:83 #, fuzzy -msgid "Cannot repeat your own notice" +msgid "Cannot repeat your own notice." msgstr "Nie można włączyć powiadomień." -#: actions/apistatusesretweet.php:91 lib/command.php:426 +#: actions/apistatusesretweet.php:91 #, fuzzy -msgid "Already repeated that notice" +msgid "Already repeated that notice." msgstr "Usuń ten wpis" #: actions/apistatusesshow.php:138 @@ -522,7 +522,7 @@ msgstr "Publiczna oś czasu użytkownika %s" msgid "%s updates from everyone!" msgstr "Użytkownik %s aktualizuje od każdego." -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" msgstr "" @@ -555,7 +555,8 @@ msgstr "Nie odnaleziono." msgid "No such attachment." msgstr "Nie ma takiego załącznika." -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "Brak pseudonimu." @@ -599,7 +600,7 @@ msgid "Preview" msgstr "Podgląd" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 msgid "Delete" msgstr "Usuń" @@ -696,15 +697,15 @@ msgstr "Zapisanie informacji o blokadzie nie powiodło się." #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname" msgstr "Brak pseudonimu" #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 msgid "No such group" msgstr "Nie ma takiej grupy" @@ -790,16 +791,13 @@ msgstr "Rozmowa" msgid "Notices" msgstr "Wpisy" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "Nie ma takiego wpisu." - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Niezalogowany." @@ -827,7 +825,7 @@ msgstr "Jesteś pewien, że chcesz usunąć ten wpis?" msgid "Do not delete this notice" msgstr "Nie usuwaj tego wpisu" -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 msgid "Delete this notice" msgstr "Usuń ten wpis" @@ -1273,19 +1271,23 @@ msgid "A selection of some of the great users on %s" msgstr "Wybór znanych użytkowników na %s" #: actions/file.php:34 -msgid "No notice id" -msgstr "Brak identyfikatora wpisu" +#, fuzzy +msgid "No notice ID." +msgstr "Brak wpisu" #: actions/file.php:38 -msgid "No notice" +#, fuzzy +msgid "No notice." msgstr "Brak wpisu" #: actions/file.php:42 -msgid "No attachments" +#, fuzzy +msgid "No attachments." msgstr "Brak załączników" #: actions/file.php:51 -msgid "No uploaded attachments" +#, fuzzy +msgid "No uploaded attachments." msgstr "Nie wysłano załączników" #: actions/finishremotesubscribe.php:69 @@ -1321,8 +1323,9 @@ msgid "Error updating remote profile" msgstr "Błąd podczas aktualizowania zdalnego profilu" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 msgid "No such group." msgstr "Nie ma takiej grupy." @@ -2069,8 +2072,8 @@ msgstr "typ zawartości " msgid "Only " msgstr "Tylko " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "To nie jest obsługiwany format danych." @@ -2889,7 +2892,7 @@ msgstr "" msgid "You already repeated that notice." msgstr "Użytkownik jest już zablokowany." -#: actions/repeat.php:112 lib/noticelist.php:628 +#: actions/repeat.php:112 lib/noticelist.php:627 #, fuzzy msgid "Repeated" msgstr "Utworzono" @@ -3708,12 +3711,9 @@ msgstr "Kanał wpisów dla znacznika %s (RSS 2.0)" msgid "Notice feed for tag %s (Atom)" msgstr "Kanał wpisów dla znacznika %s (Atom)" -#: actions/tagother.php:33 -msgid "Not logged in" -msgstr "Niezalogowano" - #: actions/tagother.php:39 -msgid "No id argument." +#, fuzzy +msgid "No ID argument." msgstr "Brak parametru identyfikatora." #: actions/tagother.php:65 @@ -3984,8 +3984,9 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "Błędny typ obrazu dla adresu URL awatara \"%s\"." #: actions/userbyid.php:70 -msgid "No id." -msgstr "Brak identyfikatora." +#, fuzzy +msgid "No ID." +msgstr "Brak identyfikatora" #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" @@ -4461,6 +4462,16 @@ msgstr "Wiadomość jest za długa - maksymalnie %d znaków, wysłano %d" msgid "Error sending direct message." msgstr "Błąd podczas wysyłania bezpośredniej wiadomości." +#: lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Nie można włączyć powiadomień." + +#: lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Usuń ten wpis" + #: lib/command.php:434 #, fuzzy, php-format msgid "Notice from %s repeated" @@ -5279,11 +5290,16 @@ msgstr "w" msgid "in context" msgstr "w rozmowie" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "Utworzono" + +#: lib/noticelist.php:587 msgid "Reply to this notice" msgstr "Odpowiedz na ten wpis" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 msgid "Reply" msgstr "Odpowiedz" @@ -5385,11 +5401,13 @@ msgid "All groups" msgstr "Wszystkie grupy" #: lib/profileformaction.php:123 -msgid "No return-to arguments" +#, fuzzy +msgid "No return-to arguments." msgstr "Brak parametrów powrotu" #: lib/profileformaction.php:137 -msgid "unimplemented method" +#, fuzzy +msgid "Unimplemented method." msgstr "niezaimplementowana metoda" #: lib/publicgroupnav.php:78 diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index 73d58c9c33..3fc5dfa887 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: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:16:10+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:35:28+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt\n" "X-Message-Group: out-statusnet\n" @@ -432,19 +432,19 @@ msgid "You may not delete another user's status." msgstr "Não pode apagar o estado de outro utilizador." #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "Nota não encontrada." -#: actions/apistatusesretweet.php:83 lib/command.php:421 +#: actions/apistatusesretweet.php:83 #, fuzzy -msgid "Cannot repeat your own notice" -msgstr "Não foi possível ligar a notificação." +msgid "Cannot repeat your own notice." +msgstr "Não pode repetir a sua própria nota" -#: actions/apistatusesretweet.php:91 lib/command.php:426 +#: actions/apistatusesretweet.php:91 #, fuzzy -msgid "Already repeated that notice" -msgstr "Apagar esta nota" +msgid "Already repeated that notice." +msgstr "Já repetiu essa nota" #: actions/apistatusesshow.php:138 msgid "Status deleted." @@ -515,20 +515,20 @@ msgstr "Notas públicas de %s" msgid "%s updates from everyone!" msgstr "%s actualizações de todos!" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" -msgstr "" +msgstr "Repetida por %s" #: actions/apitimelineretweetedtome.php:111 -#, fuzzy, php-format +#, php-format msgid "Repeated to %s" -msgstr "Respostas a %s" +msgstr "Repetida para %s" #: actions/apitimelineretweetsofme.php:112 -#, fuzzy, php-format +#, php-format msgid "Repeats of %s" -msgstr "Respostas a %s" +msgstr "Repetências de %s" #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format @@ -548,7 +548,8 @@ msgstr "Não encontrado." msgid "No such attachment." msgstr "Anexo não encontrado." -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "Nenhuma alcunha." @@ -592,7 +593,7 @@ msgid "Preview" msgstr "Antevisão" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 msgid "Delete" msgstr "Apagar" @@ -690,15 +691,15 @@ msgstr "Não foi possível gravar informação do bloqueio." #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname" msgstr "Sem alcunha" #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 msgid "No such group" msgstr "Grupo não existe" @@ -784,16 +785,13 @@ msgstr "Conversação" msgid "Notices" msgstr "Notas" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "Nota não encontrada." - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Não iniciou sessão." @@ -821,7 +819,7 @@ msgstr "Tem a certeza de que quer apagar esta nota?" msgid "Do not delete this notice" msgstr "Não apagar esta nota" -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 msgid "Delete this notice" msgstr "Apagar esta nota" @@ -1222,7 +1220,7 @@ msgstr "Notas populares, página %d" #: actions/favorited.php:79 msgid "The most popular notices on the site right now." -msgstr "As notas mais populares do site neste momento." +msgstr "As notas mais populares do site nesta altura." #: actions/favorited.php:150 msgid "Favorite notices appear on this page but no one has favorited one yet." @@ -1270,22 +1268,26 @@ msgstr "utilizadores em destaque, página %d" #: actions/featured.php:99 #, php-format msgid "A selection of some of the great users on %s" -msgstr "Uma selecção de alguns utilizadores excelentes em %s" +msgstr "Uma selecção dos participantes excelentes no %s" #: actions/file.php:34 -msgid "No notice id" -msgstr "Sem ID de nota" +#, fuzzy +msgid "No notice ID." +msgstr "Sem notas" #: actions/file.php:38 -msgid "No notice" +#, fuzzy +msgid "No notice." msgstr "Sem notas" #: actions/file.php:42 -msgid "No attachments" +#, fuzzy +msgid "No attachments." msgstr "Sem anexos" #: actions/file.php:51 -msgid "No uploaded attachments" +#, fuzzy +msgid "No uploaded attachments." msgstr "Sem anexos carregados" #: actions/finishremotesubscribe.php:69 @@ -1321,8 +1323,9 @@ msgid "Error updating remote profile" msgstr "Erro ao actualizar o perfil remoto" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 msgid "No such group." msgstr "Grupo não foi encontrado." @@ -1524,7 +1527,7 @@ msgid "" "Separate the terms by spaces; they must be 3 characters or more." msgstr "" "Procure grupos neste site pesquisando o nome, localização ou descrição. Os " -"termos de busca devem ter 3 ou mais caracteres e ser separados por espaços." +"termos de busca devem ter 3 ou mais caracteres e estar separados por espaços." #: actions/groupsearch.php:58 msgid "Group search" @@ -2000,8 +2003,8 @@ msgid "" "Search for notices on %%site.name%% by their contents. Separate search terms " "by spaces; they must be 3 characters or more." msgstr "" -"Procure notas neste site pesquisando o seu conteúdo. Os termos de busca " -"devem ter 3 ou mais caracteres e ser separados por espaços." +"Procure notas no %%site.name%%, pesquisando o seu conteúdo. Os termos de " +"busca devem ter 3 ou mais caracteres e estar separados por espaços." #: actions/noticesearch.php:78 msgid "Text search" @@ -2072,8 +2075,8 @@ msgstr "tipo de conteúdo " msgid "Only " msgstr "Apenas " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "Formato de dados não suportado." @@ -2300,8 +2303,9 @@ msgid "" "Search for people on %%site.name%% by their name, location, or interests. " "Separate the terms by spaces; they must be 3 characters or more." msgstr "" -"Procure pessoas neste site pesquisando o nome, localidade ou interesses. Os " -"termos de busca devem ter 3 ou mais caracteres e ser separados por espaços." +"Procure pessoas no %%site.name%% pesquisando o nome, localidade ou " +"interesses. Os termos de busca devem ter 3 ou mais caracteres e estar " +"separados por espaços." #: actions/peoplesearch.php:58 msgid "People search" @@ -2879,34 +2883,28 @@ msgid "Couldn’t get a request token." msgstr "Não foi possível obter uma chave de pedido." #: actions/repeat.php:57 -#, fuzzy msgid "Only logged-in users can repeat notices." -msgstr "Só o próprio utilizador pode ler a sua caixa de correio." +msgstr "Só utilizadores com sessão iniciada podem repetir notas." #: actions/repeat.php:64 actions/repeat.php:71 -#, fuzzy msgid "No notice specified." -msgstr "Não foi especificado um perfil." +msgstr "Nota não foi especificada." #: actions/repeat.php:76 -#, fuzzy msgid "You can't repeat your own notice." -msgstr "Não se pode registar se não aceita a licença." +msgstr "Não pode repetir a sua própria nota." #: actions/repeat.php:90 -#, fuzzy msgid "You already repeated that notice." -msgstr "Já bloqueou esse utilizador." +msgstr "Já repetiu essa nota." -#: actions/repeat.php:112 lib/noticelist.php:628 -#, fuzzy +#: actions/repeat.php:112 lib/noticelist.php:627 msgid "Repeated" -msgstr "Criado" +msgstr "Repetida" #: actions/repeat.php:115 -#, fuzzy msgid "Repeated!" -msgstr "Criado" +msgstr "Repetida!" #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 @@ -3243,9 +3241,9 @@ msgstr "" "Software Livre [StatusNet](http://status.net/). " #: actions/showstream.php:313 -#, fuzzy, php-format +#, php-format msgid "Repeat of %s" -msgstr "Respostas a %s" +msgstr "Repetência de %s" #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." @@ -3715,12 +3713,9 @@ msgstr "Feed de notas para a categoria %s (RSS 2.0)" msgid "Notice feed for tag %s (Atom)" msgstr "Feed de notas para a categoria %s (Atom)" -#: actions/tagother.php:33 -msgid "Not logged in" -msgstr "Não iniciou sessão." - #: actions/tagother.php:39 -msgid "No id argument." +#, fuzzy +msgid "No ID argument." msgstr "Argumento de identificação em falta." #: actions/tagother.php:65 @@ -3991,8 +3986,9 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "Tipo de imagem incorrecto para o avatar da URL ‘%s’." #: actions/userbyid.php:70 -msgid "No id." -msgstr "Nenhuma identificação." +#, fuzzy +msgid "No ID." +msgstr "Sem ID" #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" @@ -4103,9 +4099,9 @@ msgid "DB error inserting reply: %s" msgstr "Ocorreu um erro na base de dados ao inserir a resposta: %s" #: classes/Notice.php:1320 -#, fuzzy, php-format +#, php-format msgid "RT @%1$s %2$s" -msgstr "%1$s (%2$s)" +msgstr "RT @%1$s %2$s" #: classes/User.php:347 #, php-format @@ -4467,15 +4463,22 @@ msgstr "Mensagem demasiado extensa - máx. %d caracteres, enviou %d" msgid "Error sending direct message." msgstr "Erro no envio da mensagem directa." +#: lib/command.php:421 +msgid "Cannot repeat your own notice" +msgstr "Não pode repetir a sua própria nota" + +#: lib/command.php:426 +msgid "Already repeated that notice" +msgstr "Já repetiu essa nota" + #: lib/command.php:434 -#, fuzzy, php-format +#, php-format msgid "Notice from %s repeated" -msgstr "Nota publicada" +msgstr "Nota de %s repetida" #: lib/command.php:436 -#, fuzzy msgid "Error repeating notice." -msgstr "Erro ao gravar nota." +msgstr "Erro ao repetir nota." #: lib/command.php:490 #, php-format @@ -4576,7 +4579,6 @@ msgstr[0] "Está no grupo:" msgstr[1] "Está nos grupos:" #: lib/command.php:744 -#, fuzzy msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4630,6 +4632,8 @@ msgstr "" "whois - receber perfil do utilizador\n" "fav - adicionar última nota do utilizador às favoritas\n" "fav # - adicionar nota com esta identificação às favoritas\n" +"repeat # - repetir uma nota com uma certa identificação\n" +"repeat - repetir a última nota do utilizador\n" "reply # - responder à nota com esta identificação\n" "reply - responder à última nota do utilizador\n" "join - juntar-se ao grupo\n" @@ -4757,17 +4761,16 @@ msgstr "Prosseguir" #: lib/groupeditform.php:163 msgid "URL of the homepage or blog of the group or topic" -msgstr "" -"URL da página de acolhimento ou blogue, pertencentes ao grupo ou tópico" +msgstr "URL da página de acolhimento ou do blogue, deste grupo ou assunto" #: lib/groupeditform.php:168 msgid "Describe the group or topic" -msgstr "Descreva o grupo ou tópico" +msgstr "Descreva o grupo ou assunto" #: lib/groupeditform.php:170 #, php-format msgid "Describe the group or topic in %d characters" -msgstr "Descreva o grupo ou tópico em %d caracteres" +msgstr "Descreva o grupo ou o assunto em %d caracteres" #: lib/groupeditform.php:172 msgid "Description" @@ -5161,8 +5164,8 @@ 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 "" -"Não tem messagens privadas. Pode enviar mensagens privadas para encetar " -"conversas com outros utilizadores. Outros podem enviar-lhe mensagens, a que " +"Não tem messagens privadas. Pode enviar mensagens privadas para meter " +"conversa com outros utilizadores. Outros podem enviar-lhe mensagens, a que " "só você terá acesso." #: lib/mailbox.php:227 lib/noticelist.php:468 @@ -5283,11 +5286,16 @@ msgstr "coords." msgid "in context" msgstr "em contexto" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "Repetida por %s" + +#: lib/noticelist.php:587 msgid "Reply to this notice" msgstr "Responder a esta nota" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 msgid "Reply" msgstr "Responder" @@ -5389,11 +5397,13 @@ msgid "All groups" msgstr "Todos os grupos" #: lib/profileformaction.php:123 -msgid "No return-to arguments" +#, fuzzy +msgid "No return-to arguments." msgstr "Sem argumentos return-to" #: lib/profileformaction.php:137 -msgid "unimplemented method" +#, fuzzy +msgid "Unimplemented method." msgstr "método não implementado" #: lib/publicgroupnav.php:78 @@ -5417,14 +5427,12 @@ msgid "Popular" msgstr "Populares" #: lib/repeatform.php:107 lib/repeatform.php:132 -#, fuzzy msgid "Repeat this notice" -msgstr "Responder a esta nota" +msgstr "Repetir esta nota" #: lib/repeatform.php:132 -#, fuzzy msgid "Repeat" -msgstr "Reiniciar" +msgstr "Repetir" #: lib/sandboxform.php:67 msgid "Sandbox" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index 6fd338fcf1..2232a08abd 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:16:14+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:35:31+0000\n" "Language-Team: Brazilian Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt-br\n" "X-Message-Group: out-statusnet\n" @@ -433,18 +433,18 @@ msgid "You may not delete another user's status." msgstr "Você não pode apagar o status de outro usuário." #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "Essa mensagem não existe." -#: actions/apistatusesretweet.php:83 lib/command.php:421 +#: actions/apistatusesretweet.php:83 #, fuzzy -msgid "Cannot repeat your own notice" +msgid "Cannot repeat your own notice." msgstr "Não é possível ligar a notificação." -#: actions/apistatusesretweet.php:91 lib/command.php:426 +#: actions/apistatusesretweet.php:91 #, fuzzy -msgid "Already repeated that notice" +msgid "Already repeated that notice." msgstr "Excluir esta mensagem" #: actions/apistatusesshow.php:138 @@ -517,7 +517,7 @@ msgstr "Mensagens públicas de %s" msgid "%s updates from everyone!" msgstr "%s atualizações de todo mundo!" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" msgstr "" @@ -551,7 +551,8 @@ msgstr "Não encontrado." msgid "No such attachment." msgstr "Esse documento não existe." -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "Nenhum apelido." @@ -595,7 +596,7 @@ msgid "Preview" msgstr "Visualização" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 msgid "Delete" msgstr "Excluir" @@ -692,15 +693,15 @@ msgstr "Não foi possível salvar a informação de bloqueio." #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname" msgstr "Nenhum apelido" #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 msgid "No such group" msgstr "Esse grupo não existe" @@ -788,16 +789,13 @@ msgstr "Código de confirmação" msgid "Notices" msgstr "Mensagens" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "Essa mensagem não existe." - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Você não está logado." @@ -826,7 +824,7 @@ msgstr "Você tem certeza que deseja excluir esta mensagem?" msgid "Do not delete this notice" msgstr "Não é possível excluir esta mensagem." -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 msgid "Delete this notice" msgstr "Excluir esta mensagem" @@ -1287,21 +1285,23 @@ msgstr "" #: actions/file.php:34 #, fuzzy -msgid "No notice id" +msgid "No notice ID." msgstr "Nova mensagem" #: actions/file.php:38 #, fuzzy -msgid "No notice" +msgid "No notice." msgstr "Nova mensagem" #: actions/file.php:42 -msgid "No attachments" -msgstr "" +#, fuzzy +msgid "No attachments." +msgstr "Esse documento não existe." #: actions/file.php:51 -msgid "No uploaded attachments" -msgstr "" +#, fuzzy +msgid "No uploaded attachments." +msgstr "Esse documento não existe." #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1340,8 +1340,9 @@ msgid "Error updating remote profile" msgstr "Erro na atualização do perfil remoto" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 #, fuzzy msgid "No such group." msgstr "Essa etiqueta não existe." @@ -2108,8 +2109,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "Formato de dados não suportado." @@ -2936,7 +2937,7 @@ msgstr "Você não pode se registrar se não aceitar a licença." msgid "You already repeated that notice." msgstr "Você já bloqueou esse usuário." -#: actions/repeat.php:112 lib/noticelist.php:628 +#: actions/repeat.php:112 lib/noticelist.php:627 #, fuzzy msgid "Repeated" msgstr "Criar" @@ -3738,12 +3739,9 @@ msgstr "Feed de mensagens de %s" msgid "Notice feed for tag %s (Atom)" msgstr "Feed de mensagens de %s" -#: actions/tagother.php:33 -msgid "Not logged in" -msgstr "Você não está autenticado" - #: actions/tagother.php:39 -msgid "No id argument." +#, fuzzy +msgid "No ID argument." msgstr "Nenhum argumento de ID." #: actions/tagother.php:65 @@ -4027,7 +4025,8 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "Tipo de imagem errado para '%s'" #: actions/userbyid.php:70 -msgid "No id." +#, fuzzy +msgid "No ID." msgstr "Nenhuma ID." #: actions/userdesignsettings.php:76 lib/designsettings.php:65 @@ -4521,6 +4520,16 @@ msgstr "" msgid "Error sending direct message." msgstr "Ocorreu um erro durante o envio da mensagem direta." +#: lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Não é possível ligar a notificação." + +#: lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Excluir esta mensagem" + #: lib/command.php:434 #, fuzzy, php-format msgid "Notice from %s repeated" @@ -5235,11 +5244,16 @@ msgstr "" msgid "in context" msgstr "Nenhum conteúdo!" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "Criar" + +#: lib/noticelist.php:587 msgid "Reply to this notice" msgstr "Responder a esta mensagem" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 msgid "Reply" msgstr "Responder" @@ -5346,11 +5360,11 @@ msgstr "" #: lib/profileformaction.php:123 #, fuzzy -msgid "No return-to arguments" +msgid "No return-to arguments." msgstr "Nenhum argumento de ID." #: lib/profileformaction.php:137 -msgid "unimplemented method" +msgid "Unimplemented method." msgstr "" #: lib/publicgroupnav.php:78 diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index 5259ec4b7a..38b2a9e613 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:16:17+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:35:34+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ru\n" "X-Message-Group: out-statusnet\n" @@ -438,18 +438,18 @@ msgid "You may not delete another user's status." msgstr "Вы не можете удалять статус других пользователей." #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "Нет такой записи." -#: actions/apistatusesretweet.php:83 lib/command.php:421 +#: actions/apistatusesretweet.php:83 #, fuzzy -msgid "Cannot repeat your own notice" +msgid "Cannot repeat your own notice." msgstr "Есть оповещение." -#: actions/apistatusesretweet.php:91 lib/command.php:426 +#: actions/apistatusesretweet.php:91 #, fuzzy -msgid "Already repeated that notice" +msgid "Already repeated that notice." msgstr "Удалить эту запись" #: actions/apistatusesshow.php:138 @@ -521,7 +521,7 @@ msgstr "Общая лента %s" msgid "%s updates from everyone!" msgstr "Обновления %s от всех!" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" msgstr "" @@ -554,7 +554,8 @@ msgstr "Не найдено." msgid "No such attachment." msgstr "Нет такого вложения." -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "Нет имени." @@ -599,7 +600,7 @@ msgid "Preview" msgstr "Просмотр" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 msgid "Delete" msgstr "Удалить" @@ -696,15 +697,15 @@ msgstr "Не удаётся сохранить информацию о блок #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname" msgstr "Нет названия группы" #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 msgid "No such group" msgstr "Нет такой группы" @@ -790,16 +791,13 @@ msgstr "Дискуссия" msgid "Notices" msgstr "Записи" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "Нет такой записи." - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Не авторизован." @@ -827,7 +825,7 @@ msgstr "Вы уверены, что хотите удалить эту запи msgid "Do not delete this notice" msgstr "Не удалять эту запись" -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 msgid "Delete this notice" msgstr "Удалить эту запись" @@ -1284,19 +1282,23 @@ msgid "A selection of some of the great users on %s" msgstr "Список наиболее активных, знаменитых и уважаемых пользователей на %s" #: actions/file.php:34 -msgid "No notice id" -msgstr "ID записи отсутствует" +#, fuzzy +msgid "No notice ID." +msgstr "Запись отсутствует" #: actions/file.php:38 -msgid "No notice" +#, fuzzy +msgid "No notice." msgstr "Запись отсутствует" #: actions/file.php:42 -msgid "No attachments" +#, fuzzy +msgid "No attachments." msgstr "Нет вложений" #: actions/file.php:51 -msgid "No uploaded attachments" +#, fuzzy +msgid "No uploaded attachments." msgstr "Нет загруженных вложений" #: actions/finishremotesubscribe.php:69 @@ -1332,8 +1334,9 @@ msgid "Error updating remote profile" msgstr "Ошибка обновления удалённого профиля" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 msgid "No such group." msgstr "Нет такой группы." @@ -2083,8 +2086,8 @@ msgstr "тип содержимого " msgid "Only " msgstr "Только " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "Неподдерживаемый формат данных." @@ -2903,7 +2906,7 @@ msgstr "" msgid "You already repeated that notice." msgstr "Вы уже заблокировали этого пользователя." -#: actions/repeat.php:112 lib/noticelist.php:628 +#: actions/repeat.php:112 lib/noticelist.php:627 #, fuzzy msgid "Repeated" msgstr "Создано" @@ -3725,12 +3728,9 @@ msgstr "Лента записей для тега %s (RSS 2.0)" msgid "Notice feed for tag %s (Atom)" msgstr "Лента записей для тега %s (Atom)" -#: actions/tagother.php:33 -msgid "Not logged in" -msgstr "Не авторизовано" - #: actions/tagother.php:39 -msgid "No id argument." +#, fuzzy +msgid "No ID argument." msgstr "Нет ID аргумента." #: actions/tagother.php:65 @@ -4001,8 +4001,9 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "Неверный тип изображения для URL аватары «%s»." #: actions/userbyid.php:70 -msgid "No id." -msgstr "Нет идентификатора." +#, fuzzy +msgid "No ID." +msgstr "Нет ID" #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" @@ -4478,6 +4479,16 @@ msgstr "Сообщение слишком длинное — не больше % msgid "Error sending direct message." msgstr "Ошибка при отправке прямого сообщения." +#: lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Есть оповещение." + +#: lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Удалить эту запись" + #: lib/command.php:434 #, fuzzy, php-format msgid "Notice from %s repeated" @@ -5294,11 +5305,16 @@ msgstr "на" msgid "in context" msgstr "в контексте" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "Создано" + +#: lib/noticelist.php:587 msgid "Reply to this notice" msgstr "Ответить на эту запись" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 msgid "Reply" msgstr "Ответить" @@ -5400,11 +5416,13 @@ msgid "All groups" msgstr "Все группы" #: lib/profileformaction.php:123 -msgid "No return-to arguments" +#, fuzzy +msgid "No return-to arguments." msgstr "Нет аргумента return-to" #: lib/profileformaction.php:137 -msgid "unimplemented method" +#, fuzzy +msgid "Unimplemented method." msgstr "нереализованный метод" #: lib/publicgroupnav.php:78 diff --git a/locale/statusnet.po b/locale/statusnet.po index 29961af940..3e4e5b62f9 100644 --- a/locale/statusnet.po +++ b/locale/statusnet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-13 17:14+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -417,15 +417,16 @@ msgid "You may not delete another user's status." msgstr "" #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "" -#: actions/apistatusesretweet.php:83 lib/command.php:421 -msgid "Cannot repeat your own notice" +#: actions/apistatusesretweet.php:83 +msgid "Cannot repeat your own notice." msgstr "" -#: actions/apistatusesretweet.php:91 lib/command.php:426 -msgid "Already repeated that notice" +#: actions/apistatusesretweet.php:91 +msgid "Already repeated that notice." msgstr "" #: actions/apistatusesshow.php:138 @@ -497,7 +498,7 @@ msgstr "" msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" msgstr "" @@ -530,7 +531,8 @@ msgstr "" msgid "No such attachment." msgstr "" -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "" @@ -574,7 +576,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 msgid "Delete" msgstr "" @@ -668,15 +670,15 @@ msgstr "" #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname" msgstr "" #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 msgid "No such group" msgstr "" @@ -762,16 +764,13 @@ msgstr "" msgid "Notices" msgstr "" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "" - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "" @@ -797,7 +796,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "" -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 msgid "Delete this notice" msgstr "" @@ -1229,19 +1228,19 @@ msgid "A selection of some of the great users on %s" msgstr "" #: actions/file.php:34 -msgid "No notice id" +msgid "No notice ID." msgstr "" #: actions/file.php:38 -msgid "No notice" +msgid "No notice." msgstr "" #: actions/file.php:42 -msgid "No attachments" +msgid "No attachments." msgstr "" #: actions/file.php:51 -msgid "No uploaded attachments" +msgid "No uploaded attachments." msgstr "" #: actions/finishremotesubscribe.php:69 @@ -1277,8 +1276,9 @@ msgid "Error updating remote profile" msgstr "" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 msgid "No such group." msgstr "" @@ -1953,8 +1953,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "" @@ -2715,7 +2715,7 @@ msgstr "" msgid "You already repeated that notice." msgstr "" -#: actions/repeat.php:112 lib/noticelist.php:628 +#: actions/repeat.php:112 lib/noticelist.php:627 msgid "Repeated" msgstr "" @@ -3474,12 +3474,8 @@ msgstr "" msgid "Notice feed for tag %s (Atom)" msgstr "" -#: actions/tagother.php:33 -msgid "Not logged in" -msgstr "" - #: actions/tagother.php:39 -msgid "No id argument." +msgid "No ID argument." msgstr "" #: actions/tagother.php:65 @@ -3736,7 +3732,7 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "" #: actions/userbyid.php:70 -msgid "No id." +msgid "No ID." msgstr "" #: actions/userdesignsettings.php:76 lib/designsettings.php:65 @@ -4195,6 +4191,14 @@ msgstr "" msgid "Error sending direct message." msgstr "" +#: lib/command.php:421 +msgid "Cannot repeat your own notice" +msgstr "" + +#: lib/command.php:426 +msgid "Already repeated that notice" +msgstr "" + #: lib/command.php:434 #, php-format msgid "Notice from %s repeated" @@ -4876,11 +4880,15 @@ msgstr "" msgid "in context" msgstr "" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +msgid "Repeated by" +msgstr "" + +#: lib/noticelist.php:587 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 msgid "Reply" msgstr "" @@ -4982,11 +4990,11 @@ msgid "All groups" msgstr "" #: lib/profileformaction.php:123 -msgid "No return-to arguments" +msgid "No return-to arguments." msgstr "" #: lib/profileformaction.php:137 -msgid "unimplemented method" +msgid "Unimplemented method." msgstr "" #: lib/publicgroupnav.php:78 diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index cede511a06..aa33772d8c 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: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:16:20+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:35:37+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: sv\n" "X-Message-Group: out-statusnet\n" @@ -430,18 +430,18 @@ msgid "You may not delete another user's status." msgstr "Du kan inte ta bort en annan användares status." #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "Ingen sådan notis." -#: actions/apistatusesretweet.php:83 lib/command.php:421 +#: actions/apistatusesretweet.php:83 #, fuzzy -msgid "Cannot repeat your own notice" +msgid "Cannot repeat your own notice." msgstr "Kan inte stänga av notifikation." -#: actions/apistatusesretweet.php:91 lib/command.php:426 +#: actions/apistatusesretweet.php:91 #, fuzzy -msgid "Already repeated that notice" +msgid "Already repeated that notice." msgstr "Ta bort denna notis" #: actions/apistatusesshow.php:138 @@ -513,7 +513,7 @@ msgstr "%s publika tidslinje" msgid "%s updates from everyone!" msgstr "%s uppdateringar från alla!" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" msgstr "" @@ -546,7 +546,8 @@ msgstr "Hittades inte." msgid "No such attachment." msgstr "Ingen sådan bilaga." -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "Inget smeknamn." @@ -591,7 +592,7 @@ msgid "Preview" msgstr "Förhandsgranska" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 msgid "Delete" msgstr "Ta bort" @@ -688,15 +689,15 @@ msgstr "Misslyckades att spara blockeringsinformation." #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname" msgstr "Inget smeknamn" #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 msgid "No such group" msgstr "Ingen sådan grupp" @@ -783,16 +784,13 @@ msgstr "Konversationer" msgid "Notices" msgstr "Notiser" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "Ingen sådan notis." - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Inte inloggad." @@ -820,7 +818,7 @@ msgstr "Är du säker på att du vill ta bort denna notis?" msgid "Do not delete this notice" msgstr "Ta inte bort denna notis" -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 msgid "Delete this notice" msgstr "Ta bort denna notis" @@ -1266,19 +1264,23 @@ msgid "A selection of some of the great users on %s" msgstr "Ett urval av några av de stora användarna på% s" #: actions/file.php:34 -msgid "No notice id" -msgstr "Ingen notis-ID" +#, fuzzy +msgid "No notice ID." +msgstr "Ingen notis" #: actions/file.php:38 -msgid "No notice" +#, fuzzy +msgid "No notice." msgstr "Ingen notis" #: actions/file.php:42 -msgid "No attachments" +#, fuzzy +msgid "No attachments." msgstr "Inga bilagor" #: actions/file.php:51 -msgid "No uploaded attachments" +#, fuzzy +msgid "No uploaded attachments." msgstr "Inga uppladdade bilagor" #: actions/finishremotesubscribe.php:69 @@ -1314,8 +1316,9 @@ msgid "Error updating remote profile" msgstr "Fel vid uppdatering av fjärrprofil" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 msgid "No such group." msgstr "Ingen sådan grupp." @@ -2039,8 +2042,8 @@ msgstr "innehållstyp " msgid "Only " msgstr "Bara " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "Ett dataformat som inte stödjs" @@ -2846,7 +2849,7 @@ msgstr "Du kan inte registrera dig om du inte godkänner licensen." msgid "You already repeated that notice." msgstr "Du har redan blockerat denna användare." -#: actions/repeat.php:112 lib/noticelist.php:628 +#: actions/repeat.php:112 lib/noticelist.php:627 #, fuzzy msgid "Repeated" msgstr "Skapad" @@ -3649,12 +3652,9 @@ msgstr "Flöde av notiser för tagg %s (RSS 2.0)" msgid "Notice feed for tag %s (Atom)" msgstr "Flöde av notiser för tagg %s (Atom)" -#: actions/tagother.php:33 -msgid "Not logged in" -msgstr "Inte inloggad" - #: actions/tagother.php:39 -msgid "No id argument." +#, fuzzy +msgid "No ID argument." msgstr "Inget ID-argument." #: actions/tagother.php:65 @@ -3930,8 +3930,9 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "Fel bildtyp för avatar-URL '%s'." #: actions/userbyid.php:70 -msgid "No id." -msgstr "Ingen ID." +#, fuzzy +msgid "No ID." +msgstr "Ingen ID" #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" @@ -4405,6 +4406,16 @@ msgstr "Meddelande för långt - maximum är %d tecken, du skickade %d" msgid "Error sending direct message." msgstr "Fel vid sändning av direktmeddelande." +#: lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Kan inte stänga av notifikation." + +#: lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Ta bort denna notis" + #: lib/command.php:434 #, fuzzy, php-format msgid "Notice from %s repeated" @@ -5107,11 +5118,16 @@ msgstr "på" msgid "in context" msgstr "i sammanhang" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "Skapad" + +#: lib/noticelist.php:587 msgid "Reply to this notice" msgstr "Svara på detta inlägg" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 msgid "Reply" msgstr "Svara" @@ -5213,11 +5229,13 @@ msgid "All groups" msgstr "Alla grupper" #: lib/profileformaction.php:123 -msgid "No return-to arguments" +#, fuzzy +msgid "No return-to arguments." msgstr "Inga \"return-to\"-argument" #: lib/profileformaction.php:137 -msgid "unimplemented method" +#, fuzzy +msgid "Unimplemented method." msgstr "inte implementerad metod" #: lib/publicgroupnav.php:78 diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index c69b8dbf0d..cc742b7c36 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:16:23+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:35:40+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: te\n" "X-Message-Group: out-statusnet\n" @@ -263,15 +263,15 @@ msgstr "ఈ నోటీసు ఇప్పటికే మీ ఇష్టా #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 msgid "Could not create favorite." -msgstr "" +msgstr "ఇష్టాంశాన్ని సృష్టించలేకపోయాం." #: actions/apifavoritedestroy.php:122 msgid "That status is not a favorite!" -msgstr "" +msgstr "ఆ నోటీసు ఇష్టాంశం కాదు!" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 msgid "Could not delete favorite." -msgstr "" +msgstr "ఇష్టాంశాన్ని తొలగించలేకపోయాం." #: actions/apifriendshipscreate.php:109 msgid "Could not follow user: User not found." @@ -309,7 +309,7 @@ msgstr "వాడుకరిని తాజాకరించలేకున #: actions/newgroup.php:126 actions/profilesettings.php:208 #: actions/register.php:205 msgid "Nickname must have only lowercase letters and numbers and no spaces." -msgstr "" +msgstr "పేరులో చిన్నబడి అక్షరాలు మరియు అంకెలు మాత్రమే ఖాళీలు లేకుండా ఉండాలి." #: actions/apigroupcreate.php:173 actions/editgroup.php:186 #: actions/newgroup.php:130 actions/profilesettings.php:231 @@ -381,7 +381,7 @@ msgstr "మీరు ఇప్పటికే ఆ గుంపులో సభ #: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221 msgid "You have been blocked from that group by the admin." -msgstr "" +msgstr "నిర్వాహకులు ఆ గుంపు నుండి మిమ్మల్ని నిరోధించారు." #: actions/apigroupjoin.php:138 #, fuzzy, php-format @@ -426,17 +426,18 @@ msgid "You may not delete another user's status." msgstr "ఇతర వాడుకరుల స్థితిని మీరు తొలగించలేరు." #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "అటువంటి సందేశమేమీ లేదు." -#: actions/apistatusesretweet.php:83 lib/command.php:421 -msgid "Cannot repeat your own notice" -msgstr "" - -#: actions/apistatusesretweet.php:91 lib/command.php:426 +#: actions/apistatusesretweet.php:83 #, fuzzy -msgid "Already repeated that notice" +msgid "Cannot repeat your own notice." +msgstr "ఈ లైసెన్సుకి అంగీకరించకపోతే మీరు నమోదుచేసుకోలేరు." + +#: actions/apistatusesretweet.php:91 +#, fuzzy +msgid "Already repeated that notice." msgstr "ఈ నోటీసుని తొలగించు" #: actions/apistatusesshow.php:138 @@ -460,7 +461,7 @@ msgstr "దొరకలేదు" #: actions/apistatusesupdate.php:227 actions/newnotice.php:183 #, php-format msgid "Max notice size is %d chars, including attachment URL." -msgstr "" +msgstr "గరిష్ఠ నోటీసు పొడవు %d అక్షరాలు, జోడింపు URLని కలుపుకుని." #: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261 msgid "Unsupported format." @@ -508,7 +509,7 @@ msgstr "%s బహిరంగ కాలరేఖ" msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" msgstr "" @@ -541,7 +542,8 @@ msgstr "కనబడలేదు." msgid "No such attachment." msgstr "అటువంటి జోడింపు లేదు." -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 #, fuzzy msgid "No nickname." msgstr "పేరు లేదు." @@ -586,7 +588,7 @@ msgid "Preview" msgstr "మునుజూపు" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 msgid "Delete" msgstr "తొలగించు" @@ -680,8 +682,8 @@ msgstr "నిరోధపు సమాచారాన్ని భద్రప #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 #, fuzzy msgid "No nickname" msgstr "పేరు లేదు." @@ -689,7 +691,7 @@ msgstr "పేరు లేదు." #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 msgid "No such group" msgstr "అటువంటి గుంపు లేదు" @@ -777,16 +779,13 @@ msgstr "సంభాషణ" msgid "Notices" msgstr "సందేశాలు" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "అటువంటి సందేశమేమీ లేదు." - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "లోనికి ప్రవేశించలేదు." @@ -809,11 +808,10 @@ msgid "Are you sure you want to delete this notice?" msgstr "మీరు నిజంగానే ఈ నోటీసుని తొలగించాలనుకుంటున్నారా?" #: actions/deletenotice.php:145 -#, fuzzy msgid "Do not delete this notice" -msgstr "ఈ నోటీసుని తొలగించలేము." +msgstr "ఈ నోటీసుని తొలగించకు" -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 msgid "Delete this notice" msgstr "ఈ నోటీసుని తొలగించు" @@ -964,7 +962,7 @@ msgstr "రూపురేఖలని భద్రపరచు" #: actions/disfavor.php:81 msgid "This notice is not a favorite!" -msgstr "" +msgstr "ఈ నోటీసు ఇష్టాంశం కాదు!" #: actions/disfavor.php:94 msgid "Add to favorites" @@ -1249,19 +1247,22 @@ msgstr "" #: actions/file.php:34 #, fuzzy -msgid "No notice id" -msgstr "కొత్త సందేశం" +msgid "No notice ID." +msgstr "సందేశం లేదు" #: actions/file.php:38 -msgid "No notice" +#, fuzzy +msgid "No notice." msgstr "సందేశం లేదు" #: actions/file.php:42 -msgid "No attachments" +#, fuzzy +msgid "No attachments." msgstr "జోడింపులు లేవు" #: actions/file.php:51 -msgid "No uploaded attachments" +#, fuzzy +msgid "No uploaded attachments." msgstr "ఎక్కించిన జోడింపులేమీ లేవు" #: actions/finishremotesubscribe.php:69 @@ -1274,7 +1275,7 @@ msgstr "" #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59 msgid "You can use the local subscription!" -msgstr "" +msgstr "మీరు స్థానిక చందాని ఉపయోగించవచ్చు!" #: actions/finishremotesubscribe.php:99 msgid "That user has blocked you from subscribing." @@ -1297,8 +1298,9 @@ msgid "Error updating remote profile" msgstr "దూరపు ప్రొపైలుని తాజాకరించటంలో పొరపాటు" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 msgid "No such group." msgstr "అటువంటి గుంపు లేదు." @@ -1444,7 +1446,7 @@ msgstr "నిరోధించు" #: actions/groupmembers.php:441 msgid "Make user an admin of the group" -msgstr "" +msgstr "వాడుకరిని గుంపుకి ఒక నిర్వాహకునిగా చేయి" #: actions/groupmembers.php:473 msgid "Make Admin" @@ -1633,7 +1635,7 @@ msgstr "" #: actions/invite.php:41 #, php-format msgid "You must be logged in to invite other users to use %s" -msgstr "" +msgstr "%sని ఉపయోగించమని ఇతర వాడుకరులని ఆహ్వానించడానికి మీరు ప్రవేశించి ఉండాలి" #: actions/invite.php:72 #, php-format @@ -1650,7 +1652,7 @@ msgstr "కొత్త వాడుకరులని ఆహ్వానిం #: actions/invite.php:128 msgid "You are already subscribed to these users:" -msgstr "" +msgstr "మీరు ఇప్పటికే ఈ వాడుకరులకు చందాచేరి ఉన్నారు:" #: actions/invite.php:131 actions/invite.php:139 #, php-format @@ -1902,7 +1904,7 @@ msgstr "%sకి నేరు సందేశాన్ని పంపించ #: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170 msgid "Ajax Error" -msgstr "" +msgstr "అజాక్స్ పొరపాటు" #: actions/newnotice.php:69 msgid "New notice" @@ -1985,8 +1987,8 @@ msgstr "విషయ రకం " msgid "Only " msgstr "మాత్రమే " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "" @@ -2043,7 +2045,7 @@ msgstr "" #: actions/outbox.php:116 msgid "This is your outbox, which lists private messages you have sent." -msgstr "" +msgstr "ఇవి మీరు పంపివున్న అంతరంగిక సందేశాలు." #: actions/passwordsettings.php:58 msgid "Change password" @@ -2769,7 +2771,7 @@ msgstr "ఈ లైసెన్సుకి అంగీకరించకపో msgid "You already repeated that notice." msgstr "మీరు ఇప్పటికే ఆ వాడుకరిని నిరోధించారు." -#: actions/repeat.php:112 lib/noticelist.php:628 +#: actions/repeat.php:112 lib/noticelist.php:627 #, fuzzy msgid "Repeated" msgstr "సృష్టితం" @@ -3544,13 +3546,9 @@ msgstr "%s యొక్క సందేశముల ఫీడు" msgid "Notice feed for tag %s (Atom)" msgstr "%s యొక్క సందేశముల ఫీడు" -#: actions/tagother.php:33 -msgid "Not logged in" -msgstr "లోనికి ప్రవేశించలేదు" - #: actions/tagother.php:39 #, fuzzy -msgid "No id argument." +msgid "No ID argument." msgstr "అటువంటి పత్రమేమీ లేదు." #: actions/tagother.php:65 @@ -3813,7 +3811,8 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "'%s' కొరకు తప్పుడు బొమ్మ రకం" #: actions/userbyid.php:70 -msgid "No id." +#, fuzzy +msgid "No ID." msgstr "ఐడీ లేదు." #: actions/userdesignsettings.php:76 lib/designsettings.php:65 @@ -4292,6 +4291,15 @@ msgstr "" msgid "Error sending direct message." msgstr "" +#: lib/command.php:421 +msgid "Cannot repeat your own notice" +msgstr "" + +#: lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "ఈ నోటీసుని తొలగించు" + #: lib/command.php:434 #, fuzzy, php-format msgid "Notice from %s repeated" @@ -4988,11 +4996,16 @@ msgstr "" msgid "in context" msgstr "సందర్భంలో" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "సృష్టితం" + +#: lib/noticelist.php:587 msgid "Reply to this notice" msgstr "ఈ నోటీసుపై స్పందించండి" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 msgid "Reply" msgstr "స్పందించండి" @@ -5097,11 +5110,11 @@ msgstr "అన్ని గుంపులు" #: lib/profileformaction.php:123 #, fuzzy -msgid "No return-to arguments" +msgid "No return-to arguments." msgstr "అటువంటి పత్రమేమీ లేదు." #: lib/profileformaction.php:137 -msgid "unimplemented method" +msgid "Unimplemented method." msgstr "" #: lib/publicgroupnav.php:78 diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index 921537bcce..2bea51fb46 100644 --- a/locale/tr/LC_MESSAGES/statusnet.po +++ b/locale/tr/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:16:26+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:35:44+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: tr\n" "X-Message-Group: out-statusnet\n" @@ -435,17 +435,19 @@ msgid "You may not delete another user's status." msgstr "" #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "Böyle bir durum mesajı yok." -#: actions/apistatusesretweet.php:83 lib/command.php:421 -msgid "Cannot repeat your own notice" -msgstr "" +#: actions/apistatusesretweet.php:83 +#, fuzzy +msgid "Cannot repeat your own notice." +msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız." -#: actions/apistatusesretweet.php:91 lib/command.php:426 -msgid "Already repeated that notice" -msgstr "" +#: actions/apistatusesretweet.php:91 +#, fuzzy +msgid "Already repeated that notice." +msgstr "Zaten giriş yapmış durumdasıznız!" #: actions/apistatusesshow.php:138 #, fuzzy @@ -519,7 +521,7 @@ msgstr "" msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" msgstr "" @@ -554,7 +556,8 @@ msgstr "İstek bulunamadı!" msgid "No such attachment." msgstr "Böyle bir belge yok." -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "Takma ad yok" @@ -599,7 +602,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 msgid "Delete" msgstr "" @@ -698,8 +701,8 @@ msgstr "" #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 #, fuzzy msgid "No nickname" msgstr "Takma ad yok" @@ -707,7 +710,7 @@ msgstr "Takma ad yok" #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 #, fuzzy msgid "No such group" msgstr "Böyle bir durum mesajı yok." @@ -797,16 +800,13 @@ msgstr "Yer" msgid "Notices" msgstr "Durum mesajları" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "Böyle bir durum mesajı yok." - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Giriş yapılmadı." @@ -833,7 +833,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "Böyle bir durum mesajı yok." -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 msgid "Delete this notice" msgstr "" @@ -1283,21 +1283,23 @@ msgstr "" #: actions/file.php:34 #, fuzzy -msgid "No notice id" +msgid "No notice ID." msgstr "Yeni durum mesajı" #: actions/file.php:38 #, fuzzy -msgid "No notice" +msgid "No notice." msgstr "Yeni durum mesajı" #: actions/file.php:42 -msgid "No attachments" -msgstr "" +#, fuzzy +msgid "No attachments." +msgstr "Böyle bir belge yok." #: actions/file.php:51 -msgid "No uploaded attachments" -msgstr "" +#, fuzzy +msgid "No uploaded attachments." +msgstr "Böyle bir belge yok." #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1334,8 +1336,9 @@ msgid "Error updating remote profile" msgstr "Uzaktaki profili güncellemede hata oluştu" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 #, fuzzy msgid "No such group." msgstr "Böyle bir durum mesajı yok." @@ -2054,8 +2057,8 @@ msgstr "Bağlan" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "" @@ -2854,7 +2857,7 @@ msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız." msgid "You already repeated that notice." msgstr "Zaten giriş yapmış durumdasıznız!" -#: actions/repeat.php:112 lib/noticelist.php:628 +#: actions/repeat.php:112 lib/noticelist.php:627 #, fuzzy msgid "Repeated" msgstr "Yarat" @@ -3641,14 +3644,9 @@ msgstr "%s için durum RSS beslemesi" msgid "Notice feed for tag %s (Atom)" msgstr "%s için durum RSS beslemesi" -#: actions/tagother.php:33 -#, fuzzy -msgid "Not logged in" -msgstr "Giriş yapılmadı." - #: actions/tagother.php:39 #, fuzzy -msgid "No id argument." +msgid "No ID argument." msgstr "Böyle bir belge yok." #: actions/tagother.php:65 @@ -3922,7 +3920,8 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "%s için yanlış resim türü" #: actions/userbyid.php:70 -msgid "No id." +#, fuzzy +msgid "No ID." msgstr "Kullanıcı numarası yok" #: actions/userdesignsettings.php:76 lib/designsettings.php:65 @@ -4408,6 +4407,14 @@ msgstr "" msgid "Error sending direct message." msgstr "" +#: lib/command.php:421 +msgid "Cannot repeat your own notice" +msgstr "" + +#: lib/command.php:426 +msgid "Already repeated that notice" +msgstr "" + #: lib/command.php:434 #, fuzzy, php-format msgid "Notice from %s repeated" @@ -5119,11 +5126,16 @@ msgstr "" msgid "in context" msgstr "İçerik yok!" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "Yarat" + +#: lib/noticelist.php:587 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 #, fuzzy msgid "Reply" msgstr "cevapla" @@ -5229,11 +5241,11 @@ msgstr "" #: lib/profileformaction.php:123 #, fuzzy -msgid "No return-to arguments" +msgid "No return-to arguments." msgstr "Böyle bir belge yok." #: lib/profileformaction.php:137 -msgid "unimplemented method" +msgid "Unimplemented method." msgstr "" #: lib/publicgroupnav.php:78 diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index 8659251157..4e75b1967b 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:16:29+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:35:47+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: out-statusnet\n" @@ -433,18 +433,18 @@ msgid "You may not delete another user's status." msgstr "Ви не можете видалити статус іншого користувача." #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "Такого допису немає." -#: actions/apistatusesretweet.php:83 lib/command.php:421 +#: actions/apistatusesretweet.php:83 #, fuzzy -msgid "Cannot repeat your own notice" +msgid "Cannot repeat your own notice." msgstr "Не можна увімкнути сповіщення." -#: actions/apistatusesretweet.php:91 lib/command.php:426 +#: actions/apistatusesretweet.php:91 #, fuzzy -msgid "Already repeated that notice" +msgid "Already repeated that notice." msgstr "Видалити допис" #: actions/apistatusesshow.php:138 @@ -518,7 +518,7 @@ msgstr "%s загальна стрічка" msgid "%s updates from everyone!" msgstr "%s оновлення від усіх!" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" msgstr "" @@ -551,7 +551,8 @@ msgstr "Не знайдено." msgid "No such attachment." msgstr "Такого вкладення немає." -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "Немає імені." @@ -595,7 +596,7 @@ msgid "Preview" msgstr "Перегляд" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 msgid "Delete" msgstr "Видалити" @@ -693,15 +694,15 @@ msgstr "Збереження інформації про блокування з #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname" msgstr "Немає імені" #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 msgid "No such group" msgstr "Такої групи немає" @@ -787,16 +788,13 @@ msgstr "Розмова" msgid "Notices" msgstr "Дописи" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "Такого допису немає." - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Не увійшли." @@ -822,7 +820,7 @@ msgstr "Ви впевненні, що бажаєте видалити цей д msgid "Do not delete this notice" msgstr "Не видаляти цей допис" -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 msgid "Delete this notice" msgstr "Видалити допис" @@ -1268,19 +1266,23 @@ msgid "A selection of some of the great users on %s" msgstr "Вибірка з деяких видатних користувачів на %s" #: actions/file.php:34 -msgid "No notice id" -msgstr "Відсутній номер допису" +#, fuzzy +msgid "No notice ID." +msgstr "Немає допису" #: actions/file.php:38 -msgid "No notice" +#, fuzzy +msgid "No notice." msgstr "Немає допису" #: actions/file.php:42 -msgid "No attachments" +#, fuzzy +msgid "No attachments." msgstr "Немає вкладень" #: actions/file.php:51 -msgid "No uploaded attachments" +#, fuzzy +msgid "No uploaded attachments." msgstr "Немає завантажених вкладень" #: actions/finishremotesubscribe.php:69 @@ -1316,8 +1318,9 @@ msgid "Error updating remote profile" msgstr "Помилка при оновленні віддаленого профілю" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 msgid "No such group." msgstr "Такої групи немає." @@ -2072,8 +2075,8 @@ msgstr "тип змісту " msgid "Only " msgstr "Лише " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "Такий формат даних не підтримується." @@ -2895,7 +2898,7 @@ msgstr "Ви не зможете зареєструватись, якщо не msgid "You already repeated that notice." msgstr "Цього користувача вже заблоковано." -#: actions/repeat.php:112 lib/noticelist.php:628 +#: actions/repeat.php:112 lib/noticelist.php:627 #, fuzzy msgid "Repeated" msgstr "Створено" @@ -3714,12 +3717,9 @@ msgstr "Стрічка дописів для теґу %s (RSS 2.0)" msgid "Notice feed for tag %s (Atom)" msgstr "Стрічка дописів для теґу %s (Atom)" -#: actions/tagother.php:33 -msgid "Not logged in" -msgstr "Не увійшли" - #: actions/tagother.php:39 -msgid "No id argument." +#, fuzzy +msgid "No ID argument." msgstr "Немає аргументу ID." #: actions/tagother.php:65 @@ -3990,8 +3990,9 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "Неправильний тип зображення для URL-адреси аватари ‘%s’." #: actions/userbyid.php:70 -msgid "No id." -msgstr "Немає ID." +#, fuzzy +msgid "No ID." +msgstr "Немає ID" #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" @@ -4466,6 +4467,16 @@ msgstr "Повідомлення надто довге — максимум %d msgid "Error sending direct message." msgstr "Помилка при відправці прямого повідомлення." +#: lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Не можна увімкнути сповіщення." + +#: lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Видалити допис" + #: lib/command.php:434 #, fuzzy, php-format msgid "Notice from %s repeated" @@ -5281,11 +5292,16 @@ msgstr "в" msgid "in context" msgstr "в контексті" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "Створено" + +#: lib/noticelist.php:587 msgid "Reply to this notice" msgstr "Відповісти на цей допис" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 msgid "Reply" msgstr "Відповісти" @@ -5387,11 +5403,13 @@ msgid "All groups" msgstr "Всі групи" #: lib/profileformaction.php:123 -msgid "No return-to arguments" +#, fuzzy +msgid "No return-to arguments." msgstr "Немає аргументів повернення." #: lib/profileformaction.php:137 -msgid "unimplemented method" +#, fuzzy +msgid "Unimplemented method." msgstr "неприпустимий метод" #: lib/publicgroupnav.php:78 diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index 921b61cc22..ce847f188d 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: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:16:32+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:35:50+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: vi\n" "X-Message-Group: out-statusnet\n" @@ -438,17 +438,18 @@ msgid "You may not delete another user's status." msgstr "Bạn đã không xóa trạng thái của những người khác." #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "Không có tin nhắn nào." -#: actions/apistatusesretweet.php:83 lib/command.php:421 -msgid "Cannot repeat your own notice" -msgstr "" - -#: actions/apistatusesretweet.php:91 lib/command.php:426 +#: actions/apistatusesretweet.php:83 #, fuzzy -msgid "Already repeated that notice" +msgid "Cannot repeat your own notice." +msgstr "Bạn không thể đăng ký nếu không đồng ý các điều khoản." + +#: actions/apistatusesretweet.php:91 +#, fuzzy +msgid "Already repeated that notice." msgstr "Xóa tin nhắn" #: actions/apistatusesshow.php:138 @@ -522,7 +523,7 @@ msgstr "Dòng tin công cộng" msgid "%s updates from everyone!" msgstr "%s cập nhật từ tất cả mọi người!" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" msgstr "" @@ -557,7 +558,8 @@ msgstr "Không tìm thấy" msgid "No such attachment." msgstr "Không có tài liệu nào." -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "Không có biệt hiệu." @@ -604,7 +606,7 @@ msgid "Preview" msgstr "Xem trước" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 #, fuzzy msgid "Delete" msgstr "Xóa tin nhắn" @@ -705,8 +707,8 @@ msgstr "" #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 #, fuzzy msgid "No nickname" msgstr "Không có biệt hiệu." @@ -714,7 +716,7 @@ msgstr "Không có biệt hiệu." #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 #, fuzzy msgid "No such group" msgstr "Không có user nào." @@ -803,16 +805,13 @@ msgstr "Không có mã số xác nhận." msgid "Notices" msgstr "Tin nhắn" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "Không có tin nhắn nào." - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "Chưa đăng nhập." @@ -840,7 +839,7 @@ msgstr "Bạn có chắc chắn là muốn xóa tin nhắn này không?" msgid "Do not delete this notice" msgstr "Không thể xóa tin nhắn này." -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 #, fuzzy msgid "Delete this notice" msgstr "Xóa tin nhắn" @@ -1322,21 +1321,23 @@ msgstr "" #: actions/file.php:34 #, fuzzy -msgid "No notice id" +msgid "No notice ID." msgstr "Thông báo mới" #: actions/file.php:38 #, fuzzy -msgid "No notice" +msgid "No notice." msgstr "Thông báo mới" #: actions/file.php:42 -msgid "No attachments" -msgstr "" +#, fuzzy +msgid "No attachments." +msgstr "Không có tài liệu nào." #: actions/file.php:51 -msgid "No uploaded attachments" -msgstr "" +#, fuzzy +msgid "No uploaded attachments." +msgstr "Không có tài liệu nào." #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1375,8 +1376,9 @@ msgid "Error updating remote profile" msgstr "Lỗi xảy ra khi cập nhật hồ sơ cá nhân" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 #, fuzzy msgid "No such group." msgstr "Không có tin nhắn nào." @@ -2145,8 +2147,8 @@ msgstr "Kết nối" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "Không hỗ trợ định dạng dữ liệu này." @@ -2973,7 +2975,7 @@ msgstr "Bạn không thể đăng ký nếu không đồng ý các điều kho msgid "You already repeated that notice." msgstr "Bạn đã theo những người này:" -#: actions/repeat.php:112 lib/noticelist.php:628 +#: actions/repeat.php:112 lib/noticelist.php:627 #, fuzzy msgid "Repeated" msgstr "Tạo" @@ -3780,14 +3782,9 @@ msgstr "Dòng tin nhắn cho %s" msgid "Notice feed for tag %s (Atom)" msgstr "Dòng tin nhắn cho %s" -#: actions/tagother.php:33 -#, fuzzy -msgid "Not logged in" -msgstr "Chưa đăng nhập." - #: actions/tagother.php:39 #, fuzzy -msgid "No id argument." +msgid "No ID argument." msgstr "Không có tài liệu nào." #: actions/tagother.php:65 @@ -4072,7 +4069,8 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "Kiểu file ảnh không phù hợp với '%s'" #: actions/userbyid.php:70 -msgid "No id." +#, fuzzy +msgid "No ID." msgstr "Không có id." #: actions/userdesignsettings.php:76 lib/designsettings.php:65 @@ -4574,6 +4572,15 @@ msgstr "" msgid "Error sending direct message." msgstr "Thư bạn đã gửi" +#: lib/command.php:421 +msgid "Cannot repeat your own notice" +msgstr "" + +#: lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Xóa tin nhắn" + #: lib/command.php:434 #, fuzzy, php-format msgid "Notice from %s repeated" @@ -5345,12 +5352,17 @@ msgstr "" msgid "in context" msgstr "Không có nội dung!" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "Tạo" + +#: lib/noticelist.php:587 #, fuzzy msgid "Reply to this notice" msgstr "Trả lời tin nhắn này" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 msgid "Reply" msgstr "Trả lời" @@ -5459,11 +5471,11 @@ msgstr "Nhóm" #: lib/profileformaction.php:123 #, fuzzy -msgid "No return-to arguments" +msgid "No return-to arguments." msgstr "Không có tài liệu nào." #: lib/profileformaction.php:137 -msgid "unimplemented method" +msgid "Unimplemented method." msgstr "" #: lib/publicgroupnav.php:78 diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index 11aefb86a2..a4043811cc 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.po +++ b/locale/zh_CN/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:16:35+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:35:53+0000\n" "Language-Team: Simplified Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hans\n" "X-Message-Group: out-statusnet\n" @@ -436,18 +436,18 @@ msgid "You may not delete another user's status." msgstr "您不能删除其他用户的状态。" #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "没有这份通告。" -#: actions/apistatusesretweet.php:83 lib/command.php:421 +#: actions/apistatusesretweet.php:83 #, fuzzy -msgid "Cannot repeat your own notice" +msgid "Cannot repeat your own notice." msgstr "无法开启通告。" -#: actions/apistatusesretweet.php:91 lib/command.php:426 +#: actions/apistatusesretweet.php:91 #, fuzzy -msgid "Already repeated that notice" +msgid "Already repeated that notice." msgstr "删除通告" #: actions/apistatusesshow.php:138 @@ -521,7 +521,7 @@ msgstr "%s 公众时间表" msgid "%s updates from everyone!" msgstr "来自所有人的 %s 消息！" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" msgstr "" @@ -556,7 +556,8 @@ msgstr "未找到" msgid "No such attachment." msgstr "没有这份文档。" -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "没有昵称。" @@ -600,7 +601,7 @@ msgid "Preview" msgstr "预览" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 #, fuzzy msgid "Delete" msgstr "删除" @@ -700,8 +701,8 @@ msgstr "保存阻止信息失败。" #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 #, fuzzy msgid "No nickname" msgstr "没有昵称。" @@ -709,7 +710,7 @@ msgstr "没有昵称。" #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 msgid "No such group" msgstr "没有这个组" @@ -800,16 +801,13 @@ msgstr "确认码" msgid "Notices" msgstr "通告" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "没有这份通告。" - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "未登录。" @@ -837,7 +835,7 @@ msgstr "确定要删除这条消息吗？" msgid "Do not delete this notice" msgstr "无法删除通告。" -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 #, fuzzy msgid "Delete this notice" msgstr "删除通告" @@ -1295,21 +1293,23 @@ msgstr "%s 优秀用户摘选" #: actions/file.php:34 #, fuzzy -msgid "No notice id" +msgid "No notice ID." msgstr "新通告" #: actions/file.php:38 #, fuzzy -msgid "No notice" +msgid "No notice." msgstr "新通告" #: actions/file.php:42 -msgid "No attachments" -msgstr "" +#, fuzzy +msgid "No attachments." +msgstr "没有这份文档。" #: actions/file.php:51 -msgid "No uploaded attachments" -msgstr "" +#, fuzzy +msgid "No uploaded attachments." +msgstr "没有这份文档。" #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1348,8 +1348,9 @@ msgid "Error updating remote profile" msgstr "更新远程的个人信息时出错" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 msgid "No such group." msgstr "没有这个组。" @@ -2088,8 +2089,8 @@ msgstr "连接" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "不支持的数据格式。" @@ -2899,7 +2900,7 @@ msgstr "您必须同意此授权方可注册。" msgid "You already repeated that notice." msgstr "您已成功阻止该用户：" -#: actions/repeat.php:112 lib/noticelist.php:628 +#: actions/repeat.php:112 lib/noticelist.php:627 #, fuzzy msgid "Repeated" msgstr "创建" @@ -3701,14 +3702,9 @@ msgstr "%s 的通告聚合" msgid "Notice feed for tag %s (Atom)" msgstr "%s 的通告聚合" -#: actions/tagother.php:33 -#, fuzzy -msgid "Not logged in" -msgstr "未登录。" - #: actions/tagother.php:39 #, fuzzy -msgid "No id argument." +msgid "No ID argument." msgstr "没有这份文档。" #: actions/tagother.php:65 @@ -3990,8 +3986,9 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "'%s' 图像格式错误" #: actions/userbyid.php:70 -msgid "No id." -msgstr "没有 id。" +#, fuzzy +msgid "No ID." +msgstr "没有ID" #: actions/userdesignsettings.php:76 lib/designsettings.php:65 #, fuzzy @@ -4483,6 +4480,16 @@ msgstr "您的消息包含 %d 个字符，超出长度限制 - 不能超过 140 msgid "Error sending direct message." msgstr "发送消息出错。" +#: lib/command.php:421 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "无法开启通告。" + +#: lib/command.php:426 +#, fuzzy +msgid "Already repeated that notice" +msgstr "删除通告" + #: lib/command.php:434 #, fuzzy, php-format msgid "Notice from %s repeated" @@ -5206,12 +5213,17 @@ msgstr "" msgid "in context" msgstr "没有内容！" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "创建" + +#: lib/noticelist.php:587 #, fuzzy msgid "Reply to this notice" msgstr "无法删除通告。" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 #, fuzzy msgid "Reply" msgstr "回复" @@ -5320,11 +5332,11 @@ msgstr "所有组" #: lib/profileformaction.php:123 #, fuzzy -msgid "No return-to arguments" +msgid "No return-to arguments." msgstr "没有这份文档。" #: lib/profileformaction.php:137 -msgid "unimplemented method" +msgid "Unimplemented method." msgstr "" #: lib/publicgroupnav.php:78 diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index ca46fe613a..4a569ff6e1 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: 2009-12-13 17:14+0000\n" -"PO-Revision-Date: 2009-12-13 17:16:38+0000\n" +"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"PO-Revision-Date: 2009-12-14 20:35:55+0000\n" "Language-Team: Traditional Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60008); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hant\n" "X-Message-Group: out-statusnet\n" @@ -430,17 +430,19 @@ msgid "You may not delete another user's status." msgstr "" #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 -#, fuzzy -msgid "No such notice" +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." msgstr "無此通知" -#: actions/apistatusesretweet.php:83 lib/command.php:421 -msgid "Cannot repeat your own notice" -msgstr "" +#: actions/apistatusesretweet.php:83 +#, fuzzy +msgid "Cannot repeat your own notice." +msgstr "儲存使用者發生錯誤" -#: actions/apistatusesretweet.php:91 lib/command.php:426 -msgid "Already repeated that notice" -msgstr "" +#: actions/apistatusesretweet.php:91 +#, fuzzy +msgid "Already repeated that notice." +msgstr "無此使用者" #: actions/apistatusesshow.php:138 #, fuzzy @@ -512,7 +514,7 @@ msgstr "" msgid "%s updates from everyone!" msgstr "" -#: actions/apitimelineretweetedbyme.php:112 lib/noticelist.php:566 +#: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" msgstr "" @@ -547,7 +549,8 @@ msgstr "目前無請求" msgid "No such attachment." msgstr "無此文件" -#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/grouprss.php:91 +#: actions/leavegroup.php:76 msgid "No nickname." msgstr "無暱稱" @@ -592,7 +595,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:612 +#: lib/noticelist.php:611 msgid "Delete" msgstr "" @@ -691,8 +694,8 @@ msgstr "" #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/grouprss.php:91 -#: actions/joingroup.php:76 actions/showgroup.php:121 +#: actions/groupmembers.php:76 actions/joingroup.php:76 +#: actions/showgroup.php:121 #, fuzzy msgid "No nickname" msgstr "無暱稱" @@ -700,7 +703,7 @@ msgstr "無暱稱" #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/joingroup.php:83 actions/showgroup.php:137 #, fuzzy msgid "No such group" msgstr "無此通知" @@ -790,16 +793,13 @@ msgstr "地點" msgid "Notices" msgstr "" -#: actions/deletenotice.php:52 actions/shownotice.php:92 -msgid "No such notice." -msgstr "無此通知" - #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30 -#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72 -#: lib/profileformaction.php:63 lib/settingsaction.php:72 +#: actions/tagother.php:33 actions/unsubscribe.php:52 +#: lib/adminpanelaction.php:72 lib/profileformaction.php:63 +#: lib/settingsaction.php:72 msgid "Not logged in." msgstr "" @@ -826,7 +826,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "無此通知" -#: actions/deletenotice.php:146 lib/noticelist.php:612 +#: actions/deletenotice.php:146 lib/noticelist.php:611 msgid "Delete this notice" msgstr "" @@ -1273,21 +1273,23 @@ msgstr "" #: actions/file.php:34 #, fuzzy -msgid "No notice id" +msgid "No notice ID." msgstr "新訊息" #: actions/file.php:38 #, fuzzy -msgid "No notice" +msgid "No notice." msgstr "新訊息" #: actions/file.php:42 -msgid "No attachments" -msgstr "" +#, fuzzy +msgid "No attachments." +msgstr "無此文件" #: actions/file.php:51 -msgid "No uploaded attachments" -msgstr "" +#, fuzzy +msgid "No uploaded attachments." +msgstr "無此文件" #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1323,8 +1325,9 @@ msgid "Error updating remote profile" msgstr "更新遠端個人資料發生錯誤" #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupunblock.php:86 actions/leavegroup.php:83 -#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 +#: lib/command.php:263 #, fuzzy msgid "No such group." msgstr "無此通知" @@ -2015,8 +2018,8 @@ msgstr "連結" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1028 -#: lib/api.php:1056 lib/api.php:1166 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 +#: lib/api.php:1058 lib/api.php:1168 msgid "Not a supported data format." msgstr "" @@ -2794,7 +2797,7 @@ msgstr "" msgid "You already repeated that notice." msgstr "無此使用者" -#: actions/repeat.php:112 lib/noticelist.php:628 +#: actions/repeat.php:112 lib/noticelist.php:627 #, fuzzy msgid "Repeated" msgstr "新增" @@ -3573,14 +3576,9 @@ msgstr "發送給%s好友的訂閱" msgid "Notice feed for tag %s (Atom)" msgstr "" -#: actions/tagother.php:33 -#, fuzzy -msgid "Not logged in" -msgstr "已登入" - #: actions/tagother.php:39 #, fuzzy -msgid "No id argument." +msgid "No ID argument." msgstr "無此文件" #: actions/tagother.php:65 @@ -3846,8 +3844,9 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "" #: actions/userbyid.php:70 -msgid "No id." -msgstr "" +#, fuzzy +msgid "No ID." +msgstr "查無此Jabber ID" #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" @@ -4324,6 +4323,14 @@ msgstr "" msgid "Error sending direct message." msgstr "" +#: lib/command.php:421 +msgid "Cannot repeat your own notice" +msgstr "" + +#: lib/command.php:426 +msgid "Already repeated that notice" +msgstr "" + #: lib/command.php:434 #, fuzzy, php-format msgid "Notice from %s repeated" @@ -5028,11 +5035,16 @@ msgstr "" msgid "in context" msgstr "無內容" -#: lib/noticelist.php:588 +#: lib/noticelist.php:549 +#, fuzzy +msgid "Repeated by" +msgstr "新增" + +#: lib/noticelist.php:587 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:589 +#: lib/noticelist.php:588 msgid "Reply" msgstr "" @@ -5137,11 +5149,11 @@ msgstr "" #: lib/profileformaction.php:123 #, fuzzy -msgid "No return-to arguments" +msgid "No return-to arguments." msgstr "無此文件" #: lib/profileformaction.php:137 -msgid "unimplemented method" +msgid "Unimplemented method." msgstr "" #: lib/publicgroupnav.php:78 From 9d2a605d0e02a4e7d61b62420d7847ee1e6fcbe1 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 14 Dec 2009 15:42:53 -0500 Subject: [PATCH 142/172] correct link for repeat attribution in noticelist --- lib/noticelist.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/noticelist.php b/lib/noticelist.php index a106478edd..85e1befccf 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -535,7 +535,7 @@ class NoticeListItem extends Widget $repeater = Profile::staticGet('id', $this->repeat->profile_id); - $attrs = array('href' => $this->profile->profileurl, + $attrs = array('href' => $repeater->profileurl, 'class' => 'url'); if (!empty($repeater->fullname)) { @@ -544,12 +544,12 @@ class NoticeListItem extends Widget $this->out->elementStart('span', 'repeat vcard'); - $this->out->elementStart('a', $attrs); - $this->out->raw(_('Repeated by')); $avatar = $repeater->getAvatar(AVATAR_MINI_SIZE); + $this->out->elementStart('a', $attrs); + $this->out->element('img', array('src' => ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_MINI_SIZE), From 1ace5c400ebc30d2815182690e5433b918aeaf59 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 14 Dec 2009 15:49:19 -0500 Subject: [PATCH 143/172] parse error in retweet method --- actions/apistatusesretweet.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/apistatusesretweet.php b/actions/apistatusesretweet.php index 85de79d5c8..d9d4820c0e 100644 --- a/actions/apistatusesretweet.php +++ b/actions/apistatusesretweet.php @@ -80,7 +80,7 @@ class ApiStatusesRetweetAction extends ApiAuthAction $this->user = $this->auth_user; if ($this->user->id == $notice->profile_id) { - $this->clientError(_('Cannot repeat your own notice.')); + $this->clientError(_('Cannot repeat your own notice.'), 400, $this->format); return false; } From 6ff13d6828d01a142b60b4254c07f6f9ad3f16ba Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 14 Dec 2009 16:10:16 -0500 Subject: [PATCH 144/172] move full-featured timeline to apitimelinehome.php --- .../{apitimelinefriends.php => apitimelinehome.php} | 12 ++++++------ lib/router.php | 5 +++-- 2 files changed, 9 insertions(+), 8 deletions(-) rename actions/{apitimelinefriends.php => apitimelinehome.php} (95%) diff --git a/actions/apitimelinefriends.php b/actions/apitimelinehome.php similarity index 95% rename from actions/apitimelinefriends.php rename to actions/apitimelinehome.php index 09ba7a9691..5f5ea37b13 100644 --- a/actions/apitimelinefriends.php +++ b/actions/apitimelinehome.php @@ -2,7 +2,7 @@ /** * StatusNet, the distributed open-source microblogging tool * - * Show the friends timeline + * Show the home timeline * * PHP version 5 * @@ -56,7 +56,7 @@ require_once INSTALLDIR . '/lib/apibareauth.php'; * @link http://status.net/ */ -class ApiTimelineFriendsAction extends ApiBareAuthAction +class ApiTimelineHomeAction extends ApiBareAuthAction { var $notices = null; @@ -72,7 +72,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction function prepare($args) { parent::prepare($args); - common_debug("api friends_timeline"); + common_debug("api home_timeline"); $this->user = $this->getTargetUser($this->arg('id')); if (empty($this->user)) { @@ -114,7 +114,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction $sitename = common_config('site', 'name'); $title = sprintf(_("%s and friends"), $this->user->nickname); $taguribase = common_config('integration', 'taguri'); - $id = "tag:$taguribase:FriendsTimeline:" . $this->user->id; + $id = "tag:$taguribase:HomeTimeline:" . $this->user->id; $link = common_local_url( 'all', array('nickname' => $this->user->nickname) ); @@ -137,11 +137,11 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction if (isset($target_id)) { $selfuri = common_root_url() . - 'api/statuses/friends_timeline/' . + 'api/statuses/home_timeline/' . $target_id . '.atom'; } else { $selfuri = common_root_url() . - 'api/statuses/friends_timeline.atom'; + 'api/statuses/home_timeline.atom'; } $this->showAtomTimeline( diff --git a/lib/router.php b/lib/router.php index 8f68f86ac7..474e05996f 100644 --- a/lib/router.php +++ b/lib/router.php @@ -283,12 +283,13 @@ class Router array('action' => 'ApiTimelineFriends', 'id' => '[a-zA-Z0-9]+', 'format' => '(xml|json|rss|atom)')); + $m->connect('api/statuses/home_timeline.:format', - array('action' => 'ApiTimelineFriends', + array('action' => 'ApiTimelineHome', 'format' => '(xml|json|rss|atom)')); $m->connect('api/statuses/home_timeline/:id.:format', - array('action' => 'ApiTimelineFriends', + array('action' => 'ApiTimelineHome', 'id' => '[a-zA-Z0-9]+', 'format' => '(xml|json|rss|atom)')); From 9384a6e2429d8ef9a68185c869758b1e258092c1 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 14 Dec 2009 16:40:56 -0500 Subject: [PATCH 145/172] fix error with cached repeat of deleted original in api output --- lib/api.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/api.php b/lib/api.php index 0c66501116..833bc1c5fc 100644 --- a/lib/api.php +++ b/lib/api.php @@ -224,9 +224,13 @@ class ApiAction extends Action return $base; } else { $original = Notice::staticGet('id', $notice->repeat_of); - $original_array = $this->twitterSimpleStatusArray($original, $include_user); - $original_array['retweeted_status'] = $base; - return $original_array; + if (empty($original)) { + return $base; + } else { + $original_array = $this->twitterSimpleStatusArray($original, $include_user); + $original_array['retweeted_status'] = $base; + return $original_array; + } } } From 2a8eee0e0b33ce15289484270d3211f502940920 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 14 Dec 2009 16:41:25 -0500 Subject: [PATCH 146/172] add friends_timeline with no repeats in it --- actions/apitimelinefriends.php | 245 +++++++++++++++++++++++++++++++++ classes/Notice.php | 18 +++ classes/User.php | 71 ++++++++++ 3 files changed, 334 insertions(+) create mode 100644 actions/apitimelinefriends.php diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php new file mode 100644 index 0000000000..9ec7447e64 --- /dev/null +++ b/actions/apitimelinefriends.php @@ -0,0 +1,245 @@ +. + * + * @category API + * @package StatusNet + * @author Craig Andrews + * @author Evan Prodromou + * @author Jeffery To + * @author mac65 + * @author Mike Cochrane + * @author Robin Millette + * @author Zach Copley + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +require_once INSTALLDIR . '/lib/apibareauth.php'; + +/** + * Returns the most recent notices (default 20) posted by the target user. + * This is the equivalent of 'You and friends' page accessed via Web. + * + * @category API + * @package StatusNet + * @author Craig Andrews + * @author Evan Prodromou + * @author Jeffery To + * @author mac65 + * @author Mike Cochrane + * @author Robin Millette + * @author Zach Copley + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class ApiTimelineFriendsAction extends ApiBareAuthAction +{ + var $notices = null; + + /** + * Take arguments for running + * + * @param array $args $_REQUEST args + * + * @return boolean success flag + * + */ + + function prepare($args) + { + parent::prepare($args); + common_debug("api friends_timeline"); + $this->user = $this->getTargetUser($this->arg('id')); + + if (empty($this->user)) { + $this->clientError(_('No such user.'), 404, $this->format); + return; + } + + $this->notices = $this->getNotices(); + + return true; + } + + /** + * Handle the request + * + * Just show the notices + * + * @param array $args $_REQUEST data (unused) + * + * @return void + */ + + function handle($args) + { + parent::handle($args); + $this->showTimeline(); + } + + /** + * Show the timeline of notices + * + * @return void + */ + + function showTimeline() + { + $profile = $this->user->getProfile(); + $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE); + $sitename = common_config('site', 'name'); + $title = sprintf(_("%s and friends"), $this->user->nickname); + $taguribase = common_config('integration', 'taguri'); + $id = "tag:$taguribase:FriendsTimeline:" . $this->user->id; + $link = common_local_url( + 'all', array('nickname' => $this->user->nickname) + ); + $subtitle = sprintf( + _('Updates from %1$s and friends on %2$s!'), + $this->user->nickname, $sitename + ); + $logo = ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE); + + switch($this->format) { + case 'xml': + $this->showXmlTimeline($this->notices); + break; + case 'rss': + $this->showRssTimeline($this->notices, $title, $link, $subtitle, null, $logo); + break; + case 'atom': + + $target_id = $this->arg('id'); + + if (isset($target_id)) { + $selfuri = common_root_url() . + 'api/statuses/friends_timeline/' . + $target_id . '.atom'; + } else { + $selfuri = common_root_url() . + 'api/statuses/friends_timeline.atom'; + } + + $this->showAtomTimeline( + $this->notices, $title, $id, $link, + $subtitle, null, $selfuri, $logo + ); + break; + case 'json': + $this->showJsonTimeline($this->notices); + break; + default: + $this->clientError(_('API method not found!'), $code = 404); + break; + } + } + + /** + * Get notices + * + * @return array notices + */ + + function getNotices() + { + $notices = array(); + + if (!empty($this->auth_user) && $this->auth_user->id == $this->user->id) { + $notice = $this->user->ownFriendsTimeline(($this->page-1) * $this->count, + $this->count, $this->since_id, + $this->max_id, $this->since); + } else { + $notice = $this->user->friendsTimeline(($this->page-1) * $this->count, + $this->count, $this->since_id, + $this->max_id, $this->since); + } + + while ($notice->fetch()) { + $notices[] = clone($notice); + } + + return $notices; + } + + /** + * Is this action read only? + * + * @param array $args other arguments + * + * @return boolean true + */ + + function isReadOnly($args) + { + return true; + } + + /** + * When was this feed last modified? + * + * @return string datestamp of the latest notice in the stream + */ + + function lastModified() + { + if (!empty($this->notices) && (count($this->notices) > 0)) { + return strtotime($this->notices[0]->created); + } + + return null; + } + + /** + * An entity tag for this stream + * + * Returns an Etag based on the action name, language, user ID, and + * timestamps of the first and last notice in the timeline + * + * @return string etag + */ + + function etag() + { + if (!empty($this->notices) && (count($this->notices) > 0)) { + + $last = count($this->notices) - 1; + + return '"' . implode( + ':', + array($this->arg('action'), + common_language(), + $this->user->id, + strtotime($this->notices[0]->created), + strtotime($this->notices[$last]->created)) + ) + . '"'; + } + + return null; + } + +} diff --git a/classes/Notice.php b/classes/Notice.php index 66d9cf5d47..4aec4ed55c 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -530,8 +530,18 @@ class Notice extends Memcached_DataObject if ($member->find()) { while ($member->fetch()) { $cache->delete(common_cache_key('notice_inbox:by_user:' . $member->profile_id)); + $cache->delete(common_cache_key('notice_inbox:by_user_own:' . $member->profile_id)); + if (empty($this->repeat_of)) { + $cache->delete(common_cache_key('user:friends_timeline:' . $member->profile_id)); + $cache->delete(common_cache_key('user:friends_timeline_own:' . $member->profile_id)); + } if ($blowLast) { $cache->delete(common_cache_key('notice_inbox:by_user:' . $member->profile_id . ';last')); + $cache->delete(common_cache_key('notice_inbox:by_user_own:' . $member->profile_id . ';last')); + if (empty($this->repeat_of)) { + $cache->delete(common_cache_key('user:friends_timeline:' . $member->profile_id . ';last')); + $cache->delete(common_cache_key('user:friends_timeline_own:' . $member->profile_id . ';last')); + } } } } @@ -579,9 +589,17 @@ class Notice extends Memcached_DataObject while ($user->fetch()) { $cache->delete(common_cache_key('notice_inbox:by_user:'.$user->id)); $cache->delete(common_cache_key('notice_inbox:by_user_own:'.$user->id)); + if (empty($this->repeat_of)) { + $cache->delete(common_cache_key('user:friends_timeline:'.$user->id)); + $cache->delete(common_cache_key('user:friends_timeline_own:'.$user->id)); + } if ($blowLast) { $cache->delete(common_cache_key('notice_inbox:by_user:'.$user->id.';last')); $cache->delete(common_cache_key('notice_inbox:by_user_own:'.$user->id.';last')); + if (empty($this->repeat_of)) { + $cache->delete(common_cache_key('user:friends_timeline:'.$user->id.';last')); + $cache->delete(common_cache_key('user:friends_timeline_own:'.$user->id.';last')); + } } } $user->free(); diff --git a/classes/User.php b/classes/User.php index 9c071e06b0..d04f7d679f 100644 --- a/classes/User.php +++ b/classes/User.php @@ -473,6 +473,77 @@ class User extends Memcached_DataObject return Notice::getStreamByIds($ids); } + function friendsTimeline($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=null) + { + $ids = Notice::stream(array($this, '_friendsTimelineDirect'), + array(false), + 'user:friends_timeline:'.$this->id, + $offset, $limit, $since_id, $before_id, $since); + + return Notice::getStreamByIds($ids); + } + + function ownFriendsTimeline($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=null) + { + $ids = Notice::stream(array($this, '_friendsTimelineDirect'), + array(true), + 'user:friends_timeline_own:'.$this->id, + $offset, $limit, $since_id, $before_id, $since); + + return Notice::getStreamByIds($ids); + } + + function _friendsTimelineDirect($own, $offset, $limit, $since_id, $max_id, $since) + { + $qry = + 'SELECT notice.id AS id ' . + 'FROM notice JOIN notice_inbox ON notice.id = notice_inbox.notice_id ' . + 'WHERE notice_inbox.user_id = ' . $this->id . ' ' . + 'AND notice.repeat_of IS NULL '; + + if (!$own) { + // XXX: autoload notice inbox for constant + $inbox = new Notice_inbox(); + + $qry .= 'AND notice_inbox.source != ' . NOTICE_INBOX_SOURCE_GATEWAY . ' '; + } + + if ($since_id != 0) { + $qry .= 'AND notice.id > ' . $since_id . ' '; + } + + if ($max_id != 0) { + $qry .= 'AND notice.id <= ' . $max_id . ' '; + } + + if (!is_null($since)) { + $qry .= 'AND notice.modified > \'' . date('Y-m-d H:i:s', $since) . '\' '; + } + + // NOTE: we sort by fave time, not by notice time! + + $qry .= 'ORDER BY notice.id DESC '; + + if (!is_null($offset)) { + $qry .= "LIMIT $limit OFFSET $offset"; + } + + $ids = array(); + + $notice = new Notice(); + + $notice->query($qry); + + while ($notice->fetch()) { + $ids[] = $notice->id; + } + + $notice->free(); + $notice = NULL; + + return $ids; + } + function blowFavesCache() { $cache = common_memcache(); From d22364b35e33982b2f95146f9ac290a3606da28b Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 14 Dec 2009 17:11:34 -0500 Subject: [PATCH 147/172] had the order of and wrong in api output --- lib/api.php | 13 +++++-------- lib/noticelist.php | 6 ++++-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/lib/api.php b/lib/api.php index 833bc1c5fc..4ed49e4529 100644 --- a/lib/api.php +++ b/lib/api.php @@ -220,18 +220,15 @@ class ApiAction extends Action { $base = $this->twitterSimpleStatusArray($notice, $include_user); - if (empty($notice->repeat_of)) { - return $base; - } else { + if (!empty($notice->repeat_of)) { $original = Notice::staticGet('id', $notice->repeat_of); - if (empty($original)) { - return $base; - } else { + if (!empty($original)) { $original_array = $this->twitterSimpleStatusArray($original, $include_user); - $original_array['retweeted_status'] = $base; - return $original_array; + $base['retweeted_status'] = $original_array; } } + + return $base; } function twitterSimpleStatusArray($notice, $include_user=true) diff --git a/lib/noticelist.php b/lib/noticelist.php index 85e1befccf..3ccb502306 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -601,11 +601,13 @@ class NoticeListItem extends Widget { $user = common_current_user(); + $todel = (empty($this->repeat)) ? $this->notice : $this->repeat; + if (!empty($user) && - ($this->notice->profile_id == $user->id || $user->hasRight(Right::DELETEOTHERSNOTICE))) { + ($todel->profile_id == $user->id || $user->hasRight(Right::DELETEOTHERSNOTICE))) { $deleteurl = common_local_url('deletenotice', - array('notice' => $this->notice->id)); + array('notice' => $todel->id)); $this->out->element('a', array('href' => $deleteurl, 'class' => 'notice_delete', 'title' => _('Delete this notice')), _('Delete')); From 607e98ee11f01a72a6ea7d755ce0f2dee68ff74a Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 14 Dec 2009 17:48:14 -0500 Subject: [PATCH 148/172] make sure id of
  • in notice list is unique --- lib/noticelist.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/noticelist.php b/lib/noticelist.php index 3ccb502306..dd0a361c0c 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -243,8 +243,9 @@ class NoticeListItem extends Widget { // XXX: RDFa // TODO: add notice_type class e.g., notice_video, notice_image + $id = (empty($this->repeat)) ? $this->notice->id : $this->repeat->id; $this->out->elementStart('li', array('class' => 'hentry notice', - 'id' => 'notice-' . $this->notice->id)); + 'id' => 'notice-' . $id)); } /** From f8b187d5a4ac5eab1f025d61e30d5244cef6123d Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 14 Dec 2009 18:09:08 -0500 Subject: [PATCH 149/172] Initial representation for repeated notice --- actions/repeat.php | 4 +++- lib/noticelist.php | 4 +++- theme/base/css/display.css | 15 +++++++++------ theme/base/images/icons/icons-01.gif | Bin 3154 -> 3201 bytes .../images/icons/twotone/green/recycle-02.gif | Bin 0 -> 77 bytes theme/default/css/display.css | 6 +++++- theme/identica/css/display.css | 6 +++++- 7 files changed, 25 insertions(+), 10 deletions(-) create mode 100644 theme/base/images/icons/twotone/green/recycle-02.gif diff --git a/actions/repeat.php b/actions/repeat.php index a1c5f443fb..38d6efa6c6 100644 --- a/actions/repeat.php +++ b/actions/repeat.php @@ -112,7 +112,9 @@ class RepeatAction extends Action $this->element('title', null, _('Repeated')); $this->elementEnd('head'); $this->elementStart('body'); - $this->element('p', array('id' => 'repeat_response'), _('Repeated!')); + $this->element('p', array('id' => 'repeat_response', + 'class' => 'repeated'), + _('Repeated!')); $this->elementEnd('body'); $this->elementEnd('html'); } else { diff --git a/lib/noticelist.php b/lib/noticelist.php index dd0a361c0c..2165222eec 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -627,7 +627,9 @@ class NoticeListItem extends Widget if ($user && $user->id != $this->notice->profile_id) { $profile = $user->getProfile(); if ($profile->hasRepeated($this->notice->id)) { - $this->out->text(_('Repeated')); + $this->out->element('span', array('class' => 'repeated', + 'title' => _('Notice repeated')), + _('Repeated')); } else { $rf = new RepeatForm($this->out, $this->notice); $rf->show(); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 0173d2fbb2..2f46363915 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -964,7 +964,7 @@ float:left; font-size:0.95em; margin-left:59px; min-width:60%; -max-width:74%; +max-width:70%; } #showstream .notice div.entry-content, #shownotice .notice div.entry-content { @@ -996,7 +996,7 @@ left:0; .notice-options { position:relative; font-size:0.95em; -width:90px; +width:125px; float:right; } @@ -1007,16 +1007,18 @@ float:left; .notice-options .notice_reply, .notice-options .form_repeat, .notice-options .form_favor, -.notice-options .form_disfavor { +.notice-options .form_disfavor, +.notice-options .repeated { float:left; -margin-left:20%; +margin-left:14%; } .notice-options .form_favor, .notice-options .form_disfavor { margin-left:0; } .notice-options input, -.notice-options a { +.notice-options a, +.notice-options .repeated { text-indent:-9999px; outline:none; } @@ -1047,7 +1049,8 @@ display:none; border:0; padding:0; } -.notice-options a { +.notice-options a, +.notice-options .repeated { width:16px; height:16px; } diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif index 5909d7b19cdee858a479674064bff32745ebc122..417327881cca88cf17a416642ea8ad15d0589a0e 100644 GIT binary patch delta 1081 zcmV-91jhT)7=alKM@dFFIbj+AfClILkqr8i2?2_emH}h4`~d|4fBF9Z{{Q^{|NsC0 z|NsC0|NsC0|NkNR1OW;F{{Soi0000Q0DuMn2>t;7{UdcELxvNi1pb4z;sSvSE1)Ty zD3HjACUN3486o7~oCz;1X|lw^!5oSLLya(G=*}IMBZySc!|WHWU&ZuP0FfX8iG=@3 zG`VvnuS*xB|@klJ}@XCVZvm?(qA?)O9cQ3 z5CCWE5~wu92ZIYHG=`{Ass#CaYO!16mgo#kt38{G#4o3L#3*fJan8GN-|~2 zNGOO`$caQx5}cDm1W$ikY(YjEYrIhh9)G+cVGm0vp+po_kdX>3f*kV5C!=^`M}$ih zu|yPGobiY^O?zj`rGtF=#3o4B&2*w$8;Bw6;?A(8Ik2|hpgUu+PC=y{B z{&)z&$TRKeql+y1xRVVkpFDy`gl`CPDk;|?m- zRC5R(X+-!3mfTQ-O|t0RL(QC@s6j@Ailmt+Hs?(93^~z|!%ie*Y{9N7tLUN&D$Qhb zO)$bnaz+(Wu)BZCDypF3i7VuwGm08#d{M;`2`^}eCux2n2_vxhLh%<-e3^uVb|~_Q zB6!sCMjB*%vBi%k?`ZSQIOnYM&OG<*^UpvBE%eYt7j5*>NGBa36;ycPg&9!80S6s) zctN2UMmRAA7h|*`M;>`3;)o-QNJxbdY%H@2C0>Iqwj+O#Bx3b~UO3T+K6uNc%>E*8 z$DIcp5qdGj9@dnDPu{Pn4F^1y{nlT0??|=hLBAcjV z`74@FF}H$dv{4G)`n((B9#l{gb`vy2#4E_lpZ@B zw^(k(4_1FDA9ga^n6gRbv2<}bAv#pQARLLDg7-IhD5Fm}PH3agEH{X+ARWyIFHIYi z=p&C2#OQNO4e}F^7vR>3QfRIVpvc4z!hnb}%m4}!;v3_}fV=7G;086AK>+CnHK%m} z3s!)F2&tg75}NRYC`_RWSIEK^y6}ZCjG+u?2qKdW2P*-nvpEOe1OaE07z{Nu-#35+ zSbzq2Q39oX9+e?FbYsutSux^C4yao`g;2>gfz73W_;p?v(ts1FTzfS%0RaFzmX6b8 delta 1037 zcmV+o1oHcV8PXUGM@dFFIbj+AJ_hIikqr6+<$5@i1_6o#_L4M{kO5-@cfR4X^8p0` zfB*dY`Tqa@|NQ^|{~`GV0SW;B04x9i000^QJ_Y~?{s8~|J9Q#Mh7+d*{+qVq0)Y!F zrYW2#kjRK8a^y4_A><#O2`?~l!o

    9f|@+jX;D54<42yh*a3~OxP`9$o5nKkstwy zg#Su3!Gk3u7CcQ9V`BoRvSR2PqInwk(Xt*in{Ea$9a${J{ZVZ{;&FL(ziX@)|HBeMiUF&I&NnS_LQ zFcJwPdDsDm8fAdN#g8ZNX!FfD=dAP2JooJL&p-z)^w2~XZS>JdCmmrGRebTq8BoU& zM;LE#uiI6*}hWVkVh9(pVS2_%h3ScMU7IOB^YUV|+*B!7}DV)cSwIPr)-c-PZR z{v&V4tw$UYenABv*`Tve-m<{Gh#qd75#bqJd)>$~_4u<-GK;%GhT{vKL53yrj5Ew4 zowQ@QESgg>w}NN5fePOK$n#1irq}ZZ6;7-!U>tK4B1<*-SguMVl^5fL5o1Ichue^p z9(x_SSZ>4*SAQrUHZ$I&(n;mCcyYKPI#j=49E+%ew>Ww<;}1DbbmNaLH;Aub9nA+{ zjT@HuQ;!kH_@hh>@)OV(;PwerXwD0w*u)RSpa?U}016V~8{^1;yXooR1~r&L0ODtDv+Jn(%}uOrZ)_$if!7@P#mpp$umTB9jdVD*@=UIS1YZ0XUNw3^fG` H5fA`7_ISJi diff --git a/theme/base/images/icons/twotone/green/recycle-02.gif b/theme/base/images/icons/twotone/green/recycle-02.gif new file mode 100644 index 0000000000000000000000000000000000000000..060a8c72f001d4fe1561bfa8130f5a379a6b2c06 GIT binary patch literal 77 zcmZ?wbhEHb6krfwXkcWBpCa)8|9{1wEQ|~cj0`#qKmd|qU{dMnUwN91F{yduzSNhY eS5I=5b-t)&UzxbfGH+?h&h={NH9E{$8LR Date: Mon, 14 Dec 2009 18:09:30 -0500 Subject: [PATCH 150/172] default for login command is disabled --- lib/default.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/default.php b/lib/default.php index ebb6f8d016..42d4623b1e 100644 --- a/lib/default.php +++ b/lib/default.php @@ -229,4 +229,6 @@ $default = array('namespace' => 1), // 1 = geonames, 2 = Yahoo Where on Earth 'omb' => array('timeout' => 5), // HTTP request timeout in seconds when contacting remote hosts for OMB updates + 'logincommand' => + array('disabled' => true), ); From 1aae7f382ffb7d709417ecc560e37535d64e6a4d Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 14 Dec 2009 18:09:45 -0500 Subject: [PATCH 151/172] document logincommand/disabled in README --- README | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/README b/README index 51a8e91cc5..3e712af8c0 100644 --- a/README +++ b/README @@ -1407,6 +1407,21 @@ contentlimit: max length of the plain-text content of a message. Default is null, meaning to use the site-wide text limit. 0 means no limit. +logincommand +------------ + +Configuration options for the login command. + +disabled: whether to enable this command. If enabled, users who send + the text 'login' to the site through any channel will + receive a link to login to the site automatically in return. + Possibly useful for users who primarily use an XMPP or SMS + interface and can't be bothered to remember their site + password. Note that the security implications of this are + pretty serious and have not been thoroughly tested. You + should enable it only after you've convinced yourself that + it is safe. Default is 'false'. + Plugins ======= From b9040a7cc4d9f051f00e3b0d9010971262319d84 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 14 Dec 2009 16:36:01 -0800 Subject: [PATCH 152/172] Add destructor on Memcached_DataObject to free DB_DataObject's global storage for an object when that object itself is destroyed. Reduces some, but not all, memory leakage for long-running processes. --- classes/Memcached_DataObject.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php index 753fe954e0..8fdb56088b 100644 --- a/classes/Memcached_DataObject.php +++ b/classes/Memcached_DataObject.php @@ -23,6 +23,17 @@ require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; class Memcached_DataObject extends DB_DataObject { + /** + * Destructor to free global memory resources associated with + * this data object when it's unset or goes out of scope. + * DB_DataObject doesn't do this yet by itself. + */ + function __destruct() + { + $this->free(); + parent::__destruct(); + } + function &staticGet($cls, $k, $v=null) { if (is_null($v)) { From e99e66eff046a6457ea8dbd1668c2dd9b09dcf66 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 15 Dec 2009 06:11:37 -0500 Subject: [PATCH 153/172] give some trouble-shooting info for fancy URLs --- README | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/README b/README index 3e712af8c0..dc2e2b4ba4 100644 --- a/README +++ b/README @@ -358,7 +358,7 @@ It's possible to configure the software so it looks like this instead: These "fancy URLs" are more readable and memorable for users. To use fancy URLs, you must either have Apache 2.x with .htaccess enabled and -mod_redirect enabled, -OR- know how to configure "url redirection" in +mod_rewrite enabled, -OR- know how to configure "url redirection" in your server. 1. Copy the htaccess.sample file to .htaccess in your StatusNet @@ -384,6 +384,18 @@ like: If you changed your HTTP server configuration, you may need to restart the server first. +If it doesn't work, double-check that AllowOverride for the StatusNet +directory is 'All' in your Apache configuration file. This is usually +/etc/httpd.conf, /etc/apache/httpd.conf, or (on Debian and Ubuntu) +/etc/apache2/sites-available/default. See the Apache documentation for +.htaccess files for more details: + + http://httpd.apache.org/docs/2.2/howto/htaccess.html + +Also, check that mod_rewrite is installed and enabled: + + http://httpd.apache.org/docs/2.2/mod/mod_rewrite.html + Sphinx ------ From d40f0931aae912d5cb3be0b034c9302b265a2fa3 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 15 Dec 2009 10:12:36 -0500 Subject: [PATCH 154/172] remove dead code for handling direct messages, now done with commands --- scripts/xmppdaemon.php | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php index e52e2a6afe..20105b602e 100755 --- a/scripts/xmppdaemon.php +++ b/scripts/xmppdaemon.php @@ -195,17 +195,6 @@ class XMPPDaemon extends Daemon } else if ($this->is_otr($pl['body'])) { $this->log(LOG_INFO, 'Ignoring OTR from ' . $from); return; - } else if ($this->is_direct($pl['body'])) { - $this->log(LOG_INFO, 'Got a direct message ' . $from); - - preg_match_all('/d[\ ]*([a-z0-9]{1,64})/', $pl['body'], $to); - - $to = preg_replace('/^d([\ ])*/', '', $to[0][0]); - $body = preg_replace('/d[\ ]*('. $to .')[\ ]*/', '', $pl['body']); - - $this->log(LOG_INFO, 'Direct message from '. $user->nickname . ' to ' . $to); - - $this->add_direct($user, $body, $to, $from); } else { $this->log(LOG_INFO, 'Posting a notice from ' . $user->nickname); @@ -284,15 +273,6 @@ class XMPPDaemon extends Daemon } } - function is_direct($txt) - { - if (strtolower(substr($txt, 0, 2))=='d ') { - return true; - } else { - return false; - } - } - function from_site($address, $msg) { $text = '['.common_config('site', 'name') . '] ' . $msg; From 19bb9a04d171fe2a8d87a51c0267c5670cb0f5bf Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 15 Dec 2009 10:18:27 -0500 Subject: [PATCH 155/172] add mail notification for dm command results --- lib/command.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/command.php b/lib/command.php index 222bd76830..b30780bfb1 100644 --- a/lib/command.php +++ b/lib/command.php @@ -372,6 +372,7 @@ class MessageCommand extends Command } $message = Message::saveNew($this->user->id, $other->id, $this->text, $channel->source()); if ($message) { + mail_notify_message($message, $this->user, $other); $channel->output($this->user, sprintf(_('Direct message to %s sent'), $this->other)); } else { $channel->error($this->user, _('Error sending direct message.')); From 797a0d79fbf4e105ee4ccdce093c1595c1f08a4a Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 15 Dec 2009 10:31:25 -0500 Subject: [PATCH 156/172] create a method for notification for new messages, and use it --- actions/apidirectmessagenew.php | 2 +- actions/newmessage.php | 8 +------- classes/Message.php | 8 ++++++++ lib/command.php | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/actions/apidirectmessagenew.php b/actions/apidirectmessagenew.php index e6c39ce4ac..b9ac92d77b 100644 --- a/actions/apidirectmessagenew.php +++ b/actions/apidirectmessagenew.php @@ -175,7 +175,7 @@ class ApiDirectMessageNewAction extends ApiAuthAction return; } - mail_notify_message($message, $this->user, $this->other); + $message->notify(); if ($this->format == 'xml') { $this->showSingleXmlDirectMessage($message); diff --git a/actions/newmessage.php b/actions/newmessage.php index 0db2e7181c..3504520913 100644 --- a/actions/newmessage.php +++ b/actions/newmessage.php @@ -173,7 +173,7 @@ class NewmessageAction extends Action return; } - $this->notify($user, $this->other, $message); + $message->notify(); if ($this->boolean('ajax')) { $this->startHTML('text/xml;charset=utf-8'); @@ -247,12 +247,6 @@ class NewmessageAction extends Action } } - function notify($from, $to, $message) - { - mail_notify_message($message, $from, $to); - // XXX: Jabber, SMS notifications... probably queued - } - // Do nothing (override) function showNoticeForm() diff --git a/classes/Message.php b/classes/Message.php index 718a9d922a..16d0c60b30 100644 --- a/classes/Message.php +++ b/classes/Message.php @@ -89,4 +89,12 @@ class Message extends Memcached_DataObject $contentlimit = self::maxContent(); return ($contentlimit > 0 && !empty($content) && (mb_strlen($content) > $contentlimit)); } + + function notify() + { + $from = User::staticGet('id', $this->from_profile); + $to = User::staticGet('id', $this->to_profile); + + mail_notify_message($this, $from, $to); + } } diff --git a/lib/command.php b/lib/command.php index b30780bfb1..67140c3485 100644 --- a/lib/command.php +++ b/lib/command.php @@ -372,7 +372,7 @@ class MessageCommand extends Command } $message = Message::saveNew($this->user->id, $other->id, $this->text, $channel->source()); if ($message) { - mail_notify_message($message, $this->user, $other); + $message->notify(); $channel->output($this->user, sprintf(_('Direct message to %s sent'), $this->other)); } else { $channel->error($this->user, _('Error sending direct message.')); From 90c378a81f78215e3bf85cc64a2224dd07f12d8c Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 15 Dec 2009 12:29:37 -0500 Subject: [PATCH 157/172] broadcast for repeats --- actions/repeat.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/actions/repeat.php b/actions/repeat.php index 38d6efa6c6..b75523498b 100644 --- a/actions/repeat.php +++ b/actions/repeat.php @@ -106,6 +106,8 @@ class RepeatAction extends Action { $repeat = $this->notice->repeat($this->user->id, 'web'); + common_broadcast_notice($repeat); + if ($this->boolean('ajax')) { $this->startHTML('text/xml;charset=utf-8'); $this->elementStart('head'); From 945661d9426ef90a6ff6feaab3733c6b569dac7e Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 15 Dec 2009 12:33:17 -0500 Subject: [PATCH 158/172] take out DB_DataObject destructor --- classes/Memcached_DataObject.php | 1 - 1 file changed, 1 deletion(-) diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php index 8fdb56088b..360fb44243 100644 --- a/classes/Memcached_DataObject.php +++ b/classes/Memcached_DataObject.php @@ -31,7 +31,6 @@ class Memcached_DataObject extends DB_DataObject function __destruct() { $this->free(); - parent::__destruct(); } function &staticGet($cls, $k, $v=null) From 22f02b35ad58030a093563a7df683962b4d165c5 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 15 Dec 2009 12:38:15 -0500 Subject: [PATCH 159/172] call DB_DataObject::__destruct() if it exists --- classes/Memcached_DataObject.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php index 360fb44243..70e9e351d5 100644 --- a/classes/Memcached_DataObject.php +++ b/classes/Memcached_DataObject.php @@ -28,9 +28,13 @@ class Memcached_DataObject extends DB_DataObject * this data object when it's unset or goes out of scope. * DB_DataObject doesn't do this yet by itself. */ + function __destruct() { $this->free(); + if (method_exists('DB_DataObject', '__destruct')) { + parent::__destruct(); + } } function &staticGet($cls, $k, $v=null) From 80b5a7fe600e9e30021f33e58cde7906e79663eb Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 15 Dec 2009 19:44:20 +0000 Subject: [PATCH 160/172] Added .form_repeat notice option to received notices in Realtime plugin --- plugins/Realtime/RealtimePlugin.php | 3 ++- plugins/Realtime/realtimeupdate.js | 25 +++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php index 3e33fdaf19..d57438de2c 100644 --- a/plugins/Realtime/RealtimePlugin.php +++ b/plugins/Realtime/RealtimePlugin.php @@ -59,6 +59,7 @@ class RealtimePlugin extends Plugin { $this->replyurl = common_local_url('newnotice'); $this->favorurl = common_local_url('favor'); + $this->repeaturl = common_local_url('repeat'); // FIXME: need to find a better way to pass this pattern in $this->deleteurl = common_local_url('deletenotice', array('notice' => '0000000000')); @@ -297,7 +298,7 @@ class RealtimePlugin extends Plugin function _updateInitialize($timeline, $user_id) { - return "RealtimeUpdate.init($user_id, \"$this->replyurl\", \"$this->favorurl\", \"$this->deleteurl\"); "; + return "RealtimeUpdate.init($user_id, \"$this->replyurl\", \"$this->favorurl\", \"$this->repeaturl\", \"$this->deleteurl\"); "; } function _connect() diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js index 56a52433f4..2844aa5804 100644 --- a/plugins/Realtime/realtimeupdate.js +++ b/plugins/Realtime/realtimeupdate.js @@ -32,6 +32,7 @@ RealtimeUpdate = { _userid: 0, _replyurl: '', _favorurl: '', + _repeaturl: '', _deleteurl: '', _updatecounter: 0, _maxnotices: 50, @@ -40,11 +41,12 @@ RealtimeUpdate = { _paused:false, _queuedNotices:[], - init: function(userid, replyurl, favorurl, deleteurl) + init: function(userid, replyurl, favorurl, repeaturl, deleteurl) { RealtimeUpdate._userid = userid; RealtimeUpdate._replyurl = replyurl; RealtimeUpdate._favorurl = favorurl; + RealtimeUpdate._repeaturl = repeaturl; RealtimeUpdate._deleteurl = deleteurl; RealtimeUpdate._documenttitle = document.title; @@ -95,6 +97,7 @@ RealtimeUpdate = { SN.U.FormXHR($('#'+noticeItemID+' .form_favor')); SN.U.NoticeReplyTo($('#'+noticeItemID)); + SN.U.FormXHR($('#'+noticeItemID+' .form_repeat')); SN.U.NoticeWithAttachment($('#'+noticeItemID)); }, @@ -150,6 +153,9 @@ RealtimeUpdate = { if (RealtimeUpdate._userid == data['user']['id']) { ni = ni+RealtimeUpdate.makeDeleteLink(data['id']); } + else { + ni = ni+RealtimeUpdate.makeRepeatForm(data['id'], session_key); + } } ni = ni+"

    • "+ @@ -177,7 +183,22 @@ RealtimeUpdate = { var rl; rl = "Reply "+id+""; return rl; - }, + }, + + makeRepeatForm: function(id, session_key) + { + var rf; + rf = "
    "+ + "
    "+ + "Favor this notice"+ + ""+ + ""+ + ""+ + "
    "+ + "
    "; + + return rf; + }, makeDeleteLink: function(id) { From d6873beb9b2f17d62b90933e5974117a2fd713f1 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 15 Dec 2009 15:47:37 -0500 Subject: [PATCH 161/172] make realtime plugin grok repeats --- plugins/Realtime/RealtimePlugin.php | 18 +++++++++++++++ plugins/Realtime/realtimeupdate.js | 35 ++++++++++++++++++++++++----- 2 files changed, 47 insertions(+), 6 deletions(-) diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php index d57438de2c..a810b71653 100644 --- a/plugins/Realtime/RealtimePlugin.php +++ b/plugins/Realtime/RealtimePlugin.php @@ -267,6 +267,24 @@ class RealtimePlugin extends Plugin $profile = $notice->getProfile(); $arr['user']['profile_url'] = $profile->profileurl; + // Add needed repeat data + + if (!empty($notice->repeat_of)) { + $original = Notice::staticGet('id', $notice->repeat_of); + if (!empty($original)) { + $arr['retweeted_status']['url'] = $original->bestUrl(); + $arr['retweeted_status']['html'] = htmlspecialchars($original->rendered); + $arr['retweeted_status']['source'] = htmlspecialchars($original->source); + $originalProfile = $original->getProfile(); + $arr['retweeted_status']['user']['profile_url'] = $originalProfile->profileurl; + if (!empty($original->reply_to)) { + $originalReply = Notice::staticGet('id', $original->reply_to); + $arr['retweeted_status']['in_reply_to_status_url'] = $originalReply->bestUrl(); + } + } + $original = null; + } + return $arr; } diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js index 2844aa5804..18f00f22a9 100644 --- a/plugins/Realtime/realtimeupdate.js +++ b/plugins/Realtime/realtimeupdate.js @@ -116,11 +116,24 @@ RealtimeUpdate = { makeNoticeItem: function(data) { + if (data.hasOwnProperty('retweeted_status')) { + original = data['retweeted_status']; + repeat = data; + data = original; + unique = repeat['id']; + responsible = repeat['user']; + } else { + original = null; + repeat = null; + unique = data['id']; + responsible = data['user']; + } + user = data['user']; html = data['html'].replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>').replace(/"/g,'"'); source = data['source'].replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>').replace(/"/g,'"'); - ni = "
  • "+ + ni = "
  • "+ "
    "+ ""+ ""+ @@ -142,15 +155,24 @@ RealtimeUpdate = { ni = ni+" in context"; } - ni = ni+"
    "+ - "
    "; + if (repeat) { + ru = repeat['user']; + ni = ni + "Repeated by " + + "" + + "\""" + + ""+ ru['screen_name'] + ""; + } + + ni = ni+"
    "; + + ni = ni + "
    "; if (RealtimeUpdate._userid != 0) { var input = $("form#form_notice fieldset input#token"); var session_key = input.val(); ni = ni+RealtimeUpdate.makeFavoriteForm(data['id'], session_key); ni = ni+RealtimeUpdate.makeReplyLink(data['id'], data['user']['screen_name']); - if (RealtimeUpdate._userid == data['user']['id']) { + if (RealtimeUpdate._userid == responsible['id']) { ni = ni+RealtimeUpdate.makeDeleteLink(data['id']); } else { @@ -158,7 +180,8 @@ RealtimeUpdate = { } } - ni = ni+"
    "+ + ni = ni+"
    • "; + ""; return ni; }, @@ -330,7 +353,7 @@ RealtimeUpdate = { { $('.notices .entry-title a, .notices .entry-content a').bind('click', function() { window.open(this.href, ''); - + return false; }); From 608d1b206a01e1bd97e286a1003030ce89370913 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 15 Dec 2009 16:08:44 -0500 Subject: [PATCH 162/172] Don't show repeater avatar in notice lists --- lib/noticelist.php | 11 ----------- plugins/Realtime/realtimeupdate.js | 1 - 2 files changed, 12 deletions(-) diff --git a/lib/noticelist.php b/lib/noticelist.php index 2165222eec..4c11ceed6c 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -551,17 +551,6 @@ class NoticeListItem extends Widget $this->out->elementStart('a', $attrs); - $this->out->element('img', array('src' => ($avatar) ? - $avatar->displayUrl() : - Avatar::defaultImage(AVATAR_MINI_SIZE), - 'class' => 'avatar photo', - 'width' => AVATAR_MINI_SIZE, - 'height' => AVATAR_MINI_SIZE, - 'alt' => - ($repeater->fullname) ? - $repeater->fullname : - $repeater->nickname)); - $this->out->element('span', 'nickname', $repeater->nickname); $this->out->elementEnd('a'); diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js index 18f00f22a9..b57451e205 100644 --- a/plugins/Realtime/realtimeupdate.js +++ b/plugins/Realtime/realtimeupdate.js @@ -159,7 +159,6 @@ RealtimeUpdate = { ru = repeat['user']; ni = ni + "Repeated by " + "" + - "\""" + ""+ ru['screen_name'] + ""; } From f3d27cc3ae92e2b7412dd998d7de7a2b58dc8e6a Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 15 Dec 2009 16:19:11 -0500 Subject: [PATCH 163/172] can't repeat your own notice posted through realtime --- plugins/Realtime/realtimeupdate.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js index b57451e205..281d3d82de 100644 --- a/plugins/Realtime/realtimeupdate.js +++ b/plugins/Realtime/realtimeupdate.js @@ -173,8 +173,7 @@ RealtimeUpdate = { ni = ni+RealtimeUpdate.makeReplyLink(data['id'], data['user']['screen_name']); if (RealtimeUpdate._userid == responsible['id']) { ni = ni+RealtimeUpdate.makeDeleteLink(data['id']); - } - else { + } else if (RealtimeUpdate._userid != user['id']) { ni = ni+RealtimeUpdate.makeRepeatForm(data['id'], session_key); } } From e2e184363962b10ddbcd6f04d28f83d92ba67b7c Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 11 Dec 2009 13:53:09 -0800 Subject: [PATCH 164/172] slight cleanup for a bit in Notice.php where a var was reused for different types, confusing tracking down a bug --- classes/Notice.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/classes/Notice.php b/classes/Notice.php index 4aec4ed55c..01ed4e7f41 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -966,6 +966,9 @@ class Notice extends Memcached_DataObject return true; } + /** + * @return array of integer profile IDs + */ function saveReplies() { // Alternative reply format @@ -1044,8 +1047,8 @@ class Notice extends Memcached_DataObject $recipientIds = array_keys($replied); - foreach ($recipientIds as $recipient) { - $user = User::staticGet('id', $recipient); + foreach ($recipientIds as $recipientId) { + $user = User::staticGet('id', $recipientId); if ($user) { mail_notify_attn($user, $this); } From 00fb5feff8f2552f63f1ddc7b1bef25ebd408507 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 15 Dec 2009 13:05:05 -0800 Subject: [PATCH 165/172] Cleanup undefined variable notice: set a couple more null defaults for new params in Notice::saveNew(). Fixes this notice seen while using AJAX repeat button: Notice: Undefined variable: uri in classes/Notice.php on line 243 --- classes/Notice.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/classes/Notice.php b/classes/Notice.php index 01ed4e7f41..2205279e8f 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -176,12 +176,13 @@ class Notice extends Memcached_DataObject } static function saveNew($profile_id, $content, $source, $options=null) { + $defaults = array('uri' => null, + 'reply_to' => null, + 'repeat_of' => null); if (!empty($options)) { + $options = $options + $defaults; extract($options); - if (!isset($reply_to)) { - $reply_to = NULL; - } } if (empty($is_local)) { From 0158f4f73db1c6090c09da8cc3cdcfb97af3883b Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 15 Dec 2009 13:53:19 -0800 Subject: [PATCH 166/172] PHP 5.3 closure-based implementation of curry(); old implementation used as fallback for older PHP versions. Added unit tests to confirm they both work! --- lib/curry.php | 36 +++++++++++++++++++++++ lib/util.php | 30 +++++++++++-------- tests/CurryTest.php | 72 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 125 insertions(+), 13 deletions(-) create mode 100644 lib/curry.php create mode 100644 tests/CurryTest.php diff --git a/lib/curry.php b/lib/curry.php new file mode 100644 index 0000000000..6136dcdc37 --- /dev/null +++ b/lib/curry.php @@ -0,0 +1,36 @@ +. + */ + +/** + * PHP 5.3 implementation of function currying, using native closures. + * On 5.2 and lower we use the fallback implementation in util.php + * + * @param callback $fn + * @param ... any remaining arguments will be appended to call-time params + * @return callback + */ +function curry($fn) { + $extra_args = func_get_args(); + array_shift($extra_args); + return function() use ($fn, $extra_args) { + $args = func_get_args(); + return call_user_func_array($fn, + array_merge($args, $extra_args)); + }; +} diff --git a/lib/util.php b/lib/util.php index 14d6665037..d4afafb4c0 100644 --- a/lib/util.php +++ b/lib/util.php @@ -523,19 +523,23 @@ function callback_helper($matches, $callback, $notice_id) { return substr($matches[0],0,$left) . $result . substr($matches[0],$right); } -function curry($fn) { - //TODO switch to a PHP 5.3 function closure based approach if PHP 5.3 is used - $args = func_get_args(); - array_shift($args); - $id = uniqid('_partial'); - $GLOBALS[$id] = array($fn, $args); - return create_function('', - '$args = func_get_args(); '. - 'return call_user_func_array('. - '$GLOBALS["'.$id.'"][0],'. - 'array_merge('. - '$args,'. - '$GLOBALS["'.$id.'"][1]));'); +if (version_compare(PHP_VERSION, '5.3.0', 'ge')) { + // lambda implementation in a separate file; PHP 5.2 won't parse it. + require_once INSTALLDIR . "/lib/curry.php"; +} else { + function curry($fn) { + $args = func_get_args(); + array_shift($args); + $id = uniqid('_partial'); + $GLOBALS[$id] = array($fn, $args); + return create_function('', + '$args = func_get_args(); '. + 'return call_user_func_array('. + '$GLOBALS["'.$id.'"][0],'. + 'array_merge('. + '$args,'. + '$GLOBALS["'.$id.'"][1]));'); + } } function common_linkify($url) { diff --git a/tests/CurryTest.php b/tests/CurryTest.php new file mode 100644 index 0000000000..37b66cc749 --- /dev/null +++ b/tests/CurryTest.php @@ -0,0 +1,72 @@ +assertEquals($expected, $result); + } + + static public function provider() + { + $obj = new CurryTestHelperObj('oldval'); + return array(array(array('CurryTest', 'callback'), + array('curried'), + array('called'), + 'called|curried'), + array(array('CurryTest', 'callback'), + array('curried1', 'curried2'), + array('called1', 'called2'), + 'called1|called2|curried1|curried2'), + array(array('CurryTest', 'callbackObj'), + array($obj), + array('newval1'), + 'oldval|newval1'), + // Confirm object identity is retained... + array(array('CurryTest', 'callbackObj'), + array($obj), + array('newval2'), + 'newval1|newval2')); + } + + static function callback() + { + $args = func_get_args(); + return implode("|", $args); + } + + static function callbackObj($val, $obj) + { + $old = $obj->val; + $obj->val = $val; + return "$old|$val"; + } +} + +class CurryTestHelperObj +{ + public $val=''; + + function __construct($val) + { + $this->val = $val; + } +} From a998bda4a57014d0a319fd0bc31552705f0887ed Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 15 Dec 2009 14:49:53 -0800 Subject: [PATCH 167/172] Fix UserRightsTest unit tests --- classes/User.php | 2 +- tests/UserRightsTest.php | 23 ++++++++++++++++++----- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/classes/User.php b/classes/User.php index d04f7d679f..c62314d500 100644 --- a/classes/User.php +++ b/classes/User.php @@ -329,7 +329,7 @@ class User extends Memcached_DataObject $profile->query('COMMIT'); - if ($email && !$user->email) { + if (!empty($email) && !$user->email) { mail_confirm_address($user, $confirm->code, $profile->nickname, $email); } diff --git a/tests/UserRightsTest.php b/tests/UserRightsTest.php index 6544ee53d7..d24a172f6f 100644 --- a/tests/UserRightsTest.php +++ b/tests/UserRightsTest.php @@ -16,14 +16,26 @@ class UserRightsTest extends PHPUnit_Framework_TestCase function setUp() { + $user = User::staticGet('nickname', 'userrightstestuser'); + if ($user) { + // Leftover from a broken test run? + $profile = $user->getProfile(); + $user->delete(); + $profile->delete(); + } $this->user = User::register(array('nickname' => 'userrightstestuser')); + if (!$this->user) { + throw new Exception("Couldn't register userrightstestuser"); + } } function tearDown() { - $profile = $this->user->getProfile(); - $this->user->delete(); - $profile->delete(); + if ($this->user) { + $profile = $this->user->getProfile(); + $this->user->delete(); + $profile->delete(); + } } function testInvalidRole() @@ -33,7 +45,8 @@ class UserRightsTest extends PHPUnit_Framework_TestCase function standardRoles() { - return array('admin', 'moderator'); + return array(array('admin'), + array('moderator')); } /** @@ -54,6 +67,6 @@ class UserRightsTest extends PHPUnit_Framework_TestCase function testGrantedRole($role) { $this->user->grantRole($role); - $this->assertFalse($this->user->hasRole($role)); + $this->assertTrue($this->user->hasRole($role)); } } \ No newline at end of file From 0ca80f78fbb07ebaaa1509c65021eb5f26cf5c99 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 15 Dec 2009 18:27:03 -0500 Subject: [PATCH 168/172] Add doc comments listing the array parameters for User::register() and Notice::saveNew() --- classes/Notice.php | 29 +++++++++++++++++++++++++++++ classes/User.php | 21 +++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/classes/Notice.php b/classes/Notice.php index 2205279e8f..7651d8bd50 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -175,6 +175,35 @@ class Notice extends Memcached_DataObject } } + /** + * Save a new notice and push it out to subscribers' inboxes. + * Poster's permissions are checked before sending. + * + * @param int $profile_id Profile ID of the poster + * @param string $content source message text; links may be shortened + * per current user's preference + * @param string $source source key ('web', 'api', etc) + * @param array $options Associative array of optional properties: + * string 'created' timestamp of notice; defaults to now + * int 'is_local' source/gateway ID, one of: + * Notice::LOCAL_PUBLIC - Local, ok to appear in public timeline + * Notice::REMOTE_OMB - Sent from a remote OMB service; + * hide from public timeline but show in + * local "and friends" timelines + * Notice::LOCAL_NONPUBLIC - Local, but hide from public timeline + * Notice::GATEWAY - From another non-OMB service; + * will not appear in public views + * float 'lat' decimal latitude for geolocation + * float 'lon' decimal longitude for geolocation + * int 'location_id' geoname identifier + * int 'location_ns' geoname namespace to interpret location_id + * int 'reply_to'; notice ID this is a reply to + * int 'repeat_of'; notice ID this is a repeat of + * string 'uri' permalink to notice; defaults to local notice URL + * + * @return Notice + * @throws ClientException + */ static function saveNew($profile_id, $content, $source, $options=null) { $defaults = array('uri' => null, 'reply_to' => null, diff --git a/classes/User.php b/classes/User.php index c62314d500..ae709b46b6 100644 --- a/classes/User.php +++ b/classes/User.php @@ -180,6 +180,27 @@ class User extends Memcached_DataObject return $result; } + /** + * Register a new user account and profile and set up default subscriptions. + * If a new-user welcome message is configured, this will be sent. + * + * @param array $fields associative array of optional properties + * string 'bio' + * string 'email' + * bool 'email_confirmed' pass true to mark email as pre-confirmed + * string 'fullname' + * string 'homepage' + * string 'location' informal string description of geolocation + * float 'lat' decimal latitude for geolocation + * float 'lon' decimal longitude for geolocation + * int 'location_id' geoname identifier + * int 'location_ns' geoname namespace to interpret location_id + * string 'nickname' REQUIRED + * string 'password' (may be missing for eg OpenID registrations) + * string 'code' invite code + * ?string 'uri' permalink to notice; defaults to local notice URL + * @return mixed User object or false on failure + */ static function register($fields) { // MAGICALLY put fields into current scope From dc4bedd25aa75e5f4b5f5a7f7a5d93cd19dcd756 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 15 Dec 2009 18:55:18 -0500 Subject: [PATCH 169/172] Add some doc comments and fixmes in util.php --- lib/util.php | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/lib/util.php b/lib/util.php index d4afafb4c0..af4885f40f 100644 --- a/lib/util.php +++ b/lib/util.php @@ -1244,8 +1244,12 @@ function common_copy_args($from) return $to; } -// Neutralise the evil effects of magic_quotes_gpc in the current request. -// This is used before handing a request off to OAuthRequest::from_request. +/** + * Neutralise the evil effects of magic_quotes_gpc in the current request. + * This is used before handing a request off to OAuthRequest::from_request. + * @fixme Doesn't consider vars other than _POST and _GET? + * @fixme Can't be undone and could corrupt data if run twice. + */ function common_remove_magic_from_request() { if(get_magic_quotes_gpc()) { @@ -1447,6 +1451,17 @@ function common_database_tablename($tablename) return $tablename; } +/** + * Shorten a URL with the current user's configured shortening service, + * or ur1.ca if configured, or not at all if no shortening is set up. + * Length is not considered. + * + * @param string $long_url + * @return string may return the original URL if shortening failed + * + * @fixme provide a way to specify a particular shortener + * @fixme provide a way to specify to use a given user's shortening preferences + */ function common_shorten_url($long_url) { $user = common_current_user(); @@ -1467,6 +1482,16 @@ function common_shorten_url($long_url) } } +/** + * @return mixed array($proxy, $ip) for web requests; proxy may be null + * null if not a web request + * + * @fixme X-Forwarded-For can be chained by multiple proxies; + we should parse the list and provide a cleaner array + * @fixme X-Forwarded-For can be forged by clients; only use them if trusted + * @fixme X_Forwarded_For headers will override X-Forwarded-For read through $_SERVER; + * use function to get exact request headers from Apache if possible. + */ function common_client_ip() { if (!isset($_SERVER) || !array_key_exists('REQUEST_METHOD', $_SERVER)) { From 7ee875b10ffbf9fae0934426d6abda2be48d01c7 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Wed, 16 Dec 2009 23:57:10 +0100 Subject: [PATCH 170/172] Localisation updates for !StatusNet from !translatewiki.net !sntrans --- locale/ar/LC_MESSAGES/statusnet.po | 180 +-- locale/arz/LC_MESSAGES/statusnet.po | 180 +-- locale/bg/LC_MESSAGES/statusnet.po | 180 +-- locale/ca/LC_MESSAGES/statusnet.po | 180 +-- locale/cs/LC_MESSAGES/statusnet.po | 180 +-- locale/de/LC_MESSAGES/statusnet.po | 180 +-- locale/el/LC_MESSAGES/statusnet.po | 316 ++--- locale/en_GB/LC_MESSAGES/statusnet.po | 180 +-- locale/es/LC_MESSAGES/statusnet.po | 180 +-- locale/fi/LC_MESSAGES/statusnet.po | 180 +-- locale/fr/LC_MESSAGES/statusnet.po | 278 ++-- locale/ga/LC_MESSAGES/statusnet.po | 180 +-- locale/he/LC_MESSAGES/statusnet.po | 180 +-- locale/hsb/LC_MESSAGES/statusnet.po | 234 ++- locale/ia/LC_MESSAGES/statusnet.po | 573 ++++---- locale/is/LC_MESSAGES/statusnet.po | 180 +-- locale/it/LC_MESSAGES/statusnet.po | 1875 +++++++++++++------------ locale/ja/LC_MESSAGES/statusnet.po | 180 +-- locale/ko/LC_MESSAGES/statusnet.po | 180 +-- locale/mk/LC_MESSAGES/statusnet.po | 254 ++-- locale/nb/LC_MESSAGES/statusnet.po | 180 +-- locale/nl/LC_MESSAGES/statusnet.po | 212 ++- locale/nn/LC_MESSAGES/statusnet.po | 180 +-- locale/pl/LC_MESSAGES/statusnet.po | 180 +-- locale/pt/LC_MESSAGES/statusnet.po | 213 ++- locale/pt_BR/LC_MESSAGES/statusnet.po | 180 +-- locale/ru/LC_MESSAGES/statusnet.po | 180 +-- locale/statusnet.po | 187 +-- locale/sv/LC_MESSAGES/statusnet.po | 180 +-- locale/te/LC_MESSAGES/statusnet.po | 246 ++-- locale/tr/LC_MESSAGES/statusnet.po | 180 +-- locale/uk/LC_MESSAGES/statusnet.po | 270 ++-- locale/vi/LC_MESSAGES/statusnet.po | 180 +-- locale/zh_CN/LC_MESSAGES/statusnet.po | 180 +-- locale/zh_TW/LC_MESSAGES/statusnet.po | 192 +-- 35 files changed, 4627 insertions(+), 4363 deletions(-) diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index 5da69b9b71..5d0b78cc13 100644 --- a/locale/ar/LC_MESSAGES/statusnet.po +++ b/locale/ar/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:34:16+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:51:43+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ar\n" "X-Message-Group: out-statusnet\n" @@ -36,17 +36,18 @@ msgstr "لا صفحة كهذه" #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "لا مستخدم كهذا." @@ -56,7 +57,8 @@ msgid "%s and friends, page %d" msgstr "" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s والأصدقاء" @@ -108,6 +110,7 @@ msgid "You and friends" msgstr "أنت والأصدقاء" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" @@ -226,8 +229,8 @@ msgstr "" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -583,7 +586,7 @@ msgid "Preview" msgstr "عاين" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 msgid "Delete" msgstr "احذف" @@ -803,7 +806,7 @@ msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟" msgid "Do not delete this notice" msgstr "لا تحذف هذا الإشعار" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 msgid "Delete this notice" msgstr "احذف هذا الإشعار" @@ -1860,7 +1863,7 @@ msgid "You can't send a message to this user." msgstr "" #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "لا محتوى!" @@ -1877,7 +1880,7 @@ msgstr "" msgid "Message sent" msgstr "أُرسلت الرسالة" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "" @@ -1964,8 +1967,8 @@ msgstr "نوع المحتوى " msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "ليس نسق بيانات مدعوم." @@ -2735,12 +2738,12 @@ msgstr "لا يمكنك إسكات المستخدمين على هذا الموق msgid "You already repeated that notice." msgstr "لقد منعت مسبقا هذا المستخدم." -#: actions/repeat.php:112 lib/noticelist.php:627 +#: actions/repeat.php:114 lib/noticelist.php:621 #, fuzzy msgid "Repeated" msgstr "أنشئ" -#: actions/repeat.php:115 +#: actions/repeat.php:119 #, fuzzy msgid "Repeated!" msgstr "أنشئ" @@ -3832,44 +3835,44 @@ msgstr "" msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:196 +#: classes/Notice.php:226 msgid "Problem saving notice. Too long." msgstr "مشكلة في حفظ الإشعار. طويل جدًا." -#: classes/Notice.php:200 +#: classes/Notice.php:230 msgid "Problem saving notice. Unknown user." msgstr "مشكلة في حفظ الإشعار. مستخدم غير معروف." -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:211 +#: classes/Notice.php:241 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "مشكلة أثناء حفظ الإشعار." -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1320 +#: classes/Notice.php:1371 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:347 +#: classes/User.php:368 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "أهلا بكم في %1$s يا @%2$s!" @@ -4182,12 +4185,12 @@ msgstr "" "المشتركون: %2$s\n" "الإشعارات: %3$s" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "ليس للمستخدم إشعار أخير" @@ -4220,105 +4223,105 @@ msgstr "الصفحة الرئيسية: %s" msgid "About: %s" msgstr "عن: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "" -#: lib/command.php:421 +#: lib/command.php:422 msgid "Cannot repeat your own notice" msgstr "" -#: lib/command.php:426 +#: lib/command.php:427 #, fuzzy msgid "Already repeated that notice" msgstr "احذف هذا الإشعار" -#: lib/command.php:434 +#: lib/command.php:435 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "أُرسل الإشعار" -#: lib/command.php:436 +#: lib/command.php:437 #, fuzzy msgid "Error repeating notice." msgstr "خطأ أثناء حفظ الإشعار." -#: lib/command.php:490 +#: lib/command.php:491 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:499 +#: lib/command.php:500 #, php-format msgid "Reply to %s sent" msgstr "رُد على رسالة %s" -#: lib/command.php:501 +#: lib/command.php:502 msgid "Error saving notice." msgstr "خطأ أثناء حفظ الإشعار." -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "مُشترك ب%s" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "" -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "" -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "" -#: lib/command.php:663 +#: lib/command.php:664 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "تعذّر إنشاء الكنى." -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:684 +#: lib/command.php:685 msgid "You are not subscribed to anyone." msgstr "لست مُشتركًا بأي أحد." -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "لست مشتركًا بأحد." @@ -4328,11 +4331,11 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:706 +#: lib/command.php:707 msgid "No one is subscribed to you." msgstr "لا أحد مشترك بك." -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "لا أحد مشترك بك." @@ -4342,11 +4345,11 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:728 +#: lib/command.php:729 msgid "You are not a member of any groups." msgstr "لست عضوًا في أي مجموعة." -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "لست عضوًا في أي مجموعة." @@ -4356,7 +4359,7 @@ msgstr[3] "أنت عضو في هذه المجموعات:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:744 +#: lib/command.php:745 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4818,7 +4821,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 msgid "from" msgstr "من" @@ -4903,48 +4906,53 @@ msgstr "أرفق" msgid "Attach a file" msgstr "أرفق ملفًا" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "N" msgstr "ش" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "ج" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "ر" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "غ" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "في" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 msgid "in context" msgstr "في السياق" -#: lib/noticelist.php:549 +#: lib/noticelist.php:548 #, fuzzy msgid "Repeated by" msgstr "أنشئ" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 msgid "Reply to this notice" msgstr "رُد على هذا الإشعار" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 msgid "Reply" msgstr "رُد" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "حُذف الإشعار." + #: lib/nudgeform.php:116 msgid "Nudge this user" msgstr "نبّه هذا المستخدم" @@ -5254,47 +5262,47 @@ msgstr "رسالة" msgid "Moderate" msgstr "" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "قبل لحظات قليلة" -#: lib/util.php:827 +#: lib/util.php:831 msgid "about a minute ago" msgstr "قبل دقيقة تقريبًا" -#: lib/util.php:829 +#: lib/util.php:833 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:831 +#: lib/util.php:835 msgid "about an hour ago" msgstr "قبل ساعة تقريبًا" -#: lib/util.php:833 +#: lib/util.php:837 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:835 +#: lib/util.php:839 msgid "about a day ago" msgstr "قبل يوم تقريبا" -#: lib/util.php:837 +#: lib/util.php:841 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:839 +#: lib/util.php:843 msgid "about a month ago" msgstr "قبل شهر تقريبًا" -#: lib/util.php:841 +#: lib/util.php:845 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:843 +#: lib/util.php:847 msgid "about a year ago" msgstr "قبل سنة تقريبًا" diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po index 2b3aa0e80a..e37883215f 100644 --- a/locale/arz/LC_MESSAGES/statusnet.po +++ b/locale/arz/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:34:19+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:51:46+0000\n" "Language-Team: Egyptian Spoken Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: arz\n" "X-Message-Group: out-statusnet\n" @@ -36,17 +36,18 @@ msgstr "لا صفحه كهذه" #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "لا مستخدم كهذا." @@ -56,7 +57,8 @@ msgid "%s and friends, page %d" msgstr "" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s والأصدقاء" @@ -108,6 +110,7 @@ msgid "You and friends" msgstr "أنت والأصدقاء" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" @@ -227,8 +230,8 @@ msgstr "" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -584,7 +587,7 @@ msgid "Preview" msgstr "عاين" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 msgid "Delete" msgstr "احذف" @@ -804,7 +807,7 @@ msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟" msgid "Do not delete this notice" msgstr "لا تحذف هذا الإشعار" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 msgid "Delete this notice" msgstr "احذف هذا الإشعار" @@ -1861,7 +1864,7 @@ msgid "You can't send a message to this user." msgstr "" #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "لا محتوى!" @@ -1878,7 +1881,7 @@ msgstr "" msgid "Message sent" msgstr "أُرسلت الرسالة" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "" @@ -1965,8 +1968,8 @@ msgstr "نوع المحتوى " msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "ليس نسق بيانات مدعوم." @@ -2736,12 +2739,12 @@ msgstr "لا يمكنك إسكات المستخدمين على هذا الموق msgid "You already repeated that notice." msgstr "لقد منعت مسبقا هذا المستخدم." -#: actions/repeat.php:112 lib/noticelist.php:627 +#: actions/repeat.php:114 lib/noticelist.php:621 #, fuzzy msgid "Repeated" msgstr "أنشئ" -#: actions/repeat.php:115 +#: actions/repeat.php:119 #, fuzzy msgid "Repeated!" msgstr "أنشئ" @@ -3833,44 +3836,44 @@ msgstr "" msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:196 +#: classes/Notice.php:226 msgid "Problem saving notice. Too long." msgstr "مشكله فى حفظ الإشعار. طويل جدًا." -#: classes/Notice.php:200 +#: classes/Notice.php:230 msgid "Problem saving notice. Unknown user." msgstr "مشكله فى حفظ الإشعار. مستخدم غير معروف." -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:211 +#: classes/Notice.php:241 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "مشكله أثناء حفظ الإشعار." -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1320 +#: classes/Notice.php:1371 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:347 +#: classes/User.php:368 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "أهلا بكم فى %1$s يا @%2$s!" @@ -4183,12 +4186,12 @@ msgstr "" "المشتركون: %2$s\n" "الإشعارات: %3$s" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "ليس للمستخدم إشعار أخير" @@ -4221,105 +4224,105 @@ msgstr "الصفحه الرئيسية: %s" msgid "About: %s" msgstr "عن: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "" -#: lib/command.php:421 +#: lib/command.php:422 msgid "Cannot repeat your own notice" msgstr "" -#: lib/command.php:426 +#: lib/command.php:427 #, fuzzy msgid "Already repeated that notice" msgstr "احذف هذا الإشعار" -#: lib/command.php:434 +#: lib/command.php:435 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "أُرسل الإشعار" -#: lib/command.php:436 +#: lib/command.php:437 #, fuzzy msgid "Error repeating notice." msgstr "خطأ أثناء حفظ الإشعار." -#: lib/command.php:490 +#: lib/command.php:491 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:499 +#: lib/command.php:500 #, php-format msgid "Reply to %s sent" msgstr "رُد على رساله %s" -#: lib/command.php:501 +#: lib/command.php:502 msgid "Error saving notice." msgstr "خطأ أثناء حفظ الإشعار." -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "مُشترك ب%s" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "" -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "" -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "" -#: lib/command.php:663 +#: lib/command.php:664 #, php-format msgid "Could not create login token for %s" msgstr "" -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:684 +#: lib/command.php:685 msgid "You are not subscribed to anyone." msgstr "لست مُشتركًا بأى أحد." -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "لست مشتركًا بأحد." @@ -4329,11 +4332,11 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:706 +#: lib/command.php:707 msgid "No one is subscribed to you." msgstr "لا أحد مشترك بك." -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "لا أحد مشترك بك." @@ -4343,11 +4346,11 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:728 +#: lib/command.php:729 msgid "You are not a member of any groups." msgstr "لست عضوًا فى أى مجموعه." -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "لست عضوًا فى أى مجموعه." @@ -4357,7 +4360,7 @@ msgstr[3] "أنت عضو فى هذه المجموعات:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:744 +#: lib/command.php:745 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4819,7 +4822,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 msgid "from" msgstr "من" @@ -4904,48 +4907,53 @@ msgstr "أرفق" msgid "Attach a file" msgstr "أرفق ملفًا" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "N" msgstr "ش" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "ج" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "ر" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "غ" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "في" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 msgid "in context" msgstr "فى السياق" -#: lib/noticelist.php:549 +#: lib/noticelist.php:548 #, fuzzy msgid "Repeated by" msgstr "أنشئ" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 msgid "Reply to this notice" msgstr "رُد على هذا الإشعار" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 msgid "Reply" msgstr "رُد" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "حُذف الإشعار." + #: lib/nudgeform.php:116 msgid "Nudge this user" msgstr "نبّه هذا المستخدم" @@ -5255,47 +5263,47 @@ msgstr "رسالة" msgid "Moderate" msgstr "" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "قبل لحظات قليلة" -#: lib/util.php:827 +#: lib/util.php:831 msgid "about a minute ago" msgstr "قبل دقيقه تقريبًا" -#: lib/util.php:829 +#: lib/util.php:833 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:831 +#: lib/util.php:835 msgid "about an hour ago" msgstr "قبل ساعه تقريبًا" -#: lib/util.php:833 +#: lib/util.php:837 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:835 +#: lib/util.php:839 msgid "about a day ago" msgstr "قبل يوم تقريبا" -#: lib/util.php:837 +#: lib/util.php:841 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:839 +#: lib/util.php:843 msgid "about a month ago" msgstr "قبل شهر تقريبًا" -#: lib/util.php:841 +#: lib/util.php:845 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:843 +#: lib/util.php:847 msgid "about a year ago" msgstr "قبل سنه تقريبًا" diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index 26d4216929..8ca44327dd 100644 --- a/locale/bg/LC_MESSAGES/statusnet.po +++ b/locale/bg/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:34:22+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:51:49+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: bg\n" "X-Message-Group: out-statusnet\n" @@ -35,17 +35,18 @@ msgstr "Няма такака страница." #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Няма такъв потребител" @@ -55,7 +56,8 @@ msgid "%s and friends, page %d" msgstr "%s и приятели, страница %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s и приятели" @@ -107,6 +109,7 @@ msgid "You and friends" msgstr "Вие и приятелите" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Бележки от %1$s и приятели в %2$s." @@ -226,8 +229,8 @@ msgstr "Всички преки съобщения, изпратени до %s" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -590,7 +593,7 @@ msgid "Preview" msgstr "Преглед" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 msgid "Delete" msgstr "Изтриване" @@ -816,7 +819,7 @@ msgstr "Наистина ли искате да изтриете тази бел msgid "Do not delete this notice" msgstr "Да не се изтрива бележката" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 msgid "Delete this notice" msgstr "Изтриване на бележката" @@ -1954,7 +1957,7 @@ msgid "You can't send a message to this user." msgstr "Не може да изпращате съобщения до този потребител." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "Няма съдържание!" @@ -1973,7 +1976,7 @@ msgstr "" msgid "Message sent" msgstr "Съобщението е изпратено" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "Прякото съобщение до %s е изпратено." @@ -2063,8 +2066,8 @@ msgstr "Свързване" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "Неподдържан формат на данните" @@ -2871,12 +2874,12 @@ msgstr "Не можете да се регистрате, ако не сте с msgid "You already repeated that notice." msgstr "Вече сте блокирали този потребител." -#: actions/repeat.php:112 lib/noticelist.php:627 +#: actions/repeat.php:114 lib/noticelist.php:621 #, fuzzy msgid "Repeated" msgstr "Създаване" -#: actions/repeat.php:115 +#: actions/repeat.php:119 #, fuzzy msgid "Repeated!" msgstr "Създаване" @@ -4009,23 +4012,23 @@ msgstr "Грешка при обновяване на бележката с но msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:196 +#: classes/Notice.php:226 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Проблем при записване на бележката." -#: classes/Notice.php:200 +#: classes/Notice.php:230 msgid "Problem saving notice. Unknown user." msgstr "Грешка при записване на бележката. Непознат потребител." -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте " "отново след няколко минути." -#: classes/Notice.php:211 +#: classes/Notice.php:241 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4034,25 +4037,25 @@ msgstr "" "Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте " "отново след няколко минути." -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "Забранено ви е да публикувате бележки в този сайт." -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "Проблем при записване на бележката." -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "Грешка в базата от данни — отговор при вмъкването: %s" -#: classes/Notice.php:1320 +#: classes/Notice.php:1371 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:347 +#: classes/User.php:368 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Съобщение до %1$s в %2$s" @@ -4379,12 +4382,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "Потребителят няма последна бележка" @@ -4417,137 +4420,137 @@ msgstr "Домашна страница: %s" msgid "About: %s" msgstr "Относно: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" "Съобщението е твърде дълго. Най-много може да е 140 знака, а сте въвели %d." -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "Грешка при изпращане на прякото съобщение" -#: lib/command.php:421 +#: lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Грешка при включване на уведомлението." -#: lib/command.php:426 +#: lib/command.php:427 #, fuzzy msgid "Already repeated that notice" msgstr "Изтриване на бележката" -#: lib/command.php:434 +#: lib/command.php:435 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Бележката е публикувана" -#: lib/command.php:436 +#: lib/command.php:437 #, fuzzy msgid "Error repeating notice." msgstr "Проблем при записване на бележката." -#: lib/command.php:490 +#: lib/command.php:491 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" "Съобщението е твърде дълго. Най-много може да е 140 знака, а сте въвели %d." -#: lib/command.php:499 +#: lib/command.php:500 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Отговаряне на тази бележка" -#: lib/command.php:501 +#: lib/command.php:502 #, fuzzy msgid "Error saving notice." msgstr "Проблем при записване на бележката." -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "Уточнете името на потребителя, за когото се абонирате." -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "Абонирани сте за %s." -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "Уточнете името на потребителя, от когото се отписвате." -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "Отписани сте от %s." -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "Командата все още не се поддържа." -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "Уведомлението е изключено." -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "Грешка при изключване на уведомлението." -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "Уведомлението е включено." -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "Грешка при включване на уведомлението." -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "" -#: lib/command.php:663 +#: lib/command.php:664 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Грешка при отбелязване като любима." -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:684 +#: lib/command.php:685 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Не сте абонирани за този профил" -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Вече сте абонирани за следните потребители:" msgstr[1] "Вече сте абонирани за следните потребители:" -#: lib/command.php:706 +#: lib/command.php:707 #, fuzzy msgid "No one is subscribed to you." msgstr "Грешка при абониране на друг потребител за вас." -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Грешка при абониране на друг потребител за вас." msgstr[1] "Грешка при абониране на друг потребител за вас." -#: lib/command.php:728 +#: lib/command.php:729 msgid "You are not a member of any groups." msgstr "Не членувате в нито една група." -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Не членувате в тази група." msgstr[1] "Не членувате в тази група." -#: lib/command.php:744 +#: lib/command.php:745 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5025,7 +5028,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 msgid "from" msgstr "от" @@ -5110,49 +5113,54 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 #, fuzzy msgid "N" msgstr "Не" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 msgid "in context" msgstr "в контекст" -#: lib/noticelist.php:549 +#: lib/noticelist.php:548 #, fuzzy msgid "Repeated by" msgstr "Създаване" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 msgid "Reply to this notice" msgstr "Отговаряне на тази бележка" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 msgid "Reply" msgstr "Отговор" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "Бележката е изтрита." + #: lib/nudgeform.php:116 msgid "Nudge this user" msgstr "Побутване на този потребител" @@ -5471,47 +5479,47 @@ msgstr "Съобщение" msgid "Moderate" msgstr "" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "преди няколко секунди" -#: lib/util.php:827 +#: lib/util.php:831 msgid "about a minute ago" msgstr "преди около минута" -#: lib/util.php:829 +#: lib/util.php:833 #, php-format msgid "about %d minutes ago" msgstr "преди около %d минути" -#: lib/util.php:831 +#: lib/util.php:835 msgid "about an hour ago" msgstr "преди около час" -#: lib/util.php:833 +#: lib/util.php:837 #, php-format msgid "about %d hours ago" msgstr "преди около %d часа" -#: lib/util.php:835 +#: lib/util.php:839 msgid "about a day ago" msgstr "преди около ден" -#: lib/util.php:837 +#: lib/util.php:841 #, php-format msgid "about %d days ago" msgstr "преди около %d дни" -#: lib/util.php:839 +#: lib/util.php:843 msgid "about a month ago" msgstr "преди около месец" -#: lib/util.php:841 +#: lib/util.php:845 #, php-format msgid "about %d months ago" msgstr "преди около %d месеца" -#: lib/util.php:843 +#: lib/util.php:847 msgid "about a year ago" msgstr "преди около година" diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index 2b82ef877c..099a1f91b8 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:34:24+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:51:52+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: out-statusnet\n" @@ -36,17 +36,18 @@ msgstr "No existeix la pàgina." #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "No existeix aquest usuari." @@ -56,7 +57,8 @@ msgid "%s and friends, page %d" msgstr "%s i amics, pàgina %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s i amics" @@ -110,6 +112,7 @@ msgid "You and friends" msgstr "Un mateix i amics" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Actualitzacions de %1$s i amics a %2$s!" @@ -232,8 +235,8 @@ msgstr "Tots els missatges directes enviats a %s" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -597,7 +600,7 @@ msgid "Preview" msgstr "Previsualitzar" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 msgid "Delete" msgstr "Eliminar" @@ -827,7 +830,7 @@ msgstr "N'estàs segur que vols eliminar aquesta notificació?" msgid "Do not delete this notice" msgstr "No es pot esborrar la notificació." -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 msgid "Delete this notice" msgstr "Eliminar aquesta nota" @@ -1975,7 +1978,7 @@ msgid "You can't send a message to this user." msgstr "No podeu enviar un misssatge a aquest usuari." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "Cap contingut!" @@ -1992,7 +1995,7 @@ msgstr "No t'enviïs missatges a tu mateix, simplement dir-te això." msgid "Message sent" msgstr "S'ha enviat el missatge" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "Missatge directe per a %s enviat" @@ -2083,8 +2086,8 @@ msgstr "tipus de contingut " msgid "Only " msgstr "Només " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "Format de data no suportat." @@ -2905,12 +2908,12 @@ msgstr "No pots registrar-te si no estàs d'acord amb la llicència." msgid "You already repeated that notice." msgstr "Ja heu blocat l'usuari." -#: actions/repeat.php:112 lib/noticelist.php:627 +#: actions/repeat.php:114 lib/noticelist.php:621 #, fuzzy msgid "Repeated" msgstr "S'ha creat" -#: actions/repeat.php:115 +#: actions/repeat.php:119 #, fuzzy msgid "Repeated!" msgstr "S'ha creat" @@ -4052,23 +4055,23 @@ msgstr "No s'ha pogut inserir el missatge amb la nova URI." msgid "DB error inserting hashtag: %s" msgstr "Hashtag de l'error de la base de dades:%s" -#: classes/Notice.php:196 +#: classes/Notice.php:226 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Problema en guardar l'avís." -#: classes/Notice.php:200 +#: classes/Notice.php:230 msgid "Problem saving notice. Unknown user." msgstr "Problema al guardar la notificació. Usuari desconegut." -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Masses notificacions massa ràpid; pren un respir i publica de nou en uns " "minuts." -#: classes/Notice.php:211 +#: classes/Notice.php:241 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4077,25 +4080,25 @@ msgstr "" "Masses notificacions massa ràpid; pren un respir i publica de nou en uns " "minuts." -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "Ha estat bandejat de publicar notificacions en aquest lloc." -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "Problema en guardar l'avís." -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "Error de BD en inserir resposta: %s" -#: classes/Notice.php:1320 +#: classes/Notice.php:1371 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:347 +#: classes/User.php:368 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Us donem la benvinguda a %1$s, @%2$s!" @@ -4412,12 +4415,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "L'usuari no té última nota" @@ -4450,135 +4453,135 @@ msgstr "Pàgina web: %s" msgid "About: %s" msgstr "Sobre tu: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d" -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "Error al enviar el missatge directe." -#: lib/command.php:421 +#: lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice" msgstr "No es poden posar en on les notificacions." -#: lib/command.php:426 +#: lib/command.php:427 #, fuzzy msgid "Already repeated that notice" msgstr "Eliminar aquesta nota" -#: lib/command.php:434 +#: lib/command.php:435 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Notificació publicada" -#: lib/command.php:436 +#: lib/command.php:437 #, fuzzy msgid "Error repeating notice." msgstr "Problema en guardar l'avís." -#: lib/command.php:490 +#: lib/command.php:491 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d" -#: lib/command.php:499 +#: lib/command.php:500 #, php-format msgid "Reply to %s sent" msgstr "S'ha enviat la resposta a %s" -#: lib/command.php:501 +#: lib/command.php:502 #, fuzzy msgid "Error saving notice." msgstr "Problema en guardar l'avís." -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "Especifica el nom de l'usuari a que vols subscriure't" -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "Subscrit a %s" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "Especifica el nom de l'usuari del que vols deixar d'estar subscrit" -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "Has deixat d'estar subscrit a %s" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "Comanda encara no implementada." -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "Notificacions off." -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "No es poden posar en off les notificacions." -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "Notificacions on." -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "No es poden posar en on les notificacions." -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "" -#: lib/command.php:663 +#: lib/command.php:664 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "No s'han pogut crear els àlies." -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:684 +#: lib/command.php:685 #, fuzzy msgid "You are not subscribed to anyone." msgstr "No estàs subscrit a aquest perfil." -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Ja estàs subscrit a aquests usuaris:" msgstr[1] "Ja estàs subscrit a aquests usuaris:" -#: lib/command.php:706 +#: lib/command.php:707 #, fuzzy msgid "No one is subscribed to you." msgstr "No pots subscriure a un altre a tu mateix." -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "No pots subscriure a un altre a tu mateix." msgstr[1] "No pots subscriure a un altre a tu mateix." -#: lib/command.php:728 +#: lib/command.php:729 msgid "You are not a member of any groups." msgstr "No sou membre de cap grup." -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "No sou un membre del grup." msgstr[1] "No sou un membre del grup." -#: lib/command.php:744 +#: lib/command.php:745 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5061,7 +5064,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 msgid "from" msgstr "de" @@ -5146,50 +5149,55 @@ msgstr "Adjunta" msgid "Attach a file" msgstr "Adjunta un fitxer" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 #, fuzzy msgid "N" msgstr "No" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 #, fuzzy msgid "in context" msgstr "Cap contingut!" -#: lib/noticelist.php:549 +#: lib/noticelist.php:548 #, fuzzy msgid "Repeated by" msgstr "S'ha creat" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 msgid "Reply to this notice" msgstr "respondre a aquesta nota" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 msgid "Reply" msgstr "Respon" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "Notificació publicada" + #: lib/nudgeform.php:116 msgid "Nudge this user" msgstr "Reclamar aquest usuari" @@ -5504,47 +5512,47 @@ msgstr "Missatge" msgid "Moderate" msgstr "Modera" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "fa pocs segons" -#: lib/util.php:827 +#: lib/util.php:831 msgid "about a minute ago" msgstr "fa un minut" -#: lib/util.php:829 +#: lib/util.php:833 #, php-format msgid "about %d minutes ago" msgstr "fa %d minuts" -#: lib/util.php:831 +#: lib/util.php:835 msgid "about an hour ago" msgstr "fa una hora" -#: lib/util.php:833 +#: lib/util.php:837 #, php-format msgid "about %d hours ago" msgstr "fa %d hores" -#: lib/util.php:835 +#: lib/util.php:839 msgid "about a day ago" msgstr "fa un dia" -#: lib/util.php:837 +#: lib/util.php:841 #, php-format msgid "about %d days ago" msgstr "fa %d dies" -#: lib/util.php:839 +#: lib/util.php:843 msgid "about a month ago" msgstr "fa un mes" -#: lib/util.php:841 +#: lib/util.php:845 #, php-format msgid "about %d months ago" msgstr "fa %d mesos" -#: lib/util.php:843 +#: lib/util.php:847 msgid "about a year ago" msgstr "fa un any" diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index a207778b43..b224ef0a19 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: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:34:27+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:51:55+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: cs\n" "X-Message-Group: out-statusnet\n" @@ -37,17 +37,18 @@ msgstr "Žádné takové oznámení." #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Žádný takový uživatel." @@ -57,7 +58,8 @@ msgid "%s and friends, page %d" msgstr "%s a přátelé" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s a přátelé" @@ -110,6 +112,7 @@ msgid "You and friends" msgstr "%s a přátelé" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" @@ -231,8 +234,8 @@ msgstr "" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -599,7 +602,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 msgid "Delete" msgstr "Odstranit" @@ -826,7 +829,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "Žádné takové oznámení." -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 msgid "Delete this notice" msgstr "Odstranit toto oznámení" @@ -1933,7 +1936,7 @@ msgid "You can't send a message to this user." msgstr "" #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "Žádný obsah!" @@ -1950,7 +1953,7 @@ msgstr "" msgid "Message sent" msgstr "" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "" @@ -2041,8 +2044,8 @@ msgstr "Připojit" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "" @@ -2839,12 +2842,12 @@ msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí." msgid "You already repeated that notice." msgstr "Již jste přihlášen" -#: actions/repeat.php:112 lib/noticelist.php:627 +#: actions/repeat.php:114 lib/noticelist.php:621 #, fuzzy msgid "Repeated" msgstr "Vytvořit" -#: actions/repeat.php:115 +#: actions/repeat.php:119 #, fuzzy msgid "Repeated!" msgstr "Vytvořit" @@ -3981,46 +3984,46 @@ msgstr "" msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:196 +#: classes/Notice.php:226 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Problém při ukládání sdělení" -#: classes/Notice.php:200 +#: classes/Notice.php:230 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Problém při ukládání sdělení" -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:211 +#: classes/Notice.php:241 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "Problém při ukládání sdělení" -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "Chyba v DB při vkládání odpovědi: %s" -#: classes/Notice.php:1320 +#: classes/Notice.php:1371 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:347 +#: classes/User.php:368 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4347,12 +4350,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "" @@ -4385,138 +4388,138 @@ msgstr "" msgid "About: %s" msgstr "" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "" -#: lib/command.php:421 +#: lib/command.php:422 msgid "Cannot repeat your own notice" msgstr "" -#: lib/command.php:426 +#: lib/command.php:427 #, fuzzy msgid "Already repeated that notice" msgstr "Odstranit toto oznámení" -#: lib/command.php:434 +#: lib/command.php:435 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Sdělení" -#: lib/command.php:436 +#: lib/command.php:437 #, fuzzy msgid "Error repeating notice." msgstr "Problém při ukládání sdělení" -#: lib/command.php:490 +#: lib/command.php:491 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:499 +#: lib/command.php:500 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Odpovědi na %s" -#: lib/command.php:501 +#: lib/command.php:502 #, fuzzy msgid "Error saving notice." msgstr "Problém při ukládání sdělení" -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "" -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "" -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "" -#: lib/command.php:663 +#: lib/command.php:664 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Nelze uložin informace o obrázku" -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:684 +#: lib/command.php:685 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Neodeslal jste nám profil" -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Neodeslal jste nám profil" msgstr[1] "Neodeslal jste nám profil" msgstr[2] "" -#: lib/command.php:706 +#: lib/command.php:707 #, fuzzy msgid "No one is subscribed to you." msgstr "Vzdálený odběr" -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Vzdálený odběr" msgstr[1] "Vzdálený odběr" msgstr[2] "" -#: lib/command.php:728 +#: lib/command.php:729 #, fuzzy msgid "You are not a member of any groups." msgstr "Neodeslal jste nám profil" -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Neodeslal jste nám profil" msgstr[1] "Neodeslal jste nám profil" msgstr[2] "" -#: lib/command.php:744 +#: lib/command.php:745 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4997,7 +5000,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 #, fuzzy msgid "from" msgstr " od " @@ -5086,50 +5089,55 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "N" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 #, fuzzy msgid "in context" msgstr "Žádný obsah!" -#: lib/noticelist.php:549 +#: lib/noticelist.php:548 #, fuzzy msgid "Repeated by" msgstr "Vytvořit" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 #, fuzzy msgid "Reply" msgstr "odpověď" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "Sdělení" + #: lib/nudgeform.php:116 msgid "Nudge this user" msgstr "" @@ -5448,47 +5456,47 @@ msgstr "Zpráva" msgid "Moderate" msgstr "" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "před pár sekundami" -#: lib/util.php:827 +#: lib/util.php:831 msgid "about a minute ago" msgstr "asi před minutou" -#: lib/util.php:829 +#: lib/util.php:833 #, php-format msgid "about %d minutes ago" msgstr "asi před %d minutami" -#: lib/util.php:831 +#: lib/util.php:835 msgid "about an hour ago" msgstr "asi před hodinou" -#: lib/util.php:833 +#: lib/util.php:837 #, php-format msgid "about %d hours ago" msgstr "asi před %d hodinami" -#: lib/util.php:835 +#: lib/util.php:839 msgid "about a day ago" msgstr "asi přede dnem" -#: lib/util.php:837 +#: lib/util.php:841 #, php-format msgid "about %d days ago" msgstr "před %d dny" -#: lib/util.php:839 +#: lib/util.php:843 msgid "about a month ago" msgstr "asi před měsícem" -#: lib/util.php:841 +#: lib/util.php:845 #, php-format msgid "about %d months ago" msgstr "asi před %d mesíci" -#: lib/util.php:843 +#: lib/util.php:847 msgid "about a year ago" msgstr "asi před rokem" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index 0ba36e589f..8e051779f2 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:34:30+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:51:58+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: out-statusnet\n" @@ -37,17 +37,18 @@ msgstr "Seite nicht vorhanden" #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Unbekannter Benutzer." @@ -57,7 +58,8 @@ msgid "%s and friends, page %d" msgstr "%s und Freunde, Seite %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s und Freunde" @@ -109,6 +111,7 @@ msgid "You and friends" msgstr "Du und Freunde" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!" @@ -226,8 +229,8 @@ msgstr "Alle an %s gesendeten direkten Nachrichten" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -593,7 +596,7 @@ msgid "Preview" msgstr "Vorschau" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 msgid "Delete" msgstr "Löschen" @@ -816,7 +819,7 @@ msgstr "Bist du sicher, dass du diese Nachricht löschen möchtest?" msgid "Do not delete this notice" msgstr "Diese Nachricht nicht löschen" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 msgid "Delete this notice" msgstr "Nachricht löschen" @@ -1944,7 +1947,7 @@ msgid "You can't send a message to this user." msgstr "Du kannst diesem Benutzer keine Nachricht schicken." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "Kein Inhalt!" @@ -1962,7 +1965,7 @@ msgstr "" msgid "Message sent" msgstr "Nachricht gesendet" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "Direkte Nachricht an %s abgeschickt" @@ -2054,8 +2057,8 @@ msgstr "Content-Typ " msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "Kein unterstütztes Datenformat." @@ -2866,12 +2869,12 @@ msgstr "" msgid "You already repeated that notice." msgstr "Du hast diesen Benutzer bereits blockiert." -#: actions/repeat.php:112 lib/noticelist.php:627 +#: actions/repeat.php:114 lib/noticelist.php:621 #, fuzzy msgid "Repeated" msgstr "Erstellt" -#: actions/repeat.php:115 +#: actions/repeat.php:119 #, fuzzy msgid "Repeated!" msgstr "Erstellt" @@ -4020,22 +4023,22 @@ msgstr "Konnte Nachricht nicht mit neuer URI versehen." msgid "DB error inserting hashtag: %s" msgstr "Datenbankfehler beim Einfügen des Hashtags: %s" -#: classes/Notice.php:196 +#: classes/Notice.php:226 msgid "Problem saving notice. Too long." msgstr "Problem bei Speichern der Nachricht. Sie ist zu lang." -#: classes/Notice.php:200 +#: classes/Notice.php:230 msgid "Problem saving notice. Unknown user." msgstr "Problem bei Speichern der Nachricht. Unbekannter Benutzer." -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Zu schnell zu viele Nachrichten; atme kurz durch und schicke sie erneut in " "ein paar Minuten ab." -#: classes/Notice.php:211 +#: classes/Notice.php:241 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4044,26 +4047,26 @@ msgstr "" "Zu schnell zu viele Nachrichten; atme kurz durch und schicke sie erneut in " "ein paar Minuten ab." -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "" "Du wurdest für das Schreiben von Nachrichten auf dieser Seite gesperrt." -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "Problem bei Speichern der Nachricht." -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "Datenbankfehler beim Einfügen der Antwort: %s" -#: classes/Notice.php:1320 +#: classes/Notice.php:1371 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:347 +#: classes/User.php:368 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Herzlich willkommen bei %1$s, @%2$s!" @@ -4383,12 +4386,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "Nachricht mit dieser ID existiert nicht" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "Benutzer hat keine letzte Nachricht" @@ -4421,135 +4424,135 @@ msgstr "Homepage: %s" msgid "About: %s" msgstr "Über: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Nachricht zu lang - maximal %d Zeichen erlaubt, du hast %d gesendet" -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "Fehler beim Senden der Nachricht" -#: lib/command.php:421 +#: lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Konnte Benachrichtigung nicht aktivieren." -#: lib/command.php:426 +#: lib/command.php:427 #, fuzzy msgid "Already repeated that notice" msgstr "Nachricht löschen" -#: lib/command.php:434 +#: lib/command.php:435 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Nachricht hinzugefügt" -#: lib/command.php:436 +#: lib/command.php:437 #, fuzzy msgid "Error repeating notice." msgstr "Problem beim Speichern der Nachricht." -#: lib/command.php:490 +#: lib/command.php:491 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Nachricht zu lange - maximal 140 Zeichen erlaubt, du hast %s gesendet" -#: lib/command.php:499 +#: lib/command.php:500 #, php-format msgid "Reply to %s sent" msgstr "Antwort an %s gesendet" -#: lib/command.php:501 +#: lib/command.php:502 msgid "Error saving notice." msgstr "Problem beim Speichern der Nachricht." -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "Gib den Namen des Benutzers an, den du abonnieren möchtest" -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "%s abonniert" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "Gib den Namen des Benutzers ein, den du nicht mehr abonnieren möchtest" -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "%s nicht mehr abonniert" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "Befehl noch nicht implementiert." -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "Benachrichtigung deaktiviert." -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "Konnte Benachrichtigung nicht deaktivieren." -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "Benachrichtigung aktiviert." -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "Konnte Benachrichtigung nicht aktivieren." -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "" -#: lib/command.php:663 +#: lib/command.php:664 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Konnte keinen Favoriten erstellen." -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:684 +#: lib/command.php:685 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Du hast dieses Profil nicht abonniert." -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Du hast diese Benutzer bereits abonniert:" msgstr[1] "Du hast diese Benutzer bereits abonniert:" -#: lib/command.php:706 +#: lib/command.php:707 #, fuzzy msgid "No one is subscribed to you." msgstr "Die Gegenseite konnte Dich nicht abonnieren." -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Die Gegenseite konnte Dich nicht abonnieren." msgstr[1] "Die Gegenseite konnte Dich nicht abonnieren." -#: lib/command.php:728 +#: lib/command.php:729 #, fuzzy msgid "You are not a member of any groups." msgstr "Du bist kein Mitglied dieser Gruppe." -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Du bist kein Mitglied dieser Gruppe." msgstr[1] "Du bist kein Mitglied dieser Gruppe." -#: lib/command.php:744 +#: lib/command.php:745 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5047,7 +5050,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 #, fuzzy msgid "from" msgstr "von" @@ -5136,49 +5139,54 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 #, fuzzy msgid "N" msgstr "Nein" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 msgid "in context" msgstr "im Zusammenhang" -#: lib/noticelist.php:549 +#: lib/noticelist.php:548 #, fuzzy msgid "Repeated by" msgstr "Erstellt" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 msgid "Reply to this notice" msgstr "Auf diese Nachricht antworten" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 msgid "Reply" msgstr "Antworten" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "Nachricht gelöscht." + #: lib/nudgeform.php:116 #, fuzzy msgid "Nudge this user" @@ -5500,47 +5508,47 @@ msgstr "Nachricht" msgid "Moderate" msgstr "" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "vor wenigen Sekunden" -#: lib/util.php:827 +#: lib/util.php:831 msgid "about a minute ago" msgstr "vor einer Minute" -#: lib/util.php:829 +#: lib/util.php:833 #, php-format msgid "about %d minutes ago" msgstr "vor %d Minuten" -#: lib/util.php:831 +#: lib/util.php:835 msgid "about an hour ago" msgstr "vor einer Stunde" -#: lib/util.php:833 +#: lib/util.php:837 #, php-format msgid "about %d hours ago" msgstr "vor %d Stunden" -#: lib/util.php:835 +#: lib/util.php:839 msgid "about a day ago" msgstr "vor einem Tag" -#: lib/util.php:837 +#: lib/util.php:841 #, php-format msgid "about %d days ago" msgstr "vor %d Tagen" -#: lib/util.php:839 +#: lib/util.php:843 msgid "about a month ago" msgstr "vor einem Monat" -#: lib/util.php:841 +#: lib/util.php:845 #, php-format msgid "about %d months ago" msgstr "vor %d Monaten" -#: lib/util.php:843 +#: lib/util.php:847 msgid "about a year ago" msgstr "vor einem Jahr" diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index e27435c77b..715e7b6c1a 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -1,5 +1,6 @@ # Translation of StatusNet to Greek # +# Author@translatewiki.net: Crazymadlover # Author@translatewiki.net: Omnipaedista # -- # This file is distributed under the same license as the StatusNet package. @@ -8,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:34:33+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:52:01+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: el\n" "X-Message-Group: out-statusnet\n" @@ -21,9 +22,8 @@ msgstr "" #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 -#, fuzzy msgid "No such page" -msgstr "Αδύνατη η αποθήκευση του προφίλ." +msgstr "Δεν υπάρχει τέτοιο σελίδα." #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 @@ -36,45 +36,47 @@ msgstr "Αδύνατη η αποθήκευση του προφίλ." #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Κανένας τέτοιος χρήστης." #: actions/all.php:84 -#, fuzzy, php-format +#, php-format msgid "%s and friends, page %d" -msgstr "%s και οι φίλοι του/της" +msgstr "%s και οι φίλοι του/της, σελίδα %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s και οι φίλοι του/της" #: actions/all.php:99 -#, fuzzy, php-format +#, php-format msgid "Feed for friends of %s (RSS 1.0)" -msgstr "Ροή φίλων του/της %s" +msgstr "Ροή φίλων του/της %s (RSS 1.0)" #: actions/all.php:107 -#, fuzzy, php-format +#, php-format msgid "Feed for friends of %s (RSS 2.0)" -msgstr "Ροή φίλων του/της %s" +msgstr "Ροή φίλων του/της %s (RSS 2.0)" #: actions/all.php:115 -#, fuzzy, php-format +#, php-format msgid "Feed for friends of %s (Atom)" -msgstr "Ροή φίλων του/της %s" +msgstr "Ροή φίλων του/της %s (Atom)" #: actions/all.php:127 #, php-format @@ -104,11 +106,11 @@ msgid "" msgstr "" #: actions/all.php:165 -#, fuzzy msgid "You and friends" -msgstr "%s και οι φίλοι του/της" +msgstr "Εσείς και οι φίλοι σας" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" @@ -186,9 +188,8 @@ msgid "Could not update your design." msgstr "Απέτυχε η ενημέρωση του χρήστη." #: actions/apiblockcreate.php:105 -#, fuzzy msgid "You cannot block yourself!" -msgstr "Απέτυχε η ενημέρωση του χρήστη." +msgstr "Δεν μπορείτε να εμποδίσετε τον εαυτό σας!" #: actions/apiblockcreate.php:119 msgid "Block user failed." @@ -230,8 +231,8 @@ msgstr "" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -340,9 +341,9 @@ msgid "Full name is too long (max 255 chars)." msgstr "Το ονοματεπώνυμο είναι πολύ μεγάλο (μέγιστο 255 χαρακτ.)." #: actions/apigroupcreate.php:213 -#, fuzzy, php-format +#, php-format msgid "Description is too long (max %d chars)." -msgstr "Το βιογραφικό είναι πολύ μεγάλο (μέγιστο 140 χαρακτ.)." +msgstr "Η περιγραφή είναι πολύ μεγάλη (μέγιστο %d χαρακτ.)." #: actions/apigroupcreate.php:224 actions/editgroup.php:204 #: actions/newgroup.php:148 actions/profilesettings.php:225 @@ -376,9 +377,8 @@ msgstr "" #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91 -#, fuzzy msgid "Group not found!" -msgstr "Η μέθοδος του ΑΡΙ δε βρέθηκε!" +msgstr "Ομάδα δεν βρέθηκε!" #: actions/apigroupjoin.php:110 msgid "You are already a member of that group." @@ -446,9 +446,8 @@ msgid "Already repeated that notice." msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." #: actions/apistatusesshow.php:138 -#, fuzzy msgid "Status deleted." -msgstr "Ρυθμίσεις OpenID" +msgstr "Η κατάσταση διαγράφεται." #: actions/apistatusesshow.php:144 msgid "No status with that ID found." @@ -593,9 +592,9 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 msgid "Delete" -msgstr "" +msgstr "Διαγραφή" #: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" @@ -678,7 +677,7 @@ msgstr "Αδυναμία διαγραφής αυτού του μηνύματος #: actions/block.php:144 actions/deletenotice.php:146 #: actions/deleteuser.php:148 actions/groupblock.php:179 msgid "Yes" -msgstr "" +msgstr "Ναί" #: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 msgid "Block this user" @@ -699,9 +698,8 @@ msgstr "Κανένα ψευδώνυμο" #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/joingroup.php:83 actions/showgroup.php:137 -#, fuzzy msgid "No such group" -msgstr "Αδύνατη η αποθήκευση του προφίλ." +msgstr "Δεν υπάρχει τέτοιο ομάδα" #: actions/blockedfromgroup.php:90 #, fuzzy, php-format @@ -819,7 +817,7 @@ msgstr "Είσαι σίγουρος ότι θες να διαγράψεις αυ msgid "Do not delete this notice" msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 msgid "Delete this notice" msgstr "" @@ -837,9 +835,8 @@ msgid "You can only delete local users." msgstr "" #: actions/deleteuser.php:110 actions/deleteuser.php:133 -#, fuzzy msgid "Delete user" -msgstr "Διαγραφή μηνύματος" +msgstr "Διαγραφή χρήστη" #: actions/deleteuser.php:135 msgid "" @@ -848,9 +845,8 @@ msgid "" msgstr "" #: actions/deleteuser.php:148 lib/deleteuserform.php:77 -#, fuzzy msgid "Delete this user" -msgstr "Διαγραφή μηνύματος" +msgstr "Διαγράψτε αυτόν τον χρήστη" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 #: lib/adminpanelaction.php:302 lib/groupnav.php:119 @@ -926,14 +922,12 @@ msgid "Tile background image" msgstr "" #: actions/designadminpanel.php:488 lib/designsettings.php:170 -#, fuzzy msgid "Change colours" -msgstr "Αλλάξτε τον κωδικό σας" +msgstr "Αλλαγή χρωμάτων" #: actions/designadminpanel.php:510 lib/designsettings.php:191 -#, fuzzy msgid "Content" -msgstr "Σύνδεση" +msgstr "Περιεχόμενο" #: actions/designadminpanel.php:523 lib/designsettings.php:204 msgid "Sidebar" @@ -944,9 +938,8 @@ msgid "Text" msgstr "" #: actions/designadminpanel.php:549 lib/designsettings.php:230 -#, fuzzy msgid "Links" -msgstr "Σύνδεση" +msgstr "Σύνδεσμοι" #: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" @@ -1911,7 +1904,7 @@ msgid "You can't send a message to this user." msgstr "" #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "" @@ -1928,7 +1921,7 @@ msgstr "" msgid "Message sent" msgstr "" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "" @@ -2016,8 +2009,8 @@ msgstr "Σύνδεση" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "" @@ -2818,12 +2811,12 @@ msgstr "" msgid "You already repeated that notice." msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." -#: actions/repeat.php:112 lib/noticelist.php:627 +#: actions/repeat.php:114 lib/noticelist.php:621 #, fuzzy msgid "Repeated" msgstr "Δημιουργία" -#: actions/repeat.php:115 +#: actions/repeat.php:119 #, fuzzy msgid "Repeated!" msgstr "Δημιουργία" @@ -2991,9 +2984,8 @@ msgid "FOAF for %s group" msgstr "Αδύνατη η αποθήκευση του προφίλ." #: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 -#, fuzzy msgid "Members" -msgstr "Μέλος από" +msgstr "Μέλη" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 @@ -3010,9 +3002,8 @@ msgid "Statistics" msgstr "" #: actions/showgroup.php:432 -#, fuzzy msgid "Created" -msgstr "Δημιουργία" +msgstr "Δημιουργημένος" #: actions/showgroup.php:448 #, php-format @@ -3223,9 +3214,8 @@ msgid "Contact email address for your site" msgstr "Η διεύθυνση του εισερχόμενου email αφαιρέθηκε." #: actions/siteadminpanel.php:290 -#, fuzzy msgid "Local" -msgstr "Τοποθεσία" +msgstr "Τοπικός" #: actions/siteadminpanel.php:301 msgid "Default timezone" @@ -3605,9 +3595,8 @@ msgid "Tag %s" msgstr "" #: actions/tagother.php:77 lib/userprofile.php:75 -#, fuzzy msgid "User profile" -msgstr "Αδύνατη η αποθήκευση του προφίλ." +msgstr "Προφίλ χρήστη" #: actions/tagother.php:81 lib/userprofile.php:102 msgid "Photo" @@ -3711,9 +3700,8 @@ msgid "Maximum length of a profile bio in characters." msgstr "" #: actions/useradminpanel.php:231 -#, fuzzy msgid "New users" -msgstr "Διαγραφή μηνύματος" +msgstr "Νέοι χρήστες" #: actions/useradminpanel.php:235 msgid "New user welcome" @@ -3736,9 +3724,8 @@ msgstr "" "κυρίως από λογισμικό και όχι ανθρώπους)" #: actions/useradminpanel.php:251 -#, fuzzy msgid "Invitations" -msgstr "Τοποθεσία" +msgstr "Προσκλήσεις" #: actions/useradminpanel.php:256 msgid "Invitations enabled" @@ -3933,52 +3920,51 @@ msgstr "" msgid "DB error inserting hashtag: %s" msgstr "Σφάλμα στη βάση δεδομένων κατά την εισαγωγή hashtag: %s" -#: classes/Notice.php:196 +#: classes/Notice.php:226 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:200 +#: classes/Notice.php:230 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:211 +#: classes/Notice.php:241 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "Σφάλμα βάσης δεδομένων κατά την εισαγωγή απάντησης: %s" -#: classes/Notice.php:1320 +#: classes/Notice.php:1371 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:347 +#: classes/User.php:368 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" #: classes/User_group.php:380 -#, fuzzy msgid "Could not create group." -msgstr "Αδύνατη η αποθήκευση του προφίλ." +msgstr "Δεν ήταν δυνατή η δημιουργία ομάδας." #: classes/User_group.php:409 #, fuzzy @@ -4002,9 +3988,8 @@ msgid "Change email handling" msgstr "" #: lib/accountsettingsaction.php:124 -#, fuzzy msgid "Design your profile" -msgstr "Αδύνατη η αποθήκευση του προφίλ." +msgstr "Σχεδιάστε το προφίλ σας" #: lib/accountsettingsaction.php:128 msgid "Other" @@ -4036,9 +4021,8 @@ msgid "Personal profile and friends timeline" msgstr "" #: lib/action.php:433 -#, fuzzy msgid "Account" -msgstr "Περί" +msgstr "Λογαριασμός" #: lib/action.php:433 msgid "Change your email, avatar, password, profile" @@ -4075,9 +4059,8 @@ msgid "Logout from the site" msgstr "" #: lib/action.php:455 -#, fuzzy msgid "Create an account" -msgstr "Δημιουργία νέου λογαριασμού" +msgstr "Δημιουργία έναν λογαριασμού" #: lib/action.php:458 msgid "Login to the site" @@ -4088,9 +4071,8 @@ msgid "Help" msgstr "Βοήθεια" #: lib/action.php:461 -#, fuzzy msgid "Help me!" -msgstr "Βοήθεια" +msgstr "Βοηθήστε με!" #: lib/action.php:464 lib/searchaction.php:127 msgid "Search" @@ -4288,12 +4270,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "" @@ -4326,133 +4308,132 @@ msgstr "" msgid "About: %s" msgstr "" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "" -#: lib/command.php:421 +#: lib/command.php:422 msgid "Cannot repeat your own notice" msgstr "" -#: lib/command.php:426 +#: lib/command.php:427 #, fuzzy msgid "Already repeated that notice" msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." -#: lib/command.php:434 +#: lib/command.php:435 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Ρυθμίσεις OpenID" -#: lib/command.php:436 +#: lib/command.php:437 msgid "Error repeating notice." msgstr "" -#: lib/command.php:490 +#: lib/command.php:491 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:499 +#: lib/command.php:500 #, php-format msgid "Reply to %s sent" msgstr "" -#: lib/command.php:501 +#: lib/command.php:502 msgid "Error saving notice." msgstr "" -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "" -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "" -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "" -#: lib/command.php:663 +#: lib/command.php:664 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Αδύνατη η αποθήκευση του προφίλ." -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:684 +#: lib/command.php:685 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." msgstr[1] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/command.php:706 +#: lib/command.php:707 #, fuzzy msgid "No one is subscribed to you." msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." msgstr[1] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/command.php:728 -#, fuzzy +#: lib/command.php:729 msgid "You are not a member of any groups." -msgstr "Ομάδες με τα περισσότερα μέλη" +msgstr "Δεν είστε μέλος καμίας ομάδας." -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Ομάδες με τα περισσότερα μέλη" msgstr[1] "Ομάδες με τα περισσότερα μέλη" -#: lib/command.php:744 +#: lib/command.php:745 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4601,14 +4582,13 @@ msgid "URL of the homepage or blog of the group or topic" msgstr "" #: lib/groupeditform.php:168 -#, fuzzy msgid "Describe the group or topic" -msgstr "Περιγράψτε την ομάδα ή το θέμα μέχρι 140 χαρακτήρες" +msgstr "Περιγράψτε την ομάδα ή το θέμα" #: lib/groupeditform.php:170 -#, fuzzy, php-format +#, php-format msgid "Describe the group or topic in %d characters" -msgstr "Περιγράψτε την ομάδα ή το θέμα μέχρι 140 χαρακτήρες" +msgstr "Περιγράψτε την ομάδα ή το θέμα μέχρι %d χαρακτήρες" #: lib/groupeditform.php:172 msgid "Description" @@ -4717,7 +4697,6 @@ msgid "[%s]" msgstr "" #: lib/joinform.php:114 -#, fuzzy msgid "Join" msgstr "Συμμετοχή" @@ -4730,9 +4709,8 @@ msgid "Login with a username and password" msgstr "Σύνδεση με όνομα χρήστη και κωδικό" #: lib/logingroupnav.php:86 -#, fuzzy msgid "Sign up for a new account" -msgstr "Δημιουργία νέου λογαριασμού" +msgstr "Εγγραφή για ένα νέο λογαριασμό" #: lib/mail.php:172 msgid "Email address confirmation" @@ -4922,8 +4900,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:468 -#, fuzzy +#: lib/mailbox.php:227 lib/noticelist.php:469 msgid "from" msgstr "από" @@ -4989,9 +4966,8 @@ msgid "To" msgstr "" #: lib/messageform.php:159 lib/noticeform.php:183 -#, fuzzy msgid "Available characters" -msgstr "6 ή περισσότεροι χαρακτήρες" +msgstr "Διαθέσιμοι χαρακτήρες" #: lib/noticeform.php:158 msgid "Send a notice" @@ -5010,48 +4986,52 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "N" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 msgid "in context" msgstr "" -#: lib/noticelist.php:549 -#, fuzzy +#: lib/noticelist.php:548 msgid "Repeated by" -msgstr "Δημιουργία" +msgstr "Επαναλαμβάνεται από" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 msgid "Reply" msgstr "" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "Ρυθμίσεις OpenID" + #: lib/nudgeform.php:116 msgid "Nudge this user" msgstr "" @@ -5297,7 +5277,6 @@ msgid "People Tagcloud as tagged" msgstr "" #: lib/subscriptionlist.php:126 -#, fuzzy msgid "(none)" msgstr "(κανένα)" @@ -5344,13 +5323,12 @@ msgid "User actions" msgstr "" #: lib/userprofile.php:248 -#, fuzzy msgid "Edit profile settings" -msgstr "Αλλάξτε τις ρυθμίσεις του προφίλ σας" +msgstr "Επεξεργασία ρυθμίσεων προφίλ" #: lib/userprofile.php:249 msgid "Edit" -msgstr "" +msgstr "Επεξεργασία" #: lib/userprofile.php:272 msgid "Send a direct message to this user" @@ -5358,60 +5336,60 @@ msgstr "" #: lib/userprofile.php:273 msgid "Message" -msgstr "" +msgstr "Μήνυμα" #: lib/userprofile.php:311 msgid "Moderate" msgstr "" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "" -#: lib/util.php:827 -msgid "about a minute ago" -msgstr "" - -#: lib/util.php:829 -#, php-format -msgid "about %d minutes ago" -msgstr "" - #: lib/util.php:831 -msgid "about an hour ago" +msgid "about a minute ago" msgstr "" #: lib/util.php:833 #, php-format -msgid "about %d hours ago" +msgid "about %d minutes ago" msgstr "" #: lib/util.php:835 -msgid "about a day ago" +msgid "about an hour ago" msgstr "" #: lib/util.php:837 #, php-format -msgid "about %d days ago" +msgid "about %d hours ago" msgstr "" #: lib/util.php:839 -msgid "about a month ago" +msgid "about a day ago" msgstr "" #: lib/util.php:841 #, php-format -msgid "about %d months ago" +msgid "about %d days ago" msgstr "" #: lib/util.php:843 +msgid "about a month ago" +msgstr "" + +#: lib/util.php:845 +#, php-format +msgid "about %d months ago" +msgstr "" + +#: lib/util.php:847 msgid "about a year ago" msgstr "" #: lib/webcolor.php:82 -#, fuzzy, php-format +#, php-format msgid "%s is not a valid color!" -msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL." +msgstr "%s δεν είναι ένα έγκυρο χρώμα!" #: lib/webcolor.php:123 #, php-format diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index ade686de7c..198d7079a0 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:34:36+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:52:04+0000\n" "Language-Team: British English\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" "X-Message-Group: out-statusnet\n" @@ -36,17 +36,18 @@ msgstr "No such page" #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "No such user." @@ -56,7 +57,8 @@ msgid "%s and friends, page %d" msgstr "%s and friends, page %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s and friends" @@ -108,6 +110,7 @@ msgid "You and friends" msgstr "You and friends" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Updates from %1$s and friends on %2$s!" @@ -227,8 +230,8 @@ msgstr "All the direct messages sent to %s" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -587,7 +590,7 @@ msgid "Preview" msgstr "Preview" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 msgid "Delete" msgstr "Delete" @@ -813,7 +816,7 @@ msgstr "Are you sure you want to delete this notice?" msgid "Do not delete this notice" msgstr "Do not delete this notice" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 msgid "Delete this notice" msgstr "Delete this notice" @@ -1950,7 +1953,7 @@ msgid "You can't send a message to this user." msgstr "You can't send a message to this user." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "No content!" @@ -1968,7 +1971,7 @@ msgstr "" msgid "Message sent" msgstr "Message sent" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "Direct message to %s sent" @@ -2059,8 +2062,8 @@ msgstr "Connect" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "Not a supported data format." @@ -2871,12 +2874,12 @@ msgstr "You can't register if you don't agree to the licence." msgid "You already repeated that notice." msgstr "You have already blocked this user." -#: actions/repeat.php:112 lib/noticelist.php:627 +#: actions/repeat.php:114 lib/noticelist.php:621 #, fuzzy msgid "Repeated" msgstr "Created" -#: actions/repeat.php:115 +#: actions/repeat.php:119 #, fuzzy msgid "Repeated!" msgstr "Created" @@ -4010,22 +4013,22 @@ msgstr "Could not update message with new URI." msgid "DB error inserting hashtag: %s" msgstr "DB error inserting hashtag: %s" -#: classes/Notice.php:196 +#: classes/Notice.php:226 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Problem saving notice." -#: classes/Notice.php:200 +#: classes/Notice.php:230 msgid "Problem saving notice. Unknown user." msgstr "Problem saving notice. Unknown user." -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Too many notices too fast; take a breather and post again in a few minutes." -#: classes/Notice.php:211 +#: classes/Notice.php:241 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4033,25 +4036,25 @@ msgid "" msgstr "" "Too many notices too fast; take a breather and post again in a few minutes." -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "You are banned from posting notices on this site." -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "Problem saving notice." -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "DB error inserting reply: %s" -#: classes/Notice.php:1320 +#: classes/Notice.php:1371 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:347 +#: classes/User.php:368 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Welcome to %1$s, @%2$s!" @@ -4370,12 +4373,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "User has no last notice" @@ -4408,135 +4411,135 @@ msgstr "Homepage: %s" msgid "About: %s" msgstr "About: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Message too long - maximum is %d characters, you sent %d" -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "Error sending direct message." -#: lib/command.php:421 +#: lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Can't turn on notification." -#: lib/command.php:426 +#: lib/command.php:427 #, fuzzy msgid "Already repeated that notice" msgstr "Delete this notice" -#: lib/command.php:434 +#: lib/command.php:435 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Notice posted" -#: lib/command.php:436 +#: lib/command.php:437 #, fuzzy msgid "Error repeating notice." msgstr "Error saving notice." -#: lib/command.php:490 +#: lib/command.php:491 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Notice too long - maximum is %d characters, you sent %d" -#: lib/command.php:499 +#: lib/command.php:500 #, php-format msgid "Reply to %s sent" msgstr "Reply to %s sent" -#: lib/command.php:501 +#: lib/command.php:502 msgid "Error saving notice." msgstr "Error saving notice." -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "Specify the name of the user to subscribe to" -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "Subscribed to %s" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "Specify the name of the user to unsubscribe from" -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "Unsubscribed from %s" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "Command not yet implemented." -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "Notification off." -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "Can't turn off notification." -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "Notification on." -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "Can't turn on notification." -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "" -#: lib/command.php:663 +#: lib/command.php:664 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Could not create aliases" -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:684 +#: lib/command.php:685 #, fuzzy msgid "You are not subscribed to anyone." msgstr "You are not subscribed to that profile." -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "You are already subscribed to these users:" msgstr[1] "You are already subscribed to these users:" -#: lib/command.php:706 +#: lib/command.php:707 #, fuzzy msgid "No one is subscribed to you." msgstr "Could not subscribe other to you." -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Could not subscribe other to you." msgstr[1] "Could not subscribe other to you." -#: lib/command.php:728 +#: lib/command.php:729 #, fuzzy msgid "You are not a member of any groups." msgstr "You are not a member of that group." -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "You are not a member of that group." msgstr[1] "You are not a member of that group." -#: lib/command.php:744 +#: lib/command.php:745 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5021,7 +5024,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 #, fuzzy msgid "from" msgstr "from" @@ -5107,49 +5110,54 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 #, fuzzy msgid "N" msgstr "No" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 msgid "in context" msgstr "in context" -#: lib/noticelist.php:549 +#: lib/noticelist.php:548 #, fuzzy msgid "Repeated by" msgstr "Created" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 msgid "Reply to this notice" msgstr "Reply to this notice" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 msgid "Reply" msgstr "Reply" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "Notice deleted." + #: lib/nudgeform.php:116 msgid "Nudge this user" msgstr "Nudge this user" @@ -5458,47 +5466,47 @@ msgstr "Message" msgid "Moderate" msgstr "" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "a few seconds ago" -#: lib/util.php:827 +#: lib/util.php:831 msgid "about a minute ago" msgstr "about a minute ago" -#: lib/util.php:829 +#: lib/util.php:833 #, php-format msgid "about %d minutes ago" msgstr "about %d minutes ago" -#: lib/util.php:831 +#: lib/util.php:835 msgid "about an hour ago" msgstr "about an hour ago" -#: lib/util.php:833 +#: lib/util.php:837 #, php-format msgid "about %d hours ago" msgstr "about %d hours ago" -#: lib/util.php:835 +#: lib/util.php:839 msgid "about a day ago" msgstr "about a day ago" -#: lib/util.php:837 +#: lib/util.php:841 #, php-format msgid "about %d days ago" msgstr "about %d days ago" -#: lib/util.php:839 +#: lib/util.php:843 msgid "about a month ago" msgstr "about a month ago" -#: lib/util.php:841 +#: lib/util.php:845 #, php-format msgid "about %d months ago" msgstr "about %d months ago" -#: lib/util.php:843 +#: lib/util.php:847 msgid "about a year ago" msgstr "about a year ago" diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index 5229e13157..255a18258a 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -11,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:34:39+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:52:08+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: es\n" "X-Message-Group: out-statusnet\n" @@ -38,17 +38,18 @@ msgstr "No existe tal página" #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "No existe ese usuario." @@ -58,7 +59,8 @@ msgid "%s and friends, page %d" msgstr "%s y amigos, página %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s y amigos" @@ -110,6 +112,7 @@ msgid "You and friends" msgstr "Tú y amigos" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "¡Actualizaciones de %1$s y amigos en %2$s!" @@ -233,8 +236,8 @@ msgstr "Todos los mensajes directos enviados a %s" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -595,7 +598,7 @@ msgid "Preview" msgstr "Vista previa" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 msgid "Delete" msgstr "Borrar" @@ -827,7 +830,7 @@ msgstr "¿Estás seguro de que quieres eliminar este aviso?" msgid "Do not delete this notice" msgstr "No se puede eliminar este aviso." -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 msgid "Delete this notice" msgstr "Borrar este aviso" @@ -1994,7 +1997,7 @@ msgid "You can't send a message to this user." msgstr "No puedes enviar mensaje a este usuario." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "¡Ningún contenido!" @@ -2012,7 +2015,7 @@ msgstr "No te auto envíes un mensaje; dícetelo a ti mismo." msgid "Message sent" msgstr "Mensaje" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "Se envió mensaje directo a %s" @@ -2106,8 +2109,8 @@ msgstr "Conectarse" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "No es un formato de dato soportado" @@ -2938,12 +2941,12 @@ msgstr "No puedes registrarte si no estás de acuerdo con la licencia." msgid "You already repeated that notice." msgstr "Ya has bloqueado este usuario." -#: actions/repeat.php:112 lib/noticelist.php:627 +#: actions/repeat.php:114 lib/noticelist.php:621 #, fuzzy msgid "Repeated" msgstr "Crear" -#: actions/repeat.php:115 +#: actions/repeat.php:119 #, fuzzy msgid "Repeated!" msgstr "Crear" @@ -4108,24 +4111,24 @@ msgstr "No se pudo actualizar mensaje con nuevo URI." msgid "DB error inserting hashtag: %s" msgstr "Error de la BD al insertar la etiqueta clave: %s" -#: classes/Notice.php:196 +#: classes/Notice.php:226 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Hubo un problema al guardar el aviso." -#: classes/Notice.php:200 +#: classes/Notice.php:230 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Hubo problemas al guardar el aviso. Usuario desconocido." -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Demasiados avisos demasiado rápido; para y publicar nuevamente en unos " "minutos." -#: classes/Notice.php:211 +#: classes/Notice.php:241 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4134,25 +4137,25 @@ msgstr "" "Demasiados avisos demasiado rápido; para y publicar nuevamente en unos " "minutos." -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "Tienes prohibido publicar avisos en este sitio." -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "Hubo un problema al guardar el aviso." -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "Error de BD al insertar respuesta: %s" -#: classes/Notice.php:1320 +#: classes/Notice.php:1371 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:347 +#: classes/User.php:368 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Mensaje a %1$s en %2$s" @@ -4480,12 +4483,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "Usuario no tiene último aviso" @@ -4518,136 +4521,136 @@ msgstr "Página de inicio: %s" msgid "About: %s" msgstr "Sobre: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Mensaje muy largo - máximo 140 caracteres, enviaste %d" -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "Error al enviar mensaje directo." -#: lib/command.php:421 +#: lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice" msgstr "No se puede activar notificación." -#: lib/command.php:426 +#: lib/command.php:427 #, fuzzy msgid "Already repeated that notice" msgstr "Borrar este aviso" -#: lib/command.php:434 +#: lib/command.php:435 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Aviso publicado" -#: lib/command.php:436 +#: lib/command.php:437 #, fuzzy msgid "Error repeating notice." msgstr "Hubo un problema al guardar el aviso." -#: lib/command.php:490 +#: lib/command.php:491 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Mensaje muy largo - máximo 140 caracteres, enviaste %d" -#: lib/command.php:499 +#: lib/command.php:500 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Responder este aviso." -#: lib/command.php:501 +#: lib/command.php:502 #, fuzzy msgid "Error saving notice." msgstr "Hubo un problema al guardar el aviso." -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "Especificar el nombre del usuario a suscribir" -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "Suscrito a %s" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "Especificar el nombre del usuario para desuscribirse de" -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "Desuscrito de %s" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "Todavía no se implementa comando." -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "Notificación no activa." -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "No se puede desactivar notificación." -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "Notificación activada." -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "No se puede activar notificación." -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "" -#: lib/command.php:663 +#: lib/command.php:664 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "No se pudo crear favorito." -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:684 +#: lib/command.php:685 #, fuzzy msgid "You are not subscribed to anyone." msgstr "No estás suscrito a ese perfil." -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Ya estás suscrito a estos usuarios:" msgstr[1] "Ya estás suscrito a estos usuarios:" -#: lib/command.php:706 +#: lib/command.php:707 #, fuzzy msgid "No one is subscribed to you." msgstr "No se pudo suscribir otro a ti." -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "No se pudo suscribir otro a ti." msgstr[1] "No se pudo suscribir otro a ti." -#: lib/command.php:728 +#: lib/command.php:729 #, fuzzy msgid "You are not a member of any groups." msgstr "No eres miembro de ese grupo" -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "No eres miembro de este grupo." msgstr[1] "No eres miembro de este grupo." -#: lib/command.php:744 +#: lib/command.php:745 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5134,7 +5137,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 msgid "from" msgstr "desde" @@ -5221,49 +5224,54 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 #, fuzzy msgid "N" msgstr "No" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 msgid "in context" msgstr "en contexto" -#: lib/noticelist.php:549 +#: lib/noticelist.php:548 #, fuzzy msgid "Repeated by" msgstr "Crear" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 msgid "Reply to this notice" msgstr "Responder este aviso." -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 msgid "Reply" msgstr "Responder" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "Aviso borrado" + #: lib/nudgeform.php:116 msgid "Nudge this user" msgstr "Enviar zumbido a este usuario" @@ -5583,47 +5591,47 @@ msgstr "Mensaje" msgid "Moderate" msgstr "" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "hace unos segundos" -#: lib/util.php:827 +#: lib/util.php:831 msgid "about a minute ago" msgstr "hace un minuto" -#: lib/util.php:829 +#: lib/util.php:833 #, php-format msgid "about %d minutes ago" msgstr "hace %d minutos" -#: lib/util.php:831 +#: lib/util.php:835 msgid "about an hour ago" msgstr "hace una hora" -#: lib/util.php:833 +#: lib/util.php:837 #, php-format msgid "about %d hours ago" msgstr "hace %d horas" -#: lib/util.php:835 +#: lib/util.php:839 msgid "about a day ago" msgstr "hace un día" -#: lib/util.php:837 +#: lib/util.php:841 #, php-format msgid "about %d days ago" msgstr "hace %d días" -#: lib/util.php:839 +#: lib/util.php:843 msgid "about a month ago" msgstr "hace un mes" -#: lib/util.php:841 +#: lib/util.php:845 #, php-format msgid "about %d months ago" msgstr "hace %d meses" -#: lib/util.php:843 +#: lib/util.php:847 msgid "about a year ago" msgstr "hace un año" diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index 57469a98e8..33878f8ebd 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: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:34:42+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:52:12+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fi\n" "X-Message-Group: out-statusnet\n" @@ -37,17 +37,18 @@ msgstr "Sivua ei ole." #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Käyttäjää ei ole." @@ -57,7 +58,8 @@ msgid "%s and friends, page %d" msgstr "%s ja kaverit, sivu %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s ja kaverit" @@ -113,6 +115,7 @@ msgid "You and friends" msgstr "Sinä ja kaverit" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!" @@ -235,8 +238,8 @@ msgstr "Kaikki suorat viestit käyttäjälle %s" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -598,7 +601,7 @@ msgid "Preview" msgstr "Esikatselu" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 msgid "Delete" msgstr "Poista" @@ -824,7 +827,7 @@ msgstr "Oletko varma että haluat poistaa tämän päivityksen?" msgid "Do not delete this notice" msgstr "Älä poista tätä päivitystä" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 msgid "Delete this notice" msgstr "Poista tämä päivitys" @@ -1962,7 +1965,7 @@ msgid "You can't send a message to this user." msgstr "Et voi lähettää viestiä tälle käyttäjälle." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "Ei sisältöä!" @@ -1979,7 +1982,7 @@ msgstr "Älä lähetä viestiä itsellesi, vaan kuiskaa se vain hiljaa itsellesi msgid "Message sent" msgstr "Viesti lähetetty" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "Suora viesti käyttäjälle %s lähetetty" @@ -2073,8 +2076,8 @@ msgstr "Yhdistä" msgid "Only " msgstr "Vain " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "Tuo ei ole tuettu tietomuoto." @@ -2898,12 +2901,12 @@ msgstr "Et voi rekisteröityä, jos et hyväksy lisenssiehtoja." msgid "You already repeated that notice." msgstr "Sinä olet jo estänyt tämän käyttäjän." -#: actions/repeat.php:112 lib/noticelist.php:627 +#: actions/repeat.php:114 lib/noticelist.php:621 #, fuzzy msgid "Repeated" msgstr "Luotu" -#: actions/repeat.php:115 +#: actions/repeat.php:119 #, fuzzy msgid "Repeated!" msgstr "Luotu" @@ -4053,23 +4056,23 @@ msgstr "Viestin päivittäminen uudella URI-osoitteella ei onnistunut." msgid "DB error inserting hashtag: %s" msgstr "Tietokantavirhe tallennettaessa risutagiä: %s" -#: classes/Notice.php:196 +#: classes/Notice.php:226 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Ongelma päivityksen tallentamisessa." -#: classes/Notice.php:200 +#: classes/Notice.php:230 msgid "Problem saving notice. Unknown user." msgstr "Virhe tapahtui päivityksen tallennuksessa. Tuntematon käyttäjä." -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Liian monta päivitystä liian nopeasti; pidä pieni hengähdystauko ja jatka " "päivityksien lähettämista muutaman minuutin päästä." -#: classes/Notice.php:211 +#: classes/Notice.php:241 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4077,25 +4080,25 @@ msgstr "" "Liian monta päivitystä liian nopeasti; pidä pieni hengähdystauko ja jatka " "päivityksien lähettämista muutaman minuutin päästä." -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "Päivityksesi tähän palveluun on estetty." -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "Ongelma päivityksen tallentamisessa." -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "Tietokantavirhe tallennettaessa vastausta: %s" -#: classes/Notice.php:1320 +#: classes/Notice.php:1371 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:347 +#: classes/User.php:368 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Viesti käyttäjälle %1$s, %2$s" @@ -4418,12 +4421,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "Käyttäjällä ei ole viimeistä päivitystä" @@ -4456,136 +4459,136 @@ msgstr "Kotisivu: %s" msgid "About: %s" msgstr "Tietoa: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d" -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "Tapahtui virhe suoran viestin lähetyksessä." -#: lib/command.php:421 +#: lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Ilmoituksia ei voi pistää päälle." -#: lib/command.php:426 +#: lib/command.php:427 #, fuzzy msgid "Already repeated that notice" msgstr "Poista tämä päivitys" -#: lib/command.php:434 +#: lib/command.php:435 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Päivitys lähetetty" -#: lib/command.php:436 +#: lib/command.php:437 #, fuzzy msgid "Error repeating notice." msgstr "Ongelma päivityksen tallentamisessa." -#: lib/command.php:490 +#: lib/command.php:491 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d" -#: lib/command.php:499 +#: lib/command.php:500 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Vastaa tähän päivitykseen" -#: lib/command.php:501 +#: lib/command.php:502 #, fuzzy msgid "Error saving notice." msgstr "Ongelma päivityksen tallentamisessa." -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "Anna käyttäjätunnus, jonka päivitykset haluat tilata" -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "Käyttäjän %s päivitykset tilattu" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "Anna käyttäjätunnus, jonka päivityksien tilauksen haluat lopettaa" -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "Käyttäjän %s päivitysten tilaus lopetettu" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "Komentoa ei ole vielä toteutettu." -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "Ilmoitukset pois päältä." -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "Ilmoituksia ei voi pistää pois päältä." -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "Ilmoitukset päällä." -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "Ilmoituksia ei voi pistää päälle." -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "" -#: lib/command.php:663 +#: lib/command.php:664 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Ei voitu lisätä aliasta." -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:684 +#: lib/command.php:685 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Et ole tilannut tämän käyttäjän päivityksiä." -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Olet jos tilannut seuraavien käyttäjien päivitykset:" msgstr[1] "Olet jos tilannut seuraavien käyttäjien päivitykset:" -#: lib/command.php:706 +#: lib/command.php:707 #, fuzzy msgid "No one is subscribed to you." msgstr "Toista ei voitu asettaa tilaamaan sinua." -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Toista ei voitu asettaa tilaamaan sinua." msgstr[1] "Toista ei voitu asettaa tilaamaan sinua." -#: lib/command.php:728 +#: lib/command.php:729 #, fuzzy msgid "You are not a member of any groups." msgstr "Sinä et kuulu tähän ryhmään." -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Sinä et kuulu tähän ryhmään." msgstr[1] "Sinä et kuulu tähän ryhmään." -#: lib/command.php:744 +#: lib/command.php:745 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5076,7 +5079,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 #, fuzzy msgid "from" msgstr " lähteestä " @@ -5162,50 +5165,55 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 #, fuzzy msgid "N" msgstr "Ei" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 #, fuzzy msgid "in context" msgstr "Ei sisältöä!" -#: lib/noticelist.php:549 +#: lib/noticelist.php:548 #, fuzzy msgid "Repeated by" msgstr "Luotu" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 msgid "Reply to this notice" msgstr "Vastaa tähän päivitykseen" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 msgid "Reply" msgstr "Vastaus" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "Päivitys on poistettu." + #: lib/nudgeform.php:116 msgid "Nudge this user" msgstr "Tönäise tätä käyttäjää" @@ -5526,47 +5534,47 @@ msgstr "Viesti" msgid "Moderate" msgstr "" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "muutama sekunti sitten" -#: lib/util.php:827 +#: lib/util.php:831 msgid "about a minute ago" msgstr "noin minuutti sitten" -#: lib/util.php:829 +#: lib/util.php:833 #, php-format msgid "about %d minutes ago" msgstr "noin %d minuuttia sitten" -#: lib/util.php:831 +#: lib/util.php:835 msgid "about an hour ago" msgstr "noin tunti sitten" -#: lib/util.php:833 +#: lib/util.php:837 #, php-format msgid "about %d hours ago" msgstr "noin %d tuntia sitten" -#: lib/util.php:835 +#: lib/util.php:839 msgid "about a day ago" msgstr "noin päivä sitten" -#: lib/util.php:837 +#: lib/util.php:841 #, php-format msgid "about %d days ago" msgstr "noin %d päivää sitten" -#: lib/util.php:839 +#: lib/util.php:843 msgid "about a month ago" msgstr "noin kuukausi sitten" -#: lib/util.php:841 +#: lib/util.php:845 #, php-format msgid "about %d months ago" msgstr "noin %d kuukautta sitten" -#: lib/util.php:843 +#: lib/util.php:847 msgid "about a year ago" msgstr "noin vuosi sitten" diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 4c2942a9c2..8b0a52a208 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -13,12 +13,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:34:44+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:52:14+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" "X-Message-Group: out-statusnet\n" @@ -40,17 +40,18 @@ msgstr "Page non trouvée" #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Utilisateur non trouvé." @@ -60,7 +61,8 @@ msgid "%s and friends, page %d" msgstr "%s et ses amis - page %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s et ses amis" @@ -121,6 +123,7 @@ msgid "You and friends" msgstr "Vous et vos amis" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Statuts de %1$s et ses amis dans %2$s!" @@ -241,8 +244,8 @@ msgstr "Tous les messages envoyés à %s" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -446,14 +449,12 @@ msgid "No such notice." msgstr "Avis non trouvé." #: actions/apistatusesretweet.php:83 -#, fuzzy msgid "Cannot repeat your own notice." -msgstr "Impossible d’activer les avertissements." +msgstr "Vous ne pouvez pas reprendre votre propre avis." #: actions/apistatusesretweet.php:91 -#, fuzzy msgid "Already repeated that notice." -msgstr "Supprimer cet avis" +msgstr "Vous avez déjà repris cet avis." #: actions/apistatusesshow.php:138 msgid "Status deleted." @@ -529,17 +530,17 @@ msgstr "%s statuts de tout le monde !" #: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" -msgstr "" +msgstr "Repris par %s" #: actions/apitimelineretweetedtome.php:111 -#, fuzzy, php-format +#, php-format msgid "Repeated to %s" -msgstr "Réponses à %s" +msgstr "Repris pour %s" #: actions/apitimelineretweetsofme.php:112 -#, fuzzy, php-format +#, php-format msgid "Repeats of %s" -msgstr "Réponses à %s" +msgstr "Reprises de %s" #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format @@ -606,7 +607,7 @@ msgid "Preview" msgstr "Aperçu" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 msgid "Delete" msgstr "Supprimer" @@ -833,7 +834,7 @@ msgstr "Êtes-vous sûr(e) de vouloir supprimer cet avis ?" msgid "Do not delete this notice" msgstr "Ne pas supprimer cet avis" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 msgid "Delete this notice" msgstr "Supprimer cet avis" @@ -1283,24 +1284,20 @@ msgid "A selection of some of the great users on %s" msgstr "Les utilisateurs à ne pas manquer dans %s" #: actions/file.php:34 -#, fuzzy msgid "No notice ID." -msgstr "Aucun avis" +msgstr "Aucun identifiant d'avis." #: actions/file.php:38 -#, fuzzy msgid "No notice." -msgstr "Aucun avis" +msgstr "Aucun avis." #: actions/file.php:42 -#, fuzzy msgid "No attachments." -msgstr "Aucune pièce jointe" +msgstr "Aucune pièce jointe." #: actions/file.php:51 -#, fuzzy msgid "No uploaded attachments." -msgstr "Aucune pièce jointe importée" +msgstr "Aucune pièce jointe importée." #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1891,9 +1888,10 @@ msgid "Incorrect username or password." msgstr "Identifiant ou mot de passe incorrect." #: actions/login.php:153 -#, fuzzy msgid "Error setting user. You are probably not authorized." -msgstr "Abonnements par défaut" +msgstr "" +"Erreur lors de la mise en place de l'utilisateur. Vous n'y êtes probablement " +"pas autorisé." #: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 @@ -1990,7 +1988,7 @@ msgid "You can't send a message to this user." msgstr "Vous ne pouvez pas envoyer de messages à cet utilisateur." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "Aucun contenu !" @@ -2008,7 +2006,7 @@ msgstr "" msgid "Message sent" msgstr "Message envoyé" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "Votre message a été envoyé à %s" @@ -2104,8 +2102,8 @@ msgstr "type de contenu " msgid "Only " msgstr "Seulement " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "Format de données non supporté." @@ -2914,34 +2912,28 @@ msgid "Couldn’t get a request token." msgstr "Impossible d’obtenir un jeton de requête." #: actions/repeat.php:57 -#, fuzzy msgid "Only logged-in users can repeat notices." -msgstr "L’accès à cette boîte de réception est réservé à son utilisateur." +msgstr "Seuls les utilisateurs identifiés peuvent reprendre des avis." #: actions/repeat.php:64 actions/repeat.php:71 -#, fuzzy msgid "No notice specified." -msgstr "Aucun profil n’a été spécifié." +msgstr "Aucun avis n’a été spécifié." #: actions/repeat.php:76 -#, fuzzy msgid "You can't repeat your own notice." -msgstr "Vous devez accepter les termes de la licence pour créer un compte." +msgstr "Vous ne pouvez pas reprendre votre propre avis." #: actions/repeat.php:90 -#, fuzzy msgid "You already repeated that notice." -msgstr "Vous avez déjà bloqué cet utilisateur." +msgstr "Vous avez déjà repris cet avis." -#: actions/repeat.php:112 lib/noticelist.php:627 -#, fuzzy +#: actions/repeat.php:114 lib/noticelist.php:621 msgid "Repeated" -msgstr "Créé" +msgstr "Repris" -#: actions/repeat.php:115 -#, fuzzy +#: actions/repeat.php:119 msgid "Repeated!" -msgstr "Créé" +msgstr "Repris !" #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 @@ -3282,9 +3274,9 @@ msgstr "" "status.net/). " #: actions/showstream.php:313 -#, fuzzy, php-format +#, php-format msgid "Repeat of %s" -msgstr "Réponses à %s" +msgstr "Reprises de %s" #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." @@ -3758,9 +3750,8 @@ msgid "Notice feed for tag %s (Atom)" msgstr "Flux des avis pour la marque %s (Atom)" #: actions/tagother.php:39 -#, fuzzy msgid "No ID argument." -msgstr "Aucun argument d’identification." +msgstr "Aucun argument d'identifiant." #: actions/tagother.php:65 #, php-format @@ -4035,9 +4026,8 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "Format d’image invalide pour l’URL de l’avatar « %s »." #: actions/userbyid.php:70 -#, fuzzy msgid "No ID." -msgstr "Aucun identifiant" +msgstr "Aucun identifiant." #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" @@ -4112,22 +4102,22 @@ msgstr "Impossible de mettre à jour le message avec un nouvel URI." msgid "DB error inserting hashtag: %s" msgstr "Erreur de base de donnée en insérant la marque (hashtag) : %s" -#: classes/Notice.php:196 +#: classes/Notice.php:226 msgid "Problem saving notice. Too long." msgstr "Problème lors de l’enregistrement de l’avis ; trop long." -#: classes/Notice.php:200 +#: classes/Notice.php:230 msgid "Problem saving notice. Unknown user." msgstr "Erreur lors de l’enregistrement de l’avis. Utilisateur inconnu." -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Trop d’avis, trop vite ! Faites une pause et publiez à nouveau dans quelques " "minutes." -#: classes/Notice.php:211 +#: classes/Notice.php:241 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4135,25 +4125,25 @@ msgstr "" "Trop de messages en double trop vite ! Prenez une pause et publiez à nouveau " "dans quelques minutes." -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "Il vous est interdit de poster des avis sur ce site." -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "Problème lors de l’enregistrement de l’avis." -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "Erreur de base de donnée en insérant la réponse :%s" -#: classes/Notice.php:1320 -#, fuzzy, php-format +#: classes/Notice.php:1371 +#, php-format msgid "RT @%1$s %2$s" -msgstr "%1$s (%2$s)" +msgstr "RT @%1$s %2$s" -#: classes/User.php:347 +#: classes/User.php:368 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Bienvenu à %1$s, @%2$s !" @@ -4466,12 +4456,12 @@ msgstr "" "Abonnés : %2$s\n" "Messages : %3$s" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "Aucun avis avec cet identifiant n’existe" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "Aucun avis récent pour cet utilisateur" @@ -4504,139 +4494,135 @@ msgstr "Site Web : %s" msgid "About: %s" msgstr "À propos : %s" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" "Message trop long ! La taille maximale est de %d caractères ; vous en avez " "entré %d." -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "Une erreur est survenue pendant l’envoi de votre message." -#: lib/command.php:421 -#, fuzzy +#: lib/command.php:422 msgid "Cannot repeat your own notice" -msgstr "Impossible d’activer les avertissements." +msgstr "Impossible de reprendre votre propre avis" -#: lib/command.php:426 -#, fuzzy +#: lib/command.php:427 msgid "Already repeated that notice" -msgstr "Supprimer cet avis" +msgstr "Avis déjà repris" -#: lib/command.php:434 -#, fuzzy, php-format +#: lib/command.php:435 +#, php-format msgid "Notice from %s repeated" -msgstr "Avis publié" +msgstr "Avis de %s repris" -#: lib/command.php:436 -#, fuzzy +#: lib/command.php:437 msgid "Error repeating notice." -msgstr "Problème lors de l’enregistrement de l’avis." +msgstr "Erreur lors de la reprise de l'avis." -#: lib/command.php:490 +#: lib/command.php:491 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" "Avis trop long ! La taille maximale est de %d caractères ; vous en avez " "entré %d." -#: lib/command.php:499 +#: lib/command.php:500 #, php-format msgid "Reply to %s sent" msgstr "Réponse à %s envoyée" -#: lib/command.php:501 +#: lib/command.php:502 msgid "Error saving notice." msgstr "Problème lors de l’enregistrement de l’avis." -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "Indiquez le nom de l’utilisateur auquel vous souhaitez vous abonner" -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "Abonné à %s" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "Indiquez le nom de l’utilisateur duquel vous souhaitez vous désabonner" -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "Désabonné de %s" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "Cette commande n’a pas encore été implémentée." -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "Avertissements désactivés." -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "Impossible de désactiver les avertissements." -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "Avertissements activés." -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "Impossible d’activer les avertissements." -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "La commande d'ouverture de session est désactivée" -#: lib/command.php:663 +#: lib/command.php:664 #, php-format msgid "Could not create login token for %s" msgstr "Impossible de créer le jeton d'ouverture de session pour %s" -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" "Ce lien n’est utilisable qu’une seule fois, et est valable uniquement " "pendant 2 minutes : %s" -#: lib/command.php:684 +#: lib/command.php:685 msgid "You are not subscribed to anyone." msgstr "Vous n'êtes pas abonné(e) à personne." -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Vous êtes abonné à cette personne :" msgstr[1] "Vous êtes abonné à ces personnes :" -#: lib/command.php:706 +#: lib/command.php:707 msgid "No one is subscribed to you." msgstr "Personne ne s'est abonné à vous." -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Cette personne est abonnée à vous :" msgstr[1] "Ces personnes sont abonnées à vous :" -#: lib/command.php:728 +#: lib/command.php:729 msgid "You are not a member of any groups." msgstr "Vous n'êtes pas membre d'aucun groupe." -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Vous êtes membre de ce groupe :" msgstr[1] "Vous êtes membre de ces groupes :" -#: lib/command.php:744 -#, fuzzy +#: lib/command.php:745 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4681,16 +4667,18 @@ msgstr "" "off - désactiver les notifications\n" "help - montrer cette aide\n" "follow - s’abonner à l’utilisateur\n" -"groups - lister les groupes que vous avez joints\n" +"groups - lister les groupes que vous avez rejoints\n" "subscriptions - lister les personnes que vous suivez\n" "subscribers - lister les personnes qui vous suivent\n" "leave - se désabonner de l’utilisateur\n" "d - message direct à l’utilisateur\n" "get - obtenir le dernier avis de l’utilisateur\n" -"whois - obtenir le profil de cet utilisateur\n" +"whois - obtenir le profil de l'utilisateur\n" "fav - ajouter de dernier avis de l’utilisateur comme favori\n" "fav # - ajouter l’avis correspondant à l’identifiant comme " "favori\n" +"repeat # - reprendre l'avis correspondant à l'identifiant\n" +"repeat - reprendre le dernier avis de l'utilisateur\n" "reply # - répondre à l’avis correspondant à l’identifiant\n" "reply - répondre au dernier avis de l’utilisateur\n" "join - rejoindre le groupe\n" @@ -5230,7 +5218,7 @@ msgstr "" "pour démarrer des conversations avec d’autres utilisateurs. Ceux-ci peuvent " "vous envoyer des messages destinés à vous seul(e)." -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 msgid "from" msgstr "de" @@ -5319,48 +5307,52 @@ msgstr "Attacher" msgid "Attach a file" msgstr "Attacher un fichier" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "%1$u° %2$u' %3$u\" %4$s %5$u° %6$u' %7$u\" %8$s" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "N" msgstr "N" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "S" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "E" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "O" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "chez" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 msgid "in context" msgstr "dans le contexte" -#: lib/noticelist.php:549 -#, fuzzy +#: lib/noticelist.php:548 msgid "Repeated by" -msgstr "Créé" +msgstr "Repris par" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 msgid "Reply to this notice" msgstr "Répondre à cet avis" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 msgid "Reply" msgstr "Répondre" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "Avis supprimé." + #: lib/nudgeform.php:116 msgid "Nudge this user" msgstr "Envoyer un clin d’œil à cet utilisateur" @@ -5459,14 +5451,12 @@ msgid "All groups" msgstr "Tous les groupes" #: lib/profileformaction.php:123 -#, fuzzy msgid "No return-to arguments." msgstr "Aucun argument de retour." #: lib/profileformaction.php:137 -#, fuzzy msgid "Unimplemented method." -msgstr "méthode non implémentée" +msgstr "Méthode non- implémentée." #: lib/publicgroupnav.php:78 msgid "Public" @@ -5489,14 +5479,12 @@ msgid "Popular" msgstr "Populaires" #: lib/repeatform.php:107 lib/repeatform.php:132 -#, fuzzy msgid "Repeat this notice" -msgstr "Répondre à cet avis" +msgstr "Reprendre cet avis" #: lib/repeatform.php:132 -#, fuzzy msgid "Repeat" -msgstr "Réinitialiser" +msgstr "Reprendre" #: lib/sandboxform.php:67 msgid "Sandbox" @@ -5667,47 +5655,47 @@ msgstr "Message" msgid "Moderate" msgstr "Modérer" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "il y a quelques secondes" -#: lib/util.php:827 +#: lib/util.php:831 msgid "about a minute ago" msgstr "il y a 1 minute" -#: lib/util.php:829 +#: lib/util.php:833 #, php-format msgid "about %d minutes ago" msgstr "il y a %d minutes" -#: lib/util.php:831 +#: lib/util.php:835 msgid "about an hour ago" msgstr "il y a 1 heure" -#: lib/util.php:833 +#: lib/util.php:837 #, php-format msgid "about %d hours ago" msgstr "il y a %d heures" -#: lib/util.php:835 +#: lib/util.php:839 msgid "about a day ago" msgstr "il y a 1 jour" -#: lib/util.php:837 +#: lib/util.php:841 #, php-format msgid "about %d days ago" msgstr "il y a %d jours" -#: lib/util.php:839 +#: lib/util.php:843 msgid "about a month ago" msgstr "il y a 1 mois" -#: lib/util.php:841 +#: lib/util.php:845 #, php-format msgid "about %d months ago" msgstr "il y a %d mois" -#: lib/util.php:843 +#: lib/util.php:847 msgid "about a year ago" msgstr "il y a environ 1 an" diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index 37f7a4ce44..1b54c763f6 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: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:34:47+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:52:17+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ga\n" "X-Message-Group: out-statusnet\n" @@ -37,17 +37,18 @@ msgstr "Non existe a etiqueta." #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Ningún usuario." @@ -57,7 +58,8 @@ msgid "%s and friends, page %d" msgstr "%s e amigos" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s e amigos" @@ -110,6 +112,7 @@ msgid "You and friends" msgstr "%s e amigos" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Actualizacións dende %1$s e amigos en %2$s!" @@ -232,8 +235,8 @@ msgstr "Tódalas mensaxes directas enviadas a %s" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -604,7 +607,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 #, fuzzy msgid "Delete" msgstr "eliminar" @@ -842,7 +845,7 @@ msgstr "Estas seguro que queres eliminar este chío?" msgid "Do not delete this notice" msgstr "Non se pode eliminar este chíos." -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 #, fuzzy msgid "Delete this notice" msgstr "Eliminar chío" @@ -2002,7 +2005,7 @@ msgid "You can't send a message to this user." msgstr "Non podes enviar mensaxes a este usurio." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "Sen contido!" @@ -2022,7 +2025,7 @@ msgstr "" msgid "Message sent" msgstr "Non hai mensaxes de texto!" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "Mensaxe directo a %s enviado" @@ -2114,8 +2117,8 @@ msgstr "Conectar" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "Non é un formato de datos soportado." @@ -2950,12 +2953,12 @@ msgstr "Non podes rexistrarte se non estas de acordo coa licenza." msgid "You already repeated that notice." msgstr "Xa bloqueaches a este usuario." -#: actions/repeat.php:112 lib/noticelist.php:627 +#: actions/repeat.php:114 lib/noticelist.php:621 #, fuzzy msgid "Repeated" msgstr "Crear" -#: actions/repeat.php:115 +#: actions/repeat.php:119 #, fuzzy msgid "Repeated!" msgstr "Crear" @@ -4125,23 +4128,23 @@ msgstr "Non se puido actualizar a mensaxe coa nova URI." msgid "DB error inserting hashtag: %s" msgstr "Erro ó inserir o hashtag na BD: %s" -#: classes/Notice.php:196 +#: classes/Notice.php:226 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Aconteceu un erro ó gardar o chío." -#: classes/Notice.php:200 +#: classes/Notice.php:230 msgid "Problem saving notice. Unknown user." msgstr "Aconteceu un erro ó gardar o chío. Usuario descoñecido." -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro " "duns minutos." -#: classes/Notice.php:211 +#: classes/Notice.php:241 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4150,25 +4153,25 @@ msgstr "" "Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro " "duns minutos." -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "Tes restrinxido o envio de chíos neste sitio." -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "Aconteceu un erro ó gardar o chío." -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "Erro ó inserir a contestación na BD: %s" -#: classes/Notice.php:1320 +#: classes/Notice.php:1371 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:347 +#: classes/User.php:368 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Mensaxe de %1$s en %2$s" @@ -4509,12 +4512,12 @@ msgstr "" "Suscriptores: %2$s\n" "Chíos: %3$s" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "O usuario non ten último chio." @@ -4547,108 +4550,108 @@ msgstr "Páxina persoal: %s" msgid "About: %s" msgstr "Sobre: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d " -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "Erro ó enviar a mensaxe directa." -#: lib/command.php:421 +#: lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Non se pode activar a notificación." -#: lib/command.php:426 +#: lib/command.php:427 #, fuzzy msgid "Already repeated that notice" msgstr "Eliminar chío" -#: lib/command.php:434 +#: lib/command.php:435 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Chío publicado" -#: lib/command.php:436 +#: lib/command.php:437 #, fuzzy msgid "Error repeating notice." msgstr "Aconteceu un erro ó gardar o chío." -#: lib/command.php:490 +#: lib/command.php:491 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d " -#: lib/command.php:499 +#: lib/command.php:500 #, php-format msgid "Reply to %s sent" msgstr "Non se pode eliminar este chíos." -#: lib/command.php:501 +#: lib/command.php:502 #, fuzzy msgid "Error saving notice." msgstr "Aconteceu un erro ó gardar o chío." -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "Especifica o nome do usuario ó que queres suscribirte" -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "Suscrito a %s" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "Especifica o nome de usuario ó que queres deixar de seguir" -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "Desuscribir de %s" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "Comando non implementado." -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "Notificación desactivada." -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "No se pode desactivar a notificación." -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "Notificación habilitada." -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "Non se pode activar a notificación." -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "" -#: lib/command.php:663 +#: lib/command.php:664 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Non se puido crear o favorito." -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:684 +#: lib/command.php:685 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Non estás suscrito a ese perfil" -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Xa estas suscrito a estes usuarios:" @@ -4657,12 +4660,12 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: lib/command.php:706 +#: lib/command.php:707 #, fuzzy msgid "No one is subscribed to you." msgstr "Outro usuario non se puido suscribir a ti." -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Outro usuario non se puido suscribir a ti." @@ -4671,12 +4674,12 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: lib/command.php:728 +#: lib/command.php:729 #, fuzzy msgid "You are not a member of any groups." msgstr "Non estás suscrito a ese perfil" -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Non estás suscrito a ese perfil" @@ -4685,7 +4688,7 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: lib/command.php:744 +#: lib/command.php:745 #, fuzzy msgid "" "Commands:\n" @@ -5254,7 +5257,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 #, fuzzy msgid "from" msgstr " dende " @@ -5343,52 +5346,57 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 #, fuzzy msgid "N" msgstr "No" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 #, fuzzy msgid "in context" msgstr "Sen contido!" -#: lib/noticelist.php:549 +#: lib/noticelist.php:548 #, fuzzy msgid "Repeated by" msgstr "Crear" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 #, fuzzy msgid "Reply to this notice" msgstr "Non se pode eliminar este chíos." -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 #, fuzzy msgid "Reply" msgstr "contestar" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "Chío publicado" + #: lib/nudgeform.php:116 #, fuzzy msgid "Nudge this user" @@ -5721,47 +5729,47 @@ msgstr "Nova mensaxe" msgid "Moderate" msgstr "" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "fai uns segundos" -#: lib/util.php:827 +#: lib/util.php:831 msgid "about a minute ago" msgstr "fai un minuto" -#: lib/util.php:829 +#: lib/util.php:833 #, php-format msgid "about %d minutes ago" msgstr "fai %d minutos" -#: lib/util.php:831 +#: lib/util.php:835 msgid "about an hour ago" msgstr "fai unha hora" -#: lib/util.php:833 +#: lib/util.php:837 #, php-format msgid "about %d hours ago" msgstr "fai %d horas" -#: lib/util.php:835 +#: lib/util.php:839 msgid "about a day ago" msgstr "fai un día" -#: lib/util.php:837 +#: lib/util.php:841 #, php-format msgid "about %d days ago" msgstr "fai %d días" -#: lib/util.php:839 +#: lib/util.php:843 msgid "about a month ago" msgstr "fai un mes" -#: lib/util.php:841 +#: lib/util.php:845 #, php-format msgid "about %d months ago" msgstr "fai %d meses" -#: lib/util.php:843 +#: lib/util.php:847 msgid "about a year ago" msgstr "fai un ano" diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 156b745f65..38af1633c6 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: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:34:50+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:52:20+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: he\n" "X-Message-Group: out-statusnet\n" @@ -35,17 +35,18 @@ msgstr "אין הודעה כזו." #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "אין משתמש כזה." @@ -55,7 +56,8 @@ msgid "%s and friends, page %d" msgstr "%s וחברים" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s וחברים" @@ -108,6 +110,7 @@ msgid "You and friends" msgstr "%s וחברים" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" @@ -229,8 +232,8 @@ msgstr "" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -597,7 +600,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 #, fuzzy msgid "Delete" msgstr "מחק" @@ -829,7 +832,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "אין הודעה כזו." -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 msgid "Delete this notice" msgstr "" @@ -1943,7 +1946,7 @@ msgid "You can't send a message to this user." msgstr "" #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "אין תוכן!" @@ -1961,7 +1964,7 @@ msgstr "" msgid "Message sent" msgstr "הודעה חדשה" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "" @@ -2052,8 +2055,8 @@ msgstr "התחבר" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "" @@ -2844,12 +2847,12 @@ msgstr "לא ניתן להירשם ללא הסכמה לרשיון" msgid "You already repeated that notice." msgstr "כבר נכנסת למערכת!" -#: actions/repeat.php:112 lib/noticelist.php:627 +#: actions/repeat.php:114 lib/noticelist.php:621 #, fuzzy msgid "Repeated" msgstr "צור" -#: actions/repeat.php:115 +#: actions/repeat.php:119 #, fuzzy msgid "Repeated!" msgstr "צור" @@ -3985,46 +3988,46 @@ msgstr "" msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:196 +#: classes/Notice.php:226 #, fuzzy msgid "Problem saving notice. Too long." msgstr "בעיה בשמירת ההודעה." -#: classes/Notice.php:200 +#: classes/Notice.php:230 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "בעיה בשמירת ההודעה." -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:211 +#: classes/Notice.php:241 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "בעיה בשמירת ההודעה." -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "שגיאת מסד נתונים בהכנסת התגובה: %s" -#: classes/Notice.php:1320 +#: classes/Notice.php:1371 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:347 +#: classes/User.php:368 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4352,12 +4355,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "" @@ -4390,134 +4393,134 @@ msgstr "" msgid "About: %s" msgstr "אודות: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "" -#: lib/command.php:421 +#: lib/command.php:422 msgid "Cannot repeat your own notice" msgstr "" -#: lib/command.php:426 +#: lib/command.php:427 msgid "Already repeated that notice" msgstr "" -#: lib/command.php:434 +#: lib/command.php:435 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "הודעות" -#: lib/command.php:436 +#: lib/command.php:437 #, fuzzy msgid "Error repeating notice." msgstr "בעיה בשמירת ההודעה." -#: lib/command.php:490 +#: lib/command.php:491 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:499 +#: lib/command.php:500 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "תגובת עבור %s" -#: lib/command.php:501 +#: lib/command.php:502 #, fuzzy msgid "Error saving notice." msgstr "בעיה בשמירת ההודעה." -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "" -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "" -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "" -#: lib/command.php:663 +#: lib/command.php:664 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "שמירת מידע התמונה נכשל" -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:684 +#: lib/command.php:685 #, fuzzy msgid "You are not subscribed to anyone." msgstr "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "לא שלחנו אלינו את הפרופיל הזה" msgstr[1] "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:706 +#: lib/command.php:707 #, fuzzy msgid "No one is subscribed to you." msgstr "הרשמה מרוחקת" -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "הרשמה מרוחקת" msgstr[1] "הרשמה מרוחקת" -#: lib/command.php:728 +#: lib/command.php:729 #, fuzzy msgid "You are not a member of any groups." msgstr "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "לא שלחנו אלינו את הפרופיל הזה" msgstr[1] "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:744 +#: lib/command.php:745 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4999,7 +5002,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 msgid "from" msgstr "" @@ -5087,51 +5090,56 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 #, fuzzy msgid "N" msgstr "לא" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 #, fuzzy msgid "in context" msgstr "אין תוכן!" -#: lib/noticelist.php:549 +#: lib/noticelist.php:548 #, fuzzy msgid "Repeated by" msgstr "צור" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 #, fuzzy msgid "Reply" msgstr "הגב" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "הודעות" + #: lib/nudgeform.php:116 msgid "Nudge this user" msgstr "" @@ -5455,47 +5463,47 @@ msgstr "הודעה חדשה" msgid "Moderate" msgstr "" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "לפני מספר שניות" -#: lib/util.php:827 +#: lib/util.php:831 msgid "about a minute ago" msgstr "לפני כדקה" -#: lib/util.php:829 +#: lib/util.php:833 #, php-format msgid "about %d minutes ago" msgstr "לפני כ-%d דקות" -#: lib/util.php:831 +#: lib/util.php:835 msgid "about an hour ago" msgstr "לפני כשעה" -#: lib/util.php:833 +#: lib/util.php:837 #, php-format msgid "about %d hours ago" msgstr "לפני כ-%d שעות" -#: lib/util.php:835 +#: lib/util.php:839 msgid "about a day ago" msgstr "לפני כיום" -#: lib/util.php:837 +#: lib/util.php:841 #, php-format msgid "about %d days ago" msgstr "לפני כ-%d ימים" -#: lib/util.php:839 +#: lib/util.php:843 msgid "about a month ago" msgstr "לפני כחודש" -#: lib/util.php:841 +#: lib/util.php:845 #, php-format msgid "about %d months ago" msgstr "לפני כ-%d חודשים" -#: lib/util.php:843 +#: lib/util.php:847 msgid "about a year ago" msgstr "לפני כשנה" diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index f8b56d6e9f..a59b9bb921 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: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:34:53+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:52:23+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: hsb\n" "X-Message-Group: out-statusnet\n" @@ -37,17 +37,18 @@ msgstr "Strona njeeksistuje" #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Wužiwar njeeksistuje" @@ -57,7 +58,8 @@ msgid "%s and friends, page %d" msgstr "%s a přećeljo, bok %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s a přećeljo" @@ -109,6 +111,7 @@ msgid "You and friends" msgstr "Ty a přećeljo" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" @@ -225,8 +228,8 @@ msgstr "Wšě do %s pósłane direktne powěsće" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -426,14 +429,12 @@ msgid "No such notice." msgstr "Zdźělenka njeeksistuje." #: actions/apistatusesretweet.php:83 -#, fuzzy msgid "Cannot repeat your own notice." -msgstr "Njemóžeš swójsku zdźělenku wospjetować." +msgstr "Njemóžno twoju zdźělenku wospjetować." #: actions/apistatusesretweet.php:91 -#, fuzzy msgid "Already repeated that notice." -msgstr "Tuta zdźělenka bu hižo wospjetowana" +msgstr "Tuta zdźělenka bu hižo wospjetowana." #: actions/apistatusesshow.php:138 msgid "Status deleted." @@ -583,7 +584,7 @@ msgid "Preview" msgstr "Přehlad" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 msgid "Delete" msgstr "Zničić" @@ -803,7 +804,7 @@ msgstr "Chceš woprawdźe tutu zdźělenku wušmórnyć?" msgid "Do not delete this notice" msgstr "Tutu zdźělenku njewušmórnyć" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 msgid "Delete this notice" msgstr "Tutu zdźělenku wušmórnyć" @@ -1236,24 +1237,20 @@ msgid "A selection of some of the great users on %s" msgstr "" #: actions/file.php:34 -#, fuzzy msgid "No notice ID." -msgstr "Žana zdźělenka" +msgstr "Žadyn ID zdźělenki." #: actions/file.php:38 -#, fuzzy msgid "No notice." -msgstr "Žana zdźělenka" +msgstr "Žana zdźělenka." #: actions/file.php:42 -#, fuzzy msgid "No attachments." -msgstr "Žane přiwěški" +msgstr "Žane přiwěški." #: actions/file.php:51 -#, fuzzy msgid "No uploaded attachments." -msgstr "Žane nahrate přiwěški" +msgstr "Žane nahrate přiwěški." #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1865,7 +1862,7 @@ msgid "You can't send a message to this user." msgstr "Njemóžeš tutomu wužiwarju powěsć pósłać." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "Žadyn wobsah!" @@ -1882,7 +1879,7 @@ msgstr "" msgid "Message sent" msgstr "Powěsć pósłana" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "" @@ -1969,8 +1966,8 @@ msgstr "" msgid "Only " msgstr "Jenož " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "Njeje podpěrany datowy format." @@ -2732,11 +2729,11 @@ msgstr "Njemóžeš swójsku zdźělenku wospjetować." msgid "You already repeated that notice." msgstr "Sy tutu zdźělenku hižo wospjetował." -#: actions/repeat.php:112 lib/noticelist.php:627 +#: actions/repeat.php:114 lib/noticelist.php:621 msgid "Repeated" msgstr "Wospjetowany" -#: actions/repeat.php:115 +#: actions/repeat.php:119 msgid "Repeated!" msgstr "Wospjetowany!" @@ -3492,7 +3489,6 @@ msgid "Notice feed for tag %s (Atom)" msgstr "" #: actions/tagother.php:39 -#, fuzzy msgid "No ID argument." msgstr "Žadyn argument ID." @@ -3750,9 +3746,8 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "" #: actions/userbyid.php:70 -#, fuzzy msgid "No ID." -msgstr "Žadyn ID" +msgstr "Žadyn ID." #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" @@ -3821,44 +3816,44 @@ msgstr "" msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:196 +#: classes/Notice.php:226 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:200 +#: classes/Notice.php:230 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:211 +#: classes/Notice.php:241 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1320 +#: classes/Notice.php:1371 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:347 +#: classes/User.php:368 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -3959,7 +3954,7 @@ msgstr "" #: lib/action.php:455 msgid "Create an account" -msgstr "" +msgstr "Konto załožić" #: lib/action.php:458 msgid "Login to the site" @@ -3971,15 +3966,15 @@ msgstr "Pomoc" #: lib/action.php:461 msgid "Help me!" -msgstr "" +msgstr "Pomhaj!" #: lib/action.php:464 lib/searchaction.php:127 msgid "Search" -msgstr "" +msgstr "Pytać" #: lib/action.php:464 msgid "Search for people or text" -msgstr "" +msgstr "Za ludźimi abo tekstom pytać" #: lib/action.php:485 msgid "Site notice" @@ -3999,11 +3994,11 @@ msgstr "" #: lib/action.php:726 msgid "About" -msgstr "" +msgstr "Wo" #: lib/action.php:728 msgid "FAQ" -msgstr "" +msgstr "Huste prašenja" #: lib/action.php:732 msgid "TOS" @@ -4011,15 +4006,15 @@ msgstr "" #: lib/action.php:735 msgid "Privacy" -msgstr "" +msgstr "Priwatnosć" #: lib/action.php:737 msgid "Source" -msgstr "" +msgstr "Žórło" #: lib/action.php:739 msgid "Contact" -msgstr "" +msgstr "Kontakt" #: lib/action.php:741 msgid "Badge" @@ -4111,7 +4106,7 @@ msgstr "" #: lib/attachmentlist.php:265 msgid "Author" -msgstr "" +msgstr "Awtor" #: lib/attachmentlist.php:278 msgid "Provider" @@ -4163,12 +4158,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "" @@ -4179,17 +4174,17 @@ msgstr "" #: lib/command.php:315 #, php-format msgid "%1$s (%2$s)" -msgstr "" +msgstr "%1$s (%2$s)" #: lib/command.php:318 #, php-format msgid "Fullname: %s" -msgstr "" +msgstr "Dospołne mjeno: %s" #: lib/command.php:321 #, php-format msgid "Location: %s" -msgstr "" +msgstr "Městno: %s" #: lib/command.php:324 #, php-format @@ -4201,103 +4196,103 @@ msgstr "" msgid "About: %s" msgstr "Wo: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "" -#: lib/command.php:421 +#: lib/command.php:422 msgid "Cannot repeat your own notice" msgstr "" -#: lib/command.php:426 +#: lib/command.php:427 msgid "Already repeated that notice" msgstr "Tuta zdźělenka bu hižo wospjetowana" -#: lib/command.php:434 +#: lib/command.php:435 #, php-format msgid "Notice from %s repeated" msgstr "Zdźělenka wot %s wospjetowana" -#: lib/command.php:436 +#: lib/command.php:437 msgid "Error repeating notice." msgstr "Zmylk při wospjetowanju zdźělenki" -#: lib/command.php:490 +#: lib/command.php:491 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:499 +#: lib/command.php:500 #, php-format msgid "Reply to %s sent" msgstr "" -#: lib/command.php:501 +#: lib/command.php:502 msgid "Error saving notice." msgstr "" -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "" -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "" -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "" -#: lib/command.php:663 +#: lib/command.php:664 #, php-format msgid "Could not create login token for %s" msgstr "Njeje móžno było, přizjewjenske znamješko za %s wutworić" -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:684 +#: lib/command.php:685 msgid "You are not subscribed to anyone." msgstr "" -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Sy tutu wosobu abonował:" @@ -4305,11 +4300,11 @@ msgstr[1] "Sy tutej wosobje abonował:" msgstr[2] "Sy tute wosoby abonował:" msgstr[3] "Sy tute wosoby abonował:" -#: lib/command.php:706 +#: lib/command.php:707 msgid "No one is subscribed to you." msgstr "" -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Tuta wosoba je će abonowała:" @@ -4317,11 +4312,11 @@ msgstr[1] "Tutej wosobje stej će abonowałoj:" msgstr[2] "Tute wosoby su će abonowali:" msgstr[3] "Tute wosoby su će abonowali:" -#: lib/command.php:728 +#: lib/command.php:729 msgid "You are not a member of any groups." msgstr "" -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Sy čłon tuteje skupiny:" @@ -4329,7 +4324,7 @@ msgstr[1] "Sy čłon tuteju skupinow:" msgstr[2] "Sy čłon tutych skupinow:" msgstr[3] "Sy čłon tutych skupinow:" -#: lib/command.php:744 +#: lib/command.php:745 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4793,7 +4788,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 msgid "from" msgstr "wot" @@ -4878,48 +4873,52 @@ msgstr "Připowěsnyć" msgid "Attach a file" msgstr "Dataju připowěsnyć" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "N" msgstr "S" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "J" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "W" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "Z" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 msgid "in context" msgstr "" -#: lib/noticelist.php:549 -#, fuzzy +#: lib/noticelist.php:548 msgid "Repeated by" -msgstr "Wospjetowany" +msgstr "Wospjetowany wot" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 msgid "Reply to this notice" msgstr "Na tutu zdźělenku wotmołwić" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 msgid "Reply" msgstr "Wotmołwić" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "Zdźělenka zničena." + #: lib/nudgeform.php:116 msgid "Nudge this user" msgstr "" @@ -5018,9 +5017,8 @@ msgid "All groups" msgstr "Wšě skupiny" #: lib/profileformaction.php:123 -#, fuzzy msgid "No return-to arguments." -msgstr "Žadyn argument ID." +msgstr "Žane wróćenske argumenty." #: lib/profileformaction.php:137 msgid "Unimplemented method." @@ -5223,47 +5221,47 @@ msgstr "Powěsć" msgid "Moderate" msgstr "" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "před něšto sekundami" -#: lib/util.php:827 +#: lib/util.php:831 msgid "about a minute ago" msgstr "před něhdźe jednej mjeńšinu" -#: lib/util.php:829 +#: lib/util.php:833 #, php-format msgid "about %d minutes ago" msgstr "před %d mjeńšinami" -#: lib/util.php:831 +#: lib/util.php:835 msgid "about an hour ago" msgstr "před něhdźe jednej hodźinu" -#: lib/util.php:833 +#: lib/util.php:837 #, php-format msgid "about %d hours ago" msgstr "před něhdźe %d hodźinami" -#: lib/util.php:835 +#: lib/util.php:839 msgid "about a day ago" msgstr "před něhdźe jednym dnjom" -#: lib/util.php:837 +#: lib/util.php:841 #, php-format msgid "about %d days ago" msgstr "před něhdźe %d dnjemi" -#: lib/util.php:839 +#: lib/util.php:843 msgid "about a month ago" msgstr "před něhdźe jednym měsacom" -#: lib/util.php:841 +#: lib/util.php:845 #, php-format msgid "about %d months ago" msgstr "před něhdźe %d měsacami" -#: lib/util.php:843 +#: lib/util.php:847 msgid "about a year ago" msgstr "před něhdźe jednym lětom" diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po index 2562a6400f..d7a974c93f 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: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:34:56+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:52:25+0000\n" "Language-Team: Interlingua\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ia\n" "X-Message-Group: out-statusnet\n" @@ -35,17 +35,18 @@ msgstr "Pagina non existe" #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Usator non existe." @@ -55,7 +56,8 @@ msgid "%s and friends, page %d" msgstr "%s e amicos, pagina %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s e amicos" @@ -115,6 +117,7 @@ msgid "You and friends" msgstr "Tu e amicos" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Actualisationes de %1$s e su amicos in %2$s!" @@ -235,8 +238,8 @@ msgstr "Tote le messages directe inviate a %s" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -436,14 +439,12 @@ msgid "No such notice." msgstr "Nota non trovate." #: actions/apistatusesretweet.php:83 -#, fuzzy msgid "Cannot repeat your own notice." -msgstr "Non pote repeter tu proprie nota" +msgstr "Non pote repeter tu proprie nota." #: actions/apistatusesretweet.php:91 -#, fuzzy msgid "Already repeated that notice." -msgstr "Iste nota ha ja essite repetite" +msgstr "Iste nota ha ja essite repetite." #: actions/apistatusesshow.php:138 msgid "Status deleted." @@ -596,7 +597,7 @@ msgid "Preview" msgstr "Previsualisation" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 msgid "Delete" msgstr "Deler" @@ -821,7 +822,7 @@ msgstr "Es tu secur de voler deler iste nota?" msgid "Do not delete this notice" msgstr "Non deler iste nota" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 msgid "Delete this notice" msgstr "Deler iste nota" @@ -1268,24 +1269,20 @@ msgid "A selection of some of the great users on %s" msgstr "Un selection de usatores eminente in %s" #: actions/file.php:34 -#, fuzzy msgid "No notice ID." -msgstr "Nulle nota" +msgstr "Nulle ID de nota." #: actions/file.php:38 -#, fuzzy msgid "No notice." -msgstr "Nulle nota" +msgstr "Nulle nota." #: actions/file.php:42 -#, fuzzy msgid "No attachments." -msgstr "Nulle attachamento" +msgstr "Nulle attachamento." #: actions/file.php:51 -#, fuzzy msgid "No uploaded attachments." -msgstr "Nulle attachamento cargate" +msgstr "Nulle attachamento cargate." #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1962,7 +1959,7 @@ msgid "You can't send a message to this user." msgstr "Tu non pote inviar un message a iste usator." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "Nulle contento!" @@ -1981,7 +1978,7 @@ msgstr "" msgid "Message sent" msgstr "Message inviate" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "Message directe a %s inviate" @@ -2077,8 +2074,8 @@ msgstr "typo de contento " msgid "Only " msgstr "Solmente " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "Formato de datos non supportate." @@ -2364,127 +2361,130 @@ msgstr "Pagina personal" #: actions/profilesettings.php:117 actions/register.php:454 msgid "URL of your homepage, blog, or profile on another site" -msgstr "" +msgstr "URL de tu pagina personal, blog o profilo in un altere sito" #: actions/profilesettings.php:122 actions/register.php:460 #, php-format msgid "Describe yourself and your interests in %d chars" -msgstr "" +msgstr "Describe te e tu interesses in %d characteres" #: actions/profilesettings.php:125 actions/register.php:463 msgid "Describe yourself and your interests" -msgstr "" +msgstr "Describe te e tu interesses" #: actions/profilesettings.php:127 actions/register.php:465 msgid "Bio" -msgstr "" +msgstr "Bio" #: actions/profilesettings.php:132 actions/register.php:470 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" -msgstr "" +msgstr "Loco" #: actions/profilesettings.php:134 actions/register.php:472 msgid "Where you are, like \"City, State (or Region), Country\"" -msgstr "" +msgstr "Ubi tu es, como \"Citate, Stato (o Region), Pais\"" #: actions/profilesettings.php:138 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 #: lib/subscriptionlist.php:108 lib/userprofile.php:209 msgid "Tags" -msgstr "" +msgstr "Etiquettas" #: actions/profilesettings.php:140 msgid "" "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" msgstr "" +"Etiquettas pro te (litteras, numeros, -, ., e _), separate per commas o " +"spatios" #: actions/profilesettings.php:144 actions/siteadminpanel.php:307 msgid "Language" -msgstr "" +msgstr "Lingua" #: actions/profilesettings.php:145 msgid "Preferred language" -msgstr "" +msgstr "Lingua preferite" #: actions/profilesettings.php:154 msgid "Timezone" -msgstr "" +msgstr "Fuso horari" #: actions/profilesettings.php:155 msgid "What timezone are you normally in?" -msgstr "" +msgstr "In que fuso horari es tu normalmente?" #: actions/profilesettings.php:160 msgid "" "Automatically subscribe to whoever subscribes to me (best for non-humans)" msgstr "" +"Subscriber me automaticamente a qui se subscribe a me (utile pro non-humanos)" #: actions/profilesettings.php:221 actions/register.php:223 #, php-format msgid "Bio is too long (max %d chars)." -msgstr "" +msgstr "Bio es troppo longe (max %d chars)." #: actions/profilesettings.php:228 actions/siteadminpanel.php:165 msgid "Timezone not selected." -msgstr "" +msgstr "Fuso horari non seligite." #: actions/profilesettings.php:234 msgid "Language is too long (max 50 chars)." -msgstr "" +msgstr "Lingua es troppo longe (max 50 chars)." #: actions/profilesettings.php:246 actions/tagother.php:178 #, php-format msgid "Invalid tag: \"%s\"" -msgstr "" +msgstr "Etiquetta invalide: \"%s\"" #: actions/profilesettings.php:295 msgid "Couldn't update user for autosubscribe." -msgstr "" +msgstr "Non poteva actualisar usator pro autosubscription." #: actions/profilesettings.php:328 msgid "Couldn't save profile." -msgstr "" +msgstr "Non poteva salveguardar profilo." #: actions/profilesettings.php:336 msgid "Couldn't save tags." -msgstr "" +msgstr "Non poteva salveguardar etiquettas." #: actions/profilesettings.php:344 lib/adminpanelaction.php:126 msgid "Settings saved." -msgstr "" +msgstr "Preferentias confirmate." #: actions/public.php:83 #, php-format msgid "Beyond the page limit (%s)" -msgstr "" +msgstr "Ultra le limite de pagina (%s)" #: actions/public.php:92 msgid "Could not retrieve public stream." -msgstr "" +msgstr "Non poteva recuperar le fluxo public." #: actions/public.php:129 #, php-format msgid "Public timeline, page %d" -msgstr "" +msgstr "Chronologia public, pagina %d" #: actions/public.php:131 lib/publicgroupnav.php:79 msgid "Public timeline" -msgstr "" +msgstr "Chronologia public" #: actions/public.php:151 msgid "Public Stream Feed (RSS 1.0)" -msgstr "" +msgstr "Syndication del fluxo public (RSS 1.0)" #: actions/public.php:155 msgid "Public Stream Feed (RSS 2.0)" -msgstr "" +msgstr "Syndication del fluxo public (RSS 2.0)" #: actions/public.php:159 msgid "Public Stream Feed (Atom)" -msgstr "" +msgstr "Syndication del fluxo public (Atom)" #: actions/public.php:179 #, php-format @@ -2492,16 +2492,20 @@ msgid "" "This is the public timeline for %%site.name%% but no one has posted anything " "yet." msgstr "" +"Isto es le chronologia public pro %%site.name%%, ma nulle persona ha ancora " +"scribite alique." #: actions/public.php:182 msgid "Be the first to post!" -msgstr "" +msgstr "Sia le prime a publicar!" #: actions/public.php:186 #, php-format msgid "" "Why not [register an account](%%action.register%%) and be the first to post!" msgstr "" +"Proque non [registrar un conto](%%action.register%%) e devenir le prime a " +"publicar?" #: actions/public.php:233 #, php-format @@ -2511,6 +2515,10 @@ msgid "" "tool. [Join now](%%action.register%%) to share notices about yourself with " "friends, family, and colleagues! ([Read more](%%doc.help%%))" msgstr "" +"Isto es %%site.name%%, un servicio de [micro-blog](http://ia.wikipedia.org/" +"wiki/Microblog) a base del software libere [StatusNet](http://status.net/). " +"[Inscribe te ora](%%action.register%%) pro condivider notas super te con " +"amicos, familia e collegas! ([Leger plus](%%doc.help%%))" #: actions/public.php:238 #, php-format @@ -2519,24 +2527,27 @@ msgid "" "blogging) service based on the Free Software [StatusNet](http://status.net/) " "tool." msgstr "" +"Isto es %%site.name%%, un servicio de [micro-blog](http://ia.wikipedia.org/" +"wiki/Microblog) a base del software libere [StatusNet](http://status.net/)." #: actions/publictagcloud.php:57 msgid "Public tag cloud" -msgstr "" +msgstr "Etiquettario public" #: actions/publictagcloud.php:63 #, php-format msgid "These are most popular recent tags on %s " -msgstr "" +msgstr "Istes es le etiquettas recente le plus popular in %s " #: actions/publictagcloud.php:69 #, php-format msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet." msgstr "" +"Nulle persona ha ancora publicate un nota con un [hashtag](%%doc.tags%%) yet." #: actions/publictagcloud.php:72 msgid "Be the first to post one!" -msgstr "" +msgstr "Sia le prime a publicar un!" #: actions/publictagcloud.php:75 #, php-format @@ -2544,212 +2555,225 @@ msgid "" "Why not [register an account](%%action.register%%) and be the first to post " "one!" msgstr "" +"Proque non [registrar un conto](%%action.register%%) e devenir le prime a " +"publicar un?" #: actions/publictagcloud.php:135 msgid "Tag cloud" -msgstr "" +msgstr "Etiquettario" #: actions/recoverpassword.php:36 msgid "You are already logged in!" -msgstr "" +msgstr "Tu es ja identificate!" #: actions/recoverpassword.php:62 msgid "No such recovery code." -msgstr "" +msgstr "Iste codice de recuperation non existe." #: actions/recoverpassword.php:66 msgid "Not a recovery code." -msgstr "" +msgstr "Non es un codice de recuperation." #: actions/recoverpassword.php:73 msgid "Recovery code for unknown user." -msgstr "" +msgstr "Codice de recuperation pro un usator incognite." #: actions/recoverpassword.php:86 msgid "Error with confirmation code." -msgstr "" +msgstr "Error con le codice de confirmation." #: actions/recoverpassword.php:97 msgid "This confirmation code is too old. Please start again." -msgstr "" +msgstr "Iste codice de confirmation ha expirate. Per favor recomencia." #: actions/recoverpassword.php:111 msgid "Could not update user with confirmed email address." -msgstr "" +msgstr "Non poteva actualisar le usator con le adresse de e-mail confirmate." #: actions/recoverpassword.php:152 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 "" +"Si tu ha oblidate o perdite tu contrasigno, tu pote facer inviar un nove al " +"adresse de e-mail specificate in tu conto." #: actions/recoverpassword.php:158 msgid "You have been identified. Enter a new password below. " -msgstr "" +msgstr "Tu ha essite identificate. Entra un nove contrasigno hic infra. " #: actions/recoverpassword.php:188 msgid "Password recovery" -msgstr "" +msgstr "Recuperation de contrasigno" #: actions/recoverpassword.php:191 msgid "Nickname or email address" -msgstr "" +msgstr "Pseudonymo o adresse de e-mail" #: actions/recoverpassword.php:193 msgid "Your nickname on this server, or your registered email address." -msgstr "" +msgstr "Tu pseudonymo in iste servitor, o tu adresse de e-mail registrate." #: actions/recoverpassword.php:199 actions/recoverpassword.php:200 msgid "Recover" -msgstr "" +msgstr "Recuperar" #: actions/recoverpassword.php:208 msgid "Reset password" -msgstr "" +msgstr "Reinitialisar contrasigno" #: actions/recoverpassword.php:209 msgid "Recover password" -msgstr "" +msgstr "Recuperar contrasigno" #: actions/recoverpassword.php:210 actions/recoverpassword.php:322 msgid "Password recovery requested" -msgstr "" +msgstr "Recuperation de contrasigno requestate" #: actions/recoverpassword.php:213 msgid "Unknown action" -msgstr "" +msgstr "Action incognite" #: actions/recoverpassword.php:236 msgid "6 or more characters, and don't forget it!" -msgstr "" +msgstr "6 o plus characteres, e non oblida lo!" #: actions/recoverpassword.php:243 msgid "Reset" -msgstr "" +msgstr "Reinitialisar" #: actions/recoverpassword.php:252 msgid "Enter a nickname or email address." -msgstr "" +msgstr "Entra un pseudonymo o adresse de e-mail." #: actions/recoverpassword.php:272 msgid "No user with that email address or username." -msgstr "" +msgstr "Nulle usator existe con iste adresse de e-mail o nomine de usator." #: actions/recoverpassword.php:287 msgid "No registered email address for that user." -msgstr "" +msgstr "Nulle adresse de e-mail registrate pro iste usator." #: actions/recoverpassword.php:301 msgid "Error saving address confirmation." -msgstr "" +msgstr "Error al salveguardar le confirmation del adresse." #: actions/recoverpassword.php:325 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." msgstr "" +"Instructiones pro recuperar tu contrasigno ha essite inviate al adresse de e-" +"mail registrate in tu conto." #: actions/recoverpassword.php:344 msgid "Unexpected password reset." -msgstr "" +msgstr "Reinitialisation inexpectate del contrasigno." #: actions/recoverpassword.php:352 msgid "Password must be 6 chars or more." -msgstr "" +msgstr "Le contrasigno debe haber 6 characteres o plus." #: actions/recoverpassword.php:356 msgid "Password and confirmation do not match." -msgstr "" +msgstr "Contrasigno e confirmation non corresponde." #: actions/recoverpassword.php:375 actions/register.php:248 msgid "Error setting user." -msgstr "" +msgstr "Error durante le configuration del usator." #: actions/recoverpassword.php:382 msgid "New password successfully saved. You are now logged in." -msgstr "" +msgstr "Nove contrasigno salveguardate con successo. Tu session es ora aperte." #: actions/register.php:85 actions/register.php:189 actions/register.php:404 msgid "Sorry, only invited people can register." -msgstr "" +msgstr "Pardono, solmente le personas invitate pote registrar se." #: actions/register.php:92 msgid "Sorry, invalid invitation code." -msgstr "" +msgstr "Pardono, le codice de invitation es invalide." #: actions/register.php:112 msgid "Registration successful" -msgstr "" +msgstr "Registration succedite" #: actions/register.php:114 actions/register.php:502 lib/action.php:455 #: lib/logingroupnav.php:85 msgid "Register" -msgstr "" +msgstr "Crear un conto" #: actions/register.php:135 msgid "Registration not allowed." -msgstr "" +msgstr "Registration non permittite." #: actions/register.php:198 msgid "You can't register if you don't agree to the license." msgstr "" +"Tu non pote registrar te si tu non te declara de accordo con le licentia." #: actions/register.php:201 msgid "Not a valid email address." -msgstr "" +msgstr "Adresse de e-mail invalide." #: actions/register.php:212 msgid "Email address already exists." -msgstr "" +msgstr "Le adresse de e-mail existe ja." #: actions/register.php:243 actions/register.php:264 msgid "Invalid username or password." -msgstr "" +msgstr "Nomine de usator o contrasigno invalide." #: actions/register.php:342 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" +"Con iste formulario tu pote crear un nove conto. Postea, tu pote publicar " +"notas e mitter te in contacto con amicos e collegas. " #: actions/register.php:424 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." -msgstr "" +msgstr "1-64 minusculas o numeros, sin punctuation o spatios. Requisite." #: actions/register.php:429 msgid "6 or more characters. Required." -msgstr "" +msgstr "6 o plus characteres. Requisite." #: actions/register.php:433 msgid "Same as password above. Required." -msgstr "" +msgstr "Identic al contrasigno hic supra. Requisite." #: actions/register.php:437 actions/register.php:441 #: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120 msgid "Email" -msgstr "" +msgstr "E-mail" #: actions/register.php:438 actions/register.php:442 msgid "Used only for updates, announcements, and password recovery" msgstr "" +"Usate solmente pro actualisationes, notificationes e recuperation de " +"contrasigno" #: actions/register.php:449 msgid "Longer name, preferably your \"real\" name" -msgstr "" +msgstr "Nomine plus longe, preferibilemente tu nomine \"real\"" #: actions/register.php:493 msgid "My text and files are available under " -msgstr "" +msgstr "Mi texto e files es disponibile sub " #: actions/register.php:495 msgid "Creative Commons Attribution 3.0" -msgstr "" +msgstr "Creative Commons Attribution 3.0" #: actions/register.php:496 msgid "" " except this private data: password, email address, IM address, and phone " "number." msgstr "" +" excepte iste datos private: contrasigno, adresse de e-mail, adresse de " +"messageria instantanee, numero de telephono." #: actions/register.php:537 #, php-format @@ -2769,12 +2793,27 @@ msgid "" "\n" "Thanks for signing up and we hope you enjoy using this service." msgstr "" +"Felicitationes, %s! Benvenite a %%%%site.name%%%%. Ora tu pote...\n" +"\n" +"* Visitar [tu profilo](%s) e publicar tu prime message.\n" +"* Adder un [adresse Jabber/GTalk](%%%%action.imsettings%%%%) pro poter " +"inviar notas per messages instantanee.\n" +"* [Cercar personas](%%%%action.peoplesearch%%%%) que tu cognosce o con que " +"tu ha interesses in commun. \n" +"* Actualisar le [optiones de tu profilo](%%%%action.profilesettings%%%%) pro " +"contar plus super te a alteres. \n" +"* Percurrer le [documentation in linea](%%%%doc.help%%%%) pro cognoscer le " +"functiones que tu non ha ancora discoperite. \n" +"\n" +"Gratias pro inscriber te, e nos spera que iste servicio te place." #: actions/register.php:561 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" msgstr "" +"(Tu recipera tosto un message de e-mail con instructiones pro confirmar tu " +"adresse de e-mail.)" #: actions/remotesubscribe.php:98 #, php-format @@ -2783,103 +2822,107 @@ msgid "" "register%%) a new account. If you already have an account on a [compatible " "microblogging site](%%doc.openmublog%%), enter your profile URL below." msgstr "" +"Pro subscriber te, tu pote [aperir un session](%%action.login%%), o " +"[registrar](%%action.register%%) un nove conto. Si tu ha ja un conto a un " +"[sito de microblogging compatibile](%%doc.openmublog%%), entra hic infra le " +"URL de tu profilo." #: actions/remotesubscribe.php:112 msgid "Remote subscribe" -msgstr "" +msgstr "Subscription remote" #: actions/remotesubscribe.php:124 msgid "Subscribe to a remote user" -msgstr "" +msgstr "Subscriber te a un usator remote" #: actions/remotesubscribe.php:129 msgid "User nickname" -msgstr "" +msgstr "Pseudonymo del usator" #: actions/remotesubscribe.php:130 msgid "Nickname of the user you want to follow" -msgstr "" +msgstr "Le pseudonymo del usator que tu vole sequer" #: actions/remotesubscribe.php:133 msgid "Profile URL" -msgstr "" +msgstr "URL del profilo" #: actions/remotesubscribe.php:134 msgid "URL of your profile on another compatible microblogging service" -msgstr "" +msgstr "URL de tu profilo in un altere servicio de microblogging compatibile" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 #: lib/userprofile.php:365 msgid "Subscribe" -msgstr "" +msgstr "Subscriber" #: actions/remotesubscribe.php:159 msgid "Invalid profile URL (bad format)" -msgstr "" +msgstr "URL de profilo invalide (mal formato)" #: actions/remotesubscribe.php:168 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)." msgstr "" +"URL de profilo invalide (non es un documento YADIS o esseva definite un XRDS " +"invalide)." #: actions/remotesubscribe.php:176 msgid "That’s a local profile! Login to subscribe." -msgstr "" +msgstr "Isto es un profilo local! Aperi un session pro subscriber." #: actions/remotesubscribe.php:183 msgid "Couldn’t get a request token." -msgstr "" +msgstr "Non poteva obtener un indicio de requesta." #: actions/repeat.php:57 msgid "Only logged-in users can repeat notices." -msgstr "" +msgstr "Solmente usatores identificate pote repeter notas." #: actions/repeat.php:64 actions/repeat.php:71 -#, fuzzy msgid "No notice specified." -msgstr "Nulle profilo specificate." +msgstr "Nulle nota specificate." #: actions/repeat.php:76 msgid "You can't repeat your own notice." -msgstr "" +msgstr "Tu non pote repeter tu proprie nota." #: actions/repeat.php:90 -#, fuzzy msgid "You already repeated that notice." -msgstr "Tu ha ja blocate iste usator." +msgstr "Tu ha ja repetite iste nota." -#: actions/repeat.php:112 lib/noticelist.php:627 +#: actions/repeat.php:114 lib/noticelist.php:621 msgid "Repeated" -msgstr "" +msgstr "Repetite" -#: actions/repeat.php:115 +#: actions/repeat.php:119 msgid "Repeated!" -msgstr "" +msgstr "Repetite!" #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 #, php-format msgid "Replies to %s" -msgstr "" +msgstr "Responsas a %s" #: actions/replies.php:127 #, php-format msgid "Replies to %s, page %d" -msgstr "" +msgstr "Responsas a %s, pagina %d" #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" -msgstr "" +msgstr "Syndication de responsas pro %s (RSS 1.0)" #: actions/replies.php:151 #, php-format msgid "Replies feed for %s (RSS 2.0)" -msgstr "" +msgstr "Syndication de responsas pro %s (RSS 2.0)" #: actions/replies.php:158 #, php-format msgid "Replies feed for %s (Atom)" -msgstr "" +msgstr "Syndication de responsas pro %s (Atom)" #: actions/replies.php:198 #, php-format @@ -2887,6 +2930,8 @@ msgid "" "This is the timeline showing replies to %s but %s hasn't received a notice " "to his attention yet." msgstr "" +"Isto es le chronologia de responsas a %s, ma %s non ha ancora recipite alcun " +"nota a su attention." #: actions/replies.php:203 #, php-format @@ -2894,6 +2939,8 @@ msgid "" "You can engage other users in a conversation, subscribe to more people or " "[join groups](%%action.groups%%)." msgstr "" +"Tu pote facer conversation con altere usatores, subscriber te a plus " +"personas o [devenir membro de gruppos](%%action.groups%%)." #: actions/replies.php:205 #, php-format @@ -2901,49 +2948,54 @@ msgid "" "You can try to [nudge %s](../%s) or [post something to his or her attention]" "(%%%%action.newnotice%%%%?status_textarea=%s)." msgstr "" +"Tu pote tentar [pulsar %s](../%s) o [publicar alique a su attention](%%%%" +"action.newnotice%%%%?status_textarea=%s)." #: actions/repliesrss.php:72 #, php-format msgid "Replies to %1$s on %2$s!" -msgstr "" +msgstr "Responsas a %1$s in %2$s!" #: actions/sandbox.php:65 actions/unsandbox.php:65 msgid "You cannot sandbox users on this site." -msgstr "" +msgstr "Tu non pote mitter usatores in le cassa de sablo in iste sito." #: actions/sandbox.php:72 msgid "User is already sandboxed." -msgstr "" +msgstr "Usator es ja in cassa de sablo." #: actions/showfavorites.php:79 #, php-format msgid "%s's favorite notices, page %d" -msgstr "" +msgstr "Notas favorite de %s, pagina %d" #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." -msgstr "" +msgstr "Non poteva recuperar notas favorite." #: actions/showfavorites.php:170 #, php-format msgid "Feed for favorites of %s (RSS 1.0)" -msgstr "" +msgstr "Syndication del favorites de %s (RSS 1.0)" #: actions/showfavorites.php:177 #, php-format msgid "Feed for favorites of %s (RSS 2.0)" -msgstr "" +msgstr "Syndication del favorites de %s (RSS 2.0)" #: actions/showfavorites.php:184 #, php-format msgid "Feed for favorites of %s (Atom)" -msgstr "" +msgstr "Syndication del favorites de %s (Atom)" #: actions/showfavorites.php:205 msgid "" "You haven't chosen any favorite notices yet. Click the fave button on " "notices you like to bookmark them for later or shed a spotlight on them." msgstr "" +"Tu non ha ancora seligite alcun nota favorite. Clicca super le button " +"Favorite sub notas que te place pro memorisar los pro plus tarde o pro " +"mitter los in evidentia." #: actions/showfavorites.php:207 #, php-format @@ -2951,6 +3003,8 @@ msgid "" "%s hasn't added any notices to his favorites yet. Post something interesting " "they would add to their favorites :)" msgstr "" +"%s non ha ancora addite alcun nota a su favorites. Publica alique " +"interessante que ille favoritisarea :)" #: actions/showfavorites.php:211 #, php-format @@ -2959,84 +3013,87 @@ msgid "" "account](%%%%action.register%%%%) and then post something interesting they " "would add to their favorites :)" msgstr "" +"%s non ha ancora addite alcun nota a su favorites. Proque non [registrar un " +"conto](%%%%action.register%%%%) e postea publicar alique interessante que " +"ille favoritisarea :)" #: actions/showfavorites.php:242 msgid "This is a way to share what you like." -msgstr "" +msgstr "Isto es un modo de condivider lo que te place." #: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" -msgstr "" +msgstr "Gruppo %s" #: actions/showgroup.php:84 #, php-format msgid "%s group, page %d" -msgstr "" +msgstr "Gruppo %s, pagina %d" #: actions/showgroup.php:218 msgid "Group profile" -msgstr "" +msgstr "Profilo del gruppo" #: actions/showgroup.php:263 actions/tagother.php:118 #: actions/userauthorization.php:167 lib/userprofile.php:177 msgid "URL" -msgstr "" +msgstr "URL" #: actions/showgroup.php:274 actions/tagother.php:128 #: actions/userauthorization.php:179 lib/userprofile.php:194 msgid "Note" -msgstr "" +msgstr "Nota" #: actions/showgroup.php:284 lib/groupeditform.php:184 msgid "Aliases" -msgstr "" +msgstr "Aliases" #: actions/showgroup.php:293 msgid "Group actions" -msgstr "" +msgstr "Actiones del gruppo" #: actions/showgroup.php:328 #, php-format msgid "Notice feed for %s group (RSS 1.0)" -msgstr "" +msgstr "Syndication de notas pro le gruppo %s (RSS 1.0)" #: actions/showgroup.php:334 #, php-format msgid "Notice feed for %s group (RSS 2.0)" -msgstr "" +msgstr "Syndication de notas pro le gruppo %s (RSS 2.0)" #: actions/showgroup.php:340 #, php-format msgid "Notice feed for %s group (Atom)" -msgstr "" +msgstr "Syndication de notas pro le gruppo %s (Atom)" #: actions/showgroup.php:345 #, php-format msgid "FOAF for %s group" -msgstr "" +msgstr "Amico de un amico pro le gruppo %s" #: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" -msgstr "" +msgstr "Membros" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 #: lib/tagcloudsection.php:71 msgid "(None)" -msgstr "" +msgstr "(Nulle)" #: actions/showgroup.php:392 msgid "All members" -msgstr "" +msgstr "Tote le membros" #: actions/showgroup.php:429 lib/profileaction.php:174 msgid "Statistics" -msgstr "" +msgstr "Statisticas" #: actions/showgroup.php:432 msgid "Created" -msgstr "" +msgstr "Create" #: actions/showgroup.php:448 #, php-format @@ -3047,6 +3104,11 @@ msgid "" "their life and interests. [Join now](%%%%action.register%%%%) to become part " "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" +"**%s** es un gruppo de usatores in %%%%site.name%%%%, un servicio de [micro-" +"blogging](http://ia.wikipedia.org/wiki/Microblog) a base del software libere " +"[StatusNet](http://status.net/). Su membros condivide breve messages super " +"lor vita e interesses. [Crea un conto](%%%%action.register%%%%) pro devenir " +"parte de iste gruppo e multe alteres! ([Lege plus](%%%%doc.help%%%%))" #: actions/showgroup.php:454 #, php-format @@ -3056,78 +3118,84 @@ msgid "" "[StatusNet](http://status.net/) tool. Its members share short messages about " "their life and interests. " msgstr "" +"**%s** es un gruppo de usatores in %%%%site.name%%%%, un servicio de [micro-" +"blogging](http://ia.wikipedia.org/wiki/Microblog) a base del software libere " +"[StatusNet](http://status.net/). Su membros condivide breve messages super " +"lor vita e interesses. " #: actions/showgroup.php:482 msgid "Admins" -msgstr "" +msgstr "Administratores" #: actions/showmessage.php:81 msgid "No such message." -msgstr "" +msgstr "Message non existe." #: actions/showmessage.php:98 msgid "Only the sender and recipient may read this message." -msgstr "" +msgstr "Solmente le expeditor e destinatario pote leger iste message." #: actions/showmessage.php:108 #, php-format msgid "Message to %1$s on %2$s" -msgstr "" +msgstr "Message a %1$s in %2$s" #: actions/showmessage.php:113 #, php-format msgid "Message from %1$s on %2$s" -msgstr "" +msgstr "Message de %1$s in %2$s" #: actions/shownotice.php:90 msgid "Notice deleted." -msgstr "" +msgstr "Nota delite." #: actions/showstream.php:73 #, php-format msgid " tagged %s" -msgstr "" +msgstr " con etiquetta %s" #: actions/showstream.php:79 #, php-format msgid "%s, page %d" -msgstr "" +msgstr "%s, pagina %d" #: actions/showstream.php:122 #, php-format msgid "Notice feed for %s tagged %s (RSS 1.0)" -msgstr "" +msgstr "Syndication de notas pro %s con etiquetta %s (RSS 1.0)" #: actions/showstream.php:129 #, php-format msgid "Notice feed for %s (RSS 1.0)" -msgstr "" +msgstr "Syndication de notas pro %s (RSS 1.0)" #: actions/showstream.php:136 #, php-format msgid "Notice feed for %s (RSS 2.0)" -msgstr "" +msgstr "Syndication de notas pro %s (RSS 2.0)" #: actions/showstream.php:143 #, php-format msgid "Notice feed for %s (Atom)" -msgstr "" +msgstr "Syndication de notas pro %s (Atom)" #: actions/showstream.php:148 #, php-format msgid "FOAF for %s" -msgstr "" +msgstr "Amico de un amico pro %s" #: actions/showstream.php:191 #, php-format msgid "This is the timeline for %s but %s hasn't posted anything yet." -msgstr "" +msgstr "Isto es le chronologia pro %s, ma %s non ha ancora publicate alique." #: actions/showstream.php:196 msgid "" "Seen anything interesting recently? You haven't posted any notices yet, now " "would be a good time to start :)" msgstr "" +"Videva tu qualcosa de interessante recentemente? Tu non ha ancora publicate " +"alcun nota, dunque iste es un bon momento pro comenciar :)" #: actions/showstream.php:198 #, php-format @@ -3135,6 +3203,8 @@ msgid "" "You can try to nudge %s or [post something to his or her attention](%%%%" "action.newnotice%%%%?status_textarea=%s)." msgstr "" +"Tu pote tentar pulsar %s o [publicar un nota a su attention](%%%%action." +"newnotice%%%%?status_textarea=%s)." #: actions/showstream.php:234 #, php-format @@ -3144,6 +3214,11 @@ msgid "" "[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to " "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" +"**%s** ha un conto in %%%%site.name%%%%, un servicio de [micro-blogging]" +"(http://en.wikipedia.org/wiki/Microblog) a base del software libere " +"[StatusNet](http://status.net/). [Crea un conto](%%%%action.register%%%%) " +"pro sequer le notas de **%s** e multe alteres! ([Lege plus](%%%%doc.help%%%" +"%))" #: actions/showstream.php:239 #, php-format @@ -3607,9 +3682,8 @@ msgid "Notice feed for tag %s (Atom)" msgstr "" #: actions/tagother.php:39 -#, fuzzy msgid "No ID argument." -msgstr "Documento non existe." +msgstr "Nulle parametro de ID." #: actions/tagother.php:65 #, php-format @@ -3865,9 +3939,8 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "" #: actions/userbyid.php:70 -#, fuzzy msgid "No ID." -msgstr "Nulle ID" +msgstr "Nulle ID." #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" @@ -3936,44 +4009,44 @@ msgstr "" msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:196 +#: classes/Notice.php:226 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:200 +#: classes/Notice.php:230 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:211 +#: classes/Notice.php:241 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1320 +#: classes/Notice.php:1371 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:347 +#: classes/User.php:368 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4278,12 +4351,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "" @@ -4316,130 +4389,129 @@ msgstr "" msgid "About: %s" msgstr "" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "" -#: lib/command.php:421 +#: lib/command.php:422 msgid "Cannot repeat your own notice" msgstr "Non pote repeter tu proprie nota" -#: lib/command.php:426 +#: lib/command.php:427 msgid "Already repeated that notice" msgstr "Iste nota ha ja essite repetite" -#: lib/command.php:434 +#: lib/command.php:435 #, php-format msgid "Notice from %s repeated" msgstr "" -#: lib/command.php:436 -#, fuzzy +#: lib/command.php:437 msgid "Error repeating notice." -msgstr "Error in actualisar le profilo remote" +msgstr "Error durante le repetition del nota." -#: lib/command.php:490 +#: lib/command.php:491 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:499 +#: lib/command.php:500 #, php-format msgid "Reply to %s sent" msgstr "" -#: lib/command.php:501 +#: lib/command.php:502 msgid "Error saving notice." msgstr "" -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "" -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "" -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "" -#: lib/command.php:663 +#: lib/command.php:664 #, php-format msgid "Could not create login token for %s" msgstr "" -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:684 +#: lib/command.php:685 msgid "You are not subscribed to anyone." msgstr "" -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:706 +#: lib/command.php:707 msgid "No one is subscribed to you." msgstr "" -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:728 +#: lib/command.php:729 msgid "You are not a member of any groups." msgstr "" -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:744 +#: lib/command.php:745 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4901,7 +4973,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 msgid "from" msgstr "" @@ -4986,48 +5058,52 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "N" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 msgid "in context" msgstr "" -#: lib/noticelist.php:549 -#, fuzzy +#: lib/noticelist.php:548 msgid "Repeated by" -msgstr "Repetite per %s" +msgstr "Repetite per" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 msgid "Reply" msgstr "" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "Nota delite." + #: lib/nudgeform.php:116 msgid "Nudge this user" msgstr "" @@ -5154,9 +5230,8 @@ msgid "Popular" msgstr "" #: lib/repeatform.php:107 lib/repeatform.php:132 -#, fuzzy msgid "Repeat this notice" -msgstr "Deler iste nota" +msgstr "Repeter iste nota" #: lib/repeatform.php:132 msgid "Repeat" @@ -5331,47 +5406,47 @@ msgstr "" msgid "Moderate" msgstr "" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "" -#: lib/util.php:827 -msgid "about a minute ago" -msgstr "" - -#: lib/util.php:829 -#, php-format -msgid "about %d minutes ago" -msgstr "" - #: lib/util.php:831 -msgid "about an hour ago" +msgid "about a minute ago" msgstr "" #: lib/util.php:833 #, php-format -msgid "about %d hours ago" +msgid "about %d minutes ago" msgstr "" #: lib/util.php:835 -msgid "about a day ago" +msgid "about an hour ago" msgstr "" #: lib/util.php:837 #, php-format -msgid "about %d days ago" +msgid "about %d hours ago" msgstr "" #: lib/util.php:839 -msgid "about a month ago" +msgid "about a day ago" msgstr "" #: lib/util.php:841 #, php-format -msgid "about %d months ago" +msgid "about %d days ago" msgstr "" #: lib/util.php:843 +msgid "about a month ago" +msgstr "" + +#: lib/util.php:845 +#, php-format +msgid "about %d months ago" +msgstr "" + +#: lib/util.php:847 msgid "about a year ago" msgstr "" diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index 75a577d031..e8339826d2 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: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:34:59+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:52:28+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: is\n" "X-Message-Group: out-statusnet\n" @@ -38,17 +38,18 @@ msgstr "Ekkert þannig merki." #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Enginn svoleiðis notandi." @@ -58,7 +59,8 @@ msgid "%s and friends, page %d" msgstr "%s og vinirnir, síða %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s og vinirnir" @@ -110,6 +112,7 @@ msgid "You and friends" msgstr "" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Færslur frá %1$s og vinum á %2$s!" @@ -231,8 +234,8 @@ msgstr "Öll bein skilaboð til %s" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -594,7 +597,7 @@ msgid "Preview" msgstr "Forsýn" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 msgid "Delete" msgstr "Eyða" @@ -819,7 +822,7 @@ msgstr "Ertu viss um að þú viljir eyða þessu babli?" msgid "Do not delete this notice" msgstr "" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 msgid "Delete this notice" msgstr "Eyða þessu babli" @@ -1950,7 +1953,7 @@ msgid "You can't send a message to this user." msgstr "Þú getur ekki sent þessum notanda skilaboð." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "Ekkert innihald!" @@ -1969,7 +1972,7 @@ msgstr "" msgid "Message sent" msgstr "" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "Bein skilaboð send til %s" @@ -2060,8 +2063,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "Enginn stuðningur við gagnasnið." @@ -2876,12 +2879,12 @@ msgstr "Þú getur ekki nýskráð þig nema þú samþykkir leyfið." msgid "You already repeated that notice." msgstr "Þú hefur nú þegar lokað á þennan notanda." -#: actions/repeat.php:112 lib/noticelist.php:627 +#: actions/repeat.php:114 lib/noticelist.php:621 #, fuzzy msgid "Repeated" msgstr "Í sviðsljósinu" -#: actions/repeat.php:115 +#: actions/repeat.php:119 msgid "Repeated!" msgstr "" @@ -4017,46 +4020,46 @@ msgstr "Gat ekki uppfært skilaboð með nýju veffangi." msgid "DB error inserting hashtag: %s" msgstr "Gagnagrunnsvilla við innsetningu myllumerkis: %s" -#: classes/Notice.php:196 +#: classes/Notice.php:226 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:200 +#: classes/Notice.php:230 msgid "Problem saving notice. Unknown user." msgstr "Gat ekki vistað babl. Óþekktur notandi." -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Of mikið babl í einu; slakaðu aðeins á og haltu svo áfram eftir nokkrar " "mínútur." -#: classes/Notice.php:211 +#: classes/Notice.php:241 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "Það hefur verið lagt bann við babli frá þér á þessari síðu." -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "Vandamál komu upp við að vista babl." -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "Gagnagrunnsvilla við innsetningu svars: %s" -#: classes/Notice.php:1320 +#: classes/Notice.php:1371 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:347 +#: classes/User.php:368 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4377,12 +4380,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "Notandi hefur ekkert nýtt babl" @@ -4415,136 +4418,136 @@ msgstr "Heimasíða: %s" msgid "About: %s" msgstr "Um: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d" -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "Villa kom upp við að senda bein skilaboð" -#: lib/command.php:421 +#: lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Get ekki kveikt á tilkynningum." -#: lib/command.php:426 +#: lib/command.php:427 #, fuzzy msgid "Already repeated that notice" msgstr "Eyða þessu babli" -#: lib/command.php:434 +#: lib/command.php:435 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Babl sent inn" -#: lib/command.php:436 +#: lib/command.php:437 #, fuzzy msgid "Error repeating notice." msgstr "Vandamál komu upp við að vista babl." -#: lib/command.php:490 +#: lib/command.php:491 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d" -#: lib/command.php:499 +#: lib/command.php:500 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Svara þessu babli" -#: lib/command.php:501 +#: lib/command.php:502 #, fuzzy msgid "Error saving notice." msgstr "Vandamál komu upp við að vista babl." -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "Tilgreindu nafn notandans sem þú vilt gerast áskrifandi að" -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "Nú ert þú áskrifandi að %s" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "Tilgreindu nafn notandans sem þú vilt hætta sem áskrifandi að" -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "Nú ert þú ekki lengur áskrifandi að %s" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "Skipun hefur ekki verið fullbúin" -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "Tilkynningar af." -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "Get ekki slökkt á tilkynningum." -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "Tilkynningar á." -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "Get ekki kveikt á tilkynningum." -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "" -#: lib/command.php:663 +#: lib/command.php:664 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Gat ekki búið til uppáhald." -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:684 +#: lib/command.php:685 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Þú ert ekki áskrifandi." -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Þú ert nú þegar í áskrift að þessum notendum:" msgstr[1] "Þú ert nú þegar í áskrift að þessum notendum:" -#: lib/command.php:706 +#: lib/command.php:707 #, fuzzy msgid "No one is subscribed to you." msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér." -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Gat ekki leyft öðrum að gerast áskrifandi að þér." msgstr[1] "Gat ekki leyft öðrum að gerast áskrifandi að þér." -#: lib/command.php:728 +#: lib/command.php:729 #, fuzzy msgid "You are not a member of any groups." msgstr "Þú ert ekki meðlimur í þessum hópi." -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Þú ert ekki meðlimur í þessum hópi." msgstr[1] "Þú ert ekki meðlimur í þessum hópi." -#: lib/command.php:744 +#: lib/command.php:745 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5022,7 +5025,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 #, fuzzy msgid "from" msgstr "frá" @@ -5109,49 +5112,54 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 #, fuzzy msgid "N" msgstr "Nei" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 msgid "in context" msgstr "" -#: lib/noticelist.php:549 +#: lib/noticelist.php:548 #, fuzzy msgid "Repeated by" msgstr "Í sviðsljósinu" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 msgid "Reply to this notice" msgstr "Svara þessu babli" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 msgid "Reply" msgstr "Svara" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "Babl sent inn" + #: lib/nudgeform.php:116 msgid "Nudge this user" msgstr "Ýta við þessum notanda" @@ -5467,47 +5475,47 @@ msgstr "Skilaboð" msgid "Moderate" msgstr "" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "fyrir nokkrum sekúndum" -#: lib/util.php:827 +#: lib/util.php:831 msgid "about a minute ago" msgstr "fyrir um einni mínútu síðan" -#: lib/util.php:829 +#: lib/util.php:833 #, php-format msgid "about %d minutes ago" msgstr "fyrir um %d mínútum síðan" -#: lib/util.php:831 +#: lib/util.php:835 msgid "about an hour ago" msgstr "fyrir um einum klukkutíma síðan" -#: lib/util.php:833 +#: lib/util.php:837 #, php-format msgid "about %d hours ago" msgstr "fyrir um %d klukkutímum síðan" -#: lib/util.php:835 +#: lib/util.php:839 msgid "about a day ago" msgstr "fyrir um einum degi síðan" -#: lib/util.php:837 +#: lib/util.php:841 #, php-format msgid "about %d days ago" msgstr "fyrir um %d dögum síðan" -#: lib/util.php:839 +#: lib/util.php:843 msgid "about a month ago" msgstr "fyrir um einum mánuði síðan" -#: lib/util.php:841 +#: lib/util.php:845 #, php-format msgid "about %d months ago" msgstr "fyrir um %d mánuðum síðan" -#: lib/util.php:843 +#: lib/util.php:847 msgid "about a year ago" msgstr "fyrir um einu ári síðan" diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index 36d0eb289c..c9dc4aa8ce 100644 --- a/locale/it/LC_MESSAGES/statusnet.po +++ b/locale/it/LC_MESSAGES/statusnet.po @@ -1,5 +1,6 @@ # Translation of StatusNet to Italian # +# Author@translatewiki.net: Milocasagrande # Author@translatewiki.net: Nemo bis # -- # This file is distributed under the same license as the StatusNet package. @@ -8,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:35:02+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:52:31+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: it\n" "X-Message-Group: out-statusnet\n" @@ -21,9 +22,8 @@ msgstr "" #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 -#, fuzzy msgid "No such page" -msgstr "Nessuna tale etichetta." +msgstr "Pagina inesistente." #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 @@ -36,19 +36,20 @@ msgstr "Nessuna tale etichetta." #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." -msgstr "Nessun tale utente." +msgstr "Utente inesistente." #: actions/all.php:84 #, php-format @@ -56,31 +57,34 @@ msgid "%s and friends, page %d" msgstr "%s e amici, pagina %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s e amici" #: actions/all.php:99 -#, fuzzy, php-format +#, php-format msgid "Feed for friends of %s (RSS 1.0)" -msgstr "Feed per gli amici di %s" +msgstr "Feed degli amici di %s (RSS 1.0)" #: actions/all.php:107 -#, fuzzy, php-format +#, php-format msgid "Feed for friends of %s (RSS 2.0)" -msgstr "Feed per gli amici di %s" +msgstr "Feed degli amici di %s (RSS 2.0)" #: actions/all.php:115 -#, fuzzy, php-format +#, php-format msgid "Feed for friends of %s (Atom)" -msgstr "Feed per gli amici di %s" +msgstr "Feed degli amici di %s (Atom)" #: actions/all.php:127 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "" +"Questa è l'attività di %s e i suoi amici, ma nessuno ha ancora scritto " +"qualche cosa." #: actions/all.php:132 #, php-format @@ -88,6 +92,8 @@ msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " "something yourself." msgstr "" +"Prova ad abbonarti a più persone, [entra in un gruppo](%%action.groups%%) o " +"scrivi un messaggio." #: actions/all.php:134 #, php-format @@ -95,6 +101,8 @@ msgid "" "You can try to [nudge %s](../%s) from his profile or [post something to his " "or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." msgstr "" +"Puoi provare a [richiamare %s](../%s) dal suo profilo o [scrivere qualche " +"cosa alla sua attenzione](%%%%action.newnotice%%%%?status_textarea=%s)." #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 #, php-format @@ -102,25 +110,26 @@ msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " "post a notice to his or her attention." msgstr "" +"Perché non [crei un account](%%%%action.register%%%%) e richiami %s o scrivi " +"un messaggio alla sua attenzione." #: actions/all.php:165 -#, fuzzy msgid "You and friends" -msgstr "%s e amici" +msgstr "Tu e i tuoi amici" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" -msgstr "Aggiornamenti da %1$s e amici su %2$s!" +msgstr "Messaggi da %1$s e amici su %2$s!" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 -#, fuzzy msgid "API method not found." -msgstr "Metodo delle API non trovato!" +msgstr "Metodo delle API non trovato." #: actions/apiaccountupdatedeliverydevice.php:85 #: actions/apiaccountupdateprofile.php:89 @@ -141,9 +150,10 @@ msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " "none" msgstr "" +"È necessario specificare un parametro chiamato \"device\" con un valore tra: " +"\"sms\", \"im\" o \"none\"" #: actions/apiaccountupdatedeliverydevice.php:132 -#, fuzzy msgid "Could not update user." msgstr "Impossibile aggiornare l'utente." @@ -157,7 +167,6 @@ msgid "User has no profile." msgstr "L'utente non ha un profilo." #: actions/apiaccountupdateprofile.php:147 -#, fuzzy msgid "Could not save profile." msgstr "Impossibile salvare il profilo." @@ -171,25 +180,24 @@ msgid "" "The server was unable to handle that much POST data (%s bytes) due to its " "current configuration." msgstr "" +"Il server non è in grado di gestire tutti quei dati POST (%s byte) con la " +"configurazione attuale." #: actions/apiaccountupdateprofilebackgroundimage.php:136 #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 -#, fuzzy msgid "Unable to save your design settings." -msgstr "Impossibile salvare le tue impostazioni di Twitter!" +msgstr "Impossibile salvare la impostazioni dell'aspetto." #: actions/apiaccountupdateprofilebackgroundimage.php:187 #: actions/apiaccountupdateprofilecolors.php:142 -#, fuzzy msgid "Could not update your design." -msgstr "Impossibile aggiornare l'utente." +msgstr "Impossibile aggiornare l'aspetto." #: actions/apiblockcreate.php:105 -#, fuzzy msgid "You cannot block yourself!" -msgstr "Impossibile aggiornare l'utente." +msgstr "Non puoi bloccarti!" #: actions/apiblockcreate.php:119 msgid "Block user failed." @@ -200,9 +208,9 @@ msgid "Unblock user failed." msgstr "Sblocco dell'utente non riuscito." #: actions/apidirectmessage.php:89 -#, fuzzy, php-format +#, php-format msgid "Direct messages from %s" -msgstr "Messaggi diretti a %s" +msgstr "Messaggi diretti da %s" #: actions/apidirectmessage.php:93 #, php-format @@ -231,47 +239,45 @@ msgstr "Tutti i messaggi diretti inviati a %s" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found!" -msgstr "Metodo delle API non trovato!" +msgstr "Metodo delle API non trovato." #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "Nessun testo nel messaggio!" #: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, fuzzy, php-format +#, php-format msgid "That's too long. Max message size is %d chars." -msgstr "Troppo lungo. Il massimo per un messaggio è 140 caratteri." +msgstr "Troppo lungo. La dimensione massima di un messaggio è di %d caratteri." #: actions/apidirectmessagenew.php:146 msgid "Recipient user not found." -msgstr "Utente destinatario non trovato." +msgstr "Destinatario non trovato." #: actions/apidirectmessagenew.php:150 msgid "Can't send direct messages to users who aren't your friend." -msgstr "Non puoi inviare messaggi diretti a utenti che non sono amici tuoi." +msgstr "Non puoi inviare messaggi diretti a utenti che non sono tuoi amici." #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." -msgstr "Nessuno stato trovato con quel ID." +msgstr "Nessuno messaggio trovato con quel ID." #: actions/apifavoritecreate.php:119 -#, fuzzy msgid "This status is already a favorite!" msgstr "Questo messaggio è già un preferito!" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 msgid "Could not create favorite." -msgstr "Impossibile creare preferito." +msgstr "Impossibile creare un preferito." #: actions/apifavoritedestroy.php:122 -#, fuzzy msgid "That status is not a favorite!" msgstr "Questo messaggio non è un preferito!" @@ -289,27 +295,24 @@ msgid "Could not follow user: %s is already on your list." msgstr "Impossibile seguire l'utente: %s è già nel tuo elenco." #: actions/apifriendshipsdestroy.php:109 -#, fuzzy msgid "Could not unfollow user: User not found." -msgstr "Impossibile seguire l'utente: utente non trovato." +msgstr "Impossibile non seguire l'utente: utente non trovato." #: actions/apifriendshipsdestroy.php:120 msgid "You cannot unfollow yourself!" -msgstr "" +msgstr "Non puoi non seguirti!" #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." msgstr "Devono essere forniti due ID utente o nominativi." #: actions/apifriendshipsshow.php:135 -#, fuzzy msgid "Could not determine source user." -msgstr "Impossibile recuperare l'attività pubblica." +msgstr "Impossibile determinare l'utente sorgente." #: actions/apifriendshipsshow.php:143 -#, fuzzy msgid "Could not find target user." -msgstr "Impossibile trovare un qualsiasi stato." +msgstr "Impossibile trovare l'utente destinazione." #: actions/apigroupcreate.php:164 actions/editgroup.php:182 #: actions/newgroup.php:126 actions/profilesettings.php:208 @@ -335,18 +338,18 @@ msgstr "Non è un soprannome valido." #: actions/newgroup.php:139 actions/profilesettings.php:215 #: actions/register.php:217 msgid "Homepage is not a valid URL." -msgstr "L'URL della pagina web non è valido." +msgstr "L'indirizzo della pagina web non è valido." #: actions/apigroupcreate.php:205 actions/editgroup.php:198 #: actions/newgroup.php:142 actions/profilesettings.php:218 #: actions/register.php:220 msgid "Full name is too long (max 255 chars)." -msgstr "Nome troppo lungo (max 255 caratteri)" +msgstr "Nome troppo lungo (max 255 caratteri)." #: actions/apigroupcreate.php:213 -#, fuzzy, php-format +#, php-format msgid "Description is too long (max %d chars)." -msgstr "La descrizione è troppo lunga (max 140 caratteri)." +msgstr "La descrizione è troppo lunga (max %d caratteri)." #: actions/apigroupcreate.php:224 actions/editgroup.php:204 #: actions/newgroup.php:148 actions/profilesettings.php:225 @@ -358,65 +361,62 @@ msgstr "Ubicazione troppo lunga (max 255 caratteri)." #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." -msgstr "" +msgstr "Troppi alias! Massimo %d." #: actions/apigroupcreate.php:264 actions/editgroup.php:224 #: actions/newgroup.php:168 -#, fuzzy, php-format +#, php-format msgid "Invalid alias: \"%s\"" -msgstr "Etichetta non valida: \"%s\"" +msgstr "Alias non valido: \"%s\"" #: actions/apigroupcreate.php:273 actions/editgroup.php:228 #: actions/newgroup.php:172 -#, fuzzy, php-format +#, php-format msgid "Alias \"%s\" already in use. Try another one." -msgstr "Soprannome già in uso. Prova con un altro." +msgstr "L'alias \"%s\" è già in uso. Prova con un altro." #: actions/apigroupcreate.php:286 actions/editgroup.php:234 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." -msgstr "" +msgstr "L'alias non può essere lo stesso del soprannome." #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91 -#, fuzzy msgid "Group not found!" -msgstr "Metodo delle API non trovato!" +msgstr "Gruppo non trovato!" #: actions/apigroupjoin.php:110 -#, fuzzy msgid "You are already a member of that group." -msgstr "Sei già un membro di quel gruppo" +msgstr "Fai già parte di quel gruppo." #: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221 msgid "You have been blocked from that group by the admin." -msgstr "" +msgstr "L'amministratore ti ha bloccato l'accesso a quel gruppo." #: actions/apigroupjoin.php:138 -#, fuzzy, php-format +#, php-format msgid "Could not join user %s to group %s." -msgstr "Impossibile iscrivere l'utente %s al gruppo %s" +msgstr "Impossibile iscrivere l'utente %s al gruppo %s." #: actions/apigroupleave.php:114 -#, fuzzy msgid "You are not a member of this group." -msgstr "Non sei un membro di quel gruppo." +msgstr "Non fai parte di questo gruppo." #: actions/apigroupleave.php:124 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %s to group %s." -msgstr "Impossibile rimuovere l'utente %s dal gruppo %s" +msgstr "Impossibile rimuovere l'utente %s dal gruppo %s." #: actions/apigrouplist.php:95 -#, fuzzy, php-format +#, php-format msgid "%s's groups" msgstr "Gruppi di %s" #: actions/apigrouplist.php:103 -#, fuzzy, php-format +#, php-format msgid "Groups %s is a member of on %s." -msgstr "Il gruppo %s è membro di" +msgstr "Gruppi di cui %s fa parte su %s." #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format @@ -424,9 +424,9 @@ msgid "%s groups" msgstr "Gruppi di %s" #: actions/apigrouplistall.php:94 -#, fuzzy, php-format +#, php-format msgid "groups on %s" -msgstr "Azioni dei gruppi" +msgstr "Gruppi su %s" #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." @@ -434,37 +434,34 @@ msgstr "Questo metodo richiede POST o DELETE." #: actions/apistatusesdestroy.php:130 msgid "You may not delete another user's status." -msgstr "Non puoi eliminare lo stato di un altro utente." +msgstr "Non puoi eliminare il messaggio di un altro utente." #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 #: actions/deletenotice.php:52 actions/shownotice.php:92 msgid "No such notice." -msgstr "Nessun tale messaggio." +msgstr "Nessun messaggio." #: actions/apistatusesretweet.php:83 -#, fuzzy msgid "Cannot repeat your own notice." -msgstr "Impossibile attivare le notifiche." +msgstr "Non puoi ripetere un tuo messaggio." #: actions/apistatusesretweet.php:91 -#, fuzzy msgid "Already repeated that notice." -msgstr "Elimina questo messaggio" +msgstr "Hai già ripetuto quel messaggio." #: actions/apistatusesshow.php:138 -#, fuzzy msgid "Status deleted." -msgstr "Immagine aggiornata." +msgstr "Messaggio eliminato." #: actions/apistatusesshow.php:144 msgid "No status with that ID found." -msgstr "Nessuno stato con quel ID trovato." +msgstr "Nessun stato trovato con quel ID." #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 -#, fuzzy, php-format +#, php-format msgid "That's too long. Max notice size is %d chars." -msgstr "Troppo lungo. Lunghezza massima 140 caratteri." +msgstr "Troppo lungo. Lunghezza massima %d caratteri." #: actions/apistatusesupdate.php:198 msgid "Not found" @@ -474,11 +471,11 @@ msgstr "Non trovato" #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" +"La dimensione massima di un messaggio è di %d caratteri, compreso l'URL." #: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261 -#, fuzzy msgid "Unsupported format." -msgstr "Formato file immagine non supportato." +msgstr "Formato non supportato." #: actions/apitimelinefavorites.php:108 #, php-format @@ -500,22 +497,22 @@ msgstr "Attività di %s" #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" -msgstr "Aggiornamenti da %1$s su %2$s!" +msgstr "Messaggi da %1$s su %2$s!" #: actions/apitimelinementions.php:117 -#, fuzzy, php-format +#, php-format msgid "%1$s / Updates mentioning %2$s" -msgstr "%1$s / Aggiornamenti in risposta a %2$s" +msgstr "%1$s / Messaggi che citano %2$s" #: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." -msgstr "%1$s aggiornamenti in risposta agli aggiornamenti da %2$s / %3$s" +msgstr "%1$s messaggi in risposta a quelli da %2$s / %3$s" #: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" -msgstr "attività pubblica di %s" +msgstr "Attività pubblica di %s" #: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format @@ -525,17 +522,17 @@ msgstr "Aggiornamenti di %s da tutti!" #: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" -msgstr "" +msgstr "Ripetuto da %s" #: actions/apitimelineretweetedtome.php:111 -#, fuzzy, php-format +#, php-format msgid "Repeated to %s" -msgstr "Risposte a %s" +msgstr "Ripetuto a %s" #: actions/apitimelineretweetsofme.php:112 -#, fuzzy, php-format +#, php-format msgid "Repeats of %s" -msgstr "Risposte a %s" +msgstr "Ripetizioni di %s" #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format @@ -543,18 +540,17 @@ msgid "Notices tagged with %s" msgstr "Messaggi etichettati con %s" #: actions/apitimelinetag.php:108 actions/tagrss.php:64 -#, fuzzy, php-format +#, php-format msgid "Updates tagged with %1$s on %2$s!" -msgstr "Aggiornamenti da %1$s su %2$s!" +msgstr "Messaggi etichettati con %1$s su %2$s!" #: actions/apiusershow.php:96 msgid "Not found." -msgstr "Non trovato" +msgstr "Non trovato." #: actions/attachment.php:73 -#, fuzzy msgid "No such attachment." -msgstr "Nessun tale documento." +msgstr "Nessun allegato." #: actions/avatarbynickname.php:59 actions/grouprss.php:91 #: actions/leavegroup.php:76 @@ -575,9 +571,10 @@ msgid "Avatar" msgstr "Immagine" #: actions/avatarsettings.php:78 -#, fuzzy, php-format +#, php-format msgid "You can upload your personal avatar. The maximum file size is %s." -msgstr "Qui puoi caricare la tua immagine personale." +msgstr "" +"Puoi caricare la tua immagine personale. La dimensione massima del file è %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 @@ -601,7 +598,7 @@ msgid "Preview" msgstr "Anteprima" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 msgid "Delete" msgstr "Elimina" @@ -627,7 +624,8 @@ msgstr "Ritaglia" #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." -msgstr "C'è stato un problema con il tuo token di sessione. Prova di nuovo." +msgstr "" +"Si è verificato un problema con il tuo token di sessione. Prova di nuovo." #: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 @@ -650,17 +648,15 @@ msgstr "Immagine aggiornata." #: actions/avatarsettings.php:369 msgid "Failed updating avatar." -msgstr "Errore nell'aggiornare l'immagine." +msgstr "Aggiornamento dell'immagine non riuscito." #: actions/avatarsettings.php:393 -#, fuzzy msgid "Avatar deleted." -msgstr "Immagine aggiornata." +msgstr "Immagine eliminata." #: actions/block.php:69 -#, fuzzy msgid "You already blocked that user." -msgstr "Hai già bloccato questo utente." +msgstr "Hai già bloccato quell'utente." #: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 msgid "Block user" @@ -672,6 +668,9 @@ msgid "" "unsubscribed from you, unable to subscribe to you in the future, and you " "will not be notified of any @-replies from them." msgstr "" +"Vuoi bloccare questo utente? In seguito gli verrà tolto l'abbonamento ai " +"tuoi messaggi, non potrà più abbonarsi e non riceverai notifica delle @-" +"risposte che ti invierà." #: actions/block.php:143 actions/deletenotice.php:145 #: actions/deleteuser.php:147 actions/groupblock.php:178 @@ -679,9 +678,8 @@ msgid "No" msgstr "No" #: actions/block.php:143 actions/deleteuser.php:147 -#, fuzzy msgid "Do not block this user" -msgstr "Sblocca questo utente" +msgstr "Non bloccare questo utente" #: actions/block.php:144 actions/deletenotice.php:146 #: actions/deleteuser.php:148 actions/groupblock.php:179 @@ -708,27 +706,25 @@ msgstr "Nessun soprannome" #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/joingroup.php:83 actions/showgroup.php:137 msgid "No such group" -msgstr "Nessun tale gruppo" +msgstr "Nessun gruppo" #: actions/blockedfromgroup.php:90 -#, fuzzy, php-format +#, php-format msgid "%s blocked profiles" -msgstr "Profilo utente" +msgstr "Profili bloccati di %s" #: actions/blockedfromgroup.php:93 -#, fuzzy, php-format +#, php-format msgid "%s blocked profiles, page %d" -msgstr "%s e amici, pagina %d" +msgstr "Profili bloccati di %s, pagina %d" #: actions/blockedfromgroup.php:108 -#, fuzzy msgid "A list of the users blocked from joining this group." -msgstr "Un elenco degli utenti in questo gruppo." +msgstr "Un elenco degli utenti a cui è bloccato l'accesso a questo gruppo." #: actions/blockedfromgroup.php:281 -#, fuzzy msgid "Unblock user from group" -msgstr "Sblocco dell'utente non riuscito." +msgstr "Sblocca l'utente dal gruppo" #: actions/blockedfromgroup.php:313 lib/unblockform.php:69 msgid "Unblock" @@ -739,9 +735,8 @@ msgid "Unblock this user" msgstr "Sblocca questo utente" #: actions/bookmarklet.php:50 -#, fuzzy msgid "Post to " -msgstr "Fotografia" +msgstr "Invia a " #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -758,7 +753,7 @@ msgstr "Quel codice di conferma non è per te!" #: actions/confirmaddress.php:90 #, php-format msgid "Unrecognized address type %s" -msgstr "Tipo di indirizzo non riconosciuto %s" +msgstr "Tipo di indirizzo %s non riconosciuto" #: actions/confirmaddress.php:94 msgid "That address has already been confirmed." @@ -787,9 +782,8 @@ msgid "The address \"%s\" has been confirmed for your account." msgstr "L'indirizzo \"%s\" è stato confermato per il tuo account." #: actions/conversation.php:99 -#, fuzzy msgid "Conversation" -msgstr "Codice di conferma" +msgstr "Conversazione" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 #: lib/profileaction.php:216 lib/searchgroupnav.php:82 @@ -804,14 +798,13 @@ msgstr "Messaggi" #: lib/adminpanelaction.php:72 lib/profileformaction.php:63 #: lib/settingsaction.php:72 msgid "Not logged in." -msgstr "Non connesso." +msgstr "Accesso non effettuato." #: actions/deletenotice.php:71 msgid "Can't delete this notice." msgstr "Impossibile eliminare questo messaggio." #: actions/deletenotice.php:103 -#, fuzzy msgid "" "You are about to permanently delete a notice. Once this is done, it cannot " "be undone." @@ -825,159 +818,148 @@ msgstr "Elimina messaggio" #: actions/deletenotice.php:144 msgid "Are you sure you want to delete this notice?" -msgstr "Sei sicuro di voler eliminare questo messaggio?" +msgstr "Vuoi eliminare questo messaggio?" #: actions/deletenotice.php:145 -#, fuzzy msgid "Do not delete this notice" -msgstr "Impossibile eliminare questo messaggio." +msgstr "Non eliminare il messaggio" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 msgid "Delete this notice" msgstr "Elimina questo messaggio" #: actions/deletenotice.php:157 -#, fuzzy msgid "There was a problem with your session token. Try again, please." -msgstr "C'è stato un problema con il tuo token di sessione. Prova di nuovo." +msgstr "" +"Si è verificato un problema con il tuo token di sessione. Prova di nuovo." #: actions/deleteuser.php:67 -#, fuzzy msgid "You cannot delete users." -msgstr "Impossibile aggiornare l'utente." +msgstr "Non puoi eliminare utenti." #: actions/deleteuser.php:74 -#, fuzzy msgid "You can only delete local users." -msgstr "Non puoi eliminare lo stato di un altro utente." +msgstr "Puoi eliminare solo gli utenti locali." #: actions/deleteuser.php:110 actions/deleteuser.php:133 -#, fuzzy msgid "Delete user" -msgstr "Elimina" +msgstr "Elimina utente" #: actions/deleteuser.php:135 msgid "" "Are you sure you want to delete this user? This will clear all data about " "the user from the database, without a backup." msgstr "" +"Vuoi eliminare questo utente? Questa azione eliminerà tutti i dati " +"dell'utente dal database, senza una copia di sicurezza." #: actions/deleteuser.php:148 lib/deleteuserform.php:77 -#, fuzzy msgid "Delete this user" -msgstr "Elimina questo messaggio" +msgstr "Elimina questo utente" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 #: lib/adminpanelaction.php:302 lib/groupnav.php:119 msgid "Design" -msgstr "" +msgstr "Aspetto" #: actions/designadminpanel.php:73 msgid "Design settings for this StatusNet site." -msgstr "" +msgstr "Impostazioni dell'aspetto per questo sito di StatusNet." #: actions/designadminpanel.php:275 -#, fuzzy msgid "Invalid logo URL." -msgstr "Dimensione non valida." +msgstr "URL del logo non valido." #: actions/designadminpanel.php:279 -#, fuzzy, php-format +#, php-format msgid "Theme not available: %s" -msgstr "Questa pagina non è disponibile in un " +msgstr "Tema non disponibile: %s" #: actions/designadminpanel.php:375 -#, fuzzy msgid "Change logo" -msgstr "Modifica la tua password" +msgstr "Modifica logo" #: actions/designadminpanel.php:380 -#, fuzzy msgid "Site logo" -msgstr "Invita" +msgstr "Logo del sito" #: actions/designadminpanel.php:387 -#, fuzzy msgid "Change theme" -msgstr "Modifica" +msgstr "Modifica tema" #: actions/designadminpanel.php:404 -#, fuzzy msgid "Site theme" -msgstr "Messaggio del sito" +msgstr "Tema del sito" #: actions/designadminpanel.php:405 -#, fuzzy msgid "Theme for the site." -msgstr "Sconnettiti dal sito" +msgstr "Tema per questo sito." #: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" -msgstr "" +msgstr "Modifica l'immagine di sfondo" #: actions/designadminpanel.php:422 actions/designadminpanel.php:497 #: lib/designsettings.php:178 msgid "Background" -msgstr "" +msgstr "Sfondo" #: actions/designadminpanel.php:427 -#, fuzzy, php-format +#, php-format msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." -msgstr "Puoi caricare un'immagine per il logo del tuo gruppo." +msgstr "" +"Puoi caricare un'immagine di sfondo per il sito. La dimensione massima del " +"file è di %1$s." #: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" -msgstr "" +msgstr "On" #: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" -msgstr "" +msgstr "Off" #: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." -msgstr "" +msgstr "Abilita o disabilita l'immagine di sfondo." #: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" -msgstr "" +msgstr "Affianca l'immagine di sfondo" #: actions/designadminpanel.php:488 lib/designsettings.php:170 -#, fuzzy msgid "Change colours" -msgstr "Modifica la tua password" +msgstr "Modifica colori" #: actions/designadminpanel.php:510 lib/designsettings.php:191 -#, fuzzy msgid "Content" -msgstr "Connetti" +msgstr "Contenuto" #: actions/designadminpanel.php:523 lib/designsettings.php:204 -#, fuzzy msgid "Sidebar" -msgstr "Ricerca" +msgstr "Barra laterale" #: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" msgstr "Testo" #: actions/designadminpanel.php:549 lib/designsettings.php:230 -#, fuzzy msgid "Links" -msgstr "Elenco" +msgstr "Collegamenti" #: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" -msgstr "" +msgstr "Usa predefiniti" #: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" -msgstr "" +msgstr "Ripristina i valori predefiniti" #: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" -msgstr "" +msgstr "Reimposta i valori predefiniti" #: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 @@ -991,7 +973,7 @@ msgstr "Salva" #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" -msgstr "" +msgstr "Salva aspetto" #: actions/disfavor.php:81 msgid "This notice is not a favorite!" @@ -1003,7 +985,7 @@ msgstr "Aggiungi ai preferiti" #: actions/doc.php:69 msgid "No such document." -msgstr "Nessun tale documento." +msgstr "Nessun documento." #: actions/editgroup.php:56 #, php-format @@ -1024,18 +1006,17 @@ msgid "Use this form to edit the group." msgstr "Usa questo modulo per modificare il gruppo." #: actions/editgroup.php:201 actions/newgroup.php:145 -#, fuzzy, php-format +#, php-format msgid "description is too long (max %d chars)." -msgstr "La descrizione è troppo lunga (max 140 caratteri)." +msgstr "La descrizione è troppo lunga (max %d caratteri)." #: actions/editgroup.php:253 msgid "Could not update group." msgstr "Impossibile aggiornare il gruppo." #: actions/editgroup.php:259 classes/User_group.php:390 -#, fuzzy msgid "Could not create aliases." -msgstr "Impossibile creare preferito." +msgstr "Impossibile creare gli alias." #: actions/editgroup.php:269 msgid "Options saved." @@ -1070,8 +1051,9 @@ msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." msgstr "" -"Attesa la conferma per questo indirizzo. Controlla la tua casella di posta " -"(e anche la posta indesiderata!) per un messaggio con ulteriori istruzioni." +"In attesa della conferma per questo indirizzo. Controlla la tua casella di " +"posta (e anche la posta indesiderata!) per un messaggio con ulteriori " +"istruzioni." #: actions/emailsettings.php:117 actions/imsettings.php:120 #: actions/smssettings.php:126 @@ -1084,7 +1066,7 @@ msgstr "Indirizzo email" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" -msgstr "Indirizzo email, del tipo \"NomeUtente@example.org\"" +msgstr "Indirizzo email, del tipo \"nomeutente@example.org\"" #: actions/emailsettings.php:126 actions/imsettings.php:133 #: actions/smssettings.php:145 @@ -1102,7 +1084,7 @@ msgstr "Invia le email a questo indirizzo per scrivere nuovi messaggi." #: actions/emailsettings.php:145 actions/smssettings.php:162 msgid "Make a new email address for posting to; cancels the old one." msgstr "" -"Crea un nuovo indirizzo email a cui inviare i messaggi, rimuove quello " +"Crea un nuovo indirizzo email a cui inviare i messaggi e rimuovi quello " "vecchio." #: actions/emailsettings.php:148 actions/smssettings.php:164 @@ -1128,9 +1110,8 @@ msgid "Send me email when someone sends me a private message." msgstr "Inviami un'email quando qualcuno mi invia un messaggio privato" #: actions/emailsettings.php:174 -#, fuzzy msgid "Send me email when someone sends me an \"@-reply\"." -msgstr "Inviami un'email quando qualcuno mi invia un messaggio privato" +msgstr "Inviami un'email quando qualcuno mi invia una \"@-risposta\"" #: actions/emailsettings.php:179 msgid "Allow friends to nudge me and send me an email." @@ -1155,7 +1136,7 @@ msgstr "Nessun indirizzo email." #: actions/emailsettings.php:327 msgid "Cannot normalize that email address" -msgstr "Impossibile normalizzare l'indirizzo email" +msgstr "Impossibile normalizzare quell'indirizzo email" #: actions/emailsettings.php:331 actions/siteadminpanel.php:158 msgid "Not a valid email address" @@ -1248,12 +1229,16 @@ msgstr "Ecco i messaggi più famosi all'interno del sito." #: actions/favorited.php:150 msgid "Favorite notices appear on this page but no one has favorited one yet." msgstr "" +"I messaggi preferiti vengono visualizzati in questa pagina, ma non ne è " +"stato ancora impostato alcuno." #: 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 "" +"Aggiungi tu un messaggio tra i tuoi preferiti facendo clic sul pulsante a " +"forma di cuore,." #: actions/favorited.php:156 #, php-format @@ -1261,6 +1246,8 @@ msgid "" "Why not [register an account](%%action.register%%) and be the first to add a " "notice to your favorites!" msgstr "" +"Perché non [crei un account](%%action.register%%) e aggiungi un messaggio " +"tra i tuoi preferiti!" #: actions/favoritesrss.php:111 actions/showfavorites.php:77 #: lib/personalgroupnav.php:115 @@ -1269,9 +1256,9 @@ msgid "%s's favorite notices" msgstr "Messaggi preferiti di %s" #: actions/favoritesrss.php:115 -#, fuzzy, php-format +#, php-format msgid "Updates favored by %1$s on %2$s!" -msgstr "Aggiornamenti da %1$s su %2$s!" +msgstr "Messaggi preferiti da %1$s su %2$s!" #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 @@ -1289,31 +1276,26 @@ msgid "A selection of some of the great users on %s" msgstr "Una selezione dei migliori utenti su %s" #: actions/file.php:34 -#, fuzzy msgid "No notice ID." -msgstr "Nuovo messaggio" +msgstr "Nessun ID di messaggio." #: actions/file.php:38 -#, fuzzy msgid "No notice." -msgstr "Nuovo messaggio" +msgstr "Nessun messaggio." #: actions/file.php:42 -#, fuzzy msgid "No attachments." -msgstr "Nessun tale documento." +msgstr "Nessun allegato." #: actions/file.php:51 -#, fuzzy msgid "No uploaded attachments." -msgstr "Nessun tale documento." +msgstr "Nessun allegato caricato." #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" -msgstr "Non aspettavo questa risposta!" +msgstr "Risposta non attesa!" #: actions/finishremotesubscribe.php:80 -#, fuzzy msgid "User being listened to does not exist." msgstr "L'utente che intendi seguire non esiste." @@ -1326,20 +1308,16 @@ msgid "That user has blocked you from subscribing." msgstr "Quell'utente ti ha bloccato dall'abbonarti." #: actions/finishremotesubscribe.php:110 -#, fuzzy msgid "You are not authorized." -msgstr "Non autorizzato." +msgstr "Autorizzazione non presente." #: actions/finishremotesubscribe.php:113 -#, fuzzy msgid "Could not convert request token to access token." -msgstr "" -"Impossibile convertire le credenziali di richiesta in credenziali di accesso." +msgstr "Impossibile convertire il token di richiesta in uno di accesso." #: actions/finishremotesubscribe.php:118 -#, fuzzy msgid "Remote service uses unknown version of OMB protocol." -msgstr "Versione del protocollo OMB sconosciuta." +msgstr "Il servizio remoto usa una versione del protocollo OMB sconosciuta." #: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 msgid "Error updating remote profile" @@ -1350,17 +1328,15 @@ msgstr "Errore nell'aggiornare il profilo remoto" #: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 #: lib/command.php:263 msgid "No such group." -msgstr "Nessuna tale gruppo." +msgstr "Nessuna gruppo." #: actions/getfile.php:75 -#, fuzzy msgid "No such file." -msgstr "Nessun tale messaggio." +msgstr "Nessun file." #: actions/getfile.php:79 -#, fuzzy msgid "Cannot read file." -msgstr "Perso il nostro file." +msgstr "Impossibile leggere il file." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 @@ -1376,28 +1352,24 @@ msgstr "Nessun profilo con quel ID." #: actions/groupblock.php:81 actions/groupunblock.php:81 #: actions/makeadmin.php:81 -#, fuzzy msgid "No group specified." -msgstr "Nessun profilo specificato." +msgstr "Nessun gruppo specificato." #: actions/groupblock.php:91 msgid "Only an admin can block group members." -msgstr "" +msgstr "Solo un amministratore può bloccare i membri del gruppo." #: actions/groupblock.php:95 -#, fuzzy msgid "User is already blocked from group." -msgstr "L'utente ti ha bloccato." +msgstr "L'utente è già bloccato dal gruppo." #: actions/groupblock.php:100 -#, fuzzy msgid "User is not a member of group." -msgstr "Non sei un membro di quel gruppo." +msgstr "L'utente non fa parte del gruppo." #: actions/groupblock.php:136 actions/groupmembers.php:314 -#, fuzzy msgid "Block user from group" -msgstr "Blocca utente" +msgstr "Blocca l'utente dal gruppo" #: actions/groupblock.php:162 #, php-format @@ -1406,73 +1378,71 @@ msgid "" "be removed from the group, unable to post, and unable to subscribe to the " "group in the future." msgstr "" +"Vuoi bloccare l'utente \"%s\" dal gruppo \"%s\"? L'utente verrà rimosso dal " +"gruppo, non potrà più inviare messaggi e non potrà più iscriversi al gruppo." #: actions/groupblock.php:178 -#, fuzzy msgid "Do not block this user from this group" -msgstr "Un elenco degli utenti in questo gruppo." +msgstr "Non bloccare l'utente da questo gruppo" #: actions/groupblock.php:179 -#, fuzzy msgid "Block this user from this group" -msgstr "Un elenco degli utenti in questo gruppo." +msgstr "Blocca l'utente da questo gruppo" #: actions/groupblock.php:196 msgid "Database error blocking user from group." -msgstr "" +msgstr "Errore del database nel bloccare l'utente dal gruppo." #: actions/groupbyid.php:74 msgid "No ID" msgstr "Nessun ID" #: actions/groupdesignsettings.php:68 -#, fuzzy msgid "You must be logged in to edit a group." -msgstr "Devi eseguire l'accesso per creare un gruppo." +msgstr "Devi eseguire l'accesso per modificare un gruppo." #: actions/groupdesignsettings.php:141 -#, fuzzy msgid "Group design" -msgstr "Gruppi" +msgstr "Aspetto del gruppo" #: actions/groupdesignsettings.php:152 msgid "" "Customize the way your group looks with a background image and a colour " "palette of your choice." msgstr "" +"Personalizza l'aspetto del tuo gruppo con un'immagine di sfondo e dei colori " +"personalizzati." #: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 #: lib/designsettings.php:391 lib/designsettings.php:413 -#, fuzzy msgid "Couldn't update your design." -msgstr "Impossibile aggiornare l'utente." +msgstr "Impossibile aggiornare l'aspetto." #: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -#, fuzzy msgid "Unable to save your design settings!" -msgstr "Impossibile salvare le tue impostazioni di Twitter!" +msgstr "Impossibile salvare le tue impostazioni dell'aspetto." #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 -#, fuzzy msgid "Design preferences saved." -msgstr "Preferenze di sincronizzazione salvate." +msgstr "Preferenze dell'aspetto salvate." #: actions/grouplogo.php:139 actions/grouplogo.php:192 msgid "Group logo" msgstr "Logo del gruppo" #: actions/grouplogo.php:150 -#, fuzzy, php-format +#, php-format msgid "" "You can upload a logo image for your group. The maximum file size is %s." -msgstr "Puoi caricare un'immagine per il logo del tuo gruppo." +msgstr "" +"Puoi caricare un'immagine per il logo del tuo gruppo. La dimensione massima " +"del file è di %s." #: actions/grouplogo.php:362 -#, fuzzy msgid "Pick a square area of the image to be the logo." -msgstr "Scegli un'area quadrata per la tua immagine personale" +msgstr "Scegli un'area quadrata dell'immagine per il logo." #: actions/grouplogo.php:396 msgid "Logo updated." @@ -1480,7 +1450,7 @@ msgstr "Logo aggiornato." #: actions/grouplogo.php:398 msgid "Failed updating logo." -msgstr "Errore nell'aggiornare il logo." +msgstr "Aggiornamento del logo non riuscito." #: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format @@ -1505,23 +1475,21 @@ msgid "Block" msgstr "Blocca" #: actions/groupmembers.php:441 -#, fuzzy msgid "Make user an admin of the group" -msgstr "Devi essere amministratore per modificare il gruppo" +msgstr "Rende l'utente amministratore del gruppo" #: actions/groupmembers.php:473 -#, fuzzy msgid "Make Admin" -msgstr "Amministra" +msgstr "Rendi amm." #: actions/groupmembers.php:473 msgid "Make this user an admin" -msgstr "" +msgstr "Rende questo utente un amministratore" #: actions/grouprss.php:133 -#, fuzzy, php-format +#, php-format msgid "Updates from members of %1$s on %2$s!" -msgstr "Aggiornamenti da %1$s su %2$s!" +msgstr "Messaggi dai membri di %1$s su %2$s!" #: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 @@ -1542,29 +1510,33 @@ msgid "" "for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" "%%%%)" msgstr "" +"I gruppi di %%%%site.name%%%% ti consentono di trovare e parlare con persone " +"che condividono i tuoi stessi interessi. Quando fai parte di un gruppo, puoi " +"inviare messaggi a tutti i membri del gruppo utilizzando la sintassi \"!" +"nomegruppo\". Non trovi un gruppo che ti piace? Prova a [cercarne uno](%%%%" +"action.groupsearch%%%%) o [crea il tuo!](%%%%action.newgroup%%%%)" #: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 msgid "Create a new group" msgstr "Crea un nuovo gruppo" #: actions/groupsearch.php:52 -#, fuzzy, php-format +#, php-format msgid "" "Search for groups on %%site.name%% by their name, location, or description. " "Separate the terms by spaces; they must be 3 characters or more." msgstr "" -"Ricerca le persone su %%site.name%% per nome, ubicazione o interessi. Separa " -"i termini di ricerca con degli spazi; lunghezza minima 3 caratteri." +"Cerca tra i gruppi su %%site.name%% per nome, ubicazione o descrizione. " +"Separa i termini di ricerca con degli spazi; lunghezza minima 3 caratteri." #: actions/groupsearch.php:58 msgid "Group search" -msgstr "Ricerca gruppi" +msgstr "Cerca gruppi" #: actions/groupsearch.php:79 actions/noticesearch.php:117 #: actions/peoplesearch.php:83 -#, fuzzy msgid "No results." -msgstr "Nessun risultato" +msgstr "Nessun risultato." #: actions/groupsearch.php:82 #, php-format @@ -1572,6 +1544,8 @@ msgid "" "If you can't find the group you're looking for, you can [create it](%%action." "newgroup%%) yourself." msgstr "" +"Se non riesci a trovare il gruppo che cerchi, puoi [crearlo](%%action." +"newgroup%%) tu." #: actions/groupsearch.php:85 #, php-format @@ -1579,15 +1553,16 @@ msgid "" "Why not [register an account](%%action.register%%) and [create the group](%%" "action.newgroup%%) yourself!" msgstr "" +"Perché non [crei un account](%%action.register%%) e [crei tu il gruppo](%%" +"action.newgroup%%)!" #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." -msgstr "" +msgstr "Solo gli amministratori possono sbloccare i membri del gruppo." #: actions/groupunblock.php:95 -#, fuzzy msgid "User is not blocked from group." -msgstr "L'utente ti ha bloccato." +msgstr "L'utente non è bloccato dal gruppo." #: actions/groupunblock.php:128 actions/unblock.php:77 msgid "Error removing the block." @@ -1608,9 +1583,8 @@ msgstr "" "impostazioni qui di seguito." #: actions/imsettings.php:89 -#, fuzzy msgid "IM is not available." -msgstr "Questa pagina non è disponibile in un " +msgstr "Messaggistica istantanea non disponibile." #: actions/imsettings.php:106 msgid "Current confirmed Jabber/GTalk address." @@ -1623,8 +1597,8 @@ msgid "" "message with further instructions. (Did you add %s to your buddy list?)" msgstr "" "In attesa di conferma per questo indirizzo. Controlla il tuo account Jabber/" -"GTalk per un messaggio con ulteriori istruzioni (hai aggiunto %s al tuo " -"elenco contatti?)." +"GTalk per un messaggio con ulteriori istruzioni. Hai aggiunto %s al tuo " +"elenco contatti?" #: actions/imsettings.php:124 msgid "IM Address" @@ -1636,13 +1610,13 @@ msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." msgstr "" -"Indirizzo Jabber o GTalk nella forma \"NomeUtente@example.org\". Per prima " +"Indirizzo Jabber o GTalk nella forma \"nomeutente@example.org\". Per prima " "cosa, assicurati di aggiungere %s all'elenco dei contatti nel tuo programma " "di messaggistica o su GTalk." #: actions/imsettings.php:143 msgid "Send me notices through Jabber/GTalk." -msgstr "Inviami le notifiche via Jabber/GTalk" +msgstr "Inviami i messaggi via Jabber/GTalk" #: actions/imsettings.php:148 msgid "Post a notice when my Jabber/GTalk status changes." @@ -1707,7 +1681,7 @@ msgstr "" #: actions/invite.php:39 msgid "Invites have been disabled." -msgstr "" +msgstr "Gli inviti sono stati disabilitati." #: actions/invite.php:41 #, php-format @@ -1729,7 +1703,7 @@ msgstr "Invita nuovi utenti" #: actions/invite.php:128 msgid "You are already subscribed to these users:" -msgstr "Sei già abbonato a questi utenti:" +msgstr "Hai già un abbonamento a questi utenti:" #: actions/invite.php:131 actions/invite.php:139 #, php-format @@ -1739,8 +1713,7 @@ msgstr "%s (%s)" #: actions/invite.php:136 msgid "" "These people are already users and you were automatically subscribed to them:" -msgstr "" -"Queste persone sono già utenti e sei stato automaticamente abbonato a loro:" +msgstr "Queste persone sono già utenti e hai un abbonamento automatico a loro:" #: actions/invite.php:144 msgid "Invitation(s) sent to the following people:" @@ -1818,7 +1791,7 @@ msgid "" msgstr "" "Hai ricevuto un invito per seguire %1$s su %2$s (%3$s).\n" "\n" -"%2$s è un servizio di micro-blog che ti consente di rimanere sempre al passo " +"%2$s è un servizio di microblog che ti consente di rimanere sempre al passo " "con le persone che conosci e che ti interessano.\n" "\n" "Puoi condividere notizie che ti riguardano, i tuoi pensieri o la tua vita in " @@ -1849,7 +1822,7 @@ msgstr "Devi eseguire l'accesso per iscriverti a un gruppo." #: actions/joingroup.php:90 lib/command.php:217 msgid "You are already a member of that group" -msgstr "Sei già un membro di quel gruppo" +msgstr "Fai già parte di quel gruppo" #: actions/joingroup.php:128 lib/command.php:234 #, php-format @@ -1859,7 +1832,7 @@ msgstr "Impossibile iscrivere l'utente %s al gruppo %s" #: actions/joingroup.php:135 lib/command.php:239 #, php-format msgid "%s joined group %s" -msgstr "%s si è iscritto al gruppo %s" +msgstr "%s fa ora parte del gruppo %s" #: actions/leavegroup.php:60 msgid "You must be logged in to leave a group." @@ -1867,7 +1840,7 @@ msgstr "Devi eseguire l'accesso per lasciare un gruppo." #: actions/leavegroup.php:90 lib/command.php:268 msgid "You are not a member of that group." -msgstr "Non sei un membro di quel gruppo." +msgstr "Non fai parte di quel gruppo." #: actions/leavegroup.php:119 lib/command.php:278 msgid "Could not find membership record." @@ -1888,18 +1861,16 @@ msgid "Already logged in." msgstr "Accesso già effettuato." #: actions/login.php:114 actions/login.php:124 -#, fuzzy msgid "Invalid or expired token." -msgstr "Contenuto del messaggio non valido" +msgstr "Token non valido o scaduto." #: actions/login.php:147 msgid "Incorrect username or password." msgstr "Nome utente o password non corretto." #: actions/login.php:153 -#, fuzzy msgid "Error setting user. You are probably not authorized." -msgstr "Non autorizzato." +msgstr "Errore nell'impostare l'utente. Forse non hai l'autorizzazione." #: actions/login.php:208 actions/login.php:261 lib/action.php:458 #: lib/logingroupnav.php:79 @@ -1938,41 +1909,41 @@ msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "" -"Per motivi di sicurezza è necessario reinserire il proprio nome utente e la " -"propria password prima di modificare le impostazioni." +"Per motivi di sicurezza, è necessario che tu inserisca il tuo nome utente e " +"la tua password prima di modificare le impostazioni." #: actions/login.php:290 -#, fuzzy, php-format +#, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" "(%%action.register%%) a new account." msgstr "" -"Accedi con nome utente e password. Non hai ancora un nome utente? [Registra]" -"(%%action.register%%) un nuovo account o prova [OpenID](%%action.openidlogin%" -"%). " +"Accedi col tuo nome utente e password. Non hai ancora un nome utente? [Crea]" +"(%%action.register%%) un nuovo account." #: actions/makeadmin.php:91 msgid "Only an admin can make another user an admin." msgstr "" +"Solo gli amministratori possono rendere un altro utente amministratori." #: actions/makeadmin.php:95 #, php-format msgid "%s is already an admin for group \"%s\"." -msgstr "" +msgstr "%s è già amministratore per il gruppo \"%s\"." #: actions/makeadmin.php:132 #, php-format msgid "Can't get membership record for %s in group %s" -msgstr "" +msgstr "Impossibile recuperare la membership per %s nel gruppo %s" #: actions/makeadmin.php:145 #, php-format msgid "Can't make %s an admin for group %s" -msgstr "" +msgstr "Impossibile rendere %s un amministratore per il gruppo %s" #: actions/microsummary.php:69 msgid "No current status" -msgstr "Nessuno stato corrente" +msgstr "Nessun messaggio corrente" #: actions/newgroup.php:53 msgid "New group" @@ -1991,7 +1962,7 @@ msgid "You can't send a message to this user." msgstr "Non puoi inviare un messaggio a questo utente." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "Nessun contenuto!" @@ -2005,11 +1976,10 @@ msgid "" msgstr "Non inviarti un messaggio, piuttosto ripetilo a voce dolcemente." #: actions/newmessage.php:181 -#, fuzzy msgid "Message sent" -msgstr "Messaggio" +msgstr "Messaggio inviato" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "Messaggio diretto a %s inviato" @@ -2032,17 +2002,17 @@ msgid "" "Search for notices on %%site.name%% by their contents. Separate search terms " "by spaces; they must be 3 characters or more." msgstr "" -"Ricerca tra i messaggi su %%site.name%% in base al contenuto. Separa i " -"termini di ricerca con degli spazi; lunghezza minima 3 caratteri." +"Cerca tra i messaggi su %%site.name%% in base al contenuto. Separa i termini " +"di ricerca con degli spazi; lunghezza minima 3 caratteri." #: actions/noticesearch.php:78 msgid "Text search" -msgstr "Ricerca testo" +msgstr "Cerca testo" #: actions/noticesearch.php:91 -#, fuzzy, php-format +#, php-format msgid "Search results for \"%s\" on %s" -msgstr " Ricerca \"%s\" nel flusso" +msgstr "Risultati della ricerca per \"%s\" su %s" #: actions/noticesearch.php:121 #, php-format @@ -2050,6 +2020,8 @@ msgid "" "Be the first to [post on this topic](%%%%action.newnotice%%%%?" "status_textarea=%s)!" msgstr "" +"[Scrivi qualche cosa](%%%%action.newnotice%%%%?status_textarea=%s) su questo " +"argomento!" #: actions/noticesearch.php:124 #, php-format @@ -2057,16 +2029,18 @@ msgid "" "Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" +"Perché non [crei un account](%%%%action.register%%%%) e [scrivi qualche cosa]" +"(%%%%action.newnotice%%%%?status_textarea=%s) su questo argomento!" #: actions/noticesearchrss.php:96 -#, fuzzy, php-format +#, php-format msgid "Updates with \"%s\"" -msgstr "Aggiornamenti da %1$s su %2$s!" +msgstr "Messaggi con \"%s\"" #: actions/noticesearchrss.php:98 -#, fuzzy, php-format +#, php-format msgid "Updates matching search term \"%1$s\" on %2$s!" -msgstr "Tutti gli aggiornamenti corrispondenti al termine di ricerca \"%s\"" +msgstr "Messaggi che corrispondono al termine \"%1$s\" su %2$s!" #: actions/nudge.php:85 msgid "" @@ -2093,26 +2067,25 @@ msgid "%1$s's status on %2$s" msgstr "Stato di %1$s su %2$s" #: actions/oembed.php:157 -#, fuzzy msgid "content type " -msgstr "Connetti" +msgstr "tipo di contenuto " #: actions/oembed.php:160 msgid "Only " -msgstr "" +msgstr "Solo " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "Non è un formato di dati supportato." #: actions/opensearch.php:64 msgid "People Search" -msgstr "Ricerca persone" +msgstr "Cerca persone" #: actions/opensearch.php:67 msgid "Notice Search" -msgstr "Ricerca messaggi" +msgstr "Cerca messaggi" #: actions/othersettings.php:60 msgid "Other Settings" @@ -2124,28 +2097,27 @@ msgstr "Gestisci altre opzioni." #: actions/othersettings.php:108 msgid " (free service)" -msgstr "" +msgstr " (servizio libero)" #: actions/othersettings.php:116 msgid "Shorten URLs with" -msgstr "" +msgstr "Accorcia gli URL con" #: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "Servizio di autoriduzione da usare." #: actions/othersettings.php:122 -#, fuzzy msgid "View profile designs" -msgstr "Impostazioni del profilo" +msgstr "Visualizza aspetto" #: actions/othersettings.php:123 msgid "Show or hide profile designs." -msgstr "" +msgstr "Mostra o nasconde gli aspetti del profilo." #: actions/othersettings.php:153 msgid "URL shortening service is too long (max 50 chars)." -msgstr "Il servizio di riduzione degli URL è troppo lungo (max 50 caratteri)" +msgstr "Il servizio di riduzione degli URL è troppo lungo (max 50 caratteri)." #: actions/outbox.php:58 #, php-format @@ -2173,7 +2145,7 @@ msgstr "Modifica la tua password." #: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" -msgstr "Cambio password" +msgstr "Modifica password" #: actions/passwordsettings.php:104 msgid "Old password" @@ -2226,111 +2198,104 @@ msgstr "Password salvata." #: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 msgid "Paths" -msgstr "" +msgstr "Percorsi" #: actions/pathsadminpanel.php:70 msgid "Path and server settings for this StatusNet site." -msgstr "" +msgstr "Percorso e impostazioni server per questo sito StatusNet." #: actions/pathsadminpanel.php:140 -#, fuzzy, php-format +#, php-format msgid "Theme directory not readable: %s" -msgstr "Questa pagina non è disponibile in un " +msgstr "Directory del tema non leggibile: %s" #: actions/pathsadminpanel.php:146 #, php-format msgid "Avatar directory not writable: %s" -msgstr "" +msgstr "Directory delle immagini degli utenti non scrivibile: %s" #: actions/pathsadminpanel.php:152 #, php-format msgid "Background directory not writable: %s" -msgstr "" +msgstr "Directory degli sfondi non scrivibile: %s" #: actions/pathsadminpanel.php:160 #, php-format msgid "Locales directory not readable: %s" -msgstr "" +msgstr "Directory delle localizzazioni non leggibile: %s" #: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58 #: lib/adminpanelaction.php:299 -#, fuzzy msgid "Site" -msgstr "Invita" +msgstr "Sito" #: actions/pathsadminpanel.php:216 msgid "Path" -msgstr "" +msgstr "Percorso" #: actions/pathsadminpanel.php:216 -#, fuzzy msgid "Site path" -msgstr "Messaggio del sito" +msgstr "Percorso del sito" #: actions/pathsadminpanel.php:220 msgid "Path to locales" -msgstr "" +msgstr "Percorso alle localizzazioni" #: actions/pathsadminpanel.php:220 msgid "Directory path to locales" -msgstr "" +msgstr "Percorso della directory alle localizzazioni" #: actions/pathsadminpanel.php:227 msgid "Theme" -msgstr "" +msgstr "Tema" #: actions/pathsadminpanel.php:232 msgid "Theme server" -msgstr "" +msgstr "Server del tema" #: actions/pathsadminpanel.php:236 msgid "Theme path" -msgstr "" +msgstr "Percorso del tema" #: actions/pathsadminpanel.php:240 msgid "Theme directory" -msgstr "" +msgstr "Directory del tema" #: actions/pathsadminpanel.php:247 -#, fuzzy msgid "Avatars" -msgstr "Immagine" +msgstr "Immagini" #: actions/pathsadminpanel.php:252 -#, fuzzy msgid "Avatar server" -msgstr "Impostazioni immagine" +msgstr "Server dell'immagine" #: actions/pathsadminpanel.php:256 -#, fuzzy msgid "Avatar path" -msgstr "Immagine aggiornata." +msgstr "Percorso dell'immagine" #: actions/pathsadminpanel.php:260 -#, fuzzy msgid "Avatar directory" -msgstr "Immagine aggiornata." +msgstr "Directory dell'immagine" #: actions/pathsadminpanel.php:269 msgid "Backgrounds" -msgstr "" +msgstr "Sfondi" #: actions/pathsadminpanel.php:273 msgid "Background server" -msgstr "" +msgstr "Server dello sfondo" #: actions/pathsadminpanel.php:277 msgid "Background path" -msgstr "" +msgstr "Percorso dello sfondo" #: actions/pathsadminpanel.php:281 msgid "Background directory" -msgstr "" +msgstr "Directory dello sfondo" #: actions/pathsadminpanel.php:297 -#, fuzzy msgid "Save paths" -msgstr "Messaggio del sito" +msgstr "Salva percorsi" #: actions/peoplesearch.php:52 #, php-format @@ -2338,12 +2303,12 @@ msgid "" "Search for people on %%site.name%% by their name, location, or interests. " "Separate the terms by spaces; they must be 3 characters or more." msgstr "" -"Ricerca le persone su %%site.name%% per nome, ubicazione o interessi. Separa " -"i termini di ricerca con degli spazi; lunghezza minima 3 caratteri." +"Cerca tra le persone su %%site.name%% per nome, ubicazione o interessi. " +"Separa i termini di ricerca con degli spazi; lunghezza minima 3 caratteri." #: actions/peoplesearch.php:58 msgid "People search" -msgstr "Ricerca persone" +msgstr "Cerca persone" #: actions/peopletag.php:70 #, php-format @@ -2363,6 +2328,8 @@ msgstr "Contenuto del messaggio non valido" #, php-format msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." msgstr "" +"La licenza \"%s\" del messaggio non è compatibile con la licenza del sito \"%" +"s\"." #: actions/profilesettings.php:60 msgid "Profile settings" @@ -2373,7 +2340,7 @@ msgid "" "You can update your personal profile info here so people know more about you." msgstr "" "Qui puoi aggiornare le informazioni del tuo profilo personale, così gli " -"altri potranno conoscere qualcosa in più di te." +"altri potranno conoscere qualcosa in più su di te." #: actions/profilesettings.php:99 msgid "Profile information" @@ -2400,14 +2367,13 @@ msgid "URL of your homepage, blog, or profile on another site" msgstr "URL della tua pagina web, blog o profilo su un altro sito" #: actions/profilesettings.php:122 actions/register.php:460 -#, fuzzy, php-format +#, php-format msgid "Describe yourself and your interests in %d chars" -msgstr "Descriviti assieme ai tuoi interessi in 140 caratteri" +msgstr "Descriviti assieme ai tuoi interessi in %d caratteri" #: actions/profilesettings.php:125 actions/register.php:463 -#, fuzzy msgid "Describe yourself and your interests" -msgstr "Descrivi te e i tuoi " +msgstr "Descrivi te e i tuoi interessi" #: actions/profilesettings.php:127 actions/register.php:465 msgid "Bio" @@ -2460,9 +2426,9 @@ msgstr "" "umani)" #: actions/profilesettings.php:221 actions/register.php:223 -#, fuzzy, php-format +#, php-format msgid "Bio is too long (max %d chars)." -msgstr "La biografia è troppo lunga (max 140 caratteri)." +msgstr "La biografia è troppo lunga (max %d caratteri)." #: actions/profilesettings.php:228 actions/siteadminpanel.php:165 msgid "Timezone not selected." @@ -2496,7 +2462,7 @@ msgstr "Impostazioni salvate." #: actions/public.php:83 #, php-format msgid "Beyond the page limit (%s)" -msgstr "" +msgstr "Oltre il limite della pagina (%s)" #: actions/public.php:92 msgid "Could not retrieve public stream." @@ -2512,19 +2478,16 @@ msgid "Public timeline" msgstr "Attività pubblica" #: actions/public.php:151 -#, fuzzy msgid "Public Stream Feed (RSS 1.0)" -msgstr "Feed del flusso pubblico" +msgstr "Feed dell'attività pubblica (RSS 1.0)" #: actions/public.php:155 -#, fuzzy msgid "Public Stream Feed (RSS 2.0)" -msgstr "Feed del flusso pubblico" +msgstr "Feed dell'attività pubblica (RSS 2.0)" #: actions/public.php:159 -#, fuzzy msgid "Public Stream Feed (Atom)" -msgstr "Feed del flusso pubblico" +msgstr "Feed dell'attività pubblica (Atom)" #: actions/public.php:179 #, php-format @@ -2532,16 +2495,19 @@ msgid "" "This is the public timeline for %%site.name%% but no one has posted anything " "yet." msgstr "" +"Questa è l'attività pubblica di %%site.name%%, ma nessuno ha ancora scritto " +"qualche cosa." #: actions/public.php:182 msgid "Be the first to post!" -msgstr "" +msgstr "Fallo tu!" #: actions/public.php:186 #, php-format msgid "" "Why not [register an account](%%action.register%%) and be the first to post!" msgstr "" +"Perché non [crei un account](%%action.register%%) e scrivi qualche cosa!" #: actions/public.php:233 #, php-format @@ -2551,45 +2517,50 @@ msgid "" "tool. [Join now](%%action.register%%) to share notices about yourself with " "friends, family, and colleagues! ([Read more](%%doc.help%%))" msgstr "" +"Questo è %%site.name%%, un servizio di [microblog](http://it.wikipedia.org/" +"wiki/Microblogging) basato sul software libero [StatusNet](http://status." +"net/). [Registrati](%%action.register%%) per condividere messaggi con i tuoi " +"amici, i tuoi familiari e colleghi! ([Maggiori informazioni](%%doc.help%%))" #: actions/public.php:238 -#, fuzzy, php-format +#, php-format msgid "" "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-" "blogging) service based on the Free Software [StatusNet](http://status.net/) " "tool." msgstr "" -"Questo è %%site.name%%, un servizio di [micro-blog](http://it.wikipedia.org/" -"wiki/Microblogging) " +"Questo è %%site.name%%, un servizio di [microblog](http://it.wikipedia.org/" +"wiki/Microblogging) basato sul software libero [StatusNet](http://status." +"net/)." #: actions/publictagcloud.php:57 msgid "Public tag cloud" msgstr "Insieme delle etichette" #: actions/publictagcloud.php:63 -#, fuzzy, php-format +#, php-format msgid "These are most popular recent tags on %s " msgstr "Queste sono le etichette più usate e recenti su %s " #: actions/publictagcloud.php:69 #, php-format msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet." -msgstr "" +msgstr "Nessuno ha ancora scritto un messaggio con un [hashtag](%%doc.tags%%)." #: actions/publictagcloud.php:72 msgid "Be the first to post one!" -msgstr "" +msgstr "Scrivilo tu!" #: actions/publictagcloud.php:75 #, php-format msgid "" "Why not [register an account](%%action.register%%) and be the first to post " "one!" -msgstr "" +msgstr "Perché non [crei un accout](%%action.register%%) e ne scrivi uno tu!" #: actions/publictagcloud.php:135 msgid "Tag cloud" -msgstr "Insieme etichette" +msgstr "Insieme delle etichette" #: actions/recoverpassword.php:36 msgid "You are already logged in!" @@ -2624,18 +2595,20 @@ 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 "" +"Se hai dimenticato o perso la tua password, puoi fartene inviare una nuova " +"all'indirizzo email che hai inserito nel tuo account." #: actions/recoverpassword.php:158 msgid "You have been identified. Enter a new password below. " -msgstr "" +msgstr "Identificazione avvenuta. Inserisci la nuova password. " #: actions/recoverpassword.php:188 msgid "Password recovery" -msgstr "" +msgstr "Recupero password" #: actions/recoverpassword.php:191 msgid "Nickname or email address" -msgstr "" +msgstr "Soprannome o indirizzo email" #: actions/recoverpassword.php:193 msgid "Your nickname on this server, or your registered email address." @@ -2648,11 +2621,11 @@ msgstr "Recupera" #: actions/recoverpassword.php:208 msgid "Reset password" -msgstr "Reimposta password" +msgstr "Reimposta la password" #: actions/recoverpassword.php:209 msgid "Recover password" -msgstr "Recupero password" +msgstr "Recupera la password" #: actions/recoverpassword.php:210 actions/recoverpassword.php:322 msgid "Password recovery requested" @@ -2700,7 +2673,7 @@ msgstr "Ripristino della password inaspettato." #: actions/recoverpassword.php:352 msgid "Password must be 6 chars or more." -msgstr "La password dev'essere lunga almeno 6 caratteri." +msgstr "La password deve essere lunga almeno 6 caratteri." #: actions/recoverpassword.php:356 msgid "Password and confirmation do not match." @@ -2716,12 +2689,11 @@ msgstr "Nuova password salvata con successo. Hai effettuato l'accesso." #: actions/register.php:85 actions/register.php:189 actions/register.php:404 msgid "Sorry, only invited people can register." -msgstr "Spiacenti, solo le persone invitate possono registrarsi." +msgstr "Solo le persone invitate possono registrarsi." #: actions/register.php:92 -#, fuzzy msgid "Sorry, invalid invitation code." -msgstr "Errore con il codice di conferma." +msgstr "Codice di invito non valido." #: actions/register.php:112 msgid "Registration successful" @@ -2757,19 +2729,22 @@ msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" +"Attraverso questo modulo puoi creare un nuovo account con cui potrai " +"successivamente inviare messaggi e metterti in contatto con i tuoi amici e " +"colleghi. " #: actions/register.php:424 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" -"1-64 lettere minuscole o numeri, niente punteggiatura o spazi. Richiesto." +"1-64 lettere minuscole o numeri, niente punteggiatura o spazi; richiesto" #: actions/register.php:429 msgid "6 or more characters. Required." -msgstr "6 o più caratteri. Richiesta." +msgstr "6 o più caratteri; richiesta" #: actions/register.php:433 msgid "Same as password above. Required." -msgstr "Stessa password di sopra. Richiesta." +msgstr "Stessa password di sopra; richiesta" #: actions/register.php:437 actions/register.php:441 #: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120 @@ -2786,20 +2761,19 @@ msgstr "Nome completo, preferibilmente il tuo \"vero\" nome" #: actions/register.php:493 msgid "My text and files are available under " -msgstr "I miei testi e file sono disponibili sotto " +msgstr "I miei testi e file sono disponibili nei termini della licenza " #: actions/register.php:495 msgid "Creative Commons Attribution 3.0" -msgstr "" +msgstr "Creative Commons Attribution 3.0" #: actions/register.php:496 -#, fuzzy msgid "" " except this private data: password, email address, IM address, and phone " "number." msgstr "" " a eccezione di questi dati personali: password, indirizzo email, indirizzo " -"messaggistica istantanea, numero di telefono." +"messaggistica istantanea e numero di telefono." #: actions/register.php:537 #, php-format @@ -2819,19 +2793,19 @@ msgid "" "\n" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -"Congratulazioni %s! Benvenuto/a in %%%%site.name%%%%. Da qui ora puoi...\n" +"Congratulazioni %s! Benvenuti in %%%%site.name%%%%. Da qui ora puoi...\n" "\n" "* Visitare il [tuo profilo](%s) e inviare il tuo primo messaggio.\n" "*Aggiungere un [indirizzo Jabber/GTalk](%%%%action.imsettings%%%%) per usare " "quel servizio per inviare messaggi.\n" -"*[Ricercare persone](%%%%action.peoplesearch%%%%) che potresti conoscere o " -"che condividono i tuoi stessi interessi.\n" +"*[Cercare persone](%%%%action.peoplesearch%%%%) che potresti conoscere o che " +"condividono i tuoi stessi interessi.\n" "* Aggiornare le [tue impostazioni](%%%%action.profilesettings%%%%) per " "fornire agli altri più informazioni su di te.\n" "* Leggere la [documentazione in rete](%%%%doc.help%%%%) per le " "caratteristiche che magari non hai ancora visto. \n" "\n" -"Grazie per esserti iscritto/a e speriamo tu possa divertiti usando questo " +"Grazie per la tua iscrizione e speriamo tu possa divertiti usando questo " "servizio." #: actions/register.php:561 @@ -2849,19 +2823,18 @@ msgid "" "register%%) a new account. If you already have an account on a [compatible " "microblogging site](%%doc.openmublog%%), enter your profile URL below." msgstr "" -"Per abbonarti puoi [eseguire l'accesso](%%action.login%%) oppure [registrare]" -"(%%action.register%%) un nuovo account. Se ne possiedi già uno su un [sito " -"di micro-blog compatibile](%%doc.openmublog%%), inserisci l'indirizzo del " -"tuo profilo qui di seguito." +"Per abbonarti puoi [eseguire l'accesso](%%action.login%%) oppure [creare](%%" +"action.register%%) un nuovo account. Se ne possiedi già uno su un [sito di " +"microblog compatibile](%%doc.openmublog%%), inserisci l'indirizzo del tuo " +"profilo qui di seguito." #: actions/remotesubscribe.php:112 msgid "Remote subscribe" msgstr "Abbonamento remoto" #: actions/remotesubscribe.php:124 -#, fuzzy msgid "Subscribe to a remote user" -msgstr "Abbonati a questo utente" +msgstr "Abbonati a un utente remoto" #: actions/remotesubscribe.php:129 msgid "User nickname" @@ -2877,7 +2850,7 @@ msgstr "URL del profilo" #: actions/remotesubscribe.php:134 msgid "URL of your profile on another compatible microblogging service" -msgstr "URL del tuo profilo su un altro servizio di micro-blog compatibile" +msgstr "URL del tuo profilo su un altro servizio di microblog compatibile" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 #: lib/userprofile.php:365 @@ -2889,49 +2862,42 @@ msgid "Invalid profile URL (bad format)" msgstr "URL del profilo non valido (formato errato)" #: actions/remotesubscribe.php:168 -#, fuzzy msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)." -msgstr "Non è un URL di profilo valido (nessun documento YADIS)." +msgstr "" +"Non è un URL di profilo valido (nessun documento YADIS o XRDS definito non " +"valido)." #: actions/remotesubscribe.php:176 -#, fuzzy msgid "That’s a local profile! Login to subscribe." msgstr "Quello è un profilo locale! Accedi per abbonarti." #: actions/remotesubscribe.php:183 -#, fuzzy msgid "Couldn’t get a request token." msgstr "Impossibile ottenere un token di richiesta." #: actions/repeat.php:57 -#, fuzzy msgid "Only logged-in users can repeat notices." -msgstr "Solo l'utente può leggere la propria casella di posta." +msgstr "Solo gli utenti collegati possono ripetere i messaggi." #: actions/repeat.php:64 actions/repeat.php:71 -#, fuzzy msgid "No notice specified." -msgstr "Nessun profilo specificato." +msgstr "Nessun messaggio specificato." #: actions/repeat.php:76 -#, fuzzy msgid "You can't repeat your own notice." -msgstr "Non puoi registrarti se non accetti la licenza." +msgstr "Non puoi ripetere i tuoi stessi messaggi." #: actions/repeat.php:90 -#, fuzzy msgid "You already repeated that notice." -msgstr "Hai già bloccato questo utente." +msgstr "Hai già ripetuto quel messaggio." -#: actions/repeat.php:112 lib/noticelist.php:627 -#, fuzzy +#: actions/repeat.php:114 lib/noticelist.php:621 msgid "Repeated" -msgstr "Crea" +msgstr "Ripetuti" -#: actions/repeat.php:115 -#, fuzzy +#: actions/repeat.php:119 msgid "Repeated!" -msgstr "Crea" +msgstr "Ripetuti!" #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 @@ -2945,19 +2911,19 @@ msgid "Replies to %s, page %d" msgstr "Risposte a %s, pagina %d" #: actions/replies.php:144 -#, fuzzy, php-format +#, php-format msgid "Replies feed for %s (RSS 1.0)" -msgstr "Feed dei messaggi per %s" +msgstr "Feed delle risposte di %s (RSS 1.0)" #: actions/replies.php:151 -#, fuzzy, php-format +#, php-format msgid "Replies feed for %s (RSS 2.0)" -msgstr "Feed dei messaggi per %s" +msgstr "Feed delle risposte di %s (RSS 2.0)" #: actions/replies.php:158 #, php-format msgid "Replies feed for %s (Atom)" -msgstr "Feed dei messaggi per %s" +msgstr "Feed delle risposte di %s (Atom)" #: actions/replies.php:198 #, php-format @@ -2965,6 +2931,8 @@ msgid "" "This is the timeline showing replies to %s but %s hasn't received a notice " "to his attention yet." msgstr "" +"Questa è l'attività delle risposte a %s, ma %s non ha ricevuto ancora alcun " +"messaggio." #: actions/replies.php:203 #, php-format @@ -2972,6 +2940,8 @@ msgid "" "You can engage other users in a conversation, subscribe to more people or " "[join groups](%%action.groups%%)." msgstr "" +"Puoi avviare una discussione con altri utenti, abbonarti a più persone o " +"[entrare in qualche gruppo](%%action.groups%%)." #: actions/replies.php:205 #, php-format @@ -2979,24 +2949,24 @@ msgid "" "You can try to [nudge %s](../%s) or [post something to his or her attention]" "(%%%%action.newnotice%%%%?status_textarea=%s)." msgstr "" +"Puoi provare a [richiamare %s](../%s) o [scrivere qualche cosa alla sua " +"attenzione](%%%%action.newnotice%%%%?status_textarea=%s)." #: actions/repliesrss.php:72 -#, fuzzy, php-format +#, php-format msgid "Replies to %1$s on %2$s!" -msgstr "Messaggio a %1$s su %2$s" +msgstr "Risposte a %1$s su %2$s!" #: actions/sandbox.php:65 actions/unsandbox.php:65 -#, fuzzy msgid "You cannot sandbox users on this site." -msgstr "Non puoi inviare un messaggio a questo utente." +msgstr "Non puoi mettere in \"sandbox\" gli utenti su questo sito." #: actions/sandbox.php:72 -#, fuzzy msgid "User is already sandboxed." -msgstr "L'utente ti ha bloccato." +msgstr "L'utente è già nella \"sandbox\"." #: actions/showfavorites.php:79 -#, fuzzy, php-format +#, php-format msgid "%s's favorite notices, page %d" msgstr "Messaggi preferiti di %s, pagina %d" @@ -3007,23 +2977,25 @@ msgstr "Impossibile recuperare i messaggi preferiti." #: actions/showfavorites.php:170 #, php-format msgid "Feed for favorites of %s (RSS 1.0)" -msgstr "Feed per gli amici di %s" +msgstr "Feed dei preferiti di %s (RSS 1.0)" #: actions/showfavorites.php:177 #, php-format msgid "Feed for favorites of %s (RSS 2.0)" -msgstr "Feed per gli amici di %s" +msgstr "Feed dei preferiti di %s (RSS 2.0)" #: actions/showfavorites.php:184 #, php-format msgid "Feed for favorites of %s (Atom)" -msgstr "Feed per gli amici di %s" +msgstr "Feed dei preferiti di di %s (Atom)" #: actions/showfavorites.php:205 msgid "" "You haven't chosen any favorite notices yet. Click the fave button on " "notices you like to bookmark them for later or shed a spotlight on them." msgstr "" +"Non hai ancora scelto alcun messaggio come preferito. Fai clic sul pulsate a " +"forma di cuore per salvare i messaggi e rileggerli in un altro momento." #: actions/showfavorites.php:207 #, php-format @@ -3031,6 +3003,8 @@ msgid "" "%s hasn't added any notices to his favorites yet. Post something interesting " "they would add to their favorites :)" msgstr "" +"%s non ha aggiunto alcun messaggio tra i suoi preferiti. Scrivi qualche cosa " +"di interessante in modo che lo inserisca tra i suoi preferiti. :)" #: actions/showfavorites.php:211 #, php-format @@ -3039,10 +3013,13 @@ msgid "" "account](%%%%action.register%%%%) and then post something interesting they " "would add to their favorites :)" msgstr "" +"%s non ha aggiunto alcun messaggio tra i suoi preferiti. Perché non [crei un " +"account](%%%%action.register%%%%) e quindi scrivi qualche cosa di " +"interessante in modo che lo inserisca tra i suoi preferiti. :)" #: actions/showfavorites.php:242 msgid "This is a way to share what you like." -msgstr "" +msgstr "Questo è un modo per condividere ciò che ti piace." #: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format @@ -3070,31 +3047,31 @@ msgstr "Nota" #: actions/showgroup.php:284 lib/groupeditform.php:184 msgid "Aliases" -msgstr "" +msgstr "Alias" #: actions/showgroup.php:293 msgid "Group actions" msgstr "Azioni dei gruppi" #: actions/showgroup.php:328 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s group (RSS 1.0)" -msgstr "Feed dei messaggi per il gruppo %s" +msgstr "Feed dei messaggi per il gruppo %s (RSS 1.0)" #: actions/showgroup.php:334 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s group (RSS 2.0)" -msgstr "Feed dei messaggi per il gruppo %s" +msgstr "Feed dei messaggi per il gruppo %s (RSS 2.0)" #: actions/showgroup.php:340 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s group (Atom)" -msgstr "Feed dei messaggi per il gruppo %s" +msgstr "Feed dei messaggi per il gruppo %s (Atom)" #: actions/showgroup.php:345 #, php-format msgid "FOAF for %s group" -msgstr "Casella posta inviata di %s" +msgstr "FOAF per il gruppo %s" #: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" @@ -3115,9 +3092,8 @@ msgid "Statistics" msgstr "Statistiche" #: actions/showgroup.php:432 -#, fuzzy msgid "Created" -msgstr "Crea" +msgstr "Creato" #: actions/showgroup.php:448 #, php-format @@ -3128,26 +3104,32 @@ msgid "" "their life and interests. [Join now](%%%%action.register%%%%) to become part " "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" +"**%s** è un gruppo di utenti su %%%%site.name%%%%, un servizio di [microblog]" +"(http://it.wikipedia.org/wiki/Microblogging) basato sul software libero " +"[StatusNet](http://status.net/). I membri di questo gruppo condividono brevi " +"messaggi riguardo la propria vita e i propri interessi. [Unisciti oggi " +"stesso](%%%%action.register%%%%) per far parte di questo gruppo e di molti " +"altri! ([Maggiori informazioni](%%%%doc.help%%%%))" #: actions/showgroup.php:454 -#, fuzzy, php-format +#, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." "wikipedia.org/wiki/Micro-blogging) service based on the Free Software " "[StatusNet](http://status.net/) tool. Its members share short messages about " "their life and interests. " msgstr "" -"**%s** è un gruppo su %%%%site.name%%%%, un servizio di [micro-blog](http://" -"it.wikipedia.org/wiki/Microblogging) " +"**%s** è un gruppo di utenti su %%%%site.name%%%%, un servizio di [microblog]" +"(http://it.wikipedia.org/wiki/Microblogging) basato sul software libero " +"[StatusNet](http://status.net/)." #: actions/showgroup.php:482 -#, fuzzy msgid "Admins" -msgstr "Amministra" +msgstr "Amministratori" #: actions/showmessage.php:81 msgid "No such message." -msgstr "Nessun tale messaggio." +msgstr "Nessun messaggio." #: actions/showmessage.php:98 msgid "Only the sender and recipient may read this message." @@ -3164,14 +3146,13 @@ msgid "Message from %1$s on %2$s" msgstr "Messaggio da %1$s su %2$s" #: actions/shownotice.php:90 -#, fuzzy msgid "Notice deleted." -msgstr "Messaggio inviato" +msgstr "Messaggio eliminato." #: actions/showstream.php:73 -#, fuzzy, php-format +#, php-format msgid " tagged %s" -msgstr "Messaggi etichettati con %s" +msgstr " etichettati con %s" #: actions/showstream.php:79 #, php-format @@ -3179,40 +3160,42 @@ msgid "%s, page %d" msgstr "%s, pagina %d" #: actions/showstream.php:122 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s tagged %s (RSS 1.0)" -msgstr "Feed dei messaggi per il gruppo %s" +msgstr "Feed dei messaggi per %s etichettati con %s (RSS 1.0)" #: actions/showstream.php:129 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s (RSS 1.0)" -msgstr "Feed dei messaggi per %s" +msgstr "Feed dei messaggi per %s (RSS 1.0)" #: actions/showstream.php:136 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s (RSS 2.0)" -msgstr "Feed dei messaggi per %s" +msgstr "Feed dei messaggi per %s (RSS 2.0)" #: actions/showstream.php:143 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s (Atom)" -msgstr "Feed dei messaggi per %s" +msgstr "Feed dei messaggi per %s (Atom)" #: actions/showstream.php:148 -#, fuzzy, php-format +#, php-format msgid "FOAF for %s" -msgstr "Casella posta inviata di %s" +msgstr "FOAF per %s" #: actions/showstream.php:191 #, php-format msgid "This is the timeline for %s but %s hasn't posted anything yet." -msgstr "" +msgstr "Questa è l'attività di %s, ma %s non ha ancora scritto nulla." #: actions/showstream.php:196 msgid "" "Seen anything interesting recently? You haven't posted any notices yet, now " "would be a good time to start :)" msgstr "" +"Visto niente di interessante? Non hai scritto ancora alcun messaggio, questo " +"potrebbe essere un buon momento per iniziare! :)" #: actions/showstream.php:198 #, php-format @@ -3220,6 +3203,8 @@ msgid "" "You can try to nudge %s or [post something to his or her attention](%%%%" "action.newnotice%%%%?status_textarea=%s)." msgstr "" +"Puoi provare a richiamare %s o [scrivere qualche cosa che attiri la sua " +"attenzione](%%%%action.newnotice%%%%?status_textarea=%s)." #: actions/showstream.php:234 #, php-format @@ -3229,279 +3214,272 @@ msgid "" "[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to " "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" +"**%s** ha un account su %%%%site.name%%%%, un servizio di [microblog](http://" +"it.wikipedia.org/wiki/Microblogging) basato sul software libero [StatusNet]" +"(http://status.net/). [Crea un account](%%%%action.register%%%%) per seguire " +"i messaggi di **%s** e di molti altri! ([Maggiori informazioni](%%%%doc.help%" +"%%%))" #: actions/showstream.php:239 -#, fuzzy, php-format +#, php-format msgid "" "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en." "wikipedia.org/wiki/Micro-blogging) service based on the Free Software " "[StatusNet](http://status.net/) tool. " msgstr "" -"**%s** ha un account su %%%%site.name%%%%, un servizio di [micro-blog]" -"(http://it.wikipedia.org/wiki/Microblogging) " +"**%s** ha un account su %%%%site.name%%%%, un servizio di [microblog](http://" +"it.wikipedia.org/wiki/Microblogging) basato sul software libero [StatusNet]" +"(http://status.net/). " #: actions/showstream.php:313 -#, fuzzy, php-format +#, php-format msgid "Repeat of %s" -msgstr "Risposte a %s" +msgstr "Ripetizione di %s" #: actions/silence.php:65 actions/unsilence.php:65 -#, fuzzy msgid "You cannot silence users on this site." -msgstr "Non puoi inviare un messaggio a questo utente." +msgstr "Non puoi zittire gli utenti su questo sito." #: actions/silence.php:72 -#, fuzzy msgid "User is already silenced." -msgstr "L'utente ti ha bloccato." +msgstr "L'utente è già stato zittito." #: actions/siteadminpanel.php:69 msgid "Basic settings for this StatusNet site." -msgstr "" +msgstr "Impostazioni di base per questo sito StatusNet." #: actions/siteadminpanel.php:147 msgid "Site name must have non-zero length." -msgstr "" +msgstr "Il nome del sito non deve avere lunghezza parti a zero." #: actions/siteadminpanel.php:155 -#, fuzzy msgid "You must have a valid contact email address" -msgstr "Non è un indirizzo email valido" +msgstr "Devi avere un'email di contatto valida." #: actions/siteadminpanel.php:173 #, php-format msgid "Unknown language \"%s\"" -msgstr "" +msgstr "Lingua \"%s\" sconosciuta" #: actions/siteadminpanel.php:180 msgid "Invalid snapshot report URL." -msgstr "" +msgstr "URL di segnalazione snapshot non valido." #: actions/siteadminpanel.php:186 msgid "Invalid snapshot run value." -msgstr "" +msgstr "Valore di esecuzione dello snapshot non valido." #: actions/siteadminpanel.php:192 msgid "Snapshot frequency must be a number." -msgstr "" +msgstr "La frequenza degli snapshot deve essere un numero." #: actions/siteadminpanel.php:199 msgid "You must set an SSL server when enabling SSL." -msgstr "" +msgstr "Devi impostare un server SSL quando viene attivato SSL." #: actions/siteadminpanel.php:204 msgid "Invalid SSL server. The maximum length is 255 characters." -msgstr "" +msgstr "Server SSL non valido. La lunghezza massima è di 255 caratteri." #: actions/siteadminpanel.php:210 msgid "Minimum text limit is 140 characters." -msgstr "" +msgstr "Il limite minimo del testo è di 140 caratteri." #: actions/siteadminpanel.php:216 msgid "Dupe limit must 1 or more seconds." -msgstr "" +msgstr "Il limite per i duplicati deve essere di 1 o più secondi." #: actions/siteadminpanel.php:266 msgid "General" -msgstr "" +msgstr "Generale" #: actions/siteadminpanel.php:269 -#, fuzzy msgid "Site name" -msgstr "Messaggio del sito" +msgstr "Nome del sito" #: actions/siteadminpanel.php:270 msgid "The name of your site, like \"Yourcompany Microblog\"" -msgstr "" +msgstr "Il nome del tuo sito, topo \"Acme Microblog\"" #: actions/siteadminpanel.php:274 msgid "Brought by" -msgstr "" +msgstr "Offerto da" #: actions/siteadminpanel.php:275 msgid "Text used for credits link in footer of each page" -msgstr "" +msgstr "Testo usato per i crediti nel piè di pagina di ogni pagina" #: actions/siteadminpanel.php:279 msgid "Brought by URL" -msgstr "" +msgstr "URL per offerto da" #: actions/siteadminpanel.php:280 msgid "URL used for credits link in footer of each page" -msgstr "" +msgstr "URL usato per i crediti nel piè di pagina di ogni pagina" #: actions/siteadminpanel.php:284 -#, fuzzy msgid "Contact email address for your site" -msgstr "Nuovo indirizzo email per inviare messaggi a %s" +msgstr "Indirizzo email di contatto per il sito" #: actions/siteadminpanel.php:290 -#, fuzzy msgid "Local" -msgstr "Viste locali" +msgstr "Locale" #: actions/siteadminpanel.php:301 msgid "Default timezone" -msgstr "" +msgstr "Fuso orario predefinito" #: actions/siteadminpanel.php:302 msgid "Default timezone for the site; usually UTC." -msgstr "" +msgstr "Fuso orario predefinito; tipicamente UTC" #: actions/siteadminpanel.php:308 -#, fuzzy msgid "Default site language" -msgstr "Lingua preferita" +msgstr "Lingua predefinita" #: actions/siteadminpanel.php:316 -#, fuzzy msgid "URLs" msgstr "URL" #: actions/siteadminpanel.php:319 -#, fuzzy msgid "Server" -msgstr "Recupera" +msgstr "Server" #: actions/siteadminpanel.php:319 msgid "Site's server hostname." -msgstr "" +msgstr "Nome host del server" #: actions/siteadminpanel.php:323 msgid "Fancy URLs" -msgstr "" +msgstr "URL semplici" #: actions/siteadminpanel.php:325 msgid "Use fancy (more readable and memorable) URLs?" -msgstr "" +msgstr "Usare gli URL semplici (più leggibili e facili da ricordare)?" #: actions/siteadminpanel.php:331 -#, fuzzy msgid "Access" -msgstr "Accetta" +msgstr "Accesso" #: actions/siteadminpanel.php:334 -#, fuzzy msgid "Private" -msgstr "Privacy" +msgstr "Privato" #: actions/siteadminpanel.php:336 msgid "Prohibit anonymous users (not logged in) from viewing site?" msgstr "" +"Proibire agli utenti anonimi (che non hanno effettuato l'accesso) di vedere " +"il sito?" #: actions/siteadminpanel.php:340 -#, fuzzy msgid "Invite only" -msgstr "Invita" +msgstr "Solo invito" #: actions/siteadminpanel.php:342 msgid "Make registration invitation only." -msgstr "" +msgstr "Rende la registrazione solo su invito" #: actions/siteadminpanel.php:346 -#, fuzzy msgid "Closed" -msgstr "Blocca" +msgstr "Chiuso" #: actions/siteadminpanel.php:348 msgid "Disable new registrations." -msgstr "" +msgstr "Disabilita la creazione di nuovi account" #: actions/siteadminpanel.php:354 msgid "Snapshots" -msgstr "" +msgstr "Snapshot" #: actions/siteadminpanel.php:357 msgid "Randomly during Web hit" -msgstr "" +msgstr "A caso quando avviene un web hit" #: actions/siteadminpanel.php:358 msgid "In a scheduled job" -msgstr "" +msgstr "In un job pianificato" #: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383 -#, fuzzy msgid "Never" -msgstr "Recupera" +msgstr "Mai" #: actions/siteadminpanel.php:360 msgid "Data snapshots" -msgstr "" +msgstr "Snapshot dei dati" #: actions/siteadminpanel.php:361 msgid "When to send statistical data to status.net servers" -msgstr "" +msgstr "Quando inviare dati statistici a status.net" #: actions/siteadminpanel.php:366 msgid "Frequency" -msgstr "" +msgstr "Frequenza" #: actions/siteadminpanel.php:367 msgid "Snapshots will be sent once every N web hits" -msgstr "" +msgstr "Gli snapshot verranno inviati ogni N web hit" #: actions/siteadminpanel.php:372 msgid "Report URL" -msgstr "" +msgstr "URL per la segnalazione" #: actions/siteadminpanel.php:373 msgid "Snapshots will be sent to this URL" -msgstr "" +msgstr "Gli snapshot verranno inviati a questo URL" #: actions/siteadminpanel.php:380 -#, fuzzy msgid "SSL" -msgstr "SMS" +msgstr "SSL" #: actions/siteadminpanel.php:384 -#, fuzzy msgid "Sometimes" -msgstr "Messaggi" +msgstr "Qualche volta" #: actions/siteadminpanel.php:385 msgid "Always" -msgstr "" +msgstr "Sempre" #: actions/siteadminpanel.php:387 msgid "Use SSL" -msgstr "" +msgstr "Usa SSL" #: actions/siteadminpanel.php:388 msgid "When to use SSL" -msgstr "" +msgstr "Quando usare SSL" #: actions/siteadminpanel.php:393 msgid "SSL Server" -msgstr "" +msgstr "Server SSL" #: actions/siteadminpanel.php:394 msgid "Server to direct SSL requests to" -msgstr "" +msgstr "Server a cui dirigere le richieste SSL" #: actions/siteadminpanel.php:400 msgid "Limits" -msgstr "" +msgstr "Limiti" #: actions/siteadminpanel.php:403 msgid "Text limit" -msgstr "" +msgstr "Limiti del testo" #: actions/siteadminpanel.php:403 msgid "Maximum number of characters for notices." -msgstr "" +msgstr "Numero massimo di caratteri per messaggo" #: actions/siteadminpanel.php:407 msgid "Dupe limit" -msgstr "" +msgstr "Limite duplicati" #: actions/siteadminpanel.php:407 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" +"Quanto tempo gli utenti devono attendere (in secondi) prima di inviare " +"nuovamente lo stesso messaggio" #: actions/siteadminpanel.php:421 actions/useradminpanel.php:313 -#, fuzzy msgid "Save site settings" -msgstr "Impostazioni immagine" +msgstr "Salva impostazioni" #: actions/smssettings.php:58 msgid "SMS Settings" @@ -3513,9 +3491,8 @@ msgid "You can receive SMS messages through email from %%site.name%%." msgstr "Puoi ricevere messaggi SMS attraverso l'email da %%site.name%%." #: actions/smssettings.php:91 -#, fuzzy msgid "SMS is not available." -msgstr "Questa pagina non è disponibile in un " +msgstr "Il servizio SMS non è disponibile." #: actions/smssettings.php:112 msgid "Current confirmed SMS-enabled phone number." @@ -3523,7 +3500,7 @@ msgstr "Numero di telefono attualmente confermato per gli SMS." #: actions/smssettings.php:123 msgid "Awaiting confirmation on this phone number." -msgstr "Attesa la conferma per questo numero di telefono." +msgstr "In attesa della conferma per questo numero di telefono." #: actions/smssettings.php:130 msgid "Confirmation code" @@ -3566,14 +3543,13 @@ msgid "That phone number already belongs to another user." msgstr "Quel numero di telefono appartiene già a un altro utente." #: actions/smssettings.php:347 -#, fuzzy msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." msgstr "" "Un codice di conferma è stato inviato al numero di telefono che hai " -"aggiunto. Controlla la tua casella di posta (e anche la posta indesiderata!) " -"per il codice e le istruzioni su come usarlo." +"aggiunto. Controlla il tuo telefono per il codice e le istruzioni su come " +"usarlo." #: actions/smssettings.php:374 msgid "That is the wrong confirmation number." @@ -3606,7 +3582,7 @@ msgstr "Nessun codice inserito" #: actions/subedit.php:70 msgid "You are not subscribed to that profile." -msgstr "Non sei abbonato a quel profilo." +msgstr "Non hai una abbonamento a quel profilo." #: actions/subedit.php:83 msgid "Could not save subscription." @@ -3618,7 +3594,7 @@ msgstr "Non un utente locale." #: actions/subscribe.php:69 msgid "Subscribed" -msgstr "Abbonato" +msgstr "Abbonati" #: actions/subscribers.php:50 #, php-format @@ -3644,11 +3620,13 @@ msgid "" "You have no subscribers. Try subscribing to people you know and they might " "return the favor" msgstr "" +"Non hai alcun abbonato. Prova ad abbonarti a qualcuno che conosci e magari " +"loro potrebbero fare lo stesso" #: actions/subscribers.php:110 #, php-format msgid "%s has no subscribers. Want to be the first?" -msgstr "" +msgstr "%s non ha abbonati. Vuoi abbonarti tu?" #: actions/subscribers.php:114 #, php-format @@ -3656,6 +3634,8 @@ msgid "" "%s has no subscribers. Why not [register an account](%%%%action.register%%%" "%) and be the first?" msgstr "" +"%s non ha abbonati. Perché non [crei un account](%%%%action.register%%%%) e " +"ti abboni tu?" #: actions/subscriptions.php:52 #, php-format @@ -3685,11 +3665,16 @@ msgid "" "featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can " "automatically subscribe to people you already follow there." msgstr "" +"Non stai seguendo nessuno, prova ad abbonarti a qualcuno che conosci. Prova " +"a [cercare persone](%%action.peoplesearch%%), guarda tra i membri dei gruppi " +"di tuo interesse e tra gli [utenti in evidenza](%%action.featured%%). Se " +"[usi Twitter](%%action.twittersettings%%), puoi abbonarti automaticamente " +"alle persone che già seguivi lì." #: actions/subscriptions.php:123 actions/subscriptions.php:127 -#, fuzzy, php-format +#, php-format msgid "%s is not listening to anyone." -msgstr "%1$s sta ora seguendo " +msgstr "%s non sta seguendo nessuno." #: actions/subscriptions.php:194 msgid "Jabber" @@ -3705,22 +3690,21 @@ msgid "Notices tagged with %s, page %d" msgstr "Messaggi etichettati con %s, pagina %d" #: actions/tag.php:86 -#, fuzzy, php-format +#, php-format msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "Feed dei messaggi per %s" +msgstr "Feed dei messaggi per l'etichetta %s (RSS 1.0)" #: actions/tag.php:92 -#, fuzzy, php-format +#, php-format msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "Feed dei messaggi per %s" +msgstr "Feed dei messaggi per l'etichetta %s (RSS 2.0)" #: actions/tag.php:98 -#, fuzzy, php-format +#, php-format msgid "Notice feed for tag %s (Atom)" -msgstr "Feed dei messaggi per %s" +msgstr "Feed dei messaggi per l'etichetta %s (Atom)" #: actions/tagother.php:39 -#, fuzzy msgid "No ID argument." msgstr "Nessun argomento ID." @@ -3753,7 +3737,8 @@ msgstr "" msgid "" "You can only tag people you are subscribed to or who are subscribed to you." msgstr "" -"Puoi etichettare sole le persone a cui sei abbonato o che sono abbonate a te." +"Puoi etichettare sole le persone di cui hai un abbonamento o che sono " +"abbonate a te." #: actions/tagother.php:200 msgid "Could not save tags." @@ -3767,26 +3752,23 @@ msgstr "" #: actions/tagrss.php:35 msgid "No such tag." -msgstr "Nessuna tale etichetta." +msgstr "Nessuna etichetta." #: actions/twitapitrends.php:87 msgid "API method under construction." msgstr "Metodo delle API in lavorazione." #: actions/unblock.php:59 -#, fuzzy msgid "You haven't blocked that user." -msgstr "Hai già bloccato questo utente." +msgstr "Non hai bloccato quell'utente." #: actions/unsandbox.php:72 -#, fuzzy msgid "User is not sandboxed." -msgstr "L'utente ti ha bloccato." +msgstr "L'utente non è nella \"sandbox\"." #: actions/unsilence.php:72 -#, fuzzy msgid "User is not silenced." -msgstr "L'utente non ha un profilo." +msgstr "L'utente non è zittito." #: actions/unsubscribe.php:77 msgid "No profile id in request." @@ -3798,12 +3780,14 @@ msgstr "Nessun profilo con quel ID." #: actions/unsubscribe.php:98 msgid "Unsubscribed" -msgstr "Annullato abbonamento" +msgstr "Abbonamento annullato" #: actions/updateprofile.php:62 actions/userauthorization.php:330 #, php-format msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." msgstr "" +"La licenza \"%s\" dello stream di chi ascolti non è compatibile con la " +"licenza \"%s\" di questo sito." #: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 #: lib/personalgroupnav.php:115 @@ -3812,20 +3796,21 @@ msgstr "Utente" #: actions/useradminpanel.php:69 msgid "User settings for this StatusNet site." -msgstr "" +msgstr "Impostazioni utente per questo sito StatusNet." #: actions/useradminpanel.php:149 msgid "Invalid bio limit. Must be numeric." -msgstr "" +msgstr "Limite per la biografia non valido. Deve essere numerico." #: actions/useradminpanel.php:155 msgid "Invalid welcome text. Max length is 255 characters." msgstr "" +"Testo di benvenuto non valido. La lunghezza massima è di 255 caratteri." #: actions/useradminpanel.php:165 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." -msgstr "" +msgstr "Abbonamento predefinito non valido: \"%1$s\" non è un utente." #: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 @@ -3834,89 +3819,80 @@ msgstr "Profilo" #: actions/useradminpanel.php:222 msgid "Bio Limit" -msgstr "" +msgstr "Limite biografia" #: actions/useradminpanel.php:223 msgid "Maximum length of a profile bio in characters." -msgstr "" +msgstr "Lunghezza massima in caratteri della biografia" #: actions/useradminpanel.php:231 -#, fuzzy msgid "New users" -msgstr "Invita nuovi utenti" +msgstr "Nuovi utenti" #: actions/useradminpanel.php:235 msgid "New user welcome" -msgstr "" +msgstr "Messaggio per nuovi utenti" #: actions/useradminpanel.php:236 msgid "Welcome text for new users (Max 255 chars)." -msgstr "" +msgstr "Messaggio di benvenuto per nuovi utenti (max 255 caratteri)" #: actions/useradminpanel.php:241 -#, fuzzy msgid "Default subscription" -msgstr "Tutti gli abbonamenti" +msgstr "Abbonamento predefinito" #: actions/useradminpanel.php:242 -#, fuzzy msgid "Automatically subscribe new users to this user." -msgstr "" -"Abbonami automaticamente a chi si abbona ai miei messaggi (utile per i non-" -"umani)" +msgstr "Abbonare automaticamente i nuovi utenti a questo utente" #: actions/useradminpanel.php:251 -#, fuzzy msgid "Invitations" -msgstr "Inviti inviati" +msgstr "Inviti" #: actions/useradminpanel.php:256 -#, fuzzy msgid "Invitations enabled" -msgstr "Inviti inviati" +msgstr "Inviti abilitati" #: actions/useradminpanel.php:258 msgid "Whether to allow users to invite new users." -msgstr "" +msgstr "Indica se consentire agli utenti di invitarne di nuovi" #: actions/useradminpanel.php:265 msgid "Sessions" -msgstr "" +msgstr "Sessioni" #: actions/useradminpanel.php:270 msgid "Handle sessions" -msgstr "" +msgstr "Gestione sessioni" #: actions/useradminpanel.php:272 msgid "Whether to handle sessions ourselves." -msgstr "" +msgstr "Indica se gestire autonomamente le sessioni" #: actions/useradminpanel.php:276 msgid "Session debugging" -msgstr "" +msgstr "Debug delle sessioni" #: actions/useradminpanel.php:278 msgid "Turn on debugging output for sessions." -msgstr "" +msgstr "Abilita il debug per le sessioni" #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "Autorizza abbonamento" #: actions/userauthorization.php:110 -#, fuzzy msgid "" "Please check these details to make sure that you want to subscribe to this " "user’s notices. If you didn’t just ask to subscribe to someone’s notices, " "click “Reject”." msgstr "" "Controlla i dettagli seguenti per essere sicuro di volerti abbonare ai " -"messaggi di questo utente. Se non hai richiesto ciò, fai clic su \"Annulla\"." +"messaggi di questo utente. Se non hai richiesto ciò, fai clic su \"Rifiuta\"." #: actions/userauthorization.php:188 -#, fuzzy msgid "License" -msgstr "licenza." +msgstr "Licenza" #: actions/userauthorization.php:209 msgid "Accept" @@ -3932,9 +3908,8 @@ msgid "Reject" msgstr "Rifiuta" #: actions/userauthorization.php:212 -#, fuzzy msgid "Reject this subscription" -msgstr "Abbonamenti di %s" +msgstr "Rifiuta questo abbonamento" #: actions/userauthorization.php:225 msgid "No authorization request!" @@ -3945,7 +3920,6 @@ msgid "Subscription authorized" msgstr "Abbonamento autorizzato" #: actions/userauthorization.php:249 -#, fuzzy msgid "" "The subscription has been authorized, but no callback URL was passed. Check " "with the site’s instructions for details on how to authorize the " @@ -3960,70 +3934,69 @@ msgid "Subscription rejected" msgstr "Abbonamento rifiutato" #: actions/userauthorization.php:261 -#, fuzzy msgid "" "The subscription has been rejected, but no callback URL was passed. Check " "with the site’s instructions for details on how to fully reject the " "subscription." msgstr "" "L'abbonamento è stato rifiutato, ma non è stato passato alcun URL di " -"richiamo. Controlla con le istruzioni del sito per i dettagli su come " -"rifiutare completamente l'abbonamento." +"richiamo. Controlla le istruzioni del sito per i dettagli su come rifiutare " +"completamente l'abbonamento." #: actions/userauthorization.php:296 #, php-format msgid "Listener URI ‘%s’ not found here" -msgstr "" +msgstr "URL \"%s\" dell'ascoltatore non trovato qui." #: actions/userauthorization.php:301 #, php-format msgid "Listenee URI ‘%s’ is too long." -msgstr "" +msgstr "L'URI \"%s\" di colui che si ascolta è troppo lungo." #: actions/userauthorization.php:307 #, php-format msgid "Listenee URI ‘%s’ is a local user." -msgstr "" +msgstr "L'URI \"%s\" di colui che si ascolta è un utente locale." #: actions/userauthorization.php:322 #, php-format msgid "Profile URL ‘%s’ is for a local user." -msgstr "" +msgstr "L'URL \"%s\" del profilo è per un utente locale." #: actions/userauthorization.php:338 #, php-format msgid "Avatar URL ‘%s’ is not valid." -msgstr "" +msgstr "L'URL \"%s\" dell'immagine non è valido." #: actions/userauthorization.php:343 -#, fuzzy, php-format +#, php-format msgid "Can’t read avatar URL ‘%s’." -msgstr "Impossibile leggere l'URL \"%s\" dell'immagine" +msgstr "Impossibile leggere l'URL \"%s\" dell'immagine." #: actions/userauthorization.php:348 -#, fuzzy, php-format +#, php-format msgid "Wrong image type for avatar URL ‘%s’." -msgstr "Tipo di immagine errata per \"%s\"" +msgstr "Tipo di immagine errata per l'URL \"%s\"." #: actions/userbyid.php:70 -#, fuzzy msgid "No ID." -msgstr "Nessun ID" +msgstr "Nessun ID." #: actions/userdesignsettings.php:76 lib/designsettings.php:65 -#, fuzzy msgid "Profile design" -msgstr "Impostazioni del profilo" +msgstr "Aspetto del profilo" #: actions/userdesignsettings.php:87 lib/designsettings.php:76 msgid "" "Customize the way your profile looks with a background image and a colour " "palette of your choice." msgstr "" +"Personalizza l'aspetto del tuo profilo con un'immagine di sfondo e dei " +"colori personalizzati." #: actions/userdesignsettings.php:282 msgid "Enjoy your hotdog!" -msgstr "" +msgstr "Gustati il tuo hotdog!" #: actions/usergroups.php:64 #, php-format @@ -4031,19 +4004,18 @@ msgid "%s groups, page %d" msgstr "Gruppi di %s, pagina %d" #: actions/usergroups.php:130 -#, fuzzy msgid "Search for more groups" -msgstr "Ricerca persone o per testo" +msgstr "Cerca altri gruppi" #: actions/usergroups.php:153 -#, fuzzy, php-format +#, php-format msgid "%s is not a member of any group." -msgstr "Non sei un membro di quel gruppo." +msgstr "%s non fa parte di alcun gruppo." #: actions/usergroups.php:158 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." -msgstr "" +msgstr "Prova a [cercare dei gruppi](%%action.groupsearch%%) e iscriviti." #: classes/File.php:137 #, php-format @@ -4051,25 +4023,28 @@ msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" +"Nessun file può superare %d byte e il file inviato era di %d byte. Prova a " +"caricarne una versione più piccola." #: classes/File.php:147 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" +"Un file di questa dimensione supererebbe la tua quota utente di %d byte." #: classes/File.php:154 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +"Un file di questa dimensione supererebbe la tua quota mensile di %d byte." #: classes/Message.php:45 -#, fuzzy msgid "You are banned from sending direct messages." -msgstr "Errore nell'inviare il messaggio diretto." +msgstr "Ti è proibito inviare messaggi diretti." #: classes/Message.php:61 msgid "Could not insert message." -msgstr "Impossibile inserire messaggio." +msgstr "Impossibile inserire il messaggio." #: classes/Message.php:71 msgid "Could not update message with new URI." @@ -4080,53 +4055,51 @@ msgstr "Impossibile aggiornare il messaggio con il nuovo URI." msgid "DB error inserting hashtag: %s" msgstr "Errore del DB nell'inserire un hashtag: %s" -#: classes/Notice.php:196 -#, fuzzy +#: classes/Notice.php:226 msgid "Problem saving notice. Too long." -msgstr "Problema nel salvare il messaggio." +msgstr "Problema nel salvare il messaggio. Troppo lungo." -#: classes/Notice.php:200 +#: classes/Notice.php:230 msgid "Problem saving notice. Unknown user." msgstr "Problema nel salvare il messaggio. Utente sconosciuto." -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Troppi messaggi troppo velocemente; fai una pausa e scrivi di nuovo tra " "qualche minuto." -#: classes/Notice.php:211 -#, fuzzy +#: classes/Notice.php:241 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -"Troppi messaggi troppo velocemente; fai una pausa e scrivi di nuovo tra " -"qualche minuto." +"Troppi messaggi duplicati troppo velocemente; fai una pausa e scrivi di " +"nuovo tra qualche minuto." -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "Ti è proibito inviare messaggi su questo sito." -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "Problema nel salvare il messaggio." -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "Errore del DB nell'inserire la risposta: %s" -#: classes/Notice.php:1320 -#, fuzzy, php-format +#: classes/Notice.php:1371 +#, php-format msgid "RT @%1$s %2$s" -msgstr "%1$s (%2$s)" +msgstr "RT @%1$s %2$s" -#: classes/User.php:347 -#, fuzzy, php-format +#: classes/User.php:368 +#, php-format msgid "Welcome to %1$s, @%2$s!" -msgstr "Messaggio a %1$s su %2$s" +msgstr "Benvenuti su %1$s, @%2$s!" #: classes/User_group.php:380 msgid "Could not create group." @@ -4153,9 +4126,8 @@ msgid "Change email handling" msgstr "Modifica la gestione dell'email" #: lib/accountsettingsaction.php:124 -#, fuzzy msgid "Design your profile" -msgstr "Profilo utente" +msgstr "Progetta il tuo profilo" #: lib/accountsettingsaction.php:128 msgid "Other" @@ -4199,14 +4171,12 @@ msgid "Connect" msgstr "Connetti" #: lib/action.php:436 -#, fuzzy msgid "Connect to services" -msgstr "Impossibile redirigere al server: %s" +msgstr "Connettiti con altri servizi" #: lib/action.php:440 -#, fuzzy msgid "Change site configuration" -msgstr "Esplorazione sito primaria" +msgstr "Modifica la configurazione del sito" #: lib/action.php:444 lib/subgroupnav.php:105 msgid "Invite" @@ -4223,7 +4193,7 @@ msgstr "Esci" #: lib/action.php:450 msgid "Logout from the site" -msgstr "Sconnettiti dal sito" +msgstr "Termina la tua sessione sul sito" #: lib/action.php:455 msgid "Create an account" @@ -4243,11 +4213,11 @@ msgstr "Aiutami!" #: lib/action.php:464 lib/searchaction.php:127 msgid "Search" -msgstr "Ricerca" +msgstr "Cerca" #: lib/action.php:464 msgid "Search for people or text" -msgstr "Ricerca persone o per testo" +msgstr "Cerca persone o del testo" #: lib/action.php:485 msgid "Site notice" @@ -4275,7 +4245,7 @@ msgstr "FAQ" #: lib/action.php:732 msgid "TOS" -msgstr "" +msgstr "TOS" #: lib/action.php:735 msgid "Privacy" @@ -4290,13 +4260,12 @@ msgid "Contact" msgstr "Contatti" #: lib/action.php:741 -#, fuzzy msgid "Badge" -msgstr "Richiama" +msgstr "Badge" #: lib/action.php:769 msgid "StatusNet software license" -msgstr "Licenza del software statusnet" +msgstr "Licenza del software StatusNet" #: lib/action.php:772 #, php-format @@ -4304,13 +4273,13 @@ msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." "broughtby%%](%%site.broughtbyurl%%). " msgstr "" -"**%%site.name%%** è un servizio di micro-blog offerto da [%%site.broughtby%%]" +"**%%site.name%%** è un servizio di microblog offerto da [%%site.broughtby%%]" "(%%site.broughtbyurl%%). " #: lib/action.php:774 #, php-format msgid "**%%site.name%%** is a microblogging service. " -msgstr "**%%site.name%%** è un servizio di micro-blog. " +msgstr "**%%site.name%%** è un servizio di microblog. " #: lib/action.php:776 #, php-format @@ -4319,18 +4288,17 @@ msgid "" "s, available under the [GNU Affero General Public License](http://www.fsf." "org/licensing/licenses/agpl-3.0.html)." msgstr "" -"Gestito dal software di micro-blog [StatusNet](http://status.net/), versione " -"%s, disponibile sotto licenza [GNU Affero General Public License](http://www." -"fsf.org/licensing/licenses/agpl-3.0.html)." +"Gestito dal software di microblog [StatusNet](http://status.net/), versione %" +"s, disponibile nei termini della licenza [GNU Affero General Public License]" +"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)." #: lib/action.php:790 -#, fuzzy msgid "Site content license" -msgstr "Licenza del software statusnet" +msgstr "Licenza del contenuto del sito" #: lib/action.php:799 msgid "All " -msgstr "Tutto " +msgstr "Tutti " #: lib/action.php:804 msgid "license." @@ -4350,63 +4318,55 @@ msgstr "Precedenti" #: lib/action.php:1163 msgid "There was a problem with your session token." -msgstr "C'è stato un problema con il tuo token di sessione." +msgstr "Si è verificato un problema con il tuo token di sessione." #: lib/adminpanelaction.php:96 -#, fuzzy msgid "You cannot make changes to this site." -msgstr "Non puoi inviare un messaggio a questo utente." +msgstr "Non puoi apportare modifiche al sito." #: lib/adminpanelaction.php:195 -#, fuzzy msgid "showForm() not implemented." -msgstr "Comando non ancora implementato." +msgstr "showForm() non implementata." #: lib/adminpanelaction.php:224 -#, fuzzy msgid "saveSettings() not implemented." -msgstr "Comando non ancora implementato." +msgstr "saveSettings() non implementata." #: lib/adminpanelaction.php:247 -#, fuzzy msgid "Unable to delete design setting." -msgstr "Impossibile salvare le tue impostazioni di Twitter!" +msgstr "Impossibile eliminare le impostazioni dell'aspetto." #: lib/adminpanelaction.php:300 -#, fuzzy msgid "Basic site configuration" -msgstr "Conferma indirizzo email" +msgstr "Configurazione di base" #: lib/adminpanelaction.php:303 -#, fuzzy msgid "Design configuration" -msgstr "Conferma SMS" +msgstr "Configurazione aspetto" #: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 -#, fuzzy msgid "Paths configuration" -msgstr "Conferma SMS" +msgstr "Configurazione percorsi" #: lib/attachmentlist.php:87 msgid "Attachments" -msgstr "" +msgstr "Allegati" #: lib/attachmentlist.php:265 msgid "Author" -msgstr "" +msgstr "Autore" #: lib/attachmentlist.php:278 -#, fuzzy msgid "Provider" -msgstr "Profilo" +msgstr "Provider" #: lib/attachmentnoticesection.php:67 msgid "Notices where this attachment appears" -msgstr "" +msgstr "Messaggi in cui appare questo allegato" #: lib/attachmenttagcloudsection.php:48 msgid "Tags for this attachment" -msgstr "" +msgstr "Etichette per questo allegato" #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" @@ -4422,21 +4382,21 @@ msgstr "Comando non riuscito" #: lib/command.php:44 msgid "Sorry, this command is not yet implemented." -msgstr "Questo comando non è ancora implementato" +msgstr "Questo comando non è ancora implementato." #: lib/command.php:88 -#, fuzzy, php-format +#, php-format msgid "Could not find a user with nickname %s" -msgstr "Impossibile aggiornare l'utente con l'indirizzo email confermato." +msgstr "Impossibile trovare un utente col soprannome %s" #: lib/command.php:92 msgid "It does not make a lot of sense to nudge yourself!" -msgstr "" +msgstr "Non ha molto senso se cerchi di richiamarti!" #: lib/command.php:99 -#, fuzzy, php-format +#, php-format msgid "Nudge sent to %s" -msgstr "Richiamo inviato" +msgstr "Richiamo inviato a %s" #: lib/command.php:126 #, php-format @@ -4445,13 +4405,16 @@ msgid "" "Subscribers: %2$s\n" "Notices: %3$s" msgstr "" +"Abbonamenti: %1$s\n" +"Abbonati: %2$s\n" +"Messaggi: %3$s" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" -msgstr "" +msgstr "Un messaggio con quel ID non esiste" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "L'utente non ha un ultimo messaggio" @@ -4484,136 +4447,131 @@ msgstr "Pagina web: %s" msgid "About: %s" msgstr "Informazioni: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:321 -#, fuzzy, php-format +#: lib/command.php:358 scripts/xmppdaemon.php:301 +#, php-format msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "Messaggio troppo lungo - massimo 140 caratteri, inviati %d" +msgstr "Messaggio troppo lungo: massimo %d caratteri, inviati %d" -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "Errore nell'inviare il messaggio diretto." -#: lib/command.php:421 -#, fuzzy +#: lib/command.php:422 msgid "Cannot repeat your own notice" -msgstr "Impossibile attivare le notifiche." +msgstr "Impossibile ripetere un proprio messaggio" -#: lib/command.php:426 -#, fuzzy +#: lib/command.php:427 msgid "Already repeated that notice" -msgstr "Elimina questo messaggio" +msgstr "Hai già ripetuto quel messaggio" -#: lib/command.php:434 -#, fuzzy, php-format +#: lib/command.php:435 +#, php-format msgid "Notice from %s repeated" -msgstr "Messaggio inviato" +msgstr "Messaggio da %s ripetuto" -#: lib/command.php:436 -#, fuzzy +#: lib/command.php:437 msgid "Error repeating notice." -msgstr "Problema nel salvare il messaggio." +msgstr "Errore nel ripetere il messaggio." -#: lib/command.php:490 -#, fuzzy, php-format +#: lib/command.php:491 +#, php-format msgid "Notice too long - maximum is %d characters, you sent %d" -msgstr "Messaggio troppo lungo - massimo 140 caratteri, inviati %d" +msgstr "Messaggio troppo lungo: massimo %d caratteri, inviati %d" -#: lib/command.php:499 -#, fuzzy, php-format +#: lib/command.php:500 +#, php-format msgid "Reply to %s sent" -msgstr "Rispondi a questo messaggio" +msgstr "Risposta a %s inviata" -#: lib/command.php:501 -#, fuzzy +#: lib/command.php:502 msgid "Error saving notice." -msgstr "Problema nel salvare il messaggio." +msgstr "Errore nel salvare il messaggio." -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "Specifica il nome dell'utente a cui abbonarti" -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" -msgstr "Abbonato a %s" +msgstr "Abbonati a %s" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "Specifica il nome dell'utente da cui annullare l'abbonamento" -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "Abbonamento a %s annullato" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "Comando non ancora implementato." -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "Notifiche disattivate." -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "Impossibile disattivare le notifiche." -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "Notifiche attivate." -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "Impossibile attivare le notifiche." -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" -msgstr "" +msgstr "Il comando di accesso è disabilitato" -#: lib/command.php:663 -#, fuzzy, php-format +#: lib/command.php:664 +#, php-format msgid "Could not create login token for %s" -msgstr "Impossibile creare il modulo OpenID: %s" +msgstr "Impossibile creare il token di accesso per %s" -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" +"Questo collegamento è utilizzabile una sola volta ed è valido solo per 2 " +"minuti: %s" -#: lib/command.php:684 -#, fuzzy +#: lib/command.php:685 msgid "You are not subscribed to anyone." -msgstr "Non sei abbonato a quel profilo." +msgstr "Il tuo abbonamento è stato annullato." -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" -msgstr[0] "Sei già abbonato a questi utenti:" -msgstr[1] "Sei già abbonato a questi utenti:" +msgstr[0] "Persona di cui hai già un abbonamento:" +msgstr[1] "Persone di cui hai già un abbonamento:" -#: lib/command.php:706 -#, fuzzy +#: lib/command.php:707 msgid "No one is subscribed to you." -msgstr "Impossibile abbonare altri a te." +msgstr "Nessuno è abbonato ai tuoi messaggi." -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" -msgstr[0] "Impossibile abbonare altri a te." -msgstr[1] "Impossibile abbonare altri a te." +msgstr[0] "Questa persona è abbonata ai tuoi messaggi:" +msgstr[1] "Queste persone sono abbonate ai tuoi messaggi:" -#: lib/command.php:728 -#, fuzzy +#: lib/command.php:729 msgid "You are not a member of any groups." -msgstr "Non sei un membro di quel gruppo." +msgstr "Non fai parte di alcun gruppo." -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" -msgstr[0] "Non sei un membro di quel gruppo." -msgstr[1] "Non sei un membro di quel gruppo." +msgstr[0] "Non fai parte di questo gruppo:" +msgstr[1] "Non fai parte di questi gruppi:" -#: lib/command.php:744 +#: lib/command.php:745 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4653,24 +4611,63 @@ msgid "" "tracks - not yet implemented.\n" "tracking - not yet implemented.\n" msgstr "" +"Comandi:\n" +"on - abilita le notifiche\n" +"off - disabilita le notifiche\n" +"help - mostra questo aiuto\n" +"follow - ti abbona all'utente\n" +"groups - elenca i gruppi di cui fai parte\n" +"subscriptions - elenca le persone che segui\n" +"subscribers - elenca le persone che ti seguono\n" +"leave - annulla l'abbonamento dall'utente\n" +"d - invia un messaggio diretto all'utente\n" +"get - recupera l'ultimo messaggio dell'utente\n" +"whois - recupera le informazioni del profilo dell'utente\n" +"fav - aggiunge l'ultimo messaggio dell'utente tra i tuoi " +"preferiti\n" +"fav # - aggiunge un messaggio con quell'ID tra i tuoi " +"preferiti\n" +"repeat # - ripete un messaggio con quell'ID\n" +"repeat - ripete l'ultimo messaggio dell'utente\n" +"reply # - risponde al messaggio con quell'ID\n" +"reply - risponde all'ultimo messaggio dell'utente\n" +"join - ti iscrive al gruppo\n" +"login - recupera un collegamento all'interfaccia web per eseguire l'accesso\n" +"drop - annulla la tua iscrizione al gruppo\n" +"stats - recupera il tuo stato\n" +"stop - stessa azione del comando \"off\"\n" +"quit - stessa azione del comando \"on\"\n" +"sub - stessa azione del comando \"follow\"\n" +"unsub - stessa azione del comando \"leave\"\n" +"last - stessa azione del comando \"get\"\n" +"on -non ancora implementato\n" +"off - non ancora implementato\n" +"nudge - ricorda a un utente di scrivere qualche cosa\n" +"invite - non ancora implementato\n" +"track - non ancora implementato\n" +"untrack - non ancora implementato\n" +"track off - non ancora implementato\n" +"untrack all - non ancora implementato\n" +"tracks - non ancora implementato\n" +"tracking - non ancora implementato\n" #: lib/common.php:199 -#, fuzzy msgid "No configuration file found. " -msgstr "Nessun codice di conferma." +msgstr "Non è stato trovato alcun file di configurazione. " #: lib/common.php:200 msgid "I looked for configuration files in the following places: " -msgstr "" +msgstr "I file di configurazione sono stati cercati in questi posti: " #: lib/common.php:201 msgid "You may wish to run the installer to fix this." msgstr "" +"Potrebbe essere necessario lanciare il programma d'installazione per " +"correggere il problema." #: lib/common.php:202 -#, fuzzy msgid "Go to the installer." -msgstr "Accedi al sito" +msgstr "Vai al programma d'installazione." #: lib/connectsettingsaction.php:110 msgid "IM" @@ -4678,30 +4675,30 @@ msgstr "MI" #: lib/connectsettingsaction.php:111 msgid "Updates by instant messenger (IM)" -msgstr "Aggiornamenti via messaggistica istantanea (MI)" +msgstr "Messaggi via messaggistica istantanea (MI)" #: lib/connectsettingsaction.php:116 msgid "Updates by SMS" -msgstr "Aggiornamenti via SMS" +msgstr "Messaggi via SMS" #: lib/dberroraction.php:60 msgid "Database error" -msgstr "" +msgstr "Errore del database" #: lib/designsettings.php:105 -#, fuzzy msgid "Upload file" -msgstr "Carica" +msgstr "Carica file" #: lib/designsettings.php:109 -#, fuzzy msgid "" "You can upload your personal background image. The maximum file size is 2MB." -msgstr "Qui puoi caricare la tua immagine personale." +msgstr "" +"Puoi caricare la tua immagine di sfondo. La dimensione massima del file è di " +"2MB." #: lib/designsettings.php:418 msgid "Design defaults restored." -msgstr "" +msgstr "Valori predefiniti ripristinati." #: lib/disfavorform.php:114 lib/disfavorform.php:140 msgid "Disfavor this notice" @@ -4709,27 +4706,27 @@ msgstr "Togli questo messaggio dai preferiti" #: lib/favorform.php:114 lib/favorform.php:140 msgid "Favor this notice" -msgstr "Rendi questo messaggio un favorito" +msgstr "Rendi questo messaggio un preferito" #: lib/favorform.php:140 msgid "Favor" -msgstr "Preferito" +msgstr "Preferisci" #: lib/feed.php:85 msgid "RSS 1.0" -msgstr "" +msgstr "RSS 1.0" #: lib/feed.php:87 msgid "RSS 2.0" -msgstr "" +msgstr "RSS 2.0" #: lib/feed.php:89 msgid "Atom" -msgstr "" +msgstr "Atom" #: lib/feed.php:91 msgid "FOAF" -msgstr "" +msgstr "FOAF" #: lib/feedlist.php:64 msgid "Export data" @@ -4744,9 +4741,8 @@ msgid "All" msgstr "Tutto" #: lib/galleryaction.php:139 -#, fuzzy msgid "Select tag to filter" -msgstr "Seleziona un operatore" +msgstr "Seleziona un'etichetta da filtrare" #: lib/galleryaction.php:140 msgid "Tag" @@ -4762,17 +4758,16 @@ msgstr "Vai" #: lib/groupeditform.php:163 msgid "URL of the homepage or blog of the group or topic" -msgstr "URL della pagina web o del blog per il gruppo o l'argomento" +msgstr "URL della pagina web, blog del gruppo o l'argomento" #: lib/groupeditform.php:168 -#, fuzzy msgid "Describe the group or topic" -msgstr "Descrivi il gruppo o l'argomento in 140 caratteri" +msgstr "Descrivi il gruppo o l'argomento" #: lib/groupeditform.php:170 -#, fuzzy, php-format +#, php-format msgid "Describe the group or topic in %d characters" -msgstr "Descrivi il gruppo o l'argomento in 140 caratteri" +msgstr "Descrivi il gruppo o l'argomento in %d caratteri" #: lib/groupeditform.php:172 msgid "Description" @@ -4787,20 +4782,20 @@ msgstr "Dove è situato il gruppo, tipo \"città, regione, stato\"" #, php-format msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" +"Soprannomi aggiuntivi per il gruppo, separati da virgole o spazi, max %d" #: lib/groupnav.php:85 msgid "Group" msgstr "Gruppo" #: lib/groupnav.php:101 -#, fuzzy msgid "Blocked" -msgstr "Blocca" +msgstr "Bloccati" #: lib/groupnav.php:102 -#, fuzzy, php-format +#, php-format msgid "%s blocked users" -msgstr "Blocca utente" +msgstr "Utenti bloccati di %s" #: lib/groupnav.php:108 #, php-format @@ -4817,9 +4812,9 @@ msgid "Add or edit %s logo" msgstr "Aggiungi o modifica il logo di %s" #: lib/groupnav.php:120 -#, fuzzy, php-format +#, php-format msgid "Add or edit %s design" -msgstr "Aggiungi o modifica il logo di %s" +msgstr "Aggiungi o modifica l'aspetto di %s" #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" @@ -4839,9 +4834,9 @@ msgid "This page is not available in a media type you accept" msgstr "Questa pagina non è disponibile in un tipo di supporto che tu accetti" #: lib/imagefile.php:75 -#, fuzzy, php-format +#, php-format msgid "That file is too big. The maximum file size is %s." -msgstr "Puoi caricare un'immagine per il logo del tuo gruppo." +msgstr "Quel file è troppo grande. La dimensione massima è %s." #: lib/imagefile.php:80 msgid "Partial upload." @@ -4869,16 +4864,16 @@ msgstr "Tipo di file sconosciuto" #: lib/imagefile.php:217 msgid "MB" -msgstr "" +msgstr "MB" #: lib/imagefile.php:219 msgid "kB" -msgstr "" +msgstr "kB" #: lib/jabber.php:191 #, php-format msgid "[%s]" -msgstr "" +msgstr "[%s]" #: lib/joinform.php:114 msgid "Join" @@ -4916,6 +4911,19 @@ msgid "" "Thanks for your time, \n" "%s\n" msgstr "" +"Ciao %s.\n" +"\n" +"Qualcuno ha appena inserito questo indirizzo email su %s.\n" +"\n" +"Se lo hai fatto tu e vuoi confermare quanto hai fatto, utilizza il " +"collegamento riportato qui sotto:\n" +"\n" +"\t%s\n" +"\n" +"Se non si tratta di te, ignora semplicemente questo messaggio.\n" +"\n" +"Grazie per il tuo tempo, \n" +"%s\n" #: lib/mail.php:236 #, php-format @@ -4923,7 +4931,7 @@ 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 -#, fuzzy, php-format +#, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" "\n" @@ -4940,8 +4948,12 @@ msgstr "" "\n" "\t%3$s\n" "\n" +"%4$s%5$s%6$s\n" "Cordiali saluti,\n" -"%4$s.\n" +"%7$s.\n" +"\n" +"----\n" +"Modifica il tuo indirizzo email o le opzioni di notifica presso %8$s\n" #: lib/mail.php:254 #, php-format @@ -5017,6 +5029,17 @@ msgid "" "With kind regards,\n" "%4$s\n" msgstr "" +"%1$s (%2$s) si sta chiedendo cosa tu stia facendo in questi giorni e ti " +"invita a scrivere qualche cosa.\n" +"\n" +"Fatti sentire! :)\n" +"\n" +"%3$s\n" +"\n" +"Non rispondere a questa email, nessuno la riceverà!\n" +"\n" +"Cordiali saluti,\n" +"%4$s\n" #: lib/mail.php:510 #, php-format @@ -5041,11 +5064,25 @@ msgid "" "With kind regards,\n" "%5$s\n" msgstr "" +"%1$s (%2$s) ti ha inviato un messaggio privato:\n" +"\n" +"------------------------------------------------------\n" +"%3$s\n" +"------------------------------------------------------\n" +"\n" +"Puoi rispondere al messaggio a questo indirizzo:\n" +"\n" +"%4$s\n" +"\n" +"Non rispondere a questa email, nessuno la riceverà!\n" +"\n" +"Cordiali saluti,\n" +"%5$s\n" #: lib/mail.php:559 -#, fuzzy, php-format +#, php-format msgid "%s (@%s) added your notice as a favorite" -msgstr "%s ha aggiunto il tuo messaggio tra i suoi preferiti" +msgstr "%s (@%s) ha aggiunto il tuo messaggio tra i suoi preferiti" #: lib/mail.php:561 #, php-format @@ -5067,11 +5104,28 @@ msgid "" "Faithfully yours,\n" "%6$s\n" msgstr "" +"%1$s (@%7$s) ha appena aggiunto il tuo messaggio da %2$s tra i suoi " +"preferiti.\n" +"\n" +"L'indirizzo del tuo messaggio è questo:\n" +"\n" +"%3$s\n" +"\n" +"Il testo del tuo messaggio è:\n" +"\n" +"%4$s\n" +"\n" +"Puoi consultare l'elenco dei messaggi preferiti di %1$s qui:\n" +"\n" +"%5$s\n" +"\n" +"Cordiali saluti,\n" +"%6$s\n" #: lib/mail.php:620 #, php-format msgid "%s (@%s) sent a notice to your attention" -msgstr "" +msgstr "%s (@%s) ti ha inviato un messaggio" #: lib/mail.php:622 #, php-format @@ -5087,6 +5141,16 @@ msgid "" "\t%4$s\n" "\n" msgstr "" +"%1$s (@%9$s) ti ha appena inviato un messaggio (una \"@-riposta\") su %2$s.\n" +"\n" +"Il messaggio si trova qui:\n" +"\n" +"\t%3$s\n" +"\n" +"E dice:\n" +"\n" +"\t%4$s\n" +"\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." @@ -5097,63 +5161,68 @@ 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 "" +"Non hai alcun messaggio privato. Puoi inviare un messaggio privato per " +"iniziare una conversazione con altri utenti. Altre persone possono mandare " +"messaggi riservati solamente a te." -#: lib/mailbox.php:227 lib/noticelist.php:468 -#, fuzzy +#: lib/mailbox.php:227 lib/noticelist.php:469 msgid "from" -msgstr " via " +msgstr "via" #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" +"Si è verificato un errore nel database nel salvare il file. Prova di nuovo." #: lib/mediafile.php:142 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." -msgstr "" +msgstr "Il file caricato eccede la direttiva upload_max_filesize in php.ini." #: lib/mediafile.php:147 msgid "" "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " "the HTML form." msgstr "" +"Il file caricato eccede la direttiva MAX_FILE_SIZE specificata nel modulo " +"HTML." #: lib/mediafile.php:152 msgid "The uploaded file was only partially uploaded." -msgstr "" +msgstr "Il file caricato è stato caricato solo parzialmente." #: lib/mediafile.php:159 msgid "Missing a temporary folder." -msgstr "" +msgstr "Manca una directory temporanea." #: lib/mediafile.php:162 msgid "Failed to write file to disk." -msgstr "" +msgstr "Scrittura del file su disco non riuscita." #: lib/mediafile.php:165 msgid "File upload stopped by extension." -msgstr "" +msgstr "Caricamento del file bloccato dall'estensione." #: lib/mediafile.php:179 lib/mediafile.php:216 msgid "File exceeds user's quota!" -msgstr "" +msgstr "Il file supera la quota dell'utente." #: lib/mediafile.php:196 lib/mediafile.php:233 msgid "File could not be moved to destination directory." -msgstr "" +msgstr "Impossibile spostare il file nella directory di destinazione." #: lib/mediafile.php:201 lib/mediafile.php:237 msgid "Could not determine file's mime-type!" -msgstr "Impossibile recuperare l'attività pubblica." +msgstr "Impossibile determinare il tipo MIME del file." #: lib/mediafile.php:270 #, php-format msgid " Try using another %s format." -msgstr "" +msgstr "Prova a usare un altro formato per %s." #: lib/mediafile.php:275 #, php-format msgid "%s is not a supported filetype on this server." -msgstr "" +msgstr "%s non è un tipo di file supportato da questo server." #: lib/messageform.php:120 msgid "Send a direct notice" @@ -5178,56 +5247,58 @@ msgstr "Cosa succede, %s?" #: lib/noticeform.php:190 msgid "Attach" -msgstr "" +msgstr "Allega" #: lib/noticeform.php:194 msgid "Attach a file" -msgstr "" +msgstr "Allega un file" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, 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:420 -#, fuzzy +#: lib/noticelist.php:421 msgid "N" -msgstr "No" +msgstr "N" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" -msgstr "" +msgstr "S" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" -msgstr "" +msgstr "E" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" -msgstr "" +msgstr "O" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" -msgstr "" +msgstr "presso" -#: lib/noticelist.php:522 -#, fuzzy +#: lib/noticelist.php:523 msgid "in context" -msgstr "Nessun contenuto!" +msgstr "nel contesto" -#: lib/noticelist.php:549 -#, fuzzy +#: lib/noticelist.php:548 msgid "Repeated by" -msgstr "Crea" +msgstr "Ripetuto da" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 msgid "Reply to this notice" msgstr "Rispondi a questo messaggio" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 msgid "Reply" msgstr "Rispondi" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "Messaggio eliminato." + #: lib/nudgeform.php:116 msgid "Nudge this user" msgstr "Richiama questo utente" @@ -5250,17 +5321,15 @@ msgstr "Errore nell'inserire l'immagine" #: lib/oauthstore.php:311 msgid "Error inserting remote profile" -msgstr "Errore nell'inserire un profilo remoto" +msgstr "Errore nell'inserire il profilo remoto" #: lib/oauthstore.php:345 -#, fuzzy msgid "Duplicate notice" -msgstr "Elimina messaggio" +msgstr "Messaggio duplicato" #: lib/oauthstore.php:466 lib/subs.php:48 -#, fuzzy msgid "You have been banned from subscribing." -msgstr "Quell'utente ti ha bloccato dall'abbonarti." +msgstr "Non ti è possibile abbonarti." #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." @@ -5316,9 +5385,8 @@ msgid "All subscribers" msgstr "Tutti gli abbonati" #: lib/profileaction.php:178 -#, fuzzy msgid "User ID" -msgstr "Utente" +msgstr "ID utente" #: lib/profileaction.php:183 msgid "Member since" @@ -5329,13 +5397,12 @@ msgid "All groups" msgstr "Tutti i gruppi" #: lib/profileformaction.php:123 -#, fuzzy msgid "No return-to arguments." -msgstr "Nessun argomento ID." +msgstr "Nessun argomento return-to." #: lib/profileformaction.php:137 msgid "Unimplemented method." -msgstr "" +msgstr "Metodo non implementato" #: lib/publicgroupnav.php:78 msgid "Public" @@ -5358,38 +5425,32 @@ msgid "Popular" msgstr "Famosi" #: lib/repeatform.php:107 lib/repeatform.php:132 -#, fuzzy msgid "Repeat this notice" -msgstr "Rispondi a questo messaggio" +msgstr "Ripeti questo messaggio" #: lib/repeatform.php:132 -#, fuzzy msgid "Repeat" -msgstr "Reimposta" +msgstr "Ripeti" #: lib/sandboxform.php:67 -#, fuzzy msgid "Sandbox" -msgstr "In arrivo" +msgstr "Sandbox" #: lib/sandboxform.php:78 -#, fuzzy msgid "Sandbox this user" -msgstr "Sblocca questo utente" +msgstr "Metti questo utente nella \"sandbox\"" #: lib/searchaction.php:120 -#, fuzzy msgid "Search site" -msgstr "Ricerca" +msgstr "Cerca nel sito" #: lib/searchaction.php:126 msgid "Keyword(s)" -msgstr "" +msgstr "Parole" #: lib/searchaction.php:162 -#, fuzzy msgid "Search help" -msgstr "Ricerca" +msgstr "Aiuto sulla ricerca" #: lib/searchgroupnav.php:80 msgid "People" @@ -5397,15 +5458,15 @@ msgstr "Persone" #: lib/searchgroupnav.php:81 msgid "Find people on this site" -msgstr "Ricerca persone in questo sito" +msgstr "Trova persone in questo sito" #: lib/searchgroupnav.php:83 msgid "Find content of notices" -msgstr "Ricerca contenuto dei messaggi" +msgstr "Trova contenuto dei messaggi" #: lib/searchgroupnav.php:85 msgid "Find groups on this site" -msgstr "Ricerca gruppi in questo sito" +msgstr "Trova gruppi in questo sito" #: lib/section.php:89 msgid "Untitled section" @@ -5413,22 +5474,20 @@ msgstr "Sezione senza nome" #: lib/section.php:106 msgid "More..." -msgstr "" +msgstr "Altro..." #: lib/silenceform.php:67 -#, fuzzy msgid "Silence" -msgstr "Messaggio del sito" +msgstr "Zittisci" #: lib/silenceform.php:78 -#, fuzzy msgid "Silence this user" -msgstr "Blocca questo utente" +msgstr "Zittisci questo utente" #: lib/subgroupnav.php:83 #, php-format msgid "People %s subscribes to" -msgstr "Persone a cui %s è abbonato" +msgstr "Persone di cui %s ha un abbonamento" #: lib/subgroupnav.php:91 #, php-format @@ -5438,15 +5497,15 @@ msgstr "Persone abbonate a %s" #: lib/subgroupnav.php:99 #, php-format msgid "Groups %s is a member of" -msgstr "Il gruppo %s è membro di" +msgstr "Gruppi di cui %s fa parte" #: lib/subs.php:52 msgid "Already subscribed!" -msgstr "" +msgstr "Hai già l'abbonamento!" #: lib/subs.php:56 msgid "User has blocked you." -msgstr "L'utente ti ha bloccato." +msgstr "L'utente non ti consente di seguirlo." #: lib/subs.php:60 msgid "Could not subscribe." @@ -5457,14 +5516,12 @@ msgid "Could not subscribe other to you." msgstr "Impossibile abbonare altri a te." #: lib/subs.php:128 -#, fuzzy msgid "Not subscribed!" -msgstr "Non abbonato!" +msgstr "Non hai l'abbonamento!" #: lib/subs.php:133 -#, fuzzy msgid "Couldn't delete self-subscription." -msgstr "Impossibile eliminare l'abbonamento." +msgstr "Impossibile eliminare l'auto-abbonamento." #: lib/subs.php:146 msgid "Couldn't delete subscription." @@ -5473,12 +5530,12 @@ msgstr "Impossibile eliminare l'abbonamento." #: lib/subscriberspeopleselftagcloudsection.php:48 #: lib/subscriptionspeopleselftagcloudsection.php:48 msgid "People Tagcloud as self-tagged" -msgstr "" +msgstr "Insieme delle etichette delle persone come auto-etichettate" #: lib/subscriberspeopletagcloudsection.php:48 #: lib/subscriptionspeopletagcloudsection.php:48 msgid "People Tagcloud as tagged" -msgstr "" +msgstr "Insieme delle etichette delle persone come etichettate" #: lib/subscriptionlist.php:126 msgid "(none)" @@ -5494,21 +5551,19 @@ msgstr "Chi scrive più messaggi" #: lib/unsandboxform.php:69 msgid "Unsandbox" -msgstr "" +msgstr "Unsandbox" #: lib/unsandboxform.php:80 -#, fuzzy msgid "Unsandbox this user" -msgstr "Sblocca questo utente" +msgstr "Togli questo utente dalla \"sandbox\"" #: lib/unsilenceform.php:67 msgid "Unsilence" -msgstr "" +msgstr "De-zittisci" #: lib/unsilenceform.php:78 -#, fuzzy msgid "Unsilence this user" -msgstr "Sblocca questo utente" +msgstr "Fai parlare nuovamente questo utente" #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137 msgid "Unsubscribe from this user" @@ -5519,22 +5574,20 @@ msgid "Unsubscribe" msgstr "Disabbonati" #: lib/userprofile.php:116 -#, fuzzy msgid "Edit Avatar" -msgstr "Immagine" +msgstr "Modifica immagine" #: lib/userprofile.php:236 msgid "User actions" msgstr "Azioni utente" #: lib/userprofile.php:248 -#, fuzzy msgid "Edit profile settings" -msgstr "Impostazioni del profilo" +msgstr "Modifica impostazioni del profilo" #: lib/userprofile.php:249 msgid "Edit" -msgstr "" +msgstr "Modifica" #: lib/userprofile.php:272 msgid "Send a direct message to this user" @@ -5546,61 +5599,61 @@ msgstr "Messaggio" #: lib/userprofile.php:311 msgid "Moderate" -msgstr "" +msgstr "Modera" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "pochi secondi fa" -#: lib/util.php:827 +#: lib/util.php:831 msgid "about a minute ago" msgstr "circa un minuto fa" -#: lib/util.php:829 +#: lib/util.php:833 #, php-format msgid "about %d minutes ago" msgstr "circa %d minuti fa" -#: lib/util.php:831 +#: lib/util.php:835 msgid "about an hour ago" msgstr "circa un'ora fa" -#: lib/util.php:833 +#: lib/util.php:837 #, php-format msgid "about %d hours ago" msgstr "circa %d ore fa" -#: lib/util.php:835 +#: lib/util.php:839 msgid "about a day ago" msgstr "circa un giorno fa" -#: lib/util.php:837 +#: lib/util.php:841 #, php-format msgid "about %d days ago" msgstr "circa %d giorni fa" -#: lib/util.php:839 +#: lib/util.php:843 msgid "about a month ago" msgstr "circa un mese fa" -#: lib/util.php:841 +#: lib/util.php:845 #, php-format msgid "about %d months ago" msgstr "circa %d mesi fa" -#: lib/util.php:843 +#: lib/util.php:847 msgid "about a year ago" msgstr "circa un anno fa" #: lib/webcolor.php:82 -#, fuzzy, php-format +#, php-format msgid "%s is not a valid color!" -msgstr "L'URL della pagina web non è valido." +msgstr "%s non è un colore valido." #: lib/webcolor.php:123 #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." -msgstr "" +msgstr "%s non è un colore valido. Usa 3 o 6 caratteri esadecimali." #: scripts/maildaemon.php:48 msgid "Could not parse message." diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index 8c62f70cca..bfa752cba0 100644 --- a/locale/ja/LC_MESSAGES/statusnet.po +++ b/locale/ja/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:35:05+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:52:34+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ja\n" "X-Message-Group: out-statusnet\n" @@ -37,17 +37,18 @@ msgstr "そのようなページはありません。" #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "そのような利用者はいません。" @@ -57,7 +58,8 @@ msgid "%s and friends, page %d" msgstr "%s と友人、%dページ" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s と友人" @@ -115,6 +117,7 @@ msgid "You and friends" msgstr "あなたと友人" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "%2$s に %1$s と友人からの更新があります！" @@ -235,8 +238,8 @@ msgstr "" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -603,7 +606,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 msgid "Delete" msgstr "削除" @@ -832,7 +835,7 @@ msgstr "本当にこの通知を削除しますか？" msgid "Do not delete this notice" msgstr "この通知を削除できません。" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 msgid "Delete this notice" msgstr "この通知を削除" @@ -1965,7 +1968,7 @@ msgid "You can't send a message to this user." msgstr "" #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "コンテンツがありません！" @@ -1982,7 +1985,7 @@ msgstr "" msgid "Message sent" msgstr "" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "" @@ -2070,8 +2073,8 @@ msgstr "内容種別 " msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "" @@ -2881,12 +2884,12 @@ msgstr "ライセンスに同意頂けない場合は登録できません。" msgid "You already repeated that notice." msgstr "既にログイン済みです。" -#: actions/repeat.php:112 lib/noticelist.php:627 +#: actions/repeat.php:114 lib/noticelist.php:621 #, fuzzy msgid "Repeated" msgstr "作成" -#: actions/repeat.php:115 +#: actions/repeat.php:119 #, fuzzy msgid "Repeated!" msgstr "作成" @@ -4016,46 +4019,46 @@ msgstr "" msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:196 +#: classes/Notice.php:226 #, fuzzy msgid "Problem saving notice. Too long." msgstr "通知を保存する際に問題が発生しました。" -#: classes/Notice.php:200 +#: classes/Notice.php:230 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "通知を保存する際に問題が発生しました。" -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:211 +#: classes/Notice.php:241 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "通知を保存する際に問題が発生しました。" -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "返信を追加する際にデータベースエラー : %s" -#: classes/Notice.php:1320 +#: classes/Notice.php:1371 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:347 +#: classes/User.php:368 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4381,12 +4384,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "" @@ -4419,132 +4422,132 @@ msgstr "" msgid "About: %s" msgstr "" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "" -#: lib/command.php:421 +#: lib/command.php:422 msgid "Cannot repeat your own notice" msgstr "" -#: lib/command.php:426 +#: lib/command.php:427 #, fuzzy msgid "Already repeated that notice" msgstr "この通知を削除" -#: lib/command.php:434 +#: lib/command.php:435 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "通知" -#: lib/command.php:436 +#: lib/command.php:437 #, fuzzy msgid "Error repeating notice." msgstr "通知を保存する際に問題が発生しました。" -#: lib/command.php:490 +#: lib/command.php:491 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:499 +#: lib/command.php:500 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "この通知へ返信" -#: lib/command.php:501 +#: lib/command.php:502 #, fuzzy msgid "Error saving notice." msgstr "通知を保存する際に問題が発生しました。" -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "" -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "" -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "" -#: lib/command.php:663 +#: lib/command.php:664 #, php-format msgid "Could not create login token for %s" msgstr "%s 用のログイン・トークンを作成できませんでした" -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:684 +#: lib/command.php:685 #, fuzzy msgid "You are not subscribed to anyone." msgstr "そのプロファイルは送信されていません。" -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "そのプロファイルは送信されていません。" -#: lib/command.php:706 +#: lib/command.php:707 #, fuzzy msgid "No one is subscribed to you." msgstr "リモートサブスクライブ" -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "リモートサブスクライブ" -#: lib/command.php:728 +#: lib/command.php:729 #, fuzzy msgid "You are not a member of any groups." msgstr "そのプロファイルは送信されていません。" -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "そのプロファイルは送信されていません。" -#: lib/command.php:744 +#: lib/command.php:745 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5020,7 +5023,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 msgid "from" msgstr "から " @@ -5106,49 +5109,54 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "N" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 #, fuzzy msgid "in context" msgstr "コンテンツがありません！" -#: lib/noticelist.php:549 +#: lib/noticelist.php:548 #, fuzzy msgid "Repeated by" msgstr "作成" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 msgid "Reply to this notice" msgstr "この通知へ返信" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 msgid "Reply" msgstr "返信" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "通知" + #: lib/nudgeform.php:116 msgid "Nudge this user" msgstr "このユーザを突く" @@ -5468,47 +5476,47 @@ msgstr "" msgid "Moderate" msgstr "" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "数秒前" -#: lib/util.php:827 +#: lib/util.php:831 msgid "about a minute ago" msgstr "約 1 分前" -#: lib/util.php:829 +#: lib/util.php:833 #, php-format msgid "about %d minutes ago" msgstr "約 %d 分前" -#: lib/util.php:831 +#: lib/util.php:835 msgid "about an hour ago" msgstr "約 1 時間前" -#: lib/util.php:833 +#: lib/util.php:837 #, php-format msgid "about %d hours ago" msgstr "約 %d 時間前" -#: lib/util.php:835 +#: lib/util.php:839 msgid "about a day ago" msgstr "約 1 日前" -#: lib/util.php:837 +#: lib/util.php:841 #, php-format msgid "about %d days ago" msgstr "約 %d 日前" -#: lib/util.php:839 +#: lib/util.php:843 msgid "about a month ago" msgstr "約 1 ヵ月前" -#: lib/util.php:841 +#: lib/util.php:845 #, php-format msgid "about %d months ago" msgstr "約 %d ヵ月前" -#: lib/util.php:843 +#: lib/util.php:847 msgid "about a year ago" msgstr "約 1 年前" diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index 1045836a84..063254d337 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: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:35:09+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:52:37+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ko\n" "X-Message-Group: out-statusnet\n" @@ -35,17 +35,18 @@ msgstr "그러한 태그가 없습니다." #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "그러한 사용자는 없습니다." @@ -55,7 +56,8 @@ msgid "%s and friends, page %d" msgstr "%s 와 친구들, %d 페이지" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s 및 친구들" @@ -108,6 +110,7 @@ msgid "You and friends" msgstr "%s 및 친구들" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "%1$s 및 %2$s에 있는 친구들의 업데이트!" @@ -230,8 +233,8 @@ msgstr "%s에게 모든 직접 메시지" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -600,7 +603,7 @@ msgid "Preview" msgstr "미리보기" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 msgid "Delete" msgstr "삭제" @@ -830,7 +833,7 @@ msgstr "정말로 통지를 삭제하시겠습니까?" msgid "Do not delete this notice" msgstr "이 통지를 지울 수 없습니다." -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 msgid "Delete this notice" msgstr "이 게시글 삭제하기" @@ -1971,7 +1974,7 @@ msgid "You can't send a message to this user." msgstr "당신은 이 사용자에게 메시지를 보낼 수 없습니다." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "내용이 없습니다!" @@ -1990,7 +1993,7 @@ msgstr "" msgid "Message sent" msgstr "메시지" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "%s에게 보낸 직접 메시지" @@ -2081,8 +2084,8 @@ msgstr "연결" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "지원하는 형식의 데이터가 아닙니다." @@ -2893,12 +2896,12 @@ msgstr "라이선스에 동의하지 않는다면 등록할 수 없습니다." msgid "You already repeated that notice." msgstr "당신은 이미 이 사용자를 차단하고 있습니다." -#: actions/repeat.php:112 lib/noticelist.php:627 +#: actions/repeat.php:114 lib/noticelist.php:621 #, fuzzy msgid "Repeated" msgstr "생성" -#: actions/repeat.php:115 +#: actions/repeat.php:119 #, fuzzy msgid "Repeated!" msgstr "생성" @@ -4042,23 +4045,23 @@ msgstr "새 URI와 함께 메시지를 업데이트할 수 없습니다." msgid "DB error inserting hashtag: %s" msgstr "해쉬테그를 추가 할 때에 데이타베이스 에러 : %s" -#: classes/Notice.php:196 +#: classes/Notice.php:226 #, fuzzy msgid "Problem saving notice. Too long." msgstr "통지를 저장하는데 문제가 발생했습니다." -#: classes/Notice.php:200 +#: classes/Notice.php:230 msgid "Problem saving notice. Unknown user." msgstr "게시글 저장문제. 알려지지않은 회원" -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "너무 많은 게시글이 너무 빠르게 올라옵니다. 한숨고르고 몇분후에 다시 포스트를 " "해보세요." -#: classes/Notice.php:211 +#: classes/Notice.php:241 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4067,25 +4070,25 @@ msgstr "" "너무 많은 게시글이 너무 빠르게 올라옵니다. 한숨고르고 몇분후에 다시 포스트를 " "해보세요." -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "이 사이트에 게시글 포스팅으로부터 당신은 금지되었습니다." -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "통지를 저장하는데 문제가 발생했습니다." -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "답신을 추가 할 때에 데이타베이스 에러 : %s" -#: classes/Notice.php:1320 +#: classes/Notice.php:1371 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:347 +#: classes/User.php:368 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "%2$s에서 %1$s까지 메시지" @@ -4408,12 +4411,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "이용자의 지속적인 게시글이 없습니다." @@ -4446,133 +4449,133 @@ msgstr "홈페이지: %s" msgid "About: %s" msgstr "자기소개: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다." -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "직접 메시지 보내기 오류." -#: lib/command.php:421 +#: lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice" msgstr "알림을 켤 수 없습니다." -#: lib/command.php:426 +#: lib/command.php:427 #, fuzzy msgid "Already repeated that notice" msgstr "이 게시글 삭제하기" -#: lib/command.php:434 +#: lib/command.php:435 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "게시글이 등록되었습니다." -#: lib/command.php:436 +#: lib/command.php:437 #, fuzzy msgid "Error repeating notice." msgstr "통지를 저장하는데 문제가 발생했습니다." -#: lib/command.php:490 +#: lib/command.php:491 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다." -#: lib/command.php:499 +#: lib/command.php:500 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "이 게시글에 대해 답장하기" -#: lib/command.php:501 +#: lib/command.php:502 #, fuzzy msgid "Error saving notice." msgstr "통지를 저장하는데 문제가 발생했습니다." -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "구독하려는 사용자의 이름을 지정하십시오." -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "%s에게 구독되었습니다." -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "구독을 해제하려는 사용자의 이름을 지정하십시오." -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "%s에서 구독을 해제했습니다." -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "명령이 아직 실행되지 않았습니다." -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "알림끄기." -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "알림을 끌 수 없습니다." -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "알림이 켜졌습니다." -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "알림을 켤 수 없습니다." -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "" -#: lib/command.php:663 +#: lib/command.php:664 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "OpenID를 작성 할 수 없습니다 : %s" -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:684 +#: lib/command.php:685 #, fuzzy msgid "You are not subscribed to anyone." msgstr "당신은 이 프로필에 구독되지 않고있습니다." -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "당신은 다음 사용자를 이미 구독하고 있습니다." -#: lib/command.php:706 +#: lib/command.php:707 #, fuzzy msgid "No one is subscribed to you." msgstr "다른 사람을 구독 하실 수 없습니다." -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "다른 사람을 구독 하실 수 없습니다." -#: lib/command.php:728 +#: lib/command.php:729 #, fuzzy msgid "You are not a member of any groups." msgstr "당신은 해당 그룹의 멤버가 아닙니다." -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "당신은 해당 그룹의 멤버가 아닙니다." -#: lib/command.php:744 +#: lib/command.php:745 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5049,7 +5052,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 #, fuzzy msgid "from" msgstr "다음에서:" @@ -5135,50 +5138,55 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 #, fuzzy msgid "N" msgstr "아니오" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 #, fuzzy msgid "in context" msgstr "내용이 없습니다!" -#: lib/noticelist.php:549 +#: lib/noticelist.php:548 #, fuzzy msgid "Repeated by" msgstr "생성" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 msgid "Reply to this notice" msgstr "이 게시글에 대해 답장하기" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 msgid "Reply" msgstr "답장하기" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "게시글이 등록되었습니다." + #: lib/nudgeform.php:116 msgid "Nudge this user" msgstr "이 사용자 찔러 보기" @@ -5499,47 +5507,47 @@ msgstr "메시지" msgid "Moderate" msgstr "" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "몇 초 전" -#: lib/util.php:827 +#: lib/util.php:831 msgid "about a minute ago" msgstr "1분 전" -#: lib/util.php:829 +#: lib/util.php:833 #, php-format msgid "about %d minutes ago" msgstr "%d분 전" -#: lib/util.php:831 +#: lib/util.php:835 msgid "about an hour ago" msgstr "1시간 전" -#: lib/util.php:833 +#: lib/util.php:837 #, php-format msgid "about %d hours ago" msgstr "%d시간 전" -#: lib/util.php:835 +#: lib/util.php:839 msgid "about a day ago" msgstr "하루 전" -#: lib/util.php:837 +#: lib/util.php:841 #, php-format msgid "about %d days ago" msgstr "%d일 전" -#: lib/util.php:839 +#: lib/util.php:843 msgid "about a month ago" msgstr "1달 전" -#: lib/util.php:841 +#: lib/util.php:845 #, php-format msgid "about %d months ago" msgstr "%d달 전" -#: lib/util.php:843 +#: lib/util.php:847 msgid "about a year ago" msgstr "1년 전" diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 154749c832..88076b3ab3 100644 --- a/locale/mk/LC_MESSAGES/statusnet.po +++ b/locale/mk/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:35:13+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:52:40+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: mk\n" "X-Message-Group: out-statusnet\n" @@ -21,9 +21,8 @@ msgstr "" #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 -#, fuzzy msgid "No such page" -msgstr "Нема такво известување." +msgstr "Нема таква страница" #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 @@ -36,27 +35,29 @@ msgstr "Нема такво известување." #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Нема таков корисник." #: actions/all.php:84 -#, fuzzy, php-format +#, php-format msgid "%s and friends, page %d" -msgstr "%s и пријателите" +msgstr "%s и пријателите, страница %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s и пријателите" @@ -72,9 +73,9 @@ msgid "Feed for friends of %s (RSS 2.0)" msgstr "Канал со пријатели на %S" #: actions/all.php:115 -#, fuzzy, php-format +#, php-format msgid "Feed for friends of %s (Atom)" -msgstr "Канал со пријатели на %S" +msgstr "Емитување за пријатели на %S (Atom)" #: actions/all.php:127 #, php-format @@ -104,11 +105,11 @@ msgid "" msgstr "" #: actions/all.php:165 -#, fuzzy msgid "You and friends" -msgstr "%s и пријателите" +msgstr "Вие и пријателите" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" @@ -186,9 +187,8 @@ msgid "Could not update your design." msgstr "Корисникот не може да се освежи/" #: actions/apiblockcreate.php:105 -#, fuzzy msgid "You cannot block yourself!" -msgstr "Корисникот не може да се освежи/" +msgstr "Не можете да се блокирате самите себеси!" #: actions/apiblockcreate.php:119 msgid "Block user failed." @@ -230,8 +230,8 @@ msgstr "" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -243,9 +243,9 @@ msgid "No message text!" msgstr "" #: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, fuzzy, php-format +#, php-format msgid "That's too long. Max message size is %d chars." -msgstr "Ова е предолго. Максималната должина е 140 знаци." +msgstr "Ова е предолго. Максималната должина изнесува %d знаци." #: actions/apidirectmessagenew.php:146 msgid "Recipient user not found." @@ -286,9 +286,9 @@ msgid "Could not follow user: %s is already on your list." msgstr "" #: actions/apifriendshipsdestroy.php:109 -#, fuzzy msgid "Could not unfollow user: User not found." -msgstr "Не може да се пренасочи кон серверот: %s" +msgstr "" +"Не можам да престанам да го следам корисникот: Корисникот не е пронајден." #: actions/apifriendshipsdestroy.php:120 msgid "You cannot unfollow yourself!" @@ -299,14 +299,12 @@ msgid "Two user ids or screen_names must be supplied." msgstr "" #: actions/apifriendshipsshow.php:135 -#, fuzzy msgid "Could not determine source user." -msgstr "Корисникот не може да се освежи/" +msgstr "Не можев да го утврдам целниот корисник." #: actions/apifriendshipsshow.php:143 -#, fuzzy msgid "Could not find target user." -msgstr "Корисникот не може да се освежи/" +msgstr "Не можев да го пронајдам целниот корисник." #: actions/apigroupcreate.php:164 actions/editgroup.php:182 #: actions/newgroup.php:126 actions/profilesettings.php:208 @@ -339,9 +337,9 @@ msgid "Full name is too long (max 255 chars)." msgstr "Целото име е предолго (максимум 255 знаци)" #: actions/apigroupcreate.php:213 -#, fuzzy, php-format +#, php-format msgid "Description is too long (max %d chars)." -msgstr "Биографијата е предолга (максимумот е 140 знаци)." +msgstr "Описот е предолг (дозволено е највеќе %d знаци)." #: actions/apigroupcreate.php:224 actions/editgroup.php:204 #: actions/newgroup.php:148 actions/profilesettings.php:225 @@ -353,36 +351,34 @@ msgstr "Локацијата е предолга (максимумот е 255 з #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." -msgstr "" +msgstr "Премногу алијаси! Дозволено е највеќе %d." #: actions/apigroupcreate.php:264 actions/editgroup.php:224 #: actions/newgroup.php:168 -#, fuzzy, php-format +#, php-format msgid "Invalid alias: \"%s\"" -msgstr "Невалидна домашна страница: '%s'" +msgstr "Неважечки алијас: „%s“" #: actions/apigroupcreate.php:273 actions/editgroup.php:228 #: actions/newgroup.php:172 -#, fuzzy, php-format +#, php-format msgid "Alias \"%s\" already in use. Try another one." -msgstr "Тој прекар е во употреба. Одберете друг." +msgstr "Алијасот „%s“ е зафатен. Одберете друг." #: actions/apigroupcreate.php:286 actions/editgroup.php:234 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." -msgstr "" +msgstr "Алијасот не може да биде ист како прекарот." #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 #: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91 -#, fuzzy msgid "Group not found!" -msgstr "Не е пронаједено барање." +msgstr "Групата не е пронајдена!" #: actions/apigroupjoin.php:110 -#, fuzzy msgid "You are already a member of that group." -msgstr "Веќе сте пријавени!" +msgstr "Веќе членувате во таа група." #: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221 msgid "You have been blocked from that group by the admin." @@ -598,7 +594,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 msgid "Delete" msgstr "" @@ -828,7 +824,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "Нема такво известување." -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 msgid "Delete this notice" msgstr "" @@ -1526,9 +1522,8 @@ msgid "" msgstr "" #: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -#, fuzzy msgid "Create a new group" -msgstr "Креирај нова сметка" +msgstr "Создај нова група" #: actions/groupsearch.php:52 #, fuzzy, php-format @@ -1943,7 +1938,7 @@ msgid "You can't send a message to this user." msgstr "" #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "Нема содржина!" @@ -1960,7 +1955,7 @@ msgstr "" msgid "Message sent" msgstr "" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "" @@ -2051,8 +2046,8 @@ msgstr "Поврзи се" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "" @@ -2853,15 +2848,13 @@ msgstr "Не може да се регистрирате ако не ја при msgid "You already repeated that notice." msgstr "Веќе сте пријавени!" -#: actions/repeat.php:112 lib/noticelist.php:627 -#, fuzzy +#: actions/repeat.php:114 lib/noticelist.php:621 msgid "Repeated" -msgstr "Креирај" +msgstr "Повторено" -#: actions/repeat.php:115 -#, fuzzy +#: actions/repeat.php:119 msgid "Repeated!" -msgstr "Креирај" +msgstr "Повторено!" #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 @@ -3048,9 +3041,8 @@ msgid "Statistics" msgstr "Статистика" #: actions/showgroup.php:432 -#, fuzzy msgid "Created" -msgstr "Креирај" +msgstr "Создадено" #: actions/showgroup.php:448 #, php-format @@ -3995,46 +3987,46 @@ msgstr "" msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:196 +#: classes/Notice.php:226 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Проблем во снимањето на известувањето." -#: classes/Notice.php:200 +#: classes/Notice.php:230 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Проблем во снимањето на известувањето." -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:211 +#: classes/Notice.php:241 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "Проблем во снимањето на известувањето." -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "Одговор од внесот во базата: %s" -#: classes/Notice.php:1320 +#: classes/Notice.php:1371 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:347 +#: classes/User.php:368 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4141,9 +4133,8 @@ msgid "Logout from the site" msgstr "" #: lib/action.php:455 -#, fuzzy msgid "Create an account" -msgstr "Креирај нова сметка" +msgstr "Создај сметка" #: lib/action.php:458 msgid "Login to the site" @@ -4363,12 +4354,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "" @@ -4401,134 +4392,134 @@ msgstr "" msgid "About: %s" msgstr "" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "" -#: lib/command.php:421 +#: lib/command.php:422 msgid "Cannot repeat your own notice" msgstr "" -#: lib/command.php:426 +#: lib/command.php:427 msgid "Already repeated that notice" msgstr "" -#: lib/command.php:434 +#: lib/command.php:435 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Известувања" -#: lib/command.php:436 +#: lib/command.php:437 #, fuzzy msgid "Error repeating notice." msgstr "Проблем во снимањето на известувањето." -#: lib/command.php:490 +#: lib/command.php:491 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:499 +#: lib/command.php:500 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Одговори испратени до %s" -#: lib/command.php:501 +#: lib/command.php:502 #, fuzzy msgid "Error saving notice." msgstr "Проблем во снимањето на известувањето." -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "" -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "" -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "" -#: lib/command.php:663 +#: lib/command.php:664 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "OpenID формуларот не може да се креира:%s" -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:684 +#: lib/command.php:685 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Не ни го испративте тој профил." -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Не ни го испративте тој профил." msgstr[1] "Не ни го испративте тој профил." -#: lib/command.php:706 +#: lib/command.php:707 #, fuzzy msgid "No one is subscribed to you." msgstr "Оддалечена претплата" -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Оддалечена претплата" msgstr[1] "Оддалечена претплата" -#: lib/command.php:728 +#: lib/command.php:729 #, fuzzy msgid "You are not a member of any groups." msgstr "Не ни го испративте тој профил." -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Не ни го испративте тој профил." msgstr[1] "Не ни го испративте тој профил." -#: lib/command.php:744 +#: lib/command.php:745 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4815,9 +4806,8 @@ msgid "Login with a username and password" msgstr "Погрешно име или лозинка." #: lib/logingroupnav.php:86 -#, fuzzy msgid "Sign up for a new account" -msgstr "Креирај нова сметка" +msgstr "Создај нова сметка" #: lib/mail.php:172 msgid "Email address confirmation" @@ -5011,7 +5001,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 msgid "from" msgstr "" @@ -5099,50 +5089,54 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "N" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 #, fuzzy msgid "in context" msgstr "Нема содржина!" -#: lib/noticelist.php:549 -#, fuzzy +#: lib/noticelist.php:548 msgid "Repeated by" -msgstr "Креирај" +msgstr "Повторено од" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 #, fuzzy msgid "Reply" msgstr "одговор" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "Известувања" + #: lib/nudgeform.php:116 msgid "Nudge this user" msgstr "" @@ -5462,47 +5456,47 @@ msgstr "" msgid "Moderate" msgstr "" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "пред неколку секунди" -#: lib/util.php:827 +#: lib/util.php:831 msgid "about a minute ago" msgstr "пред една минута" -#: lib/util.php:829 +#: lib/util.php:833 #, php-format msgid "about %d minutes ago" msgstr "пред %d минути" -#: lib/util.php:831 +#: lib/util.php:835 msgid "about an hour ago" msgstr "пред еден час" -#: lib/util.php:833 +#: lib/util.php:837 #, php-format msgid "about %d hours ago" msgstr "пред %d часа" -#: lib/util.php:835 +#: lib/util.php:839 msgid "about a day ago" msgstr "пред еден ден" -#: lib/util.php:837 +#: lib/util.php:841 #, php-format msgid "about %d days ago" msgstr "пред %d денови" -#: lib/util.php:839 +#: lib/util.php:843 msgid "about a month ago" msgstr "пред еден месец" -#: lib/util.php:841 +#: lib/util.php:845 #, php-format msgid "about %d months ago" msgstr "пред %d месеци" -#: lib/util.php:843 +#: lib/util.php:847 msgid "about a year ago" msgstr "пред една година" diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index 247bf3d4e6..e9ea9c4bba 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:35:16+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:52:42+0000\n" "Language-Team: Norwegian (bokmål)‬\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: no\n" "X-Message-Group: out-statusnet\n" @@ -35,17 +35,18 @@ msgstr "Klarte ikke å lagre profil." #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "" @@ -55,7 +56,8 @@ msgid "%s and friends, page %d" msgstr "%s og venner" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s og venner" @@ -108,6 +110,7 @@ msgid "You and friends" msgstr "%s og venner" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" @@ -229,8 +232,8 @@ msgstr "" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -595,7 +598,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 #, fuzzy msgid "Delete" msgstr "slett" @@ -823,7 +826,7 @@ msgstr "Er du sikker på at du vil slette denne notisen?" msgid "Do not delete this notice" msgstr "Kan ikke slette notisen." -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 msgid "Delete this notice" msgstr "" @@ -1933,7 +1936,7 @@ msgid "You can't send a message to this user." msgstr "" #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "" @@ -1950,7 +1953,7 @@ msgstr "" msgid "Message sent" msgstr "" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "" @@ -2037,8 +2040,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "" @@ -2835,12 +2838,12 @@ msgstr "" msgid "You already repeated that notice." msgstr "Du er allerede logget inn!" -#: actions/repeat.php:112 lib/noticelist.php:627 +#: actions/repeat.php:114 lib/noticelist.php:621 #, fuzzy msgid "Repeated" msgstr "Opprett" -#: actions/repeat.php:115 +#: actions/repeat.php:119 #, fuzzy msgid "Repeated!" msgstr "Opprett" @@ -3953,44 +3956,44 @@ msgstr "" msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:196 +#: classes/Notice.php:226 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:200 +#: classes/Notice.php:230 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:211 +#: classes/Notice.php:241 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1320 +#: classes/Notice.php:1371 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:347 +#: classes/User.php:368 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4305,12 +4308,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "" @@ -4343,133 +4346,133 @@ msgstr "" msgid "About: %s" msgstr "" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "" -#: lib/command.php:421 +#: lib/command.php:422 msgid "Cannot repeat your own notice" msgstr "" -#: lib/command.php:426 +#: lib/command.php:427 #, fuzzy msgid "Already repeated that notice" msgstr "Kan ikke slette notisen." -#: lib/command.php:434 +#: lib/command.php:435 #, php-format msgid "Notice from %s repeated" msgstr "" -#: lib/command.php:436 +#: lib/command.php:437 msgid "Error repeating notice." msgstr "" -#: lib/command.php:490 +#: lib/command.php:491 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:499 +#: lib/command.php:500 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Svar til %s" -#: lib/command.php:501 +#: lib/command.php:502 msgid "Error saving notice." msgstr "" -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "" -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "" -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "" -#: lib/command.php:663 +#: lib/command.php:664 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Klarte ikke å lagre avatar-informasjonen" -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:684 +#: lib/command.php:685 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Ikke autorisert." -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Ikke autorisert." msgstr[1] "Ikke autorisert." -#: lib/command.php:706 +#: lib/command.php:707 #, fuzzy msgid "No one is subscribed to you." msgstr "Svar til %s" -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Svar til %s" msgstr[1] "Svar til %s" -#: lib/command.php:728 +#: lib/command.php:729 #, fuzzy msgid "You are not a member of any groups." msgstr "Du er allerede logget inn!" -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Du er allerede logget inn!" msgstr[1] "Du er allerede logget inn!" -#: lib/command.php:744 +#: lib/command.php:745 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4950,7 +4953,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 #, fuzzy msgid "from" msgstr "fra" @@ -5037,49 +5040,54 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "N" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 msgid "in context" msgstr "" -#: lib/noticelist.php:549 +#: lib/noticelist.php:548 #, fuzzy msgid "Repeated by" msgstr "Opprett" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 #, fuzzy msgid "Reply" msgstr "svar" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "Nytt nick" + #: lib/nudgeform.php:116 msgid "Nudge this user" msgstr "" @@ -5397,47 +5405,47 @@ msgstr "" msgid "Moderate" msgstr "" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "noen få sekunder siden" -#: lib/util.php:827 +#: lib/util.php:831 msgid "about a minute ago" msgstr "omtrent ett minutt siden" -#: lib/util.php:829 +#: lib/util.php:833 #, php-format msgid "about %d minutes ago" msgstr "omtrent %d minutter siden" -#: lib/util.php:831 +#: lib/util.php:835 msgid "about an hour ago" msgstr "omtrent én time siden" -#: lib/util.php:833 +#: lib/util.php:837 #, php-format msgid "about %d hours ago" msgstr "omtrent %d timer siden" -#: lib/util.php:835 +#: lib/util.php:839 msgid "about a day ago" msgstr "omtrent én dag siden" -#: lib/util.php:837 +#: lib/util.php:841 #, php-format msgid "about %d days ago" msgstr "omtrent %d dager siden" -#: lib/util.php:839 +#: lib/util.php:843 msgid "about a month ago" msgstr "omtrent én måned siden" -#: lib/util.php:841 +#: lib/util.php:845 #, php-format msgid "about %d months ago" msgstr "omtrent %d måneder siden" -#: lib/util.php:843 +#: lib/util.php:847 msgid "about a year ago" msgstr "omtrent ett år siden" diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index 6865f3f24b..db938c948f 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:35:22+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:52:48+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: out-statusnet\n" @@ -36,17 +36,18 @@ msgstr "Deze pagina bestaat niet" #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Onbekende gebruiker." @@ -56,7 +57,8 @@ msgid "%s and friends, page %d" msgstr "%s en vrienden, pagina %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s en vrienden" @@ -117,6 +119,7 @@ msgid "You and friends" msgstr "U en vrienden" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Updates van %1$s en vrienden op %2$s." @@ -237,8 +240,8 @@ msgstr "Alle directe berichten verzonden aan %s" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -446,12 +449,10 @@ msgid "No such notice." msgstr "De mededeling bestaat niet." #: actions/apistatusesretweet.php:83 -#, fuzzy msgid "Cannot repeat your own notice." msgstr "U kunt uw eigen mededelingen niet herhalen." #: actions/apistatusesretweet.php:91 -#, fuzzy msgid "Already repeated that notice." msgstr "U hebt die mededeling al herhaald." @@ -605,7 +606,7 @@ msgid "Preview" msgstr "Voorvertoning" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 msgid "Delete" msgstr "Verwijderen" @@ -833,7 +834,7 @@ msgstr "Weet u zeker dat u deze aankondiging wilt verwijderen?" msgid "Do not delete this notice" msgstr "Deze mededeling niet verwijderen" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 msgid "Delete this notice" msgstr "Deze mededeling verwijderen" @@ -1285,24 +1286,20 @@ msgid "A selection of some of the great users on %s" msgstr "Een selectie van de actieve gebruikers op %s" #: actions/file.php:34 -#, fuzzy msgid "No notice ID." -msgstr "Geen mededeling" +msgstr "Geen mededelingnummer." #: actions/file.php:38 -#, fuzzy msgid "No notice." -msgstr "Geen mededeling" +msgstr "Geen mededeling." #: actions/file.php:42 -#, fuzzy msgid "No attachments." -msgstr "Geen bijlagen" +msgstr "Geen bijlagen." #: actions/file.php:51 -#, fuzzy msgid "No uploaded attachments." -msgstr "Geen toegevoegde bijlagen" +msgstr "Geen toegevoegde bijlagen." #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1987,7 +1984,7 @@ msgid "You can't send a message to this user." msgstr "U kunt geen bericht naar deze gebruiker zenden." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "Geen inhoud!" @@ -2004,7 +2001,7 @@ msgstr "Stuur geen berichten naar uzelf. Zeg het gewoon in uw hoofd." msgid "Message sent" msgstr "Bericht verzonden." -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "Het directe bericht aan %s is verzonden" @@ -2100,8 +2097,8 @@ msgstr "inhoudstype " msgid "Only " msgstr "Alleen " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "Geen ondersteund gegevensformaat." @@ -2753,7 +2750,7 @@ msgstr "Geen geldig e-mailadres." #: actions/register.php:212 msgid "Email address already exists." -msgstr "Het e--mailadres bestaat al." +msgstr "Het e-mailadres bestaat al." #: actions/register.php:243 actions/register.php:264 msgid "Invalid username or password." @@ -2925,11 +2922,11 @@ msgstr "U kunt uw eigen mededeling niet herhalen." msgid "You already repeated that notice." msgstr "U hent die mededeling al herhaald." -#: actions/repeat.php:112 lib/noticelist.php:627 +#: actions/repeat.php:114 lib/noticelist.php:621 msgid "Repeated" msgstr "Herhaald" -#: actions/repeat.php:115 +#: actions/repeat.php:119 msgid "Repeated!" msgstr "Herhaald!" @@ -3748,7 +3745,6 @@ msgid "Notice feed for tag %s (Atom)" msgstr "Mededelingenfeed voor label %s (Atom)" #: actions/tagother.php:39 -#, fuzzy msgid "No ID argument." msgstr "Geen ID-argument." @@ -4024,9 +4020,8 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "Er staat een verkeerd afbeeldingsttype op de avatar-URL \"%s\"." #: actions/userbyid.php:70 -#, fuzzy msgid "No ID." -msgstr "Geen ID" +msgstr "Geen ID." #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" @@ -4102,26 +4097,26 @@ msgstr "Het was niet mogelijk het bericht bij te werken met de nieuwe URI." msgid "DB error inserting hashtag: %s" msgstr "Er is een databasefout opgetreden bij de invoer van de hashtag: %s" -#: classes/Notice.php:196 +#: classes/Notice.php:226 msgid "Problem saving notice. Too long." msgstr "" "Er is een probleem opgetreden bij het opslaan van de mededeling. Deze is te " "lang." -#: classes/Notice.php:200 +#: classes/Notice.php:230 msgid "Problem saving notice. Unknown user." msgstr "" "Er was een probleem bij het opslaan van de mededeling. De gebruiker is " "onbekend." -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "U hebt te snel te veel mededelingen verstuurd. Kom even op adem en probeer " "het over enige tijd weer." -#: classes/Notice.php:211 +#: classes/Notice.php:241 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4129,27 +4124,27 @@ msgstr "" "Te veel duplicaatberichten te snel achter elkaar. Neem een adempauze en " "plaats over een aantal minuten pas weer een bericht." -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "" "U bent geblokkeerd en mag geen mededelingen meer achterlaten op deze site." -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "Er is een probleem opgetreden bij het opslaan van de mededeling." -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "" "Er is een databasefout opgetreden bij het invoegen van het antwoord: %s" -#: classes/Notice.php:1320 +#: classes/Notice.php:1371 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/User.php:347 +#: classes/User.php:368 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Welkom bij %1$s, @%2$s!" @@ -4462,12 +4457,12 @@ msgstr "" "Abonnees: %2$s\n" "Mededelingen: %3$s" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "Er bestaat geen mededeling met dat ID" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "Deze gebruiker heeft geen laatste mededeling" @@ -4500,137 +4495,136 @@ msgstr "Thuispagina: %s" msgid "About: %s" msgstr "Over: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" "Het bericht te is lang. De maximale lengte is %d tekens. De lengte van uw " "bericht was %d" -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "Er is een fout opgetreden bij het verzonden van het directe bericht." -#: lib/command.php:421 +#: lib/command.php:422 msgid "Cannot repeat your own notice" msgstr "U kunt uw eigen mededelingen niet herhalen." -#: lib/command.php:426 +#: lib/command.php:427 msgid "Already repeated that notice" msgstr "U hebt die mededeling al herhaald." -#: lib/command.php:434 +#: lib/command.php:435 #, php-format msgid "Notice from %s repeated" msgstr "De mededeling van %s is herhaald" -#: lib/command.php:436 +#: lib/command.php:437 msgid "Error repeating notice." msgstr "Er is een fout opgetreden bij het herhalen van de mededeling." -#: lib/command.php:490 +#: lib/command.php:491 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" "De mededeling is te lang. De maximale lengte is %d tekens. Uw mededeling " "bevatte %d tekens" -#: lib/command.php:499 +#: lib/command.php:500 #, php-format msgid "Reply to %s sent" msgstr "Het antwoord aan %s is verzonden" -#: lib/command.php:501 +#: lib/command.php:502 msgid "Error saving notice." msgstr "Er is een fout opgetreden bij het opslaan van de mededeling." -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "Geef de naam op van de gebruiker waarop u wilt abonneren" -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "Geabonneerd op %s" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "" "Geef de naam op van de gebruiker waarvoor u het abonnement wilt opzeggen" -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "Uw abonnement op %s is opgezegd" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "Dit commando is nog niet geïmplementeerd." -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "Notificaties uitgeschakeld." -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "Het is niet mogelijk de mededelingen uit te schakelen." -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "Notificaties ingeschakeld." -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "Het is niet mogelijk de notificatie uit te schakelen." -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "Het aanmeldcommando is uitgeschakeld" -#: lib/command.php:663 +#: lib/command.php:664 #, php-format msgid "Could not create login token for %s" msgstr "Het was niet mogelijk een aanmeldtoken aan te maken voor %s" -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" "Deze verwijzing kan slechts één keer gebruikt worden en is twee minuten " "geldig: %s" -#: lib/command.php:684 +#: lib/command.php:685 msgid "You are not subscribed to anyone." msgstr "U bent op geen enkele gebruiker geabonneerd." -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "U bent geabonneerd op deze gebruiker:" msgstr[1] "U bent geabonneerd op deze gebruikers:" -#: lib/command.php:706 +#: lib/command.php:707 msgid "No one is subscribed to you." msgstr "Niemand heeft een abonnenment op u." -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Deze gebruiker is op u geabonneerd:" msgstr[1] "Deze gebruikers zijn op u geabonneerd:" -#: lib/command.php:728 +#: lib/command.php:729 msgid "You are not a member of any groups." msgstr "U bent lid van geen enkele groep." -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "U bent lid van deze groep:" msgstr[1] "U bent lid van deze groepen:" -#: lib/command.php:744 -#, fuzzy +#: lib/command.php:745 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4686,6 +4680,8 @@ msgstr "" "zetten\n" "fav # - mededelingen met aangegeven ID op favorietenlijst " "zetten\n" +"repeat # - herhaal een mededelingen met een opgegeven ID\n" +"repeat - herhaal de laatste mededelingen van gebruiker\n" "reply # - antwoorden op de mededeling met het aangegeven ID\n" "reply - antwoorden op de laatste mededeling van gebruiker\n" "join - lid worden van groep\n" @@ -5223,7 +5219,7 @@ msgstr "" "U hebt geen privéberichten. U kunt privéberichten verzenden aan andere " "gebruikers. Mensen kunnen u privéberichten sturen die alleen u kunt lezen." -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 msgid "from" msgstr "van" @@ -5314,48 +5310,52 @@ msgstr "Toevoegen" msgid "Attach a file" msgstr "Bestand toevoegen" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "N" msgstr "N" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "Z" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "O" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "W" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "op" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 msgid "in context" msgstr "in context" -#: lib/noticelist.php:549 -#, fuzzy +#: lib/noticelist.php:548 msgid "Repeated by" -msgstr "Herhaald door %s" +msgstr "Herhaald door" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 msgid "Reply to this notice" msgstr "Op deze mededeling antwoorden" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 msgid "Reply" msgstr "Antwoorden" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "Deze mededeling is verwijderd." + #: lib/nudgeform.php:116 msgid "Nudge this user" msgstr "Deze gebruiker porren" @@ -5455,14 +5455,12 @@ msgid "All groups" msgstr "Alle groepen" #: lib/profileformaction.php:123 -#, fuzzy msgid "No return-to arguments." -msgstr "Er zijn geen \"terug naar\"-parameters opgegeven" +msgstr "Er zijn geen \"terug naar\"-parameters opgegeven." #: lib/profileformaction.php:137 -#, fuzzy msgid "Unimplemented method." -msgstr "methode niet geïmplementeerd" +msgstr "Methode niet geïmplementeerd." #: lib/publicgroupnav.php:78 msgid "Public" @@ -5661,47 +5659,47 @@ msgstr "Bericht" msgid "Moderate" msgstr "Modereren" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "een paar seconden geleden" -#: lib/util.php:827 +#: lib/util.php:831 msgid "about a minute ago" msgstr "ongeveer een minuut geleden" -#: lib/util.php:829 +#: lib/util.php:833 #, php-format msgid "about %d minutes ago" msgstr "ongeveer %d minuten geleden" -#: lib/util.php:831 +#: lib/util.php:835 msgid "about an hour ago" msgstr "ongeveer een uur geleden" -#: lib/util.php:833 +#: lib/util.php:837 #, php-format msgid "about %d hours ago" msgstr "ongeveer %d uur geleden" -#: lib/util.php:835 +#: lib/util.php:839 msgid "about a day ago" msgstr "ongeveer een dag geleden" -#: lib/util.php:837 +#: lib/util.php:841 #, php-format msgid "about %d days ago" msgstr "ongeveer %d dagen geleden" -#: lib/util.php:839 +#: lib/util.php:843 msgid "about a month ago" msgstr "ongeveer een maand geleden" -#: lib/util.php:841 +#: lib/util.php:845 #, php-format msgid "about %d months ago" msgstr "ongeveer %d maanden geleden" -#: lib/util.php:843 +#: lib/util.php:847 msgid "about a year ago" msgstr "ongeveer een jaar geleden" diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index 7ad1dfd933..c60264b96e 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: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:35:19+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:52:45+0000\n" "Language-Team: Norwegian Nynorsk\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nn\n" "X-Message-Group: out-statusnet\n" @@ -35,17 +35,18 @@ msgstr "Dette emneord finst ikkje." #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Brukaren finst ikkje." @@ -55,7 +56,8 @@ msgid "%s and friends, page %d" msgstr "%s med vener, side %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s med vener" @@ -108,6 +110,7 @@ msgid "You and friends" msgstr "%s med vener" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Oppdateringar frå %1$s og vener på %2$s!" @@ -230,8 +233,8 @@ msgstr "Alle direkte meldingar sendt til %s" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -598,7 +601,7 @@ msgid "Preview" msgstr "Forhandsvis" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 msgid "Delete" msgstr "Slett" @@ -829,7 +832,7 @@ msgstr "Sikker på at du vil sletta notisen?" msgid "Do not delete this notice" msgstr "Kan ikkje sletta notisen." -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 msgid "Delete this notice" msgstr "Slett denne notisen" @@ -1974,7 +1977,7 @@ msgid "You can't send a message to this user." msgstr "Du kan ikkje sende melding til denne brukaren." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "Ingen innhald." @@ -1994,7 +1997,7 @@ msgstr "" msgid "Message sent" msgstr "Melding" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "Direkte melding til %s sendt" @@ -2086,8 +2089,8 @@ msgstr "Kopla til" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "Ikkje eit støtta dataformat." @@ -2906,12 +2909,12 @@ msgstr "Du kan ikkje registrera deg om du ikkje godtek vilkåra i lisensen." msgid "You already repeated that notice." msgstr "Du har allereie blokkert denne brukaren." -#: actions/repeat.php:112 lib/noticelist.php:627 +#: actions/repeat.php:114 lib/noticelist.php:621 #, fuzzy msgid "Repeated" msgstr "Lag" -#: actions/repeat.php:115 +#: actions/repeat.php:119 #, fuzzy msgid "Repeated!" msgstr "Lag" @@ -4061,22 +4064,22 @@ msgstr "Kunne ikkje oppdatere melding med ny URI." msgid "DB error inserting hashtag: %s" msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s" -#: classes/Notice.php:196 +#: classes/Notice.php:226 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Eit problem oppstod ved lagring av notis." -#: classes/Notice.php:200 +#: classes/Notice.php:230 msgid "Problem saving notice. Unknown user." msgstr "Feil ved lagring av notis. Ukjend brukar." -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt." -#: classes/Notice.php:211 +#: classes/Notice.php:241 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4084,25 +4087,25 @@ msgid "" msgstr "" "For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt." -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "Du kan ikkje lengre legge inn notisar på denne sida." -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "Eit problem oppstod ved lagring av notis." -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "Databasefeil, kan ikkje lagra svar: %s" -#: classes/Notice.php:1320 +#: classes/Notice.php:1371 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:347 +#: classes/User.php:368 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Melding til %1$s på %2$s" @@ -4425,12 +4428,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "Brukaren har ikkje siste notis" @@ -4463,136 +4466,136 @@ msgstr "Heimeside: %s" msgid "About: %s" msgstr "Om: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d" -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "Ein feil oppstod ved sending av direkte melding." -#: lib/command.php:421 +#: lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Kan ikkje slå på notifikasjon." -#: lib/command.php:426 +#: lib/command.php:427 #, fuzzy msgid "Already repeated that notice" msgstr "Slett denne notisen" -#: lib/command.php:434 +#: lib/command.php:435 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Melding lagra" -#: lib/command.php:436 +#: lib/command.php:437 #, fuzzy msgid "Error repeating notice." msgstr "Eit problem oppstod ved lagring av notis." -#: lib/command.php:490 +#: lib/command.php:491 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d" -#: lib/command.php:499 +#: lib/command.php:500 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Svar på denne notisen" -#: lib/command.php:501 +#: lib/command.php:502 #, fuzzy msgid "Error saving notice." msgstr "Eit problem oppstod ved lagring av notis." -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "Spesifer namnet til brukaren du vil tinge" -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "Tingar %s" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "Spesifer namnet til brukar du vil fjerne tinging på" -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "Tingar ikkje %s lengre" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "Kommando ikkje implementert." -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "Notifikasjon av." -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "Kan ikkje skru av notifikasjon." -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "Notifikasjon på." -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "Kan ikkje slå på notifikasjon." -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "" -#: lib/command.php:663 +#: lib/command.php:664 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Kunne ikkje lagre favoritt." -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:684 +#: lib/command.php:685 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Du tingar ikkje oppdateringar til den profilen." -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Du tingar allereie oppdatering frå desse brukarane:" msgstr[1] "Du tingar allereie oppdatering frå desse brukarane:" -#: lib/command.php:706 +#: lib/command.php:707 #, fuzzy msgid "No one is subscribed to you." msgstr "Kan ikkje tinga andre til deg." -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Kan ikkje tinga andre til deg." msgstr[1] "Kan ikkje tinga andre til deg." -#: lib/command.php:728 +#: lib/command.php:729 #, fuzzy msgid "You are not a member of any groups." msgstr "Du er ikkje medlem av den gruppa." -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Du er ikkje medlem av den gruppa." msgstr[1] "Du er ikkje medlem av den gruppa." -#: lib/command.php:744 +#: lib/command.php:745 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5076,7 +5079,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 #, fuzzy msgid "from" msgstr " frå " @@ -5162,50 +5165,55 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 #, fuzzy msgid "N" msgstr "Nei" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 #, fuzzy msgid "in context" msgstr "Ingen innhald." -#: lib/noticelist.php:549 +#: lib/noticelist.php:548 #, fuzzy msgid "Repeated by" msgstr "Lag" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 msgid "Reply to this notice" msgstr "Svar på denne notisen" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 msgid "Reply" msgstr "Svar" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "Melding lagra" + #: lib/nudgeform.php:116 msgid "Nudge this user" msgstr "Dult denne brukaren" @@ -5526,47 +5534,47 @@ msgstr "Melding" msgid "Moderate" msgstr "" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "eit par sekund sidan" -#: lib/util.php:827 +#: lib/util.php:831 msgid "about a minute ago" msgstr "omtrent eitt minutt sidan" -#: lib/util.php:829 +#: lib/util.php:833 #, php-format msgid "about %d minutes ago" msgstr "~%d minutt sidan" -#: lib/util.php:831 +#: lib/util.php:835 msgid "about an hour ago" msgstr "omtrent ein time sidan" -#: lib/util.php:833 +#: lib/util.php:837 #, php-format msgid "about %d hours ago" msgstr "~%d timar sidan" -#: lib/util.php:835 +#: lib/util.php:839 msgid "about a day ago" msgstr "omtrent ein dag sidan" -#: lib/util.php:837 +#: lib/util.php:841 #, php-format msgid "about %d days ago" msgstr "~%d dagar sidan" -#: lib/util.php:839 +#: lib/util.php:843 msgid "about a month ago" msgstr "omtrent ein månad sidan" -#: lib/util.php:841 +#: lib/util.php:845 #, php-format msgid "about %d months ago" msgstr "~%d månadar sidan" -#: lib/util.php:843 +#: lib/util.php:847 msgid "about a year ago" msgstr "omtrent eitt år sidan" diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index 35202771a2..b408087184 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: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:35:25+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:52:51+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -19,7 +19,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pl\n" "X-Message-Group: out-statusnet\n" @@ -40,17 +40,18 @@ msgstr "Nie ma takiej strony" #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Brak takiego użytkownika." @@ -60,7 +61,8 @@ msgid "%s and friends, page %d" msgstr "Użytkownik %s i przyjaciele, strona %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "Użytkownik %s i przyjaciele" @@ -121,6 +123,7 @@ msgid "You and friends" msgstr "Ty i przyjaciele" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Aktualizacje z %1$s i przyjaciół na %2$s." @@ -240,8 +243,8 @@ msgstr "Wszystkie bezpośrednie wiadomości wysłane do użytkownika %s" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -600,7 +603,7 @@ msgid "Preview" msgstr "Podgląd" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 msgid "Delete" msgstr "Usuń" @@ -825,7 +828,7 @@ msgstr "Jesteś pewien, że chcesz usunąć ten wpis?" msgid "Do not delete this notice" msgstr "Nie usuwaj tego wpisu" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 msgid "Delete this notice" msgstr "Usuń ten wpis" @@ -1959,7 +1962,7 @@ msgid "You can't send a message to this user." msgstr "Nie można wysłać wiadomości do tego użytkownika." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "Brak zawartości." @@ -1976,7 +1979,7 @@ msgstr "Nie wysyłaj wiadomości do siebie, po prostu powiedz to sobie po cichu. msgid "Message sent" msgstr "Wysłano wiadomość" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "Wysłano bezpośrednią wiadomość do użytkownika %s" @@ -2072,8 +2075,8 @@ msgstr "typ zawartości " msgid "Only " msgstr "Tylko " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "To nie jest obsługiwany format danych." @@ -2892,12 +2895,12 @@ msgstr "" msgid "You already repeated that notice." msgstr "Użytkownik jest już zablokowany." -#: actions/repeat.php:112 lib/noticelist.php:627 +#: actions/repeat.php:114 lib/noticelist.php:621 #, fuzzy msgid "Repeated" msgstr "Utworzono" -#: actions/repeat.php:115 +#: actions/repeat.php:119 #, fuzzy msgid "Repeated!" msgstr "Utworzono" @@ -4061,22 +4064,22 @@ msgstr "Nie można zaktualizować wiadomości za pomocą nowego adresu URL." msgid "DB error inserting hashtag: %s" msgstr "Błąd bazy danych podczas wprowadzania znacznika mieszania: %s" -#: classes/Notice.php:196 +#: classes/Notice.php:226 msgid "Problem saving notice. Too long." msgstr "Problem podczas zapisywania wpisu. Za długi." -#: classes/Notice.php:200 +#: classes/Notice.php:230 msgid "Problem saving notice. Unknown user." msgstr "Problem podczas zapisywania wpisu. Nieznany użytkownik." -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Za dużo wpisów w za krótkim czasie, weź głęboki oddech i wyślij ponownie za " "kilka minut." -#: classes/Notice.php:211 +#: classes/Notice.php:241 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4084,25 +4087,25 @@ msgstr "" "Za dużo takich samych wiadomości w za krótkim czasie, weź głęboki oddech i " "wyślij ponownie za kilka minut." -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "Zabroniono ci wysyłania wpisów na tej stronie." -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "Problem podczas zapisywania wpisu." -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "Błąd bazy danych podczas wprowadzania odpowiedzi: %s" -#: classes/Notice.php:1320 +#: classes/Notice.php:1371 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:347 +#: classes/User.php:368 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Witaj w %1$s, @%2$s." @@ -4415,12 +4418,12 @@ msgstr "" "Subskrybenci: %2$s\n" "Wpisy: %3$s" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "Wpis z tym identyfikatorem nie istnieje" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "Użytkownik nie posiada ostatniego wpisu" @@ -4453,137 +4456,137 @@ msgstr "Strona domowa: %s" msgid "About: %s" msgstr "O mnie: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Wiadomość jest za długa - maksymalnie %d znaków, wysłano %d" -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "Błąd podczas wysyłania bezpośredniej wiadomości." -#: lib/command.php:421 +#: lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Nie można włączyć powiadomień." -#: lib/command.php:426 +#: lib/command.php:427 #, fuzzy msgid "Already repeated that notice" msgstr "Usuń ten wpis" -#: lib/command.php:434 +#: lib/command.php:435 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Wysłano wpis" -#: lib/command.php:436 +#: lib/command.php:437 #, fuzzy msgid "Error repeating notice." msgstr "Błąd podczas zapisywania wpisu." -#: lib/command.php:490 +#: lib/command.php:491 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Wpis jest za długi - maksymalnie %d znaków, wysłano %d" -#: lib/command.php:499 +#: lib/command.php:500 #, php-format msgid "Reply to %s sent" msgstr "Wysłano odpowiedź do %s" -#: lib/command.php:501 +#: lib/command.php:502 msgid "Error saving notice." msgstr "Błąd podczas zapisywania wpisu." -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "Podaj nazwę użytkownika do subskrybowania" -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "Subskrybowano użytkownika %s" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "Podaj nazwę użytkownika do usunięcia subskrypcji" -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "Usunięto subskrypcję użytkownika %s" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "Nie zaimplementowano polecenia." -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "Wyłączono powiadomienia." -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "Nie można wyłączyć powiadomień." -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "Włączono powiadomienia." -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "Nie można włączyć powiadomień." -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "Polecenie logowania jest wyłączone" -#: lib/command.php:663 +#: lib/command.php:664 #, php-format msgid "Could not create login token for %s" msgstr "Nie można utworzyć tokenów loginów dla %s" -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" "Ten odnośnik można użyć tylko raz i będzie prawidłowy tylko przez dwie " "minuty: %s" -#: lib/command.php:684 +#: lib/command.php:685 msgid "You are not subscribed to anyone." msgstr "Nie subskrybujesz nikogo." -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Subskrybujesz tę osobę:" msgstr[1] "Subskrybujesz te osoby:" msgstr[2] "Subskrybujesz te osoby:" -#: lib/command.php:706 +#: lib/command.php:707 msgid "No one is subscribed to you." msgstr "Nikt cię nie subskrybuje." -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Ta osoba cię subskrybuje:" msgstr[1] "Te osoby cię subskrybują:" msgstr[2] "Te osoby cię subskrybują:" -#: lib/command.php:728 +#: lib/command.php:729 msgid "You are not a member of any groups." msgstr "Nie jesteś członkiem żadnej grupy." -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Jesteś członkiem tej grupy:" msgstr[1] "Jesteś członkiem tych grup:" msgstr[2] "Jesteś członkiem tych grup:" -#: lib/command.php:744 +#: lib/command.php:745 #, fuzzy msgid "" "Commands:\n" @@ -5175,7 +5178,7 @@ msgstr "" "rozmowę z innymi użytkownikami. Inni mogą wysyłać ci wiadomości tylko dla " "twoich oczu." -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 msgid "from" msgstr "z" @@ -5261,48 +5264,53 @@ msgstr "Załącz" msgid "Attach a file" msgstr "Załącz plik" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "N" msgstr "Północ" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "Południe" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "Wschód" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "Zachód" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "w" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 msgid "in context" msgstr "w rozmowie" -#: lib/noticelist.php:549 +#: lib/noticelist.php:548 #, fuzzy msgid "Repeated by" msgstr "Utworzono" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 msgid "Reply to this notice" msgstr "Odpowiedz na ten wpis" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 msgid "Reply" msgstr "Odpowiedz" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "Usunięto wpis." + #: lib/nudgeform.php:116 msgid "Nudge this user" msgstr "Szturchnij tego użytkownika" @@ -5609,47 +5617,47 @@ msgstr "Wiadomość" msgid "Moderate" msgstr "Moderuj" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "kilka sekund temu" -#: lib/util.php:827 +#: lib/util.php:831 msgid "about a minute ago" msgstr "około minutę temu" -#: lib/util.php:829 +#: lib/util.php:833 #, php-format msgid "about %d minutes ago" msgstr "około %d minut temu" -#: lib/util.php:831 +#: lib/util.php:835 msgid "about an hour ago" msgstr "około godzinę temu" -#: lib/util.php:833 +#: lib/util.php:837 #, php-format msgid "about %d hours ago" msgstr "około %d godzin temu" -#: lib/util.php:835 +#: lib/util.php:839 msgid "about a day ago" msgstr "blisko dzień temu" -#: lib/util.php:837 +#: lib/util.php:841 #, php-format msgid "about %d days ago" msgstr "około %d dni temu" -#: lib/util.php:839 +#: lib/util.php:843 msgid "about a month ago" msgstr "około miesiąc temu" -#: lib/util.php:841 +#: lib/util.php:845 #, php-format msgid "about %d months ago" msgstr "około %d miesięcy temu" -#: lib/util.php:843 +#: lib/util.php:847 msgid "about a year ago" msgstr "około rok temu" diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index 3fc5dfa887..155ad52e23 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: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:35:28+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:52:54+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt\n" "X-Message-Group: out-statusnet\n" @@ -36,17 +36,18 @@ msgstr "Página não encontrada." #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Utilizador não encontrado." @@ -56,7 +57,8 @@ msgid "%s and friends, page %d" msgstr "%s e amigos, página %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s e amigos" @@ -115,6 +117,7 @@ msgid "You and friends" msgstr "Você e amigos" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Actualizações de %1$s e amigos no %2$s!" @@ -234,8 +237,8 @@ msgstr "Todas as mensagens directas enviadas para %s" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -437,14 +440,12 @@ msgid "No such notice." msgstr "Nota não encontrada." #: actions/apistatusesretweet.php:83 -#, fuzzy msgid "Cannot repeat your own notice." -msgstr "Não pode repetir a sua própria nota" +msgstr "Não pode repetir a sua própria nota." #: actions/apistatusesretweet.php:91 -#, fuzzy msgid "Already repeated that notice." -msgstr "Já repetiu essa nota" +msgstr "Já repetiu essa nota." #: actions/apistatusesshow.php:138 msgid "Status deleted." @@ -593,7 +594,7 @@ msgid "Preview" msgstr "Antevisão" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 msgid "Delete" msgstr "Apagar" @@ -819,7 +820,7 @@ msgstr "Tem a certeza de que quer apagar esta nota?" msgid "Do not delete this notice" msgstr "Não apagar esta nota" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 msgid "Delete this notice" msgstr "Apagar esta nota" @@ -1271,24 +1272,20 @@ msgid "A selection of some of the great users on %s" msgstr "Uma selecção dos participantes excelentes no %s" #: actions/file.php:34 -#, fuzzy msgid "No notice ID." -msgstr "Sem notas" +msgstr "Sem identificação (ID) de nota." #: actions/file.php:38 -#, fuzzy msgid "No notice." -msgstr "Sem notas" +msgstr "Sem nota." #: actions/file.php:42 -#, fuzzy msgid "No attachments." -msgstr "Sem anexos" +msgstr "Sem anexos." #: actions/file.php:51 -#, fuzzy msgid "No uploaded attachments." -msgstr "Sem anexos carregados" +msgstr "Sem anexos carregados." #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1963,7 +1960,7 @@ msgid "You can't send a message to this user." msgstr "Não pode enviar uma mensagem a este utilizador." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "Sem conteúdo!" @@ -1980,7 +1977,7 @@ msgstr "Não auto-envie uma mensagem; basta lê-la baixinho a si próprio." msgid "Message sent" msgstr "Mensagem enviada" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "Mensagem directa para %s enviada" @@ -2075,8 +2072,8 @@ msgstr "tipo de conteúdo " msgid "Only " msgstr "Apenas " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "Formato de dados não suportado." @@ -2898,11 +2895,11 @@ msgstr "Não pode repetir a sua própria nota." msgid "You already repeated that notice." msgstr "Já repetiu essa nota." -#: actions/repeat.php:112 lib/noticelist.php:627 +#: actions/repeat.php:114 lib/noticelist.php:621 msgid "Repeated" msgstr "Repetida" -#: actions/repeat.php:115 +#: actions/repeat.php:119 msgid "Repeated!" msgstr "Repetida!" @@ -3714,9 +3711,8 @@ msgid "Notice feed for tag %s (Atom)" msgstr "Feed de notas para a categoria %s (Atom)" #: actions/tagother.php:39 -#, fuzzy msgid "No ID argument." -msgstr "Argumento de identificação em falta." +msgstr "Argumento de identificação (ID) em falta." #: actions/tagother.php:65 #, php-format @@ -3986,9 +3982,8 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "Tipo de imagem incorrecto para o avatar da URL ‘%s’." #: actions/userbyid.php:70 -#, fuzzy msgid "No ID." -msgstr "Sem ID" +msgstr "Sem ID." #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" @@ -4062,22 +4057,22 @@ msgstr "Não foi possível actualizar a mensagem com a nova URI." msgid "DB error inserting hashtag: %s" msgstr "Erro na base de dados ao inserir a hashtag: %s" -#: classes/Notice.php:196 +#: classes/Notice.php:226 msgid "Problem saving notice. Too long." msgstr "Problema na gravação da nota. Demasiado longa." -#: classes/Notice.php:200 +#: classes/Notice.php:230 msgid "Problem saving notice. Unknown user." msgstr "Problema na gravação da nota. Utilizador desconhecido." -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Demasiadas notas, demasiado rápido; descanse e volte a publicar daqui a " "alguns minutos." -#: classes/Notice.php:211 +#: classes/Notice.php:241 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4085,25 +4080,25 @@ msgstr "" "Demasiadas mensagens duplicadas, demasiado rápido; descanse e volte a " "publicar daqui a alguns minutos." -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "Está proibido de publicar notas neste site." -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "Problema na gravação da nota." -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "Ocorreu um erro na base de dados ao inserir a resposta: %s" -#: classes/Notice.php:1320 +#: classes/Notice.php:1371 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/User.php:347 +#: classes/User.php:368 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "%1$s dá-lhe as boas-vindas, @%2$s!" @@ -4416,12 +4411,12 @@ msgstr "" "Subscritores: %2$s\n" "Notas: %3$s" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "Não existe nenhuma nota com essa identificação" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "Utilizador não tem nenhuma última nota" @@ -4454,131 +4449,131 @@ msgstr "Página de acolhimento: %s" msgid "About: %s" msgstr "Sobre: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Mensagem demasiado extensa - máx. %d caracteres, enviou %d" -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "Erro no envio da mensagem directa." -#: lib/command.php:421 +#: lib/command.php:422 msgid "Cannot repeat your own notice" msgstr "Não pode repetir a sua própria nota" -#: lib/command.php:426 +#: lib/command.php:427 msgid "Already repeated that notice" msgstr "Já repetiu essa nota" -#: lib/command.php:434 +#: lib/command.php:435 #, php-format msgid "Notice from %s repeated" msgstr "Nota de %s repetida" -#: lib/command.php:436 +#: lib/command.php:437 msgid "Error repeating notice." msgstr "Erro ao repetir nota." -#: lib/command.php:490 +#: lib/command.php:491 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Nota demasiado extensa - máx. %d caracteres, enviou %d" -#: lib/command.php:499 +#: lib/command.php:500 #, php-format msgid "Reply to %s sent" msgstr "Resposta a %s enviada" -#: lib/command.php:501 +#: lib/command.php:502 msgid "Error saving notice." msgstr "Erro ao gravar nota." -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "Introduza o nome do utilizador para subscrever" -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "Subscreveu %s" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "Introduza o nome do utilizador para deixar de subscrever" -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "Deixou de subscrever %s" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "Comando ainda não implementado." -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "Notificação desligada." -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "Não foi possível desligar a notificação." -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "Notificação ligada." -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "Não foi possível ligar a notificação." -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "Comando para iniciar sessão foi desactivado" -#: lib/command.php:663 +#: lib/command.php:664 #, php-format msgid "Could not create login token for %s" msgstr "Não foi possível criar a chave de entrada para %s" -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" "Esta ligação é utilizável uma única vez e só durante os próximos 2 minutos: %" "s" -#: lib/command.php:684 +#: lib/command.php:685 msgid "You are not subscribed to anyone." msgstr "Não subscreveu ninguém." -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Subscreve esta pessoa:" msgstr[1] "Subscreve estas pessoas:" -#: lib/command.php:706 +#: lib/command.php:707 msgid "No one is subscribed to you." msgstr "Ninguém subscreve as suas notas." -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Esta pessoa subscreve as suas notas:" msgstr[1] "Estas pessoas subscrevem as suas notas:" -#: lib/command.php:728 +#: lib/command.php:729 msgid "You are not a member of any groups." msgstr "Não está em nenhum grupo." -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Está no grupo:" msgstr[1] "Está nos grupos:" -#: lib/command.php:744 +#: lib/command.php:745 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5168,7 +5163,7 @@ msgstr "" "conversa com outros utilizadores. Outros podem enviar-lhe mensagens, a que " "só você terá acesso." -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 msgid "from" msgstr "de" @@ -5257,48 +5252,52 @@ msgstr "Anexar" msgid "Attach a file" msgstr "Anexar um ficheiro" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "N" msgstr "N" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "S" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "E" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "O" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "coords." -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 msgid "in context" msgstr "em contexto" -#: lib/noticelist.php:549 -#, fuzzy +#: lib/noticelist.php:548 msgid "Repeated by" -msgstr "Repetida por %s" +msgstr "Repetida por" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 msgid "Reply to this notice" msgstr "Responder a esta nota" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 msgid "Reply" msgstr "Responder" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "Avatar actualizado." + #: lib/nudgeform.php:116 msgid "Nudge this user" msgstr "Acotovelar este utilizador" @@ -5397,14 +5396,12 @@ msgid "All groups" msgstr "Todos os grupos" #: lib/profileformaction.php:123 -#, fuzzy msgid "No return-to arguments." -msgstr "Sem argumentos return-to" +msgstr "Sem argumentos return-to." #: lib/profileformaction.php:137 -#, fuzzy msgid "Unimplemented method." -msgstr "método não implementado" +msgstr "Método não implementado." #: lib/publicgroupnav.php:78 msgid "Public" @@ -5603,47 +5600,47 @@ msgstr "Mensagem" msgid "Moderate" msgstr "Moderar" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "há alguns segundos" -#: lib/util.php:827 +#: lib/util.php:831 msgid "about a minute ago" msgstr "há cerca de um minuto" -#: lib/util.php:829 +#: lib/util.php:833 #, php-format msgid "about %d minutes ago" msgstr "há cerca de %d minutos" -#: lib/util.php:831 +#: lib/util.php:835 msgid "about an hour ago" msgstr "há cerca de uma hora" -#: lib/util.php:833 +#: lib/util.php:837 #, php-format msgid "about %d hours ago" msgstr "há cerca de %d horas" -#: lib/util.php:835 +#: lib/util.php:839 msgid "about a day ago" msgstr "há cerca de um dia" -#: lib/util.php:837 +#: lib/util.php:841 #, php-format msgid "about %d days ago" msgstr "há cerca de %d dias" -#: lib/util.php:839 +#: lib/util.php:843 msgid "about a month ago" msgstr "há cerca de um mês" -#: lib/util.php:841 +#: lib/util.php:845 #, php-format msgid "about %d months ago" msgstr "há cerca de %d meses" -#: lib/util.php:843 +#: lib/util.php:847 msgid "about a year ago" msgstr "há cerca de um ano" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index 2232a08abd..3225b56bbd 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:35:31+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:52:57+0000\n" "Language-Team: Brazilian Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt-br\n" "X-Message-Group: out-statusnet\n" @@ -37,17 +37,18 @@ msgstr "Essa página não existe." #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Usuário não encontrado." @@ -57,7 +58,8 @@ msgid "%s and friends, page %d" msgstr "%s e amigos, página %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s e amigos" @@ -109,6 +111,7 @@ msgid "You and friends" msgstr "Você e amigos" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Atualizações de %1$s e amigos no %2$s!" @@ -231,8 +234,8 @@ msgstr "Todas as mensagens diretas enviadas para %s" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -596,7 +599,7 @@ msgid "Preview" msgstr "Visualização" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 msgid "Delete" msgstr "Excluir" @@ -824,7 +827,7 @@ msgstr "Você tem certeza que deseja excluir esta mensagem?" msgid "Do not delete this notice" msgstr "Não é possível excluir esta mensagem." -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 msgid "Delete this notice" msgstr "Excluir esta mensagem" @@ -1998,7 +2001,7 @@ msgid "You can't send a message to this user." msgstr "Você não pode enviar uma mensagem para esse usuário." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "Nenhum conteúdo!" @@ -2018,7 +2021,7 @@ msgstr "" msgid "Message sent" msgstr "Nova mensagem" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "A mensagem direta para %s foi enviada" @@ -2109,8 +2112,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "Formato de dados não suportado." @@ -2937,12 +2940,12 @@ msgstr "Você não pode se registrar se não aceitar a licença." msgid "You already repeated that notice." msgstr "Você já bloqueou esse usuário." -#: actions/repeat.php:112 lib/noticelist.php:627 +#: actions/repeat.php:114 lib/noticelist.php:621 #, fuzzy msgid "Repeated" msgstr "Criar" -#: actions/repeat.php:115 +#: actions/repeat.php:119 #, fuzzy msgid "Repeated!" msgstr "Criar" @@ -4099,23 +4102,23 @@ msgstr "Não foi possível atualizar a mensagem com a nova URI." msgid "DB error inserting hashtag: %s" msgstr "Erro no banco de dados durante a inserção de hashtag: %s" -#: classes/Notice.php:196 +#: classes/Notice.php:226 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Problema ao salvar a mensagem." -#: classes/Notice.php:200 +#: classes/Notice.php:230 msgid "Problem saving notice. Unknown user." msgstr "Problema no salvamento da mensagem. Usuário desconhecido." -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Muitas mensagens em um período curto de tempo; dê uma respirada e publique " "novamente daqui a alguns minutos." -#: classes/Notice.php:211 +#: classes/Notice.php:241 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4124,25 +4127,25 @@ msgstr "" "Muitas mensagens em um período curto de tempo; dê uma respirada e publique " "novamente daqui a alguns minutos." -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "Você foi banido de publicar mensagens nesse site." -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "Problema ao salvar a mensagem." -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "Erro no banco de dados na inserção da reposta: %s" -#: classes/Notice.php:1320 +#: classes/Notice.php:1371 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:347 +#: classes/User.php:368 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Mensagem para %1$s no %2$s" @@ -4472,12 +4475,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "O usuário não tem uma \"última mensagem\"" @@ -4510,138 +4513,138 @@ msgstr "Site: %s" msgid "About: %s" msgstr "Sobre: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" "A mensagem é muito extensa - o máximo são 140 caracteres e você enviou %d" -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "Ocorreu um erro durante o envio da mensagem direta." -#: lib/command.php:421 +#: lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Não é possível ligar a notificação." -#: lib/command.php:426 +#: lib/command.php:427 #, fuzzy msgid "Already repeated that notice" msgstr "Excluir esta mensagem" -#: lib/command.php:434 +#: lib/command.php:435 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Mensagem publicada" -#: lib/command.php:436 +#: lib/command.php:437 #, fuzzy msgid "Error repeating notice." msgstr "Problema ao salvar a mensagem." -#: lib/command.php:490 +#: lib/command.php:491 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" "A mensagem é muito extensa - o máximo são 140 caracteres e você enviou %d" -#: lib/command.php:499 +#: lib/command.php:500 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Responder a esta mensagem" -#: lib/command.php:501 +#: lib/command.php:502 #, fuzzy msgid "Error saving notice." msgstr "Problema ao salvar a mensagem." -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "Especifique o nome do usuário que será assinado" -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "Efetuada a assinatura de %s" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "Especifique o nome do usuário que deixará de ser assinado" -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "Cancelada a assinatura de %s" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "O comando não foi implementado ainda." -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "Notificação desligada." -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "Não é possível desligar a notificação" -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "Notificação ligada." -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "Não é possível ligar a notificação." -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "" -#: lib/command.php:663 +#: lib/command.php:664 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Não foi possível criar a favorita." -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:684 +#: lib/command.php:685 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Você não está assinando esse perfil." -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Você já está assinando esses usuários:" msgstr[1] "Você já está assinando esses usuários:" -#: lib/command.php:706 +#: lib/command.php:707 #, fuzzy msgid "No one is subscribed to you." msgstr "Não foi possível fazer com que o outros o sigam." -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Não foi possível fazer com que o outros o sigam." msgstr[1] "Não foi possível fazer com que o outros o sigam." -#: lib/command.php:728 +#: lib/command.php:729 #, fuzzy msgid "You are not a member of any groups." msgstr "Você não está assinando esse perfil." -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Você não é membro deste grupo." msgstr[1] "Você não é membro deste grupo." -#: lib/command.php:744 +#: lib/command.php:745 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5126,7 +5129,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 #, fuzzy msgid "from" msgstr " de " @@ -5213,50 +5216,55 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 #, fuzzy msgid "N" msgstr "Não" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 #, fuzzy msgid "in context" msgstr "Nenhum conteúdo!" -#: lib/noticelist.php:549 +#: lib/noticelist.php:548 #, fuzzy msgid "Repeated by" msgstr "Criar" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 msgid "Reply to this notice" msgstr "Responder a esta mensagem" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 msgid "Reply" msgstr "Responder" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "Mensagem publicada" + #: lib/nudgeform.php:116 msgid "Nudge this user" msgstr "Chamar a atenção deste usuário" @@ -5581,47 +5589,47 @@ msgstr "Nova mensagem" msgid "Moderate" msgstr "" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "segundos atrás" -#: lib/util.php:827 +#: lib/util.php:831 msgid "about a minute ago" msgstr "1 min atrás" -#: lib/util.php:829 +#: lib/util.php:833 #, php-format msgid "about %d minutes ago" msgstr "%d mins atrás" -#: lib/util.php:831 +#: lib/util.php:835 msgid "about an hour ago" msgstr "1 hora atrás" -#: lib/util.php:833 +#: lib/util.php:837 #, php-format msgid "about %d hours ago" msgstr "%d horas atrás" -#: lib/util.php:835 +#: lib/util.php:839 msgid "about a day ago" msgstr "1 dia atrás" -#: lib/util.php:837 +#: lib/util.php:841 #, php-format msgid "about %d days ago" msgstr "%d dias atrás" -#: lib/util.php:839 +#: lib/util.php:843 msgid "about a month ago" msgstr "1 mês atrás" -#: lib/util.php:841 +#: lib/util.php:845 #, php-format msgid "about %d months ago" msgstr "%d meses atrás" -#: lib/util.php:843 +#: lib/util.php:847 msgid "about a year ago" msgstr "1 ano atrás" diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index 38b2a9e613..6f92e3832b 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:35:34+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:53:00+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ru\n" "X-Message-Group: out-statusnet\n" @@ -38,17 +38,18 @@ msgstr "Нет такой страницы" #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Нет такого пользователя." @@ -58,7 +59,8 @@ msgid "%s and friends, page %d" msgstr "%s и друзья, страница %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s и друзья" @@ -117,6 +119,7 @@ msgid "You and friends" msgstr "Вы и друзья" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Обновлено от %1$s и его друзей на %2$s!" @@ -235,8 +238,8 @@ msgstr "Все прямые сообщения посланные для %s" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -600,7 +603,7 @@ msgid "Preview" msgstr "Просмотр" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 msgid "Delete" msgstr "Удалить" @@ -825,7 +828,7 @@ msgstr "Вы уверены, что хотите удалить эту запи msgid "Do not delete this notice" msgstr "Не удалять эту запись" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 msgid "Delete this notice" msgstr "Удалить эту запись" @@ -1974,7 +1977,7 @@ msgid "You can't send a message to this user." msgstr "Вы не можете послать сообщение этому пользователю." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "Нет контента!" @@ -1991,7 +1994,7 @@ msgstr "Не посылайте сообщения сами себе; прост msgid "Message sent" msgstr "Сообщение отправлено" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "Прямое сообщение для %s послано" @@ -2086,8 +2089,8 @@ msgstr "тип содержимого " msgid "Only " msgstr "Только " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "Неподдерживаемый формат данных." @@ -2906,12 +2909,12 @@ msgstr "" msgid "You already repeated that notice." msgstr "Вы уже заблокировали этого пользователя." -#: actions/repeat.php:112 lib/noticelist.php:627 +#: actions/repeat.php:114 lib/noticelist.php:621 #, fuzzy msgid "Repeated" msgstr "Создано" -#: actions/repeat.php:115 +#: actions/repeat.php:119 #, fuzzy msgid "Repeated!" msgstr "Создано" @@ -4077,22 +4080,22 @@ msgstr "Не удаётся обновить сообщение с новым UR msgid "DB error inserting hashtag: %s" msgstr "Ошибка баз данных при вставке хеш-тегов для %s" -#: classes/Notice.php:196 +#: classes/Notice.php:226 msgid "Problem saving notice. Too long." msgstr "Проблемы с сохранением записи. Слишком длинно." -#: classes/Notice.php:200 +#: classes/Notice.php:230 msgid "Problem saving notice. Unknown user." msgstr "Проблема при сохранении записи. Неизвестный пользователь." -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Слишком много записей за столь короткий срок; передохните немного и " "попробуйте вновь через пару минут." -#: classes/Notice.php:211 +#: classes/Notice.php:241 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4100,25 +4103,25 @@ msgstr "" "Слишком много одинаковых записей за столь короткий срок; передохните немного " "и попробуйте вновь через пару минут." -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "Вам запрещено поститься на этом сайте (бан)" -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "Проблемы с сохранением записи." -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "Ошибка баз данных при вставке ответа для %s" -#: classes/Notice.php:1320 +#: classes/Notice.php:1371 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:347 +#: classes/User.php:368 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Добро пожаловать на %1$s, @%2$s!" @@ -4432,12 +4435,12 @@ msgstr "" "Подписчиков: %2$s\n" "Записей: %3$s" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "Записи с таким id не существует" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "У пользователя нет записей" @@ -4470,135 +4473,135 @@ msgstr "Домашняя страница: %s" msgid "About: %s" msgstr "О пользователе: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Сообщение слишком длинное — не больше %d символов, вы посылаете %d" -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "Ошибка при отправке прямого сообщения." -#: lib/command.php:421 +#: lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Есть оповещение." -#: lib/command.php:426 +#: lib/command.php:427 #, fuzzy msgid "Already repeated that notice" msgstr "Удалить эту запись" -#: lib/command.php:434 +#: lib/command.php:435 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Запись опубликована" -#: lib/command.php:436 +#: lib/command.php:437 #, fuzzy msgid "Error repeating notice." msgstr "Проблемы с сохранением записи." -#: lib/command.php:490 +#: lib/command.php:491 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Запись слишком длинная — не больше %d символов, вы посылаете %d" -#: lib/command.php:499 +#: lib/command.php:500 #, php-format msgid "Reply to %s sent" msgstr "Ответ %s отправлен" -#: lib/command.php:501 +#: lib/command.php:502 msgid "Error saving notice." msgstr "Проблемы с сохранением записи." -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "Определите имя пользователя при подписке на" -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "Подписано на %s" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "Определите имя пользователя для отписки от" -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "Отписано от %s" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "Команда ещё не выполнена." -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "Оповещение отсутствует." -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "Нет оповещения." -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "Есть оповещение." -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "Есть оповещение." -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "Команда входа отключена" -#: lib/command.php:663 +#: lib/command.php:664 #, php-format msgid "Could not create login token for %s" msgstr "Не удаётся создать токен входа для %s" -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "Эта ссылка действительна только один раз в течение 2 минут: %s" -#: lib/command.php:684 +#: lib/command.php:685 msgid "You are not subscribed to anyone." msgstr "Вы ни на кого не подписаны." -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Вы подписаны на этих людей:" msgstr[1] "Вы подписаны на этих людей:" msgstr[2] "Вы подписаны на этих людей:" -#: lib/command.php:706 +#: lib/command.php:707 msgid "No one is subscribed to you." msgstr "Никто не подписан на вас." -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Эти люди подписались на вас:" msgstr[1] "Эти люди подписались на вас:" msgstr[2] "Эти люди подписались на вас:" -#: lib/command.php:728 +#: lib/command.php:729 msgid "You are not a member of any groups." msgstr "Вы не состоите ни в одной группе." -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Вы являетесь участником следующих групп:" msgstr[1] "Вы являетесь участником следующих групп:" msgstr[2] "Вы являетесь участником следующих групп:" -#: lib/command.php:744 +#: lib/command.php:745 #, fuzzy msgid "" "Commands:\n" @@ -5188,7 +5191,7 @@ msgstr "" "вовлечения других пользователей в разговор. Сообщения, получаемые от других " "людей, видите только вы." -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 msgid "from" msgstr "от " @@ -5276,48 +5279,53 @@ msgstr "Прикрепить" msgid "Attach a file" msgstr "Прикрепить файл" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "%1$u°%2$u'%3$u\" %4$s %5$u°%6$u'%7$u\" %8$s" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "N" msgstr "с. ш." -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "ю. ш." -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "в. д." -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "з. д." -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "на" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 msgid "in context" msgstr "в контексте" -#: lib/noticelist.php:549 +#: lib/noticelist.php:548 #, fuzzy msgid "Repeated by" msgstr "Создано" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 msgid "Reply to this notice" msgstr "Ответить на эту запись" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 msgid "Reply" msgstr "Ответить" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "Запись удалена." + #: lib/nudgeform.php:116 msgid "Nudge this user" msgstr "«Подтолкнуть» этого пользователя" @@ -5624,47 +5632,47 @@ msgstr "Сообщение" msgid "Moderate" msgstr "Модерировать" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "пару секунд назад" -#: lib/util.php:827 +#: lib/util.php:831 msgid "about a minute ago" msgstr "около минуты назад" -#: lib/util.php:829 +#: lib/util.php:833 #, php-format msgid "about %d minutes ago" msgstr "около %d минут(ы) назад" -#: lib/util.php:831 +#: lib/util.php:835 msgid "about an hour ago" msgstr "около часа назад" -#: lib/util.php:833 +#: lib/util.php:837 #, php-format msgid "about %d hours ago" msgstr "около %d часа(ов) назад" -#: lib/util.php:835 +#: lib/util.php:839 msgid "about a day ago" msgstr "около дня назад" -#: lib/util.php:837 +#: lib/util.php:841 #, php-format msgid "about %d days ago" msgstr "около %d дня(ей) назад" -#: lib/util.php:839 +#: lib/util.php:843 msgid "about a month ago" msgstr "около месяца назад" -#: lib/util.php:841 +#: lib/util.php:845 #, php-format msgid "about %d months ago" msgstr "около %d месяца(ев) назад" -#: lib/util.php:843 +#: lib/util.php:847 msgid "about a year ago" msgstr "около года назад" diff --git a/locale/statusnet.po b/locale/statusnet.po index 3e4e5b62f9..3f52a091db 100644 --- a/locale/statusnet.po +++ b/locale/statusnet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-14 20:34+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -33,17 +33,18 @@ msgstr "" #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "" @@ -53,7 +54,8 @@ msgid "%s and friends, page %d" msgstr "" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "" @@ -105,6 +107,7 @@ msgid "You and friends" msgstr "" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" @@ -221,8 +224,8 @@ msgstr "" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -576,7 +579,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 msgid "Delete" msgstr "" @@ -796,7 +799,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 msgid "Delete this notice" msgstr "" @@ -1849,7 +1852,7 @@ msgid "You can't send a message to this user." msgstr "" #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "" @@ -1866,7 +1869,7 @@ msgstr "" msgid "Message sent" msgstr "" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "" @@ -1953,8 +1956,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "" @@ -2715,11 +2718,11 @@ msgstr "" msgid "You already repeated that notice." msgstr "" -#: actions/repeat.php:112 lib/noticelist.php:627 +#: actions/repeat.php:114 lib/noticelist.php:621 msgid "Repeated" msgstr "" -#: actions/repeat.php:115 +#: actions/repeat.php:119 msgid "Repeated!" msgstr "" @@ -3802,44 +3805,44 @@ msgstr "" msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:196 +#: classes/Notice.php:226 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:200 +#: classes/Notice.php:230 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:211 +#: classes/Notice.php:241 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1320 +#: classes/Notice.php:1371 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:347 +#: classes/User.php:368 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4144,12 +4147,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "" @@ -4182,129 +4185,129 @@ msgstr "" msgid "About: %s" msgstr "" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "" -#: lib/command.php:421 +#: lib/command.php:422 msgid "Cannot repeat your own notice" msgstr "" -#: lib/command.php:426 +#: lib/command.php:427 msgid "Already repeated that notice" msgstr "" -#: lib/command.php:434 +#: lib/command.php:435 #, php-format msgid "Notice from %s repeated" msgstr "" -#: lib/command.php:436 +#: lib/command.php:437 msgid "Error repeating notice." msgstr "" -#: lib/command.php:490 +#: lib/command.php:491 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:499 +#: lib/command.php:500 #, php-format msgid "Reply to %s sent" msgstr "" -#: lib/command.php:501 +#: lib/command.php:502 msgid "Error saving notice." msgstr "" -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "" -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "" -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "" -#: lib/command.php:663 +#: lib/command.php:664 #, php-format msgid "Could not create login token for %s" msgstr "" -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:684 +#: lib/command.php:685 msgid "You are not subscribed to anyone." msgstr "" -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:706 +#: lib/command.php:707 msgid "No one is subscribed to you." msgstr "" -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:728 +#: lib/command.php:729 msgid "You are not a member of any groups." msgstr "" -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:744 +#: lib/command.php:745 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4766,7 +4769,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 msgid "from" msgstr "" @@ -4851,47 +4854,51 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "N" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 msgid "in context" msgstr "" -#: lib/noticelist.php:549 +#: lib/noticelist.php:548 msgid "Repeated by" msgstr "" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 msgid "Reply" msgstr "" +#: lib/noticelist.php:620 +msgid "Notice repeated" +msgstr "" + #: lib/nudgeform.php:116 msgid "Nudge this user" msgstr "" @@ -5194,47 +5201,47 @@ msgstr "" msgid "Moderate" msgstr "" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "" -#: lib/util.php:827 -msgid "about a minute ago" -msgstr "" - -#: lib/util.php:829 -#, php-format -msgid "about %d minutes ago" -msgstr "" - #: lib/util.php:831 -msgid "about an hour ago" +msgid "about a minute ago" msgstr "" #: lib/util.php:833 #, php-format -msgid "about %d hours ago" +msgid "about %d minutes ago" msgstr "" #: lib/util.php:835 -msgid "about a day ago" +msgid "about an hour ago" msgstr "" #: lib/util.php:837 #, php-format -msgid "about %d days ago" +msgid "about %d hours ago" msgstr "" #: lib/util.php:839 -msgid "about a month ago" +msgid "about a day ago" msgstr "" #: lib/util.php:841 #, php-format -msgid "about %d months ago" +msgid "about %d days ago" msgstr "" #: lib/util.php:843 +msgid "about a month ago" +msgstr "" + +#: lib/util.php:845 +#, php-format +msgid "about %d months ago" +msgstr "" + +#: lib/util.php:847 msgid "about a year ago" msgstr "" diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index aa33772d8c..27f6bd6596 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: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:35:37+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:53:03+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: sv\n" "X-Message-Group: out-statusnet\n" @@ -36,17 +36,18 @@ msgstr "Ingen sådan sida" #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Ingen sådan användare." @@ -56,7 +57,8 @@ msgid "%s and friends, page %d" msgstr "%s och vänner, sida %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s och vänner" @@ -115,6 +117,7 @@ msgid "You and friends" msgstr "Du och vänner" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Uppdateringar från %1$s och vänner på %2$s!" @@ -233,8 +236,8 @@ msgstr "Alla direktmeddelanden skickade till %s" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -592,7 +595,7 @@ msgid "Preview" msgstr "Förhandsgranska" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 msgid "Delete" msgstr "Ta bort" @@ -818,7 +821,7 @@ msgstr "Är du säker på att du vill ta bort denna notis?" msgid "Do not delete this notice" msgstr "Ta inte bort denna notis" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 msgid "Delete this notice" msgstr "Ta bort denna notis" @@ -1928,7 +1931,7 @@ msgid "You can't send a message to this user." msgstr "Du kan inte skicka ett meddelande till den användaren." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "Inget innehåll!" @@ -1947,7 +1950,7 @@ msgstr "" msgid "Message sent" msgstr "Meddelande skickat" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "Direktmeddelande till %s skickat" @@ -2042,8 +2045,8 @@ msgstr "innehållstyp " msgid "Only " msgstr "Bara " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "Ett dataformat som inte stödjs" @@ -2849,12 +2852,12 @@ msgstr "Du kan inte registrera dig om du inte godkänner licensen." msgid "You already repeated that notice." msgstr "Du har redan blockerat denna användare." -#: actions/repeat.php:112 lib/noticelist.php:627 +#: actions/repeat.php:114 lib/noticelist.php:621 #, fuzzy msgid "Repeated" msgstr "Skapad" -#: actions/repeat.php:115 +#: actions/repeat.php:119 #, fuzzy msgid "Repeated!" msgstr "Skapad" @@ -4005,22 +4008,22 @@ msgstr "Kunde inte uppdatera meddelande med ny URI." msgid "DB error inserting hashtag: %s" msgstr "Databasfel vid infogning av hashtag: %s" -#: classes/Notice.php:196 +#: classes/Notice.php:226 msgid "Problem saving notice. Too long." msgstr "Problem vid sparande av notis. För långt." -#: classes/Notice.php:200 +#: classes/Notice.php:230 msgid "Problem saving notice. Unknown user." msgstr "Problem vid sparande av notis. Okänd användare." -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "För många notiser för snabbt; ta en vilopaus och posta igen om ett par " "minuter." -#: classes/Notice.php:211 +#: classes/Notice.php:241 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4028,25 +4031,25 @@ msgstr "" "För många duplicerade meddelanden för snabbt; ta en vilopaus och posta igen " "om ett par minuter." -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "Du är utestängd från att posta notiser på denna webbplats." -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "Problem med att spara notis." -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "Databasfel vid infogning av svar: %s" -#: classes/Notice.php:1320 +#: classes/Notice.php:1371 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:347 +#: classes/User.php:368 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Välkommen till %1$s, @%2$s!" @@ -4359,12 +4362,12 @@ msgstr "" "Prenumeranter: %2$s\n" "Notiser: %3$s" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "Notis med den ID:n finns inte" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "Användare har ingen sista notis" @@ -4397,133 +4400,133 @@ msgstr "Hemsida: %s" msgid "About: %s" msgstr "Om: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Meddelande för långt - maximum är %d tecken, du skickade %d" -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "Fel vid sändning av direktmeddelande." -#: lib/command.php:421 +#: lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Kan inte stänga av notifikation." -#: lib/command.php:426 +#: lib/command.php:427 #, fuzzy msgid "Already repeated that notice" msgstr "Ta bort denna notis" -#: lib/command.php:434 +#: lib/command.php:435 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Notis postad" -#: lib/command.php:436 +#: lib/command.php:437 #, fuzzy msgid "Error repeating notice." msgstr "Fel vid sparande av notis." -#: lib/command.php:490 +#: lib/command.php:491 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Notis för långt - maximum är %d tecken, du skickade %d" -#: lib/command.php:499 +#: lib/command.php:500 #, php-format msgid "Reply to %s sent" msgstr "Svar på %s skickat" -#: lib/command.php:501 +#: lib/command.php:502 msgid "Error saving notice." msgstr "Fel vid sparande av notis." -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "Ange namnet på användaren att prenumerara på" -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "Prenumerar på %s" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "Ange namnet på användaren att avsluta prenumeration på" -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "Prenumeration hos %s avslutad" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "Kommando inte implementerat än." -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "Notifikation av." -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "Kan inte sätta på notifikation." -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "Notifikation på." -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "Kan inte stänga av notifikation." -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "Inloggningskommando är inaktiverat" -#: lib/command.php:663 +#: lib/command.php:664 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Kunde inte skapa alias." -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" "Denna länk är endast användbar en gång, och gäller bara i 2 minuter: %s" -#: lib/command.php:684 +#: lib/command.php:685 msgid "You are not subscribed to anyone." msgstr "Du prenumererar inte på någon." -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Du prenumererar på denna person:" msgstr[1] "Du prenumererar på dessa personer:" -#: lib/command.php:706 +#: lib/command.php:707 msgid "No one is subscribed to you." msgstr "Ingen prenumerar på dig." -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Denna person prenumererar på dig:" msgstr[1] "Dessa personer prenumererar på dig:" -#: lib/command.php:728 +#: lib/command.php:729 msgid "You are not a member of any groups." msgstr "Du är inte medlem i några grupper." -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Du är en medlem i denna grupp:" msgstr[1] "Du är en medlem i dessa grupper:" -#: lib/command.php:744 +#: lib/command.php:745 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5000,7 +5003,7 @@ msgstr "" "engagera andra användare i konversationen. Folk kan skicka meddelanden till " "dig som bara du ser." -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 msgid "from" msgstr "från" @@ -5089,48 +5092,53 @@ msgstr "Bifoga" msgid "Attach a file" msgstr "Bifoga en fil" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "N" msgstr "N" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "S" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "Ö" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "V" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "på" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 msgid "in context" msgstr "i sammanhang" -#: lib/noticelist.php:549 +#: lib/noticelist.php:548 #, fuzzy msgid "Repeated by" msgstr "Skapad" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 msgid "Reply to this notice" msgstr "Svara på detta inlägg" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 msgid "Reply" msgstr "Svara" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "Notis borttagen." + #: lib/nudgeform.php:116 msgid "Nudge this user" msgstr "Knuffa denna användare" @@ -5442,47 +5450,47 @@ msgstr "Meddelande" msgid "Moderate" msgstr "Moderera" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "ett par sekunder sedan" -#: lib/util.php:827 +#: lib/util.php:831 msgid "about a minute ago" msgstr "för nån minut sedan" -#: lib/util.php:829 +#: lib/util.php:833 #, php-format msgid "about %d minutes ago" msgstr "för %d minuter sedan" -#: lib/util.php:831 +#: lib/util.php:835 msgid "about an hour ago" msgstr "för en timma sedan" -#: lib/util.php:833 +#: lib/util.php:837 #, php-format msgid "about %d hours ago" msgstr "för %d timmar sedan" -#: lib/util.php:835 +#: lib/util.php:839 msgid "about a day ago" msgstr "för en dag sedan" -#: lib/util.php:837 +#: lib/util.php:841 #, php-format msgid "about %d days ago" msgstr "för %d dagar sedan" -#: lib/util.php:839 +#: lib/util.php:843 msgid "about a month ago" msgstr "för en månad sedan" -#: lib/util.php:841 +#: lib/util.php:845 #, php-format msgid "about %d months ago" msgstr "för %d månader sedan" -#: lib/util.php:843 +#: lib/util.php:847 msgid "about a year ago" msgstr "för ett år sedan" diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index cc742b7c36..65cb742c0c 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:35:40+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:53:06+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: te\n" "X-Message-Group: out-statusnet\n" @@ -35,17 +35,18 @@ msgstr "అటువంటి పేజీ లేదు" #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "అటువంటి వాడుకరి లేరు." @@ -55,7 +56,8 @@ msgid "%s and friends, page %d" msgstr "%s మరియు మిత్రులు, పేజీ %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s మరియు మిత్రులు" @@ -107,6 +109,7 @@ msgid "You and friends" msgstr "మీరు మరియు మీ స్నేహితులు" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" @@ -227,8 +230,8 @@ msgstr "" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -301,9 +304,8 @@ msgid "Could not determine source user." msgstr "వాడుకరిని తాజాకరించలేకున్నాం." #: actions/apifriendshipsshow.php:143 -#, fuzzy msgid "Could not find target user." -msgstr "వాడుకరిని తాజాకరించలేకున్నాం." +msgstr "లక్ష్యిత వాడుకరిని కనుగొనలేకపోయాం." #: actions/apigroupcreate.php:164 actions/editgroup.php:182 #: actions/newgroup.php:126 actions/profilesettings.php:208 @@ -393,9 +395,9 @@ msgid "You are not a member of this group." msgstr "మీరు ఈ గుంపులో సభ్యులు కాదు." #: actions/apigroupleave.php:124 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %s to group %s." -msgstr "ఓపెన్ఐడీ ఫారమును సృష్టించలేకపోయాం: %s" +msgstr "వాడుకరి %sని %s గుంపు నుండి తొలగించలేకపోయాం." #: actions/apigrouplist.php:95 #, php-format @@ -588,7 +590,7 @@ msgid "Preview" msgstr "మునుజూపు" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 msgid "Delete" msgstr "తొలగించు" @@ -811,7 +813,7 @@ msgstr "మీరు నిజంగానే ఈ నోటీసుని త msgid "Do not delete this notice" msgstr "ఈ నోటీసుని తొలగించకు" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 msgid "Delete this notice" msgstr "ఈ నోటీసుని తొలగించు" @@ -853,9 +855,8 @@ msgid "Design settings for this StatusNet site." msgstr "" #: actions/designadminpanel.php:275 -#, fuzzy msgid "Invalid logo URL." -msgstr "తప్పుడు పరిమాణం." +msgstr "చిహ్నపు URL చెల్లదు." #: actions/designadminpanel.php:279 #, php-format @@ -1251,19 +1252,16 @@ msgid "No notice ID." msgstr "సందేశం లేదు" #: actions/file.php:38 -#, fuzzy msgid "No notice." -msgstr "సందేశం లేదు" +msgstr "సందేశం లేదు." #: actions/file.php:42 -#, fuzzy msgid "No attachments." -msgstr "జోడింపులు లేవు" +msgstr "జోడింపులు లేవు." #: actions/file.php:51 -#, fuzzy msgid "No uploaded attachments." -msgstr "ఎక్కించిన జోడింపులేమీ లేవు" +msgstr "ఎక్కించిన జోడింపులేమీ లేవు." #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1617,20 +1615,20 @@ msgstr "ఇది మీ Jabber ID కాదు" #: actions/inbox.php:59 #, php-format msgid "Inbox for %s - page %d" -msgstr "" +msgstr "%sకి వచ్చినవి - పేజీ %d" #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" -msgstr "" +msgstr "%sకి వచ్చినవి" #: actions/inbox.php:115 msgid "This is your inbox, which lists your incoming private messages." -msgstr "" +msgstr "ఇవి మీకు వచ్చిన అంతరంగిక సందేశాలు." #: actions/invite.php:39 msgid "Invites have been disabled." -msgstr "" +msgstr "ఆహ్వానాలని అచేతనం చేసారు." #: actions/invite.php:41 #, php-format @@ -1662,7 +1660,7 @@ msgstr "%s (%s)" #: actions/invite.php:136 msgid "" "These people are already users and you were automatically subscribed to them:" -msgstr "" +msgstr "ఈ వ్యక్తులు ఇప్పటికే ఇక్కడ వాడుకరులు మరియు మిమ్మల్ని వారికి చందాదార్లుగా చేర్చేసాం:" #: actions/invite.php:144 msgid "Invitation(s) sent to the following people:" @@ -1702,7 +1700,7 @@ msgstr "పంపించు" #: actions/invite.php:226 #, php-format msgid "%1$s has invited you to join them on %2$s" -msgstr "" +msgstr "%2$sలో చేరమని %1$s మిమ్మల్ని ఆహ్వానించారు" #: actions/invite.php:228 #, php-format @@ -1880,7 +1878,7 @@ msgid "You can't send a message to this user." msgstr "ఈ వాడుకరికి మీరు సందేశాన్ని పంపించలేరు." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "విషయం లేదు!" @@ -1897,7 +1895,7 @@ msgstr "మీకు మీరే సందేశాన్ని పంపుక msgid "Message sent" msgstr "సందేశాన్ని పంపించాం" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "%sకి నేరు సందేశాన్ని పంపించాం" @@ -1929,9 +1927,9 @@ msgid "Text search" msgstr "పాఠ్య అన్వేషణ" #: actions/noticesearch.php:91 -#, fuzzy, php-format +#, php-format msgid "Search results for \"%s\" on %s" -msgstr "\"%s\"కై అన్వేషణ వాహిని" +msgstr "%2$sలో \"%1$s\"కై అన్వేషణ ఫలితాలు" #: actions/noticesearch.php:121 #, php-format @@ -1987,8 +1985,8 @@ msgstr "విషయ రకం " msgid "Only " msgstr "మాత్రమే " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "" @@ -2208,9 +2206,8 @@ msgid "Background path" msgstr "నేపథ్యం" #: actions/pathsadminpanel.php:281 -#, fuzzy msgid "Background directory" -msgstr "నేపథ్యం" +msgstr "నేపథ్యాల సంచయం" #: actions/pathsadminpanel.php:297 #, fuzzy @@ -2340,9 +2337,9 @@ msgid "" msgstr "" #: actions/profilesettings.php:221 actions/register.php:223 -#, fuzzy, php-format +#, php-format msgid "Bio is too long (max %d chars)." -msgstr "స్వపరిచయం చాలా పెద్దగా ఉంది (140 అక్షరాలు గరిష్ఠం)." +msgstr "స్వపరిచయం చాలా పెద్దగా ఉంది (%d అక్షరాలు గరిష్ఠం)." #: actions/profilesettings.php:228 actions/siteadminpanel.php:165 msgid "Timezone not selected." @@ -2771,12 +2768,12 @@ msgstr "ఈ లైసెన్సుకి అంగీకరించకపో msgid "You already repeated that notice." msgstr "మీరు ఇప్పటికే ఆ వాడుకరిని నిరోధించారు." -#: actions/repeat.php:112 lib/noticelist.php:627 +#: actions/repeat.php:114 lib/noticelist.php:621 #, fuzzy msgid "Repeated" msgstr "సృష్టితం" -#: actions/repeat.php:115 +#: actions/repeat.php:119 #, fuzzy msgid "Repeated!" msgstr "సృష్టితం" @@ -3404,11 +3401,11 @@ msgstr "ఆ నిర్ధారణా సంకేతం మీది కా #: actions/smssettings.php:374 msgid "That is the wrong confirmation number." -msgstr "" +msgstr "అది తప్పుడు నిర్ధారణ సంఖ్య." #: actions/smssettings.php:405 msgid "That is not your phone number." -msgstr "" +msgstr "అది మీ ఫోను నంబర్ కాదు." #: actions/smssettings.php:465 msgid "Mobile carrier" @@ -3695,7 +3692,7 @@ msgstr "ఆహ్వానము(ల)ని పంపించాం" #: actions/useradminpanel.php:258 msgid "Whether to allow users to invite new users." -msgstr "" +msgstr "వాడుకరులను కొత్త వారిని ఆహ్వానించడానికి అనుమతించాలా వద్దా." #: actions/useradminpanel.php:265 msgid "Sessions" @@ -3882,46 +3879,46 @@ msgstr "" msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:196 +#: classes/Notice.php:226 #, fuzzy msgid "Problem saving notice. Too long." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." -#: classes/Notice.php:200 +#: classes/Notice.php:230 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:211 +#: classes/Notice.php:241 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." -msgstr "" +msgstr "ఈ సైటులో నోటీసులు రాయడం నుండి మిమ్మల్ని నిషేధించారు." -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1320 +#: classes/Notice.php:1371 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:347 +#: classes/User.php:368 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "@%2$s, %1$sకి స్వాగతం!" @@ -4021,7 +4018,7 @@ msgstr "నిష్క్రమించు" #: lib/action.php:450 msgid "Logout from the site" -msgstr "" +msgstr "సైటు నుండి నిష్క్రమించు" #: lib/action.php:455 msgid "Create an account" @@ -4244,12 +4241,12 @@ msgstr "" "చందాదార్లు: %2$s\n" "నోటీసులు: %3$s" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "" @@ -4282,132 +4279,132 @@ msgstr "" msgid "About: %s" msgstr "గురించి: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "" -#: lib/command.php:421 +#: lib/command.php:422 msgid "Cannot repeat your own notice" msgstr "" -#: lib/command.php:426 +#: lib/command.php:427 #, fuzzy msgid "Already repeated that notice" msgstr "ఈ నోటీసుని తొలగించు" -#: lib/command.php:434 +#: lib/command.php:435 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "సందేశాలు" -#: lib/command.php:436 +#: lib/command.php:437 #, fuzzy msgid "Error repeating notice." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." -#: lib/command.php:490 +#: lib/command.php:491 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "నోటిసు చాలా పొడవుగా ఉంది - %d అక్షరాలు గరిష్ఠం, మీరు %d పంపించారు" -#: lib/command.php:499 +#: lib/command.php:500 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "%sకి స్పందనలు" -#: lib/command.php:501 +#: lib/command.php:502 #, fuzzy msgid "Error saving notice." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "" -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "" -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "" -#: lib/command.php:663 +#: lib/command.php:664 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "మారుపేర్లని సృష్టించలేకపోయాం." -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "ఈ లంకెని ఒకే సారి ఉపయోగించగలరు, మరియు అది పనిచేసేది 2 నిమిషాలు మాత్రమే: %s" -#: lib/command.php:684 +#: lib/command.php:685 msgid "You are not subscribed to anyone." msgstr "మీరు ఎవరికీ చందాచేరలేదు." -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "%sకి స్పందనలు" msgstr[1] "%sకి స్పందనలు" -#: lib/command.php:706 +#: lib/command.php:707 msgid "No one is subscribed to you." msgstr "మీకు చందాదార్లు ఎవరూ లేరు." -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "%sకి స్పందనలు" msgstr[1] "%sకి స్పందనలు" -#: lib/command.php:728 +#: lib/command.php:729 msgid "You are not a member of any groups." msgstr "మీరు ఏ గుంపులోనూ సభ్యులు కాదు." -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!" msgstr[1] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!" -#: lib/command.php:744 +#: lib/command.php:745 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4518,7 +4515,7 @@ msgstr "" #: lib/feed.php:89 msgid "Atom" -msgstr "" +msgstr "ఆటమ్" #: lib/feed.php:91 msgid "FOAF" @@ -4872,7 +4869,7 @@ msgstr "" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." -msgstr "" +msgstr "ఎవరి తపాలాపెట్టెలను ఆ వాడుకరి మాత్రమే చదవలగరు." #: lib/mailbox.php:139 msgid "" @@ -4880,7 +4877,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 msgid "from" msgstr "నుండి" @@ -4967,48 +4964,53 @@ msgstr "జోడించు" msgid "Attach a file" msgstr "ఒక ఫైలుని జోడించు" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "N" msgstr "ఉ" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "ద" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "తూ" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "ప" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 msgid "in context" msgstr "సందర్భంలో" -#: lib/noticelist.php:549 +#: lib/noticelist.php:548 #, fuzzy msgid "Repeated by" msgstr "సృష్టితం" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 msgid "Reply to this notice" msgstr "ఈ నోటీసుపై స్పందించండి" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 msgid "Reply" msgstr "స్పందించండి" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "నోటీసుని తొలగించాం." + #: lib/nudgeform.php:116 msgid "Nudge this user" msgstr "" @@ -5157,18 +5159,16 @@ msgid "Sandbox this user" msgstr "అటువంటి వాడుకరి లేరు." #: lib/searchaction.php:120 -#, fuzzy msgid "Search site" -msgstr "వెతుకు" +msgstr "సైటుని వెతుకు" #: lib/searchaction.php:126 msgid "Keyword(s)" msgstr "కీపదము(లు)" #: lib/searchaction.php:162 -#, fuzzy msgid "Search help" -msgstr "వెతుకు" +msgstr "సహాయంలో వెతుకు" #: lib/searchgroupnav.php:80 msgid "People" @@ -5221,7 +5221,7 @@ msgstr "%s సభ్యులుగా ఉన్న గుంపులు" #: lib/subs.php:52 msgid "Already subscribed!" -msgstr "" +msgstr "ఇప్పటికే చందాచేరారు!" #: lib/subs.php:56 msgid "User has blocked you." @@ -5229,7 +5229,7 @@ msgstr "వాడుకరి మిమ్మల్ని నిరోధిం #: lib/subs.php:60 msgid "Could not subscribe." -msgstr "" +msgstr "చందా చేర్చలేకపోయాం." #: lib/subs.php:79 msgid "Could not subscribe other to you." @@ -5326,47 +5326,47 @@ msgstr "సందేశం" msgid "Moderate" msgstr "" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "కొన్ని క్షణాల క్రితం" -#: lib/util.php:827 +#: lib/util.php:831 msgid "about a minute ago" msgstr "ఓ నిమిషం క్రితం" -#: lib/util.php:829 +#: lib/util.php:833 #, php-format msgid "about %d minutes ago" msgstr "%d నిమిషాల క్రితం" -#: lib/util.php:831 +#: lib/util.php:835 msgid "about an hour ago" msgstr "ఒక గంట క్రితం" -#: lib/util.php:833 +#: lib/util.php:837 #, php-format msgid "about %d hours ago" msgstr "%d గంటల క్రితం" -#: lib/util.php:835 +#: lib/util.php:839 msgid "about a day ago" msgstr "ఓ రోజు క్రితం" -#: lib/util.php:837 +#: lib/util.php:841 #, php-format msgid "about %d days ago" msgstr "%d రోజుల క్రితం" -#: lib/util.php:839 +#: lib/util.php:843 msgid "about a month ago" msgstr "ఓ నెల క్రితం" -#: lib/util.php:841 +#: lib/util.php:845 #, php-format msgid "about %d months ago" msgstr "%d నెలల క్రితం" -#: lib/util.php:843 +#: lib/util.php:847 msgid "about a year ago" msgstr "ఒక సంవత్సరం క్రితం" diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index 2bea51fb46..8d70f2b9d1 100644 --- a/locale/tr/LC_MESSAGES/statusnet.po +++ b/locale/tr/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:35:44+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:53:10+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: tr\n" "X-Message-Group: out-statusnet\n" @@ -36,17 +36,18 @@ msgstr "Böyle bir durum mesajı yok." #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Böyle bir kullanıcı yok." @@ -56,7 +57,8 @@ msgid "%s and friends, page %d" msgstr "%s ve arkadaşları" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s ve arkadaşları" @@ -109,6 +111,7 @@ msgid "You and friends" msgstr "%s ve arkadaşları" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" @@ -230,8 +233,8 @@ msgstr "" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -602,7 +605,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 msgid "Delete" msgstr "" @@ -833,7 +836,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "Böyle bir durum mesajı yok." -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 msgid "Delete this notice" msgstr "" @@ -1949,7 +1952,7 @@ msgid "You can't send a message to this user." msgstr "" #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "İçerik yok!" @@ -1966,7 +1969,7 @@ msgstr "" msgid "Message sent" msgstr "" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "" @@ -2057,8 +2060,8 @@ msgstr "Bağlan" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "" @@ -2857,12 +2860,12 @@ msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız." msgid "You already repeated that notice." msgstr "Zaten giriş yapmış durumdasıznız!" -#: actions/repeat.php:112 lib/noticelist.php:627 +#: actions/repeat.php:114 lib/noticelist.php:621 #, fuzzy msgid "Repeated" msgstr "Yarat" -#: actions/repeat.php:115 +#: actions/repeat.php:119 #, fuzzy msgid "Repeated!" msgstr "Yarat" @@ -3992,46 +3995,46 @@ msgstr "" msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:196 +#: classes/Notice.php:226 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Durum mesajını kaydederken hata oluştu." -#: classes/Notice.php:200 +#: classes/Notice.php:230 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Durum mesajını kaydederken hata oluştu." -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:211 +#: classes/Notice.php:241 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "Durum mesajını kaydederken hata oluştu." -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "Cevap eklenirken veritabanı hatası: %s" -#: classes/Notice.php:1320 +#: classes/Notice.php:1371 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:347 +#: classes/User.php:368 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4360,12 +4363,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "" @@ -4398,131 +4401,131 @@ msgstr "" msgid "About: %s" msgstr "" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "" -#: lib/command.php:421 +#: lib/command.php:422 msgid "Cannot repeat your own notice" msgstr "" -#: lib/command.php:426 +#: lib/command.php:427 msgid "Already repeated that notice" msgstr "" -#: lib/command.php:434 +#: lib/command.php:435 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Durum mesajları" -#: lib/command.php:436 +#: lib/command.php:437 #, fuzzy msgid "Error repeating notice." msgstr "Durum mesajını kaydederken hata oluştu." -#: lib/command.php:490 +#: lib/command.php:491 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:499 +#: lib/command.php:500 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "%s için cevaplar" -#: lib/command.php:501 +#: lib/command.php:502 #, fuzzy msgid "Error saving notice." msgstr "Durum mesajını kaydederken hata oluştu." -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "" -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "" -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "" -#: lib/command.php:663 +#: lib/command.php:664 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Avatar bilgisi kaydedilemedi" -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:684 +#: lib/command.php:685 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Bize o profili yollamadınız" -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Bize o profili yollamadınız" -#: lib/command.php:706 +#: lib/command.php:707 #, fuzzy msgid "No one is subscribed to you." msgstr "Uzaktan abonelik" -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Uzaktan abonelik" -#: lib/command.php:728 +#: lib/command.php:729 #, fuzzy msgid "You are not a member of any groups." msgstr "Bize o profili yollamadınız" -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Bize o profili yollamadınız" -#: lib/command.php:744 +#: lib/command.php:745 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5008,7 +5011,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 msgid "from" msgstr "" @@ -5096,50 +5099,55 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "N" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 #, fuzzy msgid "in context" msgstr "İçerik yok!" -#: lib/noticelist.php:549 +#: lib/noticelist.php:548 #, fuzzy msgid "Repeated by" msgstr "Yarat" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 #, fuzzy msgid "Reply" msgstr "cevapla" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "Durum mesajları" + #: lib/nudgeform.php:116 msgid "Nudge this user" msgstr "" @@ -5460,47 +5468,47 @@ msgstr "" msgid "Moderate" msgstr "" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "birkaç saniye önce" -#: lib/util.php:827 +#: lib/util.php:831 msgid "about a minute ago" msgstr "yaklaşık bir dakika önce" -#: lib/util.php:829 +#: lib/util.php:833 #, php-format msgid "about %d minutes ago" msgstr "yaklaşık %d dakika önce" -#: lib/util.php:831 +#: lib/util.php:835 msgid "about an hour ago" msgstr "yaklaşık bir saat önce" -#: lib/util.php:833 +#: lib/util.php:837 #, php-format msgid "about %d hours ago" msgstr "yaklaşık %d saat önce" -#: lib/util.php:835 +#: lib/util.php:839 msgid "about a day ago" msgstr "yaklaşık bir gün önce" -#: lib/util.php:837 +#: lib/util.php:841 #, php-format msgid "about %d days ago" msgstr "yaklaşık %d gün önce" -#: lib/util.php:839 +#: lib/util.php:843 msgid "about a month ago" msgstr "yaklaşık bir ay önce" -#: lib/util.php:841 +#: lib/util.php:845 #, php-format msgid "about %d months ago" msgstr "yaklaşık %d ay önce" -#: lib/util.php:843 +#: lib/util.php:847 msgid "about a year ago" msgstr "yaklaşık bir yıl önce" diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index 4e75b1967b..b437482e44 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:35:47+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:53:13+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: out-statusnet\n" @@ -37,17 +37,18 @@ msgstr "Немає такої сторінки" #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Такого користувача немає." @@ -57,7 +58,8 @@ msgid "%s and friends, page %d" msgstr "%s з друзями, сторінка %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s з друзями" @@ -115,6 +117,7 @@ msgid "You and friends" msgstr "Ви з друзями" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Оновлення від %1$s та друзів на %2$s!" @@ -234,8 +237,8 @@ msgstr "Всі прямі повідомлення надіслані до %s" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -438,14 +441,12 @@ msgid "No such notice." msgstr "Такого допису немає." #: actions/apistatusesretweet.php:83 -#, fuzzy msgid "Cannot repeat your own notice." -msgstr "Не можна увімкнути сповіщення." +msgstr "Не можу вторувати Вашому власному допису." #: actions/apistatusesretweet.php:91 -#, fuzzy msgid "Already repeated that notice." -msgstr "Видалити допис" +msgstr "Цьому допису вже вторували." #: actions/apistatusesshow.php:138 msgid "Status deleted." @@ -521,17 +522,17 @@ msgstr "%s оновлення від усіх!" #: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" -msgstr "" +msgstr "Вторування %s" #: actions/apitimelineretweetedtome.php:111 -#, fuzzy, php-format +#, php-format msgid "Repeated to %s" -msgstr "Відповіді до %s" +msgstr "Вторування за %s" #: actions/apitimelineretweetsofme.php:112 -#, fuzzy, php-format +#, php-format msgid "Repeats of %s" -msgstr "Відповіді до %s" +msgstr "Вторування %s" #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format @@ -596,7 +597,7 @@ msgid "Preview" msgstr "Перегляд" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 msgid "Delete" msgstr "Видалити" @@ -820,7 +821,7 @@ msgstr "Ви впевненні, що бажаєте видалити цей д msgid "Do not delete this notice" msgstr "Не видаляти цей допис" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 msgid "Delete this notice" msgstr "Видалити допис" @@ -1266,24 +1267,20 @@ msgid "A selection of some of the great users on %s" msgstr "Вибірка з деяких видатних користувачів на %s" #: actions/file.php:34 -#, fuzzy msgid "No notice ID." -msgstr "Немає допису" +msgstr "Немає ID допису." #: actions/file.php:38 -#, fuzzy msgid "No notice." -msgstr "Немає допису" +msgstr "Немає допису." #: actions/file.php:42 -#, fuzzy msgid "No attachments." -msgstr "Немає вкладень" +msgstr "Немає вкладень." #: actions/file.php:51 -#, fuzzy msgid "No uploaded attachments." -msgstr "Немає завантажених вкладень" +msgstr "Немає завантажених вкладень." #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1962,7 +1959,7 @@ msgid "You can't send a message to this user." msgstr "Ви не можете надіслати повідомлення цьому користувачеві." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "Немає змісту!" @@ -1980,7 +1977,7 @@ msgstr "" msgid "Message sent" msgstr "Повідомлення надіслано" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "Пряме повідомлення до %s надіслано" @@ -2075,8 +2072,8 @@ msgstr "тип змісту " msgid "Only " msgstr "Лише " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "Такий формат даних не підтримується." @@ -2878,35 +2875,28 @@ msgid "Couldn’t get a request token." msgstr "Не вдалося отримати токен запиту." #: actions/repeat.php:57 -#, fuzzy msgid "Only logged-in users can repeat notices." -msgstr "" -"Лише користувач має можливість переглядати свою власну поштову скриньку." +msgstr "Лише користувачі, що знаходяться у системі, можуть вторувати дописам." #: actions/repeat.php:64 actions/repeat.php:71 -#, fuzzy msgid "No notice specified." -msgstr "Не визначено жодного профілю." +msgstr "Зазначеного допису немає." #: actions/repeat.php:76 -#, fuzzy msgid "You can't repeat your own notice." -msgstr "Ви не зможете зареєструватись, якщо не погодитесь з умовами ліцензії." +msgstr "Ви не можете вторувати своїм власним дописам." #: actions/repeat.php:90 -#, fuzzy msgid "You already repeated that notice." -msgstr "Цього користувача вже заблоковано." +msgstr "Ви вже вторували цьому допису." -#: actions/repeat.php:112 lib/noticelist.php:627 -#, fuzzy +#: actions/repeat.php:114 lib/noticelist.php:621 msgid "Repeated" -msgstr "Створено" +msgstr "Вторування" -#: actions/repeat.php:115 -#, fuzzy +#: actions/repeat.php:119 msgid "Repeated!" -msgstr "Створено" +msgstr "Вторувати!" #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 @@ -3242,9 +3232,9 @@ msgstr "" "програмному забезпеченні [StatusNet](http://status.net/). " #: actions/showstream.php:313 -#, fuzzy, php-format +#, php-format msgid "Repeat of %s" -msgstr "Відповіді до %s" +msgstr "Вторування %s" #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." @@ -3718,9 +3708,8 @@ msgid "Notice feed for tag %s (Atom)" msgstr "Стрічка дописів для теґу %s (Atom)" #: actions/tagother.php:39 -#, fuzzy msgid "No ID argument." -msgstr "Немає аргументу ID." +msgstr "Немає ID аргументу." #: actions/tagother.php:65 #, php-format @@ -3990,9 +3979,8 @@ msgid "Wrong image type for avatar URL ‘%s’." msgstr "Неправильний тип зображення для URL-адреси аватари ‘%s’." #: actions/userbyid.php:70 -#, fuzzy msgid "No ID." -msgstr "Немає ID" +msgstr "Немає ID." #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" @@ -4066,22 +4054,22 @@ msgstr "Не можна оновити повідомлення з новим UR msgid "DB error inserting hashtag: %s" msgstr "Помилка бази даних при додаванні теґу: %s" -#: classes/Notice.php:196 +#: classes/Notice.php:226 msgid "Problem saving notice. Too long." msgstr "Проблема при збереженні допису. Надто довге." -#: classes/Notice.php:200 +#: classes/Notice.php:230 msgid "Problem saving notice. Unknown user." msgstr "Проблема при збереженні допису. Невідомий користувач." -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Дуже багато дописів за короткий термін; ходіть подихайте повітрям і " "повертайтесь за кілька хвилин." -#: classes/Notice.php:211 +#: classes/Notice.php:241 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4089,25 +4077,25 @@ msgstr "" "Дуже багато повідомлень за короткий термін; ходіть подихайте повітрям і " "повертайтесь за кілька хвилин." -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "Вам заборонено надсилати дописи до цього сайту." -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "Проблема при збереженні допису." -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "Помилка бази даних при додаванні відповіді: %s" -#: classes/Notice.php:1320 -#, fuzzy, php-format +#: classes/Notice.php:1371 +#, php-format msgid "RT @%1$s %2$s" -msgstr "%1$s (%2$s)" +msgstr "RT @%1$s %2$s" -#: classes/User.php:347 +#: classes/User.php:368 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Вітаємо на %1$s, @%2$s!" @@ -4420,12 +4408,12 @@ msgstr "" "Підписчики: %2$s\n" "Дописи: %3$s" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "Такого допису не існує" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "Користувач не має останнього допису" @@ -4458,137 +4446,133 @@ msgstr "Веб-сторінка: %s" msgid "About: %s" msgstr "Про мене: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Повідомлення надто довге — максимум %d знаків, а ви надсилаєте %d" -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "Помилка при відправці прямого повідомлення." -#: lib/command.php:421 -#, fuzzy +#: lib/command.php:422 msgid "Cannot repeat your own notice" -msgstr "Не можна увімкнути сповіщення." +msgstr "Не можу вторувати Вашому власному допису" -#: lib/command.php:426 -#, fuzzy +#: lib/command.php:427 msgid "Already repeated that notice" -msgstr "Видалити допис" +msgstr "Цьому допису вже вторували" -#: lib/command.php:434 -#, fuzzy, php-format +#: lib/command.php:435 +#, php-format msgid "Notice from %s repeated" -msgstr "Допис надіслано" +msgstr "Допису від %s вторували" -#: lib/command.php:436 -#, fuzzy +#: lib/command.php:437 msgid "Error repeating notice." -msgstr "Проблема при збереженні допису." +msgstr "Помилка із вторуванням допису." -#: lib/command.php:490 +#: lib/command.php:491 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Допис надто довгий — максимум %d знаків, а ви надсилаєте %d" -#: lib/command.php:499 +#: lib/command.php:500 #, php-format msgid "Reply to %s sent" msgstr "Відповідь до %s надіслано" -#: lib/command.php:501 +#: lib/command.php:502 msgid "Error saving notice." msgstr "Проблема при збереженні допису." -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "Зазначте ім’я користувача, до якого бажаєте підписатись" -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "Підписано до %s" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "Зазначте ім’я користувача, від якого бажаєте відписатись" -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "Відписано від %s" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "Виконання команди ще не завершено." -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "Сповіщення вимкнуто." -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "Не можна вимкнути сповіщення." -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "Сповіщення увімкнуто." -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "Не можна увімкнути сповіщення." -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "Команду входу відключено" -#: lib/command.php:663 +#: lib/command.php:664 #, php-format msgid "Could not create login token for %s" msgstr "Не вдалося створити токен входу для %s" -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" "Це посилання можна використати лише раз, воно дійсне протягом 2 хвилин: %s" -#: lib/command.php:684 +#: lib/command.php:685 msgid "You are not subscribed to anyone." msgstr "Ви не маєте жодних підписок." -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Ви підписані до цієї особи:" msgstr[1] "Ви підписані до цих людей:" msgstr[2] "Ви підписані до цих людей:" -#: lib/command.php:706 +#: lib/command.php:707 msgid "No one is subscribed to you." msgstr "До Вас ніхто не підписаний." -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Ця особа є підписаною до Вас:" msgstr[1] "Ці люди підписані до Вас:" msgstr[2] "Ці люди підписані до Вас:" -#: lib/command.php:728 +#: lib/command.php:729 msgid "You are not a member of any groups." msgstr "Ви не є учасником жодної групи." -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Ви є учасником групи:" msgstr[1] "Ви є учасником таких груп:" msgstr[2] "Ви є учасником таких груп:" -#: lib/command.php:744 -#, fuzzy +#: lib/command.php:745 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5176,7 +5160,7 @@ msgstr "" "повідомлення аби долучити користувачів до розмови. Такі повідомлення бачите " "лише Ви." -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 msgid "from" msgstr "від" @@ -5263,48 +5247,52 @@ msgstr "Вкласти" msgid "Attach a file" msgstr "Вкласти файл" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "N" msgstr "Півн." -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "Півд." -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "Сх." -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "Зах." -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "в" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 msgid "in context" msgstr "в контексті" -#: lib/noticelist.php:549 -#, fuzzy +#: lib/noticelist.php:548 msgid "Repeated by" -msgstr "Створено" +msgstr "Вторуванні" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 msgid "Reply to this notice" msgstr "Відповісти на цей допис" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 msgid "Reply" msgstr "Відповісти" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "Допис видалено." + #: lib/nudgeform.php:116 msgid "Nudge this user" msgstr "«Розштовхати» користувача" @@ -5403,14 +5391,12 @@ msgid "All groups" msgstr "Всі групи" #: lib/profileformaction.php:123 -#, fuzzy msgid "No return-to arguments." -msgstr "Немає аргументів повернення." +msgstr "Немає аргументів return-to." #: lib/profileformaction.php:137 -#, fuzzy msgid "Unimplemented method." -msgstr "неприпустимий метод" +msgstr "Метод не виконується." #: lib/publicgroupnav.php:78 msgid "Public" @@ -5433,14 +5419,12 @@ msgid "Popular" msgstr "Популярне" #: lib/repeatform.php:107 lib/repeatform.php:132 -#, fuzzy msgid "Repeat this notice" -msgstr "Відповісти на цей допис" +msgstr "Вторувати цьому допису" #: lib/repeatform.php:132 -#, fuzzy msgid "Repeat" -msgstr "Скинути" +msgstr "Вторувати" #: lib/sandboxform.php:67 msgid "Sandbox" @@ -5611,47 +5595,47 @@ msgstr "Повідомлення" msgid "Moderate" msgstr "Модерувати" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "мить тому" -#: lib/util.php:827 +#: lib/util.php:831 msgid "about a minute ago" msgstr "хвилину тому" -#: lib/util.php:829 +#: lib/util.php:833 #, php-format msgid "about %d minutes ago" msgstr "близько %d хвилин тому" -#: lib/util.php:831 +#: lib/util.php:835 msgid "about an hour ago" msgstr "годину тому" -#: lib/util.php:833 +#: lib/util.php:837 #, php-format msgid "about %d hours ago" msgstr "близько %d годин тому" -#: lib/util.php:835 +#: lib/util.php:839 msgid "about a day ago" msgstr "день тому" -#: lib/util.php:837 +#: lib/util.php:841 #, php-format msgid "about %d days ago" msgstr "близько %d днів тому" -#: lib/util.php:839 +#: lib/util.php:843 msgid "about a month ago" msgstr "місяць тому" -#: lib/util.php:841 +#: lib/util.php:845 #, php-format msgid "about %d months ago" msgstr "близько %d місяців тому" -#: lib/util.php:843 +#: lib/util.php:847 msgid "about a year ago" msgstr "рік тому" diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index ce847f188d..c2c80a2f68 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: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:35:50+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:53:15+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: vi\n" "X-Message-Group: out-statusnet\n" @@ -35,17 +35,18 @@ msgstr "Không có tin nhắn nào." #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "Không có user nào." @@ -55,7 +56,8 @@ msgid "%s and friends, page %d" msgstr "%s và bạn bè" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s và bạn bè" @@ -108,6 +110,7 @@ msgid "You and friends" msgstr "%s và bạn bè" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" @@ -230,8 +233,8 @@ msgstr "" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -606,7 +609,7 @@ msgid "Preview" msgstr "Xem trước" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 #, fuzzy msgid "Delete" msgstr "Xóa tin nhắn" @@ -839,7 +842,7 @@ msgstr "Bạn có chắc chắn là muốn xóa tin nhắn này không?" msgid "Do not delete this notice" msgstr "Không thể xóa tin nhắn này." -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 #, fuzzy msgid "Delete this notice" msgstr "Xóa tin nhắn" @@ -2035,7 +2038,7 @@ msgid "You can't send a message to this user." msgstr "Bạn đã theo những người này:" #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "Không có nội dung!" @@ -2053,7 +2056,7 @@ msgstr "" msgid "Message sent" msgstr "Tin mới nhất" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, fuzzy, php-format msgid "Direct message to %s sent" msgstr "Tin nhắn riêng" @@ -2147,8 +2150,8 @@ msgstr "Kết nối" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "Không hỗ trợ định dạng dữ liệu này." @@ -2975,12 +2978,12 @@ msgstr "Bạn không thể đăng ký nếu không đồng ý các điều kho msgid "You already repeated that notice." msgstr "Bạn đã theo những người này:" -#: actions/repeat.php:112 lib/noticelist.php:627 +#: actions/repeat.php:114 lib/noticelist.php:621 #, fuzzy msgid "Repeated" msgstr "Tạo" -#: actions/repeat.php:115 +#: actions/repeat.php:119 #, fuzzy msgid "Repeated!" msgstr "Tạo" @@ -4144,46 +4147,46 @@ msgstr "Không thể cập nhật thông tin user với địa chỉ email đã msgid "DB error inserting hashtag: %s" msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s" -#: classes/Notice.php:196 +#: classes/Notice.php:226 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: classes/Notice.php:200 +#: classes/Notice.php:230 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:211 +#: classes/Notice.php:241 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s" -#: classes/Notice.php:1320 +#: classes/Notice.php:1371 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%s (%s)" -#: classes/User.php:347 +#: classes/User.php:368 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "%s chào mừng bạn " @@ -4522,12 +4525,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 #, fuzzy msgid "User has no last notice" msgstr "Người dùng không có thông tin." @@ -4562,135 +4565,135 @@ msgstr "Trang chủ hoặc Blog: %s" msgid "About: %s" msgstr "Giới thiệu" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:377 +#: lib/command.php:378 #, fuzzy msgid "Error sending direct message." msgstr "Thư bạn đã gửi" -#: lib/command.php:421 +#: lib/command.php:422 msgid "Cannot repeat your own notice" msgstr "" -#: lib/command.php:426 +#: lib/command.php:427 #, fuzzy msgid "Already repeated that notice" msgstr "Xóa tin nhắn" -#: lib/command.php:434 +#: lib/command.php:435 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Tin đã gửi" -#: lib/command.php:436 +#: lib/command.php:437 #, fuzzy msgid "Error repeating notice." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: lib/command.php:490 +#: lib/command.php:491 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:499 +#: lib/command.php:500 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Trả lời tin nhắn này" -#: lib/command.php:501 +#: lib/command.php:502 #, fuzzy msgid "Error saving notice." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:562 +#: lib/command.php:563 #, fuzzy, php-format msgid "Subscribed to %s" msgstr "Theo nhóm này" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:590 +#: lib/command.php:591 #, fuzzy, php-format msgid "Unsubscribed from %s" msgstr "Hết theo" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:611 +#: lib/command.php:612 #, fuzzy msgid "Notification off." msgstr "Không có mã số xác nhận." -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:634 +#: lib/command.php:635 #, fuzzy msgid "Notification on." msgstr "Không có mã số xác nhận." -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "" -#: lib/command.php:663 +#: lib/command.php:664 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "Không thể tạo favorite." -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:684 +#: lib/command.php:685 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Bạn chưa cập nhật thông tin riêng" -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Bạn đã theo những người này:" -#: lib/command.php:706 +#: lib/command.php:707 #, fuzzy msgid "No one is subscribed to you." msgstr "Không thể tạo favorite." -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Không thể tạo favorite." -#: lib/command.php:728 +#: lib/command.php:729 #, fuzzy msgid "You are not a member of any groups." msgstr "Bạn chưa cập nhật thông tin riêng" -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Bạn chưa cập nhật thông tin riêng" -#: lib/command.php:744 +#: lib/command.php:745 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5232,7 +5235,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 #, fuzzy msgid "from" msgstr " từ " @@ -5321,51 +5324,56 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 #, fuzzy msgid "N" msgstr "Không" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 #, fuzzy msgid "in context" msgstr "Không có nội dung!" -#: lib/noticelist.php:549 +#: lib/noticelist.php:548 #, fuzzy msgid "Repeated by" msgstr "Tạo" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 #, fuzzy msgid "Reply to this notice" msgstr "Trả lời tin nhắn này" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 msgid "Reply" msgstr "Trả lời" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "Tin đã gửi" + #: lib/nudgeform.php:116 #, fuzzy msgid "Nudge this user" @@ -5701,47 +5709,47 @@ msgstr "Tin mới nhất" msgid "Moderate" msgstr "" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "vài giây trước" -#: lib/util.php:827 +#: lib/util.php:831 msgid "about a minute ago" msgstr "1 phút trước" -#: lib/util.php:829 +#: lib/util.php:833 #, php-format msgid "about %d minutes ago" msgstr "%d phút trước" -#: lib/util.php:831 +#: lib/util.php:835 msgid "about an hour ago" msgstr "1 giờ trước" -#: lib/util.php:833 +#: lib/util.php:837 #, php-format msgid "about %d hours ago" msgstr "%d giờ trước" -#: lib/util.php:835 +#: lib/util.php:839 msgid "about a day ago" msgstr "1 ngày trước" -#: lib/util.php:837 +#: lib/util.php:841 #, php-format msgid "about %d days ago" msgstr "%d ngày trước" -#: lib/util.php:839 +#: lib/util.php:843 msgid "about a month ago" msgstr "1 tháng trước" -#: lib/util.php:841 +#: lib/util.php:845 #, php-format msgid "about %d months ago" msgstr "%d tháng trước" -#: lib/util.php:843 +#: lib/util.php:847 msgid "about a year ago" msgstr "1 năm trước" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index a4043811cc..9c099dc34c 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.po +++ b/locale/zh_CN/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:35:53+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:53:18+0000\n" "Language-Team: Simplified Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hans\n" "X-Message-Group: out-statusnet\n" @@ -37,17 +37,18 @@ msgstr "未找到此消息。" #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "没有这个用户。" @@ -57,7 +58,8 @@ msgid "%s and friends, page %d" msgstr "%s 及好友" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s 及好友" @@ -110,6 +112,7 @@ msgid "You and friends" msgstr "%s 及好友" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "%2$s 上 %1$s 和好友的更新！" @@ -232,8 +235,8 @@ msgstr "发给 %s 的直接消息" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -601,7 +604,7 @@ msgid "Preview" msgstr "预览" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 #, fuzzy msgid "Delete" msgstr "删除" @@ -835,7 +838,7 @@ msgstr "确定要删除这条消息吗？" msgid "Do not delete this notice" msgstr "无法删除通告。" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 #, fuzzy msgid "Delete this notice" msgstr "删除通告" @@ -1981,7 +1984,7 @@ msgid "You can't send a message to this user." msgstr "无法向此用户发送消息。" #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "没有内容！" @@ -1999,7 +2002,7 @@ msgstr "不要向自己发送消息；跟自己悄悄说就得了。" msgid "Message sent" msgstr "新消息" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "已向 %s 发送消息" @@ -2089,8 +2092,8 @@ msgstr "连接" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "不支持的数据格式。" @@ -2900,12 +2903,12 @@ msgstr "您必须同意此授权方可注册。" msgid "You already repeated that notice." msgstr "您已成功阻止该用户：" -#: actions/repeat.php:112 lib/noticelist.php:627 +#: actions/repeat.php:114 lib/noticelist.php:621 #, fuzzy msgid "Repeated" msgstr "创建" -#: actions/repeat.php:115 +#: actions/repeat.php:119 #, fuzzy msgid "Repeated!" msgstr "创建" @@ -4060,47 +4063,47 @@ msgstr "无法添加新URI的信息。" msgid "DB error inserting hashtag: %s" msgstr "添加标签时数据库出错：%s" -#: classes/Notice.php:196 +#: classes/Notice.php:226 #, fuzzy msgid "Problem saving notice. Too long." msgstr "保存通告时出错。" -#: classes/Notice.php:200 +#: classes/Notice.php:230 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "保存通告时出错。" -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "你在短时间里发布了过多的消息，请深呼吸，过几分钟再发消息。" -#: classes/Notice.php:211 +#: classes/Notice.php:241 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "你在短时间里发布了过多的消息，请深呼吸，过几分钟再发消息。" -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "在这个网站你被禁止发布消息。" -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "保存通告时出错。" -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "添加回复时数据库出错：%s" -#: classes/Notice.php:1320 +#: classes/Notice.php:1371 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:347 +#: classes/User.php:368 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "发送给 %1$s 的 %2$s 消息" @@ -4433,12 +4436,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "用户没有通告。" @@ -4471,133 +4474,133 @@ msgstr "主页：%s" msgid "About: %s" msgstr "关于：%s" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "您的消息包含 %d 个字符，超出长度限制 - 不能超过 140 个字符。" -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "发送消息出错。" -#: lib/command.php:421 +#: lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice" msgstr "无法开启通告。" -#: lib/command.php:426 +#: lib/command.php:427 #, fuzzy msgid "Already repeated that notice" msgstr "删除通告" -#: lib/command.php:434 +#: lib/command.php:435 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "消息已发布。" -#: lib/command.php:436 +#: lib/command.php:437 #, fuzzy msgid "Error repeating notice." msgstr "保存通告时出错。" -#: lib/command.php:490 +#: lib/command.php:491 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "您的消息包含 %d 个字符，超出长度限制 - 不能超过 140 个字符。" -#: lib/command.php:499 +#: lib/command.php:500 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "无法删除通告。" -#: lib/command.php:501 +#: lib/command.php:502 #, fuzzy msgid "Error saving notice." msgstr "保存通告时出错。" -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "指定要订阅的用户名" -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "订阅 %s" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "指定要取消订阅的用户名" -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "取消订阅 %s" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "命令尚未实现。" -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "通告关闭。" -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "无法关闭通告。" -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "通告开启。" -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "无法开启通告。" -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "" -#: lib/command.php:663 +#: lib/command.php:664 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "无法创建收藏。" -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:684 +#: lib/command.php:685 #, fuzzy msgid "You are not subscribed to anyone." msgstr "您未告知此个人信息" -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "您已订阅这些用户：" -#: lib/command.php:706 +#: lib/command.php:707 #, fuzzy msgid "No one is subscribed to you." msgstr "无法订阅他人更新。" -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "无法订阅他人更新。" -#: lib/command.php:728 +#: lib/command.php:729 #, fuzzy msgid "You are not a member of any groups." msgstr "您未告知此个人信息" -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "您未告知此个人信息" -#: lib/command.php:744 +#: lib/command.php:745 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5093,7 +5096,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 #, fuzzy msgid "from" msgstr " 从 " @@ -5182,52 +5185,57 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 #, fuzzy msgid "N" msgstr "否" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 #, fuzzy msgid "in context" msgstr "没有内容！" -#: lib/noticelist.php:549 +#: lib/noticelist.php:548 #, fuzzy msgid "Repeated by" msgstr "创建" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 #, fuzzy msgid "Reply to this notice" msgstr "无法删除通告。" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 #, fuzzy msgid "Reply" msgstr "回复" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "消息已发布。" + #: lib/nudgeform.php:116 msgid "Nudge this user" msgstr "呼叫这个用户" @@ -5560,47 +5568,47 @@ msgstr "新消息" msgid "Moderate" msgstr "" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "几秒前" -#: lib/util.php:827 +#: lib/util.php:831 msgid "about a minute ago" msgstr "一分钟前" -#: lib/util.php:829 +#: lib/util.php:833 #, php-format msgid "about %d minutes ago" msgstr "%d 分钟前" -#: lib/util.php:831 +#: lib/util.php:835 msgid "about an hour ago" msgstr "一小时前" -#: lib/util.php:833 +#: lib/util.php:837 #, php-format msgid "about %d hours ago" msgstr "%d 小时前" -#: lib/util.php:835 +#: lib/util.php:839 msgid "about a day ago" msgstr "一天前" -#: lib/util.php:837 +#: lib/util.php:841 #, php-format msgid "about %d days ago" msgstr "%d 天前" -#: lib/util.php:839 +#: lib/util.php:843 msgid "about a month ago" msgstr "一个月前" -#: lib/util.php:841 +#: lib/util.php:845 #, php-format msgid "about %d months ago" msgstr "%d 个月前" -#: lib/util.php:843 +#: lib/util.php:847 msgid "about a year ago" msgstr "一年前" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index 4a569ff6e1..9acae37c1e 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: 2009-12-14 20:34+0000\n" -"PO-Revision-Date: 2009-12-14 20:35:55+0000\n" +"POT-Creation-Date: 2009-12-16 22:51+0000\n" +"PO-Revision-Date: 2009-12-16 22:53:21+0000\n" "Language-Team: Traditional Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60044); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hant\n" "X-Message-Group: out-statusnet\n" @@ -35,17 +35,18 @@ msgstr "無此通知" #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 -#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 -#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 -#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 -#: actions/newmessage.php:116 actions/remotesubscribe.php:145 -#: actions/remotesubscribe.php:154 actions/replies.php:73 -#: actions/repliesrss.php:38 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 -#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 -#: lib/command.php:364 lib/command.php:409 lib/command.php:470 -#: lib/command.php:526 lib/galleryaction.php:59 lib/mailbox.php:82 -#: lib/profileaction.php:77 lib/subs.php:34 lib/subs.php:116 +#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 +#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 +#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 +#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 +#: actions/replies.php:73 actions/repliesrss.php:38 +#: actions/showfavorites.php:105 actions/userbyid.php:74 +#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 +#: lib/command.php:163 lib/command.php:311 lib/command.php:364 +#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:116 msgid "No such user." msgstr "無此使用者" @@ -55,7 +56,8 @@ msgid "%s and friends, page %d" msgstr "%s與好友" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100 +#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s與好友" @@ -108,6 +110,7 @@ msgid "You and friends" msgstr "%s與好友" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "" @@ -229,8 +232,8 @@ msgstr "" #: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 #: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 #: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131 -#: actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 #: actions/apitimelineuser.php:165 actions/apiusershow.php:101 @@ -595,7 +598,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:603 msgid "Delete" msgstr "" @@ -826,7 +829,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "無此通知" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:603 msgid "Delete this notice" msgstr "" @@ -1913,7 +1916,7 @@ msgid "You can't send a message to this user." msgstr "" #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:483 +#: lib/command.php:484 msgid "No content!" msgstr "無內容" @@ -1930,7 +1933,7 @@ msgstr "" msgid "Message sent" msgstr "" -#: actions/newmessage.php:185 lib/command.php:375 +#: actions/newmessage.php:185 lib/command.php:376 #, php-format msgid "Direct message to %s sent" msgstr "" @@ -2018,8 +2021,8 @@ msgstr "連結" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1030 -#: lib/api.php:1058 lib/api.php:1168 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 +#: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." msgstr "" @@ -2797,12 +2800,12 @@ msgstr "" msgid "You already repeated that notice." msgstr "無此使用者" -#: actions/repeat.php:112 lib/noticelist.php:627 +#: actions/repeat.php:114 lib/noticelist.php:621 #, fuzzy msgid "Repeated" msgstr "新增" -#: actions/repeat.php:115 +#: actions/repeat.php:119 #, fuzzy msgid "Repeated!" msgstr "新增" @@ -3915,46 +3918,46 @@ msgstr "" msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:196 +#: classes/Notice.php:226 #, fuzzy msgid "Problem saving notice. Too long." msgstr "儲存使用者發生錯誤" -#: classes/Notice.php:200 +#: classes/Notice.php:230 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "儲存使用者發生錯誤" -#: classes/Notice.php:205 +#: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:211 +#: classes/Notice.php:241 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:217 +#: classes/Notice.php:247 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:289 classes/Notice.php:314 +#: classes/Notice.php:319 classes/Notice.php:344 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:993 +#: classes/Notice.php:1044 #, php-format msgid "DB error inserting reply: %s" msgstr "增加回覆時,資料庫發生錯誤: %s" -#: classes/Notice.php:1320 +#: classes/Notice.php:1371 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:347 +#: classes/User.php:368 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4276,12 +4279,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:398 lib/command.php:459 +#: lib/command.php:152 lib/command.php:399 lib/command.php:460 msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:414 lib/command.php:475 -#: lib/command.php:531 +#: lib/command.php:168 lib/command.php:415 lib/command.php:476 +#: lib/command.php:532 msgid "User has no last notice" msgstr "" @@ -4314,130 +4317,130 @@ msgstr "" msgid "About: %s" msgstr "" -#: lib/command.php:358 scripts/xmppdaemon.php:321 +#: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:377 +#: lib/command.php:378 msgid "Error sending direct message." msgstr "" -#: lib/command.php:421 +#: lib/command.php:422 msgid "Cannot repeat your own notice" msgstr "" -#: lib/command.php:426 +#: lib/command.php:427 msgid "Already repeated that notice" msgstr "" -#: lib/command.php:434 +#: lib/command.php:435 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "更新個人圖像" -#: lib/command.php:436 +#: lib/command.php:437 #, fuzzy msgid "Error repeating notice." msgstr "儲存使用者發生錯誤" -#: lib/command.php:490 +#: lib/command.php:491 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:499 +#: lib/command.php:500 #, php-format msgid "Reply to %s sent" msgstr "" -#: lib/command.php:501 +#: lib/command.php:502 msgid "Error saving notice." msgstr "儲存使用者發生錯誤" -#: lib/command.php:555 +#: lib/command.php:556 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:562 +#: lib/command.php:563 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:583 +#: lib/command.php:584 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:590 +#: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:608 lib/command.php:631 +#: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:611 +#: lib/command.php:612 msgid "Notification off." msgstr "" -#: lib/command.php:613 +#: lib/command.php:614 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:634 +#: lib/command.php:635 msgid "Notification on." msgstr "" -#: lib/command.php:636 +#: lib/command.php:637 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:649 +#: lib/command.php:650 msgid "Login command is disabled" msgstr "" -#: lib/command.php:663 +#: lib/command.php:664 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "無法存取個人圖像資料" -#: lib/command.php:668 +#: lib/command.php:669 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:684 +#: lib/command.php:685 #, fuzzy msgid "You are not subscribed to anyone." msgstr "此帳號已註冊" -#: lib/command.php:686 +#: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "此帳號已註冊" -#: lib/command.php:706 +#: lib/command.php:707 #, fuzzy msgid "No one is subscribed to you." msgstr "無此訂閱" -#: lib/command.php:708 +#: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "無此訂閱" -#: lib/command.php:728 +#: lib/command.php:729 #, fuzzy msgid "You are not a member of any groups." msgstr "無法連結到伺服器:%s" -#: lib/command.php:730 +#: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "無法連結到伺服器:%s" -#: lib/command.php:744 +#: lib/command.php:745 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4917,7 +4920,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:468 +#: lib/mailbox.php:227 lib/noticelist.php:469 msgid "from" msgstr "" @@ -5005,49 +5008,54 @@ msgstr "" msgid "Attach a file" msgstr "" -#: lib/noticelist.php:419 +#: lib/noticelist.php:420 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "N" msgstr "" -#: lib/noticelist.php:420 +#: lib/noticelist.php:421 msgid "S" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "E" msgstr "" -#: lib/noticelist.php:421 +#: lib/noticelist.php:422 msgid "W" msgstr "" -#: lib/noticelist.php:427 +#: lib/noticelist.php:428 msgid "at" msgstr "" -#: lib/noticelist.php:522 +#: lib/noticelist.php:523 #, fuzzy msgid "in context" msgstr "無內容" -#: lib/noticelist.php:549 +#: lib/noticelist.php:548 #, fuzzy msgid "Repeated by" msgstr "新增" -#: lib/noticelist.php:587 +#: lib/noticelist.php:577 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:588 +#: lib/noticelist.php:578 msgid "Reply" msgstr "" +#: lib/noticelist.php:620 +#, fuzzy +msgid "Notice repeated" +msgstr "更新個人圖像" + #: lib/nudgeform.php:116 msgid "Nudge this user" msgstr "" @@ -5363,47 +5371,47 @@ msgstr "" msgid "Moderate" msgstr "" -#: lib/util.php:825 +#: lib/util.php:829 msgid "a few seconds ago" msgstr "" -#: lib/util.php:827 -msgid "about a minute ago" -msgstr "" - -#: lib/util.php:829 -#, php-format -msgid "about %d minutes ago" -msgstr "" - #: lib/util.php:831 -msgid "about an hour ago" +msgid "about a minute ago" msgstr "" #: lib/util.php:833 #, php-format -msgid "about %d hours ago" +msgid "about %d minutes ago" msgstr "" #: lib/util.php:835 -msgid "about a day ago" +msgid "about an hour ago" msgstr "" #: lib/util.php:837 #, php-format -msgid "about %d days ago" +msgid "about %d hours ago" msgstr "" #: lib/util.php:839 -msgid "about a month ago" +msgid "about a day ago" msgstr "" #: lib/util.php:841 #, php-format -msgid "about %d months ago" +msgid "about %d days ago" msgstr "" #: lib/util.php:843 +msgid "about a month ago" +msgstr "" + +#: lib/util.php:845 +#, php-format +msgid "about %d months ago" +msgstr "" + +#: lib/util.php:847 msgid "about a year ago" msgstr "" From d708e40be222b27ad009f3eeec7c951152742ff0 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 22 Dec 2009 16:41:07 -0800 Subject: [PATCH 171/172] update README for 0.9.0rc2 --- README | 176 +++++++++++++++++++++++++++++++-------------------------- 1 file changed, 96 insertions(+), 80 deletions(-) diff --git a/README b/README index dc2e2b4ba4..9e91ad674d 100644 --- a/README +++ b/README @@ -2,8 +2,8 @@ README ------ -StatusNet 0.8.2 ("Life and How to Live It") -1 Nov 2009 +StatusNet 0.9.0 ("Stand") Release Candidate 2 +22 Dec 2009 This is the README file for StatusNet (formerly Laconica), the Open Source microblogging platform. It includes installation instructions, @@ -16,10 +16,10 @@ About StatusNet (formerly Laconica) is a Free and Open Source microblogging platform. It helps people in a community, company or group to exchange -short (140 character) messages over the Web. Users can choose which -people to "follow" and receive only their friends' or colleagues' -status messages. It provides a similar service to sites like Twitter, -Jaiku, Yammer, and Plurk. +short (140 characters, by default) messages over the Web. Users can +choose which people to "follow" and receive only their friends' or +colleagues' status messages. It provides a similar service to sites +like Twitter, Jaiku, Yammer, and Plurk. With a little work, status messages can be sent to mobile phones, instant messenger programs (GTalk/Jabber), and specially-designed @@ -77,81 +77,96 @@ for additional terms. New this version ================ -This is a minor feature and bugfix release since version 0.8.1, -released Aug 26 2009. Notable changes this version: +This is a major feature release since version 0.8.2, released Nov 1 2009. +Notable changes this version: -- New script for deleting user accounts. Not particularly safe or - community-friendly. Better for deleting abusive accounts than for - users who are 'retiring'. -- Improved detection of URLs in notices, specifically for punctuation - chars like ~, :, $, _, -, +, !, @, and %. -- Removed some extra
    semantic HTML code. -- Correct error in status-network database ini file (having multiple - statusnet sites with a single codebase) -- Fixed error output for Twitter posting failures. -- Fixed bug in Twitter queue handler that requeued inapplicable - notices ad infinitum. -- Improve FOAF output for remote users. -- new commands to join and leave groups. -- Fixed bug in which you cannot turn off importing friends timelines - flag. -- Better error handling in Twitter posting. -- Show oEmbed data for XHTML files as well as plain HTML. -- Updated bug database link in README. -- add support for HTTP Basic Auth in PHP CGI or FastCGI (e.g. GoDaddy). -- autofocus input to selected entry elements depending on page. -- updated layout for filter-by-tag form. -- better layout for inbox and outbox pages. -- fix highlighting search terms in attributes of notice list elements. -- Correctly handle errors in linkback plugin. -- Updated biz theme. -- Updated cloudy theme. -- Don't match '::' as an IPv6 address. -- Use the same decision logic for deciding whether to mark an - attachment as an enclosure in RSS or as a paperclip item in Web - output. -- Fixed a bug in the Piwik plugin that hard-coded the site ID. -- Add a param, inreplyto, to notice/new to allow an explicit response - to another notice. -- Show username in subject of emails. -- Check if avatar exists before trying to delete it. -- Correctly add omb_version to response for request token in OMB. -- Add a few more SMS carriers. -- Add a few more notice sources. -- Vary: header. -- Improvements to the AutoCompletePlugin. -- Check for 'dl' before using it. -- Make it impossible to delete self-subscriptions via the API. -- Fix pagination of tagged user pages. -- Make PiwikAnalyticsPlugin work with addPlugin(). -- Removed trailing single space in user nicknames in notice lists. -- Show context link if a notice starts a conversation. -- blacklist all files and directories in install dir. -- handle GoDaddy-style PATH_INFO, including script name. -- add home_timeline synonym for friends_timeline. -- Add a popup window for the realtime plugin. -- Add some more streams for the realtime plugin. -- Fix a bug that overwrote group creation timestamp on every edit. -- Moved HTTP error code strings to a class variable. -- The Twitter API now returns server errors in the correct format. -- Reset the doctype for HTML output. -- Fixed a number of notices. -- Don't show search suggestions for private sites. -- Some corrections to FBConnect nav overrides. -- Slightly less database-intensive session management. -- Updated name of software in installer script. -- Include long-form attachment URLs if url-shortener is disabled. -- Include updated localisations for Polish, Greek, Hebrew, Icelandic, - Norwegian, and Chinese. -- Include upstream fixes to gettext.php. -- Correct for regression in Facebook API for updates. -- Ignore "Sent from my iPhone" (and similar) in mail updates. -- Use the NICKNAME_FMT constant for detecting nicknames. -- Check for site servername config'd. -- Compatibility fix for empty status updates with Twitter API. -- Option to show files privately (EXPERIMENTAL! Use with caution.) -- a script to register a new user. -- a script to make a user admin of a group. +- Records of deleted notices are stored without the notice content. +- Much of the optional core featureset has been moved to plugins. +- OpenID support moved from core to a plugin. Helps test the strength of + our plugin architecture and makes it easy to disable this + functionality for e.g. intranet sites. +- Many additional hook events (see EVENTS.txt for details). +- OMB 0.1 support re-implemented using libomb. +- Re-structure database so notices, messages, bios and group + descriptions can be over 140 characters. Limit defined by + site administrator as configuration option; can be unlimited. +- Configuration data now optionally stored in the database, which + overrides any settings in config files. +- Twitter integration re-implemented as a plugin. +- Facebook integration re-implemented as a plugin. +- Role-based authorization framework. Users can have named roles, and + roles can have rights (e.g., to delete notices, change configuration + data, or ban uncooperative users). Default roles 'admin' (for + configuration) and 'moderator' (for community management) added. +- Plugin for PubSubHubBub (PuSH) support. +- Considerable code style cleanup to meet PEAR code standards. +- Made a common library for HTTP-client access which uses available + HTTP libraries where possible. +- Added statuses/home_timeline method to API. +- Hooks for plugins to handle notices offline, either by defining + their own queue handler scripts or to use a default plugin queue + handler script. +- Plugins can now modify the database schema, adding their own tables + or modifying existing ones. +- Groups API. +- Twitter API supports Web caching for some methods. +- Twitter API refactored into one-action-per-method. +- Realtime plugin supports a tear-off window. +- FOAF for groups. +- Moved all JavaScript tags to just before by default, + significantly speeding up apparent page load time. +- Added a Realtime plugin for Orbited server. +- Added a mobile plugin to give a more mobile-phone-friendly layout + when a mobile browser is detected. +- Use CSS sprites for most common icons. +- Fixes for images and buttons on Web output. +- New plugin requires that users validate their email before posting. +- New plugin UserFlag lets users flag other profiles for review. +- Considerably better i18n support. Use TranslateWiki to update + translations. +- Notices and profiles now store location information. +- New plugin, Geonames, for turning location names and lat/long pairs + into structured IDs and vice versa. Architecture reusable for other + systems. +- Better check of license compatibility between site licenses. +- Some improvements in XMPP output. +- Media upload in the API. +- Replies appear in the user's inbox. +- Improved the UI on the bookmarklet. +- StatusNet identities can be used as OpenID identities. +- Script to register a user. +- Script to make someone a group admin. +- Script to make someone a site admin or moderator. +- 'login' command. +- Pluggable authentication. +- LDAP authentication plugin. +- Script for console interaction with the site (!). +- Users don't see group posts from people they've blocked. +- Admin panel interface for changing site configuration. +- Users can be sandboxed (limited contributions) or silenced + (no contributions) by moderators. +- Many changes to make language usage more consistent. +- Sphinx search moved to a plugin. +- GeoURL plugin. +- Profile and group lists support hAtom. +- Massive refactoring of util.js. +- Mapstraction plugin to show maps on inbox and profile pages. +- Play/pause buttons for realtime notices. +- Support for geo microformat. +- Partial support for feed subscriptions, RSSCloud, PubSubHubBub. +- Support for geolocation in browser (Chrome, Firefox). +- Quit trying to negotiate HTML format. Always use text/html. + We lose, and so do Web standards. Boo. +- Better logging of request info. +- Better output for errors in Web interface. +- No longer store .mo files; these need to be generated. +- Minify plugin. +- Events to allow pluginizing logger. +- New framework for plugin localization. +- Gravatar plugin. +- Add support for "repeats" (similar to Twitter's "retweets"). +- Support for repeats in Twitter API. +- Better notification of direct messages. Prerequisites ============= @@ -1600,6 +1615,7 @@ if anyone's been overlooked in error. * Federico Marani * Craig Andrews * mEDI +* Brett Taylor Thanks also to the developers of our upstream library code and to the thousands of people who have tried out Identi.ca, installed StatusNet, From 30c2e2ce83282f0bc268153d7ec465fbb5cf00ca Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 22 Dec 2009 16:41:39 -0800 Subject: [PATCH 172/172] update to rc2 --- lib/common.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/common.php b/lib/common.php index 9b3ded037b..7fa1910af8 100644 --- a/lib/common.php +++ b/lib/common.php @@ -20,9 +20,9 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } //exit with 200 response, if this is checking fancy from the installer -if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') { exit; } +if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') { exit; } -define('STATUSNET_VERSION', '0.9.0rc1'); +define('STATUSNET_VERSION', '0.9.0rc2'); define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility define('STATUSNET_CODENAME', 'Stand');