diff options
115 files changed, 5661 insertions, 3648 deletions
diff --git a/EVENTS.txt b/EVENTS.txt index f75dcebca..c788a9215 100644 --- a/EVENTS.txt +++ b/EVENTS.txt @@ -528,13 +528,27 @@ EndCheckPassword: After checking a username/password pair - $authenticatedUser: User object if credentials match a user, else null. StartChangePassword: Before changing a password -- $nickname: user's nickname +- $user: user - $oldpassword: the user's old password - $newpassword: the desired new password EndChangePassword: After changing a password -- $nickname: user's nickname +- $user: user UserDeleteRelated: Specify additional tables to delete entries from when deleting users - $user: User object - &$related: array of DB_DataObject class names to delete entries on matching user_id. + +GetUrlShorteners: Specify URL shorteners that are available for use +- &$shorteners: append your shortener to this array like so: $shorteners[shortenerName]=array('display'=>display, 'freeService'=>boolean) + +StartShortenUrl: About to shorten a URL +- $url: url to be shortened +- $shortenerName: name of the requested shortener +- &$shortenedUrl: short version of the url + +EndShortenUrl: After a URL has been shortened +- $url: url to be shortened +- $shortenerName: name of the requested shortener +- $shortenedUrl: short version of the url + diff --git a/actions/noticesearch.php b/actions/noticesearch.php index 1e5a69180..76c877ff2 100644 --- a/actions/noticesearch.php +++ b/actions/noticesearch.php @@ -121,7 +121,7 @@ class NoticesearchAction extends SearchAction $message = sprintf(_('Be the first to [post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!'), urlencode($q)); } else { - $message = sprintf(_('Why not [register an account](%%%%action.register%%%%) and be the first to [post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!'), urlencode($q)); + $message = sprintf(_('Why not [register an account](%%%%action.register%%%%) and be the first to [post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!'), urlencode($q)); } $this->elementStart('div', 'guide'); diff --git a/actions/othersettings.php b/actions/othersettings.php index d32a2d651..0de7cd908 100644 --- a/actions/othersettings.php +++ b/actions/othersettings.php @@ -96,28 +96,28 @@ class OthersettingsAction extends AccountSettingsAction common_local_url('othersettings'))); $this->elementStart('fieldset'); $this->hidden('token', common_session_token()); + $this->elementStart('ul', 'form_data'); - $services=array(); - global $_shorteners; - if($_shorteners){ - foreach($_shorteners as $name=>$value) - { - $services[$name]=$name; - if(!empty($value['info']['freeService'])){ - // I18N - $services[$name].=' (free service)'; - } + $shorteners = array(); + Event::handle('GetUrlShorteners', array(&$shorteners)); + $services = array(); + foreach($shorteners as $name=>$value) + { + $services[$name]=$name; + if($value['freeService']){ + $services[$name].=_(' (free service)'); } } - asort($services); - $services['']='None'; - - $this->elementStart('ul', 'form_data'); - $this->elementStart('li'); - $this->dropdown('urlshorteningservice', _('Shorten URLs with'), - $services, _('Automatic shortening service to use.'), - false, $user->urlshorteningservice); - $this->elementEnd('li'); + if($services) + { + asort($services); + + $this->elementStart('li'); + $this->dropdown('urlshorteningservice', _('Shorten URLs with'), + $services, _('Automatic shortening service to use.'), + false, $user->urlshorteningservice); + $this->elementEnd('li'); + } $this->elementStart('li'); $this->checkbox('viewdesigns', _('View profile designs'), $user->viewdesigns, _('Show or hide profile designs.')); diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php index 9e79501e2..11d7bf785 100644 --- a/actions/passwordsettings.php +++ b/actions/passwordsettings.php @@ -170,7 +170,7 @@ class PasswordsettingsAction extends AccountSettingsAction } $success = false; - if(! Event::handle('StartChangePassword', array($user->nickname, $oldpassword, $newpassword))){ + if(! Event::handle('StartChangePassword', array($user, $oldpassword, $newpassword))){ //no handler changed the password, so change the password internally $original = clone($user); @@ -186,7 +186,7 @@ class PasswordsettingsAction extends AccountSettingsAction $this->serverError(_('Can\'t save new password.')); return; } - Event::handle('EndChangePassword', array($nickname)); + Event::handle('EndChangePassword', array($user)); } $this->showForm(_('Password saved.'), true); diff --git a/actions/xrds.php b/actions/xrds.php index 8f09557d1..534182e3e 100644 --- a/actions/xrds.php +++ b/actions/xrds.php @@ -97,27 +97,23 @@ class XrdsAction extends Action $xrdsOutputter->element('Type', null, 'xri://$xrds*simple'); $xrdsOutputter->showXrdsService(OAUTH_ENDPOINT_REQUEST, common_local_url('requesttoken'), - array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1)); - $xrdsOutputter->showXrdsService( OAUTH_ENDPOINT_AUTHORIZE, - common_local_url('userauthorization'), array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1), null, - $this->user->getIdentifierURI()); + $this->user->uri); + $xrdsOutputter->showXrdsService( OAUTH_ENDPOINT_AUTHORIZE, + common_local_url('userauthorization'), + array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1)); $xrdsOutputter->showXrdsService(OAUTH_ENDPOINT_ACCESS, common_local_url('accesstoken'), - array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1), - null, - $this->user->getIdentifierURI()); + array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1)); $xrdsOutputter->showXrdsService(OAUTH_ENDPOINT_RESOURCE, null, - array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1), - null, - $this->user->getIdentifierURI()); + array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1)); $xrdsOutputter->elementEnd('XRD'); //omb $xrdsOutputter->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)', - 'xml:id' => 'oauth', + 'xml:id' => 'omb', 'xmlns:simple' => 'http://xrds-simple.net/core/1.0', 'version' => '2.0')); $xrdsOutputter->element('Type', null, 'xri://$xrds*simple'); @@ -127,10 +123,10 @@ class XrdsAction extends Action common_local_url('updateprofile')); $xrdsOutputter->elementEnd('XRD'); + Event::handle('EndUserXRDS', array($this,&$xrdsOutputter)); + //misc $xrdsOutputter->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)', - 'xml:id' => 'oauth', - 'xmlns:simple' => 'http://xrds-simple.net/core/1.0', 'version' => '2.0')); $xrdsOutputter->showXrdsService(OAUTH_DISCOVERY, '#oauth'); @@ -138,8 +134,6 @@ class XrdsAction extends Action '#omb'); $xrdsOutputter->elementEnd('XRD'); - Event::handle('EndUserXRDS', array($this,&$xrdsOutputter)); - $xrdsOutputter->endXRDS(); } diff --git a/classes/User.php b/classes/User.php index 9b90ce61b..9f1ee53f4 100644 --- a/classes/User.php +++ b/classes/User.php @@ -114,7 +114,7 @@ class User extends Memcached_DataObject return $result; } - function allowed_nickname($nickname) + static function allowed_nickname($nickname) { // XXX: should already be validated for size, content, etc. $blacklist = common_config('nickname', 'blacklist'); @@ -190,7 +190,17 @@ class User extends Memcached_DataObject $profile->query('BEGIN'); + if(!empty($email)) + { + $email = common_canonical_email($email); + } + + $nickname = common_canonical_nickname($nickname); $profile->nickname = $nickname; + if(! User::allowed_nickname($nickname)){ + common_log(LOG_WARNING, sprintf("Attempted to register a nickname that is not allowed: %s", $profile->nickname), + __FILE__); + } $profile->profileurl = common_profile_url($nickname); if (!empty($fullname)) { @@ -242,6 +252,10 @@ class User extends Memcached_DataObject } } + if(isset($email_confirmed) && $email_confirmed) { + $user->email = $email; + } + // This flag is ignored but still set to 1 $user->inboxed = 1; diff --git a/classes/statusnet.ini b/classes/statusnet.ini index 912d05cdf..19ab7bf97 100644 --- a/classes/statusnet.ini +++ b/classes/statusnet.ini @@ -566,3 +566,13 @@ modified = 384 user_id = K token = K +[user_username] +user_id = 129 +provider_name = 130 +username = 130 +created = 142 +modified = 384 + +[user_username__keys] +provider_name = K +username = K diff --git a/db/08to09.sql b/db/08to09.sql index 1d37a759d..028fe56a4 100644 --- a/db/08to09.sql +++ b/db/08to09.sql @@ -51,3 +51,7 @@ alter table subscription add index subscription_subscriber_idx (subscriber,created), drop index subscription_subscribed_idx, add index subscription_subscribed_idx (subscribed,created); + +alter table notice + drop index notice_profile_id_idx, + add index notice_profile_id_idx (profile_id,created,id); diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql index 004c77b36..d9b57fb84 100644 --- a/db/08to09_pg.sql +++ b/db/08to09_pg.sql @@ -40,20 +40,23 @@ create table user_role ( ); create table login_token ( - user_id integer not null /* comment 'user owning this token'*/ references user (id), + user_id integer not null /* comment 'user owning this token'*/ references "user" (id), token char(32) not null /* comment 'token useable for logging in'*/, created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created'*/, modified timestamp /* comment 'date this record was modified'*/, - constraint primary key (user_id) + primary key (user_id) ); -alter table fave - drop index fave_user_id_idx, - add index fave_user_id_idx using btree(user_id,modified); +DROP index fave_user_id_idx; +CREATE index fave_user_id_idx on fave (user_id,modified); + +DROP index subscription_subscriber_idx; +CREATE index subscription_subscriber_idx ON subscription (subscriber,created); + +DROP index subscription_subscribed_idx; +CREATE index subscription_subscribed_idx ON subscription (subscribed,created); + +DROP index notice_profile_id_idx; +CREATE index notice_profile_id_idx ON notice (profile_id,created,id); -alter table subscription - drop index subscription_subscriber_idx, - add index subscription_subscriber_idx using btree(subscriber,created), - drop index subscription_subscribed_idx, - add index subscription_subscribed_idx using btree(subscribed,created); diff --git a/db/statusnet.sql b/db/statusnet.sql index 2983c67cf..732aded5a 100644 --- a/db/statusnet.sql +++ b/db/statusnet.sql @@ -130,7 +130,7 @@ create table notice ( location_id integer comment 'location id if possible', location_ns integer comment 'namespace for location', - index notice_profile_id_idx (profile_id), + index notice_profile_id_idx (profile_id,created,id), index notice_conversation_idx (conversation), index notice_created_idx (created), index notice_replyto_idx (reply_to), diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql index 392a6a5f3..7b0e5313c 100644 --- a/db/statusnet_pg.sql +++ b/db/statusnet_pg.sql @@ -137,7 +137,7 @@ create table notice ( /* FULLTEXT(content) */ ); -create index notice_profile_id_idx on notice using btree(profile_id); +create index notice_profile_id_idx on notice using btree(profile_id,created,id); create index notice_created_idx on notice using btree(created); create table notice_source ( @@ -68,7 +68,6 @@ function getPath($req) */ function handleError($error) { -//error_log(print_r($error,1)); if ($error->getCode() == DB_DATAOBJECT_ERROR_NODATA) { return; } diff --git a/install.php b/install.php index e7f7cf318..8e76f6198 100644 --- a/install.php +++ b/install.php @@ -1,4 +1,3 @@ - <?php /** * StatusNet - the distributed open-source microblogging tool @@ -26,7 +25,7 @@ * @author Brion Vibber <brion@pobox.com> * @author CiaranG <ciaran@ciarang.com> * @author Craig Andrews <candrews@integralblue.com> - * @author Eric Helgeson <helfire@Erics-MBP.local> + * @author Eric Helgeson <erichelgeson@gmail.com> * @author Evan Prodromou <evan@status.net> * @author Robin Millette <millette@controlyourself.ca> * @author Sarven Capadisli <csarven@status.net> @@ -500,6 +499,11 @@ function showForm() <input type="password" id="password" name="password" /> <p class="form_guide">Database password (optional)</p> </li> + <li> + <label for="snapshot">Send stats to StatusNet Inc?</label> + <input type="checkbox" id="snapshot" name="snapshot" checked /> + <p class="form_guide">Periodically send information about your site to StatusNet Inc</p> + </li> </ul> <input type="submit" name="submit" class="submit" value="Submit" /> </fieldset> @@ -521,6 +525,7 @@ function handlePost() $username = $_POST['username']; $password = $_POST['password']; $sitename = $_POST['sitename']; + $snapshot = $_POST['snapshot']; $fancy = !empty($_POST['fancy']); $server = $_SERVER['HTTP_HOST']; $path = substr(dirname($_SERVER['PHP_SELF']), 1); @@ -567,7 +572,7 @@ STR; } updateStatus("Writing config file..."); - $res = writeConf($sitename, $server, $path, $fancy, $db); + $res = writeConf($sitename, $server, $path, $fancy, $db, $snapshot); if (!$res) { updateStatus("Can't write config file.", true); @@ -688,7 +693,7 @@ function Mysql_Db_installer($host, $database, $username, $password) return $db; } -function writeConf($sitename, $server, $path, $fancy, $db) +function writeConf($sitename, $server, $path, $fancy, $db, $snapshot) { // assemble configuration file in a string $cfg = "<?php\n". @@ -704,6 +709,9 @@ function writeConf($sitename, $server, $path, $fancy, $db) // checks if fancy URLs are enabled ($fancy ? "\$config['site']['fancy'] = true;\n\n":''). + // send site stats to SNI + ($snapshot ? "\$config['snapshot']['run'] = 'web';\n\n":''). + // database "\$config['db']['database'] = '{$db['database']}';\n\n". ($db['type'] == 'pgsql' ? "\$config['db']['quote_identifiers'] = true;\n\n":''). diff --git a/js/util.js b/js/util.js index b90f33ec7..c59c63910 100644 --- a/js/util.js +++ b/js/util.js @@ -228,6 +228,7 @@ var SN = { // StatusNet $('#'+notice.id).fadeIn(2500); SN.U.NoticeAttachments(); SN.U.NoticeReply(); + SN.U.NoticeFavor(); } } $('#'+form_id+' #'+SN.C.S.NoticeDataText).val(''); @@ -276,6 +277,11 @@ var SN = { // StatusNet return true; }, + NoticeFavor: function() { + $('.form_favor').each(function() { SN.U.FormXHR($(this)); }); + $('.form_disfavor').each(function() { SN.U.FormXHR($(this)); }); + }, + NoticeAttachments: function() { $.fn.jOverlay.options = { method : 'GET', @@ -370,31 +376,53 @@ var SN = { // StatusNet return false; }); } - } -}; + }, -$(document).ready(function(){ - if ($('body.user_in').length > 0) { - $('.'+SN.C.S.FormNotice).each(function() { - SN.U.FormNoticeXHR($(this)); - SN.U.FormNoticeEnhancements($(this)); - }); + Init: { + NoticeForm: function() { + if ($('body.user_in').length > 0) { + $('.'+SN.C.S.FormNotice).each(function() { + SN.U.FormNoticeXHR($(this)); + SN.U.FormNoticeEnhancements($(this)); + }); + + SN.U.NoticeDataAttach(); + } + }, - $('.form_user_subscribe').each(function() { SN.U.FormXHR($(this)); }); - $('.form_user_unsubscribe').each(function() { SN.U.FormXHR($(this)); }); - $('.form_favor').each(function() { SN.U.FormXHR($(this)); }); - $('.form_disfavor').each(function() { SN.U.FormXHR($(this)); }); - $('.form_group_join').each(function() { SN.U.FormXHR($(this)); }); - $('.form_group_leave').each(function() { SN.U.FormXHR($(this)); }); - $('.form_user_nudge').each(function() { SN.U.FormXHR($(this)); }); + Notices: function() { + if ($('body.user_in').length > 0) { + SN.U.NoticeFavor(); - SN.U.NoticeReply(); + SN.U.NoticeReply(); + } + + SN.U.NoticeAttachments(); + }, - SN.U.NoticeDataAttach(); + EntityActions: function() { + if ($('body.user_in').length > 0) { + $('.form_user_subscribe').each(function() { SN.U.FormXHR($(this)); }); + $('.form_user_unsubscribe').each(function() { SN.U.FormXHR($(this)); }); + $('.form_group_join').each(function() { SN.U.FormXHR($(this)); }); + $('.form_group_leave').each(function() { SN.U.FormXHR($(this)); }); + $('.form_user_nudge').each(function() { SN.U.FormXHR($(this)); }); - SN.U.NewDirectMessage(); + SN.U.NewDirectMessage(); + } + } } +}; - SN.U.NoticeAttachments(); +$(document).ready(function(){ + if ($('.'+SN.C.S.FormNotice).length > 0) { + SN.Init.NoticeForm(); + } + if ($('#content .notices').length > 0) { + SN.Init.Notices(); + } + if ($('#content .entity_actions').length > 0) { + SN.Init.EntityActions(); + } }); diff --git a/lib/Shorturl_api.php b/lib/Shorturl_api.php deleted file mode 100644 index de4d55012..000000000 --- a/lib/Shorturl_api.php +++ /dev/null @@ -1,67 +0,0 @@ -<?php -/* - * StatusNet - the distributed open-source microblogging tool - * Copyright (C) 2008, 2009, StatusNet, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } - -abstract class ShortUrlApi -{ - protected $service_url; - protected $long_limit = 27; - - function __construct($service_url) - { - $this->service_url = $service_url; - } - - function shorten($url) - { - if ($this->is_long($url)) return $this->shorten_imp($url); - return $url; - } - - protected abstract function shorten_imp($url); - - protected function is_long($url) { - return strlen($url) >= common_config('site', 'shorturllength'); - } - - protected function http_post($data) - { - $request = HTTPClient::start(); - $response = $request->post($this->service_url, null, $data); - return $response->getBody(); - } - - protected function http_get($url) - { - $request = HTTPClient::start(); - $response = $request->get($this->service_url . urlencode($url)); - return $response->getBody(); - } - - protected function tidy($response) { - $response = str_replace(' ', ' ', $response); - $config = array('output-xhtml' => true); - $tidy = new tidy; - $tidy->parseString($response, $config, 'utf8'); - $tidy->cleanRepair(); - return (string)$tidy; - } -} - diff --git a/lib/action.php b/lib/action.php index 80f398fbd..b5cf3240c 100644 --- a/lib/action.php +++ b/lib/action.php @@ -1048,8 +1048,7 @@ class Action extends HTMLOutputter // lawsuit { // Does a little before-after block for next/prev page if ($have_before || $have_after) { - $this->elementStart('div', array('class' => 'pagination')); - $this->elementStart('dl', null); + $this->elementStart('dl', 'pagination'); $this->element('dt', null, _('Pagination')); $this->elementStart('dd', null); $this->elementStart('ul', array('class' => 'nav')); @@ -1074,7 +1073,6 @@ class Action extends HTMLOutputter // lawsuit $this->elementEnd('ul'); $this->elementEnd('dd'); $this->elementEnd('dl'); - $this->elementEnd('div'); } } diff --git a/lib/common.php b/lib/common.php index 6aac46807..4524d50fa 100644 --- a/lib/common.php +++ b/lib/common.php @@ -19,6 +19,9 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } +//exit with 200 response, if this is checking fancy from the installer +if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') { exit; } + define('STATUSNET_VERSION', '0.9.0dev'); define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility @@ -38,8 +41,6 @@ define('FOREIGN_NOTICE_SEND_REPLY', 4); define('FOREIGN_FRIEND_SEND', 1); define('FOREIGN_FRIEND_RECV', 2); -define_syslog_variables(); - # append our extlib dir as the last-resort place to find libs set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/extlib/'); @@ -229,7 +230,6 @@ require_once INSTALLDIR.'/lib/util.php'; require_once INSTALLDIR.'/lib/action.php'; require_once INSTALLDIR.'/lib/mail.php'; require_once INSTALLDIR.'/lib/subs.php'; -require_once INSTALLDIR.'/lib/Shorturl_api.php'; require_once INSTALLDIR.'/lib/clientexception.php'; require_once INSTALLDIR.'/lib/serverexception.php'; diff --git a/lib/default.php b/lib/default.php index 95366e0b3..82b6910ab 100644 --- a/lib/default.php +++ b/lib/default.php @@ -159,7 +159,7 @@ $default = array('default' => null, 'welcome' => null), 'snapshot' => - array('run' => 'web', + array('run' => 'never', 'frequency' => 10000, 'reporturl' => 'http://status.net/stats/report'), 'attachments' => diff --git a/lib/grouplist.php b/lib/grouplist.php index cc734bdd0..99bff9cdc 100644 --- a/lib/grouplist.php +++ b/lib/grouplist.php @@ -85,18 +85,18 @@ class GroupList extends Widget function showGroup() { - $this->out->elementStart('li', array('class' => 'profile', + $this->out->elementStart('li', array('class' => 'profile hentry', 'id' => 'group-' . $this->group->id)); $user = common_current_user(); - $this->out->elementStart('div', 'entity_profile vcard'); + $this->out->elementStart('div', 'entity_profile vcard entry-content'); $logo = ($this->group->stream_logo) ? $this->group->stream_logo : User_group::defaultLogo(AVATAR_STREAM_SIZE); $this->out->elementStart('a', array('href' => $this->group->homeUrl(), - 'class' => 'url', + 'class' => 'url entry-title', 'rel' => 'contact group')); $this->out->element('img', array('src' => $logo, 'class' => 'photo avatar', diff --git a/lib/jabber.php b/lib/jabber.php index 73f2ec660..a8e295ea5 100644 --- a/lib/jabber.php +++ b/lib/jabber.php @@ -176,7 +176,7 @@ function jabber_format_entry($profile, $notice) $xs = new XMLStringer(); $xs->elementStart('html', array('xmlns' => 'http://jabber.org/protocol/xhtml-im')); $xs->elementStart('body', array('xmlns' => 'http://www.w3.org/1999/xhtml')); - $xs->element("img", array('src'=> $profile->avatarUrl(AVATAR_MINI_SIZE) , 'alt' => $profile->nickname)); + $xs->element("img", array('src'=> $profile->avatarUrl(AVATAR_MINI_SIZE))); $xs->element('a', array('href' => $profile->profileurl), $profile->nickname); $xs->text(": "); @@ -185,11 +185,11 @@ function jabber_format_entry($profile, $notice) } else { $xs->raw(common_render_content($notice->content, $notice)); } - $xs->raw(" "); + $xs->text(" "); $xs->element('a', array( 'href'=>common_local_url('conversation', array('id' => $notice->conversation)).'#notice-'.$notice->id - ),sprintf(_('notice id: %s'),$notice->id)); + ),sprintf(_('[%s]'),$notice->id)); $xs->elementEnd('body'); $xs->elementEnd('html'); @@ -481,5 +481,5 @@ function jabber_public_notice($notice) function jabber_format_notice(&$profile, &$notice) { - return $profile->nickname . ': ' . $notice->content; + return $profile->nickname . ': ' . $notice->content . ' [' . $notice->id . ']'; } diff --git a/lib/plugin.php b/lib/plugin.php index 59bf3ba9d..87d7be5a7 100644 --- a/lib/plugin.php +++ b/lib/plugin.php @@ -76,18 +76,4 @@ class Plugin { return true; } - - /* - * the name of the shortener - * shortenerInfo associative array with additional information. One possible element is 'freeService' which can be true or false - * shortener array, first element is the name of the class, second element is an array to be passed as constructor parameters to the class - */ - function registerUrlShortener($name, $shortenerInfo, $shortener) - { - global $_shorteners; - if(!is_array($_shorteners)){ - $_shorteners=array(); - } - $_shorteners[$name]=array('info'=>$shortenerInfo, 'callInfo'=>$shortener); - } } diff --git a/lib/profilelist.php b/lib/profilelist.php index bbb722701..3412d41d1 100644 --- a/lib/profilelist.php +++ b/lib/profilelist.php @@ -76,7 +76,7 @@ class ProfileList extends Widget function startList() { - $this->out->elementStart('ul', 'profiles'); + $this->out->elementStart('ul', 'profiles xoxo'); } function endList() @@ -140,7 +140,7 @@ class ProfileListItem extends Widget function startItem() { - $this->out->elementStart('li', array('class' => 'profile', + $this->out->elementStart('li', array('class' => 'profile hentry', 'id' => 'profile-' . $this->profile->id)); } @@ -175,14 +175,14 @@ class ProfileListItem extends Widget function startProfile() { - $this->out->elementStart('div', 'entity_profile vcard'); + $this->out->elementStart('div', 'entity_profile vcard entry-content'); } function showAvatar() { $avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE); $this->out->elementStart('a', array('href' => $this->profile->profileurl, - 'class' => 'url', + 'class' => 'url entry-title', 'rel' => 'contact')); $this->out->element('img', array('src' => ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_STREAM_SIZE), 'class' => 'photo avatar', diff --git a/lib/subs.php b/lib/subs.php index 934380b76..2f0f97049 100644 --- a/lib/subs.php +++ b/lib/subs.php @@ -121,7 +121,7 @@ function subs_unsubscribe_user($user, $other_nickname) function subs_unsubscribe_to($user, $other) { if (!$user->isSubscribed($other)) - return _('Not subscribed!.'); + return _('Not subscribed!'); $sub = DB_DataObject::factory('subscription'); diff --git a/lib/util.php b/lib/util.php index 81160d052..68f3520db 100644 --- a/lib/util.php +++ b/lib/util.php @@ -350,8 +350,11 @@ function common_current_user() common_ensure_session(); $id = isset($_SESSION['userid']) ? $_SESSION['userid'] : false; if ($id) { - $_cur = User::staticGet($id); - return $_cur; + $user = User::staticGet($id); + if ($user) { + $_cur = $user; + return $_cur; + } } } @@ -1420,25 +1423,18 @@ function common_shorten_url($long_url) if (empty($user)) { // common current user does not find a user when called from the XMPP daemon // therefore we'll set one here fix, so that XMPP given URLs may be shortened - $svc = 'ur1.ca'; + $shortenerName = 'ur1.ca'; } else { - $svc = $user->urlshorteningservice; - } - global $_shorteners; - if (!isset($_shorteners[$svc])) { - //the user selected service doesn't exist, so default to ur1.ca - $svc = 'ur1.ca'; - } - if (!isset($_shorteners[$svc])) { - // no shortener plugins installed. - return $long_url; + $shortenerName = $user->urlshorteningservice; } - $reflectionObj = new ReflectionClass($_shorteners[$svc]['callInfo'][0]); - $short_url_service = $reflectionObj->newInstanceArgs($_shorteners[$svc]['callInfo'][1]); - $short_url = $short_url_service->shorten($long_url); - - return $short_url; + if(Event::handle('StartShortenUrl', array($long_url,$shortenerName,&$shortenedUrl))){ + //URL wasn't shortened, so return the long url + return $long_url; + }else{ + //URL was shortened, so return the result + return $shortenedUrl; + } } function common_client_ip() diff --git a/locale/ar/LC_MESSAGES/statusnet.mo b/locale/ar/LC_MESSAGES/statusnet.mo Binary files differindex 396f81227..a6b411e4d 100644 --- a/locale/ar/LC_MESSAGES/statusnet.mo +++ b/locale/ar/LC_MESSAGES/statusnet.mo diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index d5000e633..af80e9c9c 100644 --- a/locale/ar/LC_MESSAGES/statusnet.po +++ b/locale/ar/LC_MESSAGES/statusnet.po @@ -6,12 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:58:39+0000\n" +"POT-Creation-Date: 2009-11-13 20:42+0000\n" +"PO-Revision-Date: 2009-11-13 20:42:15+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ar\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "لا صÙØØ© كهذه" #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -105,35 +108,41 @@ msgstr "أنت والأصدقاء" msgid "Updates from %1$s and friends on %2$s!" msgstr "" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." +msgstr "لم يوجد رمز التأكيد." -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +msgid "Could not update user." +msgstr "تعذّر تØديث المستخدم." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -141,15 +150,35 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +msgid "Could not update your design." +msgstr "تعذّر تØديث تصميمك." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "ليس للمستخدم مل٠شخصي." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "تعذّر ØÙظ المل٠الشخصي." + #: actions/apiblockcreate.php:108 msgid "Block user failed." -msgstr "" +msgstr "Ùشل منع المستخدم." #: actions/apiblockdestroy.php:107 msgid "Unblock user failed." @@ -185,13 +214,30 @@ msgstr "" #: actions/apidirectmessage.php:101 #, php-format msgid "Direct messages to %s" -msgstr "" +msgstr "رسالة مباشرة %s" #: actions/apidirectmessage.php:105 #, php-format msgid "All the direct messages sent to %s" msgstr "" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -349,7 +395,7 @@ msgstr "مجموعات %s" #: actions/apigrouplistall.php:94 #, php-format msgid "groups on %s" -msgstr "" +msgstr "مجموعات %s" #: actions/apigrouplist.php:95 #, php-format @@ -377,17 +423,17 @@ msgstr "ØÙØ°ÙÙت الØالة." msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "لم يوجد" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -410,7 +456,7 @@ msgstr "" #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" -msgstr "" +msgstr "مسار %s الزمني" #: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125 #: actions/userrss.php:92 @@ -441,7 +487,7 @@ msgstr "" #: actions/apitimelinetag.php:101 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" -msgstr "" +msgstr "الإشعارات الموسومة ب%s" #: actions/apitimelinetag.php:107 actions/tagrss.php:64 #, php-format @@ -469,7 +515,7 @@ msgid "Invalid size." msgstr "Øجم غير صالØ." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Ø£Ùتار" @@ -492,7 +538,7 @@ msgstr "إعدادات الأÙتار" #: actions/avatarsettings.php:126 actions/avatarsettings.php:202 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" -msgstr "" +msgstr "الأصلي" #: actions/avatarsettings.php:141 actions/avatarsettings.php:214 #: actions/grouplogo.php:210 actions/grouplogo.php:271 @@ -517,7 +563,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -631,9 +677,8 @@ msgid "No" msgstr "لا" #: actions/block.php:149 -#, fuzzy msgid "Do not block this user" -msgstr "ألغ٠منع هذا المستخدم" +msgstr "لا تمنع هذا المستخدم" #: actions/block.php:150 actions/deletenotice.php:146 #: actions/groupblock.php:179 @@ -667,7 +712,7 @@ msgstr "لم يوجد رمز التأكيد." #: actions/confirmaddress.php:85 msgid "That confirmation code is not for you!" -msgstr "" +msgstr "رمز التأكيد ليس لك!" #: actions/confirmaddress.php:90 #, php-format @@ -725,11 +770,11 @@ msgstr "" #: actions/deletenotice.php:109 actions/deletenotice.php:141 msgid "Delete notice" -msgstr "اØذ٠الملاØظة" +msgstr "اØذ٠الإشعار" #: actions/deletenotice.php:144 msgid "Are you sure you want to delete this notice?" -msgstr "أمتأكد من أنك تريد Øذ٠هذه الملاØظة؟" +msgstr "أمتأكد من أنك تريد Øذ٠هذا الإشعار؟" #: actions/deletenotice.php:145 msgid "Do not delete this notice" @@ -737,7 +782,7 @@ msgstr "لا تØذ٠هذا الإشعار" #: actions/deletenotice.php:146 lib/noticelist.php:522 msgid "Delete this notice" -msgstr "" +msgstr "اØذ٠هذا الإشعار" #: actions/deletenotice.php:157 msgid "There was a problem with your session token. Try again, please." @@ -745,7 +790,7 @@ msgstr "" #: actions/disfavor.php:81 msgid "This notice is not a favorite!" -msgstr "" +msgstr "هذا الشعار ليس Ù…Ùضلًا!" #: actions/disfavor.php:94 msgid "Add to favorites" @@ -753,12 +798,12 @@ msgstr "أض٠إلى المÙضلات" #: actions/doc.php:69 msgid "No such document." -msgstr "" +msgstr "لا مستند كهذا." #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" -msgstr "" +msgstr "عدّل مجموعة %s" #: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65 msgid "You must be logged in to create a group." @@ -767,11 +812,11 @@ msgstr "" #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 msgid "You must be an admin to edit the group" -msgstr "" +msgstr "يجب أن تكون إداريًا لتعدّل المجموعة" #: actions/editgroup.php:154 msgid "Use this form to edit the group." -msgstr "" +msgstr "استخدم هذا النموذج لتعديل المجموعة." #: actions/editgroup.php:201 actions/newgroup.php:145 #, php-format @@ -840,7 +885,7 @@ msgstr "البريد الإلكتروني الوارد" #: actions/emailsettings.php:138 actions/smssettings.php:157 msgid "Send email to this address to post new notices." -msgstr "" +msgstr "أرسل بريدًا إلكترونيًا إلى هذا العنوان لترسل إشعارات جديدة." #: actions/emailsettings.php:145 actions/smssettings.php:162 msgid "Make a new email address for posting to; cancels the old one." @@ -934,7 +979,7 @@ msgstr "" #: actions/emailsettings.php:382 actions/imsettings.php:355 msgid "That is the wrong IM address." -msgstr "" +msgstr "هذا عنوان Ù…Øادثة Ùورية خاطئ." #: actions/emailsettings.php:394 actions/imsettings.php:367 #: actions/smssettings.php:386 @@ -948,7 +993,7 @@ msgstr "هذا ليس عنوان بريدك الإلكتروني." #: actions/emailsettings.php:431 actions/imsettings.php:408 #: actions/smssettings.php:425 msgid "The address was removed." -msgstr "" +msgstr "أزيل هذا العنوان." #: actions/emailsettings.php:445 actions/smssettings.php:518 msgid "No incoming email address." @@ -1050,11 +1095,11 @@ msgstr "لا مرÙقات مرÙوعة" #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" -msgstr "" +msgstr "لم أتوقع هذا الرد!" #: actions/finishremotesubscribe.php:80 msgid "User being listened to does not exist." -msgstr "" +msgstr "المستخدم الذي تستمع إليه غير موجود." #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59 msgid "You can use the local subscription!" @@ -1066,7 +1111,7 @@ msgstr "" #: actions/finishremotesubscribe.php:106 msgid "You are not authorized." -msgstr "" +msgstr "لا تملك تصريØًا." #: actions/finishremotesubscribe.php:109 msgid "Could not convert request token to access token." @@ -1109,7 +1154,7 @@ msgstr "" #: actions/groupblock.php:100 msgid "User is not a member of group." -msgstr "" +msgstr "المستخدم ليس عضوًا ÙÙŠ المجموعة." #: actions/groupblock.php:136 actions/groupmembers.php:314 msgid "Block user from group" @@ -1141,7 +1186,7 @@ msgstr "لا هوية" #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." -msgstr "" +msgstr "يجب أن تلج لتÙعدّل المجموعات." #: actions/groupdesignsettings.php:141 msgid "Group design" @@ -1156,7 +1201,7 @@ msgstr "" #: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 #: lib/designsettings.php:434 lib/designsettings.php:464 msgid "Couldn't update your design." -msgstr "" +msgstr "تعذّر تØديث تصميمك." #: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 @@ -1184,16 +1229,16 @@ msgstr "" #: actions/grouplogo.php:396 msgid "Logo updated." -msgstr "" +msgstr "ØÙدّث الشعار." #: actions/grouplogo.php:398 msgid "Failed updating logo." -msgstr "" +msgstr "Ùشل رÙع الشعار." #: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" -msgstr "" +msgstr "أعضاء مجموعة %s" #: actions/groupmembers.php:96 #, php-format @@ -1293,7 +1338,7 @@ msgstr "" #: actions/groupunblock.php:128 actions/unblock.php:108 msgid "Error removing the block." -msgstr "" +msgstr "خطأ أثناء منع الØجب." #: actions/imsettings.php:59 msgid "IM Settings" @@ -1358,7 +1403,7 @@ msgstr "" #: actions/imsettings.php:296 msgid "Not a valid Jabber ID" -msgstr "" +msgstr "ليست هوية جابر صالØØ©" #: actions/imsettings.php:299 msgid "That is already your Jabber ID." @@ -1409,11 +1454,11 @@ msgstr "عنوان بريد إلكتروني غير صالØ: %s" #: actions/invite.php:110 msgid "Invitation(s) sent" -msgstr "" +msgstr "Ø£Ùرسلت الدعوة" #: actions/invite.php:112 msgid "Invite new users" -msgstr "" +msgstr "ادع٠مستخدمين جددًا" #: actions/invite.php:128 msgid "You are already subscribed to these users:" @@ -1422,7 +1467,7 @@ msgstr "" #: actions/invite.php:131 actions/invite.php:139 #, php-format msgid "%s (%s)" -msgstr "" +msgstr "%s (%s)" #: actions/invite.php:136 msgid "" @@ -1516,7 +1561,7 @@ msgstr "" #: actions/joingroup.php:135 lib/command.php:239 #, php-format msgid "%s joined group %s" -msgstr "" +msgstr "%s انضم إلى مجموعة %s" #: actions/leavegroup.php:60 msgid "You must be logged in to leave a group." @@ -1573,7 +1618,7 @@ msgid "Nickname" msgstr "الاسم المستعار" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "كلمة السر" @@ -1623,7 +1668,7 @@ msgstr "" #: actions/microsummary.php:69 msgid "No current status" -msgstr "" +msgstr "لا Øالة Øالية" #: actions/newgroup.php:53 msgid "New group" @@ -1631,7 +1676,7 @@ msgstr "مجموعة جديدة" #: actions/newgroup.php:110 msgid "Use this form to create a new group." -msgstr "" +msgstr "استخدم هذا النموذج لإنشاء مجموعة جديدة." #: actions/newmessage.php:71 actions/newmessage.php:231 msgid "New message" @@ -1666,7 +1711,7 @@ msgstr "" #: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170 msgid "Ajax Error" -msgstr "" +msgstr "خطأ أجاكس" #: actions/newnotice.php:69 msgid "New notice" @@ -1702,7 +1747,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1746,18 +1791,18 @@ msgstr "نوع المØتوى " msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "" #: actions/opensearch.php:64 msgid "People Search" -msgstr "" +msgstr "بØØ« الأشخاص" #: actions/opensearch.php:67 msgid "Notice Search" -msgstr "" +msgstr "بØØ« الإشعارات" #: actions/othersettings.php:60 msgid "Other Settings" @@ -1767,11 +1812,15 @@ msgstr "إعدادات أخرى" msgid "Manage various other options." msgstr "" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr " (خدمة Øرة)" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "قصّر المسارات بـ" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "" @@ -1805,65 +1854,60 @@ msgstr "" msgid "Change password" msgstr "غيّر كلمة السر" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "غير كلمة سرّك" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 msgid "Change your password." msgstr "غيّر كلمة سرك." -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "تغيير كلمة السر" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "كلمة السر القديمة" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "كلمة سر جديدة" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" -msgstr "أكد" +msgstr "أكّد" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" -msgstr "" +msgstr "Ù†Ùس كلمة السر أعلاه" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "غيّر" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "كلمتا السر غير متطابقتين." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "كلمة السر القديمة غير صØÙŠØØ©" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "خطأ أثناء ØÙظ المستخدم؛ غير صالØ." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." -msgstr "" +msgstr "تعذّر ØÙظ كلمة السر الجديدة." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "ØÙÙظت كلمة السر." @@ -1876,7 +1920,7 @@ msgstr "" #: actions/peoplesearch.php:58 msgid "People search" -msgstr "" +msgstr "بØØ« الأشخاص" #: actions/peopletag.php:70 #, php-format @@ -1899,7 +1943,7 @@ msgstr "" #: actions/profilesettings.php:60 msgid "Profile settings" -msgstr "" +msgstr "إعدادات المل٠الشخصي" #: actions/profilesettings.php:71 msgid "" @@ -1936,7 +1980,7 @@ msgstr "" #: actions/profilesettings.php:125 actions/register.php:463 msgid "Describe yourself and your interests" -msgstr "" +msgstr "صÙÙ Ù†Ùسك واهتماماتك" #: actions/profilesettings.php:127 actions/register.php:465 msgid "Bio" @@ -2013,7 +2057,7 @@ msgstr "تعذّر ØÙظ المل٠الشخصي." #: actions/profilesettings.php:336 msgid "Couldn't save tags." -msgstr "" +msgstr "تعذّر ØÙظ الوسوم." #: actions/profilesettings.php:344 msgid "Settings saved." @@ -2022,7 +2066,7 @@ msgstr "ØÙÙظت الإعدادات." #: actions/public.php:83 #, php-format msgid "Beyond the page limit (%s)" -msgstr "" +msgstr "وراء Øد الصÙØØ© (%s)" #: actions/public.php:92 msgid "Could not retrieve public stream." @@ -2031,7 +2075,7 @@ msgstr "" #: actions/public.php:129 #, php-format msgid "Public timeline, page %d" -msgstr "" +msgstr "المسار الزمني العام، صÙØØ© %d" #: actions/public.php:131 lib/publicgroupnav.php:79 msgid "Public timeline" @@ -2099,7 +2143,7 @@ msgstr "" #: actions/publictagcloud.php:72 msgid "Be the first to post one!" -msgstr "" +msgstr "كن أول من ÙŠÙرسل!" #: actions/publictagcloud.php:75 #, php-format @@ -2114,7 +2158,7 @@ msgstr "سØابة الوسوم" #: actions/recoverpassword.php:36 msgid "You are already logged in!" -msgstr "" +msgstr "أنت والج بالÙعل!" #: actions/recoverpassword.php:62 msgid "No such recovery code." @@ -2134,7 +2178,7 @@ msgstr "خطأ ÙÙŠ رمز التأكيد." #: actions/recoverpassword.php:97 msgid "This confirmation code is too old. Please start again." -msgstr "" +msgstr "رمز التأكيد هذا قديم جدًا. من Ùضلك ابدأ من جديد." #: actions/recoverpassword.php:111 msgid "Could not update user with confirmed email address." @@ -2152,7 +2196,7 @@ msgstr "" #: actions/recoverpassword.php:188 msgid "Password recovery" -msgstr "" +msgstr "استعادة كلمة السر" #: actions/recoverpassword.php:191 msgid "Nickname or email address" @@ -2164,7 +2208,7 @@ msgstr "" #: actions/recoverpassword.php:199 actions/recoverpassword.php:200 msgid "Recover" -msgstr "" +msgstr "استرجع" #: actions/recoverpassword.php:208 msgid "Reset password" @@ -2172,11 +2216,11 @@ msgstr "أعد ضبط كلمة السر" #: actions/recoverpassword.php:209 msgid "Recover password" -msgstr "" +msgstr "استعد كلمة السر" #: actions/recoverpassword.php:210 actions/recoverpassword.php:322 msgid "Password recovery requested" -msgstr "" +msgstr "Ø·Ùلبت استعادة كلمة السر" #: actions/recoverpassword.php:213 msgid "Unknown action" @@ -2188,15 +2232,15 @@ msgstr "" #: actions/recoverpassword.php:240 msgid "Same as password above" -msgstr "" +msgstr "Ù†Ùس كلمة السر أعلاه" #: actions/recoverpassword.php:243 msgid "Reset" -msgstr "" +msgstr "أعد الضبط" #: actions/recoverpassword.php:252 msgid "Enter a nickname or email address." -msgstr "" +msgstr "أدخل اسمًا مستعارًا أو عنوان بريد إلكتروني." #: actions/recoverpassword.php:272 msgid "No user with that email address or username." @@ -2251,7 +2295,7 @@ msgstr "سجّل" #: actions/register.php:135 msgid "Registration not allowed." -msgstr "" +msgstr "لا ÙŠÙØ³Ù…Ø Ø¨Ø§Ù„ØªØ³Ø¬ÙŠÙ„." #: actions/register.php:198 msgid "You can't register if you don't agree to the license." @@ -2288,7 +2332,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "البريد الإلكتروني" @@ -2306,7 +2350,7 @@ msgstr "" #: actions/register.php:495 msgid "Creative Commons Attribution 3.0" -msgstr "" +msgstr "المشاع المبدع نسبة المنص٠إلى مؤلÙÙ‡ 3.0" #: actions/register.php:496 msgid "" @@ -2353,7 +2397,7 @@ msgstr "اشتراك بعيد" #: actions/remotesubscribe.php:124 msgid "Subscribe to a remote user" -msgstr "" +msgstr "اشترك بمستخدم بعيد" #: actions/remotesubscribe.php:129 msgid "User nickname" @@ -2397,12 +2441,12 @@ msgstr "" #: lib/personalgroupnav.php:105 #, php-format msgid "Replies to %s" -msgstr "" +msgstr "الردود على %s" #: actions/replies.php:127 #, php-format msgid "Replies to %s, page %d" -msgstr "" +msgstr "الردود على %sØŒ الصÙØØ© %d" #: actions/replies.php:144 #, php-format @@ -2781,11 +2825,11 @@ msgstr "" #: actions/subedit.php:83 msgid "Could not save subscription." -msgstr "" +msgstr "تعذّر ØÙظ الاشتراك." #: actions/subscribe.php:55 msgid "Not a local user." -msgstr "" +msgstr "ليس Ù…Ùستخدمًا Ù…Øليًا." #: actions/subscribe.php:69 msgid "Subscribed" @@ -2794,12 +2838,12 @@ msgstr "Ù…Ùشترك" #: actions/subscribers.php:50 #, php-format msgid "%s subscribers" -msgstr "" +msgstr "مشتركو %s" #: actions/subscribers.php:52 #, php-format msgid "%s subscribers, page %d" -msgstr "" +msgstr "مشتركو %sØŒ الصÙØØ© %d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -2831,12 +2875,12 @@ msgstr "" #: actions/subscriptions.php:52 #, php-format msgid "%s subscriptions" -msgstr "" +msgstr "اشتراكات %s" #: actions/subscriptions.php:54 #, php-format msgid "%s subscriptions, page %d" -msgstr "" +msgstr "اشتراكات %sØŒ الصÙØØ© %d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." @@ -2876,7 +2920,7 @@ msgstr "لست والجًا" #: actions/tagother.php:39 msgid "No id argument." -msgstr "" +msgstr "لا Ù…Ùدخل هوية." #: actions/tagother.php:65 #, php-format @@ -2948,7 +2992,7 @@ msgstr "" #: actions/unsubscribe.php:84 msgid "No profile with that id." -msgstr "" +msgstr "لا مل٠بهذه الهوية." #: actions/unsubscribe.php:98 msgid "Unsubscribed" @@ -2993,7 +3037,7 @@ msgstr "ارÙض هذا الاشتراك" #: actions/userauthorization.php:225 msgid "No authorization request!" -msgstr "" +msgstr "لا طلب استيثاق!" #: actions/userauthorization.php:247 msgid "Subscription authorized" @@ -3008,7 +3052,7 @@ msgstr "" #: actions/userauthorization.php:259 msgid "Subscription rejected" -msgstr "" +msgstr "رÙÙض الاشتراك" #: actions/userauthorization.php:261 msgid "" @@ -3151,36 +3195,36 @@ msgstr "مشكلة أثناء ØÙظ الإشعار." msgid "DB error inserting reply: %s" msgstr "" -#: classes/User.php:333 +#: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "المل٠الشخصي" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "غيّر إعدادات ملÙÙƒ الشخصي" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "غير كلمة سرّك" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "غير أسلوب التعامل مع البريد الإلكتروني" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "التصميم" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 msgid "Design your profile" msgstr "صمّم ملÙÙƒ الشخصي" @@ -3188,7 +3232,7 @@ msgstr "صمّم ملÙÙƒ الشخصي" msgid "Other" msgstr "أخرى" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "خيارات أخرى" @@ -3211,7 +3255,7 @@ msgstr "الرئيسية" #: lib/action.php:430 msgid "Personal profile and friends timeline" -msgstr "" +msgstr "المل٠الشخصي ومسار الأصدقاء الزمني" #: lib/action.php:432 msgid "Account" @@ -3368,7 +3412,7 @@ msgstr "" #: lib/attachmentlist.php:87 msgid "Attachments" -msgstr "" +msgstr "مرÙقات" #: lib/attachmentlist.php:265 msgid "Author" @@ -3442,7 +3486,7 @@ msgstr "" #: lib/command.php:315 #, php-format msgid "%1$s (%2$s)" -msgstr "" +msgstr "%1$s (%2$s)" #: lib/command.php:318 #, php-format @@ -3485,7 +3529,7 @@ msgstr "رÙد على رسالة %s" #: lib/command.php:441 msgid "Error saving notice." -msgstr "خطأ أثناء ØÙظ الملاØظة." +msgstr "خطأ أثناء ØÙظ الإشعار." #: lib/command.php:495 msgid "Specify the name of the user to subscribe to" @@ -3494,7 +3538,7 @@ msgstr "" #: lib/command.php:502 #, php-format msgid "Subscribed to %s" -msgstr "" +msgstr "Ù…Ùشترك ب%s" #: lib/command.php:523 msgid "Specify the name of the user to unsubscribe from" @@ -3571,19 +3615,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:189 msgid "No configuration file found. " msgstr "" -#: lib/common.php:192 +#: lib/common.php:190 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:191 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:192 msgid "Go to the installer." msgstr "اذهب إلى المÙثبّت." @@ -3682,15 +3726,15 @@ msgstr "استعيدت مبدئيات التصميم." #: lib/disfavorform.php:114 lib/disfavorform.php:140 msgid "Disfavor this notice" -msgstr "" +msgstr "ألغ٠تÙضيل هذا الإشعار" #: lib/favorform.php:114 lib/favorform.php:140 msgid "Favor this notice" -msgstr "" +msgstr "Ùضّل هذا الإشعار" #: lib/favorform.php:140 msgid "Favor" -msgstr "" +msgstr "Ùضّل" #: lib/feedlist.php:64 msgid "Export data" @@ -3710,7 +3754,7 @@ msgstr "أتوم" #: lib/feed.php:91 msgid "FOAF" -msgstr "" +msgstr "FOAF" #: lib/galleryaction.php:121 msgid "Filter tags" @@ -3839,11 +3883,11 @@ msgstr "" #: lib/imagefile.php:150 lib/imagefile.php:197 msgid "Unknown file type" -msgstr "" +msgstr "نوع مل٠غير معروÙ" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" +msgid "[%s]" msgstr "" #: lib/joinform.php:114 @@ -3955,7 +3999,7 @@ msgstr "" #: lib/mail.php:412 #, php-format msgid "%s status" -msgstr "" +msgstr "Øالة %s" #: lib/mail.php:438 msgid "SMS confirmation" @@ -3985,7 +4029,7 @@ msgstr "" #: lib/mail.php:509 #, php-format msgid "New private message from %s" -msgstr "" +msgstr "رسالة خاصة جديدة من %s" #: lib/mail.php:513 #, php-format @@ -4106,7 +4150,7 @@ msgstr "" #: lib/messageform.php:120 msgid "Send a direct notice" -msgstr "أرسل ملاØظة مباشرة" +msgstr "أرسل إشعارًا مباشرًا" #: lib/messageform.php:146 msgid "To" @@ -4167,11 +4211,11 @@ msgstr "" #: lib/oauthstore.php:311 msgid "Error inserting remote profile" -msgstr "" +msgstr "خطأ أثناء إدراج المل٠الشخصي البعيد" #: lib/oauthstore.php:345 msgid "Duplicate notice" -msgstr "" +msgstr "ضاع٠الإشعار" #: lib/oauthstore.php:487 msgid "Couldn't insert new subscription." @@ -4187,7 +4231,7 @@ msgstr "الردود" #: lib/personalgroupnav.php:114 msgid "Favorites" -msgstr "Ù…Ùضلات" +msgstr "المÙضلات" #: lib/personalgroupnav.php:115 msgid "User" @@ -4207,7 +4251,7 @@ msgstr "صندوق الصادر" #: lib/personalgroupnav.php:130 msgid "Your sent messages" -msgstr "" +msgstr "رسائلك المÙرسلة" #: lib/personaltagcloudsection.php:56 #, php-format @@ -4272,11 +4316,11 @@ msgstr "ابØØ« ÙÙŠ المساعدة" #: lib/searchgroupnav.php:80 msgid "People" -msgstr "" +msgstr "أشخاص" #: lib/searchgroupnav.php:81 msgid "Find people on this site" -msgstr "" +msgstr "ابØØ« عن أشخاص على هذا الموقع" #: lib/searchgroupnav.php:82 msgid "Notice" @@ -4301,17 +4345,17 @@ msgstr "المزيد..." #: lib/subgroupnav.php:83 #, php-format msgid "People %s subscribes to" -msgstr "" +msgstr "الأشخاص الذين اشترك بهم %s" #: lib/subgroupnav.php:91 #, php-format msgid "People subscribed to %s" -msgstr "" +msgstr "الأشخاص المشتركون ب%s" #: lib/subgroupnav.php:99 #, php-format msgid "Groups %s is a member of" -msgstr "" +msgstr "المجموعات التي %s عضو Ùيها" #: lib/subscriberspeopleselftagcloudsection.php:48 #: lib/subscriptionspeopleselftagcloudsection.php:48 @@ -4329,7 +4373,7 @@ msgstr "(لا شيء)" #: lib/subs.php:48 msgid "Already subscribed!" -msgstr "" +msgstr "Ù…Ùشترك أصلا!" #: lib/subs.php:52 msgid "User has blocked you." @@ -4344,8 +4388,9 @@ msgid "Could not subscribe other to you." msgstr "" #: lib/subs.php:124 -msgid "Not subscribed!." -msgstr "" +#, fuzzy +msgid "Not subscribed!" +msgstr "لست Ù…Ùشتركًا!" #: lib/subs.php:136 msgid "Couldn't delete subscription." @@ -4391,54 +4436,54 @@ msgstr "أرسل رسالة مباشرة إلى هذا المستخدم" msgid "Message" msgstr "رسالة" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "قبل Ù„Øظات قليلة" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "قبل دقيقة تقريبًا" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "قبل ساعة تقريبًا" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "قبل يوم تقريبا" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "قبل شهر تقريبًا" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "قبل سنة تقريبًا" #: lib/webcolor.php:82 #, php-format msgid "%s is not a valid color!" -msgstr "" +msgstr "%s ليس لونًا صØÙŠØًا!" #: lib/webcolor.php:123 #, php-format @@ -4447,7 +4492,7 @@ msgstr "" #: scripts/maildaemon.php:48 msgid "Could not parse message." -msgstr "" +msgstr "تعذّر تØليل الرسالة." #: scripts/maildaemon.php:53 msgid "Not a registered user." diff --git a/locale/bg/LC_MESSAGES/statusnet.mo b/locale/bg/LC_MESSAGES/statusnet.mo Binary files differindex a05e3245c..518f6949a 100644 --- a/locale/bg/LC_MESSAGES/statusnet.mo +++ b/locale/bg/LC_MESSAGES/statusnet.mo diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index 33844a4c7..c47a06d3d 100644 --- a/locale/bg/LC_MESSAGES/statusnet.po +++ b/locale/bg/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:58:41+0000\n" +"POT-Creation-Date: 2009-11-13 20:42+0000\n" +"PO-Revision-Date: 2009-11-13 20:42:18+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: bg\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "ÐÑма такъв етикет." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -106,35 +109,42 @@ msgstr "%s и приÑтели" msgid "Updates from %1$s and friends on %2$s!" msgstr "Бележки от %1$s и приÑтели в %2$s." -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "Ðе е открит методът в API." -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Този метод изиÑква заÑвка POST." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Грешка при обновÑване на потребителÑ." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -142,12 +152,34 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "Грешка при запиÑване наÑтройките за Twitter" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Грешка при обновÑване на потребителÑ." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "ПотребителÑÑ‚ нÑма профил." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Грешка при запазване на профила." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "" @@ -195,6 +227,23 @@ msgstr "Преки ÑÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð´Ð¾ %s" msgid "All the direct messages sent to %s" msgstr "Ð’Ñички преки ÑъобщениÑ, изпратени до %s" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "Ðе е открит методът в API." + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -392,17 +441,17 @@ msgstr "Ðватарът е обновен." msgid "No status with that ID found." msgstr "Ðе е открита бележка Ñ Ñ‚Ð°ÐºÑŠÐ² идентификатор." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Твърде дълга бележка. ТрÑбва да е най-много 140 знака." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "Ðе е открито." -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -486,7 +535,7 @@ msgid "Invalid size." msgstr "Ðеправилен размер." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Ðватар" @@ -534,7 +583,7 @@ msgstr "ИзрÑзване" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1672,7 +1721,7 @@ msgid "Nickname" msgstr "ПÑевдоним" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Парола" @@ -1811,7 +1860,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1856,8 +1905,8 @@ msgstr "Свързване" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Ðеподдържан формат на данните" @@ -1877,11 +1926,15 @@ msgstr "Други наÑтройки" msgid "Manage various other options." msgstr "Управление на различни други наÑтройки." -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "УÑлуга за автоматично Ñъкращаване, коÑто да Ñе ползва." @@ -1916,66 +1969,61 @@ msgstr "Това е изходÑщата ви ÐºÑƒÑ‚Ð¸Ñ Ñ Ð»Ð¸Ñ‡Ð½Ð¸ ÑÑŠÐ¾Ð±Ñ msgid "Change password" msgstr "СмÑна на паролата" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "СмÑна на паролата" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 msgid "Change your password." msgstr "СмÑна на паролата." -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Паролата е запиÑана." -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Стара парола" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Ðова парола" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 или повече знака" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Потвърждаване" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "Ñъщо като паролата по-горе" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "ПромÑна" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Паролата Ñ‚Ñ€Ñбва да е 6 или повече знака." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Паролите не Ñъвпадат." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Грешна Ñтара парола" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Грешка при запазване на потребител — невалидноÑÑ‚." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Грешка при запазване на новата парола." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Паролата е запиÑана." @@ -2414,7 +2462,7 @@ msgid "Same as password above. Required." msgstr "Същото като паролата по-горе. Задължително поле." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Е-поща" @@ -3341,36 +3389,36 @@ msgstr "Проблем при запиÑване на бележката." msgid "DB error inserting reply: %s" msgstr "Грешка в базата от данни — отговор при вмъкването: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Съобщение до %1$s в %2$s" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Профил" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "ПромÑна наÑтройките на профила" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "Качване на аватар" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "СмÑна на паролата" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "ПромÑна обработката на пиÑмата" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "ПотребителÑки профил" @@ -3379,7 +3427,7 @@ msgstr "ПотребителÑки профил" msgid "Other" msgstr "Друго" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Други наÑтройки" @@ -3775,20 +3823,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:189 #, fuzzy msgid "No configuration file found. " msgstr "ÐÑма код за потвърждение." -#: lib/common.php:192 +#: lib/common.php:190 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:191 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:192 #, fuzzy msgid "Go to the installer." msgstr "Влизане в Ñайта" @@ -4060,8 +4108,8 @@ msgstr "Ðеподдържан вид файл" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "Ðова бележка" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 msgid "Join" @@ -4575,7 +4623,8 @@ msgid "Could not subscribe other to you." msgstr "Грешка при абониране на друг потребител за ваÑ." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "Ðе Ñте абонирани!" #: lib/subs.php:136 @@ -4624,47 +4673,47 @@ msgstr "Изпращате на прÑко Ñъобщение до този по msgid "Message" msgstr "Съобщение" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "преди нÑколко Ñекунди" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "преди около минута" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "преди около %d минути" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "преди около чаÑ" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "преди около %d чаÑа" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "преди около ден" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "преди около %d дни" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "преди около меÑец" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "преди около %d меÑеца" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "преди около година" diff --git a/locale/ca/LC_MESSAGES/statusnet.mo b/locale/ca/LC_MESSAGES/statusnet.mo Binary files differindex ac01d8ed9..c52451e28 100644 --- a/locale/ca/LC_MESSAGES/statusnet.mo +++ b/locale/ca/LC_MESSAGES/statusnet.mo diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index 11d83cad8..c76ac05a3 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:58:44+0000\n" +"POT-Creation-Date: 2009-11-13 20:42+0000\n" +"PO-Revision-Date: 2009-11-13 20:42:21+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "No existeix aquesta etiqueta." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -106,35 +109,42 @@ msgstr "%s i amics" msgid "Updates from %1$s and friends on %2$s!" msgstr "Actualitzacions de %1$s i amics a %2$s!" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "No s'ha trobat el mètode API!" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Aquest mètode requereix POST." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "No s'ha pogut actualitzar l'usuari." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -142,12 +152,34 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "No s'ha pogut guardar la teva configuració de Twitter!" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "No s'ha pogut actualitzar l'usuari." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "L'usuari no té perfil." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "No s'ha pogut guardar el perfil." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "Ha fallat el bloqueig d'usuari." @@ -193,6 +225,23 @@ msgstr "Missatges directes a %s" msgid "All the direct messages sent to %s" msgstr "Tots els missatges directes enviats a %s" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "No s'ha trobat el mètode API!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -390,17 +439,17 @@ msgstr "Avatar actualitzat." msgid "No status with that ID found." msgstr "No s'ha trobat cap estatus amb la ID trobada." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Massa llarg. La longitud mà xima és de 140 carà cters." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "No s'ha trobat" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -484,7 +533,7 @@ msgid "Invalid size." msgstr "Mida invà lida." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" @@ -532,7 +581,7 @@ msgstr "Crop" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1691,7 +1740,7 @@ msgid "Nickname" msgstr "Sobrenom" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Contrasenya" @@ -1830,7 +1879,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1877,8 +1926,8 @@ msgstr "Connectar-se" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Format de data no suportat." @@ -1898,11 +1947,15 @@ msgstr "Altres configuracions" msgid "Manage various other options." msgstr "Gestionar altres và ries opcions." -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "Servei d'auto-escurçament a utilitzar." @@ -1940,65 +1993,60 @@ msgstr "" msgid "Change password" msgstr "Canviar contrasenya" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Canviar la teva contrasenya" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 msgid "Change your password." msgstr "Canviar contrasenya" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "Contrasenya canviada." -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Antiga contrasenya" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Nova contrasenya" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 o més carà cters" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirmar" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "repeteix la contrasenya anterior" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Canviar" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "La contrasenya hauria de ser d'entre 6 a més carà cters." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Les contrasenyes no coincideixen." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Contrasenya antiga incorrecta" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Error en guardar usuari; invà lid." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "No es pot guardar la nova contrasenya." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Contrasenya guardada." @@ -2444,7 +2492,7 @@ msgid "Same as password above. Required." msgstr "Igual a la contrasenya de dalt. Requerit." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Correu electrònic" @@ -3379,36 +3427,36 @@ msgstr "Problema en guardar l'avÃs." msgid "DB error inserting reply: %s" msgstr "Error de BD en inserir resposta: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Missatge per a %1$s a %2$s" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Perfil" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Canviar les preferències del teu perfil" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "Pujar un avatar" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Canviar la teva contrasenya" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Canviar correu electrònic" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "Perfil de l'usuari" @@ -3417,7 +3465,7 @@ msgstr "Perfil de l'usuari" msgid "Other" msgstr "Altres" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Altres opcions" @@ -3807,20 +3855,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:189 #, fuzzy msgid "No configuration file found. " msgstr "Cap codi de confirmació." -#: lib/common.php:192 +#: lib/common.php:190 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:191 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:192 #, fuzzy msgid "Go to the installer." msgstr "Accedir a aquest lloc" @@ -4090,8 +4138,8 @@ msgstr "Tipus de fitxer desconegut" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "Nou avÃs" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 msgid "Join" @@ -4613,7 +4661,8 @@ msgid "Could not subscribe other to you." msgstr "No pots subscriure a un altre a tu mateix." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "No està s subscrit!" #: lib/subs.php:136 @@ -4662,47 +4711,47 @@ msgstr "Enviar un missatge directe a aquest usuari" msgid "Message" msgstr "Missatge" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "fa pocs segons" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "fa un minut" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "fa %d minuts" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "fa una hora" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "fa %d hores" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "fa un dia" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "fa %d dies" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "fa un mes" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "fa %d mesos" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "fa un any" diff --git a/locale/cs/LC_MESSAGES/statusnet.mo b/locale/cs/LC_MESSAGES/statusnet.mo Binary files differindex 275a5e3a3..e3141e70a 100644 --- a/locale/cs/LC_MESSAGES/statusnet.mo +++ b/locale/cs/LC_MESSAGES/statusnet.mo diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index 17a12027f..36e0f1c40 100644 --- a/locale/cs/LC_MESSAGES/statusnet.po +++ b/locale/cs/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:58:47+0000\n" +"POT-Creation-Date: 2009-11-13 20:42+0000\n" +"PO-Revision-Date: 2009-11-13 20:42:23+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: cs\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "Žádné takové oznámenÃ." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -106,35 +109,42 @@ msgstr "%s a přátelé" msgid "Updates from %1$s and friends on %2$s!" msgstr "" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." +msgstr "PotvrzujÃcà kód nebyl nalezen" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Nelze aktualizovat uživatele" + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -142,12 +152,33 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Nelze aktualizovat uživatele" + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "Uživatel nemá profil." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Nelze uložit profil" + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "" @@ -193,6 +224,23 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -387,17 +435,17 @@ msgstr "Obrázek nahrán" msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Je to pÅ™ÃliÅ¡ dlouhé. Maximálnà sdÄ›lenà délka je 140 znaků" -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -482,7 +530,7 @@ msgid "Invalid size." msgstr "Neplatná velikost" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Obrázek" @@ -531,7 +579,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1637,7 +1685,7 @@ msgid "Nickname" msgstr "PÅ™ezdÃvka" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Heslo" @@ -1772,7 +1820,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1817,8 +1865,8 @@ msgstr "PÅ™ipojit" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "" @@ -1839,11 +1887,15 @@ msgstr "NastavenÃ" msgid "Manage various other options." msgstr "" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "" @@ -1879,66 +1931,62 @@ msgstr "" msgid "Change password" msgstr "ZmÄ›nit heslo" -#: actions/passwordsettings.php:70 -msgid "You are not allowed to change your password" -msgstr "" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 #, fuzzy msgid "Change your password." msgstr "ZmÄ›nit heslo" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Heslo uloženo" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Staré heslo" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Nové heslo" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 a vÃce znaků" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Heslo znovu" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "stejné jako heslo výše" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "ZmÄ›nit" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Hesla nesouhlasÃ" -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Neplatné heslo" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Chyba pÅ™i ukládanà uživatele; neplatný" -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Nelze uložit nové heslo" -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Heslo uloženo" @@ -2377,7 +2425,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Email" @@ -3285,37 +3333,37 @@ msgstr "Problém pÅ™i ukládánà sdÄ›lenÃ" msgid "DB error inserting reply: %s" msgstr "Chyba v DB pÅ™i vkládánà odpovÄ›di: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 #, fuzzy msgid "Upload an avatar" msgstr "Nahrávánà obrázku selhalo." -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "Uživatel nemá profil." @@ -3324,7 +3372,7 @@ msgstr "Uživatel nemá profil." msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "" @@ -3721,20 +3769,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:189 #, fuzzy msgid "No configuration file found. " msgstr "Žádný potvrzujÃcà kód." -#: lib/common.php:192 +#: lib/common.php:190 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:191 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:192 msgid "Go to the installer." msgstr "" @@ -4007,8 +4055,8 @@ msgstr "" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "Nové sdÄ›lenÃ" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 #, fuzzy @@ -4531,7 +4579,8 @@ msgid "Could not subscribe other to you." msgstr "" #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "NepÅ™ihlášen!" #: lib/subs.php:136 @@ -4580,47 +4629,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "pÅ™ed pár sekundami" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "asi pÅ™ed minutou" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "asi pÅ™ed %d minutami" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "asi pÅ™ed hodinou" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "asi pÅ™ed %d hodinami" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "asi pÅ™ede dnem" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "pÅ™ed %d dny" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "asi pÅ™ed mÄ›sÃcem" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "asi pÅ™ed %d mesÃci" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "asi pÅ™ed rokem" diff --git a/locale/de/LC_MESSAGES/statusnet.mo b/locale/de/LC_MESSAGES/statusnet.mo Binary files differindex 9591afa0b..b5c2ef5d0 100644 --- a/locale/de/LC_MESSAGES/statusnet.mo +++ b/locale/de/LC_MESSAGES/statusnet.mo diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index 0cca46cb4..93ce64cd5 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -6,12 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:58:49+0000\n" +"POT-Creation-Date: 2009-11-13 20:42+0000\n" +"PO-Revision-Date: 2009-11-13 20:42:26+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: out-statusnet\n" @@ -23,12 +23,15 @@ msgid "No such page" msgstr "Tag nicht vorhanden." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -107,35 +110,42 @@ msgstr "%s und Freunde" msgid "Updates from %1$s and friends on %2$s!" msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "API-Methode nicht gefunden!" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Diese Methode benötigt ein POST." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Konnte Benutzerdaten nicht aktualisieren." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -143,12 +153,34 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "Konnte Twitter Einstellungen nicht speichern!" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Konnte Benutzerdaten nicht aktualisieren." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "Benutzer hat kein Profil." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Konnte Profil nicht speichern." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "Blockieren des Benutzers fehlgeschlagen." @@ -197,6 +229,23 @@ msgstr "Direkte Nachricht an %s" msgid "All the direct messages sent to %s" msgstr "Alle an %s gesendeten direkten Nachrichten" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "API-Methode nicht gefunden!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -394,18 +443,18 @@ msgstr "Avatar aktualisiert." msgid "No status with that ID found." msgstr "Keine Nachricht mit dieser ID gefunden." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" "Das war zu lang. Die Länge einer Nachricht ist auf 140 Zeichen beschränkt." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "Nicht gefunden" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -489,7 +538,7 @@ msgid "Invalid size." msgstr "Ungültige Größe." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" @@ -538,7 +587,7 @@ msgstr "Zuschneiden" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1698,7 +1747,7 @@ msgid "Nickname" msgstr "Nutzername" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Passwort" @@ -1837,7 +1886,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1884,8 +1933,8 @@ msgstr "Verbinden" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Kein unterstütztes Datenformat." @@ -1905,11 +1954,15 @@ msgstr "Andere Einstellungen" msgid "Manage various other options." msgstr "Verwalte zahlreiche andere Einstellungen." -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "URL-Auto-Kürzungs-Dienst." @@ -1945,65 +1998,60 @@ msgstr "" msgid "Change password" msgstr "Passwort ändern" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Ändere dein Passwort" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 msgid "Change your password." msgstr "Ändere dein Passwort." -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "Passwort geändert" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Altes Passwort" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Neues Passwort" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 oder mehr Zeichen" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Bestätigen" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "Gleiches Passwort wie oben" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Ändern" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Das Passwort muss aus 6 oder mehr Zeichen bestehen." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Passwörter stimmen nicht überein." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Altes Passwort falsch" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Fehler beim Speichern des Nutzers, ungültig." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Konnte neues Passwort nicht speichern" -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Passwort gespeichert." @@ -2450,7 +2498,7 @@ msgid "Same as password above. Required." msgstr "Gleiches Passwort wie zuvor. Pflichteingabe." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "E-Mail" @@ -3390,36 +3438,36 @@ msgstr "Problem bei Speichern der Nachricht." msgid "DB error inserting reply: %s" msgstr "Datenbankfehler beim Einfügen der Antwort: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Nachricht an %1$s auf %2$s" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Ändern der Profileinstellungen" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "Avatar hochladen" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Ändere dein Passwort" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Ändere die E-Mail Verarbeitung" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "Benutzerprofil" @@ -3428,7 +3476,7 @@ msgstr "Benutzerprofil" msgid "Other" msgstr "Sonstige" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Sonstige Optionen" @@ -3819,20 +3867,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:189 #, fuzzy msgid "No configuration file found. " msgstr "Kein Bestätigungs-Code." -#: lib/common.php:192 +#: lib/common.php:190 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:191 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:192 #, fuzzy msgid "Go to the installer." msgstr "Auf der Seite anmelden" @@ -4109,8 +4157,8 @@ msgstr "Unbekannter Dateityp" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "Neue Nachricht" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 #, fuzzy @@ -4646,7 +4694,8 @@ msgid "Could not subscribe other to you." msgstr "Die Gegenseite konnte Dich nicht abonnieren." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "Nicht abonniert!" #: lib/subs.php:136 @@ -4695,47 +4744,47 @@ msgstr "Direkte Nachricht an Benutzer verschickt" msgid "Message" msgstr "Nachricht" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "vor wenigen Sekunden" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "vor einer Minute" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "vor %d Minuten" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "vor einer Stunde" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "vor %d Stunden" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "vor einem Tag" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "vor %d Tagen" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "vor einem Monat" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "vor %d Monaten" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "vor einem Jahr" diff --git a/locale/el/LC_MESSAGES/statusnet.mo b/locale/el/LC_MESSAGES/statusnet.mo Binary files differindex 72dc2ce58..69dc7b9c4 100644 --- a/locale/el/LC_MESSAGES/statusnet.mo +++ b/locale/el/LC_MESSAGES/statusnet.mo diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index a7163a762..1b97f591c 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:58:52+0000\n" +"POT-Creation-Date: 2009-11-13 20:42+0000\n" +"PO-Revision-Date: 2009-11-13 20:42:28+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: el\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -106,35 +109,42 @@ msgstr "%s και οι φίλοι του/της" msgid "Updates from %1$s and friends on %2$s!" msgstr "" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "Η μÎθοδος του ΑΡΙ δε βÏÎθηκε!" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "ΑπÎτυχε η ενημÎÏωση του χÏήστη." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -142,12 +152,33 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "ΑπÎτυχε η ενημÎÏωση του χÏήστη." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "" +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "ΑπÎτυχε η αποθήκευση του Ï€Ïοφίλ." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "" @@ -193,6 +224,23 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "Η μÎθοδος του ΑΡΙ δε βÏÎθηκε!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -386,17 +434,17 @@ msgstr "Ρυθμίσεις OpenID" msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -478,7 +526,7 @@ msgid "Invalid size." msgstr "" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "" @@ -527,7 +575,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1613,7 +1661,7 @@ msgid "Nickname" msgstr "Ψευδώνυμο" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Κωδικός" @@ -1747,7 +1795,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1792,8 +1840,8 @@ msgstr "ΣÏνδεση" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "" @@ -1814,11 +1862,15 @@ msgstr "Ρυθμίσεις OpenID" msgid "Manage various other options." msgstr "" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "" @@ -1853,67 +1905,62 @@ msgstr "" msgid "Change password" msgstr "Αλλαγή κωδικοÏ" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Αλλάξτε τον κωδικό σας" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 #, fuzzy msgid "Change your password." msgstr "Αλλαγή κωδικοÏ" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Ο κωδικός αποθηκεÏτηκε." -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "ÎÎος κωδικός" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 ή πεÏισσότεÏοι χαÏακτήÏες" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Επιβεβαίωση" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Αλλαγή" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Οι κωδικοί δεν ταυτίζονται." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Λάθος παλιός κωδικός" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "" -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "ΑδÏνατη η αποθήκευση του νÎου κωδικοÏ" -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Ο κωδικός αποθηκεÏτηκε." @@ -2346,7 +2393,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Email" @@ -3245,36 +3292,36 @@ msgstr "" msgid "DB error inserting reply: %s" msgstr "Σφάλμα βάσης δεδομÎνων κατά την εισαγωγή απάντησης: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Αλλάξτε τις Ïυθμίσεις του Ï€Ïοφίλ σας" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Αλλάξτε τον κωδικό σας" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ." @@ -3283,7 +3330,7 @@ msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ." msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "" @@ -3670,20 +3717,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:189 #, fuzzy msgid "No configuration file found. " msgstr "Ο κωδικός επιβεβαίωσης δεν βÏÎθηκε." -#: lib/common.php:192 +#: lib/common.php:190 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:191 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:192 msgid "Go to the installer." msgstr "" @@ -3948,9 +3995,9 @@ msgid "Unknown file type" msgstr "" #: lib/jabber.php:192 -#, fuzzy, php-format -msgid "notice id: %s" -msgstr "Μήνυμα" +#, php-format +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 #, fuzzy @@ -4459,8 +4506,9 @@ msgid "Could not subscribe other to you." msgstr "Δεν επιτÏÎπεται να κάνεις συνδÏομητÎÏ‚ του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎ¿Ï… άλλους." #: lib/subs.php:124 -msgid "Not subscribed!." -msgstr "" +#, fuzzy +msgid "Not subscribed!" +msgstr "ΑπÎτυχε η συνδÏομή." #: lib/subs.php:136 msgid "Couldn't delete subscription." @@ -4507,47 +4555,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.mo b/locale/en_GB/LC_MESSAGES/statusnet.mo Binary files differindex b6dc8fa58..7998fbcf0 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.mo +++ b/locale/en_GB/LC_MESSAGES/statusnet.mo diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index 384e60927..27fd82b70 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -1,5 +1,6 @@ # Translation of StatusNet to British English # +# Author@translatewiki.net: CiaranG # -- # #-#-#-#-# statusnet.new.pot (PACKAGE VERSION) #-#-#-#-# # SOME DESCRIPTIVE TITLE. @@ -11,29 +12,31 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:58:54+0000\n" +"POT-Creation-Date: 2009-11-13 20:42+0000\n" +"PO-Revision-Date: 2009-11-13 20:42:31+0000\n" "Language-Team: British English\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" "X-Message-Group: out-statusnet\n" #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 -#, fuzzy msgid "No such page" -msgstr "No such tag." +msgstr "No such page" #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -61,19 +64,19 @@ msgid "%s and friends" msgstr "%s and friends" #: actions/all.php:99 -#, fuzzy, php-format +#, php-format msgid "Feed for friends of %s (RSS 1.0)" -msgstr "Feed for friends of %s" +msgstr "Feed for friends of %s (RSS 1.0)" #: actions/all.php:107 -#, fuzzy, php-format +#, php-format msgid "Feed for friends of %s (RSS 2.0)" -msgstr "Feed for friends of %s" +msgstr "Feed for friends of %s (RSS 2.0)" #: actions/all.php:115 -#, fuzzy, php-format +#, php-format msgid "Feed for friends of %s (Atom)" -msgstr "Feed for friends of %s" +msgstr "Feed for friends of %s (Atom)" #: actions/all.php:127 #, php-format @@ -103,44 +106,49 @@ msgid "" msgstr "" #: actions/all.php:165 -#, fuzzy msgid "You and friends" -msgstr "%s and friends" +msgstr "You and friends" #: actions/allrss.php:119 actions/apitimelinefriends.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Updates from %1$s and friends on %2$s!" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "API method not found!" - -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +msgid "API method not found." +msgstr "API method not found." + +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "This method requires a POST." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Couldn't update user." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -148,12 +156,32 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "Unable to save your design settings!" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +msgid "Could not update your design." +msgstr "Could not update your design." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "User has no profile." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Couldn't save profile." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "Block user failed." @@ -167,9 +195,9 @@ msgid "No message text!" msgstr "No message text!" #: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, fuzzy, php-format +#, php-format msgid "That's too long. Max message size is %d chars." -msgstr "That's too long. Max message size is 140 chars." +msgstr "That's too long. Max message size is %d chars." #: actions/apidirectmessagenew.php:146 msgid "Recipient user not found." @@ -180,9 +208,9 @@ msgid "Can't send direct messages to users who aren't your friend." msgstr "Can't send direct messages to users who aren't your friend." #: actions/apidirectmessage.php:89 -#, fuzzy, php-format +#, php-format msgid "Direct messages from %s" -msgstr "Direct messages to %s" +msgstr "Direct messages from %s" #: actions/apidirectmessage.php:93 #, php-format @@ -199,24 +227,39 @@ msgstr "Direct messages to %s" msgid "All the direct messages sent to %s" msgstr "All the direct messages sent to %s" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "API method not found!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." msgstr "No status found with that ID." #: actions/apifavoritecreate.php:119 -#, fuzzy msgid "This status is already a favorite!" -msgstr "This notice is already a favourite!" +msgstr "This status is already a favourite!" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 msgid "Could not create favorite." msgstr "Could not create favourite." #: actions/apifavoritedestroy.php:122 -#, fuzzy msgid "That status is not a favorite!" -msgstr "This notice is not a favourite!" +msgstr "That status is not a favourite!" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 msgid "Could not delete favorite." @@ -232,9 +275,8 @@ msgid "Could not follow user: %s is already on your list." msgstr "Could not follow user: %s is already on your list." #: actions/apifriendshipsdestroy.php:109 -#, fuzzy msgid "Could not unfollow user: User not found." -msgstr "Could not follow user: User not found." +msgstr "Could not unfollow user: User not found." #: actions/apifriendshipsdestroy.php:120 msgid "You cannot unfollow yourself!" @@ -260,9 +302,8 @@ msgstr "Could not create group." #: actions/apigroupcreate.php:147 actions/editgroup.php:259 #: actions/newgroup.php:210 -#, fuzzy msgid "Could not create aliases." -msgstr "Could not create favourite." +msgstr "Could not create aliases" #: actions/apigroupcreate.php:166 actions/newgroup.php:224 msgid "Could not set group membership." @@ -333,9 +374,8 @@ msgid "Alias can't be the same as nickname." msgstr "" #: actions/apigroupjoin.php:110 -#, fuzzy msgid "You are already a member of that group." -msgstr "You are already a member of that group" +msgstr "You are already a member of that group." #: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221 msgid "You have been blocked from that group by the admin." @@ -393,17 +433,17 @@ msgstr "Avatar updated." msgid "No status with that ID found." msgstr "No status with that ID found." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 -#, fuzzy, php-format +#, php-format msgid "That's too long. Max notice size is %d chars." -msgstr "That's too long. Max notice size is 140 chars." +msgstr "That's too long. Max notice size is %d chars." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "Not found" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -487,7 +527,7 @@ msgid "Invalid size." msgstr "Invalid size." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" @@ -535,7 +575,7 @@ msgstr "Crop" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -675,9 +715,8 @@ msgid "Failed to save block information." msgstr "Failed to save block information." #: actions/bookmarklet.php:50 -#, fuzzy msgid "Post to " -msgstr "Photo" +msgstr "Post to " #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -723,9 +762,8 @@ msgid "The address \"%s\" has been confirmed for your account." msgstr "The address \"%s\" has been confirmed for your account." #: actions/conversation.php:99 -#, fuzzy msgid "Conversation" -msgstr "Confirmation code" +msgstr "Conversation" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 #: lib/profileaction.php:206 @@ -758,9 +796,8 @@ msgid "Are you sure you want to delete this notice?" msgstr "Are you sure you want to delete this notice?" #: actions/deletenotice.php:145 -#, fuzzy msgid "Do not delete this notice" -msgstr "Can't delete this notice." +msgstr "Do not delete this notice" #: actions/deletenotice.php:146 lib/noticelist.php:522 msgid "Delete this notice" @@ -898,9 +935,8 @@ msgid "Send me email when someone sends me a private message." msgstr "Send me e-mail when someone sends me a private message." #: actions/emailsettings.php:174 -#, fuzzy msgid "Send me email when someone sends me an \"@-reply\"." -msgstr "Send me e-mail when someone sends me a private message." +msgstr "Send me e-mail when someone sends me an \"@-reply\"." #: actions/emailsettings.php:179 msgid "Allow friends to nudge me and send me an email." @@ -1017,12 +1053,15 @@ msgstr "The most popular notices on the site right now." #: actions/favorited.php:150 msgid "Favorite notices appear on this page but no one has favorited one yet." msgstr "" +"Favourite notices appear on this page but no one has favourited one yet" #: actions/favorited.php:153 msgid "" "Be the first to add a notice to your favorites by clicking the fave button " "next to any notice you like." msgstr "" +"Be the first to add a notice to your favourites by clicking the fave button " +"next to any notice you like." #: actions/favorited.php:156 #, php-format @@ -1030,6 +1069,8 @@ msgid "" "Why not [register an account](%%action.register%%) and be the first to add a " "notice to your favorites!" msgstr "" +"Why not [register an account](%%action.register%%) and be the first to add a " +"notice to your favourites!" #: actions/favoritesrss.php:111 actions/showfavorites.php:77 #: lib/personalgroupnav.php:115 @@ -1038,9 +1079,9 @@ msgid "%s's favorite notices" msgstr "%s's favourite notices" #: actions/favoritesrss.php:115 -#, fuzzy, php-format +#, php-format msgid "Updates favored by %1$s on %2$s!" -msgstr "Updates from %1$s on %2$s!" +msgstr "Updates favoured by %1$s on %2$s!" #: actions/favor.php:79 msgid "This notice is already a favorite!" @@ -1066,14 +1107,12 @@ msgid "A selection of some of the great users on %s" msgstr "A selection of some of the great users on %s" #: actions/file.php:34 -#, fuzzy msgid "No notice id" -msgstr "New notice" +msgstr "No notice id" #: actions/file.php:38 -#, fuzzy msgid "No notice" -msgstr "New notice" +msgstr "No notice." #: actions/file.php:42 msgid "No attachments" @@ -1101,9 +1140,8 @@ msgid "That user has blocked you from subscribing." msgstr "That user has blocked you from subscribing." #: actions/finishremotesubscribe.php:106 -#, fuzzy msgid "You are not authorized." -msgstr "Not authorised." +msgstr "You are not authorised." #: actions/finishremotesubscribe.php:109 #, fuzzy @@ -1146,14 +1184,12 @@ msgid "Only an admin can block group members." msgstr "" #: actions/groupblock.php:95 -#, fuzzy msgid "User is already blocked from group." -msgstr "User has blocked you." +msgstr "User is already blocked from group." #: actions/groupblock.php:100 -#, fuzzy msgid "User is not a member of group." -msgstr "You are not a member of that group." +msgstr "User is not a member of group." #: actions/groupblock.php:136 actions/groupmembers.php:314 #, fuzzy @@ -1169,9 +1205,8 @@ msgid "" msgstr "" #: actions/groupblock.php:178 -#, fuzzy msgid "Do not block this user from this group" -msgstr "A list of the users in this group." +msgstr "Do not block this user from this group" #: actions/groupblock.php:179 #, fuzzy @@ -1673,7 +1708,7 @@ msgid "Nickname" msgstr "Nickname" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Password" @@ -1698,14 +1733,13 @@ msgstr "" "changing your settings." #: actions/login.php:286 -#, fuzzy, php-format +#, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" "(%%action.register%%) a new account." msgstr "" "Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%" -"%). " +"(%%action.register%%) a new account." #: actions/makeadmin.php:91 msgid "Only an admin can make another user an admin." @@ -1811,7 +1845,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1857,8 +1891,8 @@ msgstr "Connect" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Not a supported data format." @@ -1878,11 +1912,15 @@ msgstr "Other Settings" msgid "Manage various other options." msgstr "Manage various other options." -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "Automatic shortening service to use." @@ -1917,65 +1955,60 @@ msgstr "This is your outbox, which lists private messages you have sent." msgid "Change password" msgstr "Change password" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Change your password" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 msgid "Change your password." msgstr "Change your password." -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "Password change" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Old password" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "New password" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 or more characters" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirm" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "same as password above" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Change" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Password must be 6 or more characters." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Passwords don't match." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Incorrect old password" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Error saving user; invalid." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Can't save new password." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Password saved." @@ -2414,7 +2447,7 @@ msgid "Same as password above. Required." msgstr "Same as password above. Required." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "E-mail" @@ -3345,36 +3378,36 @@ msgstr "Problem saving notice." msgid "DB error inserting reply: %s" msgstr "DB error inserting reply: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Message to %1$s on %2$s" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profile" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Change your profile settings" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "Upload an avatar" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Change your password" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Change e-mail handling" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "User profile" @@ -3383,7 +3416,7 @@ msgstr "User profile" msgid "Other" msgstr "Other" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Other options" @@ -3773,20 +3806,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 -#, fuzzy +#: lib/common.php:189 msgid "No configuration file found. " -msgstr "No confirmation code." +msgstr "No configuration file found" -#: lib/common.php:192 +#: lib/common.php:190 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:191 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:192 #, fuzzy msgid "Go to the installer." msgstr "Login to the site" @@ -3838,9 +3870,8 @@ msgid "Tile background image" msgstr "" #: lib/designsettings.php:170 -#, fuzzy msgid "Change colours" -msgstr "Change your password" +msgstr "Change colours" #: lib/designsettings.php:178 msgid "Background" @@ -3883,7 +3914,7 @@ msgstr "" #: lib/designsettings.php:372 msgid "Bad default color settings: " -msgstr "" +msgstr "Bad default colour settings: " #: lib/designsettings.php:468 msgid "Design defaults restored." @@ -3930,9 +3961,8 @@ msgid "All" msgstr "All" #: lib/galleryaction.php:139 -#, fuzzy msgid "Select tag to filter" -msgstr "Select a carrier" +msgstr "Select tag to filter" #: lib/galleryaction.php:140 msgid "Tag" @@ -3951,14 +3981,13 @@ msgid "URL of the homepage or blog of the group or topic" msgstr "URL of the homepage or blog of the group or topic" #: lib/groupeditform.php:168 -#, fuzzy msgid "Describe the group or topic" -msgstr "Describe the group or topic in 140 chars" +msgstr "Describe the group or topic" #: lib/groupeditform.php:170 -#, fuzzy, php-format +#, php-format msgid "Describe the group or topic in %d characters" -msgstr "Describe the group or topic in 140 chars" +msgstr "Describe the group or topic in %d characters" #: lib/groupeditform.php:172 msgid "Description" @@ -4026,9 +4055,9 @@ msgid "This page is not available in a media type you accept" msgstr "This page is not available in a media type you accept" #: lib/imagefile.php:75 -#, fuzzy, php-format +#, php-format msgid "That file is too big. The maximum file size is %s." -msgstr "You can upload a logo image for your group." +msgstr "That file is too big. The maximum file size is %s." #: lib/imagefile.php:80 msgid "Partial upload." @@ -4056,8 +4085,8 @@ msgstr "Unknown file type" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "New notice" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 msgid "Join" @@ -4364,9 +4393,8 @@ msgid "Attach a file" msgstr "" #: lib/noticelist.php:478 -#, fuzzy msgid "in context" -msgstr "No content!" +msgstr "in context" #: lib/noticelist.php:498 msgid "Reply to this notice" @@ -4579,7 +4607,8 @@ msgid "Could not subscribe other to you." msgstr "Could not subscribe other to you." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "Not subscribed!" #: lib/subs.php:136 @@ -4603,18 +4632,16 @@ msgid "Unsubscribe" msgstr "Unsubscribe" #: lib/userprofile.php:116 -#, fuzzy msgid "Edit Avatar" -msgstr "Avatar" +msgstr "Edit Avatar" #: lib/userprofile.php:236 msgid "User actions" msgstr "User actions" #: lib/userprofile.php:248 -#, fuzzy msgid "Edit profile settings" -msgstr "Profile settings" +msgstr "Edit profile settings" #: lib/userprofile.php:249 msgid "Edit" @@ -4628,54 +4655,54 @@ msgstr "Send a direct message to this user" msgid "Message" msgstr "Message" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "a few seconds ago" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "about a minute ago" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "about %d minutes ago" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "about an hour ago" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "about %d hours ago" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "about a day ago" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "about %d days ago" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "about a month ago" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "about %d months ago" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "about a year ago" #: lib/webcolor.php:82 -#, fuzzy, php-format +#, php-format msgid "%s is not a valid color!" -msgstr "Homepage is not a valid URL." +msgstr "%s is not a valid colour!" #: lib/webcolor.php:123 #, php-format diff --git a/locale/es/LC_MESSAGES/statusnet.mo b/locale/es/LC_MESSAGES/statusnet.mo Binary files differindex eda910548..366d16819 100644 --- a/locale/es/LC_MESSAGES/statusnet.mo +++ b/locale/es/LC_MESSAGES/statusnet.mo diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index d04d4f826..1315f017c 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:58:57+0000\n" +"POT-Creation-Date: 2009-11-13 20:42+0000\n" +"PO-Revision-Date: 2009-11-13 20:42:34+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: es\n" "X-Message-Group: out-statusnet\n" @@ -28,12 +28,15 @@ msgid "No such page" msgstr "No existe tal página" #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -111,35 +114,42 @@ msgstr "Tú y amigos" msgid "Updates from %1$s and friends on %2$s!" msgstr "¡Actualizaciones de %1$s y amigos en %2$s!" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "¡No se encontró el método de la API!" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Este método requiere PUBLICAR" +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "No se pudo actualizar el usuario." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -147,12 +157,34 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "¡No se pudo guardar tu configuración de Twitter!" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "No se pudo actualizar el usuario." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "El usuario no tiene un perfil." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "No se pudo guardar el perfil." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "Falló bloquear usuario." @@ -198,6 +230,23 @@ msgstr "Mensajes directos a %s" msgid "All the direct messages sent to %s" msgstr "Todos los mensajes directos enviados a %s" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "¡No se encontró el método de la API!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -393,17 +442,17 @@ msgstr "Status borrado." msgid "No status with that ID found." msgstr "No hay estado para ese ID" -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Demasiado largo. La longitud máxima es de 140 caracteres. " -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "No encontrado" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -487,7 +536,7 @@ msgid "Invalid size." msgstr "Tamaño inválido." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" @@ -535,7 +584,7 @@ msgstr "Cortar" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1693,7 +1742,7 @@ msgid "Nickname" msgstr "Apodo" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Contraseña" @@ -1833,7 +1882,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1881,8 +1930,8 @@ msgstr "Conectarse" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "No es un formato de dato soportado" @@ -1903,11 +1952,15 @@ msgstr "Otras configuraciones" msgid "Manage various other options." msgstr "Manejo de varias opciones adicionales." -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "Servicio de acorte automático a usar." @@ -1944,67 +1997,62 @@ msgstr "" msgid "Change password" msgstr "Cambiar contraseña" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Cambia tu contraseña" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 #, fuzzy msgid "Change your password." msgstr "Cambia tu contraseña." -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Cambio de contraseña " -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Antigua contraseña" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Nueva contraseña" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 o más caracteres" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirmar" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "repita la contraseña anterior" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Cambiar" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Cotrnaseña debe tener 6 o más caracteres." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Las contraseñas no coinciden" -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Contraseña antigua incorrecta." -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Error al guardar el usuario; inválido." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "No se puede guardar la nueva contraseña." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Se guardó Contraseña." @@ -2454,7 +2502,7 @@ msgid "Same as password above. Required." msgstr "Igual a la contraseña de arriba. Requerida" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Correo electrónico" @@ -3402,36 +3450,36 @@ msgstr "Hubo un problema al guardar el aviso." msgid "DB error inserting reply: %s" msgstr "Error de BD al insertar respuesta: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Mensaje a %1$s en %2$s" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Perfil" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Cambia tus opciones de perfil" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "Cargar un avatar." -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Cambia tu contraseña" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Cambiar el manejo del correo." -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 msgid "Design your profile" msgstr "Diseñar tu perfil" @@ -3439,7 +3487,7 @@ msgstr "Diseñar tu perfil" msgid "Other" msgstr "Otro" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Otras opciones" @@ -3833,19 +3881,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:189 msgid "No configuration file found. " msgstr "Ningún archivo de configuración encontrado. " -#: lib/common.php:192 +#: lib/common.php:190 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:191 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:192 msgid "Go to the installer." msgstr "Ir al instalador." @@ -4110,8 +4158,8 @@ msgstr "Tipo de archivo desconocido" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "Nuevo aviso" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 #, fuzzy @@ -4636,7 +4684,8 @@ msgid "Could not subscribe other to you." msgstr "No se pudo suscribir otro a ti." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "¡No estás suscrito!" #: lib/subs.php:136 @@ -4686,47 +4735,47 @@ msgstr "Enviar un mensaje directo a este usuario" msgid "Message" msgstr "Mensaje" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "hace unos segundos" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "hace un minuto" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "hace %d minutos" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "hace una hora" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "hace %d horas" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "hace un dÃa" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "hace %d dÃas" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "hace un mes" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "hace %d meses" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "hace un año" diff --git a/locale/fi/LC_MESSAGES/statusnet.mo b/locale/fi/LC_MESSAGES/statusnet.mo Binary files differindex 61946bd6a..9cd1fdbfa 100644 --- a/locale/fi/LC_MESSAGES/statusnet.mo +++ b/locale/fi/LC_MESSAGES/statusnet.mo diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index 8202cd4f4..db933a25b 100644 --- a/locale/fi/LC_MESSAGES/statusnet.po +++ b/locale/fi/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:00+0000\n" +"POT-Creation-Date: 2009-11-13 20:42+0000\n" +"PO-Revision-Date: 2009-11-13 20:42:37+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fi\n" "X-Message-Group: out-statusnet\n" @@ -28,12 +28,15 @@ msgid "No such page" msgstr "Sivua ei ole." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -111,35 +114,42 @@ msgstr "Sinä ja kaverit" msgid "Updates from %1$s and friends on %2$s!" msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "API-metodia ei löytynyt!" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Tämä metodi edellyttää POST sanoman." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Ei voitu päivittää käyttäjää." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -147,12 +157,34 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "Twitter-asetuksia ei voitu tallentaa!" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Ei voitu päivittää käyttäjää." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "Käyttäjällä ei ole profiilia." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Ei voitu tallentaa profiilia." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "Käyttäjän esto epäonnistui." @@ -199,6 +231,23 @@ msgstr "Suorat viestit käyttäjälle %s" msgid "All the direct messages sent to %s" msgstr "Kaikki suorat viestit käyttäjälle %s" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "API-metodia ei löytynyt!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -388,17 +437,17 @@ msgstr "Päivitys poistettu." msgid "No status with that ID found." msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Päivitys on liian pitkä. Maksimipituus on %d merkkiä." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "Ei löytynyt" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Maksimikoko päivitykselle on %d merkkiä, mukaan lukien URL-osoite." @@ -481,7 +530,7 @@ msgid "Invalid size." msgstr "Koko ei kelpaa." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Kuva" @@ -529,7 +578,7 @@ msgstr "Rajaa" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1664,7 +1713,7 @@ msgid "Nickname" msgstr "Tunnus" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Salasana" @@ -1802,7 +1851,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1849,8 +1898,8 @@ msgstr "Yhdistä" msgid "Only " msgstr "Vain " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Tuo ei ole tuettu tietomuoto." @@ -1870,11 +1919,15 @@ msgstr "Muita Asetuksia" msgid "Manage various other options." msgstr "Hallinnoi muita asetuksia." -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "Lyhennä URL-osoitteita" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "Käytettävä automaattinen lyhennyspalvelu." @@ -1909,65 +1962,60 @@ msgstr "Tämä on postilaatikkosi, jossa on lähettämäsi yksityisviestit." msgid "Change password" msgstr "Vaihda salasana" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Vaihda salasanasi" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 msgid "Change your password." msgstr "Vaihda salasanasi." -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "Salasanan vaihto" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Vanha salasana" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Uusi salasana" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 tai useampia merkkejä" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Vahvista" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "sama salasana kuin yllä" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Vaihda" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Salasanassa pitää olla 6 tai useampia merkkejä." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Salasanat eivät täsmää." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Väärä vanha salasana" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Virhe tapahtui käyttäjän tallentamisessa; epäkelpo." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Uutta salasanaa ei voida tallentaa." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Salasana tallennettu." @@ -2412,7 +2460,7 @@ msgid "Same as password above. Required." msgstr "Sama kuin ylläoleva salasana. Pakollinen." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Sähköposti" @@ -3350,36 +3398,36 @@ msgstr "Ongelma päivityksen tallentamisessa." msgid "DB error inserting reply: %s" msgstr "Tietokantavirhe tallennettaessa vastausta: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Viesti käyttäjälle %1$s, %2$s" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profiili" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Vaihda profiiliasetuksesi" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "Lataa kuva" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Vaihda salasanasi" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Muuta sähköpostin käsittelyasetuksia." -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "Käyttäjän profiili" @@ -3388,7 +3436,7 @@ msgstr "Käyttäjän profiili" msgid "Other" msgstr "Muut" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Muita asetuksia" @@ -3778,20 +3826,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:189 #, fuzzy msgid "No configuration file found. " msgstr "Varmistuskoodia ei ole annettu." -#: lib/common.php:192 +#: lib/common.php:190 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:191 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:192 #, fuzzy msgid "Go to the installer." msgstr "Kirjaudu sisään palveluun" @@ -4062,8 +4110,8 @@ msgstr "Tunnistamaton tiedoston tyyppi" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "Uusi päivitys" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 msgid "Join" @@ -4589,7 +4637,8 @@ msgid "Could not subscribe other to you." msgstr "Toista ei voitu asettaa tilaamaan sinua." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "Ei ole tilattu!." #: lib/subs.php:136 @@ -4638,47 +4687,47 @@ msgstr "Lähetä suora viesti tälle käyttäjälle" msgid "Message" msgstr "Viesti" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "muutama sekunti sitten" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "noin minuutti sitten" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "noin %d minuuttia sitten" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "noin tunti sitten" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "noin %d tuntia sitten" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "noin päivä sitten" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "noin %d päivää sitten" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "noin kuukausi sitten" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "noin %d kuukautta sitten" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "noin vuosi sitten" diff --git a/locale/fr/LC_MESSAGES/statusnet.mo b/locale/fr/LC_MESSAGES/statusnet.mo Binary files differindex 59b7812fc..1549319bb 100644 --- a/locale/fr/LC_MESSAGES/statusnet.mo +++ b/locale/fr/LC_MESSAGES/statusnet.mo diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 7507e44db..70d66e8eb 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -2,34 +2,38 @@ # # Author@translatewiki.net: IAlex # Author@translatewiki.net: Jean-Frédéric +# Author@translatewiki.net: Peter17 +# Author@translatewiki.net: Zetud # -- msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:03+0000\n" +"POT-Creation-Date: 2009-11-13 20:42+0000\n" +"PO-Revision-Date: 2009-11-13 20:42:39+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" "X-Message-Group: out-statusnet\n" #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 -#, fuzzy msgid "No such page" -msgstr "Aucun marquage trouvé." +msgstr "Page non trouvée" #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -107,35 +111,42 @@ msgstr "Vous et vos amis" msgid "Updates from %1$s and friends on %2$s!" msgstr "Statuts de %1$s et ses amis dans %2$s!" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "Méthode API non trouvée !" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Ce processus requiert un POST." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Impossible de mettre à jour l'utilisateur." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -143,12 +154,34 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "L'enregistrement de votre configuration Twitter a échoué !" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Impossible de mettre à jour l'utilisateur." + +#: 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 +#, fuzzy +msgid "Could not save profile." +msgstr "Impossible d'enregistrer le profil." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "Le blocage de l'utilisateur a échoué." @@ -162,9 +195,9 @@ msgid "No message text!" msgstr "Message sans texte !" #: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, fuzzy, php-format +#, php-format msgid "That's too long. Max message size is %d chars." -msgstr "C'est trop long ! Vous n'avez droit qu'à 140 caractères." +msgstr "C'est trop long ! La taille maximale du message est de %d caractères." #: actions/apidirectmessagenew.php:146 msgid "Recipient user not found." @@ -177,9 +210,9 @@ msgstr "" "comme amis." #: actions/apidirectmessage.php:89 -#, fuzzy, php-format +#, php-format msgid "Direct messages from %s" -msgstr "Messages envoyés à %s" +msgstr "Messages direct depuis %s" #: actions/apidirectmessage.php:93 #, php-format @@ -196,6 +229,23 @@ msgstr "Messages envoyés à %s" msgid "All the direct messages sent to %s" msgstr "Tous les messages envoyés à %s" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "Méthode API non trouvée !" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -227,9 +277,8 @@ msgid "Could not follow user: %s is already on your list." msgstr "Impossible de suivre l'utilisateur : %s est déjà dans votre liste." #: actions/apifriendshipsdestroy.php:109 -#, fuzzy msgid "Could not unfollow user: User not found." -msgstr "Impossible de suivre l'utilisateur : Utilisateur non trouvé." +msgstr "Impossible de ne plus suivre l'utilisateur : utilisateur non trouvé." #: actions/apifriendshipsdestroy.php:120 msgid "You cannot unfollow yourself!" @@ -240,9 +289,8 @@ msgid "Two user ids or screen_names must be supplied." msgstr "Vous devez fournir 2 identifiants ou pseudos." #: actions/apifriendshipsshow.php:135 -#, fuzzy msgid "Could not determine source user." -msgstr "Impossible de récupérer le flux public." +msgstr "Impossible de déterminer l'utilisateur source." #: actions/apifriendshipsshow.php:143 msgid "Could not find target user." @@ -254,9 +302,8 @@ msgstr "Impossible de créer le groupe." #: actions/apigroupcreate.php:147 actions/editgroup.php:259 #: actions/newgroup.php:210 -#, fuzzy msgid "Could not create aliases." -msgstr "Impossible de créer le favori." +msgstr "Impossible de créer les alias." #: actions/apigroupcreate.php:166 actions/newgroup.php:224 msgid "Could not set group membership." @@ -295,9 +342,9 @@ msgid "Full name is too long (max 255 chars)." msgstr "Nom complet trop long (maximum de 255 caractères)." #: actions/apigroupcreate.php:261 -#, fuzzy, php-format +#, php-format msgid "Description is too long (max %d chars)." -msgstr "la description est trop longue (140 caractères maximum)." +msgstr "La description est trop longue (%d caractères maximum)." #: actions/apigroupcreate.php:272 actions/editgroup.php:204 #: actions/newgroup.php:148 actions/profilesettings.php:225 @@ -313,15 +360,15 @@ msgstr "" #: actions/apigroupcreate.php:312 actions/editgroup.php:224 #: actions/newgroup.php:168 -#, fuzzy, php-format +#, php-format msgid "Invalid alias: \"%s\"" -msgstr "Marquage invalide : \"%s\"" +msgstr "Alias invalide : « %s »" #: actions/apigroupcreate.php:321 actions/editgroup.php:228 #: actions/newgroup.php:172 -#, fuzzy, php-format +#, php-format msgid "Alias \"%s\" already in use. Try another one." -msgstr "Pseudo déjà utilisé. Essayez-en un autre." +msgstr "Alias « %s » déjà utilisé. Essayez-en un autre." #: actions/apigroupcreate.php:334 actions/editgroup.php:234 #: actions/newgroup.php:178 @@ -329,26 +376,24 @@ msgid "Alias can't be the same as nickname." msgstr "" #: actions/apigroupjoin.php:110 -#, fuzzy msgid "You are already a member of that group." -msgstr "Vous êtes déjà membre de ce groupe " +msgstr "Vous êtes déjà membre de ce groupe." #: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221 msgid "You have been blocked from that group by the admin." msgstr "" #: actions/apigroupjoin.php:138 -#, fuzzy, php-format +#, php-format msgid "Could not join user %s to group %s." -msgstr "Impossible d'inscrire l'utilisateur %s au groupe %s" +msgstr "Impossible de joindre l'utilisateur %s au groupe %s." #: actions/apigroupleave.php:114 -#, fuzzy msgid "You are not a member of this group." msgstr "Vous n'êtes pas membre de ce groupe." #: actions/apigroupleave.php:124 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %s to group %s." msgstr "Impossible de retirer l'utilisateur %s du groupe %s" @@ -358,12 +403,12 @@ msgid "%s groups" msgstr "Groupes de %s" #: actions/apigrouplistall.php:94 -#, fuzzy, php-format +#, php-format msgid "groups on %s" -msgstr "Actions du groupe" +msgstr "groupes sur %s" #: actions/apigrouplist.php:95 -#, fuzzy, php-format +#, php-format msgid "%s's groups" msgstr "Groupes de %s" @@ -381,33 +426,31 @@ msgid "You may not delete another user's status." msgstr "Vous ne pouvez pas supprimer le statut d'un autre utilisateur." #: actions/apistatusesshow.php:138 -#, fuzzy msgid "Status deleted." -msgstr "Avatar supprimé." +msgstr "Statut supprimé." #: actions/apistatusesshow.php:144 msgid "No status with that ID found." msgstr "Aucun statut trouvé avec cet identifiant." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 -#, fuzzy, php-format +#, php-format msgid "That's too long. Max notice size is %d chars." -msgstr "C'est trop long ! Vous n'avez droit qu'à 140 caractères." +msgstr "C'est trop long ! La taille maximale de l'avis est de %d caractères." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "Non trouvé" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" #: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261 -#, fuzzy msgid "Unsupported format." -msgstr "Format de fichier d'image non supporté." +msgstr "Format non supporté." #: actions/apitimelinefavorites.php:107 #, php-format @@ -432,9 +475,9 @@ msgid "Updates from %1$s on %2$s!" msgstr "Statuts de %1$s dans %2$s!" #: actions/apitimelinementions.php:116 -#, fuzzy, php-format +#, php-format msgid "%1$s / Updates mentioning %2$s" -msgstr "%1$s / Réponses à %2$s" +msgstr "%1$s / Mises à jour mentionnant %2$s" #: actions/apitimelinementions.php:126 #, php-format @@ -457,9 +500,9 @@ msgid "Notices tagged with %s" msgstr "Statuts marqués avec %s" #: actions/apitimelinetag.php:107 actions/tagrss.php:64 -#, fuzzy, php-format +#, php-format msgid "Updates tagged with %1$s on %2$s!" -msgstr "Statuts de %1$s dans %2$s!" +msgstr "Mises à jour marquées avec %1$s dans %2$s !" #: actions/apiusershow.php:96 msgid "Not found." @@ -482,14 +525,16 @@ msgid "Invalid size." msgstr "Taille incorrecte." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" #: actions/avatarsettings.php:78 -#, fuzzy, php-format +#, php-format msgid "You can upload your personal avatar. The maximum file size is %s." -msgstr "Vous pouvez associer un « avatar » (image personnelle) à votre profil." +msgstr "" +"Vous pouvez associer un « avatar » (image personnelle) à votre profil. La " +"taille maximale du fichier est de %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:182 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 @@ -530,7 +575,7 @@ msgstr "Recadrer" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -583,24 +628,22 @@ msgid "No such group" msgstr "Aucun groupe trouvé" #: actions/blockedfromgroup.php:90 -#, fuzzy, php-format +#, php-format msgid "%s blocked profiles" -msgstr "Profil de l'utilisateur" +msgstr "%s profils bloqués" #: actions/blockedfromgroup.php:93 -#, fuzzy, php-format +#, php-format msgid "%s blocked profiles, page %d" -msgstr "%s et ses amis - page %d" +msgstr "%s profils bloqués, page %d" #: actions/blockedfromgroup.php:108 -#, fuzzy msgid "A list of the users blocked from joining this group." -msgstr "Liste des utilisateurs inscrits à ce groupe." +msgstr "Une liste des utilisateurs dont l'inscription à ce groupe est bloquée." #: actions/blockedfromgroup.php:281 -#, fuzzy msgid "Unblock user from group" -msgstr "Le déblocage de l'utilisateur a échoué." +msgstr "Débloquer l'utilisateur du groupe" #: actions/blockedfromgroup.php:313 lib/unblockform.php:150 msgid "Unblock" @@ -651,9 +694,8 @@ msgid "No" msgstr "Non" #: actions/block.php:149 -#, fuzzy msgid "Do not block this user" -msgstr "Débloquer cet utilisateur" +msgstr "Ne pas bloquer cet utilisateur" #: actions/block.php:150 actions/deletenotice.php:146 #: actions/groupblock.php:179 @@ -674,9 +716,8 @@ msgid "Failed to save block information." msgstr "Impossible d'enregistrer les informations de blocage." #: actions/bookmarklet.php:50 -#, fuzzy msgid "Post to " -msgstr "Photo" +msgstr "Poster sur" #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -722,9 +763,8 @@ msgid "The address \"%s\" has been confirmed for your account." msgstr "L'adresse \"%s\" a été validée pour votre compte." #: actions/conversation.php:99 -#, fuzzy msgid "Conversation" -msgstr "Code de confirmation" +msgstr "Conversation" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 #: lib/profileaction.php:206 @@ -740,13 +780,12 @@ msgid "Can't delete this notice." msgstr "Impossible de supprimer ce statut." #: actions/deletenotice.php:103 -#, fuzzy msgid "" "You are about to permanently delete a notice. Once this is done, it cannot " "be undone." msgstr "" -"Ce message va être définitivement supprimé. Il sera impossible de le " -"récupérer." +"Vous êtes sur le point de supprimer définitivement un message. Une fois cela " +"fait, il est impossible de l'annuler." #: actions/deletenotice.php:109 actions/deletenotice.php:141 msgid "Delete notice" @@ -802,9 +841,9 @@ msgid "Use this form to edit the group." msgstr "Remplissez ce formulaire pour modifier les options du groupe." #: actions/editgroup.php:201 actions/newgroup.php:145 -#, fuzzy, php-format +#, php-format msgid "description is too long (max %d chars)." -msgstr "la description est trop longue (140 caractères maximum)." +msgstr "la description est trop longue (%d caractères maximum)." #: actions/editgroup.php:253 msgid "Could not update group." @@ -1089,7 +1128,6 @@ msgid "Not expecting this response!" msgstr "Réponse inattendue !" #: actions/finishremotesubscribe.php:80 -#, fuzzy msgid "User being listened to does not exist." msgstr "L'utilisateur suivi n'existe pas." @@ -1102,19 +1140,16 @@ msgid "That user has blocked you from subscribing." msgstr "Cet utilisateur vous a empêché de vous inscrire." #: actions/finishremotesubscribe.php:106 -#, fuzzy msgid "You are not authorized." -msgstr "Non autorisé." +msgstr "Vous n'êtes pas autorisé." #: actions/finishremotesubscribe.php:109 -#, fuzzy msgid "Could not convert request token to access token." -msgstr "Impossible de convertir les jetons de requête en jetons d'accès" +msgstr "Impossible de convertir le jeton de requête en jeton d'accès." #: actions/finishremotesubscribe.php:114 -#, fuzzy msgid "Remote service uses unknown version of OMB protocol." -msgstr "Version inconnue du protocole OMB" +msgstr "Le service distant utilise une version inconnue du protocole OMB." #: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306 msgid "Error updating remote profile" @@ -1127,9 +1162,8 @@ msgid "No such group." msgstr "Aucun groupe trouvé." #: actions/getfile.php:75 -#, fuzzy msgid "No such file." -msgstr "Statut non trouvé. " +msgstr "Fichier non trouvé." #: actions/getfile.php:79 msgid "Cannot read file." @@ -1142,12 +1176,11 @@ msgstr "Aucun groupe n'a été spécifié." #: actions/groupblock.php:91 msgid "Only an admin can block group members." -msgstr "" +msgstr "Seul un administrateur peut bloquer des membres du groupe." #: actions/groupblock.php:95 -#, fuzzy msgid "User is already blocked from group." -msgstr "Cet utilisateur vous a bloqué." +msgstr "Cet utilisateur est déjà bloqué pour le groupe." #: actions/groupblock.php:100 msgid "User is not a member of group." @@ -1166,9 +1199,8 @@ msgid "" msgstr "" #: actions/groupblock.php:178 -#, fuzzy msgid "Do not block this user from this group" -msgstr "Liste des utilisateurs inscrits à ce groupe." +msgstr "Ne pas bloquer cet utilisateur pour ce groupe" #: actions/groupblock.php:179 #, fuzzy @@ -1221,10 +1253,12 @@ msgid "Group logo" msgstr "Logo du groupe" #: actions/grouplogo.php:150 -#, fuzzy, php-format +#, php-format msgid "" "You can upload a logo image for your group. The maximum file size is %s." -msgstr "Choisissez un logo pour votre groupe." +msgstr "" +"Vous pouvez choisir un logo pour votre groupe. La taille maximale du fichier " +"est de %s." #: actions/grouplogo.php:362 #, fuzzy @@ -1266,13 +1300,12 @@ msgid "Make user an admin of the group" msgstr "Faire de cet utilisateur un administrateur du groupe" #: actions/groupmembers.php:473 -#, fuzzy msgid "Make Admin" -msgstr "Administrer" +msgstr "Faire un administrateur" #: actions/groupmembers.php:473 msgid "Make this user an admin" -msgstr "" +msgstr "Faire de cet utilisateur un administrateur" #: actions/grouprss.php:133 #, fuzzy, php-format @@ -1338,12 +1371,11 @@ msgstr "Créer un nouveau groupe" #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." -msgstr "" +msgstr "Seul un administrateur peut débloquer les membres du groupes." #: actions/groupunblock.php:95 -#, fuzzy msgid "User is not blocked from group." -msgstr "Cet utilisateur vous a bloqué." +msgstr "Cet utilisateur n'est pas bloqué du groupe." #: actions/groupunblock.php:128 actions/unblock.php:108 msgid "Error removing the block." @@ -1364,9 +1396,8 @@ msgstr "" "dessous." #: actions/imsettings.php:89 -#, fuzzy msgid "IM is not available." -msgstr "Cette page n'est pas disponible dans " +msgstr "La messagerie instantanée n'est pas disponible." #: actions/imsettings.php:106 msgid "Current confirmed Jabber/GTalk address." @@ -1679,7 +1710,7 @@ msgid "Nickname" msgstr "Pseudo" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Mot de passe" @@ -1722,7 +1753,7 @@ msgstr "" #: actions/makeadmin.php:95 #, php-format msgid "%s is already an admin for group \"%s\"." -msgstr "" +msgstr "%s est déjà un administrateur du groupe « %s »." #: actions/makeadmin.php:132 #, php-format @@ -1818,14 +1849,14 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" #: actions/noticesearchrss.php:89 -#, fuzzy, php-format +#, php-format msgid "Updates with \"%s\"" -msgstr "Statuts de %1$s dans %2$s!" +msgstr "Mises à jour avec « %s »" #: actions/noticesearchrss.php:91 #, fuzzy, php-format @@ -1857,16 +1888,15 @@ msgid "%1$s's status on %2$s" msgstr "Statut de %1$s sur %2$s" #: actions/oembed.php:157 -#, fuzzy msgid "content type " -msgstr "Contenu" +msgstr "type de contenu " #: actions/oembed.php:160 msgid "Only " -msgstr "" +msgstr "Seulement " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Format de données non supporté." @@ -1886,11 +1916,15 @@ msgstr "Autres paramètres" msgid "Manage various other options." msgstr "Autres options à configurer" -#: actions/othersettings.php:117 -msgid "Shorten URLs with" +#: actions/othersettings.php:108 +msgid " (free service)" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:116 +msgid "Shorten URLs with" +msgstr "Raccourcir les URL avec" + +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "Sélectionnez un service de réduction d'URL." @@ -1926,65 +1960,60 @@ msgstr "" msgid "Change password" msgstr "Modifier le mot de passe" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Modifier votre mot de passe" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 msgid "Change your password." msgstr "Modifier votre mot de passe." -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "Modification du mot de passe" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Ancien mot de passe" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Nouveau mot de passe" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 caractères ou plus" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirmer" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "identique au mot de passe ci-dessus" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Modifier" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Votre mot de passe doit contenir au moins 6 caractères." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Les mots de passe ne correspondent pas." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Ancien mot de passe incorrect" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Erreur lors de l'enregistrement de l'utilisateur ; invalide." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Impossible de sauvegarder le nouveau mot de passe." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Mot de passe enregistré." @@ -2056,14 +2085,13 @@ msgid "URL of your homepage, blog, or profile on another site" msgstr "Adresse de votre site Web, blogue, ou profil dans un autre site" #: actions/profilesettings.php:122 actions/register.php:460 -#, fuzzy, php-format +#, php-format msgid "Describe yourself and your interests in %d chars" -msgstr "Décrivez vos intérêts en 140 caractères" +msgstr "Décrivez vous et vos intérêts en %d caractères" #: actions/profilesettings.php:125 actions/register.php:463 -#, fuzzy msgid "Describe yourself and your interests" -msgstr "Décrivez qui vous êtes et vos " +msgstr "Décrivez vous et vos interêts" #: actions/profilesettings.php:127 actions/register.php:465 msgid "Bio" @@ -2116,9 +2144,9 @@ msgstr "" "les utilisateurs non-humains)" #: actions/profilesettings.php:221 actions/register.php:223 -#, fuzzy, php-format +#, php-format msgid "Bio is too long (max %d chars)." -msgstr "La bio est trop longue (140 caractères maximum)." +msgstr "La bio est trop longue (%d caractères maximum)." #: actions/profilesettings.php:228 msgid "Timezone not selected." @@ -2384,9 +2412,8 @@ msgid "Sorry, only invited people can register." msgstr "Désolé ! Seules les personnes invitées peuvent s'inscrire." #: actions/register.php:92 -#, fuzzy msgid "Sorry, invalid invitation code." -msgstr "Erreur dans le code de confirmation." +msgstr "Désolé, code d'invitation invalide." #: actions/register.php:112 msgid "Registration successful" @@ -2437,7 +2464,7 @@ msgid "Same as password above. Required." msgstr "Identique au mot de passe ci-dessus. Requis." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Courriel" @@ -2527,9 +2554,8 @@ msgid "Remote subscribe" msgstr "Abonnement à distance " #: actions/remotesubscribe.php:124 -#, fuzzy msgid "Subscribe to a remote user" -msgstr "S'abonner à cet utilisateur" +msgstr "S'abonner à un utilisateur distant" #: actions/remotesubscribe.php:129 msgid "User nickname" @@ -2563,14 +2589,12 @@ msgid "" msgstr "URL de profil invalide (aucun document YADIS)." #: actions/remotesubscribe.php:176 -#, fuzzy msgid "That’s a local profile! Login to subscribe." -msgstr "Ce profil est local ! Ouvrez une session pour vous abonner." +msgstr "Ce profil est local ! Connectez-vous pour vous abonner." #: actions/remotesubscribe.php:183 -#, fuzzy msgid "Couldn’t get a request token." -msgstr "Impossible d'obtenir le jeton de requête." +msgstr "Impossible d'obtenir un jeton de requête." #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 @@ -2625,9 +2649,9 @@ msgid "Replies to %1$s on %2$s!" msgstr "Message adressé à %1$s le %2$s" #: actions/showfavorites.php:79 -#, fuzzy, php-format +#, php-format msgid "%s's favorite notices, page %d" -msgstr "Statuts favoris de %s - page %d" +msgstr "Avis favoris de %s, page %d" #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." @@ -2699,26 +2723,26 @@ msgstr "Note" #: actions/showgroup.php:284 lib/groupeditform.php:184 msgid "Aliases" -msgstr "" +msgstr "Alias" #: actions/showgroup.php:293 msgid "Group actions" msgstr "Actions du groupe" #: actions/showgroup.php:328 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s group (RSS 1.0)" -msgstr "Fil des statuts du groupe %s" +msgstr "Fil des avis du groupe %s (RSS 1.0)" #: actions/showgroup.php:334 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s group (RSS 2.0)" -msgstr "Fil des statuts du groupe %s" +msgstr "Fil des avis du groupe %s (RSS 2.0)" #: actions/showgroup.php:340 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s group (Atom)" -msgstr "Fil des statuts du groupe %s" +msgstr "Fil des avis du groupe %s (Atom)" #: actions/showgroup.php:345 #, php-format @@ -2793,9 +2817,8 @@ msgid "Message from %1$s on %2$s" msgstr "Message reçu de %1$s le %2$s" #: actions/shownotice.php:90 -#, fuzzy msgid "Notice deleted." -msgstr "Statut publié" +msgstr "Avis supprimé." #: actions/showstream.php:73 #, fuzzy, php-format @@ -2881,9 +2904,8 @@ msgstr "" "name%%." #: actions/smssettings.php:91 -#, fuzzy msgid "SMS is not available." -msgstr "Cette page n'est pas disponible dans " +msgstr "Les SMS ne sont pas disponibles." #: actions/smssettings.php:112 msgid "Current confirmed SMS-enabled phone number." @@ -3194,7 +3216,7 @@ msgstr "Refuser" #: actions/userauthorization.php:212 msgid "Reject this subscription" -msgstr "Rejeter cet souscription" +msgstr "Rejeter cette souscription" #: actions/userauthorization.php:225 msgid "No authorization request!" @@ -3256,14 +3278,14 @@ msgid "Avatar URL ‘%s’ is not valid." msgstr "" #: actions/userauthorization.php:343 -#, fuzzy, php-format +#, php-format msgid "Can’t read avatar URL ‘%s’." -msgstr "Impossible de lire l'URL '%s'" +msgstr "Impossible de lire l'URL de l'avatar « %s »." #: actions/userauthorization.php:348 -#, fuzzy, php-format +#, php-format msgid "Wrong image type for avatar URL ‘%s’." -msgstr "Format d'image invalide pour '%s'" +msgstr "Format d'image invalide pour l'URL de l'avatar « %s »." #: actions/userbyid.php:70 msgid "No id." @@ -3289,9 +3311,8 @@ msgid "%s groups, page %d" msgstr "Groupes de %s - page %d" #: actions/usergroups.php:130 -#, fuzzy msgid "Search for more groups" -msgstr "Rechercher des personnes ou du texte" +msgstr "Rechercher pour plus de groupes" #: actions/usergroups.php:153 #, php-format @@ -3334,9 +3355,8 @@ msgid "DB error inserting hashtag: %s" msgstr "Erreur de base de donnée en insérant le hashtag : %s" #: classes/Notice.php:179 -#, fuzzy msgid "Problem saving notice. Too long." -msgstr "Problème lors de l'enregistrement du statut." +msgstr "Problème lors de l'enregistrement de l'avis ; trop long." #: classes/Notice.php:183 msgid "Problem saving notice. Unknown user." @@ -3371,36 +3391,36 @@ msgstr "Problème lors de l'enregistrement du statut." msgid "DB error inserting reply: %s" msgstr "Erreur de base de donnée en insérant la réponse :%s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Message adressé à %1$s le %2$s" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Modifier vos paramètres de profil" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "Ajouter un avatar" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Modifier votre mot de passe" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Modifier le traitement des courriels" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "Conception" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 msgid "Design your profile" msgstr "Concevez votre profile" @@ -3408,7 +3428,7 @@ msgstr "Concevez votre profile" msgid "Other" msgstr "Autres " -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Autres options " @@ -3447,9 +3467,8 @@ msgid "Connect" msgstr "Connecter" #: lib/action.php:435 -#, fuzzy msgid "Connect to services" -msgstr "Impossible de rediriger vers le serveur : %s" +msgstr "Se connecter aux services" #: lib/action.php:439 lib/subgroupnav.php:105 msgid "Invite" @@ -3501,9 +3520,8 @@ msgid "Local views" msgstr "Vues locales" #: lib/action.php:612 -#, fuzzy msgid "Page notice" -msgstr "Notice de la page" +msgstr "Avis de la page" #: lib/action.php:714 msgid "Secondary site navigation" @@ -3568,9 +3586,8 @@ msgstr "" "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)." #: lib/action.php:785 -#, fuzzy msgid "Site content license" -msgstr "Licence du logiciel StatusNet" +msgstr "Licence du contenu du site" #: lib/action.php:794 msgid "All " @@ -3696,10 +3713,10 @@ msgid "About: %s" msgstr "À propos : %s" #: lib/command.php:358 scripts/xmppdaemon.php:321 -#, fuzzy, php-format +#, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -"Message trop long ! La taille maximale est de 140 caractères ; vous en avez " +"Message trop long ! La taille maximale est de %d caractères ; vous en avez " "entré %d." #: lib/command.php:377 @@ -3707,21 +3724,20 @@ msgid "Error sending direct message." msgstr "Une erreur est survenue pendant l'envoi de votre message." #: lib/command.php:431 -#, fuzzy, php-format +#, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -"Message trop long ! La taille maximale est de 140 caractères ; vous en avez " +"Avis trop long ! La taille maximale est de %d caractères ; vous en avez " "entré %d." #: lib/command.php:439 -#, fuzzy, php-format +#, php-format msgid "Reply to %s sent" -msgstr "Répondre à ce statut" +msgstr "Réponse à %s envoyée" #: lib/command.php:441 -#, fuzzy msgid "Error saving notice." -msgstr "Problème lors de l'enregistrement du statut." +msgstr "Problème lors de l'enregistrement de l'avis." #: lib/command.php:495 msgid "Specify the name of the user to subscribe to" @@ -3807,23 +3823,21 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 -#, fuzzy +#: lib/common.php:189 msgid "No configuration file found. " -msgstr "Aucun code de confirmation." +msgstr "Aucun fichier de configuration n'a été trouvé. " -#: lib/common.php:192 +#: lib/common.php:190 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:191 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 -#, fuzzy +#: lib/common.php:192 msgid "Go to the installer." -msgstr "Ouvrir une session" +msgstr "Aller au programme d'installation" #: lib/connectsettingsaction.php:110 msgid "IM" @@ -4085,8 +4099,8 @@ msgstr "Type de fichier inconnu" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "Nouveau statut" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 msgid "Join" @@ -4357,11 +4371,11 @@ msgstr "" #: lib/mediafile.php:159 msgid "Missing a temporary folder." -msgstr "" +msgstr "Un dossier temporaire est manquant." #: lib/mediafile.php:162 msgid "Failed to write file to disk." -msgstr "" +msgstr "Impossible d'écrire sur le disque." #: lib/mediafile.php:165 msgid "File upload stopped by extension." @@ -4412,11 +4426,11 @@ msgstr "Quoi de neuf, %s ?" #: lib/noticeform.php:180 msgid "Attach" -msgstr "" +msgstr "Attacher" #: lib/noticeform.php:184 msgid "Attach a file" -msgstr "" +msgstr "Attacher un fichier" #: lib/noticelist.php:478 msgid "in context" @@ -4455,9 +4469,8 @@ msgid "Error inserting remote profile" msgstr "Erreur lors de l'insertion du profil distant" #: lib/oauthstore.php:345 -#, fuzzy msgid "Duplicate notice" -msgstr "Supprimer ce statut" +msgstr "Dupliquer l'avis" #: lib/oauthstore.php:487 msgid "Couldn't insert new subscription." @@ -4615,7 +4628,7 @@ msgstr "(aucun)" #: lib/subs.php:48 msgid "Already subscribed!" -msgstr "" +msgstr "Déjà souscrit !" #: lib/subs.php:52 msgid "User has blocked you." @@ -4630,7 +4643,8 @@ msgid "Could not subscribe other to you." msgstr "Impossible d'abonner une autre personne à votre profil." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "Pas abonné !" #: lib/subs.php:136 @@ -4677,47 +4691,47 @@ msgstr "Envoyer un message à cet utilisateur" msgid "Message" msgstr "Message " -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "il y a quelques secondes " -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "il y a 1 minute" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "il y a %d minutes" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "il y a 1 heure" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "il y a %d heures" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "il y a 1 jour" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "il y a %d jours" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "il y a 1 mois" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "il y a %d mois" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "il y a environ 1 an" @@ -4730,6 +4744,7 @@ msgstr "&s n'est pas une couleur valide !" #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" +"%s n'est pas une couleur valide ! Utilisez 3 ou 6 caractères hexadécimaux." #: scripts/maildaemon.php:48 msgid "Could not parse message." diff --git a/locale/ga/LC_MESSAGES/statusnet.mo b/locale/ga/LC_MESSAGES/statusnet.mo Binary files differindex bf827fd68..fa63d16af 100644 --- a/locale/ga/LC_MESSAGES/statusnet.mo +++ b/locale/ga/LC_MESSAGES/statusnet.mo diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index 294ef6f94..edbe981a2 100644 --- a/locale/ga/LC_MESSAGES/statusnet.po +++ b/locale/ga/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:05+0000\n" +"POT-Creation-Date: 2009-11-13 20:42+0000\n" +"PO-Revision-Date: 2009-11-13 20:42:42+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ga\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "Non existe a etiqueta." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -106,35 +109,42 @@ msgstr "%s e amigos" msgid "Updates from %1$s and friends on %2$s!" msgstr "Actualizacións dende %1$s e amigos en %2$s!" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "Método da API non atopado" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Este método require un POST." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Non se puido actualizar o usuario." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -142,12 +152,34 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "Non se puideron gardar os teus axustes de Twitter!" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Non se puido actualizar o usuario." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "O usuario non ten perfil." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Non se puido gardar o perfil." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "Bloqueo de usuario fallido." @@ -195,6 +227,23 @@ msgstr "Mensaxes directas para %s" msgid "All the direct messages sent to %s" msgstr "Tódalas mensaxes directas enviadas a %s" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "Método da API non atopado" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -391,18 +440,18 @@ msgstr "Avatar actualizado." msgid "No status with that ID found." msgstr "Non existe ningún estado con esa ID atopada." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" "Iso é demasiado longo. O tamaño máximo para un chÃo é de 140 caracteres." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "Non atopado" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -486,7 +535,7 @@ msgid "Invalid size." msgstr "Tamaño inválido." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" @@ -536,7 +585,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1692,7 +1741,7 @@ msgid "Nickname" msgstr "Alcume" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Contrasinal" @@ -1831,7 +1880,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1878,8 +1927,8 @@ msgstr "Conectar" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Non é un formato de datos soportado." @@ -1899,11 +1948,15 @@ msgstr "Outros axustes" msgid "Manage various other options." msgstr "Xestionár axustes varios." -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "Servizo de acortado automático a usar." @@ -1939,67 +1992,62 @@ msgstr "" msgid "Change password" msgstr "Cambiar contrasinal" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Cambiar contrasinal" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 #, fuzzy msgid "Change your password." msgstr "Cambiar contrasinal" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Contrasinal gardada." -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Contrasinal antiga" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Nova contrasinal" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 ou máis caracteres" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirmar" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "igual á contrasinal de enriba" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Modificado" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "A contrasinal debe ter 6 caracteres ou máis." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "As contrasinais non coinciden" -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Contrasinal actual incorrecta" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Acounteceu un erro gardando o usuario: é inválido." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Non se pode gardar a contrasinal." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Contrasinal gardada." @@ -2456,7 +2504,7 @@ msgid "Same as password above. Required." msgstr "A mesma contrasinal que arriba. Requerido." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Correo Electrónico" @@ -3407,37 +3455,37 @@ msgstr "Aconteceu un erro ó gardar o chÃo." msgid "DB error inserting reply: %s" msgstr "Erro ó inserir a contestación na BD: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Mensaxe de %1$s en %2$s" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Perfil" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Configuración de perfil" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 #, fuzzy msgid "Upload an avatar" msgstr "Acounteceu un fallo ó actualizar o avatar." -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Cambiar contrasinal" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Cambiar a xestión de email" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "O usuario non ten perfil." @@ -3446,7 +3494,7 @@ msgstr "O usuario non ten perfil." msgid "Other" msgstr "Outros" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Outras opcions" @@ -3878,20 +3926,20 @@ msgstr "" "tracks - non implementado por agora.\n" "tracking - non implementado por agora.\n" -#: lib/common.php:191 +#: lib/common.php:189 #, fuzzy msgid "No configuration file found. " msgstr "Sen código de confirmación." -#: lib/common.php:192 +#: lib/common.php:190 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:191 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:192 msgid "Go to the installer." msgstr "" @@ -4167,8 +4215,8 @@ msgstr "tipo de ficheiro non soportado" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "Novo chÃo" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 #, fuzzy @@ -4336,6 +4384,16 @@ msgid "" "With kind regards,\n" "%4$s\n" msgstr "" +"%1$s (%2$s) preguntase que é de ti, e invÃtate a publicar algun chÃo.\n" +"\n" +"So let's hear from you :)\n" +"\n" +"%3$s\n" +"\n" +"Don't reply to this email; it won't get to them.\n" +"\n" +"With kind regards,\n" +"%4$s\n" #: lib/mail.php:509 #, php-format @@ -4360,6 +4418,20 @@ msgid "" "With kind regards,\n" "%5$s\n" msgstr "" +"%1$s (%2$s) enviouche unha mensaxe privada:\n" +"\n" +"------------------------------------------------------\n" +"%3$s\n" +"------------------------------------------------------\n" +"\n" +"You can reply to their message here:\n" +"\n" +"%4$s\n" +"\n" +"Don't reply to this email; it won't get to them.\n" +"\n" +"With kind regards,\n" +"%5$s\n" #: lib/mail.php:554 #, fuzzy, php-format @@ -4729,7 +4801,8 @@ msgid "Could not subscribe other to you." msgstr "Outro usuario non se puido suscribir a ti." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "Non está suscrito!" #: lib/subs.php:136 @@ -4783,47 +4856,47 @@ msgstr "Non podes enviar mensaxes a este usurio." msgid "Message" msgstr "Nova mensaxe" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "fai uns segundos" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "fai un minuto" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "fai %d minutos" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "fai unha hora" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "fai %d horas" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "fai un dÃa" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "fai %d dÃas" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "fai un mes" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "fai %d meses" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "fai un ano" diff --git a/locale/he/LC_MESSAGES/statusnet.mo b/locale/he/LC_MESSAGES/statusnet.mo Binary files differindex faaf5f29b..51329ffd0 100644 --- a/locale/he/LC_MESSAGES/statusnet.mo +++ b/locale/he/LC_MESSAGES/statusnet.mo diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 902e4a5c0..af4ad9aae 100644 --- a/locale/he/LC_MESSAGES/statusnet.po +++ b/locale/he/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:08+0000\n" +"POT-Creation-Date: 2009-11-13 20:42+0000\n" +"PO-Revision-Date: 2009-11-13 20:42:45+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: he\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "×ין הודעה כזו." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -106,35 +109,42 @@ msgstr "%s וחברי×" msgid "Updates from %1$s and friends on %2$s!" msgstr "" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." +msgstr "קוד ×”×ישור ×œ× × ×ž×¦×." -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "עידכון המשתמש × ×›×©×œ." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -142,12 +152,33 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "עידכון המשתמש × ×›×©×œ." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "למשתמש ×ין פרופיל." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "שמירת הפרופיל × ×›×©×œ×”." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "" @@ -193,6 +224,23 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -387,17 +435,17 @@ msgstr "×”×ª×ž×•× ×” ×¢×•×“×›× ×”." msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "×–×” ×רוך מידי. ×ורך מירבי להודעה ×”×•× 140 ×ותיות." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "×œ× × ×ž×¦×" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -482,7 +530,7 @@ msgid "Invalid size." msgstr "גודל ×œ× ×—×•×§×™." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "×ª×ž×•× ×”" @@ -532,7 +580,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1640,7 +1688,7 @@ msgid "Nickname" msgstr "×›×™× ×•×™" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "סיסמה" @@ -1775,7 +1823,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1820,8 +1868,8 @@ msgstr "התחבר" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "" @@ -1842,11 +1890,15 @@ msgstr "הגדרות" msgid "Manage various other options." msgstr "" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "" @@ -1882,66 +1934,62 @@ msgstr "" msgid "Change password" msgstr "×©× ×” סיסמה" -#: actions/passwordsettings.php:70 -msgid "You are not allowed to change your password" -msgstr "" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 #, fuzzy msgid "Change your password." msgstr "×©× ×” סיסמה" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "הסיסמה × ×©×ž×¨×”." -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "סיסמה ×™×©× ×”" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "סיסמה חדשה" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "לפחות 6 ×ותיות" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "×שר" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "×–×”×” לסיסמה למעלה" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "×©× ×”" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "הסיסמ×ות ×œ× ×ª×•×מות." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "הסיסמה ×”×™×©× ×” ×œ× × ×›×•× ×”" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "שגי××” בשמירת ×©× ×”×ž×©×ª×ž×©, ×œ× ×¢×•×ž×“ בכללי×." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "×œ× × ×™×ª×Ÿ לשמור ×ת הסיסמה" -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "הסיסמה × ×©×ž×¨×”." @@ -2376,7 +2424,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "" @@ -3279,37 +3327,37 @@ msgstr "בעיה בשמירת ההודעה." msgid "DB error inserting reply: %s" msgstr "שגי×ת מסד × ×ª×•× ×™× ×‘×”×›× ×¡×ª התגובה: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "פרופיל" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 #, fuzzy msgid "Upload an avatar" msgstr "עדכון ×”×ª×ž×•× ×” × ×›×©×œ." -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "למשתמש ×ין פרופיל." @@ -3318,7 +3366,7 @@ msgstr "למשתמש ×ין פרופיל." msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "" @@ -3715,20 +3763,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:189 #, fuzzy msgid "No configuration file found. " msgstr "×ין קוד ×ישור." -#: lib/common.php:192 +#: lib/common.php:190 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:191 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:192 msgid "Go to the installer." msgstr "" @@ -4001,8 +4049,8 @@ msgstr "" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "הודעה חדשה" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 #, fuzzy @@ -4524,7 +4572,8 @@ msgid "Could not subscribe other to you." msgstr "" #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "×œ× ×ž× ×•×™!" #: lib/subs.php:136 @@ -4575,47 +4624,47 @@ msgstr "" msgid "Message" msgstr "הודעה חדשה" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "×œ×¤× ×™ מספר ×©× ×™×•×ª" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "×œ×¤× ×™ כדקה" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "×œ×¤× ×™ ×›-%d דקות" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "×œ×¤× ×™ כשעה" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "×œ×¤× ×™ ×›-%d שעות" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "×œ×¤× ×™ כיו×" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "×œ×¤× ×™ ×›-%d ימי×" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "×œ×¤× ×™ כחודש" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "×œ×¤× ×™ ×›-%d חודשי×" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "×œ×¤× ×™ ×›×©× ×”" diff --git a/locale/is/LC_MESSAGES/statusnet.mo b/locale/is/LC_MESSAGES/statusnet.mo Binary files differindex eaf63735e..bf148d7fa 100644 --- a/locale/is/LC_MESSAGES/statusnet.mo +++ b/locale/is/LC_MESSAGES/statusnet.mo diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index c0bef7ddf..86be2cf8b 100644 --- a/locale/is/LC_MESSAGES/statusnet.po +++ b/locale/is/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:10+0000\n" +"POT-Creation-Date: 2009-11-13 20:42+0000\n" +"PO-Revision-Date: 2009-11-13 20:42:49+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: is\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "Ekkert þannig merki." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -105,35 +108,42 @@ msgstr "" msgid "Updates from %1$s and friends on %2$s!" msgstr "Færslur frá %1$s og vinum á %2$s!" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "Aðferð à forritsskilum fannst ekki!" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Þessi aðferð krefst POST." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Gat ekki uppfært notanda." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -141,12 +151,33 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Gat ekki uppfært hóp." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "Notandi hefur enga persónulega sÃðu." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Gat ekki vistað persónulega sÃðu." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "Mistókst að loka á notanda." @@ -192,6 +223,23 @@ msgstr "Bein skilaboð til %s" msgid "All the direct messages sent to %s" msgstr "Öll bein skilaboð til %s" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "Aðferð à forritsskilum fannst ekki!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -381,17 +429,17 @@ msgstr "" msgid "No status with that ID found." msgstr "Engin staða með þessu kenni fannst." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "Fannst ekki" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -474,7 +522,7 @@ msgid "Invalid size." msgstr "Ótæk stærð." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Mynd" @@ -522,7 +570,7 @@ msgstr "Skera af" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1638,7 +1686,7 @@ msgid "Nickname" msgstr "Stuttnefni" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Lykilorð" @@ -1778,7 +1826,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1824,8 +1872,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Enginn stuðningur við gagnasnið." @@ -1845,11 +1893,15 @@ msgstr "Aðrar stillingar" msgid "Manage various other options." msgstr "Sjá um ýmsar aðrar stillingar." -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "Þjónusta sem sér um sjálfkrafa styttingu." @@ -1885,65 +1937,60 @@ msgstr "" msgid "Change password" msgstr "Breyta lykilorði" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Breyta lykilorðinu þÃnu" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 msgid "Change your password." msgstr "Breyta lykilorðinu þÃnu." -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "Lykilorðabreyting" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Eldra lykilorð" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Nýtt lykilorð" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 eða fleiri tákn" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Staðfesta" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "sama og lykilorðið hér fyrir ofan" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Breyta" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Lykilorð verður að vera að minnsta kosti 6 tákn." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Lykilorðin passa ekki saman." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Rangt eldra lykilorð" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Villa kom upp à vistun notanda: ótækt." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Get ekki vistað nýja lykilorðið." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Lykilorð vistað." @@ -2384,7 +2431,7 @@ msgid "Same as password above. Required." msgstr "Sama og lykilorðið hér fyrir ofan. Nauðsynlegt." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Tölvupóstur" @@ -3299,36 +3346,36 @@ msgstr "Vandamál komu upp við að vista babl." msgid "DB error inserting reply: %s" msgstr "Gagnagrunnsvilla við innsetningu svars: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Persónuleg sÃða" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Breyta persónulegu stillingunum þÃnum" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "Hlaða upp einkennismynd" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Breyta lykilorðinu þÃnu" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Breyta tölvupóstumsjón" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 msgid "Design your profile" msgstr "" @@ -3336,7 +3383,7 @@ msgstr "" msgid "Other" msgstr "Annað" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Aðrir valkostir" @@ -3726,20 +3773,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:189 #, fuzzy msgid "No configuration file found. " msgstr "Enginn staðfestingarlykill." -#: lib/common.php:192 +#: lib/common.php:190 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:191 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:192 #, fuzzy msgid "Go to the installer." msgstr "Skrá þig inn á sÃðuna" @@ -4002,9 +4049,9 @@ msgid "Unknown file type" msgstr "Óþekkt skráargerð" #: lib/jabber.php:192 -#, fuzzy, php-format -msgid "notice id: %s" -msgstr "Bablveita fyrir %s" +#, php-format +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 msgid "Join" @@ -4517,7 +4564,8 @@ msgid "Could not subscribe other to you." msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "Ekki à áskrift!" #: lib/subs.php:136 @@ -4564,47 +4612,47 @@ msgstr "Senda bein skilaboð til þessa notanda" msgid "Message" msgstr "Skilaboð" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "fyrir nokkrum sekúndum" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "fyrir um einni mÃnútu sÃðan" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "fyrir um %d mÃnútum sÃðan" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "fyrir um einum klukkutÃma sÃðan" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "fyrir um %d klukkutÃmum sÃðan" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "fyrir um einum degi sÃðan" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "fyrir um %d dögum sÃðan" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "fyrir um einum mánuði sÃðan" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "fyrir um %d mánuðum sÃðan" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "fyrir um einu ári sÃðan" diff --git a/locale/it/LC_MESSAGES/statusnet.mo b/locale/it/LC_MESSAGES/statusnet.mo Binary files differindex 1e33d6b95..a215ac0ac 100644 --- a/locale/it/LC_MESSAGES/statusnet.mo +++ b/locale/it/LC_MESSAGES/statusnet.mo diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index 06a8a0a12..03d397b52 100644 --- a/locale/it/LC_MESSAGES/statusnet.po +++ b/locale/it/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:13+0000\n" +"POT-Creation-Date: 2009-11-13 20:42+0000\n" +"PO-Revision-Date: 2009-11-13 20:42:52+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: it\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "Nessuna tale etichetta." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -106,35 +109,42 @@ msgstr "%s e amici" msgid "Updates from %1$s and friends on %2$s!" msgstr "Aggiornamenti da %1$s e amici su %2$s!" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "Metodo delle API non trovato!" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Questo metodo richiede POST." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Impossibile aggiornare l'utente." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -142,12 +152,34 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "Impossibile salvare le tue impostazioni di Twitter!" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Impossibile aggiornare l'utente." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "L'utente non ha un profilo." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Impossibile salvare il profilo." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "Blocco dell'utente non riuscito." @@ -193,6 +225,23 @@ msgstr "Messaggi diretti a %s" msgid "All the direct messages sent to %s" msgstr "Tutti i messaggi diretti inviati a %s" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "Metodo delle API non trovato!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -389,17 +438,17 @@ msgstr "Immagine aggiornata." msgid "No status with that ID found." msgstr "Nessuno stato con quel ID trovato." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Troppo lungo. Lunghezza massima 140 caratteri." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "Non trovato" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -483,7 +532,7 @@ msgid "Invalid size." msgstr "Dimensione non valida." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Immagine" @@ -531,7 +580,7 @@ msgstr "Ritaglia" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1679,7 +1728,7 @@ msgid "Nickname" msgstr "Soprannome" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Password" @@ -1816,7 +1865,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1863,8 +1912,8 @@ msgstr "Connetti" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Non è un formato di dati supportato." @@ -1884,11 +1933,15 @@ msgstr "Altre impostazioni" msgid "Manage various other options." msgstr "Gestisci altre opzioni." -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "Servizio di autoriduzione da usare." @@ -1925,65 +1978,60 @@ msgstr "" msgid "Change password" msgstr "Modifica password" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Modifica la tua password" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 msgid "Change your password." msgstr "Modifica la tua password." -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "Cambio password" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Vecchia password" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Nuova password" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 o più caratteri" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Conferma" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "stessa password di sopra" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Modifica" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "La password deve essere di 6 o più caratteri." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Le password non corrispondono." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Vecchia password non corretta" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Errore nel salvare l'utente; non valido." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Impossibile salvare la nuova password." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Password salvata." @@ -2427,7 +2475,7 @@ msgid "Same as password above. Required." msgstr "Stessa password di sopra. Richiesta." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Email" @@ -3359,36 +3407,36 @@ msgstr "Problema nel salvare il messaggio." msgid "DB error inserting reply: %s" msgstr "Errore del DB nell'inserire la risposta: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Messaggio a %1$s su %2$s" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profilo" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Modifica le impostazioni del tuo profilo" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "Carica un'immagine" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Modifica la tua password" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Modifica la gestione dell'email" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "Profilo utente" @@ -3397,7 +3445,7 @@ msgstr "Profilo utente" msgid "Other" msgstr "Altro" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Altre opzioni" @@ -3787,20 +3835,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:189 #, fuzzy msgid "No configuration file found. " msgstr "Nessun codice di conferma." -#: lib/common.php:192 +#: lib/common.php:190 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:191 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:192 #, fuzzy msgid "Go to the installer." msgstr "Accedi al sito" @@ -4069,8 +4117,8 @@ msgstr "Tipo di file sconosciuto" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "Nuovo messaggio" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 msgid "Join" @@ -4592,7 +4640,8 @@ msgid "Could not subscribe other to you." msgstr "Impossibile abbonare altri a te." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "Non abbonato!" #: lib/subs.php:136 @@ -4641,47 +4690,47 @@ msgstr "Invia un messaggio diretto a questo utente" msgid "Message" msgstr "Messaggio" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "pochi secondi fa" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "circa un minuto fa" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "circa %d minuti fa" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "circa un'ora fa" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "circa %d ore fa" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "circa un giorno fa" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "circa %d giorni fa" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "circa un mese fa" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "circa %d mesi fa" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "circa un anno fa" diff --git a/locale/ja/LC_MESSAGES/statusnet.mo b/locale/ja/LC_MESSAGES/statusnet.mo Binary files differindex 9bbc582ac..91a049b32 100644 --- a/locale/ja/LC_MESSAGES/statusnet.mo +++ b/locale/ja/LC_MESSAGES/statusnet.mo diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index fd22e5177..f75460079 100644 --- a/locale/ja/LC_MESSAGES/statusnet.po +++ b/locale/ja/LC_MESSAGES/statusnet.po @@ -6,12 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:16+0000\n" +"POT-Creation-Date: 2009-11-13 20:42+0000\n" +"PO-Revision-Date: 2009-11-13 20:42:55+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ja\n" "X-Message-Group: out-statusnet\n" @@ -23,12 +23,15 @@ msgid "No such page" msgstr "ãã®ã‚ˆã†ãªé€šçŸ¥ã¯ã‚ã‚Šã¾ã›ã‚“。" #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -107,35 +110,42 @@ msgstr "%s & ã¨ã‚‚ã ã¡" msgid "Updates from %1$s and friends on %2$s!" msgstr "" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "API メソッドãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ï¼" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "ユーザを更新ã§ãã¾ã›ã‚“" + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -143,12 +153,33 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "ユーザを更新ã§ãã¾ã›ã‚“" + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚ã‚Šã¾ã›ã‚“。" +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä¿å˜ã§ãã¾ã›ã‚“" + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "ユーザã®ãƒ–ãƒãƒƒã‚¯ã«å¤±æ•—ã—ã¾ã—ãŸã€‚" @@ -194,6 +225,23 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "API メソッドãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ï¼" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -391,17 +439,17 @@ msgstr "ã‚¢ãƒã‚¿ãƒ¼ãŒæ›´æ–°ã•ã‚Œã¾ã—ãŸã€‚" msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "é•·ã™ãŽã¾ã™ã€‚通知ã¯æœ€å¤§ 140 å—ã¾ã§ã§ã™ã€‚" -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -485,7 +533,7 @@ msgid "Invalid size." msgstr "ä¸æ£ãªã‚µã‚¤ã‚ºã€‚" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "ã‚¢ãƒã‚¿ãƒ¼" @@ -534,7 +582,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1668,7 +1716,7 @@ msgid "Nickname" msgstr "ニックãƒãƒ¼ãƒ " #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "パスワード" @@ -1800,7 +1848,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1844,8 +1892,8 @@ msgstr "内容種別 " msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "" @@ -1866,11 +1914,15 @@ msgstr "è¨å®š" msgid "Manage various other options." msgstr "" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "" @@ -1906,67 +1958,62 @@ msgstr "" msgid "Change password" msgstr "パスワードã®å¤‰æ›´" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "パスワードã®å¤‰æ›´" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 #, fuzzy msgid "Change your password." msgstr "パスワードã®å¤‰æ›´" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "パスワードãŒä¿å˜ã•ã‚Œã¾ã—ãŸã€‚" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "å¤ã„パスワード" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "æ–°ã—ã„パスワード" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6æ–‡å—以上" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "確èª" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "上ã®ãƒ‘スワードã¨åŒã˜" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "変更" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "パスワードãŒä¸€è‡´ã—ã¾ã›ã‚“。" -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "å¤ã„パスワードãŒé–“é•ã£ã¦ã„ã¾ã™ã€‚" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "ユーザä¿å˜ã‚¨ãƒ©ãƒ¼; ä¸æ£ãªãƒ¦ãƒ¼ã‚¶" -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "æ–°ã—ã„パスワードをä¿å˜ã§ãã¾ã›ã‚“。" -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "パスワードãŒä¿å˜ã•ã‚Œã¾ã—ãŸã€‚" @@ -2403,7 +2450,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "メール" @@ -3318,36 +3365,36 @@ msgstr "通知をä¿å˜ã™ã‚‹éš›ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚" msgid "DB error inserting reply: %s" msgstr "è¿”ä¿¡ã‚’è¿½åŠ ã™ã‚‹éš›ã«ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚¨ãƒ©ãƒ¼ : %s" -#: classes/User.php:333 +#: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«è¨å®šã®å¤‰æ›´" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "ã‚¢ãƒã‚¿ãƒ¼ã®ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "パスワードã®å¤‰æ›´" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "メールã®æ‰±ã„を変更" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚ã‚Šã¾ã›ã‚“。" @@ -3356,7 +3403,7 @@ msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚ã‚Šã¾ã›ã‚“。" msgid "Other" msgstr "ãã®ä»–" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "ãã®ä»–ã®ã‚ªãƒ—ション" @@ -3751,20 +3798,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:189 #, fuzzy msgid "No configuration file found. " msgstr "確èªã‚³ãƒ¼ãƒ‰ãŒã‚ã‚Šã¾ã›ã‚“。" -#: lib/common.php:192 +#: lib/common.php:190 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:191 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:192 #, fuzzy msgid "Go to the installer." msgstr "サイトã¸ãƒã‚°ã‚¤ãƒ³" @@ -4033,8 +4080,8 @@ msgstr "" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "æ–°ã—ã„通知" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 msgid "Join" @@ -4547,7 +4594,8 @@ msgid "Could not subscribe other to you." msgstr "" #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "è³¼èªã—ã¦ã„ã¾ã›ã‚“ï¼" #: lib/subs.php:136 @@ -4596,47 +4644,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "数秒å‰" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "ç´„ 1 分å‰" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "ç´„ %d 分å‰" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "ç´„ 1 時間å‰" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "ç´„ %d 時間å‰" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "ç´„ 1 æ—¥å‰" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "ç´„ %d æ—¥å‰" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "ç´„ 1 ヵ月å‰" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "ç´„ %d ヵ月å‰" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "ç´„ 1 å¹´å‰" diff --git a/locale/ko/LC_MESSAGES/statusnet.mo b/locale/ko/LC_MESSAGES/statusnet.mo Binary files differindex b2e5f3d92..ad6a2eca8 100644 --- a/locale/ko/LC_MESSAGES/statusnet.mo +++ b/locale/ko/LC_MESSAGES/statusnet.mo diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index f521a9f09..9c25104ac 100644 --- a/locale/ko/LC_MESSAGES/statusnet.po +++ b/locale/ko/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:19+0000\n" +"POT-Creation-Date: 2009-11-13 20:42+0000\n" +"PO-Revision-Date: 2009-11-13 20:42:57+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ko\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "그러한 태그가 없습니다." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -106,35 +109,42 @@ msgstr "%s ë° ì¹œêµ¬ë“¤" msgid "Updates from %1$s and friends on %2$s!" msgstr "%1$s ë° %2$sì— ìžˆëŠ” ì¹œêµ¬ë“¤ì˜ ì—…ë°ì´íŠ¸!" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "API 메서드를 ì°¾ì„ ìˆ˜ 없습니다." -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "ì´ ë©”ì„œë“œëŠ” 등ë¡ì„ 요구합니다." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "사용ìžë¥¼ ì—…ë°ì´íŠ¸ í• ìˆ˜ 없습니다." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -142,12 +152,34 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "트위터 í™˜ê²½ì„¤ì •ì„ ì €ìž¥í• ìˆ˜ 없습니다." + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "사용ìžë¥¼ ì—…ë°ì´íŠ¸ í• ìˆ˜ 없습니다." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "ì´ìš©ìžê°€ í”„ë¡œí•„ì„ ê°€ì§€ê³ ìžˆì§€ 않습니다." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "í”„ë¡œí•„ì„ ì €ìž¥ í• ìˆ˜ 없습니다." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "ì‚¬ìš©ìž ì°¨ë‹¨ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤." @@ -193,6 +225,23 @@ msgstr "%sì—게 ì§ì ‘ 메시지" msgid "All the direct messages sent to %s" msgstr "%sì—게 ëª¨ë“ ì§ì ‘ 메시지" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "API 메서드를 ì°¾ì„ ìˆ˜ 없습니다." + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -389,17 +438,17 @@ msgstr "아바타가 ì—…ë°ì´íŠ¸ ë˜ì—ˆìŠµë‹ˆë‹¤." msgid "No status with that ID found." msgstr "ë°œê²¬ëœ IDì˜ ìƒíƒœê°€ 없습니다." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "너무 ê¹ë‹ˆë‹¤. í†µì§€ì˜ ìµœëŒ€ 길ì´ëŠ” 140ê¸€ìž ìž…ë‹ˆë‹¤." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "찾지 못함" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -483,7 +532,7 @@ msgid "Invalid size." msgstr "옳지 ì•Šì€ í¬ê¸°" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "아바타" @@ -531,7 +580,7 @@ msgstr "ìžë¥´ê¸°" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1661,7 +1710,7 @@ msgid "Nickname" msgstr "별명" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "비밀 번호" @@ -1798,7 +1847,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1844,8 +1893,8 @@ msgstr "ì—°ê²°" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "지ì›í•˜ëŠ” 형ì‹ì˜ ë°ì´í„°ê°€ 아닙니다." @@ -1865,11 +1914,15 @@ msgstr "기타 ì„¤ì •" msgid "Manage various other options." msgstr "다양한 다른 옵션관리" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "ì‚¬ìš©í• URL ìžë™ 줄ì´ê¸° 서비스" @@ -1904,65 +1957,60 @@ msgstr "ë‹¹ì‹ ì˜ ë³´ë‚¸ 쪽지함입니다. ì´ê³³ì—” ë‹¹ì‹ ì´ ë³´ëƒˆë˜ ë¹„ë° msgid "Change password" msgstr "비밀번호 바꾸기" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "비밀번호 바꾸기" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 msgid "Change your password." msgstr "비밀번호를 변경하세요." -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "비밀번호 변경" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "기존 비밀 번호" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "새로운 비밀 번호" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6ê¸€ìž ì´ìƒ" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "ì¸ì¦" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "위 비밀번호와 ë™ì¼í•˜ê²Œ" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "변환" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "비밀번호는 6ìžë¦¬ ì´ìƒì´ì–´ì•¼ 합니다." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "비밀 번호가 ì¼ì¹˜í•˜ì§€ 않습니다." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "기존 비밀 번호가 í‹€ë ¸ìŠµë‹ˆë‹¤" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "ì‚¬ìš©ìž ì €ìž¥ 오류; 무효한 사용ìž" -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "새 비밀번호를 ì €ìž¥ í• ìˆ˜ 없습니다." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "비밀 번호 ì €ìž¥" @@ -2401,7 +2449,7 @@ msgid "Same as password above. Required." msgstr "위와 ê°™ì€ ë¹„ë°€ 번호. 필수 사í•." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "ì´ë©”ì¼" @@ -3324,36 +3372,36 @@ msgstr "통지를 ì €ìž¥í•˜ëŠ”ë° ë¬¸ì œê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤." msgid "DB error inserting reply: %s" msgstr "ë‹µì‹ ì„ ì¶”ê°€ í• ë•Œì— ë°ì´íƒ€ë² ì´ìŠ¤ ì—러 : %s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "%2$sì—ì„œ %1$s까지 메시지" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "프로필" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "프로필 세팅 바꾸기" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "아바타를 업로드하세요." -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "비밀번호 바꾸기" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "ì´ë©”ì¼ ì²˜ë¦¬ 변경" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "ì´ìš©ìž 프로필" @@ -3362,7 +3410,7 @@ msgstr "ì´ìš©ìž 프로필" msgid "Other" msgstr "기타" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "다른 옵션들" @@ -3752,20 +3800,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:189 #, fuzzy msgid "No configuration file found. " msgstr "í™•ì¸ ì½”ë“œê°€ 없습니다." -#: lib/common.php:192 +#: lib/common.php:190 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:191 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:192 #, fuzzy msgid "Go to the installer." msgstr "ì´ ì‚¬ì´íŠ¸ 로그ì¸" @@ -4034,8 +4082,8 @@ msgstr "ì•Œ 수 없는 ì¢…ë¥˜ì˜ íŒŒì¼ìž…니다" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "새로운 통지" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 msgid "Join" @@ -4549,7 +4597,8 @@ msgid "Could not subscribe other to you." msgstr "다른 ì‚¬ëžŒì„ êµ¬ë… í•˜ì‹¤ 수 없습니다." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "구ë…í•˜ê³ ìžˆì§€ 않습니다!" #: lib/subs.php:136 @@ -4598,47 +4647,47 @@ msgstr "ì´ íšŒì›ì—게 ì§ì ‘ 메시지를 보냅니다." msgid "Message" msgstr "메시지" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "몇 ì´ˆ ì „" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "1분 ì „" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "%d분 ì „" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "1시간 ì „" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "%d시간 ì „" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "하루 ì „" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "%dì¼ ì „" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "1달 ì „" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "%d달 ì „" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "1ë…„ ì „" diff --git a/locale/mk/LC_MESSAGES/statusnet.mo b/locale/mk/LC_MESSAGES/statusnet.mo Binary files differindex 3914f339c..cce86e74d 100644 --- a/locale/mk/LC_MESSAGES/statusnet.mo +++ b/locale/mk/LC_MESSAGES/statusnet.mo diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 91f7eaebe..01d416fa1 100644 --- a/locale/mk/LC_MESSAGES/statusnet.po +++ b/locale/mk/LC_MESSAGES/statusnet.po @@ -6,12 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:21+0000\n" +"POT-Creation-Date: 2009-11-13 20:42+0000\n" +"PO-Revision-Date: 2009-11-13 20:43:00+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: mk\n" "X-Message-Group: out-statusnet\n" @@ -23,12 +23,15 @@ msgid "No such page" msgstr "Ðема такво извеÑтување." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -107,35 +110,42 @@ msgstr "%s и пријателите" msgid "Updates from %1$s and friends on %2$s!" msgstr "" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." +msgstr "Кодот за потврда не е пронајден." -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "КориÑникот не може да Ñе оÑвежи/" + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -143,12 +153,33 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "КориÑникот не може да Ñе оÑвежи/" + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "КориÑникот нема профил." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Профилот не може да Ñе Ñними." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "" @@ -194,6 +225,23 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -388,17 +436,17 @@ msgstr "Ðватарот е ажуриран." msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Ова е предолго. МакÑималната должина е 140 знаци." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -483,7 +531,7 @@ msgid "Invalid size." msgstr "Погрешна големина." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Ðватар" @@ -532,7 +580,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1638,7 +1686,7 @@ msgid "Nickname" msgstr "Прекар" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Лозинка" @@ -1775,7 +1823,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1820,8 +1868,8 @@ msgstr "Поврзи Ñе" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "" @@ -1842,11 +1890,15 @@ msgstr "ПоÑтавки" msgid "Manage various other options." msgstr "" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "" @@ -1882,66 +1934,62 @@ msgstr "" msgid "Change password" msgstr "Промени ја лозинката" -#: actions/passwordsettings.php:70 -msgid "You are not allowed to change your password" -msgstr "" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 #, fuzzy msgid "Change your password." msgstr "Промени ја лозинката" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Лозинката е Ñнимена." -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Стара лозинка" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Ðова лозинка" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 или повеќе знаци" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Потврди" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "иÑто како лозинката погоре" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Промени" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Лозинките не Ñе Ñовпаѓаат." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Ðеточна Ñтара лозинка" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Грешка во Ñнимањето на кориÑникот; неправилен." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Ðовата лозинка не може да Ñе Ñними" -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Лозинката е Ñнимена." @@ -2382,7 +2430,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Е-пошта" @@ -3290,37 +3338,37 @@ msgstr "Проблем во Ñнимањето на извеÑтувањето." msgid "DB error inserting reply: %s" msgstr "Одговор од внеÑот во базата: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Профил" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 #, fuzzy msgid "Upload an avatar" msgstr "Товарањето на аватарот не уÑпеа." -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "КориÑникот нема профил." @@ -3329,7 +3377,7 @@ msgstr "КориÑникот нема профил." msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "" @@ -3726,20 +3774,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:189 #, fuzzy msgid "No configuration file found. " msgstr "Ðема код за потврда." -#: lib/common.php:192 +#: lib/common.php:190 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:191 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:192 msgid "Go to the installer." msgstr "" @@ -4012,8 +4060,8 @@ msgstr "" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "Ðово извеÑтување" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 #, fuzzy @@ -4534,7 +4582,8 @@ msgid "Could not subscribe other to you." msgstr "" #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "Ðе Ñте претплатени!" #: lib/subs.php:136 @@ -4583,47 +4632,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "пред неколку Ñекунди" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "пред една минута" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "пред %d минути" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "пред еден чаÑ" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "пред %d чаÑа" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "пред еден ден" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "пред %d денови" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "пред еден меÑец" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "пред %d меÑеци" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "пред една година" diff --git a/locale/nb/LC_MESSAGES/statusnet.mo b/locale/nb/LC_MESSAGES/statusnet.mo Binary files differindex 80e30b11f..15f13ca51 100644 --- a/locale/nb/LC_MESSAGES/statusnet.mo +++ b/locale/nb/LC_MESSAGES/statusnet.mo diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index fa895ce1c..d0c4ea124 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -11,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:24+0000\n" +"POT-Creation-Date: 2009-11-13 20:42+0000\n" +"PO-Revision-Date: 2009-11-13 20:43:03+0000\n" "Language-Team: Norwegian (bokmÃ¥l)‬\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: no\n" "X-Message-Group: out-statusnet\n" @@ -28,12 +28,15 @@ msgid "No such page" msgstr "Klarte ikke Ã¥ lagre profil." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -112,35 +115,42 @@ msgstr "%s og venner" msgid "Updates from %1$s and friends on %2$s!" msgstr "" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "API-metode ikke funnet!" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Klarte ikke Ã¥ oppdatere bruker." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -148,12 +158,33 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Klarte ikke Ã¥ oppdatere bruker." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "" +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Klarte ikke Ã¥ lagre profil." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "" @@ -199,6 +230,23 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "API-metode ikke funnet!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -393,17 +441,17 @@ msgstr "" msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -486,7 +534,7 @@ msgid "Invalid size." msgstr "Ugyldig størrelse" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Brukerbilde" @@ -536,7 +584,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1640,7 +1688,7 @@ msgid "Nickname" msgstr "Nick" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Passord" @@ -1770,7 +1818,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1814,8 +1862,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "" @@ -1836,11 +1884,15 @@ msgstr "Innstillinger for IM" msgid "Manage various other options." msgstr "" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "" @@ -1875,67 +1927,62 @@ msgstr "" msgid "Change password" msgstr "Endre passord" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Endre passordet ditt" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 #, fuzzy msgid "Change your password." msgstr "Endre passord" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Passordet ble lagret" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Gammelt passord" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Nytt passord" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 eller flere tegn" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Bekreft" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Endre" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "" -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Feil gammelt passord" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "" -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Klarer ikke Ã¥ lagre nytt passord." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Passordet ble lagret" @@ -2367,7 +2414,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "E-post" @@ -3264,36 +3311,36 @@ msgstr "" msgid "DB error inserting reply: %s" msgstr "" -#: classes/User.php:333 +#: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Endre profilinnstillingene dine" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Endre passordet ditt" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Endre eposthÃ¥ndtering" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "Klarte ikke Ã¥ lagre profil." @@ -3302,7 +3349,7 @@ msgstr "Klarte ikke Ã¥ lagre profil." msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "" @@ -3689,20 +3736,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:189 #, fuzzy msgid "No configuration file found. " msgstr "Fant ikke bekreftelseskode." -#: lib/common.php:192 +#: lib/common.php:190 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:191 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:192 msgid "Go to the installer." msgstr "" @@ -3974,7 +4021,7 @@ msgstr "" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" +msgid "[%s]" msgstr "" #: lib/joinform.php:114 @@ -4493,8 +4540,9 @@ msgid "Could not subscribe other to you." msgstr "" #: lib/subs.php:124 -msgid "Not subscribed!." -msgstr "" +#, fuzzy +msgid "Not subscribed!" +msgstr "Alle abonnementer" #: lib/subs.php:136 msgid "Couldn't delete subscription." @@ -4542,47 +4590,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "noen fÃ¥ sekunder siden" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "omtrent ett minutt siden" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "omtrent %d minutter siden" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "omtrent én time siden" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "omtrent %d timer siden" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "omtrent én dag siden" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "omtrent %d dager siden" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "omtrent én mÃ¥ned siden" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "omtrent %d mÃ¥neder siden" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "omtrent ett Ã¥r siden" diff --git a/locale/nl/LC_MESSAGES/statusnet.mo b/locale/nl/LC_MESSAGES/statusnet.mo Binary files differindex 74e52e10d..4fcdabaed 100644 --- a/locale/nl/LC_MESSAGES/statusnet.mo +++ b/locale/nl/LC_MESSAGES/statusnet.mo diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index 42b776809..438a4e424 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:29+0000\n" +"POT-Creation-Date: 2009-11-13 20:42+0000\n" +"PO-Revision-Date: 2009-11-13 20:43:09+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: out-statusnet\n" @@ -23,12 +23,15 @@ msgid "No such page" msgstr "Deze pagina bestaat niet" #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -94,8 +97,8 @@ msgid "" "or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." msgstr "" "U kunt proberen [%s te porren](../%s) op de eigen profielpagina of [een " -"bericht aan die gebruiker richten](%%%%action.newnotice%%%%?status_textarea=%" -"s)." +"bericht voor die gebruiker plaatsen](%%%%action.newnotice%%%%?" +"status_textarea=%s)." #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 #, php-format @@ -103,6 +106,8 @@ msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " "post a notice to his or her attention." msgstr "" +"U kunt een [gebruiker registeren](%%%%action.register%%%%) en %s dan porren " +"of een een bericht voor die gebruiker plaatsen." #: actions/all.php:165 msgid "You and friends" @@ -113,35 +118,42 @@ msgstr "U en vrienden" msgid "Updates from %1$s and friends on %2$s!" msgstr "Updates van %1$s en vrienden op %2$s." -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "De API-functie is niet aangetroffen!" - -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +msgid "API method not found." +msgstr "De API-functie is niet aangetroffen." + +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Deze methode heeft een POST nodig." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" +"U moet een parameter met de naam \"device\" opgeven met een waarde uit de " +"volgende lijst: sms, im, none" + +#: actions/apiaccountupdatedeliverydevice.php:132 +msgid "Could not update user." +msgstr "Het was niet mogelijk de gebruiker te actualiseren." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -151,12 +163,31 @@ msgstr "" "De server was niet in staat zoveel POST-gegevens af te handelen (%s bytes) " "vanwege de huidige instellingen." -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "Het was niet mogelijk om uw ontwerpinstellingen op te slaan." + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +msgid "Could not update your design." +msgstr "Het was niet mogelijk uw ontwerp bij te werken." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "Deze gebruiker heeft geen profiel." +#: actions/apiaccountupdateprofile.php:147 +msgid "Could not save profile." +msgstr "Het was niet mogelijk het profiel op te slaan." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "Het blokkeren van de gebruiker is mislukt." @@ -204,6 +235,23 @@ msgstr "Directe beichten aan %s" msgid "All the direct messages sent to %s" msgstr "Alle directe berichten verzonden aan %s" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "De API-functie is niet aangetroffen!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -395,17 +443,17 @@ msgstr "De status is verwijderd." msgid "No status with that ID found." msgstr "Er is geen status gevonden met dit ID." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Dat is te lang. De maximale mededelingslengte is 140 tekens." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "Niet gevonden" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -489,7 +537,7 @@ msgid "Invalid size." msgstr "Ongeldige afmetingen." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" @@ -538,7 +586,7 @@ msgstr "Uitsnijden" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -647,6 +695,10 @@ msgid "" "unsubscribed from you, unable to subscribe to you in the future, and you " "will not be notified of any @-replies from them." msgstr "" +"Weet u zeker dat u deze gebruiker wilt blokkeren? Na deze handeling wordt " +"het abonnement van de gebruiker op u opgezegd en kan deze gebruiker in de " +"toekomst niet op u abonneren. U wordt niet op de hoogte gesteld van \"@\"-" +"antwoorden van de gebruiker." #: actions/block.php:149 actions/deletenotice.php:145 #: actions/groupblock.php:178 @@ -654,9 +706,8 @@ msgid "No" msgstr "Nee" #: actions/block.php:149 -#, fuzzy msgid "Do not block this user" -msgstr "Deblokkeer deze gebruiker." +msgstr "Gebruiker deblokkeren" #: actions/block.php:150 actions/deletenotice.php:146 #: actions/groupblock.php:179 @@ -1036,6 +1087,8 @@ msgid "" "Why not [register an account](%%action.register%%) and be the first to add a " "notice to your favorites!" msgstr "" +"U kunt een [gebruiker registreren](%%action.register%%) en de eerste " +"mededeling voor de favorietenlijst plaatsen!" #: actions/favoritesrss.php:111 actions/showfavorites.php:77 #: lib/personalgroupnav.php:115 @@ -1165,6 +1218,9 @@ msgid "" "be removed from the group, unable to post, and unable to subscribe to the " "group in the future." msgstr "" +"Weet u zeker dat u gebruiker \"%s\" uit de groep \"%s\" wilt weren? De " +"gebruiker wordt dan uit de groep verwijderd, kan er geen berichten meer " +"plaatsen en kan zich in de toekomst ook niet meer op de groep abonneren." #: actions/groupblock.php:178 msgid "Do not block this user from this group" @@ -1197,6 +1253,8 @@ msgid "" "Customize the way your group looks with a background image and a colour " "palette of your choice." msgstr "" +"Het uiterlijk van uw groep aanpassen met een achtergrondafbeeldingen en een " +"kleurenpalet van uw keuze." #: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 #: lib/designsettings.php:434 lib/designsettings.php:464 @@ -1301,6 +1359,8 @@ msgid "" "If you can't find the group you're looking for, you can [create it](%%action." "newgroup%%) yourself." msgstr "" +"Als u de groep waar u naar zoekt niet kunt vinden, dan kunt u deze zelf " +"[aanmaken](%%action.newgroup%%)." #: actions/groupsearch.php:85 #, php-format @@ -1308,6 +1368,8 @@ msgid "" "Why not [register an account](%%action.register%%) and [create the group](%%" "action.newgroup%%) yourself!" msgstr "" +"U kunt een [gebruiker registreren](%%action.register%%) en de groep zelf " +"[aanmaken](%%action.newgroup%%)!" #: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81 #: lib/subgroupnav.php:98 @@ -1328,6 +1390,12 @@ msgid "" "for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" "%%%%)" msgstr "" +"Met groepen van %%%%site.name%%%% kunt u gebruikers vinden met gelijke " +"interessen en daarmee in contact treden. Nadat u lid bent geworden van een " +"groep, kunt u berichten naar alle gebruikers zenden met door het voorvoegsel " +"\"!groepsnaam\" te gebruiken. Als u geen groep ziet die u aantreft, " +"[doorzoek dan de groepen](%%%%action.groupsearch%%%%) of [start zelf een " +"groep!](%%%%action.newgroup%%%%)." #: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 msgid "Create a new group" @@ -1668,7 +1736,7 @@ msgid "Nickname" msgstr "Gebruikersnaam" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Wachtwoord" @@ -1799,13 +1867,18 @@ msgid "" "Be the first to [post on this topic](%%%%action.newnotice%%%%?" "status_textarea=%s)!" msgstr "" +"U kunt de eerste zijn die een bericht plaatst in [dit onderwerp](%%%%action." +"newnotice%%%%?status_textarea=%s)!" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" +"U kunt een [gebruiker registeren](%%%%action.register%%%%) en dan de eerste " +"zijn die een bericht plaatst in [dit onderwerp](%%%%action.newnotice%%%%?" +"status_textarea=%s)!" #: actions/noticesearchrss.php:89 #, php-format @@ -1849,8 +1922,8 @@ msgstr "inhoudstype " msgid "Only " msgstr "Alleen " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Geen ondersteund gegevensformaat." @@ -1870,11 +1943,15 @@ msgstr "Overige instellingen" msgid "Manage various other options." msgstr "Overige instellingen beheren." -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr " (gratis dienst)" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "URL's inkorten met" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "Te gebruiken automatische verkortingsdienst." @@ -1908,65 +1985,60 @@ msgstr "Dit is uw Postvak UIT waarin de door u verzonden privéberichten staan." msgid "Change password" msgstr "Wachtwoord wijzigen" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Uw wachtwoord wijzigen" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 msgid "Change your password." msgstr "Wachtwoord wijzigen" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "Wachtwoord wijzigen" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Oud wachtwoord" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Nieuw wachtwoord" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "Zes of meer tekens" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Bevestigen" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "gelijk aan wachtwoord hierboven" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Wijzigen" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Het wachtwoord moet zes of meer tekens bevatten." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "De wachtwoorden komen niet overeen." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Het oude wachtwoord is onjuist" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Fout bij opslaan gebruiker; ongeldig." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Het was niet mogelijk het nieuwe wachtwoord op te slaan." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Het wachtwoord is opgeslagen." @@ -2171,6 +2243,8 @@ msgid "" "This is the public timeline for %%site.name%% but no one has posted anything " "yet." msgstr "" +"Dit is de publieke tijdlijn voor %%site.name%%, maar niemand heeft nog " +"berichten geplaatst." #: actions/public.php:182 msgid "Be the first to post!" @@ -2192,6 +2266,11 @@ msgid "" "tool. [Join now](%%action.register%%) to share notices about yourself with " "friends, family, and colleagues! ([Read more](%%doc.help%%))" msgstr "" +"Dit is %%site.name%%, een [microblogdienst](http://en.wikipedia.org/wiki/" +"Micro-blogging) gebaseerd op de Vrije Software [StatusNet](http://status." +"net/). [Registreer nu](%%%%action.register%%%%) om mededelingen over uzelf " +"te delen met vrienden, familie en collega's! [Meer lezen...](%%%%doc.help%%%" +"%)" #: actions/public.php:238 #, php-format @@ -2200,8 +2279,9 @@ msgid "" "blogging) service based on the Free Software [StatusNet](http://status.net/) " "tool." msgstr "" -"Dit is %%site.name%%, [microblogdienst](http://en.wikipedia.org/wiki/Micro-" -"blogging) gebaseerd op de Vrije Software [StatusNet](http://status.net/)" +"Dit is %%site.name%%, een [microblogdienst](http://en.wikipedia.org/wiki/" +"Micro-blogging) gebaseerd op de Vrije Software [StatusNet](http://status." +"net/)" #: actions/publictagcloud.php:57 msgid "Public tag cloud" @@ -2228,6 +2308,8 @@ msgid "" "Why not [register an account](%%action.register%%) and be the first to post " "one!" msgstr "" +"U kunt een [gebruiker registeren](%%%%action.register%%%%) en dan de eerste " +"zijn die er een plaatst!" #: actions/publictagcloud.php:135 msgid "Tag cloud" @@ -2268,10 +2350,13 @@ msgid "" "If you have forgotten or lost your password, you can get a new one sent to " "the email address you have stored in your account." msgstr "" +"Als u uw wachtwoord kwijt bent of vergeten bent, dan is het mogelijk een " +"nieuw wachtwoord toegezonden te krijgen op het e-mailadres dat bij uw " +"gebruiker staat opgeslagen." #: actions/recoverpassword.php:158 msgid "You have been identified. Enter a new password below. " -msgstr "" +msgstr "U bent geïdentificeerd. Voer hieronder een nieuw wachtwoord in. " #: actions/recoverpassword.php:188 msgid "Password recovery" @@ -2417,7 +2502,7 @@ msgid "Same as password above. Required." msgstr "Gelijk aan het wachtwoord hierboven. Verplicht" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "E-mail" @@ -2579,6 +2664,8 @@ msgid "" "This is the timeline showing replies to %s but %s hasn't received a notice " "to his attention yet." msgstr "" +"Dit is de tijdlijn met de antwoorden aan %s, maar %s heeft nog geen " +"antwoorden ontvangen." #: actions/replies.php:203 #, php-format @@ -2586,6 +2673,8 @@ msgid "" "You can engage other users in a conversation, subscribe to more people or " "[join groups](%%action.groups%%)." msgstr "" +"U kunt gesprekken aanknopen met andere gebruikers, op meer gebruikers " +"abonneren of [lid worden van groepen](%%action.groups%%)." #: actions/replies.php:205 #, php-format @@ -2593,6 +2682,8 @@ msgid "" "You can try to [nudge %s](../%s) or [post something to his or her attention]" "(%%%%action.newnotice%%%%?status_textarea=%s)." msgstr "" +"U kunt proberen [%s te porren](../%s) of [een bericht voor die gebruiker " +"plaatsen](%%%%action.newnotice%%%%?status_textarea=%s)." #: actions/repliesrss.php:72 #, php-format @@ -2628,6 +2719,9 @@ msgid "" "You haven't chosen any favorite notices yet. Click the fave button on " "notices you like to bookmark them for later or shed a spotlight on them." msgstr "" +"U hebt nog geen favoriete mededelingen. Klik op de knop \"Aan favorieten " +"toevoegen\" bij mededelingen die u aanstaan om ze op een lijst te bewaren en " +"ze uit te lichten." #: actions/showfavorites.php:207 #, php-format @@ -2635,6 +2729,9 @@ msgid "" "%s hasn't added any notices to his favorites yet. Post something interesting " "they would add to their favorites :)" msgstr "" +"%s heeff nog geen mededelingen op de eigen favorietenlijst geplaatst. Plaats " +"een interessant bericht, en dan komt u misschien wel op de " +"favorietenlijst. :)" #: actions/showfavorites.php:211 #, php-format @@ -2643,6 +2740,9 @@ msgid "" "account](%%%%action.register%%%%) and then post something interesting they " "would add to their favorites :)" msgstr "" +"%s heeft nog geen favorietenlijst. U kunt een [gebruiker registeren](%%%%" +"action.register%%%%) en dan interessante mededelingen plaatsten die " +"misschien aan favorietenlijsten zijn toe te voegen. :)" #: actions/showfavorites.php:242 msgid "This is a way to share what you like." @@ -2731,6 +2831,12 @@ msgid "" "their life and interests. [Join now](%%%%action.register%%%%) to become part " "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" +"**%s** is een gebruikersgroep bij %%site.name%%, een [microblogdienst]" +"(http://en.wikipedia.org/wiki/Micro-blogging) gebaseerd op de Vrije Software " +"[StatusNet](http://status.net/). De groepsleden wisselen korte berichten uit " +"over hun leven en interesses. [Registreer nu](%%%%action.register%%%%) om " +"lid te worden van deze groep en nog veel meer! [Meer lezen...](%%%%doc.help%%" +"%%)" #: actions/showgroup.php:454 #, php-format @@ -2826,6 +2932,8 @@ msgid "" "You can try to nudge %s or [post something to his or her attention](%%%%" "action.newnotice%%%%?status_textarea=%s)." msgstr "" +"U kunt proberen %s te porren of [een bericht voor die gebruiker plaatsen](%%%" +"%action.newnotice%%%%?status_textarea=%s)." #: actions/showstream.php:234 #, php-format @@ -2835,6 +2943,10 @@ msgid "" "[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to " "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" +"**%s** is actief op %%site.name%%, een [microblogdienst](http://en.wikipedia." +"org/wiki/Micro-blogging) gebaseerd op de Vrije Software [StatusNet](http://" +"status.net/). [Registreer nu](%%%%action.register%%%%) om te abonneren op de " +"mededelingen van **%s** en nog veel meer! [Meer lezen...](%%%%doc.help%%%%)" #: actions/showstream.php:239 #, php-format @@ -2843,7 +2955,7 @@ msgid "" "wikipedia.org/wiki/Micro-blogging) service based on the Free Software " "[StatusNet](http://status.net/) tool. " msgstr "" -"**%s** heeft een gebruiker op %%%%site.name%%%%, eena [microblogdienst]" +"**%s** heeft een gebruiker op %%%%site.name%%%%, een [microblogdienst]" "(http://en.wikipedia.org/wiki/Micro-blogging) gebaseerd op de Vrije Software " "[StatusNet](http://status.net/). " @@ -3031,6 +3143,12 @@ msgid "" "featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can " "automatically subscribe to people you already follow there." msgstr "" +"U bent op dit moment op geen enkele gebruiker geabonneerd. Abonneer u op " +"gebruikers die u kent. [Zoek gebruikers](%%action.peoplesearch%%), bekijk de " +"leden van groepen waar uw interesse naar uitgaat en kijk in de [lijst met " +"uitgelichte gebruikers](%%action.featured%%). Als u [Twitter gebruikt](%%" +"action.twittersettings%%), kunt u automatisch abonneren op de gebruikers die " +"u daar al volgt." #: actions/subscriptions.php:123 actions/subscriptions.php:127 #, php-format @@ -3139,6 +3257,8 @@ msgstr "Het abonnement is opgezegd" #, php-format msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." msgstr "" +"De licentie \"%s\" voor de stream die u wilt volgen is niet compatibel met " +"de sitelicentie \"%s\"." #: actions/userauthorization.php:105 msgid "Authorize subscription" @@ -3216,12 +3336,12 @@ msgstr "De abonnee-URI \"%s\" is hier niet te vinden" #: actions/userauthorization.php:301 #, php-format msgid "Listenee URI ‘%s’ is too long." -msgstr "" +msgstr "De URI \"%s\" voor de stream is te lang." #: actions/userauthorization.php:307 #, php-format msgid "Listenee URI ‘%s’ is a local user." -msgstr "" +msgstr "de URI \"%s\" voor de stream is een lokale gebruiker." #: actions/userauthorization.php:322 #, php-format @@ -3256,6 +3376,8 @@ msgid "" "Customize the way your profile looks with a background image and a colour " "palette of your choice." msgstr "" +"U kunt het uiterlijk van uw profiel aanpassen door een achtergrondafbeelding " +"toe te voegen of het kleurenpalet aan te passen." #: actions/userdesignsettings.php:282 msgid "Enjoy your hotdog!" @@ -3279,6 +3401,7 @@ msgstr "%s is van geen enkele groep lid." #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" +"U kunt [naar groepen zoeken](%%action.groupsearch%%) en daar lid van worden." #: classes/File.php:137 #, php-format @@ -3286,6 +3409,8 @@ msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" +"Bestanden mogen niet groter zijn dan %d bytes, en uw bestand was %d bytes. " +"Probeer een kleinere versie te uploaden." #: classes/File.php:147 #, php-format @@ -3354,36 +3479,36 @@ msgid "DB error inserting reply: %s" msgstr "" "Er is een databasefout opgetreden bij het invoegen van het antwoord: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Welkom bij %1$s, @%2$s!" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profiel" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Uw profielgegevens wijzigen" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "Avatar uploaden" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Uw wachtwoord wijzigen" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "E-mailafhandeling wijzigen" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "Ontwerp" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 msgid "Design your profile" msgstr "Uw profiel ontwerpen" @@ -3391,7 +3516,7 @@ msgstr "Uw profiel ontwerpen" msgid "Other" msgstr "Overige" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Overige instellingen" @@ -3479,7 +3604,7 @@ msgstr "Kennisgeving van site" #: lib/action.php:546 msgid "Local views" -msgstr "" +msgstr "Lokale weergaven" #: lib/action.php:612 msgid "Page notice" @@ -3785,21 +3910,55 @@ msgid "" "tracks - not yet implemented.\n" "tracking - not yet implemented.\n" msgstr "" - -#: lib/common.php:191 +"Commando's:\n" +"on - notificaties inschakelen\n" +"off - notificaties uitschakelen\n" +"help - deze hulptekst weergeven\n" +"follow <gebruiker> - abonneren op gebruiker\n" +"leave <gebruiker> - abonnement op gebruiker opzeggen\n" +"d <gebruiker> <tekst> - direct bericht aan gebruiker\n" +"get <gebruiker> - laatste mededeling van gebruiker opvragen\n" +"whois <gebruiker> - profielinformatie van gebruiker opvragen\n" +"fav <gebruiker> - laatste mededeling van gebruiker op favorietenlijst " +"zetten\n" +"fav #<mededeling-ID> - mededelingen met aangegeven ID op favorietenlijst " +"zetten\n" +"reply #<mededeling-ID> - antwoorden op de mededeling met het aangegeven ID\n" +"reply <gebruiker> - antwoorden op de laatste mededeling van gebruiker\n" +"join <groep> - lid worden van groep\n" +"login - verwijzing opvragen naar de webpagina voor aanmelden\n" +"drop <groep> - groepslidmaatschap opzeggen\n" +"stats - uw statistieken opvragen\n" +"stop - zelfde als 'off'\n" +"quit - zelfde als 'off'\n" +"sub <gebruiker> - zelfde als 'follow'\n" +"unsub <gebruiker> - zelfde als 'leave'\n" +"last <gebruiker> - zelfde als 'get'\n" +"on <gebruiker> - nog niet beschikbaar\n" +"off <gebruiker> - nog niet beschikbaar\n" +"nudge <gebruiker> - gebruiker porren\n" +"invite <phone number> - nog niet beschikbaar\n" +"track <word> - nog niet beschikbaar\n" +"untrack <word> - nog niet beschikbaar\n" +"track off - nog niet beschikbaar\n" +"untrack all - nog niet beschikbaar\n" +"tracks - nog niet beschikbaar\n" +"tracking - nog niet beschikbaar\n" + +#: lib/common.php:189 msgid "No configuration file found. " msgstr "Er is geen instellingenbestand aangetroffen. " -#: lib/common.php:192 +#: lib/common.php:190 msgid "I looked for configuration files in the following places: " msgstr "Er is gezocht naar instellingenbestanden op de volgende plaatsen: " -#: lib/common.php:193 +#: lib/common.php:191 msgid "You may wish to run the installer to fix this." msgstr "" "U kunt proberen de installer uit te voeren om dit probleem op te lossen." -#: lib/common.php:194 +#: lib/common.php:192 msgid "Go to the installer." msgstr "Naar het installatieprogramma gaan." @@ -4026,7 +4185,7 @@ msgstr "Groepen met de meeste berichten" #: lib/grouptagcloudsection.php:56 #, php-format msgid "Tags in %s group's notices" -msgstr "" +msgstr "Labels in de groepsmededelingen van %s" #: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" @@ -4063,8 +4222,8 @@ msgstr "Onbekend bestandstype" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "mededelingennummer: %s" +msgid "[%s]" +msgstr "[%s]" #: lib/joinform.php:114 msgid "Join" @@ -4236,6 +4395,18 @@ msgid "" "With kind regards,\n" "%4$s\n" msgstr "" +"%1$s (%2$s) vraagt zich af wat u tegenwoordig doet en nodigt u uit om dat te " +"delen.\n" +"\n" +"Laat dus iets van u horen!\n" +"\n" +"%3$s\n" +"\n" +"Schrijf geen antwoord op deze e-mail. Die komt niet aan bij de juiste " +"gebruiker.\n" +"\n" +"Met vriendelijke groet,\n" +"%4$s\n" #: lib/mail.php:509 #, php-format @@ -4260,6 +4431,21 @@ msgid "" "With kind regards,\n" "%5$s\n" msgstr "" +"%1$s (%2$s) heeft u een privébericht gezonden:\n" +"\n" +"------------------------------------------------------\n" +"%3$s\n" +"------------------------------------------------------\n" +"\n" +"Hier kunt u antwoorden:\n" +"\n" +"%4$s\n" +"\n" +"Schrijf geen antwoord op deze e-mail. Die komt niet aan bij de juiste " +"gebruiker.\n" +"\n" +"Met vriendelijke groet,\n" +"%5$s\n" #: lib/mail.php:554 #, php-format @@ -4286,6 +4472,23 @@ msgid "" "Faithfully yours,\n" "%6$s\n" msgstr "" +"%1$s (@%7$s) heeft uw mededeling van %2$s zojuist op de favorietenlijst " +"geplaatst.\n" +"\n" +"De URL van uw mededeling is:\n" +"\n" +"%3$s\n" +"\n" +"De inhoud van uw mededeling luidt:\n" +"\n" +"%4$s\n" +"\n" +"U kunt de favorietenlijst van %1$s via de volgende verwijzing bekijken:\n" +"\n" +"%5$s\n" +"\n" +"Met vriendelijke groet,\n" +"%6$s\n" #: lib/mail.php:611 #, php-format @@ -4616,7 +4819,8 @@ msgid "Could not subscribe other to you." msgstr "Het was niet mogelijk om een ander op u te laten abonneren" #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "Niet geabonneerd!" #: lib/subs.php:136 @@ -4663,47 +4867,47 @@ msgstr "Deze gebruiker een direct bericht zenden" msgid "Message" msgstr "Bericht" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "een paar seconden geleden" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "ongeveer een minuut geleden" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "ongeveer %d minuten geleden" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "ongeveer een uur geleden" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "ongeveer %d uur geleden" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "ongeveer een dag geleden" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "ongeveer %d dagen geleden" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "ongeveer een maand geleden" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "ongeveer %d maanden geleden" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "ongeveer een jaar geleden" diff --git a/locale/nn/LC_MESSAGES/statusnet.mo b/locale/nn/LC_MESSAGES/statusnet.mo Binary files differindex bf03dffcc..d6fc4c4ca 100644 --- a/locale/nn/LC_MESSAGES/statusnet.mo +++ b/locale/nn/LC_MESSAGES/statusnet.mo diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index 6de37a959..872f4eed0 100644 --- a/locale/nn/LC_MESSAGES/statusnet.po +++ b/locale/nn/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:26+0000\n" +"POT-Creation-Date: 2009-11-13 20:42+0000\n" +"PO-Revision-Date: 2009-11-13 20:43:05+0000\n" "Language-Team: Norwegian Nynorsk\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nn\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "Dette emneord finst ikkje." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -106,35 +109,42 @@ msgstr "%s med vener" msgid "Updates from %1$s and friends on %2$s!" msgstr "Oppdateringar frÃ¥ %1$s og vener pÃ¥ %2$s!" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "Fann ikkje API-metode." -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Dette krev ein POST." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Kan ikkje oppdatera brukar." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -142,12 +152,34 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "Klarte ikkje Ã¥ lagra Twitter-innstillingane dine!" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Kan ikkje oppdatera brukar." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "Brukaren har inga profil." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Kan ikkje lagra profil." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "Blokkering av brukar feila." @@ -193,6 +225,23 @@ msgstr "Direkte meldingar til %s" msgid "All the direct messages sent to %s" msgstr "Alle direkte meldingar sendt til %s" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "Fann ikkje API-metode." + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -387,17 +436,17 @@ msgstr "Lasta opp brukarbilete." msgid "No status with that ID found." msgstr "Fann ingen status med den ID-en." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Det er for langt! Ein notis kan berre innehalde 140 teikn." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "Fann ikkje" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -481,7 +530,7 @@ msgid "Invalid size." msgstr "Ugyldig storleik." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Brukarbilete" @@ -529,7 +578,7 @@ msgstr "Skaler" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1663,7 +1712,7 @@ msgid "Nickname" msgstr "Kallenamn" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Passord" @@ -1802,7 +1851,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1849,8 +1898,8 @@ msgstr "Kopla til" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Ikkje eit støtta dataformat." @@ -1870,11 +1919,15 @@ msgstr "Andre innstillingar" msgid "Manage various other options." msgstr "Velikehald andre innstillingar" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "Den automatisk forkortingstenesta du vil bruke" @@ -1909,65 +1962,60 @@ msgstr "Dette er din utboks som syner alle private meldingar du har sendt." msgid "Change password" msgstr "Endra passord" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Endra passordet ditt" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 msgid "Change your password." msgstr "Endra passordet ditt" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "Endra passord" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Gamalt passord" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Nytt passord" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 eller fleire teikn" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Godta" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "same passord som ovanfor" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Endra" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Passord mÃ¥ være minst 6 teikn." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Passorda var ikkje like." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Det gamle passordet stemmer ikkje" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Feil ved lagring av brukar; fungerer ikkje." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Klarar ikkje lagra nytt passord." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Lagra passord." @@ -2411,7 +2459,7 @@ msgid "Same as password above. Required." msgstr "Samme som passord over. PÃ¥krevd." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Epost" @@ -3340,36 +3388,36 @@ msgstr "Eit problem oppstod ved lagring av notis." msgid "DB error inserting reply: %s" msgstr "Databasefeil, kan ikkje lagra svar: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Melding til %1$s pÃ¥ %2$s" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Endra profilinnstillingane dine" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "Last opp ein avatar" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Endra passordet ditt" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Endra eposthandtering" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "Brukarprofil" @@ -3378,7 +3426,7 @@ msgstr "Brukarprofil" msgid "Other" msgstr "Anna" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Andre val" @@ -3768,20 +3816,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:189 #, fuzzy msgid "No configuration file found. " msgstr "Ingen stadfestingskode." -#: lib/common.php:192 +#: lib/common.php:190 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:191 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:192 #, fuzzy msgid "Go to the installer." msgstr "Logg inn or sida" @@ -4050,8 +4098,8 @@ msgstr "Ukjend fil type" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "Ny notis" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 msgid "Join" @@ -4572,7 +4620,8 @@ msgid "Could not subscribe other to you." msgstr "Kan ikkje tinga andre til deg." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "Ikkje tinga." #: lib/subs.php:136 @@ -4621,47 +4670,47 @@ msgstr "Send ei direktemelding til denne brukaren" msgid "Message" msgstr "Melding" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "eit par sekund sidan" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "omtrent eitt minutt sidan" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "~%d minutt sidan" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "omtrent ein time sidan" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "~%d timar sidan" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "omtrent ein dag sidan" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "~%d dagar sidan" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "omtrent ein mÃ¥nad sidan" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "~%d mÃ¥nadar sidan" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "omtrent eitt Ã¥r sidan" diff --git a/locale/pl/LC_MESSAGES/statusnet.mo b/locale/pl/LC_MESSAGES/statusnet.mo Binary files differindex 861243ce2..2303f0fb2 100644 --- a/locale/pl/LC_MESSAGES/statusnet.mo +++ b/locale/pl/LC_MESSAGES/statusnet.mo diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index 6f5c7433c..e6c3ab182 100644 --- a/locale/pl/LC_MESSAGES/statusnet.po +++ b/locale/pl/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:32+0000\n" +"POT-Creation-Date: 2009-11-13 20:42+0000\n" +"PO-Revision-Date: 2009-11-13 20:43:13+0000\n" "Language-Team: Polish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pl\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "Nie ma takiego znacznika." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -114,35 +117,42 @@ msgstr "Ty i przyjaciele" msgid "Updates from %1$s and friends on %2$s!" msgstr "Aktualizacje od %1$s i przyjaciół na %2$s!" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "Nie znaleziono metody API!" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Ta metoda wymaga POST." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Nie można zaktualizować użytkownika." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -152,12 +162,34 @@ msgstr "" "Serwer nie może obsÅ‚użyć aż tyle danych POST (%s bajty) z powodu bieżącej " "konfiguracji." -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "Nie można zapisać ustawieÅ„ wyglÄ…du!" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Nie można zaktualizować wyglÄ…du." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "Użytkownik nie posiada profilu." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Nie można zapisać profilu." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "Zablokowanie użytkownika nie powiodÅ‚o siÄ™." @@ -205,6 +237,23 @@ msgstr "BezpoÅ›rednia wiadomość do użytkownika %s" msgid "All the direct messages sent to %s" msgstr "Wszystkie bezpoÅ›rednie wiadomoÅ›ci wysÅ‚ane do użytkownika %s" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "Nie znaleziono metody API!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -394,17 +443,17 @@ msgstr "UsuniÄ™to awatar." msgid "No status with that ID found." msgstr "Nie znaleziono statusów z tym identyfikatorem." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Wpis jest za dÅ‚ugi. Maksymalna dÅ‚ugość to 140 znaków." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "Nie znaleziono" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, fuzzy, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Maksymalny rozmiar wpisu to 140 znaków, w tym adres URL zaÅ‚Ä…cznika." @@ -487,7 +536,7 @@ msgid "Invalid size." msgstr "NieprawidÅ‚owy rozmiar." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Awatar" @@ -535,7 +584,7 @@ msgstr "Przytnij" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1676,7 +1725,7 @@ msgid "Nickname" msgstr "Pseudonim" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "HasÅ‚o" @@ -1813,9 +1862,9 @@ msgstr "" "status_textarea=%s)!" #: actions/noticesearch.php:124 -#, php-format +#, fuzzy, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" "Dlaczego nie [zarejestrujesz konta](%%%%action.register%%%%) i zostaniesz " @@ -1865,8 +1914,8 @@ msgstr "Zawartość" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "To nie jest obsÅ‚ugiwany format danych." @@ -1886,11 +1935,15 @@ msgstr "Inne ustawienia" msgid "Manage various other options." msgstr "ZarzÄ…dzaj różnymi innymi opcjami." -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "Skracaj adresy URL za pomocÄ…" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "Używana automatyczna usÅ‚uga skracania." @@ -1924,65 +1977,60 @@ msgstr "To sÄ… wiadomoÅ›ci wysÅ‚ane, czyli prywatne wiadomoÅ›ci, które wysÅ‚aÅ‚ msgid "Change password" msgstr "ZmieÅ„ hasÅ‚o" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "ZmieÅ„ hasÅ‚o" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 msgid "Change your password." msgstr "ZmieÅ„ hasÅ‚o." -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "Zmiana hasÅ‚a" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Stare hasÅ‚o" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Nowe hasÅ‚o" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 lub wiÄ™cej znaków" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Potwierdź" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "takie samo jak hasÅ‚o powyżej" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "ZmieÅ„" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "HasÅ‚o musi mieć sześć lub wiÄ™cej znaków." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "HasÅ‚a nie pasujÄ… do siebie." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Niepoprawne stare hasÅ‚o" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "BÅ‚Ä…d podczas zapisywania użytkownika; nieprawidÅ‚owy." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Nie można zapisać nowego hasÅ‚a." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Zapisano hasÅ‚o." @@ -2439,7 +2487,7 @@ msgid "Same as password above. Required." msgstr "Takie samo jak powyższe hasÅ‚o. Wymagane." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "E-mail" @@ -3408,36 +3456,36 @@ msgstr "Problem podczas zapisywania wpisu." msgid "DB error inserting reply: %s" msgstr "BÅ‚Ä…d bazy danych podczas wprowadzania odpowiedzi: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Witaj w %1$s, @%2$s!" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "ZmieÅ„ ustawienia profilu" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "WyÅ›lij awatar" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "ZmieÅ„ hasÅ‚o" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "ZmieÅ„ obsÅ‚ugÄ™ adresu e-mail" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "WyglÄ…d" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 msgid "Design your profile" msgstr "WyglÄ…d profilu" @@ -3445,7 +3493,7 @@ msgstr "WyglÄ…d profilu" msgid "Other" msgstr "Inne" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Inne opcje" @@ -3863,20 +3911,20 @@ msgstr "" "tracks - jeszcze nie zaimplementowano.\n" "tracking - jeszcze nie zaimplementowano.\n" -#: lib/common.php:191 +#: lib/common.php:189 #, fuzzy msgid "No configuration file found. " msgstr "Brak kodu potwierdzajÄ…cego." -#: lib/common.php:192 +#: lib/common.php:190 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:191 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:192 #, fuzzy msgid "Go to the installer." msgstr "Zaloguj siÄ™ na stronÄ™" @@ -4142,9 +4190,9 @@ msgid "Unknown file type" msgstr "Nieznany typ pliku" #: lib/jabber.php:192 -#, fuzzy, php-format -msgid "notice id: %s" -msgstr "Brak identyfikatora wpisu" +#, php-format +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 msgid "Join" @@ -4318,6 +4366,17 @@ msgid "" "With kind regards,\n" "%4$s\n" msgstr "" +"Użytkownik %1$s (%2$s) zastanawia siÄ™, co siÄ™ z TobÄ… dzieje w ostatnich " +"dniach i zaprasza CiÄ™ do wysÅ‚ania jakichÅ› aktualnoÅ›ci.\n" +"\n" +"Tak wiÄ™c do usÅ‚yszenia. :)\n" +"\n" +"%3$s\n" +"\n" +"Nie odpowiadaj na tÄ™ wiadomość e-mail, nie dotrze ona do nich.\n" +"\n" +"Z poważaniem,\n" +"%4$s\n" #: lib/mail.php:509 #, php-format @@ -4342,6 +4401,20 @@ msgid "" "With kind regards,\n" "%5$s\n" msgstr "" +"Użytkownik %1$s (%2$s) wysÅ‚aÅ‚ Ci prywatnÄ… wiadomość:\n" +"\n" +"------------------------------------------------------\n" +"%3$s\n" +"------------------------------------------------------\n" +"\n" +"Tutaj możesz na niÄ… odpowiedzieć:\n" +"\n" +"%4$s\n" +"\n" +"Nie odpowiadaj na tÄ™ wiadomość e-mail, nie dotrze ona do nich.\n" +"\n" +"Z poważaniem,\n" +"%5$s\n" #: lib/mail.php:554 #, fuzzy, php-format @@ -4700,7 +4773,8 @@ msgid "Could not subscribe other to you." msgstr "Nie można zasubskrybować innych do Ciebie." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "Nie zasubskrybowane!" #: lib/subs.php:136 @@ -4747,47 +4821,47 @@ msgstr "WyÅ›lij bezpoÅ›redniÄ… wiadomość do tego użytkownika" msgid "Message" msgstr "Wiadomość" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "kilka sekund temu" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "okoÅ‚o minutÄ™ temu" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "okoÅ‚o %d minut temu" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "okoÅ‚o godzinÄ™ temu" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "okoÅ‚o %d godzin temu" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "blisko dzieÅ„ temu" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "okoÅ‚o %d dni temu" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "okoÅ‚o miesiÄ…c temu" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "okoÅ‚o %d miesiÄ™cy temu" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "okoÅ‚o rok temu" diff --git a/locale/pt/LC_MESSAGES/statusnet.mo b/locale/pt/LC_MESSAGES/statusnet.mo Binary files differindex 116a7bacd..77ba0509a 100644 --- a/locale/pt/LC_MESSAGES/statusnet.mo +++ b/locale/pt/LC_MESSAGES/statusnet.mo diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index cd7997a50..bdcc66468 100644 --- a/locale/pt/LC_MESSAGES/statusnet.po +++ b/locale/pt/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:35+0000\n" +"POT-Creation-Date: 2009-11-13 20:42+0000\n" +"PO-Revision-Date: 2009-11-13 20:43:15+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt\n" "X-Message-Group: out-statusnet\n" @@ -26,12 +26,15 @@ msgid "No such page" msgstr "" #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -110,35 +113,42 @@ msgstr "%s e amigos" msgid "Updates from %1$s and friends on %2$s!" msgstr "" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "Método da API não encontrado!" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Não foi possÃvel actualizar o utilizador." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -146,12 +156,33 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Não foi possÃvel actualizar o utilizador." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "" +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Não foi possÃvel salvar o perfil." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "" @@ -197,6 +228,23 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "Método da API não encontrado!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -387,17 +435,17 @@ msgstr "Avatar actualizado." msgid "No status with that ID found." msgstr "Nenhum estado com esse ID encontrado." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -479,7 +527,7 @@ msgid "Invalid size." msgstr "Tamanho inválido." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" @@ -527,7 +575,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1634,7 +1682,7 @@ msgid "Nickname" msgstr "Alcunha" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "" @@ -1769,7 +1817,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1814,8 +1862,8 @@ msgstr "Ligar" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "" @@ -1835,11 +1883,15 @@ msgstr "" msgid "Manage various other options." msgstr "" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "" @@ -1873,66 +1925,61 @@ msgstr "" msgid "Change password" msgstr "Modificar palavra-passe" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Modificar a sua palavra-passe" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 #, fuzzy msgid "Change your password." msgstr "Modificar a sua palavra-passe" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Nova palavra-passe" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 ou mais caracteres" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirmar" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Modificar" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "" -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Palavra-passe antiga incorrecta" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Erro ao guardar utilizador; inválido." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Não é possÃvel guardar a nova password." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "" @@ -2365,7 +2412,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Email" @@ -3254,36 +3301,36 @@ msgstr "" msgid "DB error inserting reply: %s" msgstr "Ocorreu um erro na base de dados ao inserir a resposta: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Modificar as suas definições de perfil" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Modificar a sua palavra-passe" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Alterar email handling" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 msgid "Design your profile" msgstr "" @@ -3291,7 +3338,7 @@ msgstr "" msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "" @@ -3681,20 +3728,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:189 #, fuzzy msgid "No configuration file found. " msgstr "Código de confirmação não encontrado" -#: lib/common.php:192 +#: lib/common.php:190 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:191 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:192 msgid "Go to the installer." msgstr "" @@ -3959,9 +4006,9 @@ msgid "Unknown file type" msgstr "" #: lib/jabber.php:192 -#, fuzzy, php-format -msgid "notice id: %s" -msgstr "URI da mensagem inválido" +#, php-format +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 msgid "Join" @@ -4473,8 +4520,9 @@ msgid "Could not subscribe other to you." msgstr "Não foi possÃvel subscrever outros a si." #: lib/subs.php:124 -msgid "Not subscribed!." -msgstr "" +#, fuzzy +msgid "Not subscribed!" +msgstr "Não foi possÃvel subscrever. " #: lib/subs.php:136 msgid "Couldn't delete subscription." @@ -4522,47 +4570,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.mo b/locale/pt_BR/LC_MESSAGES/statusnet.mo Binary files differindex 478729896..58f25061d 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.mo +++ b/locale/pt_BR/LC_MESSAGES/statusnet.mo diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index aa7f47cca..d724f79b1 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:40+0000\n" +"POT-Creation-Date: 2009-11-13 20:42+0000\n" +"PO-Revision-Date: 2009-11-13 20:43:18+0000\n" "Language-Team: Brazilian Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt-br\n" "X-Message-Group: out-statusnet\n" @@ -24,12 +24,15 @@ msgid "No such page" msgstr "Essa etiqueta não existe." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -108,35 +111,42 @@ msgstr "%s e amigos" msgid "Updates from %1$s and friends on %2$s!" msgstr "Atualizações de %1$s e amigos no %2$s!" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "O método da API não foi encontrado!" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Este método requer um POST." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Não foi possÃvel atualizar o usuário." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -144,12 +154,34 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "Não foi possÃvel salvar suas configurações do Twitter!" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Não foi possÃvel atualizar o usuário." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "O usuário não tem perfil." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Não foi possÃvel salvar o perfil." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "Não foi possÃvel bloquear o usuário." @@ -197,6 +229,23 @@ msgstr "Mensagem direta para %s" msgid "All the direct messages sent to %s" msgstr "Todas as mensagens diretas enviadas para %s" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "O método da API não foi encontrado!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -394,17 +443,17 @@ msgstr "" msgid "No status with that ID found." msgstr "Não foi encontrado nenhum status com esse ID." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Está muito extenso. O tamanho máximo é de 140 caracteres." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "Não encontrado" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -488,7 +537,7 @@ msgid "Invalid size." msgstr "Tamanho inválido." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" @@ -536,7 +585,7 @@ msgstr "Cortar" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1698,7 +1747,7 @@ msgid "Nickname" msgstr "Apelido" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Senha" @@ -1840,7 +1889,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1886,8 +1935,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Formato de dados não suportado." @@ -1907,11 +1956,15 @@ msgstr "Outras configurações" msgid "Manage various other options." msgstr "Gerenciar várias outras opções." -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "Serviço de encolhimento automático a ser utilizado." @@ -1948,67 +2001,62 @@ msgstr "" msgid "Change password" msgstr "Alterar a senha" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Altere a sua senha" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 #, fuzzy msgid "Change your password." msgstr "Altera a sua senha" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "A senha foi salva." -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Senha antiga" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Nova senha" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "No mÃnimo 6 caracteres" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirmar" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "igual à senha acima" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Alterar" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "A senha deve ter 6 ou mais caracteres." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "As senhas não coincidem." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "A senha antiga está incorreta" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Erro ao salvar usuário; inválido." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Não é possÃvel salvar a nova senha." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "A senha foi salva." @@ -2456,7 +2504,7 @@ msgid "Same as password above. Required." msgstr "Igual à senha acima. Obrigatório." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "E-mail" @@ -3396,36 +3444,36 @@ msgstr "Problema ao salvar a mensagem." msgid "DB error inserting reply: %s" msgstr "Erro no banco de dados na inserção da reposta: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Mensagem para %1$s no %2$s" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Perfil" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Alterar as suas configurações de perfil" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "Enviar um avatar" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Altere a sua senha" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Configurações de uso do e-mail" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "O usuário não tem perfil." @@ -3434,7 +3482,7 @@ msgstr "O usuário não tem perfil." msgid "Other" msgstr "Outras" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Outras opções" @@ -3832,20 +3880,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:189 #, fuzzy msgid "No configuration file found. " msgstr "Nenhum código de confirmação." -#: lib/common.php:192 +#: lib/common.php:190 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:191 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:192 #, fuzzy msgid "Go to the installer." msgstr "Entrar" @@ -4113,9 +4161,9 @@ msgid "Unknown file type" msgstr "Tipo de arquivo desconhecido" #: lib/jabber.php:192 -#, fuzzy, php-format -msgid "notice id: %s" -msgstr "Feed de mensagens de %s" +#, php-format +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 msgid "Join" @@ -4639,7 +4687,8 @@ msgid "Could not subscribe other to you." msgstr "Não foi possÃvel fazer com que o outros o sigam." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "Não é seguido!" #: lib/subs.php:136 @@ -4691,47 +4740,47 @@ msgstr "Você não pode enviar uma mensagem para esse usuário." msgid "Message" msgstr "Nova mensagem" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "segundos atrás" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "1 min atrás" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "%d mins atrás" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "1 hora atrás" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "%d horas atrás" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "1 dia atrás" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "%d dias atrás" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "1 mês atrás" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "%d meses atrás" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "1 ano atrás" diff --git a/locale/ru/LC_MESSAGES/statusnet.mo b/locale/ru/LC_MESSAGES/statusnet.mo Binary files differindex 7a8ba6e3d..2ee87e9be 100644 --- a/locale/ru/LC_MESSAGES/statusnet.mo +++ b/locale/ru/LC_MESSAGES/statusnet.mo diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index 80bfd1d72..9c876cddf 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -6,12 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:42+0000\n" +"POT-Creation-Date: 2009-11-13 20:42+0000\n" +"PO-Revision-Date: 2009-11-13 20:43: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(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ru\n" "X-Message-Group: out-statusnet\n" @@ -23,12 +23,15 @@ msgid "No such page" msgstr "Ðет такого тега." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -107,35 +110,42 @@ msgstr "%s и друзьÑ" msgid "Updates from %1$s and friends on %2$s!" msgstr "Обновлено от %1$s и его друзей на %2$s!" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "Метод API не найден!" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Ðтот метод требует POST." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Ðе удаётÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ пользователÑ." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -143,12 +153,34 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "Ðе удаётÑÑ Ñохранить Ваши уÑтановки по Твиттеру!" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Ðе удаётÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ пользователÑ." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "У Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð½ÐµÑ‚ профилÑ." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Ðе удаётÑÑ Ñохранить профиль." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "Ðеудача при блокировке пользователÑ." @@ -196,6 +228,23 @@ msgstr "ПрÑмые ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð´Ð»Ñ %s" msgid "All the direct messages sent to %s" msgstr "Ð’Ñе прÑмые ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¿Ð¾Ñланные Ð´Ð»Ñ %s" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "Метод API не найден!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -394,17 +443,17 @@ msgstr "Ðватар обновлён." msgid "No status with that ID found." msgstr "Ðе найдено ÑтатуÑа Ñ Ñ‚Ð°ÐºÐ¸Ð¼ ID." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Слишком Ð´Ð»Ð¸Ð½Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ. МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° - 140 знаков." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "Ðе найдено" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -488,7 +537,7 @@ msgid "Invalid size." msgstr "Ðеверный размер." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Ðватар" @@ -536,7 +585,7 @@ msgstr "Обрезать" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1688,7 +1737,7 @@ msgid "Nickname" msgstr "ИмÑ" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Пароль" @@ -1825,7 +1874,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1872,8 +1921,8 @@ msgstr "Соединить" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Ðеподдерживаемый формат данных." @@ -1893,11 +1942,15 @@ msgstr "Другие уÑтановки" msgid "Manage various other options." msgstr "Управление другими опциÑми." -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "ÐвтоматичеÑки иÑпользовать выбранный ÑервиÑ" @@ -1934,65 +1987,60 @@ msgstr "" msgid "Change password" msgstr "Изменить пароль" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Изменить ваш пароль" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 msgid "Change your password." msgstr "Изменить ваш пароль" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "Пароль Ñохранён." -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Старый пароль" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Ðовый пароль" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 или больше знаков" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Подтвердить" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "повторить пароль Ñверху" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Изменить" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Пароль должен быть длиной не менее 6 Ñимволов." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Пароли не Ñовпадают." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Ðекорректный Ñтарый пароль" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Ошибка ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ; неверное имÑ." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Ðе удаётÑÑ Ñохранить новый пароль." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Пароль Ñохранён." @@ -2445,7 +2493,7 @@ msgid "Same as password above. Required." msgstr "Тот же пароль что и Ñверху. ОбÑзательно." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Email" @@ -3394,36 +3442,36 @@ msgstr "Проблемы Ñ Ñохранением запиÑи." msgid "DB error inserting reply: %s" msgstr "Ошибка баз данных при вÑтавке ответа Ð´Ð»Ñ %s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Сообщение Ð´Ð»Ñ %1$s на %2$s" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Профиль" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Изменить ваши наÑтройки профилÑ" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "Загрузить аватар" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Изменить ваш пароль" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Изменить Ñлектронный адреÑ" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "Профиль пользователÑ" @@ -3432,7 +3480,7 @@ msgstr "Профиль пользователÑ" msgid "Other" msgstr "Другое" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Другие опции" @@ -3823,20 +3871,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:189 #, fuzzy msgid "No configuration file found. " msgstr "Ðет кода подтверждениÑ." -#: lib/common.php:192 +#: lib/common.php:190 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:191 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:192 #, fuzzy msgid "Go to the installer." msgstr "Войти" @@ -4104,9 +4152,9 @@ msgid "Unknown file type" msgstr "Ðеподдерживаемый тип файла" #: lib/jabber.php:192 -#, fuzzy, php-format -msgid "notice id: %s" -msgstr "ÐÐ¾Ð²Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ" +#, php-format +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 msgid "Join" @@ -4622,7 +4670,8 @@ msgid "Could not subscribe other to you." msgstr "Ðе удаётÑÑ Ð¿Ð¾Ð´Ð¿Ð¸Ñать других на вашу ленту." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "Ðе подпиÑан!" #: lib/subs.php:136 @@ -4671,47 +4720,47 @@ msgstr "ПоÑлать приватное Ñообщение Ñтому поль msgid "Message" msgstr "Сообщение" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "пару Ñекунд назад" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "около минуты назад" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "около %d минут(Ñ‹) назад" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "около чаÑа назад" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "около %d чаÑа(ов) назад" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "около Ð´Ð½Ñ Ð½Ð°Ð·Ð°Ð´" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "около %d днÑ(ей) назад" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "около меÑÑца назад" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "около %d меÑÑца(ев) назад" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "около года назад" diff --git a/locale/statusnet.po b/locale/statusnet.po index 30d449fba..448ab4fa5 100644 --- a/locale/statusnet.po +++ b/locale/statusnet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"POT-Creation-Date: 2009-11-13 20:42+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "" #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -105,35 +108,40 @@ msgstr "" msgid "Updates from %1$s and friends on %2$s!" msgstr "" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +msgid "API method not found." msgstr "" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +msgid "Could not update user." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -141,12 +149,31 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +msgid "Could not update your design." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "" +#: actions/apiaccountupdateprofile.php:147 +msgid "Could not save profile." +msgstr "" + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "" @@ -192,6 +219,23 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -377,17 +421,17 @@ msgstr "" msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -469,7 +513,7 @@ msgid "Invalid size." msgstr "" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "" @@ -517,7 +561,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1572,7 +1616,7 @@ msgid "Nickname" msgstr "" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "" @@ -1701,7 +1745,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1745,8 +1789,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "" @@ -1766,11 +1810,15 @@ msgstr "" msgid "Manage various other options." msgstr "" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "" @@ -1804,64 +1852,60 @@ msgstr "" msgid "Change password" msgstr "" -#: actions/passwordsettings.php:70 -msgid "You are not allowed to change your password" -msgstr "" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 msgid "Change your password." msgstr "" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "" -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "" -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "" -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "" @@ -2286,7 +2330,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "" @@ -3149,36 +3193,36 @@ msgstr "" msgid "DB error inserting reply: %s" msgstr "" -#: classes/User.php:333 +#: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 msgid "Design your profile" msgstr "" @@ -3186,7 +3230,7 @@ msgstr "" msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "" @@ -3566,19 +3610,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:189 msgid "No configuration file found. " msgstr "" -#: lib/common.php:192 +#: lib/common.php:190 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:191 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:192 msgid "Go to the installer." msgstr "" @@ -3838,7 +3882,7 @@ msgstr "" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" +msgid "[%s]" msgstr "" #: lib/joinform.php:114 @@ -4339,7 +4383,7 @@ msgid "Could not subscribe other to you." msgstr "" #: lib/subs.php:124 -msgid "Not subscribed!." +msgid "Not subscribed!" msgstr "" #: lib/subs.php:136 @@ -4386,47 +4430,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "" diff --git a/locale/sv/LC_MESSAGES/statusnet.mo b/locale/sv/LC_MESSAGES/statusnet.mo Binary files differindex 8c1d54b02..93760fe39 100644 --- a/locale/sv/LC_MESSAGES/statusnet.mo +++ b/locale/sv/LC_MESSAGES/statusnet.mo diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index f43a686b7..514a2e0fa 100644 --- a/locale/sv/LC_MESSAGES/statusnet.po +++ b/locale/sv/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:45+0000\n" +"POT-Creation-Date: 2009-11-13 20:42+0000\n" +"PO-Revision-Date: 2009-11-13 20:43: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(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: sv\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "Inget sÃ¥dant meddelande." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -106,35 +109,42 @@ msgstr "%s med vänner" msgid "Updates from %1$s and friends on %2$s!" msgstr "Uppdateringar frÃ¥n %1$s och vänner pÃ¥ %2$s!" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "API-metoden hittades inte!" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Denna metod kräver skicka." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Kunde inte uppdatera användare." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -142,12 +152,34 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "Kunde inte spara dina Twitter inställningar!" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Kunde inte uppdatera användare." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "Användaren har ingen profil." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Kunde inte spara profil." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "" @@ -194,6 +226,23 @@ msgstr "Direktmeddelande till %s" msgid "All the direct messages sent to %s" msgstr "Alla direktmeddelanden skickade till %s" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "API-metoden hittades inte!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -391,17 +440,17 @@ msgstr "Användarbilden uppdaterad." msgid "No status with that ID found." msgstr "Ingen status med det ID hittades." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "För lÃ¥ngt. Maximalt 140 tecken" -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "Hittades inte" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -486,7 +535,7 @@ msgid "Invalid size." msgstr "Felaktig storlek" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Användarbild" @@ -536,7 +585,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1698,7 +1747,7 @@ msgid "Nickname" msgstr "Smeknamn" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Lösenord" @@ -1836,7 +1885,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1881,8 +1930,8 @@ msgstr "Anslut" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Ingen support för det formatet." @@ -1903,11 +1952,15 @@ msgstr "Twitter inställningar" msgid "Manage various other options." msgstr "" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "" @@ -1943,67 +1996,62 @@ msgstr "Detta är din outbox som innehÃ¥ller meddelanden som du skickat." msgid "Change password" msgstr "Byt lösenord" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Ändra ditt lösenord" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 #, fuzzy msgid "Change your password." msgstr "Ändra ditt lösenord" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Lösenord är sparat." -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Gammalt lösenord" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Nytt lösenord" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "Minst 6 tecken" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Bekräfta" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "samma som lösenordet ovan" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Ändra" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Lösenordet mÃ¥ste vara minst 6 tecken." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Lösenorden matchar inte." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Felaktigt, gammalt lösenord" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Fel uppstog när användare skulle sparas." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Kan inte spara det nya lösenordet." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Lösenord är sparat." @@ -2446,7 +2494,7 @@ msgid "Same as password above. Required." msgstr "Samma som lösenordet ovan. MÃ¥ste fyllas i." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Epost" @@ -3382,37 +3430,37 @@ msgstr "Det var ett problem när inlägget sparades." msgid "DB error inserting reply: %s" msgstr "Databasfel för svar: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Meddelande till %1$s pÃ¥ %2$s" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Ändra dina profilinställningar" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 #, fuzzy msgid "Upload an avatar" msgstr "Uppdatering av profilbild misslyckades." -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Ändra ditt lösenord" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Ändra email hantering" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "Användaren har ingen profil." @@ -3421,7 +3469,7 @@ msgstr "Användaren har ingen profil." msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "" @@ -3822,20 +3870,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:189 #, fuzzy msgid "No configuration file found. " msgstr "Ingen bekräftelsekod." -#: lib/common.php:192 +#: lib/common.php:190 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:191 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:192 msgid "Go to the installer." msgstr "" @@ -4113,8 +4161,8 @@ msgstr "okänd fil typ" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "Nytt inlägg" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 #, fuzzy @@ -4647,7 +4695,8 @@ msgid "Could not subscribe other to you." msgstr "Kunde inte prenumerera pÃ¥ annat Ã¥t dig." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "Ingen prenumerant!" #: lib/subs.php:136 @@ -4700,47 +4749,47 @@ msgstr "Du kan inte skicka meddelande till den användaren." msgid "Message" msgstr "Nytt meddelande" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "ett par sekunder sedan" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "för nÃ¥n minut sedan" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "för %d minuter sedan" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "för en timma sedan" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "för %d timmar sedan" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "för en dag sedan" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "för %d dagar sedan" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "för en mÃ¥nad sedan" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "för %d mÃ¥nader sedan" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "för ett Ã¥r sedan" diff --git a/locale/te/LC_MESSAGES/statusnet.mo b/locale/te/LC_MESSAGES/statusnet.mo Binary files differindex d1784c5d8..2b70c53f2 100644 --- a/locale/te/LC_MESSAGES/statusnet.mo +++ b/locale/te/LC_MESSAGES/statusnet.mo diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index b044aef99..04a21fe1b 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -6,12 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:48+0000\n" +"POT-Creation-Date: 2009-11-13 20:42+0000\n" +"PO-Revision-Date: 2009-11-13 20:43:25+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: te\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ పేజీ లేదà±" #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -105,35 +108,42 @@ msgstr "మీరౠమరియౠమీ à°¸à±à°¨à±‡à°¹à°¿à°¤à±à°²à±" msgid "Updates from %1$s and friends on %2$s!" msgstr "" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." +msgstr "నిరà±à°§à°¾à°°à°£ సంకేతం కనబడలేదà±." -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "వాడà±à°•à°°à°¿à°¨à°¿ తాజాకరించలేకà±à°¨à±à°¨à°¾à°‚." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -141,12 +151,33 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "వాడà±à°•à°°à°¿à°¨à°¿ తాజాకరించలేకà±à°¨à±à°¨à°¾à°‚." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "వాడà±à°•à°°à°¿à°•à°¿ à°ªà±à°°à±Šà°«à±ˆà°²à± లేదà±." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "à°ªà±à°°à±Šà°«à±ˆà°²à±à°¨à°¿ à°à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à±à°¨à±à°¨à°¾à°‚." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "వాడà±à°•à°°à°¿ నిరోధం విఫలమైంది." @@ -192,6 +223,23 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -247,9 +295,8 @@ msgid "Could not find target user." msgstr "వాడà±à°•à°°à°¿à°¨à°¿ తాజాకరించలేకà±à°¨à±à°¨à°¾à°‚." #: actions/apigroupcreate.php:136 actions/newgroup.php:204 -#, fuzzy msgid "Could not create group." -msgstr "అవతారపౠసమాచారానà±à°¨à°¿ à°à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à±à°¨à±à°¨à°¾à°‚" +msgstr "à°—à±à°‚à°ªà±à°¨à°¿ సృషà±à°Ÿà°¿à°‚చలేకపోయాం." #: actions/apigroupcreate.php:147 actions/editgroup.php:259 #: actions/newgroup.php:210 @@ -384,17 +431,17 @@ msgstr "à°¸à±à°¥à°¿à°¤à°¿à°¨à°¿ తొలగించాం." msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "ఇది చాలా పొడవà±à°‚ది. à°—à°°à°¿à°·à±à° సందేశ పరిమాణం 140 à°…à°•à±à°·à°°à°¾à°²à±." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "దొరకలేదà±" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -456,14 +503,12 @@ msgid "Updates tagged with %1$s on %2$s!" msgstr "%s యొకà±à°• మైకà±à°°à±‹à°¬à±à°²à°¾à°—à±" #: actions/apiusershow.php:96 -#, fuzzy msgid "Not found." -msgstr "à°…à°à±à°¯à°°à±à°¥à°¨à°²à±‡à°®à±€ కనబడలేదà±!" +msgstr "కనబడలేదà±." #: actions/attachment.php:73 -#, fuzzy msgid "No such attachment." -msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ పతà±à°°à°®à±‡à°®à±€ లేదà±." +msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ జోడింపౠలేదà±." #: actions/avatarbynickname.php:59 actions/leavegroup.php:76 #, fuzzy @@ -479,7 +524,7 @@ msgid "Invalid size." msgstr "తపà±à°ªà±à°¡à± పరిమాణం." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "అవతారం" @@ -527,7 +572,7 @@ msgstr "à°•à°¤à±à°¤à°¿à°°à°¿à°‚à°šà±" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -644,9 +689,8 @@ msgid "No" msgstr "కాదà±" #: actions/block.php:149 -#, fuzzy msgid "Do not block this user" -msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ వాడà±à°•à°°à°¿ లేరà±." +msgstr "à°ˆ వాడà±à°•à°°à°¿à°¨à°¿ నిరోధించకà±" #: actions/block.php:150 actions/deletenotice.php:146 #: actions/groupblock.php:179 @@ -659,13 +703,12 @@ msgid "Block this user" msgstr "à°ˆ వాడà±à°•à°°à°¿à°¨à°¿ నిరోధించà±" #: actions/block.php:165 -#, fuzzy msgid "You have already blocked this user." -msgstr "మీరౠఇపà±à°ªà°Ÿà°¿à°•à±‡ లోనికి à°ªà±à°°à°µà±‡à°¶à°¿à°‚చారà±!" +msgstr "మీరౠఇపà±à°ªà°Ÿà°¿à°•à±‡ à°ˆ వాడà±à°•à°°à°¿à°¨à°¿ నిరోధించారà±." #: actions/block.php:170 msgid "Failed to save block information." -msgstr "" +msgstr "నిరోధపౠసమాచారానà±à°¨à°¿ à°à°¦à±à°°à°ªà°°à°šà°¡à°‚లో విఫలమయà±à°¯à°¾à°‚." #: actions/bookmarklet.php:50 msgid "Post to " @@ -739,7 +782,7 @@ msgstr "" #: actions/deletenotice.php:109 actions/deletenotice.php:141 msgid "Delete notice" -msgstr "" +msgstr "నోటీసà±à°¨à°¿ తొలగించà±" #: actions/deletenotice.php:144 msgid "Are you sure you want to delete this notice?" @@ -773,7 +816,7 @@ msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ పతà±à°°à°®à±‡à°®à±€ లేదà±." #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" -msgstr "" +msgstr "%s à°—à±à°‚à°ªà±à°¨à°¿ మారà±à°šà±" #: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65 msgid "You must be logged in to create a group." @@ -789,9 +832,9 @@ msgid "Use this form to edit the group." msgstr "" #: actions/editgroup.php:201 actions/newgroup.php:145 -#, fuzzy, php-format +#, php-format msgid "description is too long (max %d chars)." -msgstr "à°¸à±à°µà°ªà°°à°¿à°šà°¯à°‚ చాలా పెదà±à°¦à°—à°¾ ఉంది (140 à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚)." +msgstr "వివరణ చాలా పెదà±à°¦à°¦à°¿à°—à°¾ ఉంది (140 à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚)." #: actions/editgroup.php:253 #, fuzzy @@ -914,7 +957,7 @@ msgstr "à°…à°à°¿à°°à±à°šà±à°²à± à°à°¦à±à°°à°®à°¯à±à°¯à°¾à°¯à°¿." #: actions/emailsettings.php:319 msgid "No email address." -msgstr "" +msgstr "ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾ లేదà±." #: actions/emailsettings.php:326 msgid "Cannot normalize that email address" @@ -922,7 +965,7 @@ msgstr "" #: actions/emailsettings.php:330 msgid "Not a valid email address" -msgstr "" +msgstr "సరైన ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾ కాదà±" #: actions/emailsettings.php:333 msgid "That is already your email address." @@ -959,7 +1002,7 @@ msgstr "నిరà±à°§à°¾à°°à°£ à°°à°¦à±à°¦à°¯à°¿à°‚ది." #: actions/emailsettings.php:412 msgid "That is not your email address." -msgstr "" +msgstr "అది మీ ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾ కాదà±." #: actions/emailsettings.php:431 actions/imsettings.php:408 #: actions/smssettings.php:425 @@ -985,14 +1028,13 @@ msgstr "" #: actions/favorited.php:65 lib/popularnoticesection.php:87 #: lib/publicgroupnav.php:93 -#, fuzzy msgid "Popular notices" -msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ సందేశమేమీ లేదà±." +msgstr "à°ªà±à°°à°¾à°šà±à°°à±à°¯ నోటీసà±à°²à±" #: actions/favorited.php:67 -#, fuzzy, php-format +#, php-format msgid "Popular notices, page %d" -msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ సందేశమేమీ లేదà±." +msgstr "à°ªà±à°°à°¾à°šà±à°°à±à°¯ నోటీసà±à°²à±, పేజీ %d" #: actions/favorited.php:79 msgid "The most popular notices on the site right now." @@ -1028,7 +1070,7 @@ msgstr "%s యొకà±à°• మైకà±à°°à±‹à°¬à±à°²à°¾à°—à±" #: actions/favor.php:79 msgid "This notice is already a favorite!" -msgstr "" +msgstr "à°ˆ నోటీసౠఇపà±à°ªà°Ÿà°¿à°•à±‡ మీ ఇషà±à°Ÿà°¾à°‚శం!" #: actions/favor.php:92 lib/disfavorform.php:140 msgid "Disfavor favorite" @@ -1055,9 +1097,8 @@ msgid "No notice id" msgstr "కొతà±à°¤ సందేశం" #: actions/file.php:38 -#, fuzzy msgid "No notice" -msgstr "కొతà±à°¤ సందేశం" +msgstr "సందేశం లేదà±" #: actions/file.php:42 msgid "No attachments" @@ -1065,7 +1106,7 @@ msgstr "జోడింపà±à°²à± లేవà±" #: actions/file.php:51 msgid "No uploaded attachments" -msgstr "" +msgstr "à°Žà°•à±à°•à°¿à°‚à°šà°¿à°¨ జోడింపà±à°²à±‡à°®à±€ లేవà±" #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1106,9 +1147,8 @@ msgid "No such group." msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ à°—à±à°‚పౠలేదà±." #: actions/getfile.php:75 -#, fuzzy msgid "No such file." -msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ సందేశమేమీ లేదà±." +msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ ఫైలౠలేదà±." #: actions/getfile.php:79 #, fuzzy @@ -1168,7 +1208,7 @@ msgstr "" #: actions/groupdesignsettings.php:141 msgid "Group design" -msgstr "" +msgstr "à°—à±à°‚పౠఅలంకారం" #: actions/groupdesignsettings.php:152 msgid "" @@ -1245,7 +1285,7 @@ msgstr "" #: actions/groupmembers.php:473 msgid "Make Admin" -msgstr "" +msgstr "నిరà±à°µà°¾à°¹à°•à±à°¨à±à°¨à°¿ చేయి" #: actions/groupmembers.php:473 msgid "Make this user an admin" @@ -1266,15 +1306,13 @@ msgstr "" "ఖాళీలతో వేరà±à°šà±‡à°¯à°‚à°¡à°¿; à°’à°•à±à°•à±‹ పదంలో 3 లేదా అంతకంటే à°Žà°•à±à°•à±à°µ à°…à°•à±à°·à°°à°¾à°²à± ఉండాలి." #: actions/groupsearch.php:58 -#, fuzzy msgid "Group search" -msgstr "à°µà±à°¯à°•à±à°¤à±à°² à°…à°¨à±à°µà±‡à°·à°£" +msgstr "à°—à±à°‚à°ªà±à°² à°…à°¨à±à°µà±‡à°·à°£" #: actions/groupsearch.php:79 actions/noticesearch.php:117 #: actions/peoplesearch.php:83 -#, fuzzy msgid "No results." -msgstr "ఫలితాలేమీ లేవà±" +msgstr "ఫలితాలేమీ లేవà±." #: actions/groupsearch.php:82 #, php-format @@ -1608,7 +1646,7 @@ msgid "Nickname" msgstr "పేరà±" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "సంకేతపదం" @@ -1659,7 +1697,7 @@ msgstr "" #: actions/microsummary.php:69 msgid "No current status" -msgstr "" +msgstr "à°ªà±à°°à°¸à±à°¤à±à°¤ à°¸à±à°¥à°¿à°¤à°¿ à°à°®à±€ లేదà±" #: actions/newgroup.php:53 msgid "New group" @@ -1741,7 +1779,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1786,18 +1824,18 @@ msgstr "à°…à°¨à±à°¸à°‚ధానించà±" msgid "Only " msgstr "మాతà±à°°à°®à±‡ " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "" #: actions/opensearch.php:64 msgid "People Search" -msgstr "" +msgstr "à°ªà±à°°à°œà°² à°…à°¨à±à°µà±‡à°·à°£" #: actions/opensearch.php:67 msgid "Notice Search" -msgstr "" +msgstr "నోటీసà±à°² à°…à°¨à±à°µà±‡à°·à°£" #: actions/othersettings.php:60 msgid "Other Settings" @@ -1807,13 +1845,17 @@ msgstr "ఇతర అమరికలà±" msgid "Manage various other options." msgstr "" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr " (à°¸à±à°µà±‡à°šà±à°›à°¾ సేవ)" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" -msgstr "" +msgstr "URL à°•à±à°¦à°¿à°‚పౠసేవ" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." -msgstr "" +msgstr "ఉపయోగించాలà±à°¸à°¿à°¨ యాంతà±à°°à°¿à°• à°•à±à°¦à°¿à°‚పౠసేవ." #: actions/othersettings.php:122 #, fuzzy @@ -1825,9 +1867,8 @@ msgid "Show or hide profile designs." msgstr "" #: actions/othersettings.php:153 -#, fuzzy msgid "URL shortening service is too long (max 50 chars)." -msgstr "à°ªà±à°°à°¾à°‚తం పేరౠమరీ పెదà±à°¦à°—à°¾ ఉంది (255 à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚)." +msgstr "URL à°•à±à°¦à°¿à°‚పౠసేవ మరీ పెదà±à°¦à°—à°¾ ఉంది (50 à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚)." #: actions/outbox.php:58 #, php-format @@ -1847,66 +1888,61 @@ msgstr "" msgid "Change password" msgstr "సంకేతపదం మారà±à°šà±à°•à±‹à°‚à°¡à°¿" -#: actions/passwordsettings.php:70 -msgid "You are not allowed to change your password" -msgstr "" - -#: actions/passwordsettings.php:82 -#, fuzzy +#: actions/passwordsettings.php:69 msgid "Change your password." -msgstr "సంకేతపదం మారà±à°šà±à°•à±‹à°‚à°¡à°¿" +msgstr "మీ సంకేతపదం మారà±à°šà±à°•à±‹à°‚à°¡à°¿." -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "సంకేతపదం à°à°¦à±à°°à°®à°¯à±à°¯à°¿à°‚ది." -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "పాత సంకేతపదం" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "కొతà±à°¤ సంకేతపదం" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 లేదా అంతకంటే à°Žà°•à±à°•à±à°µ à°…à°•à±à°·à°°à°¾à°²à±" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "నిరà±à°¥à°¾à°°à°¿à°‚à°šà±" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "పై సంకేతపదం వలెనే" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "మారà±à°šà±" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "సంకేతపదాలౠసరిపోలలేదà±." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "పాత సంకేతపదం తపà±à°ªà±" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "వాడà±à°•à°°à°¿à°¨à°¿ à°à°¦à±à°°à°ªà°°à°šà°¡à°‚లో పొరపాటà±: సరికాదà±." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "కొతà±à°¤ సంకేతపదానà±à°¨à°¿ à°à°¦à±à°°à°ªà°°à°šà°²à±‡à°®à±." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "సంకేతపదం à°à°¦à±à°°à°®à°¯à±à°¯à°¿à°‚ది." @@ -1952,9 +1988,8 @@ msgid "" msgstr "" #: actions/profilesettings.php:99 -#, fuzzy msgid "Profile information" -msgstr "à°…à°œà±à°žà°¾à°¤ à°ªà±à°°à±Šà°«à±ˆà°²à±" +msgstr "à°ªà±à°°à±Šà°«à±ˆà°²à± సమాచారం" #: actions/profilesettings.php:108 lib/groupeditform.php:154 msgid "1-64 lowercase letters or numbers, no punctuation or spaces" @@ -2004,7 +2039,7 @@ msgstr "మీరౠఎకà±à°•à°¡ à°¨à±à°‚à°¡à°¿, \"నగరం, రాషà #: actions/tagother.php:209 lib/subscriptionlist.php:106 #: lib/subscriptionlist.php:108 lib/userprofile.php:209 msgid "Tags" -msgstr "" +msgstr "à°Ÿà±à°¯à°¾à°—à±à°²à±" #: actions/profilesettings.php:140 msgid "" @@ -2043,7 +2078,7 @@ msgstr "కాలమండలానà±à°¨à°¿ à°Žà°‚à°šà±à°•à±‹à°²à±‡à°¦à±." #: actions/profilesettings.php:234 msgid "Language is too long (max 50 chars)." -msgstr "" +msgstr "à°à°¾à°· మరీ పెదà±à°¦à°—à°¾ ఉంది (50 à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚)." #: actions/profilesettings.php:246 actions/tagother.php:178 #, fuzzy, php-format @@ -2059,9 +2094,8 @@ msgid "Couldn't save profile." msgstr "à°ªà±à°°à±Šà°«à±ˆà°²à±à°¨à°¿ à°à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à±à°¨à±à°¨à°¾à°‚." #: actions/profilesettings.php:336 -#, fuzzy msgid "Couldn't save tags." -msgstr "à°ªà±à°°à±Šà°«à±ˆà°²à±à°¨à°¿ à°à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à±à°¨à±à°¨à°¾à°‚." +msgstr "à°Ÿà±à°¯à°¾à°—à±à°²à°¨à°¿ à°à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à±à°¨à±à°¨à°¾à°‚." #: actions/profilesettings.php:344 msgid "Settings saved." @@ -2077,9 +2111,9 @@ msgid "Could not retrieve public stream." msgstr "" #: actions/public.php:129 -#, fuzzy, php-format +#, php-format msgid "Public timeline, page %d" -msgstr "à°ªà±à°°à°œà°¾ కాలరేఖ" +msgstr "à°ªà±à°°à°œà°¾ కాలరేఖ, పేజీ %d" #: actions/public.php:131 lib/publicgroupnav.php:79 msgid "Public timeline" @@ -2162,7 +2196,7 @@ msgstr "" #: actions/publictagcloud.php:135 msgid "Tag cloud" -msgstr "" +msgstr "à°Ÿà±à°¯à°¾à°—ౠమేఘం" #: actions/recoverpassword.php:36 msgid "You are already logged in!" @@ -2295,7 +2329,7 @@ msgstr "నిరà±à°§à°¾à°°à°£ సంకేతంలో పొరపాటà±. #: actions/register.php:112 msgid "Registration successful" -msgstr "" +msgstr "నమోదౠవిజయవంతం" #: actions/register.php:114 actions/register.php:502 lib/action.php:450 #: lib/logingroupnav.php:85 @@ -2341,7 +2375,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "ఈమెయిలà±" @@ -2429,7 +2463,7 @@ msgstr "" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 #: lib/userprofile.php:321 msgid "Subscribe" -msgstr "" +msgstr "చందాచేరà±" #: actions/remotesubscribe.php:159 msgid "Invalid profile URL (bad format)" @@ -2557,7 +2591,7 @@ msgstr "%s à°—à±à°‚à°ªà±" #: actions/showgroup.php:84 #, php-format msgid "%s group, page %d" -msgstr "" +msgstr "%s à°—à±à°‚à°ªà±, పేజీ %d" #: actions/showgroup.php:218 msgid "Group profile" @@ -2570,9 +2604,8 @@ msgstr "" #: actions/showgroup.php:274 actions/tagother.php:128 #: actions/userauthorization.php:179 lib/userprofile.php:194 -#, fuzzy msgid "Note" -msgstr "సందేశాలà±" +msgstr "గమనిక" #: actions/showgroup.php:284 lib/groupeditform.php:184 msgid "Aliases" @@ -2646,7 +2679,7 @@ msgstr "" #: actions/showgroup.php:482 msgid "Admins" -msgstr "" +msgstr "నిరà±à°µà°¾à°¹à°•à±à°²à±" #: actions/showmessage.php:81 msgid "No such message." @@ -2667,9 +2700,8 @@ msgid "Message from %1$s on %2$s" msgstr "" #: actions/shownotice.php:90 -#, fuzzy msgid "Notice deleted." -msgstr "సందేశాలà±" +msgstr "నోటీసà±à°¨à°¿ తొలగించాం." #: actions/showstream.php:73 #, php-format @@ -2892,14 +2924,14 @@ msgid "" msgstr "" #: actions/subscriptions.php:52 -#, fuzzy, php-format +#, php-format msgid "%s subscriptions" -msgstr "à°…à°¨à±à°¨à°¿ చందాలà±" +msgstr "%s చందాలà±" #: actions/subscriptions.php:54 -#, fuzzy, php-format +#, php-format msgid "%s subscriptions, page %d" -msgstr "à°…à°¨à±à°¨à°¿ చందాలà±" +msgstr "%s చందాలà±, పేజీ %d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." @@ -2935,9 +2967,8 @@ msgid "SMS" msgstr "" #: actions/tagother.php:33 -#, fuzzy msgid "Not logged in" -msgstr "లోనికి à°ªà±à°°à°µà±‡à°¶à°¿à°‚చలేదà±." +msgstr "లోనికి à°ªà±à°°à°µà±‡à°¶à°¿à°‚చలేదà±" #: actions/tagother.php:39 #, fuzzy @@ -2950,9 +2981,8 @@ msgid "Tag %s" msgstr "" #: actions/tagother.php:77 lib/userprofile.php:75 -#, fuzzy msgid "User profile" -msgstr "వాడà±à°•à°°à°¿à°•à°¿ à°ªà±à°°à±Šà°«à±ˆà°²à± లేదà±." +msgstr "వాడà±à°•à°°à°¿ à°ªà±à°°à±Šà°«à±ˆà°²à±" #: actions/tagother.php:81 lib/userprofile.php:102 msgid "Photo" @@ -2974,9 +3004,8 @@ msgid "" msgstr "" #: actions/tagother.php:200 -#, fuzzy msgid "Could not save tags." -msgstr "అవతారపౠసమాచారానà±à°¨à°¿ à°à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à±à°¨à±à°¨à°¾à°‚" +msgstr "à°Ÿà±à°¯à°¾à°—à±à°²à°¨à°¿ à°à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à°ªà±‹à°¯à°¾à°‚." #: actions/tagother.php:236 msgid "Use this form to add tags to your subscribers or subscriptions." @@ -3050,9 +3079,8 @@ msgstr "అంగీకరించà±" #: actions/userauthorization.php:210 lib/subscribeform.php:115 #: lib/subscribeform.php:139 -#, fuzzy msgid "Subscribe to this user" -msgstr "చందాదారà±à°²à±" +msgstr "à°ˆ వాడà±à°•à°°à°¿à°•à°¿ చందాచేరà±" #: actions/userauthorization.php:211 msgid "Reject" @@ -3226,37 +3254,36 @@ msgstr "సందేశానà±à°¨à°¿ à°à°¦à±à°°à°ªà°°à°šà°¡à°‚లో పొà msgid "DB error inserting reply: %s" msgstr "" -#: classes/User.php:333 +#: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" -msgstr "" +msgstr "@%2$s, %1$sà°•à°¿ à°¸à±à°µà°¾à°—తం!" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "à°ªà±à°°à±Šà°«à±ˆà°²à±" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:114 -#, fuzzy +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" -msgstr "అవతారపౠతాజాకరణ విఫలమైంది." +msgstr "à°’à°• అవతారానà±à°¨à°¿ à°Žà°•à±à°•à°¿à°‚à°šà°‚à°¡à°¿" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" -msgstr "" +msgstr "మీ సంకేతపదానà±à°¨à°¿ మారà±à°šà±à°•à±‹à°‚à°¡à°¿" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" -msgstr "" +msgstr "రూపà±à°°à±‡à°–à°²à±" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "వాడà±à°•à°°à°¿à°•à°¿ à°ªà±à°°à±Šà°«à±ˆà°²à± లేదà±." @@ -3265,7 +3292,7 @@ msgstr "వాడà±à°•à°°à°¿à°•à°¿ à°ªà±à°°à±Šà°«à±ˆà°²à± లేదà±." msgid "Other" msgstr "ఇతర" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "ఇతర ఎంపికలà±" @@ -3324,9 +3351,8 @@ msgid "Logout from the site" msgstr "" #: lib/action.php:450 -#, fuzzy msgid "Create an account" -msgstr "కొతà±à°¤ ఖాతా సృషà±à°Ÿà°¿à°‚à°šà±à°•à±‹à°‚à°¡à°¿" +msgstr "కొతà±à°¤ ఖాతా సృషà±à°Ÿà°¿à°‚à°šà±" #: lib/action.php:453 msgid "Login to the site" @@ -3373,13 +3399,12 @@ msgid "About" msgstr "à°—à±à°°à°¿à°‚à°šà°¿" #: lib/action.php:723 -#, fuzzy msgid "FAQ" -msgstr "తవసం" +msgstr "à°ªà±à°°à°¶à±à°¨à°²à±" #: lib/action.php:727 msgid "TOS" -msgstr "" +msgstr "సేవా నియమాలà±" #: lib/action.php:730 msgid "Privacy" @@ -3438,7 +3463,7 @@ msgstr "" #: lib/action.php:1053 msgid "Pagination" -msgstr "" +msgstr "పేజీకరణ" #: lib/action.php:1062 msgid "After" @@ -3510,6 +3535,9 @@ msgid "" "Subscribers: %2$s\n" "Notices: %3$s" msgstr "" +"చందాలà±: %1$s\n" +"చందాదారà±à°²à±: %2$s\n" +"నోటీసà±à°²à±: %3$s" #: lib/command.php:152 lib/command.php:400 msgid "Notice with that id does not exist" @@ -3656,20 +3684,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:189 #, fuzzy msgid "No configuration file found. " msgstr "నిరà±à°§à°¾à°°à°£ సంకేతం లేదà±." -#: lib/common.php:192 +#: lib/common.php:190 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:191 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:192 msgid "Go to the installer." msgstr "" @@ -3691,7 +3719,7 @@ msgstr "" #: lib/designsettings.php:101 msgid "Change background image" -msgstr "" +msgstr "నేపథà±à°¯ à°šà°¿à°¤à±à°°à°¾à°¨à±à°¨à°¿ మారà±à°šà±" #: lib/designsettings.php:105 #, fuzzy @@ -3701,7 +3729,7 @@ msgstr "à°Žà°—à±à°®à°¤à°¿à°‚à°šà±" #: lib/designsettings.php:109 msgid "" "You can upload your personal background image. The maximum file size is 2Mb." -msgstr "" +msgstr "మీ à°¸à±à°µà°‚à°¤ నేపథà±à°¯à°ªà± à°šà°¿à°¤à±à°°à°¾à°¨à±à°¨à°¿ మీరౠఎకà±à°•à°¿à°‚చవచà±à°šà±. à°—à°°à°¿à°·à±à° ఫైలౠపరిమాణం 2మెబై." #: lib/designsettings.php:139 msgid "On" @@ -3733,18 +3761,16 @@ msgid "Content" msgstr "à°…à°¨à±à°¸à°‚ధానించà±" #: lib/designsettings.php:204 -#, fuzzy msgid "Sidebar" -msgstr "వెతà±à°•à±" +msgstr "పకà±à°•à°ªà°Ÿà±à°Ÿà±€" #: lib/designsettings.php:217 msgid "Text" msgstr "పాఠà±à°¯à°‚" #: lib/designsettings.php:230 -#, fuzzy msgid "Links" -msgstr "à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà°‚à°¡à°¿" +msgstr "లంకెలà±" #: lib/designsettings.php:247 msgid "Use defaults" @@ -3760,7 +3786,7 @@ msgstr "" #: lib/designsettings.php:257 msgid "Save design" -msgstr "" +msgstr "రూపà±à°°à±‡à°–లని à°à°¦à±à°°à°ªà°°à°šà±" #: lib/designsettings.php:372 msgid "Bad default color settings: " @@ -3867,9 +3893,9 @@ msgid "Blocked" msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ వాడà±à°•à°°à°¿ లేరà±." #: lib/groupnav.php:102 -#, fuzzy, php-format +#, php-format msgid "%s blocked users" -msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ వాడà±à°•à°°à°¿ లేరà±." +msgstr "%s నిరోధిత వాడà±à°•à°°à±à°²à±" #: lib/groupnav.php:108 #, php-format @@ -3892,11 +3918,11 @@ msgstr "" #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" -msgstr "" +msgstr "à°Žà°•à±à°•à±à°µà°®à°‚ది à°¸à°à±à°¯à±à°²à±à°¨à±à°¨ à°—à±à°‚à°ªà±à°²à±" #: lib/groupsbypostssection.php:71 msgid "Groups with most posts" -msgstr "" +msgstr "à°Žà°•à±à°•à±à°µ టపాలà±à°¨à±à°¨ à°—à±à°‚à°ªà±à°²à±" #: lib/grouptagcloudsection.php:56 #, php-format @@ -3935,27 +3961,24 @@ msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ సందేశమేమీ లేదà±." #: lib/imagefile.php:150 lib/imagefile.php:197 msgid "Unknown file type" -msgstr "" +msgstr "తెలియని ఫైలౠరకం" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "కొతà±à°¤ సందేశం" +msgid "[%s]" +msgstr "[%s]" #: lib/joinform.php:114 -#, fuzzy msgid "Join" -msgstr "à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà°‚à°¡à°¿" +msgstr "చేరà±" #: lib/leaveform.php:114 -#, fuzzy msgid "Leave" -msgstr "à°à°¦à±à°°à°ªà°°à°šà±" +msgstr "వైదొలగà±" #: lib/logingroupnav.php:80 -#, fuzzy msgid "Login with a username and password" -msgstr "వాడà±à°•à°°à°¿à°ªà±‡à°°à± లేదా సంకేతపదం తపà±à°ªà±." +msgstr "వాడà±à°•à°°à°¿à°ªà±‡à°°à± మరియౠసంకేతపదాలతో à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà°‚à°¡à°¿" #: lib/logingroupnav.php:86 #, fuzzy @@ -3973,9 +3996,8 @@ msgid "" msgstr "" #: lib/mailbox.php:227 lib/noticelist.php:424 -#, fuzzy msgid "from" -msgstr " à°¨à±à°‚à°¡à°¿ " +msgstr "à°¨à±à°‚à°¡à°¿" #: lib/mail.php:172 msgid "Email address confirmation" @@ -4024,9 +4046,9 @@ msgid "Location: %s\n" msgstr "à°ªà±à°°à°¾à°‚తం: %s\n" #: lib/mail.php:255 -#, fuzzy, php-format +#, php-format msgid "Homepage: %s\n" -msgstr "హోమౠపేజీ\n" +msgstr "హోమౠపేజీ: %s\n" #: lib/mail.php:257 #, php-format @@ -4060,7 +4082,7 @@ msgstr "%s à°¸à±à°¥à°¿à°¤à°¿" #: lib/mail.php:438 msgid "SMS confirmation" -msgstr "" +msgstr "SMS నిరà±à°§à°¾à°°à°£" #: lib/mail.php:462 #, php-format @@ -4086,7 +4108,7 @@ msgstr "" #: lib/mail.php:509 #, php-format msgid "New private message from %s" -msgstr "" +msgstr "%s à°¨à±à°‚à°¡à°¿ కొతà±à°¤ అంతరంగిక సందేశం" #: lib/mail.php:513 #, php-format @@ -4215,9 +4237,8 @@ msgid "To" msgstr "" #: lib/messageform.php:162 lib/noticeform.php:173 -#, fuzzy msgid "Available characters" -msgstr "6 లేదా అంతకంటే à°Žà°•à±à°•à±à°µ à°…à°•à±à°·à°°à°¾à°²à±" +msgstr "à°…à°‚à°¦à±à°¬à°¾à°Ÿà±à°²à±‹ ఉనà±à°¨ à°…à°•à±à°·à°°à°¾à°²à±" #: lib/noticeform.php:145 #, fuzzy @@ -4235,7 +4256,7 @@ msgstr "జోడించà±" #: lib/noticeform.php:184 msgid "Attach a file" -msgstr "" +msgstr "à°’à°• ఫైలà±à°¨à°¿ జోడించà±" #: lib/noticelist.php:478 #, fuzzy @@ -4244,12 +4265,11 @@ msgstr "విషయం లేదà±!" #: lib/noticelist.php:498 msgid "Reply to this notice" -msgstr "" +msgstr "à°ˆ నోటీసà±à°ªà±ˆ à°¸à±à°ªà°‚దించండి" #: lib/noticelist.php:499 -#, fuzzy msgid "Reply" -msgstr "à°¸à±à°ªà°‚దించà±" +msgstr "à°¸à±à°ªà°‚దించండి" #: lib/nudgeform.php:116 msgid "Nudge this user" @@ -4335,9 +4355,8 @@ msgid "Subscribers" msgstr "చందాదారà±à°²à±" #: lib/profileaction.php:157 -#, fuzzy msgid "All subscribers" -msgstr "చందాదారà±à°²à±" +msgstr "అందరౠచందాదారà±à°²à±" #: lib/profileaction.php:177 #, fuzzy @@ -4362,16 +4381,15 @@ msgstr "వాడà±à°•à°°à°¿ à°—à±à°‚à°ªà±à°²à±" #: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85 msgid "Recent tags" -msgstr "" +msgstr "ఇటీవలి à°Ÿà±à°¯à°¾à°—à±à°²à±" #: lib/publicgroupnav.php:88 msgid "Featured" -msgstr "" +msgstr "విశేషం" #: lib/publicgroupnav.php:92 -#, fuzzy msgid "Popular" -msgstr "à°µà±à°¯à°•à±à°¤à±à°² à°…à°¨à±à°µà±‡à°·à°£" +msgstr "à°ªà±à°°à°¾à°šà±à°°à±à°¯à°‚" #: lib/searchaction.php:120 #, fuzzy @@ -4410,7 +4428,7 @@ msgstr "" #: lib/section.php:106 msgid "More..." -msgstr "" +msgstr "మరింత..." #: lib/subgroupnav.php:83 #, php-format @@ -4459,8 +4477,9 @@ msgid "Could not subscribe other to you." msgstr "" #: lib/subs.php:124 -msgid "Not subscribed!." -msgstr "" +#, fuzzy +msgid "Not subscribed!" +msgstr "చందాదారà±à°²à±" #: lib/subs.php:136 msgid "Couldn't delete subscription." @@ -4468,7 +4487,7 @@ msgstr "చందాని తొలగించలేకపోయాం." #: lib/tagcloudsection.php:56 msgid "None" -msgstr "" +msgstr "à°à°®à±€à°²à±‡à°¦à±" #: lib/topposterssection.php:74 msgid "Top posters" @@ -4483,9 +4502,8 @@ msgid "Unsubscribe" msgstr "" #: lib/userprofile.php:116 -#, fuzzy msgid "Edit Avatar" -msgstr "అవతారం" +msgstr "అవతారానà±à°¨à°¿ మారà±à°šà±" #: lib/userprofile.php:236 msgid "User actions" @@ -4498,7 +4516,7 @@ msgstr "à°«à±à°°à±Šà°«à±ˆà°²à± అమరికలà±" #: lib/userprofile.php:249 msgid "Edit" -msgstr "" +msgstr "మారà±à°šà±" #: lib/userprofile.php:272 msgid "Send a direct message to this user" @@ -4508,47 +4526,47 @@ msgstr "" msgid "Message" msgstr "సందేశం" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "కొనà±à°¨à°¿ à°•à±à°·à°£à°¾à°² à°•à±à°°à°¿à°¤à°‚" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "à°“ నిమిషం à°•à±à°°à°¿à°¤à°‚" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "%d నిమిషాల à°•à±à°°à°¿à°¤à°‚" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "à°’à°• à°—à°‚à°Ÿ à°•à±à°°à°¿à°¤à°‚" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "%d à°—à°‚à°Ÿà°² à°•à±à°°à°¿à°¤à°‚" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "à°“ రోజౠకà±à°°à°¿à°¤à°‚" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "%d రోజà±à°² à°•à±à°°à°¿à°¤à°‚" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "à°“ నెల à°•à±à°°à°¿à°¤à°‚" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "%d నెలల à°•à±à°°à°¿à°¤à°‚" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "à°’à°• సంవతà±à°¸à°°à°‚ à°•à±à°°à°¿à°¤à°‚" @@ -4568,7 +4586,7 @@ msgstr "" #: scripts/maildaemon.php:53 msgid "Not a registered user." -msgstr "" +msgstr "నమోదైన వాడà±à°•à°°à°¿ కాదà±." #: scripts/maildaemon.php:57 msgid "Sorry, that is not your incoming email address." diff --git a/locale/tr/LC_MESSAGES/statusnet.mo b/locale/tr/LC_MESSAGES/statusnet.mo Binary files differindex 49093b4dc..1ee9548bc 100644 --- a/locale/tr/LC_MESSAGES/statusnet.mo +++ b/locale/tr/LC_MESSAGES/statusnet.mo diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index c25d1a8a6..cd84e1bd9 100644 --- a/locale/tr/LC_MESSAGES/statusnet.po +++ b/locale/tr/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:50+0000\n" +"POT-Creation-Date: 2009-11-13 20:42+0000\n" +"PO-Revision-Date: 2009-11-13 20:43:28+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: tr\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "Böyle bir durum mesajı yok." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -106,35 +109,42 @@ msgstr "%s ve arkadaÅŸları" msgid "Updates from %1$s and friends on %2$s!" msgstr "" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." +msgstr "Onay kodu bulunamadı." -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Kullanıcı güncellenemedi." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -142,12 +152,33 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Kullanıcı güncellenemedi." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "Kullanıcının profili yok." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Profil kaydedilemedi." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "" @@ -194,6 +225,23 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -390,18 +438,18 @@ msgstr "Avatar güncellendi." msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" "Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?" -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -486,7 +534,7 @@ msgid "Invalid size." msgstr "Geçersiz büyüklük." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" @@ -535,7 +583,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1641,7 +1689,7 @@ msgid "Nickname" msgstr "Takma ad" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Parola" @@ -1779,7 +1827,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1824,8 +1872,8 @@ msgstr "BaÄŸlan" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "" @@ -1846,11 +1894,15 @@ msgstr "Ayarlar" msgid "Manage various other options." msgstr "" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "" @@ -1886,66 +1938,62 @@ msgstr "" msgid "Change password" msgstr "Parolayı deÄŸiÅŸtir" -#: actions/passwordsettings.php:70 -msgid "You are not allowed to change your password" -msgstr "" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 #, fuzzy msgid "Change your password." msgstr "Parolayı deÄŸiÅŸtir" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Parola kaydedildi." -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Eski parola" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Yeni parola" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 veya daha fazla karakter" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Onayla" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "yukaridaki parola ile aynı" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "DeÄŸiÅŸtir" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Parolalar birbirini tutmuyor." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Eski parola yanlış" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Kullanıcıyı kaydetmede hata oluÅŸtu; geçersiz." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Yeni parola kaydedilemedi." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Parola kaydedildi." @@ -2388,7 +2436,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Eposta" @@ -3285,37 +3333,37 @@ msgstr "Durum mesajını kaydederken hata oluÅŸtu." msgid "DB error inserting reply: %s" msgstr "Cevap eklenirken veritabanı hatası: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 #, fuzzy msgid "Upload an avatar" msgstr "Avatar güncellemede hata." -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "Kullanıcının profili yok." @@ -3324,7 +3372,7 @@ msgstr "Kullanıcının profili yok." msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "" @@ -3721,20 +3769,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:189 #, fuzzy msgid "No configuration file found. " msgstr "Onay kodu yok." -#: lib/common.php:192 +#: lib/common.php:190 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:191 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:192 msgid "Go to the installer." msgstr "" @@ -4009,8 +4057,8 @@ msgstr "" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "Yeni durum mesajı" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 #, fuzzy @@ -4532,7 +4580,8 @@ msgid "Could not subscribe other to you." msgstr "" #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "Bu kullanıcıyı zaten takip etmiyorsunuz!" #: lib/subs.php:136 @@ -4581,47 +4630,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "birkaç saniye önce" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "yaklaşık bir dakika önce" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "yaklaşık %d dakika önce" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "yaklaşık bir saat önce" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "yaklaşık %d saat önce" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "yaklaşık bir gün önce" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "yaklaşık %d gün önce" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "yaklaşık bir ay önce" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "yaklaşık %d ay önce" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "yaklaşık bir yıl önce" diff --git a/locale/uk/LC_MESSAGES/statusnet.mo b/locale/uk/LC_MESSAGES/statusnet.mo Binary files differindex e7e6fe0ea..fa541313f 100644 --- a/locale/uk/LC_MESSAGES/statusnet.mo +++ b/locale/uk/LC_MESSAGES/statusnet.mo diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index a1a002b85..3c803427b 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:53+0000\n" +"POT-Creation-Date: 2009-11-13 20:42+0000\n" +"PO-Revision-Date: 2009-11-13 20:43:31+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "Такого тегу немає." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -106,35 +109,42 @@ msgstr "%s з друзÑми" msgid "Updates from %1$s and friends on %2$s!" msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ %1$s та друзів на %2$s!" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "API метод не знайдено!" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Цей метод потребує ÐÐПИСÐТИ." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Ðе вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ кориÑтувача." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -142,12 +152,34 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "Ðе маю можливоÑÑ‚Ñ– зберегти ваші Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¢Ð²Ñ–Ñ‚Ñ‚ÐµÑ€Ð°!" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Ðе вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ кориÑтувача." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "КориÑтувач не має профілю." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Ðе вдалоÑÑ Ð·Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ профіль." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "Спроба заблокувати кориÑтувача невдала." @@ -194,6 +226,23 @@ msgstr "ПрÑме Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð¾ %s" msgid "All the direct messages sent to %s" msgstr "Ð’ÑÑ– прÑмі Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð½Ð°Ð´Ñ–Ñлані до %s" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "API метод не знайдено!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -390,17 +439,17 @@ msgstr "Ðватару оновлено." msgid "No status with that ID found." msgstr "Ðе знайдено жодних ÑтатуÑів з таким ID." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Ðадто довго. МакÑимальний розмір Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ 140 знаків." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "Ðе знайдено" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -484,7 +533,7 @@ msgid "Invalid size." msgstr "ÐедійÑний розмір." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Ðватара" @@ -532,7 +581,7 @@ msgstr "Ð’Ñ‚Ñти" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1683,7 +1732,7 @@ msgid "Nickname" msgstr "Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Пароль" @@ -1824,7 +1873,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1871,8 +1920,8 @@ msgstr "З'єднаннÑ" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Такий формат даних не підтримуєтьÑÑ." @@ -1892,11 +1941,15 @@ msgstr "Інші опції" msgid "Manage various other options." msgstr "ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð´ÐµÑкими іншими опціÑми" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "СервіÑи доÑтупні Ð´Ð»Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑтаннÑ" @@ -1933,65 +1986,60 @@ msgstr "" msgid "Change password" msgstr "Змінити пароль" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Змінити ваш пароль" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 msgid "Change your password." msgstr "Змінити пароль." -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "Пароль замінено" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Старий пароль" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Ðовий пароль" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 або більше знаків" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Підтвердити" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "такий Ñамо, Ñк Ñ– пароль вище" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Змінити" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Пароль має ÑкладатиÑÑŒ з 6-ти або більше знаків." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Паролі не Ñпівпадають." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Старий пароль неточний" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Помилка при збереженні кориÑтувача; недійÑний." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Ðе можна зберегти новий пароль." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Пароль збережено." @@ -2439,7 +2487,7 @@ msgid "Same as password above. Required." msgstr "Такий Ñамо, Ñк Ñ– пароль вище. Ðеодмінно." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Пошта" @@ -3371,36 +3419,36 @@ msgstr "Проблема при збереженні повідомленнÑ." msgid "DB error inserting reply: %s" msgstr "Помилка бази даних при додаванні відповіді: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð¾ %1$s на %2$s" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Профіль" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Змінити Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¾Ñ„Ñ–Ð»ÑŽ" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð°Ð²Ð°Ñ‚Ð°Ñ€Ð¸" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Змінити ваш пароль" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Змінити електронну адреÑу вручну" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "Профіль кориÑтувача." @@ -3409,7 +3457,7 @@ msgstr "Профіль кориÑтувача." msgid "Other" msgstr "Інше" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Інші опції" @@ -3799,20 +3847,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:189 #, fuzzy msgid "No configuration file found. " msgstr "Ðемає коду підтвердженнÑ." -#: lib/common.php:192 +#: lib/common.php:190 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:191 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:192 #, fuzzy msgid "Go to the installer." msgstr "Увійти на Ñайт" @@ -4081,8 +4129,8 @@ msgstr "Тип файлу не підтримуєтьÑÑ" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "Ðове повідомленнÑ" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 msgid "Join" @@ -4605,7 +4653,8 @@ msgid "Could not subscribe other to you." msgstr "Ðе вдалоÑÑ Ð¿Ñ–Ð´Ð¿Ð¸Ñати іншого до ваÑ." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "Ðе підпиÑано!." #: lib/subs.php:136 @@ -4654,47 +4703,47 @@ msgstr "ÐадіÑлати прÑме Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ñ†ÑŒÐ¾Ð¼Ñƒ кор msgid "Message" msgstr "ПовідомленнÑ" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "мить тому" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "хвилину тому" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "близько %d хвилин тому" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "годину тому" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "близько %d годин тому" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "день тому" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "близько %d днів тому" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "міÑÑць тому" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "близько %d міÑÑців тому" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "рік тому" diff --git a/locale/vi/LC_MESSAGES/statusnet.mo b/locale/vi/LC_MESSAGES/statusnet.mo Binary files differindex bb42fbee7..1b6b7f268 100644 --- a/locale/vi/LC_MESSAGES/statusnet.mo +++ b/locale/vi/LC_MESSAGES/statusnet.mo diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index f1b61c263..0c6fd586b 100644 --- a/locale/vi/LC_MESSAGES/statusnet.po +++ b/locale/vi/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:55+0000\n" +"POT-Creation-Date: 2009-11-13 20:42+0000\n" +"PO-Revision-Date: 2009-11-13 20:43:33+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: vi\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "Không có tin nhắn nà o." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -106,35 +109,42 @@ msgstr "%s và bạn bè" msgid "Updates from %1$s and friends on %2$s!" msgstr "" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "PhÆ°Æ¡ng thức API không tìm thấy!" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "PhÆ°Æ¡ng thức nà y yêu cầu là POST." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Không thể cáºp nháºt thà nh viên." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -142,12 +152,34 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "Không thể lÆ°u thông tin Twitter của bạn!" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Không thể cáºp nháºt thà nh viên." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "NgÆ°á»i dùng không có thông tin." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Không thể lÆ°u hồ sÆ¡ cá nhân." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "" @@ -195,6 +227,23 @@ msgstr "Tin nhắn riêng" msgid "All the direct messages sent to %s" msgstr "" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "PhÆ°Æ¡ng thức API không tìm thấy!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -393,17 +442,17 @@ msgstr "Hình đại diện đã được cáºp nháºt." msgid "No status with that ID found." msgstr "Không tìm thấy trạng thái nà o tÆ°Æ¡ng ứng vá»›i ID đó." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Quá dà i. Tối Ä‘a là 140 ký tá»±." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "Không tìm thấy" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -488,7 +537,7 @@ msgid "Invalid size." msgstr "KÃch thÆ°á»›c không hợp lệ." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Hình đại diện" @@ -541,7 +590,7 @@ msgstr "Nhóm" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1719,7 +1768,7 @@ msgid "Nickname" msgstr "Biệt danh" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Máºt khẩu" @@ -1861,7 +1910,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1908,8 +1957,8 @@ msgstr "Kết nối" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Không há»— trợ định dạng dữ liệu nà y." @@ -1931,11 +1980,15 @@ msgstr "Thiết láºp tà i khoản Twitter" msgid "Manage various other options." msgstr "" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "" @@ -1973,68 +2026,63 @@ msgstr "" msgid "Change password" msgstr "Äổi máºt khẩu" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Thay đổi máºt khẩu của bạn" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 #, fuzzy msgid "Change your password." msgstr "Thay đổi máºt khẩu của bạn" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Äã lÆ°u máºt khẩu." -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Máºt khẩu cÅ©" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Máºt khẩu má»›i" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "Nhiá»u hÆ¡n 6 ký tá»±" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Xác nháºn" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "cùng máºt khẩu ở trên" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Thay đổi" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 #, fuzzy msgid "Password must be 6 or more characters." msgstr "Máºt khẩu phải nhiá»u hÆ¡n 6 ký tá»±." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Máºt khẩu không khá»›p." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Máºt khẩu cÅ© sai" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Lá»—i xảy ra khi lÆ°u thà nh viên; không hợp lệ." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Không thể lÆ°u máºt khẩu má»›i" -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Äã lÆ°u máºt khẩu." @@ -2480,7 +2528,7 @@ msgid "Same as password above. Required." msgstr "Cùng máºt khẩu ở trên. Bắt buá»™c." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Email" @@ -3420,37 +3468,37 @@ msgstr "Có lá»—i xảy ra khi lÆ°u tin nhắn." msgid "DB error inserting reply: %s" msgstr "Lá»—i cÆ¡ sở dữ liệu khi chèn trả lá»i: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "%s chà o mừng bạn " -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Hồ sÆ¡ " -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Thay đổi các thiết láºp trong hồ sÆ¡ cá nhân của bạn" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 #, fuzzy msgid "Upload an avatar" msgstr "Cáºp nháºt hình đại diện không thà nh công." -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Thay đổi máºt khẩu của bạn" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Äang thá»±c hiện việc thay đổi email" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "Hồ sÆ¡" @@ -3460,7 +3508,7 @@ msgstr "Hồ sÆ¡" msgid "Other" msgstr "Sau" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "" @@ -3869,20 +3917,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:189 #, fuzzy msgid "No configuration file found. " msgstr "Không có mã số xác nháºn." -#: lib/common.php:192 +#: lib/common.php:190 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:191 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:192 msgid "Go to the installer." msgstr "" @@ -4166,8 +4214,8 @@ msgstr "Không há»— trợ kiểu file ảnh nà y." #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "Thông báo má»›i" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 #, fuzzy @@ -4362,6 +4410,20 @@ msgid "" "With kind regards,\n" "%5$s\n" msgstr "" +"%1$s (%2$s) đã gá»i đến bạn tin nhắn riêng:\n" +"\n" +"------------------------------------------------------\n" +"%3$s\n" +"------------------------------------------------------\n" +"\n" +"Bạn có thể trả lá»i tại:\n" +"\n" +"%4$s\n" +"\n" +"Äừng trả lá»i lại thÆ° nà y; sẽ không có ai nháºn thÆ°.\n" +"\n" +"Chúc sức khá»e,\n" +"%5$s\n" #: lib/mail.php:554 #, fuzzy, php-format @@ -4735,7 +4797,8 @@ msgid "Could not subscribe other to you." msgstr "Không thể tạo favorite." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "ChÆ°a đăng nháºn!" #: lib/subs.php:136 @@ -4789,47 +4852,47 @@ msgstr "Bạn đã theo những ngÆ°á»i nà y:" msgid "Message" msgstr "Tin má»›i nhất" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "và i giây trÆ°á»›c" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "1 phút trÆ°á»›c" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "%d phút trÆ°á»›c" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "1 giá» trÆ°á»›c" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "%d giá» trÆ°á»›c" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "1 ngà y trÆ°á»›c" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "%d ngà y trÆ°á»›c" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "1 tháng trÆ°á»›c" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "%d tháng trÆ°á»›c" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "1 năm trÆ°á»›c" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.mo b/locale/zh_CN/LC_MESSAGES/statusnet.mo Binary files differindex f3b08115d..18493304d 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.mo +++ b/locale/zh_CN/LC_MESSAGES/statusnet.mo diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index 1a5c6d5ba..d64c07436 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.po +++ b/locale/zh_CN/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:58+0000\n" +"POT-Creation-Date: 2009-11-13 20:42+0000\n" +"PO-Revision-Date: 2009-11-13 20:43:36+0000\n" "Language-Team: Simplified Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hans\n" "X-Message-Group: out-statusnet\n" @@ -27,12 +27,15 @@ msgid "No such page" msgstr "未找到æ¤æ¶ˆæ¯ã€‚" #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -111,35 +114,42 @@ msgstr "%s åŠå¥½å‹" msgid "Updates from %1$s and friends on %2$s!" msgstr "%2$s 上 %1$s 和好å‹çš„æ›´æ–°ï¼" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "API 方法未实现ï¼" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "æ¤æ–¹æ³•æŽ¥å—POST请求。" +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "æ— æ³•æ›´æ–°ç”¨æˆ·ã€‚" + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -147,12 +157,34 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "æ— æ³•ä¿å˜ Twitter 设置ï¼" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "æ— æ³•æ›´æ–°ç”¨æˆ·ã€‚" + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "用户没有个人信æ¯ã€‚" +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "æ— æ³•ä¿å˜ä¸ªäººä¿¡æ¯ã€‚" + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "阻æ¢ç”¨æˆ·å¤±è´¥ã€‚" @@ -198,6 +230,23 @@ msgstr "å‘ç»™ %s 的直接消æ¯" msgid "All the direct messages sent to %s" msgstr "å‘ç»™ %s 的直接消æ¯" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "API 方法未实现ï¼" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -393,17 +442,17 @@ msgstr "头åƒå·²æ›´æ–°ã€‚" msgid "No status with that ID found." msgstr "没有找到æ¤IDçš„ä¿¡æ¯ã€‚" -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "超出长度é™åˆ¶ã€‚ä¸èƒ½è¶…过 140 个å—符。" -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "未找到" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -488,7 +537,7 @@ msgid "Invalid size." msgstr "大å°ä¸æ£ç¡®ã€‚" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "头åƒ" @@ -537,7 +586,7 @@ msgstr "剪è£" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1677,7 +1726,7 @@ msgid "Nickname" msgstr "昵称" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "密ç " @@ -1811,7 +1860,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1856,8 +1905,8 @@ msgstr "连接" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "ä¸æ”¯æŒçš„æ•°æ®æ ¼å¼ã€‚" @@ -1878,11 +1927,15 @@ msgstr "Twitter 设置" msgid "Manage various other options." msgstr "管ç†å…¶ä»–选项。" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "è¦ä½¿ç”¨çš„自动缩çŸæœåŠ¡ã€‚" @@ -1918,67 +1971,62 @@ msgstr "这是您的å‘件箱，包å«æ‚¨å‘é€çš„ç§äººæ¶ˆæ¯ã€‚" msgid "Change password" msgstr "修改密ç " -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "修改密ç " - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 #, fuzzy msgid "Change your password." msgstr "修改密ç " -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "密ç å·²ä¿å˜ã€‚" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "旧密ç " -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "新密ç " -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 个或更多å—符" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "确认" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "相åŒçš„密ç " -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "修改" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "密ç å¿…é¡»åŒ…å« 6 个或更多å—符。" -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "密ç ä¸åŒ¹é…。" -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "旧密ç ä¸æ£ç¡®" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "ä¿å˜ç”¨æˆ·æ—¶å‡ºé”™ï¼›ä¸æ£ç¡®ã€‚" -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "æ— æ³•ä¿å˜æ–°å¯†ç 。" -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "密ç å·²ä¿å˜ã€‚" @@ -2416,7 +2464,7 @@ msgid "Same as password above. Required." msgstr "相åŒçš„密ç 。æ¤é¡¹å¿…填。" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "电å邮件" @@ -3345,36 +3393,36 @@ msgstr "ä¿å˜é€šå‘Šæ—¶å‡ºé”™ã€‚" msgid "DB error inserting reply: %s" msgstr "æ·»åŠ å›žå¤æ—¶æ•°æ®åº“出错：%s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "å‘é€ç»™ %1$s çš„ %2$s 消æ¯" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "个人信æ¯" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "修改您的个人信æ¯" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "上载一个头åƒã€‚" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "修改密ç " -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "修改电å邮件" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "用户没有个人信æ¯ã€‚" @@ -3383,7 +3431,7 @@ msgstr "用户没有个人信æ¯ã€‚" msgid "Other" msgstr "其他" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "其他选项" @@ -3782,20 +3830,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:189 #, fuzzy msgid "No configuration file found. " msgstr "没有验è¯ç " -#: lib/common.php:192 +#: lib/common.php:190 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:191 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:192 #, fuzzy msgid "Go to the installer." msgstr "登入本站" @@ -4073,8 +4121,8 @@ msgstr "未知文件类型" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "新通告" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 #, fuzzy @@ -4610,7 +4658,8 @@ msgid "Could not subscribe other to you." msgstr "æ— æ³•è®¢é˜…ä»–äººæ›´æ–°ã€‚" #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "未订阅ï¼" #: lib/subs.php:136 @@ -4665,47 +4714,47 @@ msgstr "æ— æ³•å‘æ¤ç”¨æˆ·å‘é€æ¶ˆæ¯ã€‚" msgid "Message" msgstr "新消æ¯" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "å‡ ç§’å‰" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "一分钟å‰" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "%d 分钟å‰" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "一å°æ—¶å‰" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "%d å°æ—¶å‰" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "一天å‰" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "%d 天å‰" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "一个月å‰" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "%d 个月å‰" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "一年å‰" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.mo b/locale/zh_TW/LC_MESSAGES/statusnet.mo Binary files differindex 36cdef3ba..d9cef9e4e 100644 --- a/locale/zh_TW/LC_MESSAGES/statusnet.mo +++ b/locale/zh_TW/LC_MESSAGES/statusnet.mo diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index 0843684be..3bc2ebbd6 100644 --- a/locale/zh_TW/LC_MESSAGES/statusnet.po +++ b/locale/zh_TW/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 21:00:00+0000\n" +"POT-Creation-Date: 2009-11-13 20:42+0000\n" +"PO-Revision-Date: 2009-11-13 20:43: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(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hant\n" "X-Message-Group: out-statusnet\n" @@ -27,12 +27,15 @@ msgid "No such page" msgstr "ç„¡æ¤é€šçŸ¥" #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -111,35 +114,42 @@ msgstr "%s與好å‹" msgid "Updates from %1$s and friends on %2$s!" msgstr "" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." +msgstr "確èªç¢¼éºå¤±" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "無法更新使用者" + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -147,12 +157,33 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "無法更新使用者" + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "" +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "無法儲å˜å€‹äººè³‡æ–™" + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "" @@ -198,6 +229,23 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -391,17 +439,17 @@ msgstr "更新個人圖åƒ" msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -485,7 +533,7 @@ msgid "Invalid size." msgstr "尺寸錯誤" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "個人圖åƒ" @@ -534,7 +582,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1619,7 +1667,7 @@ msgid "Nickname" msgstr "暱稱" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "" @@ -1748,7 +1796,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1793,8 +1841,8 @@ msgstr "連çµ" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "" @@ -1815,11 +1863,15 @@ msgstr "線上å³æ™‚通è¨å®š" msgid "Manage various other options." msgstr "" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "" @@ -1854,65 +1906,61 @@ msgstr "" msgid "Change password" msgstr "更改密碼" -#: actions/passwordsettings.php:70 -msgid "You are not allowed to change your password" -msgstr "" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 #, fuzzy msgid "Change your password." msgstr "更改密碼" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "新密碼" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6個以上å—å…ƒ" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "確èª" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "更改" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "" -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "舊密碼錯誤" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "儲å˜ä½¿ç”¨è€…發生錯誤;使用者å稱無效" -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "無法å˜å–新密碼" -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "" @@ -2341,7 +2389,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "é›»åä¿¡ç®±" @@ -3226,37 +3274,37 @@ msgstr "" msgid "DB error inserting reply: %s" msgstr "å¢žåŠ å›žè¦†æ™‚,資料庫發生錯誤: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 #, fuzzy msgid "Upload an avatar" msgstr "無法上傳個人圖åƒ" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "ç„¡æ¤é€šçŸ¥" @@ -3265,7 +3313,7 @@ msgstr "ç„¡æ¤é€šçŸ¥" msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "" @@ -3655,20 +3703,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:189 #, fuzzy msgid "No configuration file found. " msgstr "無確èªç¢¼" -#: lib/common.php:192 +#: lib/common.php:190 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:191 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:192 msgid "Go to the installer." msgstr "" @@ -3937,9 +3985,9 @@ msgid "Unknown file type" msgstr "" #: lib/jabber.php:192 -#, fuzzy, php-format -msgid "notice id: %s" -msgstr "新訊æ¯" +#, php-format +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 #, fuzzy @@ -4456,8 +4504,9 @@ msgid "Could not subscribe other to you." msgstr "" #: lib/subs.php:124 -msgid "Not subscribed!." -msgstr "" +#, fuzzy +msgid "Not subscribed!" +msgstr "æ¤å¸³è™Ÿå·²è¨»å†Š" #: lib/subs.php:136 msgid "Couldn't delete subscription." @@ -4505,47 +4554,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "" diff --git a/plugins/Auth/AuthPlugin.php b/plugins/Auth/AuthPlugin.php deleted file mode 100644 index cb52730f6..000000000 --- a/plugins/Auth/AuthPlugin.php +++ /dev/null @@ -1,172 +0,0 @@ -<?php -/** - * StatusNet, the distributed open-source microblogging tool - * - * Superclass for plugins that do authentication and/or authorization - * - * PHP version 5 - * - * LICENCE: This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - * @category Plugin - * @package StatusNet - * @author Craig Andrews <candrews@integralblue.com> - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ - */ - -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); -} - -/** - * Superclass for plugins that do authentication - * - * @category Plugin - * @package StatusNet - * @author Craig Andrews <candrews@integralblue.com> - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ - */ - -abstract class AuthPlugin extends Plugin -{ - //is this plugin authoritative for authentication? - public $authn_authoritative = false; - - //should accounts be automatically created after a successful login attempt? - public $autoregistration = false; - - //can the user change their email address - public $email_changeable=true; - - //can the user change their email address - public $password_changeable=true; - - //------------Auth plugin should implement some (or all) of these methods------------\\ - /** - * Check if a nickname/password combination is valid - * @param nickname - * @param password - * @return boolean true if the credentials are valid, false if they are invalid. - */ - function checkPassword($nickname, $password) - { - return false; - } - - /** - * Automatically register a user when they attempt to login with valid credentials. - * User::register($data) is a very useful method for this implementation - * @param nickname - * @return boolean true if the user was created, false if autoregistration is not allowed, null if this plugin is not responsible for this nickname - */ - function autoRegister($nickname) - { - return null; - } - - /** - * Change a user's password - * The old password has been verified to be valid by this plugin before this call is made - * @param nickname - * @param oldpassword - * @param newpassword - * @return boolean true if the password was changed, false if password changing failed for some reason, null if this plugin is not responsible for this nickname - */ - function changePassword($nickname,$oldpassword,$newpassword) - { - return null; - } - - /** - * Can a user change this field in his own profile? - * @param nickname - * @param field - * @return boolean true if the field can be changed, false if not allowed to change it, null if this plugin is not responsible for this nickname - */ - function canUserChangeField($nickname, $field) - { - return null; - } - - //------------Below are the methods that connect StatusNet to the implementing Auth plugin------------\\ - function __construct() - { - parent::__construct(); - } - - function StartCheckPassword($nickname, $password, &$authenticatedUser){ - if($this->password_changeable){ - $authenticated = $this->checkPassword($nickname, $password); - if($authenticated){ - $authenticatedUser = User::staticGet('nickname', $nickname); - if(!$authenticatedUser && $this->autoregistration){ - if($this->autoregister($nickname)){ - $authenticatedUser = User::staticGet('nickname', $nickname); - } - } - return false; - }else{ - if($this->authn_authoritative){ - return false; - } - } - //we're not authoritative, so let other handlers try - }else{ - if($this->authn_authoritative){ - //since we're authoritative, no other plugin could do this - throw new Exception(_('Password changing is not allowed')); - } - } - } - - function onStartChangePassword($nickname,$oldpassword,$newpassword) - { - if($this->password_changeable){ - $authenticated = $this->checkPassword($nickname, $oldpassword); - if($authenticated){ - $result = $this->changePassword($nickname,$oldpassword,$newpassword); - if($result){ - //stop handling of other handlers, because what was requested was done - return false; - }else{ - throw new Exception(_('Password changing failed')); - } - }else{ - if($this->authn_authoritative){ - //since we're authoritative, no other plugin could do this - throw new Exception(_('Password changing failed')); - }else{ - //let another handler try - return null; - } - } - }else{ - if($this->authn_authoritative){ - //since we're authoritative, no other plugin could do this - throw new Exception(_('Password changing is not allowed')); - } - } - } - - function onStartAccountSettingsPasswordMenuItem($widget) - { - if($this->authn_authoritative && !$this->password_changeable){ - //since we're authoritative, no other plugin could change passwords, so do render the menu item - return false; - } - } -} - diff --git a/plugins/Authentication/AuthenticationPlugin.php b/plugins/Authentication/AuthenticationPlugin.php new file mode 100644 index 000000000..a76848b04 --- /dev/null +++ b/plugins/Authentication/AuthenticationPlugin.php @@ -0,0 +1,226 @@ +<?php +/** + * StatusNet, the distributed open-source microblogging tool + * + * Superclass for plugins that do authentication and/or authorization + * + * PHP version 5 + * + * LICENCE: This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * @category Plugin + * @package StatusNet + * @author Craig Andrews <candrews@integralblue.com> + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +/** + * Superclass for plugins that do authentication + * + * @category Plugin + * @package StatusNet + * @author Craig Andrews <candrews@integralblue.com> + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +abstract class AuthenticationPlugin extends Plugin +{ + //is this plugin authoritative for authentication? + public $authoritative = false; + + //should accounts be automatically created after a successful login attempt? + public $autoregistration = false; + + //can the user change their email address + public $password_changeable=true; + + //unique name for this authentication provider + public $provider_name; + + //------------Auth plugin should implement some (or all) of these methods------------\\ + /** + * Check if a nickname/password combination is valid + * @param username + * @param password + * @return boolean true if the credentials are valid, false if they are invalid. + */ + function checkPassword($username, $password) + { + return false; + } + + /** + * Automatically register a user when they attempt to login with valid credentials. + * User::register($data) is a very useful method for this implementation + * @param username + * @return mixed instance of User, or false (if user couldn't be created) + */ + function autoRegister($username) + { + $registration_data = array(); + $registration_data['nickname'] = $username ; + return User::register($registration_data); + } + + /** + * Change a user's password + * The old password has been verified to be valid by this plugin before this call is made + * @param username + * @param oldpassword + * @param newpassword + * @return boolean true if the password was changed, false if password changing failed for some reason + */ + function changePassword($username,$oldpassword,$newpassword) + { + return false; + } + + //------------Below are the methods that connect StatusNet to the implementing Auth plugin------------\\ + function onInitializePlugin(){ + if(!isset($this->provider_name)){ + throw new Exception("must specify a provider_name for this authentication provider"); + } + } + + function onStartCheckPassword($nickname, $password, &$authenticatedUser){ + //map the nickname to a username + $user_username = new User_username(); + $user_username->username=$nickname; + $user_username->provider_name=$this->provider_name; + if($user_username->find() && $user_username->fetch()){ + $username = $user_username->username; + $authenticated = $this->checkPassword($username, $password); + if($authenticated){ + $authenticatedUser = User::staticGet('id', $user_username->user_id); + return false; + } + }else{ + $user = User::staticGet('nickname', $nickname); + if($user){ + //make sure a different provider isn't handling this nickname + $user_username = new User_username(); + $user_username->username=$nickname; + if(!$user_username->find()){ + //no other provider claims this username, so it's safe for us to handle it + $authenticated = $this->checkPassword($nickname, $password); + if($authenticated){ + $authenticatedUser = User::staticGet('nickname', $nickname); + User_username::register($authenticatedUser,$nickname,$this->provider_name); + return false; + } + } + }else{ + if($this->autoregistration){ + $authenticated = $this->checkPassword($nickname, $password); + if($authenticated){ + $user = $this->autoregister($nickname); + if($user){ + $authenticatedUser = $user; + User_username::register($authenticatedUser,$nickname,$this->provider_name); + return false; + } + } + } + } + } + if($this->authoritative){ + return false; + }else{ + //we're not authoritative, so let other handlers try + return; + } + } + + function onStartChangePassword($user,$oldpassword,$newpassword) + { + if($this->password_changeable){ + $user_username = new User_username(); + $user_username->user_id=$user->id; + $user_username->provider_name=$this->provider_name; + if($user_username->find() && $user_username->fetch()){ + $authenticated = $this->checkPassword($user_username->username, $oldpassword); + if($authenticated){ + $result = $this->changePassword($user_username->username,$oldpassword,$newpassword); + if($result){ + //stop handling of other handlers, because what was requested was done + return false; + }else{ + throw new Exception(_('Password changing failed')); + } + }else{ + if($this->authoritative){ + //since we're authoritative, no other plugin could do this + throw new Exception(_('Password changing failed')); + }else{ + //let another handler try + return null; + } + } + } + }else{ + if($this->authoritative){ + //since we're authoritative, no other plugin could do this + throw new Exception(_('Password changing is not allowed')); + } + } + } + + function onStartAccountSettingsPasswordMenuItem($widget) + { + if($this->authoritative && !$this->password_changeable){ + //since we're authoritative, no other plugin could change passwords, so do not render the menu item + return false; + } + } + + function onAutoload($cls) + { + switch ($cls) + { + case 'User_username': + require_once(INSTALLDIR.'/plugins/Authentication/User_username.php'); + return false; + default: + return true; + } + } + + function onCheckSchema() { + $schema = Schema::get(); + $schema->ensureTable('user_username', + array(new ColumnDef('provider_name', 'varchar', + '255', false, 'PRI'), + new ColumnDef('username', 'varchar', + '255', false, 'PRI'), + new ColumnDef('user_id', 'integer', + null, false), + new ColumnDef('created', 'datetime', + null, false), + new ColumnDef('modified', 'timestamp'))); + return true; + } + + function onUserDeleteRelated($user, &$tables) + { + $tables[] = 'User_username'; + return true; + } +} + diff --git a/plugins/Authentication/User_username.php b/plugins/Authentication/User_username.php new file mode 100644 index 000000000..f30f60d83 --- /dev/null +++ b/plugins/Authentication/User_username.php @@ -0,0 +1,46 @@ +<?php +/** + * Table Definition for user_username + */ +require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; + +class User_username extends Memcached_DataObject +{ + ###START_AUTOCODE + /* the code below is auto generated do not remove the above tag */ + + public $__table = 'user_username'; // table name + public $user_id; // int(4) not_null + public $provider_name; // varchar(255) primary_key not_null + public $username; // varchar(255) primary_key not_null + public $created; // datetime() not_null + public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP + + /* Static get */ + function staticGet($k,$v=null) + { return Memcached_DataObject::staticGet('User_username',$k,$v); } + + /* the code above is auto generated do not remove the tag below */ + ###END_AUTOCODE + + /** + * Register a user with a username on a given provider + * @param User User object + * @param string username on the given provider + * @param provider_name string name of the provider + * @return mixed User_username instance if the registration succeeded, false if it did not + */ + static function register($user, $username, $provider_name) + { + $user_username = new User_username(); + $user_username->user_id = $user->id; + $user_username->provider_name = $provider_name; + $user_username->username = $username; + $user_username->created = DB_DataObject_Cast::dateTime(); + if($user_username->insert()){ + return $user_username; + }else{ + return false; + } + } +} diff --git a/plugins/BitlyUrl/BitlyUrlPlugin.php b/plugins/BitlyUrl/BitlyUrlPlugin.php index 478ef99d2..65d0f70e6 100644 --- a/plugins/BitlyUrl/BitlyUrlPlugin.php +++ b/plugins/BitlyUrl/BitlyUrlPlugin.php @@ -31,31 +31,24 @@ if (!defined('STATUSNET')) { exit(1); } -class BitlyUrlPlugin extends Plugin +require_once INSTALLDIR.'/plugins/UrlShortener/UrlShortenerPlugin.php'; + +class BitlyUrlPlugin extends UrlShortenerPlugin { - function __construct() - { - parent::__construct(); - } + public $serviceUrl; function onInitializePlugin(){ - $this->registerUrlShortener( - 'bit.ly', - array(), - array('BitlyUrl',array('http://bit.ly/api?method=shorten&long_url=')) - ); + parent::onInitializePlugin(); + if(!isset($this->serviceUrl)){ + throw new Exception("must specify a serviceUrl"); + } } -} -class BitlyUrl extends ShortUrlApi -{ - protected function shorten_imp($url) { + protected function shorten($url) { $response = $this->http_get($url); - if(!$response){ - return $url; - }else{ - return current(json_decode($response)->results)->hashUrl; - } + if(!$response) return; + return current(json_decode($response)->results)->hashUrl; } } + diff --git a/plugins/EmailAuthentication/EmailAuthenticationPlugin.php b/plugins/EmailAuthentication/EmailAuthenticationPlugin.php new file mode 100644 index 000000000..25e537735 --- /dev/null +++ b/plugins/EmailAuthentication/EmailAuthenticationPlugin.php @@ -0,0 +1,54 @@ +<?php +/** + * StatusNet, the distributed open-source microblogging tool + * + * Plugin that uses the email address as a username, and checks the password as normal + * + * PHP version 5 + * + * LICENCE: This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * @category Plugin + * @package StatusNet + * @author Craig Andrews <candrews@integralblue.com> + * @copyright 2009 Craig Andrews http://candrews.integralblue.com + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +class EmailAuthenticationPlugin extends Plugin +{ + //---interface implementation---// + + function onStartCheckPassword($nickname, $password, &$authenticatedUser) + { + if(strpos($nickname, '@')) + { + $user = User::staticGet('email',$nickname); + if($user && isset($user->email)) + { + if(common_check_user($user->nickname,$password)) + { + $authenticatedUser = $user; + return false; + } + } + } + } +} + diff --git a/plugins/EmailAuthentication/README b/plugins/EmailAuthentication/README new file mode 100644 index 000000000..320815689 --- /dev/null +++ b/plugins/EmailAuthentication/README @@ -0,0 +1,7 @@ +The Email Authentication plugin allows users to login using their email address. + +The provided email address is used to lookup the user's nickname, then that nickname and the provided password is checked. + +Installation +============ +add "addPlugin('emailAuthentication');" to the bottom of your config.php diff --git a/plugins/Facebook/facebookaction.php b/plugins/Facebook/facebookaction.php index a10fdf90d..c852bbf5e 100644 --- a/plugins/Facebook/facebookaction.php +++ b/plugins/Facebook/facebookaction.php @@ -382,8 +382,7 @@ class FacebookAction extends Action { // Does a little before-after block for next/prev page if ($have_before || $have_after) { - $this->elementStart('div', array('class' => 'pagination')); - $this->elementStart('dl', null); + $this->elementStart('dl', 'pagination'); $this->element('dt', null, _('Pagination')); $this->elementStart('dd', null); $this->elementStart('ul', array('class' => 'nav')); @@ -408,7 +407,6 @@ class FacebookAction extends Action $this->elementEnd('ul'); $this->elementEnd('dd'); $this->elementEnd('dl'); - $this->elementEnd('div'); } } diff --git a/plugins/Facebook/facebookhome.php b/plugins/Facebook/facebookhome.php index 91c0cc6b8..ea141c2c2 100644 --- a/plugins/Facebook/facebookhome.php +++ b/plugins/Facebook/facebookhome.php @@ -244,8 +244,7 @@ class FacebookhomeAction extends FacebookAction // XXX: Fix so this uses common_local_url() if possible. if ($have_before || $have_after) { - $this->elementStart('div', array('class' => 'pagination')); - $this->elementStart('dl', null); + $this->elementStart('dl', 'pagination'); $this->element('dt', null, _('Pagination')); $this->elementStart('dd', null); $this->elementStart('ul', array('class' => 'nav')); @@ -270,7 +269,6 @@ class FacebookhomeAction extends FacebookAction $this->elementEnd('ul'); $this->elementEnd('dd'); $this->elementEnd('dl'); - $this->elementEnd('div'); } } diff --git a/plugins/InfiniteScroll/infinitescroll.js b/plugins/InfiniteScroll/infinitescroll.js index ae4d53d09..0dafef6d5 100644 --- a/plugins/InfiniteScroll/infinitescroll.js +++ b/plugins/InfiniteScroll/infinitescroll.js @@ -2,14 +2,20 @@ jQuery(document).ready(function($){ $('notices_primary').infinitescroll({ debug: true, infiniteScroll : false, - nextSelector : "li.nav_next a", + nextSelector : 'body#public li.nav_next a,'+ + 'body#all li.nav_next a,'+ + 'body#showstream li.nav_next a,'+ + 'body#replies li.nav_next a,'+ + 'body#showfavorites li.nav_next a,'+ + 'body#showgroup li.nav_next a,'+ + 'body#favorited li.nav_next a', loadingImg : $('address .url')[0].href+'plugins/InfiniteScroll/ajax-loader.gif', text : "<em>Loading the next set of posts...</em>", donetext : "<em>Congratulations, you\'ve reached the end of the Internet.</em>", - navSelector : "div.pagination", + navSelector : ".pagination", contentSelector : "#notices_primary ol.notices", itemSelector : "#notices_primary ol.notices li" },function(){ - NoticeAttachments(); + SN.Init.Notices(); }); }); diff --git a/plugins/Ldap/LdapPlugin.php b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php index 88ca92b37..865154730 100644 --- a/plugins/Ldap/LdapPlugin.php +++ b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php @@ -31,10 +31,10 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/plugins/Auth/AuthPlugin.php'; +require_once INSTALLDIR.'/plugins/Authentication/AuthenticationPlugin.php'; require_once 'Net/LDAP2.php'; -class LdapPlugin extends AuthPlugin +class LdapAuthenticationPlugin extends AuthenticationPlugin { public $host=null; public $port=null; @@ -48,20 +48,31 @@ class LdapPlugin extends AuthPlugin public $scope=null; public $attributes=array(); - function __construct() - { - parent::__construct(); + function onInitializePlugin(){ + parent::onInitializePlugin(); + if(!isset($this->host)){ + throw new Exception("must specify a host"); + } + if(!isset($this->basedn)){ + throw new Exception("must specify a basedn"); + } + if(!isset($this->attributes['nickname'])){ + throw new Exception("must specify a nickname attribute"); + } + if(!isset($this->attributes['username'])){ + throw new Exception("must specify a username attribute"); + } } //---interface implementation---// - function checkPassword($nickname, $password) + function checkPassword($username, $password) { $ldap = $this->ldap_get_connection(); if(!$ldap){ return false; } - $entry = $this->ldap_get_user($nickname); + $entry = $this->ldap_get_user($username); if(!$entry){ return false; }else{ @@ -76,59 +87,33 @@ class LdapPlugin extends AuthPlugin } } - function autoRegister($nickname) + function autoRegister($username) { - $attributes=array(); - $config_attributes = array('nickname','email','fullname','homepage','location'); - foreach($config_attributes as $config_attribute){ - $value = common_config('ldap', $config_attribute.'_attribute'); - if($value!==false){ - array_push($attributes,$value); - } - } - $entry = $this->ldap_get_user($nickname,$attributes); + $entry = $this->ldap_get_user($username,$this->attributes); if($entry){ $registration_data = array(); - foreach($config_attributes as $config_attribute){ - $value = common_config('ldap', $config_attribute.'_attribute'); - if($value!==false){ - if($config_attribute=='email'){ - $registration_data[$config_attribute]=common_canonical_email($entry->getValue($value,'single')); - }else if($config_attribute=='nickname'){ - $registration_data[$config_attribute]=common_canonical_nickname($entry->getValue($value,'single')); - }else{ - $registration_data[$config_attribute]=$entry->getValue($value,'single'); - } - } + foreach($this->attributes as $sn_attribute=>$ldap_attribute){ + $registration_data[$sn_attribute]=$entry->getValue($ldap_attribute,'single'); + } + if(isset($registration_data['email']) && !empty($registration_data['email'])){ + $registration_data['email_confirmed']=true; } //set the database saved password to a random string. $registration_data['password']=common_good_rand(16); - $user = User::register($registration_data); - return true; + return User::register($registration_data); }else{ //user isn't in ldap, so we cannot register him - return null; + return false; } } - function changePassword($nickname,$oldpassword,$newpassword) + function changePassword($username,$oldpassword,$newpassword) { //TODO implement this throw new Exception(_('Sorry, changing LDAP passwords is not supported at this time')); return false; } - - function canUserChangeField($nickname, $field) - { - switch($field) - { - case 'password': - case 'nickname': - case 'email': - return false; - } - } //---utility functions---// function ldap_get_config(){ @@ -170,7 +155,7 @@ class LdapPlugin extends AuthPlugin */ function ldap_get_user($username,$attributes=array()){ $ldap = $this->ldap_get_connection(); - $filter = Net_LDAP2_Filter::create(common_config('ldap','nickname_attribute'), 'equals', $username); + $filter = Net_LDAP2_Filter::create($this->attributes['username'], 'equals', $username); $options = array( 'scope' => 'sub', 'attributes' => $attributes diff --git a/plugins/Ldap/README b/plugins/LdapAuthentication/README index 063286cef..b10a1eb93 100644 --- a/plugins/Ldap/README +++ b/plugins/LdapAuthentication/README @@ -1,12 +1,13 @@ -The LDAP plugin allows for StatusNet to handle authentication, authorization, and user information through LDAP. +The LDAP Authentication plugin allows for StatusNet to handle authentication through LDAP. Installation ============ -add "addPlugin('ldap', array('setting'=>'value', 'setting2'=>'value2', ...);" to the bottom of your config.php +add "addPlugin('ldapAuthentication', array('setting'=>'value', 'setting2'=>'value2', ...);" to the bottom of your config.php Settings ======== -authn_authoritative (false): Set to true if LDAP's responses are authoritative (meaning if LDAP fails, do check the any other plugins or the internal password database). +provider_name*: a unique name for this authentication provider. +authoritative (false): Set to true if LDAP's responses are authoritative (meaning if LDAP fails, do check any other plugins or the internal password database). autoregistration (false): Set to true if users should be automatically created when they attempt to login. email_changeable (true): Are users allowed to change their email address? (true or false) password_changeable (true): Are users allowed to change their passwords? (true or false) @@ -23,6 +24,7 @@ filter: Default search filter. See http://pear.php.net/manual/en/package.network scope: Default search scope. See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php attributes: an array with the key being the StatusNet user attribute name, and the value the LDAP attribute name + username* nickname* email fullname @@ -36,8 +38,9 @@ Example ======= Here's an example of an LDAP plugin configuration that connects to Microsoft Active Directory. -addPlugin('ldap', array( - 'authn_authoritative'=>true, +addPlugin('ldapAuthentication', array( + 'provider_name'=>'Example', + 'authoritative'=>true, 'autoregistration'=>true, 'binddn'=>'username', 'bindpw'=>'password', diff --git a/plugins/LilUrl/LilUrlPlugin.php b/plugins/LilUrl/LilUrlPlugin.php index 852253b02..e906751e8 100644 --- a/plugins/LilUrl/LilUrlPlugin.php +++ b/plugins/LilUrl/LilUrlPlugin.php @@ -31,37 +31,31 @@ if (!defined('STATUSNET')) { exit(1); } -require_once(INSTALLDIR.'/lib/Shorturl_api.php'); +require_once INSTALLDIR.'/plugins/UrlShortener/UrlShortenerPlugin.php'; -class LilUrlPlugin extends Plugin +class LilUrlPlugin extends UrlShortenerPlugin { - function __construct() - { - parent::__construct(); - } + public $serviceUrl; function onInitializePlugin(){ - $this->registerUrlShortener( - 'ur1.ca', - array('freeService'=>true), - array('LilUrl',array('http://ur1.ca/')) - ); + parent::onInitializePlugin(); + if(!isset($this->serviceUrl)){ + throw new Exception("must specify a serviceUrl"); + } } -} -class LilUrl extends ShortUrlApi -{ - protected function shorten_imp($url) { - $data['longurl'] = $url; - $response = $this->http_post($data); - if (!$response) return $url; - $y = @simplexml_load_string($response); - if (!isset($y->body)) return $url; + protected function shorten($url) { + $data = array('longurl' => $url); + + $responseBody = $this->http_post($this->serviceUrl,$data); + + if (!$responseBody) return; + $y = @simplexml_load_string($responseBody); + if (!isset($y->body)) return; $x = $y->body->p[0]->a->attributes(); if (isset($x['href'])) { - common_log(LOG_INFO, __CLASS__ . ": shortened $url to $x[href]"); return $x['href']; } - return $url; } } + diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php index e4aed2ddb..55c0eadaf 100644 --- a/plugins/OpenID/OpenIDPlugin.php +++ b/plugins/OpenID/OpenIDPlugin.php @@ -302,6 +302,7 @@ class OpenIDPlugin extends Plugin function onUserDeleteRelated($user, &$tables) { $tables[] = 'User_openid'; + $tables[] = 'User_openid_trustroot'; return true; } } diff --git a/plugins/OpenID/openid.php b/plugins/OpenID/openid.php index ff7a93899..dd628e773 100644 --- a/plugins/OpenID/openid.php +++ b/plugins/OpenID/openid.php @@ -280,6 +280,11 @@ class AutosubmitAction extends Action function showContent() { $this->raw($this->form_html); + } + + function showScripts() + { + parent::showScripts(); $this->element('script', null, '$(document).ready(function() { ' . ' $(\'#'. $this->form_id .'\').submit(); '. diff --git a/plugins/PtitUrl/PtitUrlPlugin.php b/plugins/PtitUrl/PtitUrlPlugin.php index f00d3e2f2..ef453e96d 100644 --- a/plugins/PtitUrl/PtitUrlPlugin.php +++ b/plugins/PtitUrl/PtitUrlPlugin.php @@ -30,33 +30,28 @@ if (!defined('STATUSNET')) { exit(1); } +require_once INSTALLDIR.'/plugins/UrlShortener/UrlShortenerPlugin.php'; -class PtitUrlPlugin extends Plugin +class PtitUrlPlugin extends UrlShortenerPlugin { - function __construct() - { - parent::__construct(); - } + public $serviceUrl; function onInitializePlugin(){ - $this->registerUrlShortener( - 'ptiturl.com', - array(), - array('PtitUrl',array('http://ptiturl.com/?creer=oui&action=Reduire&url=')) - ); + parent::onInitializePlugin(); + if(!isset($this->serviceUrl)){ + throw new Exception("must specify a serviceUrl"); + } } -} -class PtitUrl extends ShortUrlApi -{ - protected function shorten_imp($url) { - $response = $this->http_get($url); - if (!$response) return $url; + protected function shorten($url) + { + $response = $this->http_get(sprintf($this->serviceUrl,urlencode($url))); + if (!$response) return; $response = $this->tidy($response); $y = @simplexml_load_string($response); - if (!isset($y->body)) return $url; + if (!isset($y->body)) return; $xml = $y->body->center->table->tr->td->pre->a->attributes(); if (isset($xml['href'])) return $xml['href']; - return $url; } } + diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js index ca6ea891a..9b9991b9e 100644 --- a/plugins/Realtime/realtimeupdate.js +++ b/plugins/Realtime/realtimeupdate.js @@ -45,15 +45,9 @@ RealtimeUpdate = { DT = document.title; $(window).blur(function() { - $('#notices_primary .notice').css({ - 'border-top-color':$('#notices_primary .notice:last').css('border-top-color'), - 'border-top-style':'dotted' - }); + $('#notices_primary .notice').removeClass('mark-top'); - $('#notices_primary .notice:first').css({ - 'border-top-color':'#AAAAAA', - 'border-top-style':'solid' - }); + $('#notices_primary .notice:first').addClass('mark-top'); RealtimeUpdate._updatecounter = 0; document.title = DT; @@ -163,12 +157,14 @@ RealtimeUpdate = { addPopup: function(url, timeline, iconurl) { - $('#notices_primary').css({'position':'relative'}); - $('#notices_primary').prepend('<button id="realtime_timeline" title="Pop up in a window">Pop up</button>'); + var NP = $('#notices_primary'); + NP.css({'position':'relative'}); + NP.prepend('<button id="realtime_timeline" title="Pop up in a window">Pop up</button>'); - $('#realtime_timeline').css({ + var RT = $('#realtime_timeline'); + RT.css({ 'margin':'0 0 11px 0', - 'background':'transparent url('+ iconurl + ') no-repeat 0% 30%', + 'background':'transparent url('+ iconurl + ') no-repeat 0 30%', 'padding':'0 0 0 20px', 'display':'block', 'position':'absolute', @@ -176,15 +172,16 @@ RealtimeUpdate = { 'right':'0', 'border':'none', 'cursor':'pointer', - 'color':$("a").css("color"), + 'color':$('a').css('color'), 'font-weight':'bold', 'font-size':'1em' }); + $('#showstream #notices_primary').css({'margin-top':'18px'}); - $('#realtime_timeline').click(function() { + RT.click(function() { window.open(url, timeline, - 'toolbar=no,resizable=yes,scrollbars=yes,status=yes'); + 'toolbar=no,resizable=yes,scrollbars=yes,status=yes,width=500,height=550'); return false; }); @@ -192,7 +189,6 @@ RealtimeUpdate = { initPopupWindow: function() { - window.resizeTo(500, 550); $('address').hide(); $('#content').css({'width':'93.5%'}); diff --git a/plugins/ReverseUsernameAuthentication/README b/plugins/ReverseUsernameAuthentication/README new file mode 100644 index 000000000..e9160ed9b --- /dev/null +++ b/plugins/ReverseUsernameAuthentication/README @@ -0,0 +1,26 @@ +The Reverse Username Authentication plugin allows for StatusNet to handle authentication by checking if the provided password is the same as the reverse of the username. + +THIS PLUGIN IS FOR TESTING PURPOSES ONLY + +Installation +============ +add "addPlugin('reverseUsernameAuthentication', array('setting'=>'value', 'setting2'=>'value2', ...);" to the bottom of your config.php + +Settings +======== +provider_name*: a unique name for this authentication provider. +password_changeable*: must be set to false. This plugin does not support changing passwords. +authoritative (false): Set to true if this plugin's responses are authoritative (meaning if this fails, do check any other plugins or the internal password database). +autoregistration (false): Set to true if users should be automatically created when they attempt to login. + +* required +default values are in (parenthesis) + +Example +======= +addPlugin('reverseUsernameAuthentication', array( + 'provider_name'=>'Example', + 'password_changeable'=>false, + 'authoritative'=>true, + 'autoregistration'=>true +)); diff --git a/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php b/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php new file mode 100644 index 000000000..d48283b2e --- /dev/null +++ b/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php @@ -0,0 +1,58 @@ +<?php +/** + * StatusNet, the distributed open-source microblogging tool + * + * Plugin that checks if the password is the reverse of username + * + * PHP version 5 + * + * LICENCE: This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * @category Plugin + * @package StatusNet + * @author Craig Andrews <candrews@integralblue.com> + * @copyright 2009 Craig Andrews http://candrews.integralblue.com + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +require_once INSTALLDIR.'/plugins/Authentication/AuthenticationPlugin.php'; + +class ReverseUsernameAuthenticationPlugin extends AuthenticationPlugin +{ + //---interface implementation---// + + function onInitializePlugin(){ + parent::onInitializePlugin(); + if(!isset($this->password_changeable) && $this->password_changeable){ + throw new Exception("password_changeable cannot be set to true. This plugin does not support changing passwords."); + } + } + + function checkPassword($username, $password) + { + return $username == strrev($password); + } + + function autoRegister($username) + { + $registration_data = array(); + $registration_data['nickname'] = $username ; + return User::register($registration_data); + } +} diff --git a/plugins/SimpleUrl/SimpleUrlPlugin.php b/plugins/SimpleUrl/SimpleUrlPlugin.php index d59d63e47..45b745b07 100644 --- a/plugins/SimpleUrl/SimpleUrlPlugin.php +++ b/plugins/SimpleUrl/SimpleUrlPlugin.php @@ -31,40 +31,21 @@ if (!defined('STATUSNET')) { exit(1); } -class SimpleUrlPlugin extends Plugin +require_once INSTALLDIR.'/plugins/UrlShortener/UrlShortenerPlugin.php'; + +class SimpleUrlPlugin extends UrlShortenerPlugin { - function __construct() - { - parent::__construct(); - } + public $serviceUrl; function onInitializePlugin(){ - $this->registerUrlShortener( - 'is.gd', - array(), - array('SimpleUrl',array('http://is.gd/api.php?longurl=')) - ); - $this->registerUrlShortener( - 'snipr.com', - array(), - array('SimpleUrl',array('http://snipr.com/site/snip?r=simple&link=')) - ); - $this->registerUrlShortener( - 'metamark.net', - array(), - array('SimpleUrl',array('http://metamark.net/api/rest/simple?long_url=')) - ); - $this->registerUrlShortener( - 'tinyurl.com', - array(), - array('SimpleUrl',array('http://tinyurl.com/api-create.php?url=')) - ); + parent::onInitializePlugin(); + if(!isset($this->serviceUrl)){ + throw new Exception("must specify a serviceUrl"); + } } -} -class SimpleUrl extends ShortUrlApi -{ - protected function shorten_imp($url) { - return $this->http_get($url); + protected function shorten($url) { + return $this->http_get(sprintf($this->serviceUrl,urlencode($url))); } } + diff --git a/plugins/TightUrl/TightUrlPlugin.php b/plugins/TightUrl/TightUrlPlugin.php index 48efb355f..56414c8c8 100644 --- a/plugins/TightUrl/TightUrlPlugin.php +++ b/plugins/TightUrl/TightUrlPlugin.php @@ -31,32 +31,27 @@ if (!defined('STATUSNET')) { exit(1); } -class TightUrlPlugin extends Plugin +require_once INSTALLDIR.'/plugins/UrlShortener/UrlShortenerPlugin.php'; + +class TightUrlPlugin extends UrlShortenerPlugin { - function __construct() - { - parent::__construct(); - } + public $serviceUrl; function onInitializePlugin(){ - $this->registerUrlShortener( - '2tu.us', - array('freeService'=>true), - array('TightUrl',array('http://2tu.us/?save=y&url=')) - ); + parent::onInitializePlugin(); + if(!isset($this->serviceUrl)){ + throw new Exception("must specify a serviceUrl"); + } } -} -class TightUrl extends ShortUrlApi -{ - protected function shorten_imp($url) { - $response = $this->http_get($url); - if (!$response) return $url; + protected function shorten($url) + { + $response = $this->http_get(sprintf($this->serviceUrl,urlencode($url))); + if (!$response) return; $response = $this->tidy($response); $y = @simplexml_load_string($response); - if (!isset($y->body)) return $url; + if (!isset($y->body)) return; $xml = $y->body->p[0]->code[0]->a->attributes(); if (isset($xml['href'])) return $xml['href']; - return $url; } } diff --git a/plugins/UrlShortener/UrlShortenerPlugin.php b/plugins/UrlShortener/UrlShortenerPlugin.php new file mode 100644 index 000000000..37206aa89 --- /dev/null +++ b/plugins/UrlShortener/UrlShortenerPlugin.php @@ -0,0 +1,103 @@ +<?php +/** + * StatusNet, the distributed open-source microblogging tool + * + * Superclass for plugins that do URL shortening + * + * PHP version 5 + * + * LICENCE: This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * @category Plugin + * @package StatusNet + * @author Craig Andrews <candrews@integralblue.com> + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +/** + * Superclass for plugins that do URL shortening + * + * @category Plugin + * @package StatusNet + * @author Craig Andrews <candrews@integralblue.com> + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +abstract class UrlShortenerPlugin extends Plugin +{ + public $shortenerName; + public $freeService=false; + //------------Url Shortener plugin should implement some (or all) of these methods------------\\ + + /** + * Short a URL + * @param url + * @return string shortened version of the url, or null if URL shortening failed + */ + protected abstract function shorten($url); + + //------------These methods may help you implement your plugin------------\\ + protected function http_get($url) + { + $request = HTTPClient::start(); + $response = $request->get($url); + return $response->getBody(); + } + + protected function http_post($url,$data) + { + $request = HTTPClient::start(); + $response = $request->post($url, null, $data); + return $response->getBody(); + } + + protected function tidy($response) { + $response = str_replace(' ', ' ', $response); + $config = array('output-xhtml' => true); + $tidy = new tidy; + $tidy->parseString($response, $config, 'utf8'); + $tidy->cleanRepair(); + return (string)$tidy; + } + //------------Below are the methods that connect StatusNet to the implementing Url Shortener plugin------------\\ + + function onInitializePlugin(){ + if(!isset($this->shortenerName)){ + throw new Exception("must specify a shortenerName"); + } + } + + function onGetUrlShorteners(&$shorteners) + { + $shorteners[$this->shortenerName]=array('freeService'=>$this->freeService); + } + + function onStartShortenUrl($url,$shortenerName,&$shortenedUrl) + { + if($shortenerName == $this->shortenerName && strlen($url) >= common_config('site', 'shorturllength')){ + $result = $this->shorten($url); + if(isset($result) && $result != null && $result !== false){ + $shortenedUrl=$result; + common_log(LOG_INFO, __CLASS__ . ": $this->shortenerName shortened $url to $shortenedUrl"); + return false; + } + } + } +} diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php index fe4a74869..6410ee1ce 100644 --- a/plugins/UserFlag/UserFlagPlugin.php +++ b/plugins/UserFlag/UserFlagPlugin.php @@ -140,4 +140,12 @@ class UserFlagPlugin extends Plugin return true; } + + function onEndShowScripts($action) + { + $action->elementStart('script', array('type' => 'text/javascript')); + $action->raw('/*<![CDATA[*/ SN.U.FormXHR($(".form_entity_flag")); /*]]>*/'); + $action->elementEnd('script'); + return true; + } } diff --git a/plugins/UserFlag/flagprofile.php b/plugins/UserFlag/flagprofile.php index c72b74c6a..77c86b233 100644 --- a/plugins/UserFlag/flagprofile.php +++ b/plugins/UserFlag/flagprofile.php @@ -108,7 +108,21 @@ class FlagprofileAction extends Action parent::handle($args); $this->flagProfile(); - $this->returnTo(); + + if ($this->boolean('ajax')) { + header('Content-Type: text/xml;charset=utf-8'); + $this->xw->startDocument('1.0', 'UTF-8'); + $this->elementStart('html'); + $this->elementStart('head'); + $this->element('title', null, _('Flagged for review')); + $this->elementEnd('head'); + $this->elementStart('body'); + $this->element('p', 'flagged', _('Flagged')); + $this->elementEnd('body'); + $this->elementEnd('html'); + } else { + $this->returnTo(); + } } function title() { diff --git a/plugins/UserFlag/flagprofileform.php b/plugins/UserFlag/flagprofileform.php index 0811dbb9d..a8396e2d5 100644 --- a/plugins/UserFlag/flagprofileform.php +++ b/plugins/UserFlag/flagprofileform.php @@ -94,7 +94,7 @@ class FlagProfileForm extends Form function formClass() { - return 'form_profile_flag'; + return 'form_entity_flag'; } /** diff --git a/scripts/xmppconfirmhandler.php b/scripts/xmppconfirmhandler.php index c7ed15e49..2e3974136 100755 --- a/scripts/xmppconfirmhandler.php +++ b/scripts/xmppconfirmhandler.php @@ -34,8 +34,6 @@ require_once INSTALLDIR.'/scripts/commandline.inc'; require_once INSTALLDIR . '/lib/jabber.php'; require_once INSTALLDIR . '/lib/xmppqueuehandler.php'; -define('CLAIM_TIMEOUT', 1200); - class XmppConfirmHandler extends XmppQueueHandler { var $_id = 'confirm'; diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php index b2efc07c3..e52e2a6af 100755 --- a/scripts/xmppdaemon.php +++ b/scripts/xmppdaemon.php @@ -187,7 +187,7 @@ class XMPPDaemon extends Daemon return; } if ($this->handle_command($user, $pl['body'])) { - $this->log(LOG_INFO, "Command messag by $from handled."); + $this->log(LOG_INFO, "Command message by $from handled."); return; } else if ($this->is_autoreply($pl['body'])) { $this->log(LOG_INFO, 'Ignoring auto reply from ' . $from); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index cdc17d67f..1be66fe5a 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -839,6 +839,10 @@ margin-left:2%; width:98%; float:left; } +.mark-top { +border-top-width:1px; +border-top-style:solid; +} /* NOTICES */ #notices_primary { diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 4e3bc5980..94bef339f 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -178,6 +178,11 @@ background-color:rgba(255, 255, 255, 0.7); #site_nav_local_views .current a { text-shadow: rgba(194,194,194,0.5) 1px 1px 1px; } +.processing { +background-image:url(../../base/images/icons/icon_processing.gif); +background-repeat:no-repeat; +background-position:47% 47%; +} .error { background-color:#F7E8E8; @@ -330,3 +335,17 @@ background-position:10% -187px; .pagination .nav_next a { background-position:105% -252px; } +.pagination .nav .processing { +background-image:url(../../base/images/icons/icon_processing.gif); +box-shadow:none; +-moz-box-shadow:none; +-webkit-box-shadow:none; +outline:none; +} +.pagination .nav_next a.processing { +background-position:90% 47%; +} +.pagination .nav_prev a.processing { +background-position:10% 47%; +} + |