From 0d8e9faaa182c4923eec6d329773516e81c7edf9 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 11 Nov 2009 12:21:18 +0000 Subject: Added mark-top styles --- theme/base/css/display.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 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 { -- cgit v1.2.3-54-g00ecf From d6cd083946be96bcfc64329fc0bfdd28261c82ef Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 11 Nov 2009 12:21:27 +0000 Subject: Using mark-top styles --- plugins/Realtime/realtimeupdate.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js index ca6ea891a..a2af4007b 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:first').css({ - 'border-top-color':'#AAAAAA', - 'border-top-style':'solid' - }); + $('#notices_primary .notice').removeClass('mark-top'); + + $('#notices_primary .notice:first').addClass('mark-top'); RealtimeUpdate._updatecounter = 0; document.title = DT; -- cgit v1.2.3-54-g00ecf From 37c62c6356af22a7b1eb444b241083d9fa53166e Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Wed, 11 Nov 2009 13:24:02 +0100 Subject: Remove double space in message --- actions/noticesearch.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/noticesearch.php b/actions/noticesearch.php index 79cf572cc..b68a2efe2 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'); -- cgit v1.2.3-54-g00ecf From 3874269a0b3ba81a1813cc282356618bb02d0f20 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 11 Nov 2009 12:31:14 +0000 Subject: Calling selector once --- plugins/Realtime/realtimeupdate.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js index a2af4007b..ebe94ca41 100644 --- a/plugins/Realtime/realtimeupdate.js +++ b/plugins/Realtime/realtimeupdate.js @@ -157,10 +157,12 @@ RealtimeUpdate = { addPopup: function(url, timeline, iconurl) { - $('#notices_primary').css({'position':'relative'}); - $('#notices_primary').prepend(''); + var NP = $('#notices_primary'); + NP.css({'position':'relative'}); + NP.prepend(''); - $('#realtime_timeline').css({ + var RT = $('#realtime_timeline'); + RT.css({ 'margin':'0 0 11px 0', 'background':'transparent url('+ iconurl + ') no-repeat 0% 30%', 'padding':'0 0 0 20px', @@ -170,12 +172,12 @@ RealtimeUpdate = { 'right':'0', 'border':'none', 'cursor':'pointer', - 'color':$("a").css("color"), + 'color':$('a').css('color'), 'font-weight':'bold', 'font-size':'1em' }); - $('#realtime_timeline').click(function() { + RT.click(function() { window.open(url, timeline, 'toolbar=no,resizable=yes,scrollbars=yes,status=yes'); -- cgit v1.2.3-54-g00ecf From af4a54b1674ae118afcc88c03bab93d47208b6f8 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 11 Nov 2009 12:34:22 +0000 Subject: Set window resize before openning it up --- plugins/Realtime/realtimeupdate.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js index ebe94ca41..c7ba2c531 100644 --- a/plugins/Realtime/realtimeupdate.js +++ b/plugins/Realtime/realtimeupdate.js @@ -180,7 +180,7 @@ RealtimeUpdate = { 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; }); @@ -188,7 +188,6 @@ RealtimeUpdate = { initPopupWindow: function() { - window.resizeTo(500, 550); $('address').hide(); $('#content').css({'width':'93.5%'}); -- cgit v1.2.3-54-g00ecf From dbe02049a829dd0f3200984f1c797907aac5423f Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 11 Nov 2009 12:57:48 +0000 Subject: Added margin-top for showstream page (space between entity_actions and notice_primary) --- plugins/Realtime/realtimeupdate.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js index c7ba2c531..9b9991b9e 100644 --- a/plugins/Realtime/realtimeupdate.js +++ b/plugins/Realtime/realtimeupdate.js @@ -164,7 +164,7 @@ RealtimeUpdate = { 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,6 +176,7 @@ RealtimeUpdate = { 'font-weight':'bold', 'font-size':'1em' }); + $('#showstream #notices_primary').css({'margin-top':'18px'}); RT.click(function() { window.open(url, -- cgit v1.2.3-54-g00ecf From 686c2e5e064573a70e38e8df6d5fb60061858599 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 11 Nov 2009 13:43:21 +0000 Subject: Added XHR for form_entity_flag --- plugins/UserFlag/UserFlagPlugin.php | 8 ++++++++ plugins/UserFlag/flagprofile.php | 16 +++++++++++++++- plugins/UserFlag/flagprofileform.php | 2 +- 3 files changed, 24 insertions(+), 2 deletions(-) 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('/**/'); + $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'; } /** -- cgit v1.2.3-54-g00ecf From f600fa3b1a3a4c81f6573d05dbcf286e2834a389 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Wed, 11 Nov 2009 12:16:58 -0500 Subject: Rename the plugins, as I'm separating out Authn, Authz, and user information into separate plugins --- plugins/Auth/AuthPlugin.php | 172 ------------------ plugins/Authentication/AuthenticationPlugin.php | 172 ++++++++++++++++++ plugins/Ldap/LdapPlugin.php | 195 --------------------- plugins/Ldap/README | 50 ------ .../LdapAuthenticationPlugin.php | 195 +++++++++++++++++++++ plugins/LdapAuthentication/README | 50 ++++++ 6 files changed, 417 insertions(+), 417 deletions(-) delete mode 100644 plugins/Auth/AuthPlugin.php create mode 100644 plugins/Authentication/AuthenticationPlugin.php delete mode 100644 plugins/Ldap/LdapPlugin.php delete mode 100644 plugins/Ldap/README create mode 100644 plugins/LdapAuthentication/LdapAuthenticationPlugin.php create mode 100644 plugins/LdapAuthentication/README 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 @@ -. - * - * @category Plugin - * @package StatusNet - * @author Craig Andrews - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ - */ - -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); -} - -/** - * Superclass for plugins that do authentication - * - * @category Plugin - * @package StatusNet - * @author Craig Andrews - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ - */ - -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..ef78c7ce4 --- /dev/null +++ b/plugins/Authentication/AuthenticationPlugin.php @@ -0,0 +1,172 @@ +. + * + * @category Plugin + * @package StatusNet + * @author Craig Andrews + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +/** + * Superclass for plugins that do authentication + * + * @category Plugin + * @package StatusNet + * @author Craig Andrews + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +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 $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->authoritative){ + return false; + } + } + //we're not authoritative, so let other handlers try + }else{ + if($this->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->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 render the menu item + return false; + } + } +} + diff --git a/plugins/Ldap/LdapPlugin.php b/plugins/Ldap/LdapPlugin.php deleted file mode 100644 index 88ca92b37..000000000 --- a/plugins/Ldap/LdapPlugin.php +++ /dev/null @@ -1,195 +0,0 @@ -. - * - * @category Plugin - * @package StatusNet - * @author Craig Andrews - * @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/Auth/AuthPlugin.php'; -require_once 'Net/LDAP2.php'; - -class LdapPlugin extends AuthPlugin -{ - public $host=null; - public $port=null; - public $version=null; - public $starttls=null; - public $binddn=null; - public $bindpw=null; - public $basedn=null; - public $options=null; - public $filter=null; - public $scope=null; - public $attributes=array(); - - function __construct() - { - parent::__construct(); - } - - //---interface implementation---// - - function checkPassword($nickname, $password) - { - $ldap = $this->ldap_get_connection(); - if(!$ldap){ - return false; - } - $entry = $this->ldap_get_user($nickname); - if(!$entry){ - return false; - }else{ - $config = $this->ldap_get_config(); - $config['binddn']=$entry->dn(); - $config['bindpw']=$password; - if($this->ldap_get_connection($config)){ - return true; - }else{ - return false; - } - } - } - - function autoRegister($nickname) - { - $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); - 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'); - } - } - } - //set the database saved password to a random string. - $registration_data['password']=common_good_rand(16); - $user = User::register($registration_data); - return true; - }else{ - //user isn't in ldap, so we cannot register him - return null; - } - } - - function changePassword($nickname,$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(){ - $config = array(); - $keys = array('host','port','version','starttls','binddn','bindpw','basedn','options','filter','scope'); - foreach($keys as $key){ - $value = $this->$key; - if($value!==null){ - $config[$key]=$value; - } - } - return $config; - } - - function ldap_get_connection($config = null){ - if($config == null){ - $config = $this->ldap_get_config(); - } - - //cannot use Net_LDAP2::connect() as StatusNet uses - //PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'handleError'); - //PEAR handling can be overridden on instance objects, so we do that. - $ldap = new Net_LDAP2($config); - $ldap->setErrorHandling(PEAR_ERROR_RETURN); - $err=$ldap->bind(); - if (Net_LDAP2::isError($err)) { - common_log(LOG_WARNING, 'Could not connect to LDAP server: '.$err->getMessage()); - return false; - } - return $ldap; - } - - /** - * get an LDAP entry for a user with a given username - * - * @param string $username - * $param array $attributes LDAP attributes to retrieve - * @return string DN - */ - function ldap_get_user($username,$attributes=array()){ - $ldap = $this->ldap_get_connection(); - $filter = Net_LDAP2_Filter::create(common_config('ldap','nickname_attribute'), 'equals', $username); - $options = array( - 'scope' => 'sub', - 'attributes' => $attributes - ); - $search = $ldap->search(null,$filter,$options); - - if (PEAR::isError($search)) { - common_log(LOG_WARNING, 'Error while getting DN for user: '.$search->getMessage()); - return false; - } - - if($search->count()==0){ - return false; - }else if($search->count()==1){ - $entry = $search->shiftEntry(); - return $entry; - }else{ - common_log(LOG_WARNING, 'Found ' . $search->count() . ' ldap user with the username: ' . $username); - return false; - } - } -} diff --git a/plugins/Ldap/README b/plugins/Ldap/README deleted file mode 100644 index 063286cef..000000000 --- a/plugins/Ldap/README +++ /dev/null @@ -1,50 +0,0 @@ -The LDAP plugin allows for StatusNet to handle authentication, authorization, and user information through LDAP. - -Installation -============ -add "addPlugin('ldap', 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). -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) - -host*: LDAP server name to connect to. You can provide several hosts in an array in which case the hosts are tried from left to right.. See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php -port: Port on the server. See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php -version: LDAP version. See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php -starttls: TLS is started after connecting. See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php -binddn: The distinguished name to bind as (username). See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php -bindpw: Password for the binddn. See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php -basedn*: LDAP base name (root directory). See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php -options: See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php -filter: Default search filter. See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php -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 - nickname* - email - fullname - homepage - location - -* required -default values are in (parenthesis) - -Example -======= -Here's an example of an LDAP plugin configuration that connects to Microsoft Active Directory. - -addPlugin('ldap', array( - 'authn_authoritative'=>true, - 'autoregistration'=>true, - 'binddn'=>'username', - 'bindpw'=>'password', - 'basedn'=>'OU=Users,OU=StatusNet,OU=US,DC=americas,DC=global,DC=loc', - 'host'=>array('server1', 'server2'), - 'attributes'=>array( - 'nickname'=>'sAMAccountName', - 'email'=>'mail', - 'fullname'=>'displayName') -)); diff --git a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php new file mode 100644 index 000000000..f14080b2d --- /dev/null +++ b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php @@ -0,0 +1,195 @@ +. + * + * @category Plugin + * @package StatusNet + * @author Craig Andrews + * @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'; +require_once 'Net/LDAP2.php'; + +class LdapAuthenticatonPlugin extends AuthenticationPlugin +{ + public $host=null; + public $port=null; + public $version=null; + public $starttls=null; + public $binddn=null; + public $bindpw=null; + public $basedn=null; + public $options=null; + public $filter=null; + public $scope=null; + public $attributes=array(); + + function __construct() + { + parent::__construct(); + } + + //---interface implementation---// + + function checkPassword($nickname, $password) + { + $ldap = $this->ldap_get_connection(); + if(!$ldap){ + return false; + } + $entry = $this->ldap_get_user($nickname); + if(!$entry){ + return false; + }else{ + $config = $this->ldap_get_config(); + $config['binddn']=$entry->dn(); + $config['bindpw']=$password; + if($this->ldap_get_connection($config)){ + return true; + }else{ + return false; + } + } + } + + function autoRegister($nickname) + { + $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); + 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'); + } + } + } + //set the database saved password to a random string. + $registration_data['password']=common_good_rand(16); + $user = User::register($registration_data); + return true; + }else{ + //user isn't in ldap, so we cannot register him + return null; + } + } + + function changePassword($nickname,$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(){ + $config = array(); + $keys = array('host','port','version','starttls','binddn','bindpw','basedn','options','filter','scope'); + foreach($keys as $key){ + $value = $this->$key; + if($value!==null){ + $config[$key]=$value; + } + } + return $config; + } + + function ldap_get_connection($config = null){ + if($config == null){ + $config = $this->ldap_get_config(); + } + + //cannot use Net_LDAP2::connect() as StatusNet uses + //PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'handleError'); + //PEAR handling can be overridden on instance objects, so we do that. + $ldap = new Net_LDAP2($config); + $ldap->setErrorHandling(PEAR_ERROR_RETURN); + $err=$ldap->bind(); + if (Net_LDAP2::isError($err)) { + common_log(LOG_WARNING, 'Could not connect to LDAP server: '.$err->getMessage()); + return false; + } + return $ldap; + } + + /** + * get an LDAP entry for a user with a given username + * + * @param string $username + * $param array $attributes LDAP attributes to retrieve + * @return string DN + */ + function ldap_get_user($username,$attributes=array()){ + $ldap = $this->ldap_get_connection(); + $filter = Net_LDAP2_Filter::create(common_config('ldap','nickname_attribute'), 'equals', $username); + $options = array( + 'scope' => 'sub', + 'attributes' => $attributes + ); + $search = $ldap->search(null,$filter,$options); + + if (PEAR::isError($search)) { + common_log(LOG_WARNING, 'Error while getting DN for user: '.$search->getMessage()); + return false; + } + + if($search->count()==0){ + return false; + }else if($search->count()==1){ + $entry = $search->shiftEntry(); + return $entry; + }else{ + common_log(LOG_WARNING, 'Found ' . $search->count() . ' ldap user with the username: ' . $username); + return false; + } + } +} diff --git a/plugins/LdapAuthentication/README b/plugins/LdapAuthentication/README new file mode 100644 index 000000000..03647e7c7 --- /dev/null +++ b/plugins/LdapAuthentication/README @@ -0,0 +1,50 @@ +The LDAP Authentication plugin allows for StatusNet to handle authentication through LDAP. + +Installation +============ +add "addPlugin('ldapAuthentication', array('setting'=>'value', 'setting2'=>'value2', ...);" to the bottom of your config.php + +Settings +======== +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). +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) + +host*: LDAP server name to connect to. You can provide several hosts in an array in which case the hosts are tried from left to right.. See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php +port: Port on the server. See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php +version: LDAP version. See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php +starttls: TLS is started after connecting. See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php +binddn: The distinguished name to bind as (username). See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php +bindpw: Password for the binddn. See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php +basedn*: LDAP base name (root directory). See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php +options: See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php +filter: Default search filter. See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php +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 + nickname* + email + fullname + homepage + location + +* required +default values are in (parenthesis) + +Example +======= +Here's an example of an LDAP plugin configuration that connects to Microsoft Active Directory. + +addPlugin('ldapAuthentication', array( + 'authoritative'=>true, + 'autoregistration'=>true, + 'binddn'=>'username', + 'bindpw'=>'password', + 'basedn'=>'OU=Users,OU=StatusNet,OU=US,DC=americas,DC=global,DC=loc', + 'host'=>array('server1', 'server2'), + 'attributes'=>array( + 'nickname'=>'sAMAccountName', + 'email'=>'mail', + 'fullname'=>'displayName') +)); -- cgit v1.2.3-54-g00ecf From b8b4d3d2f2ab657105a914577c6335be5bb14ae2 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 11 Nov 2009 18:20:58 +0000 Subject: Separated actions that's particular to the notice stream pages into its own function. It can be reused whenever the common behaviours needs to be initialized. --- js/util.js | 46 +++++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/js/util.js b/js/util.js index b90f33ec7..f03a1e67c 100644 --- a/js/util.js +++ b/js/util.js @@ -370,31 +370,39 @@ 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: { + Notices: function() { + if ($('body.user_in').length > 0) { + $('.'+SN.C.S.FormNotice).each(function() { + SN.U.FormNoticeXHR($(this)); + SN.U.FormNoticeEnhancements($(this)); + }); - $('.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)); }); + $('.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)); }); - SN.U.NoticeReply(); + SN.U.NoticeReply(); - SN.U.NoticeDataAttach(); + SN.U.NoticeDataAttach(); - SN.U.NewDirectMessage(); + SN.U.NewDirectMessage(); + } + + SN.U.NoticeAttachments(); + } } +}; - SN.U.NoticeAttachments(); +$(document).ready(function(){ + if ($('#content .notices').length >0) { + SN.Init.Notices(); + } }); -- cgit v1.2.3-54-g00ecf From 7f8dbb8e457d1e5534ebb569988d84ee3adaeef7 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 11 Nov 2009 10:38:11 -0800 Subject: Fix bug 1963: Web UI throws warnings during previously open login session after user account is deleted common_logged_in() returned bogus results because it checks against null specifically, but common_current_user() was sticking 'false' into $_cur because that's what User::staticGet() returned from a failed lookup. Now we skip over a failed lookup here, so we keep null and all is well. --- lib/util.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/util.php b/lib/util.php index 81160d052..7aca4af8d 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; + } } } -- cgit v1.2.3-54-g00ecf From 095cf8ebf1e95dfc2e625ca6a7f705dbf007a9fd Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 11 Nov 2009 18:47:14 +0000 Subject: Separated Init functions to NoticeForm, Notices, EvenActions. --- js/util.js | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/js/util.js b/js/util.js index f03a1e67c..9bdc48507 100644 --- a/js/util.js +++ b/js/util.js @@ -373,36 +373,51 @@ var SN = { // StatusNet }, Init: { - Notices: function() { + NoticeForm: function() { if ($('body.user_in').length > 0) { $('.'+SN.C.S.FormNotice).each(function() { SN.U.FormNoticeXHR($(this)); SN.U.FormNoticeEnhancements($(this)); }); - $('.form_user_subscribe').each(function() { SN.U.FormXHR($(this)); }); - $('.form_user_unsubscribe').each(function() { SN.U.FormXHR($(this)); }); + SN.U.NoticeDataAttach(); + } + }, + + Notices: function() { + if ($('body.user_in').length > 0) { $('.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)); }); SN.U.NoticeReply(); + } - SN.U.NoticeDataAttach(); + SN.U.NoticeAttachments(); + }, + + 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.NoticeAttachments(); } } }; $(document).ready(function(){ - if ($('#content .notices').length >0) { + 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(); + } }); -- cgit v1.2.3-54-g00ecf From 014d6b1d19b6ae5de8d87f055397993f80579f74 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Wed, 11 Nov 2009 14:02:57 -0500 Subject: Redid how URL shorteners work. This way is much more like how Evan wants events to work (and more like how the rest of SN works). --- EVENTS.txt | 14 ++++ actions/othersettings.php | 17 ++--- lib/Shorturl_api.php | 67 ------------------ lib/common.php | 1 - lib/util.php | 25 +++---- plugins/BitlyUrl/BitlyUrlPlugin.php | 31 ++++----- plugins/LilUrl/LilUrlPlugin.php | 38 +++++----- plugins/PtitUrl/PtitUrlPlugin.php | 31 ++++----- plugins/SimpleUrl/SimpleUrlPlugin.php | 41 +++-------- plugins/TightUrl/TightUrlPlugin.php | 31 ++++----- plugins/UrlShortener/UrlShortenerPlugin.php | 103 ++++++++++++++++++++++++++++ 11 files changed, 197 insertions(+), 202 deletions(-) delete mode 100644 lib/Shorturl_api.php create mode 100644 plugins/UrlShortener/UrlShortenerPlugin.php diff --git a/EVENTS.txt b/EVENTS.txt index f75dcebca..3acff277b 100644 --- a/EVENTS.txt +++ b/EVENTS.txt @@ -538,3 +538,17 @@ EndChangePassword: After changing a password 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/othersettings.php b/actions/othersettings.php index d32a2d651..d52a634ac 100644 --- a/actions/othersettings.php +++ b/actions/othersettings.php @@ -97,20 +97,15 @@ class OthersettingsAction extends AccountSettingsAction $this->elementStart('fieldset'); $this->hidden('token', common_session_token()); - $services=array(); - global $_shorteners; - if($_shorteners){ - foreach($_shorteners as $name=>$value) - { - $services[$name]=$name; - if(!empty($value['info']['freeService'])){ - // I18N - $services[$name].=' (free service)'; - } + Event::handle('GetUrlShorteners', array(&$shorteners)); + 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'); 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 @@ -. - */ - -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/common.php b/lib/common.php index 6aac46807..4958866d0 100644 --- a/lib/common.php +++ b/lib/common.php @@ -229,7 +229,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/util.php b/lib/util.php index 7aca4af8d..68f3520db 100644 --- a/lib/util.php +++ b/lib/util.php @@ -1423,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; + $shortenerName = $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; - } - - $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/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/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/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/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 @@ +. + * + * @category Plugin + * @package StatusNet + * @author Craig Andrews + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +/** + * Superclass for plugins that do URL shortening + * + * @category Plugin + * @package StatusNet + * @author Craig Andrews + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +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; + } + } + } +} -- cgit v1.2.3-54-g00ecf From b43866d9aab10574ec215eea059ab54e5be38841 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Wed, 11 Nov 2009 14:04:32 -0500 Subject: Correct stupid spelling errors --- plugins/Authentication/AuthenticationPlugin.php | 2 +- plugins/LdapAuthentication/LdapAuthenticationPlugin.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Authentication/AuthenticationPlugin.php b/plugins/Authentication/AuthenticationPlugin.php index ef78c7ce4..e3e55fea6 100644 --- a/plugins/Authentication/AuthenticationPlugin.php +++ b/plugins/Authentication/AuthenticationPlugin.php @@ -107,7 +107,7 @@ abstract class AuthenticationPlugin extends Plugin parent::__construct(); } - function StartCheckPassword($nickname, $password, &$authenticatedUser){ + function onStartCheckPassword($nickname, $password, &$authenticatedUser){ if($this->password_changeable){ $authenticated = $this->checkPassword($nickname, $password); if($authenticated){ diff --git a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php index f14080b2d..d3ccd93b6 100644 --- a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php +++ b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php @@ -34,7 +34,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { require_once INSTALLDIR.'/plugins/Authentication/AuthenticationPlugin.php'; require_once 'Net/LDAP2.php'; -class LdapAuthenticatonPlugin extends AuthenticationPlugin +class LdapAuthenticationPlugin extends AuthenticationPlugin { public $host=null; public $port=null; -- cgit v1.2.3-54-g00ecf From f6f5b5654a81f441bd3388832e0cb51b55c37328 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Wed, 11 Nov 2009 15:08:17 -0500 Subject: Don't use common_config anymore --- .../LdapAuthenticationPlugin.php | 29 +++++++--------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php index d3ccd93b6..ded5cf299 100644 --- a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php +++ b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php @@ -78,27 +78,16 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin function autoRegister($nickname) { - $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($nickname,$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){ + if($sn_attribute=='email'){ + $registration_data[$sn_attribute]=common_canonical_email($entry->getValue($ldap_attribute,'single')); + }else if($sn_attribute=='nickname'){ + $registration_data[$sn_attribute]=common_canonical_nickname($entry->getValue($ldap_attribute,'single')); + }else{ + $registration_data[$sn_attribute]=$entry->getValue($ldap_attribute,'single'); } } //set the database saved password to a random string. @@ -170,7 +159,7 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin */ 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['nickname'], 'equals', $username); $options = array( 'scope' => 'sub', 'attributes' => $attributes -- cgit v1.2.3-54-g00ecf From 41944f36e49086d56bded449816d62d3bd4a0c59 Mon Sep 17 00:00:00 2001 From: CiaranG Date: Wed, 11 Nov 2009 20:31:58 +0000 Subject: CLAIM_TIMEOUT is already defined elsewhere - causes a PHP warning (minor perf. issue) and confusion if someone tries to change one or the other --- scripts/xmppconfirmhandler.php | 2 -- 1 file changed, 2 deletions(-) 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'; -- cgit v1.2.3-54-g00ecf From 1c4bacf7bcaad9b078ff1e7675371932bb76d0b3 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Wed, 11 Nov 2009 16:51:10 -0500 Subject: Remove registerUrlShortener() (no longer used) --- lib/plugin.php | 14 -------------- 1 file changed, 14 deletions(-) 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); - } } -- cgit v1.2.3-54-g00ecf From 23290f746f7ef9567e95ecbb06baf17f246a3fe7 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Wed, 11 Nov 2009 17:05:24 -0500 Subject: Do not show the URL shortener selection drop down if no shorteners are available --- actions/othersettings.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/actions/othersettings.php b/actions/othersettings.php index d52a634ac..1d252f34e 100644 --- a/actions/othersettings.php +++ b/actions/othersettings.php @@ -96,6 +96,7 @@ class OthersettingsAction extends AccountSettingsAction common_local_url('othersettings'))); $this->elementStart('fieldset'); $this->hidden('token', common_session_token()); + $this->elementStart('ul', 'form_data'); Event::handle('GetUrlShorteners', array(&$shorteners)); foreach($shorteners as $name=>$value) @@ -105,14 +106,16 @@ class OthersettingsAction extends AccountSettingsAction $services[$name].=_(' (free service)'); } } - asort($services); + if($services) + { + asort($services); - $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'); + $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.')); -- cgit v1.2.3-54-g00ecf From 8a6590a7e800e33787ffc55dbd0b2b36ff140504 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Wed, 11 Nov 2009 17:09:00 -0500 Subject: initialize these variables before use to prevent warnings --- actions/othersettings.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/actions/othersettings.php b/actions/othersettings.php index 1d252f34e..0de7cd908 100644 --- a/actions/othersettings.php +++ b/actions/othersettings.php @@ -98,7 +98,9 @@ class OthersettingsAction extends AccountSettingsAction $this->hidden('token', common_session_token()); $this->elementStart('ul', 'form_data'); + $shorteners = array(); Event::handle('GetUrlShorteners', array(&$shorteners)); + $services = array(); foreach($shorteners as $name=>$value) { $services[$name]=$name; -- cgit v1.2.3-54-g00ecf From 074b9faee0efafa2917e39257ab94f95fb6960b0 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Wed, 11 Nov 2009 18:00:58 -0500 Subject: Remove alt text on avatar url (so pidgin doesn't show it) surround notice_id with [], looks nicer --- lib/jabber.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/jabber.php b/lib/jabber.php index 73f2ec660..23c2e0d94 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'); -- cgit v1.2.3-54-g00ecf From 59e8896212a8d5e5ceed37162b8d38abc0de0e4b Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Wed, 11 Nov 2009 18:03:07 -0500 Subject: Add the [noticeid] to the end of text only jabber messages --- lib/jabber.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jabber.php b/lib/jabber.php index 23c2e0d94..a8e295ea5 100644 --- a/lib/jabber.php +++ b/lib/jabber.php @@ -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 . ']'; } -- cgit v1.2.3-54-g00ecf From 7efea1115f45b8880fe3161cc32b09510ddd2264 Mon Sep 17 00:00:00 2001 From: Eric Helgeson Date: Wed, 11 Nov 2009 18:45:21 -0500 Subject: Ask users if they wish to send statistics to SNI, default is off. Users may not know about this setting and are unaware they are sending stats. This allows them to make that decision. --- install.php | 15 +++++++++++---- lib/default.php | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/install.php b/install.php index e7f7cf318..964d743f9 100644 --- a/install.php +++ b/install.php @@ -1,4 +1,3 @@ - * @author CiaranG * @author Craig Andrews - * @author Eric Helgeson + * @author Eric Helgeson * @author Evan Prodromou * @author Robin Millette * @author Sarven Capadisli @@ -500,6 +499,10 @@ function showForm()

Database password (optional)

+
  • + + +

    Periodically send information about your site to StatusNet Inc

    @@ -521,6 +524,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 +571,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 +692,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 = " null, 'welcome' => null), 'snapshot' => - array('run' => 'web', + array('run' => 'never', 'frequency' => 10000, 'reporturl' => 'http://status.net/stats/report'), 'attachments' => -- cgit v1.2.3-54-g00ecf From bd1c1fc137e00ba0714b0905005991f68602b3c1 Mon Sep 17 00:00:00 2001 From: Eric Helgeson Date: Wed, 11 Nov 2009 18:50:23 -0500 Subject: Forgot closing tag... --- install.php | 1 + 1 file changed, 1 insertion(+) diff --git a/install.php b/install.php index 964d743f9..8e76f6198 100644 --- a/install.php +++ b/install.php @@ -503,6 +503,7 @@ function showForm()

    Periodically send information about your site to StatusNet Inc

    +
    • -- cgit v1.2.3-54-g00ecf From 8109d39a566bc351080996d2806b40e89426f168 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Thu, 12 Nov 2009 09:18:15 +0000 Subject: Minor typo correction in log message. Seems trivial, unless you are trying to search the log for it. --- scripts/xmppdaemon.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- cgit v1.2.3-54-g00ecf From 15de8892f553d45af23eb7272a70a423096e4340 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Thu, 12 Nov 2009 10:08:01 +0000 Subject: Badly formatted message in en_GB translation resulted in '%s and friends' being displayed --- locale/en_GB/LC_MESSAGES/statusnet.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index 384e60927..3eb1678ec 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -103,9 +103,8 @@ 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 -- cgit v1.2.3-54-g00ecf From 6e601c11718d075cf17c463e997023058f18aa99 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Thu, 12 Nov 2009 14:21:47 +0000 Subject: Wrong XRDS service type for OMB was being supplied. Wrong since commit 54696f7c I think --- actions/xrds.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/xrds.php b/actions/xrds.php index 8f09557d1..5db3489ad 100644 --- a/actions/xrds.php +++ b/actions/xrds.php @@ -117,7 +117,7 @@ class XrdsAction extends Action //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'); -- cgit v1.2.3-54-g00ecf From 707efadbd4b44435741ad9b2b972a77f4069e689 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Thu, 12 Nov 2009 14:46:16 +0000 Subject: Some more XRDS fixes. With this and the previous commit, remote subs seem to work. Otherwise they don't. --- actions/xrds.php | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/actions/xrds.php b/actions/xrds.php index 5db3489ad..76ccc9c6e 100644 --- a/actions/xrds.php +++ b/actions/xrds.php @@ -97,22 +97,18 @@ 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 -- cgit v1.2.3-54-g00ecf From d8fe5224cb5628f1a281c7498a516e89992f6474 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 12 Nov 2009 09:02:00 -0800 Subject: Fix for bug 1974: drop unnecessary define_syslog_variables() call from common.php The call was moved to this spot in commit 3ea1119e500c23ee918569e2a58cc5abaa1d8a5a (previously init'd later in another func) but doesn't seem to be needed anyway. None of our code uses the variables that this function defines, just the constants -- which are already predefined without the call. The function is deprecated in PHP 5.3 and gone in 6, so we may as well toss it now. --- lib/common.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/common.php b/lib/common.php index 4958866d0..fbe4216e3 100644 --- a/lib/common.php +++ b/lib/common.php @@ -38,8 +38,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/'); -- cgit v1.2.3-54-g00ecf From 81fa515881e42afe55379befa4e7d93313c90891 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 12 Nov 2009 11:08:43 -0800 Subject: Fix index on notice for efficient querying of notice(s) by order for a profile. Should resolve performance problem with Profile::getCurrentNotice() --- db/08to09.sql | 4 ++++ db/08to09_pg.sql | 4 ++++ db/statusnet.sql | 2 +- db/statusnet_pg.sql | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) 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..fe9eccb2a 100644 --- a/db/08to09_pg.sql +++ b/db/08to09_pg.sql @@ -57,3 +57,7 @@ alter table subscription add index subscription_subscriber_idx using btree(subscriber,created), drop index subscription_subscribed_idx, add index subscription_subscribed_idx using btree(subscribed,created); + +alter table notice + drop index notice_profile_id_idx, + add index notice_profile_id_idx using btree(profile_id,created,id); 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 ( -- cgit v1.2.3-54-g00ecf From d8296df5d73fc189d393cddd9e2277f7c8a4cbf6 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Thu, 12 Nov 2009 20:57:09 +0000 Subject: A further change to the XRDS is required if 0.9.x is to be able to remote sub to a 0.8.x account, with the OpenID plugin enabled. --- actions/xrds.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/actions/xrds.php b/actions/xrds.php index 76ccc9c6e..534182e3e 100644 --- a/actions/xrds.php +++ b/actions/xrds.php @@ -123,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'); @@ -134,8 +134,6 @@ class XrdsAction extends Action '#omb'); $xrdsOutputter->elementEnd('XRD'); - Event::handle('EndUserXRDS', array($this,&$xrdsOutputter)); - $xrdsOutputter->endXRDS(); } -- cgit v1.2.3-54-g00ecf From c27dc71277c2cd2631f285108e4f365db50201dd Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Thu, 12 Nov 2009 22:58:28 +0100 Subject: Localisation updates from translatewiki.net (2009-11-12) --- locale/ar/LC_MESSAGES/statusnet.mo | Bin 22332 -> 22584 bytes locale/ar/LC_MESSAGES/statusnet.po | 211 ++++++++++------ locale/bg/LC_MESSAGES/statusnet.mo | Bin 83123 -> 83559 bytes locale/bg/LC_MESSAGES/statusnet.po | 215 ++++++++++------ locale/ca/LC_MESSAGES/statusnet.mo | Bin 71227 -> 71507 bytes locale/ca/LC_MESSAGES/statusnet.po | 215 ++++++++++------ locale/cs/LC_MESSAGES/statusnet.mo | Bin 34906 -> 35137 bytes locale/cs/LC_MESSAGES/statusnet.po | 211 ++++++++++------ locale/de/LC_MESSAGES/statusnet.mo | Bin 71423 -> 71701 bytes locale/de/LC_MESSAGES/statusnet.po | 215 ++++++++++------ locale/el/LC_MESSAGES/statusnet.mo | Bin 29237 -> 29484 bytes locale/el/LC_MESSAGES/statusnet.po | 217 ++++++++++------ locale/en_GB/LC_MESSAGES/statusnet.mo | Bin 66104 -> 66327 bytes locale/en_GB/LC_MESSAGES/statusnet.po | 222 ++++++++++------- locale/es/LC_MESSAGES/statusnet.mo | Bin 70370 -> 70651 bytes locale/es/LC_MESSAGES/statusnet.po | 215 ++++++++++------ locale/fi/LC_MESSAGES/statusnet.mo | Bin 74094 -> 74355 bytes locale/fi/LC_MESSAGES/statusnet.po | 215 ++++++++++------ locale/fr/LC_MESSAGES/statusnet.mo | Bin 75427 -> 76895 bytes locale/fr/LC_MESSAGES/statusnet.po | 452 ++++++++++++++++++---------------- locale/ga/LC_MESSAGES/statusnet.mo | Bin 73257 -> 74535 bytes locale/ga/LC_MESSAGES/statusnet.po | 239 ++++++++++++------ locale/he/LC_MESSAGES/statusnet.mo | Bin 38349 -> 38631 bytes locale/he/LC_MESSAGES/statusnet.po | 211 ++++++++++------ locale/is/LC_MESSAGES/statusnet.mo | Bin 62720 -> 62875 bytes locale/is/LC_MESSAGES/statusnet.po | 217 ++++++++++------ locale/it/LC_MESSAGES/statusnet.mo | Bin 70500 -> 70765 bytes locale/it/LC_MESSAGES/statusnet.po | 215 ++++++++++------ locale/ja/LC_MESSAGES/statusnet.mo | Bin 47704 -> 47907 bytes locale/ja/LC_MESSAGES/statusnet.po | 214 ++++++++++------ locale/ko/LC_MESSAGES/statusnet.mo | Bin 74777 -> 75097 bytes locale/ko/LC_MESSAGES/statusnet.po | 215 ++++++++++------ locale/mk/LC_MESSAGES/statusnet.mo | Bin 44896 -> 45259 bytes locale/mk/LC_MESSAGES/statusnet.po | 211 ++++++++++------ locale/nb/LC_MESSAGES/statusnet.mo | Bin 23106 -> 23307 bytes locale/nb/LC_MESSAGES/statusnet.po | 209 ++++++++++------ locale/nl/LC_MESSAGES/statusnet.mo | Bin 85178 -> 99610 bytes locale/nl/LC_MESSAGES/statusnet.po | 396 ++++++++++++++++++++++------- locale/nn/LC_MESSAGES/statusnet.mo | Bin 67679 -> 67929 bytes locale/nn/LC_MESSAGES/statusnet.po | 215 ++++++++++------ locale/pl/LC_MESSAGES/statusnet.mo | Bin 94675 -> 96011 bytes locale/pl/LC_MESSAGES/statusnet.po | 245 ++++++++++++------ locale/pt/LC_MESSAGES/statusnet.mo | Bin 25296 -> 25469 bytes locale/pt/LC_MESSAGES/statusnet.po | 217 ++++++++++------ locale/pt_BR/LC_MESSAGES/statusnet.mo | Bin 70063 -> 70361 bytes locale/pt_BR/LC_MESSAGES/statusnet.po | 218 ++++++++++------ locale/ru/LC_MESSAGES/statusnet.mo | Bin 94082 -> 94452 bytes locale/ru/LC_MESSAGES/statusnet.po | 218 ++++++++++------ locale/statusnet.po | 196 +++++++++------ locale/sv/LC_MESSAGES/statusnet.mo | Bin 58606 -> 58861 bytes locale/sv/LC_MESSAGES/statusnet.po | 215 ++++++++++------ locale/te/LC_MESSAGES/statusnet.mo | Bin 47515 -> 48739 bytes locale/te/LC_MESSAGES/statusnet.po | 274 ++++++++++++--------- locale/tr/LC_MESSAGES/statusnet.mo | Bin 34413 -> 34654 bytes locale/tr/LC_MESSAGES/statusnet.po | 211 ++++++++++------ locale/uk/LC_MESSAGES/statusnet.mo | Bin 91848 -> 92216 bytes locale/uk/LC_MESSAGES/statusnet.po | 215 ++++++++++------ locale/vi/LC_MESSAGES/statusnet.mo | Bin 67147 -> 68028 bytes locale/vi/LC_MESSAGES/statusnet.po | 229 +++++++++++------ locale/zh_CN/LC_MESSAGES/statusnet.mo | Bin 64571 -> 64800 bytes locale/zh_CN/LC_MESSAGES/statusnet.po | 215 ++++++++++------ locale/zh_TW/LC_MESSAGES/statusnet.mo | Bin 18568 -> 18784 bytes locale/zh_TW/LC_MESSAGES/statusnet.po | 214 ++++++++++------ 63 files changed, 4648 insertions(+), 2749 deletions(-) diff --git a/locale/ar/LC_MESSAGES/statusnet.mo b/locale/ar/LC_MESSAGES/statusnet.mo index 396f81227..ff3af0e18 100644 Binary files a/locale/ar/LC_MESSAGES/statusnet.mo and b/locale/ar/LC_MESSAGES/statusnet.mo differ diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index d5000e633..aa58a5689 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-12 21:38+0000\n" +"PO-Revision-Date: 2009-11-12 21:38:34+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(r58962); Translate extension (2009-08-03)\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,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." @@ -377,17 +425,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 +517,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 +565,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 @@ -1573,7 +1621,7 @@ msgid "Nickname" msgstr "الاسم المستعار" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "كلمة السر" @@ -1702,7 +1750,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,8 +1794,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 "" @@ -1767,11 +1815,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 +1857,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 "أكد" -#: 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 "حُفظت كلمة السر." @@ -2288,7 +2335,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 "البريد الإلكتروني" @@ -3156,31 +3203,31 @@ msgstr "" 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 +3235,7 @@ msgstr "صمّم ملفك الشخصي" msgid "Other" msgstr "أخرى" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "خيارات أخرى" @@ -3571,19 +3618,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 "اذهب إلى المُثبّت." @@ -3843,7 +3890,7 @@ msgstr "" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" +msgid "[%s]" msgstr "" #: lib/joinform.php:114 @@ -4391,47 +4438,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 "قبل سنة تقريبًا" @@ -4460,3 +4507,7 @@ msgstr "" #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "" + +#, fuzzy +#~ msgid "You are not allowed to change your password" +#~ msgstr "غير كلمة سرّك" diff --git a/locale/bg/LC_MESSAGES/statusnet.mo b/locale/bg/LC_MESSAGES/statusnet.mo index a05e3245c..ed18172d2 100644 Binary files a/locale/bg/LC_MESSAGES/statusnet.mo and b/locale/bg/LC_MESSAGES/statusnet.mo differ diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index 33844a4c7..6aff75834 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-12 21:38+0000\n" +"PO-Revision-Date: 2009-11-12 21:38:36+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(r58962); Translate extension (2009-08-03)\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 "Е-поща" @@ -3346,31 +3394,31 @@ msgstr "Грешка в базата от данни — отговор при 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" @@ -4624,47 +4672,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 "преди около година" @@ -4693,3 +4741,10 @@ msgstr "Това не е вашият входящ адрес." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Входящата поща не е разрешена." + +#, fuzzy +#~ msgid "You are not allowed to change your password" +#~ msgstr "Смяна на паролата" + +#~ msgid "notice id: %s" +#~ msgstr "Нова бележка" diff --git a/locale/ca/LC_MESSAGES/statusnet.mo b/locale/ca/LC_MESSAGES/statusnet.mo index ac01d8ed9..f6d142e9b 100644 Binary files a/locale/ca/LC_MESSAGES/statusnet.mo and b/locale/ca/LC_MESSAGES/statusnet.mo differ diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index 11d83cad8..bd19ad23a 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-12 21:38+0000\n" +"PO-Revision-Date: 2009-11-12 21:38:39+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(r58962); Translate extension (2009-08-03)\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" @@ -3384,31 +3432,31 @@ msgstr "Error de BD en inserir resposta: %s" 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" @@ -4662,47 +4710,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" @@ -4731,3 +4779,10 @@ msgstr "Perdó, aquest no és el teu correu electrònic entrant permès." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Perdó, no hi ha un correu electrònic entrant permès." + +#, fuzzy +#~ msgid "You are not allowed to change your password" +#~ msgstr "Canviar la teva contrasenya" + +#~ msgid "notice id: %s" +#~ msgstr "Nou avís" diff --git a/locale/cs/LC_MESSAGES/statusnet.mo b/locale/cs/LC_MESSAGES/statusnet.mo index 275a5e3a3..8ae0c5ef6 100644 Binary files a/locale/cs/LC_MESSAGES/statusnet.mo and b/locale/cs/LC_MESSAGES/statusnet.mo differ diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index 17a12027f..41e922a19 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-12 21:38+0000\n" +"PO-Revision-Date: 2009-11-12 21:38:42+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(r58962); Translate extension (2009-08-03)\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" @@ -3290,32 +3338,32 @@ msgstr "Chyba v DB při vkládání odpovědi: %s" 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 @@ -4580,47 +4628,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" @@ -4649,3 +4697,6 @@ msgstr "" #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "" + +#~ msgid "notice id: %s" +#~ msgstr "Nové sdělení" diff --git a/locale/de/LC_MESSAGES/statusnet.mo b/locale/de/LC_MESSAGES/statusnet.mo index 9591afa0b..83ea15c97 100644 Binary files a/locale/de/LC_MESSAGES/statusnet.mo and b/locale/de/LC_MESSAGES/statusnet.mo differ diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index 0cca46cb4..aad5fa2c7 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-12 21:38+0000\n" +"PO-Revision-Date: 2009-11-12 21:38:44+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(r58962); Translate extension (2009-08-03)\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" @@ -3395,31 +3443,31 @@ msgstr "Datenbankfehler beim Einfügen der Antwort: %s" 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 @@ -4695,47 +4743,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" @@ -4765,3 +4813,10 @@ msgstr "Sorry, das ist nicht deine Adresse für eingehende E-Mails." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Sorry, keinen eingehenden E-Mails gestattet." + +#, fuzzy +#~ msgid "You are not allowed to change your password" +#~ msgstr "Ändere dein Passwort" + +#~ msgid "notice id: %s" +#~ msgstr "Neue Nachricht" diff --git a/locale/el/LC_MESSAGES/statusnet.mo b/locale/el/LC_MESSAGES/statusnet.mo index 72dc2ce58..4c52ea135 100644 Binary files a/locale/el/LC_MESSAGES/statusnet.mo and b/locale/el/LC_MESSAGES/statusnet.mo differ diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index a7163a762..61897cbeb 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-12 21:38+0000\n" +"PO-Revision-Date: 2009-11-12 21:38:47+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(r58962); Translate extension (2009-08-03)\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" @@ -3250,31 +3297,31 @@ msgstr "Σφάλμα βάσης δεδομένων κατά την εισαγω 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 @@ -4507,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 "" @@ -4576,3 +4623,11 @@ msgstr "" #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "" + +#, fuzzy +#~ msgid "You are not allowed to change your password" +#~ msgstr "Αλλάξτε τον κωδικό σας" + +#, fuzzy +#~ msgid "notice id: %s" +#~ msgstr "Μήνυμα" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.mo b/locale/en_GB/LC_MESSAGES/statusnet.mo index b6dc8fa58..74608c5c2 100644 Binary files a/locale/en_GB/LC_MESSAGES/statusnet.mo and b/locale/en_GB/LC_MESSAGES/statusnet.mo differ diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index 3eb1678ec..9e6780ddc 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,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:54+0000\n" +"POT-Creation-Date: 2009-11-12 21:38+0000\n" +"PO-Revision-Date: 2009-11-12 21:38:50+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(r58962); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" "X-Message-Group: out-statusnet\n" @@ -28,12 +29,15 @@ msgid "No such page" msgstr "No such tag." #: 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 +115,42 @@ msgstr "You and friends" 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!" +#: 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 method not found!" -#: 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 "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 "" @@ -147,12 +158,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 "Unable to save your Twitter settings!" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Couldn't update user." + +#: 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." @@ -198,6 +231,23 @@ 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." @@ -392,17 +442,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 msgid "That's too long. Max notice size is %d chars." msgstr "That's too long. Max notice size is 140 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 "" @@ -486,7 +536,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" @@ -534,7 +584,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 @@ -722,9 +772,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 @@ -1672,7 +1721,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" @@ -1810,7 +1859,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 "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." @@ -1877,11 +1926,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." @@ -1916,65 +1969,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." @@ -2413,7 +2461,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" @@ -3349,31 +3397,31 @@ msgstr "DB error inserting reply: %s" 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" @@ -3382,7 +3430,7 @@ msgstr "User profile" msgid "Other" msgstr "Other" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Other options" @@ -3772,20 +3820,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" @@ -4055,8 +4102,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" @@ -4627,47 +4674,47 @@ 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" @@ -4696,3 +4743,10 @@ msgstr "Sorry, that is not your incoming e-mail address." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Sorry, no incoming e-mail allowed." + +#, fuzzy +#~ msgid "You are not allowed to change your password" +#~ msgstr "Change your password" + +#~ msgid "notice id: %s" +#~ msgstr "New notice" diff --git a/locale/es/LC_MESSAGES/statusnet.mo b/locale/es/LC_MESSAGES/statusnet.mo index eda910548..6972043ab 100644 Binary files a/locale/es/LC_MESSAGES/statusnet.mo and b/locale/es/LC_MESSAGES/statusnet.mo differ diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index d04d4f826..bcd3ea64e 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-12 21:38+0000\n" +"PO-Revision-Date: 2009-11-12 21:38:53+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(r58962); Translate extension (2009-08-03)\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" @@ -3407,31 +3455,31 @@ msgstr "Error de BD al insertar respuesta: %s" 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 @@ -4686,47 +4734,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" @@ -4755,3 +4803,10 @@ msgstr "Lo sentimos, pero este no es su dirección de correo entrante." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Lo sentimos, pero no se permite correos entrantes" + +#, fuzzy +#~ msgid "You are not allowed to change your password" +#~ msgstr "Cambia tu contraseña" + +#~ msgid "notice id: %s" +#~ msgstr "Nuevo aviso" diff --git a/locale/fi/LC_MESSAGES/statusnet.mo b/locale/fi/LC_MESSAGES/statusnet.mo index 61946bd6a..a64023a6d 100644 Binary files a/locale/fi/LC_MESSAGES/statusnet.mo and b/locale/fi/LC_MESSAGES/statusnet.mo differ diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index 8202cd4f4..97bd0b253 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-12 21:38+0000\n" +"PO-Revision-Date: 2009-11-12 21:38:58+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(r58962); Translate extension (2009-08-03)\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" @@ -3355,31 +3403,31 @@ msgstr "Tietokantavirhe tallennettaessa vastausta: %s" 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" @@ -4638,47 +4686,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" @@ -4707,3 +4755,10 @@ msgstr "Valitettavasti tuo ei ole oikea osoite sähköpostipäivityksille." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Valitettavasti päivitysten teko sähköpostilla ei ole sallittua." + +#, fuzzy +#~ msgid "You are not allowed to change your password" +#~ msgstr "Vaihda salasanasi" + +#~ msgid "notice id: %s" +#~ msgstr "Uusi päivitys" diff --git a/locale/fr/LC_MESSAGES/statusnet.mo b/locale/fr/LC_MESSAGES/statusnet.mo index 59b7812fc..059d75717 100644 Binary files a/locale/fr/LC_MESSAGES/statusnet.mo and b/locale/fr/LC_MESSAGES/statusnet.mo differ diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 7507e44db..3531e335f 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -2,34 +2,37 @@ # # Author@translatewiki.net: IAlex # Author@translatewiki.net: Jean-Frédéric +# 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-12 21:38+0000\n" +"PO-Revision-Date: 2009-11-12 21:39:00+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(r58962); Translate extension (2009-08-03)\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 +110,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 +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 "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 +194,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 +209,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 +228,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 +276,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 +288,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 +301,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 +341,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 +359,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 +375,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 +402,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 +425,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 @@ -482,14 +524,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 +574,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,14 +627,14 @@ 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 @@ -598,9 +642,8 @@ msgid "A list of the users blocked from joining this group." msgstr "Liste des utilisateurs inscrits à ce groupe." #: 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" @@ -674,9 +717,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 +764,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 @@ -802,9 +843,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." @@ -1102,19 +1143,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 +1165,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." @@ -1221,10 +1258,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 +1305,12 @@ msgid "Make user an admin of the group" msgstr "Faire de cet utilisateur un administrateur du groupe" #: actions/groupmembers.php:473 -#, fuzzy msgid "Make Admin" -msgstr "Administrer" +msgstr "Faire un administrateur" #: actions/groupmembers.php:473 msgid "Make this user an admin" -msgstr "" +msgstr "Faire de cet utilisateur un administrateur" #: actions/grouprss.php:133 #, fuzzy, php-format @@ -1338,12 +1376,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 +1401,8 @@ msgstr "" "dessous." #: actions/imsettings.php:89 -#, fuzzy msgid "IM is not available." -msgstr "Cette page n'est pas disponible dans " +msgstr "La messagerie instantanée n'est pas disponible." #: actions/imsettings.php:106 msgid "Current confirmed Jabber/GTalk address." @@ -1679,7 +1715,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 +1758,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 +1854,14 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" #: actions/noticesearchrss.php:89 -#, fuzzy, php-format +#, php-format msgid "Updates with \"%s\"" -msgstr "Statuts de %1$s dans %2$s!" +msgstr "Mises à jour avec « %s »" #: actions/noticesearchrss.php:91 #, fuzzy, php-format @@ -1857,16 +1893,15 @@ msgid "%1$s's status on %2$s" msgstr "Statut de %1$s sur %2$s" #: actions/oembed.php:157 -#, fuzzy msgid "content type " -msgstr "Contenu" +msgstr "type de contenu " #: actions/oembed.php:160 msgid "Only " -msgstr "" +msgstr "Seulement " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Format de données non supporté." @@ -1886,11 +1921,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 +1965,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 +2090,13 @@ msgid "URL of your homepage, blog, or profile on another site" msgstr "Adresse de votre site Web, blogue, ou profil dans un autre site" #: actions/profilesettings.php:122 actions/register.php:460 -#, fuzzy, php-format +#, php-format msgid "Describe yourself and your interests in %d chars" -msgstr "Décrivez vos intérêts en 140 caractères" +msgstr "Décrivez vous et vos intérêts en %d caractères" #: actions/profilesettings.php:125 actions/register.php:463 -#, fuzzy msgid "Describe yourself and your interests" -msgstr "Décrivez qui vous êtes et vos " +msgstr "Décrivez vous et vos interêts" #: actions/profilesettings.php:127 actions/register.php:465 msgid "Bio" @@ -2116,9 +2149,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 +2417,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 +2469,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 +2559,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 +2594,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 +2654,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 +2728,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 +2822,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 +2909,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 +3221,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 +3283,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 +3316,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 +3360,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." @@ -3376,31 +3401,31 @@ msgstr "Erreur de base de donnée en insérant la réponse :%s" 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 +3433,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 +3472,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 +3525,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 +3591,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 +3718,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 +3729,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 +3828,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 +4104,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 +4376,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 +4431,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 +4474,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 +4633,7 @@ msgstr "(aucun)" #: lib/subs.php:48 msgid "Already subscribed!" -msgstr "" +msgstr "Déjà souscrit !" #: lib/subs.php:52 msgid "User has blocked you." @@ -4677,47 +4695,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 +4748,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." @@ -4746,3 +4765,10 @@ msgstr "Désolé, ceci n'est pas votre adresse de courriel entrant." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Désolé, la réception de courriels n'est pas permise. " + +#, fuzzy +#~ msgid "You are not allowed to change your password" +#~ msgstr "Modifier votre mot de passe" + +#~ msgid "notice id: %s" +#~ msgstr "Nouveau statut" diff --git a/locale/ga/LC_MESSAGES/statusnet.mo b/locale/ga/LC_MESSAGES/statusnet.mo index bf827fd68..157f791ac 100644 Binary files a/locale/ga/LC_MESSAGES/statusnet.mo and b/locale/ga/LC_MESSAGES/statusnet.mo differ diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index 294ef6f94..d8b2f76d7 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-12 21:38+0000\n" +"PO-Revision-Date: 2009-11-12 21:39:04+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(r58962); Translate extension (2009-08-03)\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" @@ -3412,32 +3460,32 @@ msgstr "Erro ó inserir a contestación na BD: %s" 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 @@ -4783,47 +4855,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" @@ -4852,3 +4924,10 @@ msgstr "Ise é un enderezo IM incorrecto." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Aivá, non se permiten correos entrantes." + +#, fuzzy +#~ msgid "You are not allowed to change your password" +#~ msgstr "Cambiar contrasinal" + +#~ msgid "notice id: %s" +#~ msgstr "Novo chío" diff --git a/locale/he/LC_MESSAGES/statusnet.mo b/locale/he/LC_MESSAGES/statusnet.mo index faaf5f29b..821468374 100644 Binary files a/locale/he/LC_MESSAGES/statusnet.mo and b/locale/he/LC_MESSAGES/statusnet.mo differ diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 902e4a5c0..3499f2a5d 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-12 21:38+0000\n" +"PO-Revision-Date: 2009-11-12 21:39:06+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(r58962); Translate extension (2009-08-03)\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 "" @@ -3284,32 +3332,32 @@ msgstr "שגיאת מסד נתונים בהכנסת התגובה: %s" 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 @@ -4575,47 +4623,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 "לפני כשנה" @@ -4644,3 +4692,6 @@ msgstr "" #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "" + +#~ msgid "notice id: %s" +#~ msgstr "הודעה חדשה" diff --git a/locale/is/LC_MESSAGES/statusnet.mo b/locale/is/LC_MESSAGES/statusnet.mo index eaf63735e..06c9153d1 100644 Binary files a/locale/is/LC_MESSAGES/statusnet.mo and b/locale/is/LC_MESSAGES/statusnet.mo differ diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index c0bef7ddf..c8cae147b 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-12 21:38+0000\n" +"PO-Revision-Date: 2009-11-12 21:39:09+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(r58962); Translate extension (2009-08-03)\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" @@ -3304,31 +3351,31 @@ msgstr "Gagnagrunnsvilla við innsetningu svars: %s" 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" @@ -4564,47 +4611,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" @@ -4633,3 +4680,11 @@ msgstr "Afsakið en þetta er ekki móttökutölvupóstfangið þitt." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Því miður er móttökutölvupóstur ekki leyfður." + +#, fuzzy +#~ msgid "You are not allowed to change your password" +#~ msgstr "Breyta lykilorðinu þínu" + +#, fuzzy +#~ msgid "notice id: %s" +#~ msgstr "Bablveita fyrir %s" diff --git a/locale/it/LC_MESSAGES/statusnet.mo b/locale/it/LC_MESSAGES/statusnet.mo index 1e33d6b95..015f5f70b 100644 Binary files a/locale/it/LC_MESSAGES/statusnet.mo and b/locale/it/LC_MESSAGES/statusnet.mo differ diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index 06a8a0a12..00a632ed9 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-12 21:38+0000\n" +"PO-Revision-Date: 2009-11-12 21:39:12+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(r58962); Translate extension (2009-08-03)\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" @@ -3364,31 +3412,31 @@ msgstr "Errore del DB nell'inserire la risposta: %s" 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" @@ -4641,47 +4689,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" @@ -4710,3 +4758,10 @@ msgstr "Quella non è la tua email di ricezione." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Email di ricezione non consentita." + +#, fuzzy +#~ msgid "You are not allowed to change your password" +#~ msgstr "Modifica la tua password" + +#~ msgid "notice id: %s" +#~ msgstr "Nuovo messaggio" diff --git a/locale/ja/LC_MESSAGES/statusnet.mo b/locale/ja/LC_MESSAGES/statusnet.mo index 9bbc582ac..a5e15962e 100644 Binary files a/locale/ja/LC_MESSAGES/statusnet.mo and b/locale/ja/LC_MESSAGES/statusnet.mo differ diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index fd22e5177..dbba05855 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-12 21:38+0000\n" +"PO-Revision-Date: 2009-11-12 21:39:15+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(r58962); Translate extension (2009-08-03)\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 "メール" @@ -3323,31 +3370,31 @@ msgstr "返信を追加する際にデータベースエラー : %s" 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" @@ -4596,47 +4643,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 年前" @@ -4665,3 +4712,10 @@ msgstr "" #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "" + +#, fuzzy +#~ msgid "You are not allowed to change your password" +#~ msgstr "パスワードの変更" + +#~ msgid "notice id: %s" +#~ msgstr "新しい通知" diff --git a/locale/ko/LC_MESSAGES/statusnet.mo b/locale/ko/LC_MESSAGES/statusnet.mo index b2e5f3d92..5d5cebe9a 100644 Binary files a/locale/ko/LC_MESSAGES/statusnet.mo and b/locale/ko/LC_MESSAGES/statusnet.mo differ diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index f521a9f09..23dd573e9 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-12 21:38+0000\n" +"PO-Revision-Date: 2009-11-12 21:39:17+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(r58962); Translate extension (2009-08-03)\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 "이메일" @@ -3329,31 +3377,31 @@ msgstr "답신을 추가 할 때에 데이타베이스 에러 : %s" 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" @@ -4598,47 +4646,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년 전" @@ -4667,3 +4715,10 @@ msgstr "죄송합니다. 귀하의 이메일이 아닙니다." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "죄송합니다. 이메일이 허용되지 않습니다." + +#, fuzzy +#~ msgid "You are not allowed to change your password" +#~ msgstr "비밀번호 바꾸기" + +#~ msgid "notice id: %s" +#~ msgstr "새로운 통지" diff --git a/locale/mk/LC_MESSAGES/statusnet.mo b/locale/mk/LC_MESSAGES/statusnet.mo index 3914f339c..4a09ab212 100644 Binary files a/locale/mk/LC_MESSAGES/statusnet.mo and b/locale/mk/LC_MESSAGES/statusnet.mo differ diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 91f7eaebe..22ebe9b74 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-12 21:38+0000\n" +"PO-Revision-Date: 2009-11-12 21:39:20+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(r58962); Translate extension (2009-08-03)\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 "Е-пошта" @@ -3295,32 +3343,32 @@ msgstr "Одговор од внесот во базата: %s" 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 @@ -4583,47 +4631,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 "пред една година" @@ -4652,3 +4700,6 @@ msgstr "" #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "" + +#~ msgid "notice id: %s" +#~ msgstr "Ново известување" diff --git a/locale/nb/LC_MESSAGES/statusnet.mo b/locale/nb/LC_MESSAGES/statusnet.mo index 80e30b11f..fc2345852 100644 Binary files a/locale/nb/LC_MESSAGES/statusnet.mo and b/locale/nb/LC_MESSAGES/statusnet.mo differ diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index fa895ce1c..fe94f18dd 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-12 21:38+0000\n" +"PO-Revision-Date: 2009-11-12 21:39:23+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(r58962); Translate extension (2009-08-03)\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" @@ -3269,31 +3316,31 @@ msgstr "" 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 @@ -4542,47 +4589,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" @@ -4611,3 +4658,7 @@ msgstr "" #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "" + +#, fuzzy +#~ msgid "You are not allowed to change your password" +#~ msgstr "Endre passordet ditt" diff --git a/locale/nl/LC_MESSAGES/statusnet.mo b/locale/nl/LC_MESSAGES/statusnet.mo index 74e52e10d..b1efe47cd 100644 Binary files a/locale/nl/LC_MESSAGES/statusnet.mo and b/locale/nl/LC_MESSAGES/statusnet.mo differ diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index 42b776809..a2639fdd2 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-12 21:38+0000\n" +"PO-Revision-Date: 2009-11-12 21:39:28+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(r58962); Translate extension (2009-08-03)\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!" +#: 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 "De API-functie is niet aangetroffen!" -#: 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 "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 "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Kon gebruiker niet 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,34 @@ 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 +#, fuzzy +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 +#, fuzzy +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 +#, fuzzy +msgid "Could not save profile." +msgstr "Het profiel kon niet opgeslagen worden." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "Het blokkeren van de gebruiker is mislukt." @@ -204,6 +238,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 +446,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 +540,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 +589,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 +698,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 +709,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 +1090,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 +1221,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 +1256,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 +1362,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 +1371,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 +1393,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 +1739,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 +1870,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 +#, 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 "" +"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 +1925,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 +1946,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 "" + +#: 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 +1988,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 +2246,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 +2269,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 +2282,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 +2311,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 +2353,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 +2505,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 +2667,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 +2676,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 +2685,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 +2722,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 +2732,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 +2743,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 +2834,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 +2935,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 +2946,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 +2958,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 +3146,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 +3260,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 +3339,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 +3379,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 +3404,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 +3412,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 @@ -3359,31 +3487,31 @@ msgstr "" 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 +3519,7 @@ msgstr "Uw profiel ontwerpen" msgid "Other" msgstr "Overige" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Overige instellingen" @@ -3785,21 +3913,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 - abonneren op gebruiker\n" +"leave - abonnement op gebruiker opzeggen\n" +"d - direct bericht aan gebruiker\n" +"get - laatste mededeling van gebruiker opvragen\n" +"whois - profielinformatie van gebruiker opvragen\n" +"fav - laatste mededeling van gebruiker op favorietenlijst " +"zetten\n" +"fav # - mededelingen met aangegeven ID op favorietenlijst " +"zetten\n" +"reply # - antwoorden op de mededeling met het aangegeven ID\n" +"reply - antwoorden op de laatste mededeling van gebruiker\n" +"join - lid worden van groep\n" +"login - verwijzing opvragen naar de webpagina voor aanmelden\n" +"drop - groepslidmaatschap opzeggen\n" +"stats - uw statistieken opvragen\n" +"stop - zelfde als 'off'\n" +"quit - zelfde als 'off'\n" +"sub - zelfde als 'follow'\n" +"unsub - zelfde als 'leave'\n" +"last - zelfde als 'get'\n" +"on - nog niet beschikbaar\n" +"off - nog niet beschikbaar\n" +"nudge - gebruiker porren\n" +"invite - nog niet beschikbaar\n" +"track - nog niet beschikbaar\n" +"untrack - 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." @@ -4063,8 +4225,8 @@ msgstr "Onbekend bestandstype" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "mededelingennummer: %s" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 msgid "Join" @@ -4236,6 +4398,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 +4434,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 +4475,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 @@ -4663,47 +4869,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" @@ -4732,3 +4938,9 @@ msgstr "Dit is niet uw inkomende e-mailadres." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Inkomende e-mail is niet toegestaan." + +#~ msgid "You are not allowed to change your password" +#~ msgstr "U mag uw wachtwoord niet wijzigen" + +#~ msgid "notice id: %s" +#~ msgstr "mededelingennummer: %s" diff --git a/locale/nn/LC_MESSAGES/statusnet.mo b/locale/nn/LC_MESSAGES/statusnet.mo index bf03dffcc..2df4fbc5c 100644 Binary files a/locale/nn/LC_MESSAGES/statusnet.mo and b/locale/nn/LC_MESSAGES/statusnet.mo differ diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index 6de37a959..96df29e7d 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-12 21:38+0000\n" +"PO-Revision-Date: 2009-11-12 21:39:25+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(r58962); Translate extension (2009-08-03)\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" @@ -3345,31 +3393,31 @@ msgstr "Databasefeil, kan ikkje lagra svar: %s" 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" @@ -4621,47 +4669,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" @@ -4690,3 +4738,10 @@ msgstr "Beklager, det er ikkje di inngåande epost addresse." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Beklager, inngåande epost er ikkje tillatt." + +#, fuzzy +#~ msgid "You are not allowed to change your password" +#~ msgstr "Endra passordet ditt" + +#~ msgid "notice id: %s" +#~ msgstr "Ny notis" diff --git a/locale/pl/LC_MESSAGES/statusnet.mo b/locale/pl/LC_MESSAGES/statusnet.mo index 861243ce2..3a3faf90a 100644 Binary files a/locale/pl/LC_MESSAGES/statusnet.mo and b/locale/pl/LC_MESSAGES/statusnet.mo differ diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index 6f5c7433c..499340022 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-12 21:38+0000\n" +"PO-Revision-Date: 2009-11-12 21:39:31+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(r58962); Translate extension (2009-08-03)\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" @@ -3413,31 +3461,31 @@ msgstr "Błąd bazy danych podczas wprowadzania odpowiedzi: %s" 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 @@ -4747,47 +4820,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" @@ -4818,3 +4891,11 @@ msgstr "Przepraszamy, to nie jest twój przychodzący adres e-mail." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Przepraszamy, przychodzący e-mail nie jest dozwolony." + +#, fuzzy +#~ msgid "You are not allowed to change your password" +#~ msgstr "Zmień hasło" + +#, fuzzy +#~ msgid "notice id: %s" +#~ msgstr "Brak identyfikatora wpisu" diff --git a/locale/pt/LC_MESSAGES/statusnet.mo b/locale/pt/LC_MESSAGES/statusnet.mo index 116a7bacd..ad28db804 100644 Binary files a/locale/pt/LC_MESSAGES/statusnet.mo and b/locale/pt/LC_MESSAGES/statusnet.mo differ diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index cd7997a50..3460cc2fa 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-12 21:38+0000\n" +"PO-Revision-Date: 2009-11-12 21:39:33+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(r58962); Translate extension (2009-08-03)\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" @@ -3259,31 +3306,31 @@ msgstr "Ocorreu um erro na base de dados ao inserir a resposta: %s" 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" @@ -4522,47 +4569,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 "" @@ -4591,3 +4638,11 @@ msgstr "" #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "" + +#, fuzzy +#~ msgid "You are not allowed to change your password" +#~ msgstr "Modificar a sua palavra-passe" + +#, fuzzy +#~ msgid "notice id: %s" +#~ msgstr "URI da mensagem inválido" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.mo b/locale/pt_BR/LC_MESSAGES/statusnet.mo index 478729896..bb8d65071 100644 Binary files a/locale/pt_BR/LC_MESSAGES/statusnet.mo and b/locale/pt_BR/LC_MESSAGES/statusnet.mo differ diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index aa7f47cca..228a08f6b 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-12 21:38+0000\n" +"PO-Revision-Date: 2009-11-12 21:39:36+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(r58962); Translate extension (2009-08-03)\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" @@ -3401,31 +3449,31 @@ msgstr "Erro no banco de dados na inserção da reposta: %s" 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" @@ -4691,47 +4739,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" @@ -4760,3 +4808,11 @@ msgstr "Desculpe-me, mas este não é seu endereço de e-mail para recebimento." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Desculpe-me, mas não é permitido o recebimento de emails." + +#, fuzzy +#~ msgid "You are not allowed to change your password" +#~ msgstr "Altere a sua senha" + +#, fuzzy +#~ msgid "notice id: %s" +#~ msgstr "Feed de mensagens de %s" diff --git a/locale/ru/LC_MESSAGES/statusnet.mo b/locale/ru/LC_MESSAGES/statusnet.mo index 7a8ba6e3d..60ba76718 100644 Binary files a/locale/ru/LC_MESSAGES/statusnet.mo and b/locale/ru/LC_MESSAGES/statusnet.mo differ diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index 80bfd1d72..4202d8844 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-12 21:38+0000\n" +"PO-Revision-Date: 2009-11-12 21:39:39+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(r58962); Translate extension (2009-08-03)\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" @@ -3399,31 +3447,31 @@ msgstr "Ошибка баз данных при вставке ответа дл 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" @@ -4671,47 +4719,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 "около года назад" @@ -4740,3 +4788,11 @@ msgstr "Простите, это не Ваш входящий электронн #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Простите, входящих писем нет." + +#, fuzzy +#~ msgid "You are not allowed to change your password" +#~ msgstr "Изменить ваш пароль" + +#, fuzzy +#~ msgid "notice id: %s" +#~ msgstr "Новая запись" diff --git a/locale/statusnet.po b/locale/statusnet.po index 30d449fba..2b5d0b36e 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-12 21:38+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \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 "" @@ -3154,31 +3198,31 @@ msgstr "" 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 @@ -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 index 8c1d54b02..a4d3232e1 100644 Binary files a/locale/sv/LC_MESSAGES/statusnet.mo and b/locale/sv/LC_MESSAGES/statusnet.mo differ diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index f43a686b7..ff7537edd 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-12 21:38+0000\n" +"PO-Revision-Date: 2009-11-12 21:39:41+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(r58962); Translate extension (2009-08-03)\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" @@ -3387,32 +3435,32 @@ msgstr "Databasfel för svar: %s" 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 @@ -4700,47 +4748,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" @@ -4769,3 +4817,10 @@ msgstr "Ledsen, men det är inte din inkommande emailadress." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Ledsen, men inga inkommande email är tillåtna." + +#, fuzzy +#~ msgid "You are not allowed to change your password" +#~ msgstr "Ändra ditt lösenord" + +#~ msgid "notice id: %s" +#~ msgstr "Nytt inlägg" diff --git a/locale/te/LC_MESSAGES/statusnet.mo b/locale/te/LC_MESSAGES/statusnet.mo index d1784c5d8..5a7db18d7 100644 Binary files a/locale/te/LC_MESSAGES/statusnet.mo and b/locale/te/LC_MESSAGES/statusnet.mo differ diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index b044aef99..82b93e719 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-12 21:38+0000\n" +"PO-Revision-Date: 2009-11-12 21:39:44+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(r58962); Translate extension (2009-08-03)\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." @@ -384,17 +432,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 +504,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 +525,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 +573,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 @@ -739,7 +785,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?" @@ -914,7 +960,7 @@ msgstr "అభిరుచులు భద్రమయ్యాయి." #: actions/emailsettings.php:319 msgid "No email address." -msgstr "" +msgstr "ఈమెయిలు చిరునామా లేదు." #: actions/emailsettings.php:326 msgid "Cannot normalize that email address" @@ -1106,9 +1152,8 @@ msgid "No such group." msgstr "అటువంటి గుంపు లేదు." #: actions/getfile.php:75 -#, fuzzy msgid "No such file." -msgstr "అటువంటి సందేశమేమీ లేదు." +msgstr "అటువంటి ఫైలు లేదు." #: actions/getfile.php:79 #, fuzzy @@ -1168,7 +1213,7 @@ msgstr "" #: actions/groupdesignsettings.php:141 msgid "Group design" -msgstr "" +msgstr "గుంపు అలంకారం" #: actions/groupdesignsettings.php:152 msgid "" @@ -1266,15 +1311,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 +1651,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 +1702,7 @@ msgstr "" #: actions/microsummary.php:69 msgid "No current status" -msgstr "" +msgstr "ప్రస్తుత స్థితి ఏమీ లేదు" #: actions/newgroup.php:53 msgid "New group" @@ -1741,7 +1784,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 +1829,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,11 +1850,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 "" @@ -1847,66 +1894,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 "సంకేతపదం భద్రమయ్యింది." @@ -2162,7 +2205,7 @@ msgstr "" #: actions/publictagcloud.php:135 msgid "Tag cloud" -msgstr "" +msgstr "ట్యాగు మేఘం" #: actions/recoverpassword.php:36 msgid "You are already logged in!" @@ -2341,7 +2384,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 +2472,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)" @@ -2570,9 +2613,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" @@ -2667,9 +2709,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,9 +2933,9 @@ msgid "" msgstr "" #: actions/subscriptions.php:52 -#, fuzzy, php-format +#, php-format msgid "%s subscriptions" -msgstr "అన్ని చందాలు" +msgstr "%s చందాలు" #: actions/subscriptions.php:54 #, fuzzy, php-format @@ -2950,9 +2991,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" @@ -3231,32 +3271,32 @@ msgstr "" 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 +3305,7 @@ msgstr "వాడుకరికి ప్రొఫైలు లేదు." msgid "Other" msgstr "ఇతర" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "ఇతర ఎంపికలు" @@ -3656,20 +3696,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 "" @@ -3939,13 +3979,12 @@ msgstr "" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "కొత్త సందేశం" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 -#, fuzzy msgid "Join" -msgstr "ప్రవేశించండి" +msgstr "చేరు" #: lib/leaveform.php:114 #, fuzzy @@ -3973,9 +4012,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 +4062,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 +4098,7 @@ msgstr "%s స్థితి" #: lib/mail.php:438 msgid "SMS confirmation" -msgstr "" +msgstr "SMS నిర్ధారణ" #: lib/mail.php:462 #, php-format @@ -4335,9 +4373,8 @@ msgid "Subscribers" msgstr "చందాదార్లు" #: lib/profileaction.php:157 -#, fuzzy msgid "All subscribers" -msgstr "చందాదార్లు" +msgstr "అందరు చందాదార్లు" #: lib/profileaction.php:177 #, fuzzy @@ -4498,7 +4535,7 @@ msgstr "ఫ్రొఫైలు అమరికలు" #: lib/userprofile.php:249 msgid "Edit" -msgstr "" +msgstr "మార్చు" #: lib/userprofile.php:272 msgid "Send a direct message to this user" @@ -4508,47 +4545,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 +4605,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." @@ -4577,3 +4614,6 @@ msgstr "" #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "" + +#~ msgid "notice id: %s" +#~ msgstr "కొత్త సందేశం" diff --git a/locale/tr/LC_MESSAGES/statusnet.mo b/locale/tr/LC_MESSAGES/statusnet.mo index 49093b4dc..03e33ec01 100644 Binary files a/locale/tr/LC_MESSAGES/statusnet.mo and b/locale/tr/LC_MESSAGES/statusnet.mo differ diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index c25d1a8a6..e5bd043e0 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-12 21:38+0000\n" +"PO-Revision-Date: 2009-11-12 21:39:47+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(r58962); Translate extension (2009-08-03)\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" @@ -3290,32 +3338,32 @@ msgstr "Cevap eklenirken veritabanı hatası: %s" 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 @@ -4581,47 +4629,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" @@ -4650,3 +4698,6 @@ msgstr "" #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "" + +#~ msgid "notice id: %s" +#~ msgstr "Yeni durum mesajı" diff --git a/locale/uk/LC_MESSAGES/statusnet.mo b/locale/uk/LC_MESSAGES/statusnet.mo index e7e6fe0ea..1b4461151 100644 Binary files a/locale/uk/LC_MESSAGES/statusnet.mo and b/locale/uk/LC_MESSAGES/statusnet.mo differ diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index a1a002b85..23ca1e3f6 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-12 21:38+0000\n" +"PO-Revision-Date: 2009-11-12 21:39:49+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(r58962); Translate extension (2009-08-03)\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 "Пошта" @@ -3376,31 +3424,31 @@ msgstr "Помилка бази даних при додаванні відпо 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" @@ -4654,47 +4702,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 "рік тому" @@ -4724,3 +4772,10 @@ msgstr "Вибачте, але це не є вашою електронною а msgid "Sorry, no incoming email allowed." msgstr "" "Вибачте, але не затверджено жодної електронної адреси для вхідної пошти." + +#, fuzzy +#~ msgid "You are not allowed to change your password" +#~ msgstr "Змінити ваш пароль" + +#~ msgid "notice id: %s" +#~ msgstr "Нове повідомлення" diff --git a/locale/vi/LC_MESSAGES/statusnet.mo b/locale/vi/LC_MESSAGES/statusnet.mo index bb42fbee7..2ac624b85 100644 Binary files a/locale/vi/LC_MESSAGES/statusnet.mo and b/locale/vi/LC_MESSAGES/statusnet.mo differ diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index f1b61c263..484368827 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-12 21:38+0000\n" +"PO-Revision-Date: 2009-11-12 21:39:52+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(r58962); Translate extension (2009-08-03)\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" @@ -3425,32 +3473,32 @@ msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s" 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 @@ -4789,47 +4851,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" @@ -4859,3 +4921,10 @@ msgstr "Xin lỗi, đó không phải là địa chỉ email mà bạn nhập v #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Xin lỗi, không có địa chỉ email cho phép." + +#, fuzzy +#~ msgid "You are not allowed to change your password" +#~ msgstr "Thay đổi mật khẩu của bạn" + +#~ msgid "notice id: %s" +#~ msgstr "Thông báo mới" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.mo b/locale/zh_CN/LC_MESSAGES/statusnet.mo index f3b08115d..b0fbc5e4a 100644 Binary files a/locale/zh_CN/LC_MESSAGES/statusnet.mo and b/locale/zh_CN/LC_MESSAGES/statusnet.mo differ diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index 1a5c6d5ba..387ed1805 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-12 21:38+0000\n" +"PO-Revision-Date: 2009-11-12 21:39:55+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(r58962); Translate extension (2009-08-03)\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 "电子邮件" @@ -3350,31 +3398,31 @@ msgstr "添加回复时数据库出错：%s" 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 @@ -4665,47 +4713,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 "一年前" @@ -4734,3 +4782,10 @@ msgstr "对不起，这个发布用的电子邮件属于其他用户。" #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "对不起，发布用的电子邮件无法使用。" + +#, fuzzy +#~ msgid "You are not allowed to change your password" +#~ msgstr "修改密码" + +#~ msgid "notice id: %s" +#~ msgstr "新通告" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.mo b/locale/zh_TW/LC_MESSAGES/statusnet.mo index 36cdef3ba..8bfb97041 100644 Binary files a/locale/zh_TW/LC_MESSAGES/statusnet.mo and b/locale/zh_TW/LC_MESSAGES/statusnet.mo differ diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index 0843684be..2a6099a23 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-12 21:38+0000\n" +"PO-Revision-Date: 2009-11-12 21:39:59+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(r58962); Translate extension (2009-08-03)\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 "電子信箱" @@ -3231,32 +3279,32 @@ msgstr "增加回覆時,資料庫發生錯誤: %s" 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 @@ -4505,47 +4553,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 "" @@ -4574,3 +4622,7 @@ msgstr "" #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "" + +#, fuzzy +#~ msgid "notice id: %s" +#~ msgstr "新訊息" -- cgit v1.2.3-54-g00ecf From cefbad0159c6be0aa6e75c85dd2e4b9f1e412116 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Thu, 12 Nov 2009 10:38:45 -0500 Subject: Also delete the OpenID provider data when a user is deleted --- plugins/OpenID/OpenIDPlugin.php | 1 + 1 file changed, 1 insertion(+) 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; } } -- cgit v1.2.3-54-g00ecf From ed690615de8f6433a1a4d9a8fc7c28385af47d8a Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Thu, 12 Nov 2009 20:12:00 -0500 Subject: Added a User_username table that links the external username with a StatusNet user_id Added EmailAuthenticationPlugin Added ReverseUsernameAuthenticationPlugin Changed the StartChangePassword and EndChangePassword events to take a user, instead of a nickname User::allowed_nickname was declared non-static, but used as if it was static, so I made the declaration static --- EVENTS.txt | 4 +- actions/passwordsettings.php | 4 +- classes/User.php | 16 +- classes/statusnet.ini | 10 ++ index.php | 1 - lib/util.php | 1 + plugins/Authentication/AuthenticationPlugin.php | 177 ++++++++++++++------- plugins/Authentication/User_username.php | 25 +++ .../EmailAuthenticationPlugin.php | 54 +++++++ plugins/EmailAuthentication/README | 7 + .../LdapAuthenticationPlugin.php | 56 +++---- plugins/LdapAuthentication/README | 5 +- plugins/ReverseUsernameAuthentication/README | 26 +++ .../ReverseUsernameAuthenticationPlugin.php | 58 +++++++ 14 files changed, 349 insertions(+), 95 deletions(-) create mode 100644 plugins/Authentication/User_username.php create mode 100644 plugins/EmailAuthentication/EmailAuthenticationPlugin.php create mode 100644 plugins/EmailAuthentication/README create mode 100644 plugins/ReverseUsernameAuthentication/README create mode 100644 plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php diff --git a/EVENTS.txt b/EVENTS.txt index 3acff277b..c788a9215 100644 --- a/EVENTS.txt +++ b/EVENTS.txt @@ -528,12 +528,12 @@ 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 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/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/index.php b/index.php index b1e4f651e..577b491ed 100644 --- a/index.php +++ b/index.php @@ -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/lib/util.php b/lib/util.php index 68f3520db..4b2a25ead 100644 --- a/lib/util.php +++ b/lib/util.php @@ -1058,6 +1058,7 @@ function common_log($priority, $msg, $filename=null) } } else { common_ensure_syslog(); + error_log($msg); syslog($priority, $msg); } } diff --git a/plugins/Authentication/AuthenticationPlugin.php b/plugins/Authentication/AuthenticationPlugin.php index e3e55fea6..99b61b808 100644 --- a/plugins/Authentication/AuthenticationPlugin.php +++ b/plugins/Authentication/AuthenticationPlugin.php @@ -48,20 +48,20 @@ abstract class AuthenticationPlugin extends Plugin //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; + //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 nickname + * @param username * @param password * @return boolean true if the credentials are valid, false if they are invalid. */ - function checkPassword($nickname, $password) + function checkPassword($username, $password) { return false; } @@ -69,88 +69,116 @@ abstract class AuthenticationPlugin extends Plugin /** * 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 + * @param username + * @return boolean true if the user was created, false if not */ - function autoRegister($nickname) + function autoRegister($username) { - return null; + $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 nickname + * @param username * @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 + * @return boolean true if the password was changed, false if password changing failed for some reason */ - function changePassword($nickname,$oldpassword,$newpassword) + function changePassword($username,$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; + return false; } //------------Below are the methods that connect StatusNet to the implementing Auth plugin------------\\ - function __construct() - { - parent::__construct(); + function onInitializePlugin(){ + if(!isset($this->provider_name)){ + throw new Exception("must specify a provider_name for this authentication provider"); + } } - + function onStartCheckPassword($nickname, $password, &$authenticatedUser){ - if($this->password_changeable){ - $authenticated = $this->checkPassword($nickname, $password); + //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('nickname', $nickname); - if(!$authenticatedUser && $this->autoregistration){ - if($this->autoregister($nickname)){ + $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 = new User_username(); + $user_username->user_id = $authenticatedUser->id; + $user_username->provider_name = $this->provider_name; + $user_username->username = $nickname; + $user_username->created = DB_DataObject_Cast::dateTime(); + $user_username->insert(); + return false; } } - return false; }else{ - if($this->authoritative){ - return false; + if($this->autoregistration){ + $authenticated = $this->checkPassword($nickname, $password); + if($authenticated && $this->autoregister($nickname)){ + $authenticatedUser = User::staticGet('nickname', $nickname); + $user_username = new User_username(); + $user_username->user_id = $authenticatedUser->id; + $user_username->provider_name = $this->provider_name; + $user_username->username = $nickname; + $user_username->created = DB_DataObject_Cast::dateTime(); + $user_username->insert(); + return false; + } } } - //we're not authoritative, so let other handlers try + } + if($this->authoritative){ + return false; }else{ - if($this->authoritative){ - //since we're authoritative, no other plugin could do this - throw new Exception(_('Password changing is not allowed')); - } + //we're not authoritative, so let other handlers try + return; } } - function onStartChangePassword($nickname,$oldpassword,$newpassword) + function onStartChangePassword($user,$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->authoritative){ - //since we're authoritative, no other plugin could do this - throw new Exception(_('Password changing failed')); + $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{ - //let another handler try - return null; + 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{ @@ -164,9 +192,42 @@ abstract class AuthenticationPlugin extends Plugin function onStartAccountSettingsPasswordMenuItem($widget) { if($this->authoritative && !$this->password_changeable){ - //since we're authoritative, no other plugin could change passwords, so do render the menu item + //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..79adeb189 --- /dev/null +++ b/plugins/Authentication/User_username.php @@ -0,0 +1,25 @@ +. + * + * @category Plugin + * @package StatusNet + * @author Craig Andrews + * @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/LdapAuthentication/LdapAuthenticationPlugin.php b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php index ded5cf299..865154730 100644 --- a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php +++ b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php @@ -48,20 +48,31 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin 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,48 +87,33 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin } } - function autoRegister($nickname) + function autoRegister($username) { - $entry = $this->ldap_get_user($nickname,$this->attributes); + $entry = $this->ldap_get_user($username,$this->attributes); if($entry){ $registration_data = array(); foreach($this->attributes as $sn_attribute=>$ldap_attribute){ - if($sn_attribute=='email'){ - $registration_data[$sn_attribute]=common_canonical_email($entry->getValue($ldap_attribute,'single')); - }else if($sn_attribute=='nickname'){ - $registration_data[$sn_attribute]=common_canonical_nickname($entry->getValue($ldap_attribute,'single')); - }else{ - $registration_data[$sn_attribute]=$entry->getValue($ldap_attribute,'single'); - } + $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(){ @@ -159,7 +155,7 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin */ function ldap_get_user($username,$attributes=array()){ $ldap = $this->ldap_get_connection(); - $filter = Net_LDAP2_Filter::create($this->attributes['nickname'], 'equals', $username); + $filter = Net_LDAP2_Filter::create($this->attributes['username'], 'equals', $username); $options = array( 'scope' => 'sub', 'attributes' => $attributes diff --git a/plugins/LdapAuthentication/README b/plugins/LdapAuthentication/README index 03647e7c7..b10a1eb93 100644 --- a/plugins/LdapAuthentication/README +++ b/plugins/LdapAuthentication/README @@ -6,7 +6,8 @@ add "addPlugin('ldapAuthentication', array('setting'=>'value', 'setting2'=>'valu Settings ======== -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 @@ -37,6 +39,7 @@ Example Here's an example of an LDAP plugin configuration that connects to Microsoft Active Directory. addPlugin('ldapAuthentication', array( + 'provider_name'=>'Example', 'authoritative'=>true, 'autoregistration'=>true, 'binddn'=>'username', 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 @@ +. + * + * @category Plugin + * @package StatusNet + * @author Craig Andrews + * @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); + } +} -- cgit v1.2.3-54-g00ecf From f60a55d9ec08019c7e1a9b60bc5d34fad61fb088 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Thu, 12 Nov 2009 20:15:10 -0500 Subject: blasted, that should not be there --- lib/util.php | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/util.php b/lib/util.php index 4b2a25ead..68f3520db 100644 --- a/lib/util.php +++ b/lib/util.php @@ -1058,7 +1058,6 @@ function common_log($priority, $msg, $filename=null) } } else { common_ensure_syslog(); - error_log($msg); syslog($priority, $msg); } } -- cgit v1.2.3-54-g00ecf From 21603f02258346aa516db77c1691ee32f180fcbc Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Fri, 13 Nov 2009 11:28:54 +0100 Subject: Fix typo (!. -> !) --- lib/subs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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'); -- cgit v1.2.3-54-g00ecf From 12d3c44480465b494010f6f1e56d831cf3567f06 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Fri, 13 Nov 2009 12:13:38 +0000 Subject: Added hAtom for profile and group lists --- lib/grouplist.php | 6 +++--- lib/profilelist.php | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) 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/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', -- cgit v1.2.3-54-g00ecf From 1bac324072a2d8d53b7e8c038d781b0af21eb99e Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Fri, 13 Nov 2009 12:26:24 +0000 Subject: Moved class="pagination" to child element and removed element --- lib/action.php | 4 +--- plugins/Facebook/facebookaction.php | 4 +--- plugins/Facebook/facebookhome.php | 4 +--- plugins/InfiniteScroll/infinitescroll.js | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) 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/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..09b2d4f72 100644 --- a/plugins/InfiniteScroll/infinitescroll.js +++ b/plugins/InfiniteScroll/infinitescroll.js @@ -6,7 +6,7 @@ jQuery(document).ready(function($){ loadingImg : $('address .url')[0].href+'plugins/InfiniteScroll/ajax-loader.gif', text : "Loading the next set of posts...", donetext : "Congratulations, you\'ve reached the end of the Internet.", - navSelector : "div.pagination", + navSelector : ".pagination", contentSelector : "#notices_primary ol.notices", itemSelector : "#notices_primary ol.notices li" },function(){ -- cgit v1.2.3-54-g00ecf From e8e0cdb4d6f2e35389092dd173104b064c14b12c Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Fri, 13 Nov 2009 13:21:16 +0000 Subject: Added .processing styles for pagination --- theme/identica/css/display.css | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 4e3bc5980..69f58bc21 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -330,3 +330,19 @@ background-position:10% -187px; .pagination .nav_next a { background-position:105% -252px; } +.pagination .nav .processing { +background-image:url(../../base/images/icons/icon_processing.gif); +background-repeat:no-repeat; +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%; +} + + -- cgit v1.2.3-54-g00ecf From b9562cbb18a7b8f3f01bcbc8540933c4dfc10fb9 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Fri, 13 Nov 2009 12:54:27 -0500 Subject: autoregister returns the new user on success (not just true) --- plugins/Authentication/AuthenticationPlugin.php | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/plugins/Authentication/AuthenticationPlugin.php b/plugins/Authentication/AuthenticationPlugin.php index 99b61b808..f061e456d 100644 --- a/plugins/Authentication/AuthenticationPlugin.php +++ b/plugins/Authentication/AuthenticationPlugin.php @@ -70,7 +70,7 @@ abstract class AuthenticationPlugin extends Plugin * 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 boolean true if the user was created, false if not + * @return mixed instance of User, or false (if user couldn't be created) */ function autoRegister($username) { @@ -134,15 +134,18 @@ abstract class AuthenticationPlugin extends Plugin }else{ if($this->autoregistration){ $authenticated = $this->checkPassword($nickname, $password); - if($authenticated && $this->autoregister($nickname)){ - $authenticatedUser = User::staticGet('nickname', $nickname); - $user_username = new User_username(); - $user_username->user_id = $authenticatedUser->id; - $user_username->provider_name = $this->provider_name; - $user_username->username = $nickname; - $user_username->created = DB_DataObject_Cast::dateTime(); - $user_username->insert(); - return false; + if($authenticated){ + $user = $this->autoregister($nickname); + if($user){ + $authenticatedUser = $user; + $user_username = new User_username(); + $user_username->user_id = $authenticatedUser->id; + $user_username->provider_name = $this->provider_name; + $user_username->username = $nickname; + $user_username->created = DB_DataObject_Cast::dateTime(); + $user_username->insert(); + return false; + } } } } -- cgit v1.2.3-54-g00ecf From 5494eb61465595466b897fdd88efda250c1107e2 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Fri, 13 Nov 2009 13:11:28 -0500 Subject: Refactor User_username object creation to reuse code --- plugins/Authentication/AuthenticationPlugin.php | 14 ++------------ plugins/Authentication/User_username.php | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/plugins/Authentication/AuthenticationPlugin.php b/plugins/Authentication/AuthenticationPlugin.php index f061e456d..a76848b04 100644 --- a/plugins/Authentication/AuthenticationPlugin.php +++ b/plugins/Authentication/AuthenticationPlugin.php @@ -122,12 +122,7 @@ abstract class AuthenticationPlugin extends Plugin $authenticated = $this->checkPassword($nickname, $password); if($authenticated){ $authenticatedUser = User::staticGet('nickname', $nickname); - $user_username = new User_username(); - $user_username->user_id = $authenticatedUser->id; - $user_username->provider_name = $this->provider_name; - $user_username->username = $nickname; - $user_username->created = DB_DataObject_Cast::dateTime(); - $user_username->insert(); + User_username::register($authenticatedUser,$nickname,$this->provider_name); return false; } } @@ -138,12 +133,7 @@ abstract class AuthenticationPlugin extends Plugin $user = $this->autoregister($nickname); if($user){ $authenticatedUser = $user; - $user_username = new User_username(); - $user_username->user_id = $authenticatedUser->id; - $user_username->provider_name = $this->provider_name; - $user_username->username = $nickname; - $user_username->created = DB_DataObject_Cast::dateTime(); - $user_username->insert(); + User_username::register($authenticatedUser,$nickname,$this->provider_name); return false; } } diff --git a/plugins/Authentication/User_username.php b/plugins/Authentication/User_username.php index 79adeb189..f30f60d83 100644 --- a/plugins/Authentication/User_username.php +++ b/plugins/Authentication/User_username.php @@ -22,4 +22,25 @@ class User_username extends Memcached_DataObject /* 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; + } + } } -- cgit v1.2.3-54-g00ecf From 9a2a01c51e1fd9a344680087014329df00e74b5b Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Fri, 13 Nov 2009 19:35:27 +0000 Subject: Rearranged selectors for processing style --- theme/identica/css/display.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 69f58bc21..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; @@ -332,7 +337,6 @@ background-position:105% -252px; } .pagination .nav .processing { background-image:url(../../base/images/icons/icon_processing.gif); -background-repeat:no-repeat; box-shadow:none; -moz-box-shadow:none; -webkit-box-shadow:none; @@ -345,4 +349,3 @@ background-position:90% 47%; background-position:10% 47%; } - -- cgit v1.2.3-54-g00ecf From 8dcde1c3a8c705054455419afed917a7098fab2e Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Fri, 13 Nov 2009 21:48:04 +0100 Subject: Localisation updates from translatewiki.net (2009-11-13) --- locale/ar/LC_MESSAGES/statusnet.mo | Bin 22584 -> 29926 bytes locale/ar/LC_MESSAGES/statusnet.po | 220 +++++++++++++++++----------------- locale/bg/LC_MESSAGES/statusnet.mo | Bin 83559 -> 83558 bytes locale/bg/LC_MESSAGES/statusnet.po | 18 +-- locale/ca/LC_MESSAGES/statusnet.mo | Bin 71507 -> 71506 bytes locale/ca/LC_MESSAGES/statusnet.po | 18 +-- locale/cs/LC_MESSAGES/statusnet.mo | Bin 35137 -> 35136 bytes locale/cs/LC_MESSAGES/statusnet.po | 14 +-- locale/de/LC_MESSAGES/statusnet.mo | Bin 71701 -> 71700 bytes locale/de/LC_MESSAGES/statusnet.po | 18 +-- locale/el/LC_MESSAGES/statusnet.mo | Bin 29484 -> 29552 bytes locale/el/LC_MESSAGES/statusnet.po | 21 ++-- locale/en_GB/LC_MESSAGES/statusnet.mo | Bin 66327 -> 67062 bytes locale/en_GB/LC_MESSAGES/statusnet.po | 142 +++++++++------------- locale/es/LC_MESSAGES/statusnet.mo | Bin 70651 -> 70650 bytes locale/es/LC_MESSAGES/statusnet.po | 18 +-- locale/fi/LC_MESSAGES/statusnet.mo | Bin 74355 -> 74354 bytes locale/fi/LC_MESSAGES/statusnet.po | 18 +-- locale/fr/LC_MESSAGES/statusnet.mo | Bin 76895 -> 77122 bytes locale/fr/LC_MESSAGES/statusnet.po | 47 +++----- locale/ga/LC_MESSAGES/statusnet.mo | Bin 74535 -> 74534 bytes locale/ga/LC_MESSAGES/statusnet.po | 18 +-- locale/he/LC_MESSAGES/statusnet.mo | Bin 38631 -> 38630 bytes locale/he/LC_MESSAGES/statusnet.po | 14 +-- locale/is/LC_MESSAGES/statusnet.mo | Bin 62875 -> 62874 bytes locale/is/LC_MESSAGES/statusnet.po | 19 +-- locale/it/LC_MESSAGES/statusnet.mo | Bin 70765 -> 70764 bytes locale/it/LC_MESSAGES/statusnet.po | 18 +-- locale/ja/LC_MESSAGES/statusnet.mo | Bin 47907 -> 47906 bytes locale/ja/LC_MESSAGES/statusnet.po | 18 +-- locale/ko/LC_MESSAGES/statusnet.mo | Bin 75097 -> 75096 bytes locale/ko/LC_MESSAGES/statusnet.po | 18 +-- locale/mk/LC_MESSAGES/statusnet.mo | Bin 45259 -> 45258 bytes locale/mk/LC_MESSAGES/statusnet.po | 14 +-- locale/nb/LC_MESSAGES/statusnet.mo | Bin 23307 -> 23373 bytes locale/nb/LC_MESSAGES/statusnet.po | 17 ++- locale/nl/LC_MESSAGES/statusnet.mo | Bin 99610 -> 100085 bytes locale/nl/LC_MESSAGES/statusnet.po | 42 +++---- locale/nn/LC_MESSAGES/statusnet.mo | Bin 67929 -> 67928 bytes locale/nn/LC_MESSAGES/statusnet.po | 18 +-- locale/pl/LC_MESSAGES/statusnet.mo | Bin 96011 -> 96010 bytes locale/pl/LC_MESSAGES/statusnet.po | 19 +-- locale/pt/LC_MESSAGES/statusnet.mo | Bin 25469 -> 25533 bytes locale/pt/LC_MESSAGES/statusnet.po | 21 ++-- locale/pt_BR/LC_MESSAGES/statusnet.mo | Bin 70361 -> 70360 bytes locale/pt_BR/LC_MESSAGES/statusnet.po | 19 +-- locale/ru/LC_MESSAGES/statusnet.mo | Bin 94452 -> 94451 bytes locale/ru/LC_MESSAGES/statusnet.po | 19 +-- locale/statusnet.po | 6 +- locale/sv/LC_MESSAGES/statusnet.mo | Bin 58861 -> 58860 bytes locale/sv/LC_MESSAGES/statusnet.po | 18 +-- locale/te/LC_MESSAGES/statusnet.mo | Bin 48739 -> 52337 bytes locale/te/LC_MESSAGES/statusnet.po | 176 ++++++++++++--------------- locale/tr/LC_MESSAGES/statusnet.mo | Bin 34654 -> 34653 bytes locale/tr/LC_MESSAGES/statusnet.po | 14 +-- locale/uk/LC_MESSAGES/statusnet.mo | Bin 92216 -> 92215 bytes locale/uk/LC_MESSAGES/statusnet.po | 18 +-- locale/vi/LC_MESSAGES/statusnet.mo | Bin 68028 -> 68027 bytes locale/vi/LC_MESSAGES/statusnet.po | 18 +-- locale/zh_CN/LC_MESSAGES/statusnet.mo | Bin 64800 -> 64799 bytes locale/zh_CN/LC_MESSAGES/statusnet.po | 18 +-- locale/zh_TW/LC_MESSAGES/statusnet.mo | Bin 18784 -> 18835 bytes locale/zh_TW/LC_MESSAGES/statusnet.po | 17 ++- 63 files changed, 440 insertions(+), 653 deletions(-) diff --git a/locale/ar/LC_MESSAGES/statusnet.mo b/locale/ar/LC_MESSAGES/statusnet.mo index ff3af0e18..a6b411e4d 100644 Binary files a/locale/ar/LC_MESSAGES/statusnet.mo and b/locale/ar/LC_MESSAGES/statusnet.mo differ diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index aa58a5689..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-12 21:38+0000\n" -"PO-Revision-Date: 2009-11-12 21:38:34+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(r58962); 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" @@ -137,7 +137,6 @@ msgid "" msgstr "" #: actions/apiaccountupdatedeliverydevice.php:132 -#, fuzzy msgid "Could not update user." msgstr "تعذّر تحديث المستخدم." @@ -160,9 +159,8 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:187 #: actions/apiaccountupdateprofilecolors.php:142 -#, fuzzy msgid "Could not update your design." -msgstr "تعذر تحديث المجموعة." +msgstr "تعذّر تحديث تصميمك." #: actions/apiaccountupdateprofilebackgroundimage.php:194 #: actions/apiaccountupdateprofilecolors.php:185 @@ -180,7 +178,7 @@ msgstr "تعذّر حفظ الملف الشخصي." #: actions/apiblockcreate.php:108 msgid "Block user failed." -msgstr "" +msgstr "فشل منع المستخدم." #: actions/apiblockdestroy.php:107 msgid "Unblock user failed." @@ -216,7 +214,7 @@ msgstr "" #: actions/apidirectmessage.php:101 #, php-format msgid "Direct messages to %s" -msgstr "" +msgstr "رسالة مباشرة %s" #: actions/apidirectmessage.php:105 #, php-format @@ -397,7 +395,7 @@ msgstr "مجموعات %s" #: actions/apigrouplistall.php:94 #, php-format msgid "groups on %s" -msgstr "" +msgstr "مجموعات %s" #: actions/apigrouplist.php:95 #, php-format @@ -458,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 @@ -489,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 @@ -540,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 @@ -679,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 @@ -715,7 +712,7 @@ msgstr "لم يوجد رمز التأكيد." #: actions/confirmaddress.php:85 msgid "That confirmation code is not for you!" -msgstr "" +msgstr "رمز التأكيد ليس لك!" #: actions/confirmaddress.php:90 #, php-format @@ -773,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" @@ -785,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." @@ -793,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" @@ -801,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." @@ -815,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 @@ -888,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." @@ -982,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 @@ -996,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." @@ -1098,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!" @@ -1114,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." @@ -1157,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" @@ -1189,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" @@ -1204,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 @@ -1232,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 @@ -1341,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" @@ -1406,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." @@ -1457,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:" @@ -1470,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 "" @@ -1564,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." @@ -1671,7 +1668,7 @@ msgstr "" #: actions/microsummary.php:69 msgid "No current status" -msgstr "" +msgstr "لا حالة حالية" #: actions/newgroup.php:53 msgid "New group" @@ -1679,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" @@ -1714,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" @@ -1801,11 +1798,11 @@ 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" @@ -1817,7 +1814,7 @@ msgstr "" #: actions/othersettings.php:108 msgid " (free service)" -msgstr "" +msgstr " (خدمة حرة)" #: actions/othersettings.php:116 msgid "Shorten URLs with" @@ -1880,11 +1877,11 @@ msgstr "" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" -msgstr "أكد" +msgstr "أكّد" #: actions/passwordsettings.php:113 msgid "same as password above" -msgstr "" +msgstr "نفس كلمة السر أعلاه" #: actions/passwordsettings.php:117 msgid "Change" @@ -1908,7 +1905,7 @@ msgstr "خطأ أثناء حفظ المستخدم؛ غير صالح." #: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." -msgstr "" +msgstr "تعذّر حفظ كلمة السر الجديدة." #: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." @@ -1923,7 +1920,7 @@ msgstr "" #: actions/peoplesearch.php:58 msgid "People search" -msgstr "" +msgstr "بحث الأشخاص" #: actions/peopletag.php:70 #, php-format @@ -1946,7 +1943,7 @@ msgstr "" #: actions/profilesettings.php:60 msgid "Profile settings" -msgstr "" +msgstr "إعدادات الملف الشخصي" #: actions/profilesettings.php:71 msgid "" @@ -1983,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" @@ -2060,7 +2057,7 @@ msgstr "تعذّر حفظ الملف الشخصي." #: actions/profilesettings.php:336 msgid "Couldn't save tags." -msgstr "" +msgstr "تعذّر حفظ الوسوم." #: actions/profilesettings.php:344 msgid "Settings saved." @@ -2069,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." @@ -2078,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" @@ -2146,7 +2143,7 @@ msgstr "" #: actions/publictagcloud.php:72 msgid "Be the first to post one!" -msgstr "" +msgstr "كن أول من يُرسل!" #: actions/publictagcloud.php:75 #, php-format @@ -2161,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." @@ -2181,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." @@ -2199,7 +2196,7 @@ msgstr "" #: actions/recoverpassword.php:188 msgid "Password recovery" -msgstr "" +msgstr "استعادة كلمة السر" #: actions/recoverpassword.php:191 msgid "Nickname or email address" @@ -2211,7 +2208,7 @@ msgstr "" #: actions/recoverpassword.php:199 actions/recoverpassword.php:200 msgid "Recover" -msgstr "" +msgstr "استرجع" #: actions/recoverpassword.php:208 msgid "Reset password" @@ -2219,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" @@ -2235,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." @@ -2298,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." @@ -2353,7 +2350,7 @@ msgstr "" #: actions/register.php:495 msgid "Creative Commons Attribution 3.0" -msgstr "" +msgstr "المشاع المبدع نسبة المنصف إلى مؤلفه 3.0" #: actions/register.php:496 msgid "" @@ -2400,7 +2397,7 @@ msgstr "اشتراك بعيد" #: actions/remotesubscribe.php:124 msgid "Subscribe to a remote user" -msgstr "" +msgstr "اشترك بمستخدم بعيد" #: actions/remotesubscribe.php:129 msgid "User nickname" @@ -2444,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 @@ -2828,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" @@ -2841,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." @@ -2878,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." @@ -2923,7 +2920,7 @@ msgstr "لست والجًا" #: actions/tagother.php:39 msgid "No id argument." -msgstr "" +msgstr "لا مُدخل هوية." #: actions/tagother.php:65 #, php-format @@ -2995,7 +2992,7 @@ msgstr "" #: actions/unsubscribe.php:84 msgid "No profile with that id." -msgstr "" +msgstr "لا ملف بهذه الهوية." #: actions/unsubscribe.php:98 msgid "Unsubscribed" @@ -3040,7 +3037,7 @@ msgstr "ارفض هذا الاشتراك" #: actions/userauthorization.php:225 msgid "No authorization request!" -msgstr "" +msgstr "لا طلب استيثاق!" #: actions/userauthorization.php:247 msgid "Subscription authorized" @@ -3055,7 +3052,7 @@ msgstr "" #: actions/userauthorization.php:259 msgid "Subscription rejected" -msgstr "" +msgstr "رُفض الاشتراك" #: actions/userauthorization.php:261 msgid "" @@ -3198,7 +3195,7 @@ 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 "" @@ -3258,7 +3255,7 @@ msgstr "الرئيسية" #: lib/action.php:430 msgid "Personal profile and friends timeline" -msgstr "" +msgstr "الملف الشخصي ومسار الأصدقاء الزمني" #: lib/action.php:432 msgid "Account" @@ -3415,7 +3412,7 @@ msgstr "" #: lib/attachmentlist.php:87 msgid "Attachments" -msgstr "" +msgstr "مرفقات" #: lib/attachmentlist.php:265 msgid "Author" @@ -3489,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 @@ -3532,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" @@ -3541,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" @@ -3729,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" @@ -3757,7 +3754,7 @@ msgstr "أتوم" #: lib/feed.php:91 msgid "FOAF" -msgstr "" +msgstr "FOAF" #: lib/galleryaction.php:121 msgid "Filter tags" @@ -3886,7 +3883,7 @@ msgstr "" #: lib/imagefile.php:150 lib/imagefile.php:197 msgid "Unknown file type" -msgstr "" +msgstr "نوع ملف غير معروف" #: lib/jabber.php:192 #, php-format @@ -4002,7 +3999,7 @@ msgstr "" #: lib/mail.php:412 #, php-format msgid "%s status" -msgstr "" +msgstr "حالة %s" #: lib/mail.php:438 msgid "SMS confirmation" @@ -4032,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 @@ -4153,7 +4150,7 @@ msgstr "" #: lib/messageform.php:120 msgid "Send a direct notice" -msgstr "أرسل ملاحظة مباشرة" +msgstr "أرسل إشعارًا مباشرًا" #: lib/messageform.php:146 msgid "To" @@ -4214,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." @@ -4234,7 +4231,7 @@ msgstr "الردود" #: lib/personalgroupnav.php:114 msgid "Favorites" -msgstr "مفضلات" +msgstr "المفضلات" #: lib/personalgroupnav.php:115 msgid "User" @@ -4254,7 +4251,7 @@ msgstr "صندوق الصادر" #: lib/personalgroupnav.php:130 msgid "Your sent messages" -msgstr "" +msgstr "رسائلك المُرسلة" #: lib/personaltagcloudsection.php:56 #, php-format @@ -4319,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" @@ -4348,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 @@ -4376,7 +4373,7 @@ msgstr "(لا شيء)" #: lib/subs.php:48 msgid "Already subscribed!" -msgstr "" +msgstr "مُشترك أصلا!" #: lib/subs.php:52 msgid "User has blocked you." @@ -4391,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." @@ -4485,7 +4483,7 @@ msgstr "قبل سنة تقريبًا" #: lib/webcolor.php:82 #, php-format msgid "%s is not a valid color!" -msgstr "" +msgstr "%s ليس لونًا صحيحًا!" #: lib/webcolor.php:123 #, php-format @@ -4494,7 +4492,7 @@ msgstr "" #: scripts/maildaemon.php:48 msgid "Could not parse message." -msgstr "" +msgstr "تعذّر تحليل الرسالة." #: scripts/maildaemon.php:53 msgid "Not a registered user." @@ -4507,7 +4505,3 @@ msgstr "" #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "" - -#, fuzzy -#~ msgid "You are not allowed to change your password" -#~ msgstr "غير كلمة سرّك" diff --git a/locale/bg/LC_MESSAGES/statusnet.mo b/locale/bg/LC_MESSAGES/statusnet.mo index ed18172d2..518f6949a 100644 Binary files a/locale/bg/LC_MESSAGES/statusnet.mo and b/locale/bg/LC_MESSAGES/statusnet.mo differ diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index 6aff75834..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-12 21:38+0000\n" -"PO-Revision-Date: 2009-11-12 21:38:36+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(r58962); 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" @@ -3389,7 +3389,7 @@ 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" @@ -4623,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 @@ -4741,10 +4742,3 @@ msgstr "Това не е вашият входящ адрес." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Входящата поща не е разрешена." - -#, fuzzy -#~ msgid "You are not allowed to change your password" -#~ msgstr "Смяна на паролата" - -#~ msgid "notice id: %s" -#~ msgstr "Нова бележка" diff --git a/locale/ca/LC_MESSAGES/statusnet.mo b/locale/ca/LC_MESSAGES/statusnet.mo index f6d142e9b..c52451e28 100644 Binary files a/locale/ca/LC_MESSAGES/statusnet.mo and b/locale/ca/LC_MESSAGES/statusnet.mo differ diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index bd19ad23a..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-12 21:38+0000\n" -"PO-Revision-Date: 2009-11-12 21:38:39+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(r58962); 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" @@ -3427,7 +3427,7 @@ 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" @@ -4661,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 @@ -4779,10 +4780,3 @@ msgstr "Perdó, aquest no és el teu correu electrònic entrant permès." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Perdó, no hi ha un correu electrònic entrant permès." - -#, fuzzy -#~ msgid "You are not allowed to change your password" -#~ msgstr "Canviar la teva contrasenya" - -#~ msgid "notice id: %s" -#~ msgstr "Nou avís" diff --git a/locale/cs/LC_MESSAGES/statusnet.mo b/locale/cs/LC_MESSAGES/statusnet.mo index 8ae0c5ef6..e3141e70a 100644 Binary files a/locale/cs/LC_MESSAGES/statusnet.mo and b/locale/cs/LC_MESSAGES/statusnet.mo differ diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index 41e922a19..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-12 21:38+0000\n" -"PO-Revision-Date: 2009-11-12 21:38:42+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(r58962); 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" @@ -3333,7 +3333,7 @@ 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 "" @@ -4579,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 @@ -4697,6 +4698,3 @@ msgstr "" #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "" - -#~ msgid "notice id: %s" -#~ msgstr "Nové sdělení" diff --git a/locale/de/LC_MESSAGES/statusnet.mo b/locale/de/LC_MESSAGES/statusnet.mo index 83ea15c97..b5c2ef5d0 100644 Binary files a/locale/de/LC_MESSAGES/statusnet.mo and b/locale/de/LC_MESSAGES/statusnet.mo differ diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index aad5fa2c7..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-12 21:38+0000\n" -"PO-Revision-Date: 2009-11-12 21:38:44+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(r58962); 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" @@ -3438,7 +3438,7 @@ 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" @@ -4694,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 @@ -4813,10 +4814,3 @@ msgstr "Sorry, das ist nicht deine Adresse für eingehende E-Mails." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Sorry, keinen eingehenden E-Mails gestattet." - -#, fuzzy -#~ msgid "You are not allowed to change your password" -#~ msgstr "Ändere dein Passwort" - -#~ msgid "notice id: %s" -#~ msgstr "Neue Nachricht" diff --git a/locale/el/LC_MESSAGES/statusnet.mo b/locale/el/LC_MESSAGES/statusnet.mo index 4c52ea135..69dc7b9c4 100644 Binary files a/locale/el/LC_MESSAGES/statusnet.mo and b/locale/el/LC_MESSAGES/statusnet.mo differ diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index 61897cbeb..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-12 21:38+0000\n" -"PO-Revision-Date: 2009-11-12 21:38:47+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(r58962); 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" @@ -3292,7 +3292,7 @@ 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 "" @@ -4506,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." @@ -4623,11 +4624,3 @@ msgstr "" #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "" - -#, fuzzy -#~ msgid "You are not allowed to change your password" -#~ msgstr "Αλλάξτε τον κωδικό σας" - -#, fuzzy -#~ msgid "notice id: %s" -#~ msgstr "Μήνυμα" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.mo b/locale/en_GB/LC_MESSAGES/statusnet.mo index 74608c5c2..7998fbcf0 100644 Binary files a/locale/en_GB/LC_MESSAGES/statusnet.mo and b/locale/en_GB/LC_MESSAGES/statusnet.mo differ diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index 9e6780ddc..27fd82b70 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -12,21 +12,20 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-12 21:38+0000\n" -"PO-Revision-Date: 2009-11-12 21:38:50+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(r58962); 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/apiaccountupdatedeliverydevice.php:113 @@ -65,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 @@ -120,9 +119,8 @@ msgstr "Updates from %1$s and friends on %2$s!" #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountupdateprofile.php:97 -#, fuzzy msgid "API method not found." -msgstr "API method not found!" +msgstr "API method not found." #: actions/apiaccountupdatedeliverydevice.php:85 #: actions/apiaccountupdateprofilebackgroundimage.php:86 @@ -162,15 +160,13 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 -#, fuzzy msgid "Unable to save your design settings." -msgstr "Unable to save your Twitter settings!" +msgstr "Unable to save your design settings!" #: actions/apiaccountupdateprofilebackgroundimage.php:187 #: actions/apiaccountupdateprofilecolors.php:142 -#, fuzzy msgid "Could not update your design." -msgstr "Couldn't update user." +msgstr "Could not update your design." #: actions/apiaccountupdateprofilebackgroundimage.php:194 #: actions/apiaccountupdateprofilecolors.php:185 @@ -199,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." @@ -212,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 @@ -254,18 +250,16 @@ 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." @@ -281,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!" @@ -309,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." @@ -382,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." @@ -444,9 +435,9 @@ msgstr "No status with that ID found." #: 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:198 msgid "Not found" @@ -724,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." @@ -806,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" @@ -946,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." @@ -1065,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 @@ -1078,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 @@ -1086,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!" @@ -1114,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" @@ -1149,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 @@ -1194,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 @@ -1217,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 @@ -1746,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." @@ -3392,7 +3378,7 @@ 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" @@ -3884,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" @@ -3929,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." @@ -3976,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" @@ -3997,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" @@ -4072,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." @@ -4410,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" @@ -4625,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 @@ -4649,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" @@ -4719,9 +4700,9 @@ 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 @@ -4743,10 +4724,3 @@ msgstr "Sorry, that is not your incoming e-mail address." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Sorry, no incoming e-mail allowed." - -#, fuzzy -#~ msgid "You are not allowed to change your password" -#~ msgstr "Change your password" - -#~ msgid "notice id: %s" -#~ msgstr "New notice" diff --git a/locale/es/LC_MESSAGES/statusnet.mo b/locale/es/LC_MESSAGES/statusnet.mo index 6972043ab..366d16819 100644 Binary files a/locale/es/LC_MESSAGES/statusnet.mo and b/locale/es/LC_MESSAGES/statusnet.mo differ diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index bcd3ea64e..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-12 21:38+0000\n" -"PO-Revision-Date: 2009-11-12 21:38:53+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(r58962); 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" @@ -3450,7 +3450,7 @@ 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" @@ -4684,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 @@ -4803,10 +4804,3 @@ msgstr "Lo sentimos, pero este no es su dirección de correo entrante." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Lo sentimos, pero no se permite correos entrantes" - -#, fuzzy -#~ msgid "You are not allowed to change your password" -#~ msgstr "Cambia tu contraseña" - -#~ msgid "notice id: %s" -#~ msgstr "Nuevo aviso" diff --git a/locale/fi/LC_MESSAGES/statusnet.mo b/locale/fi/LC_MESSAGES/statusnet.mo index a64023a6d..9cd1fdbfa 100644 Binary files a/locale/fi/LC_MESSAGES/statusnet.mo and b/locale/fi/LC_MESSAGES/statusnet.mo differ diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index 97bd0b253..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-12 21:38+0000\n" -"PO-Revision-Date: 2009-11-12 21:38:58+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(r58962); 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" @@ -3398,7 +3398,7 @@ 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" @@ -4637,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 @@ -4755,10 +4756,3 @@ msgstr "Valitettavasti tuo ei ole oikea osoite sähköpostipäivityksille." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Valitettavasti päivitysten teko sähköpostilla ei ole sallittua." - -#, fuzzy -#~ msgid "You are not allowed to change your password" -#~ msgstr "Vaihda salasanasi" - -#~ msgid "notice id: %s" -#~ msgstr "Uusi päivitys" diff --git a/locale/fr/LC_MESSAGES/statusnet.mo b/locale/fr/LC_MESSAGES/statusnet.mo index 059d75717..1549319bb 100644 Binary files a/locale/fr/LC_MESSAGES/statusnet.mo and b/locale/fr/LC_MESSAGES/statusnet.mo differ diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 3531e335f..70d66e8eb 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -2,18 +2,19 @@ # # 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-12 21:38+0000\n" -"PO-Revision-Date: 2009-11-12 21:39:00+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(r58962); 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" @@ -474,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 @@ -499,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." @@ -637,9 +638,8 @@ msgid "%s blocked profiles, 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 msgid "Unblock user from group" @@ -694,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 @@ -781,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" @@ -1130,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." @@ -1179,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." @@ -1203,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 @@ -3396,7 +3391,7 @@ 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" @@ -4648,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 @@ -4765,10 +4761,3 @@ msgstr "Désolé, ceci n'est pas votre adresse de courriel entrant." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Désolé, la réception de courriels n'est pas permise. " - -#, fuzzy -#~ msgid "You are not allowed to change your password" -#~ msgstr "Modifier votre mot de passe" - -#~ msgid "notice id: %s" -#~ msgstr "Nouveau statut" diff --git a/locale/ga/LC_MESSAGES/statusnet.mo b/locale/ga/LC_MESSAGES/statusnet.mo index 157f791ac..fa63d16af 100644 Binary files a/locale/ga/LC_MESSAGES/statusnet.mo and b/locale/ga/LC_MESSAGES/statusnet.mo differ diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index d8b2f76d7..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-12 21:38+0000\n" -"PO-Revision-Date: 2009-11-12 21:39:04+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(r58962); 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" @@ -3455,7 +3455,7 @@ 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" @@ -4801,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 @@ -4924,10 +4925,3 @@ msgstr "Ise é un enderezo IM incorrecto." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Aivá, non se permiten correos entrantes." - -#, fuzzy -#~ msgid "You are not allowed to change your password" -#~ msgstr "Cambiar contrasinal" - -#~ msgid "notice id: %s" -#~ msgstr "Novo chío" diff --git a/locale/he/LC_MESSAGES/statusnet.mo b/locale/he/LC_MESSAGES/statusnet.mo index 821468374..51329ffd0 100644 Binary files a/locale/he/LC_MESSAGES/statusnet.mo and b/locale/he/LC_MESSAGES/statusnet.mo differ diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 3499f2a5d..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-12 21:38+0000\n" -"PO-Revision-Date: 2009-11-12 21:39:06+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(r58962); 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" @@ -3327,7 +3327,7 @@ 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 "" @@ -4572,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 @@ -4692,6 +4693,3 @@ msgstr "" #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "" - -#~ msgid "notice id: %s" -#~ msgstr "הודעה חדשה" diff --git a/locale/is/LC_MESSAGES/statusnet.mo b/locale/is/LC_MESSAGES/statusnet.mo index 06c9153d1..bf148d7fa 100644 Binary files a/locale/is/LC_MESSAGES/statusnet.mo and b/locale/is/LC_MESSAGES/statusnet.mo differ diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index c8cae147b..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-12 21:38+0000\n" -"PO-Revision-Date: 2009-11-12 21:39:09+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(r58962); 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" @@ -3346,7 +3346,7 @@ 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 "" @@ -4564,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 @@ -4680,11 +4681,3 @@ msgstr "Afsakið en þetta er ekki móttökutölvupóstfangið þitt." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Því miður er móttökutölvupóstur ekki leyfður." - -#, fuzzy -#~ msgid "You are not allowed to change your password" -#~ msgstr "Breyta lykilorðinu þínu" - -#, fuzzy -#~ msgid "notice id: %s" -#~ msgstr "Bablveita fyrir %s" diff --git a/locale/it/LC_MESSAGES/statusnet.mo b/locale/it/LC_MESSAGES/statusnet.mo index 015f5f70b..a215ac0ac 100644 Binary files a/locale/it/LC_MESSAGES/statusnet.mo and b/locale/it/LC_MESSAGES/statusnet.mo differ diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index 00a632ed9..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-12 21:38+0000\n" -"PO-Revision-Date: 2009-11-12 21:39:12+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(r58962); 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" @@ -3407,7 +3407,7 @@ 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" @@ -4640,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 @@ -4758,10 +4759,3 @@ msgstr "Quella non è la tua email di ricezione." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Email di ricezione non consentita." - -#, fuzzy -#~ msgid "You are not allowed to change your password" -#~ msgstr "Modifica la tua password" - -#~ msgid "notice id: %s" -#~ msgstr "Nuovo messaggio" diff --git a/locale/ja/LC_MESSAGES/statusnet.mo b/locale/ja/LC_MESSAGES/statusnet.mo index a5e15962e..91a049b32 100644 Binary files a/locale/ja/LC_MESSAGES/statusnet.mo and b/locale/ja/LC_MESSAGES/statusnet.mo differ diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index dbba05855..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-12 21:38+0000\n" -"PO-Revision-Date: 2009-11-12 21:39:15+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(r58962); 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" @@ -3365,7 +3365,7 @@ 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 "" @@ -4594,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 @@ -4712,10 +4713,3 @@ msgstr "" #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "" - -#, fuzzy -#~ msgid "You are not allowed to change your password" -#~ msgstr "パスワードの変更" - -#~ msgid "notice id: %s" -#~ msgstr "新しい通知" diff --git a/locale/ko/LC_MESSAGES/statusnet.mo b/locale/ko/LC_MESSAGES/statusnet.mo index 5d5cebe9a..ad6a2eca8 100644 Binary files a/locale/ko/LC_MESSAGES/statusnet.mo and b/locale/ko/LC_MESSAGES/statusnet.mo differ diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index 23dd573e9..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-12 21:38+0000\n" -"PO-Revision-Date: 2009-11-12 21:39:17+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(r58962); 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" @@ -3372,7 +3372,7 @@ 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까지 메시지" @@ -4597,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 @@ -4715,10 +4716,3 @@ msgstr "죄송합니다. 귀하의 이메일이 아닙니다." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "죄송합니다. 이메일이 허용되지 않습니다." - -#, fuzzy -#~ msgid "You are not allowed to change your password" -#~ msgstr "비밀번호 바꾸기" - -#~ msgid "notice id: %s" -#~ msgstr "새로운 통지" diff --git a/locale/mk/LC_MESSAGES/statusnet.mo b/locale/mk/LC_MESSAGES/statusnet.mo index 4a09ab212..cce86e74d 100644 Binary files a/locale/mk/LC_MESSAGES/statusnet.mo and b/locale/mk/LC_MESSAGES/statusnet.mo differ diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 22ebe9b74..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-12 21:38+0000\n" -"PO-Revision-Date: 2009-11-12 21:39:20+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(r58962); 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" @@ -3338,7 +3338,7 @@ 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 "" @@ -4582,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 @@ -4700,6 +4701,3 @@ msgstr "" #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "" - -#~ msgid "notice id: %s" -#~ msgstr "Ново известување" diff --git a/locale/nb/LC_MESSAGES/statusnet.mo b/locale/nb/LC_MESSAGES/statusnet.mo index fc2345852..15f13ca51 100644 Binary files a/locale/nb/LC_MESSAGES/statusnet.mo and b/locale/nb/LC_MESSAGES/statusnet.mo differ diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index fe94f18dd..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-12 21:38+0000\n" -"PO-Revision-Date: 2009-11-12 21:39:23+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(r58962); 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" @@ -3311,7 +3311,7 @@ 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 "" @@ -4540,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." @@ -4658,7 +4659,3 @@ msgstr "" #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "" - -#, fuzzy -#~ msgid "You are not allowed to change your password" -#~ msgstr "Endre passordet ditt" diff --git a/locale/nl/LC_MESSAGES/statusnet.mo b/locale/nl/LC_MESSAGES/statusnet.mo index b1efe47cd..4fcdabaed 100644 Binary files a/locale/nl/LC_MESSAGES/statusnet.mo and b/locale/nl/LC_MESSAGES/statusnet.mo differ diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index a2639fdd2..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-12 21:38+0000\n" -"PO-Revision-Date: 2009-11-12 21:39:28+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(r58962); 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" @@ -123,9 +123,8 @@ msgstr "Updates van %1$s en vrienden op %2$s." #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apiaccountupdateprofile.php:97 -#, fuzzy msgid "API method not found." -msgstr "De API-functie is niet aangetroffen!" +msgstr "De API-functie is niet aangetroffen." #: actions/apiaccountupdatedeliverydevice.php:85 #: actions/apiaccountupdateprofilebackgroundimage.php:86 @@ -145,11 +144,12 @@ 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 -#, fuzzy msgid "Could not update user." -msgstr "Kon gebruiker niet actualiseren." +msgstr "Het was niet mogelijk de gebruiker te actualiseren." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 @@ -167,13 +167,11 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 -#, fuzzy msgid "Unable to save your design settings." -msgstr "Het was niet mogelijk om uw ontwerpinstellingen op te slaan!" +msgstr "Het was niet mogelijk om uw ontwerpinstellingen op te slaan." #: actions/apiaccountupdateprofilebackgroundimage.php:187 #: actions/apiaccountupdateprofilecolors.php:142 -#, fuzzy msgid "Could not update your design." msgstr "Het was niet mogelijk uw ontwerp bij te werken." @@ -187,9 +185,8 @@ msgid "User has no profile." msgstr "Deze gebruiker heeft geen profiel." #: actions/apiaccountupdateprofile.php:147 -#, fuzzy msgid "Could not save profile." -msgstr "Het profiel kon niet opgeslagen worden." +msgstr "Het was niet mogelijk het profiel op te slaan." #: actions/apiblockcreate.php:108 msgid "Block user failed." @@ -1874,7 +1871,7 @@ msgstr "" "newnotice%%%%?status_textarea=%s)!" #: actions/noticesearch.php:124 -#, fuzzy, php-format +#, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" @@ -1948,7 +1945,7 @@ msgstr "Overige instellingen beheren." #: actions/othersettings.php:108 msgid " (free service)" -msgstr "" +msgstr " (gratis dienst)" #: actions/othersettings.php:116 msgid "Shorten URLs with" @@ -3482,7 +3479,7 @@ 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!" @@ -3607,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" @@ -4188,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" @@ -4226,7 +4223,7 @@ msgstr "Onbekend bestandstype" #: lib/jabber.php:192 #, php-format msgid "[%s]" -msgstr "" +msgstr "[%s]" #: lib/joinform.php:114 msgid "Join" @@ -4822,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 @@ -4938,9 +4936,3 @@ msgstr "Dit is niet uw inkomende e-mailadres." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Inkomende e-mail is niet toegestaan." - -#~ msgid "You are not allowed to change your password" -#~ msgstr "U mag uw wachtwoord niet wijzigen" - -#~ msgid "notice id: %s" -#~ msgstr "mededelingennummer: %s" diff --git a/locale/nn/LC_MESSAGES/statusnet.mo b/locale/nn/LC_MESSAGES/statusnet.mo index 2df4fbc5c..d6fc4c4ca 100644 Binary files a/locale/nn/LC_MESSAGES/statusnet.mo and b/locale/nn/LC_MESSAGES/statusnet.mo differ diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index 96df29e7d..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-12 21:38+0000\n" -"PO-Revision-Date: 2009-11-12 21:39:25+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(r58962); 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" @@ -3388,7 +3388,7 @@ 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" @@ -4620,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 @@ -4738,10 +4739,3 @@ msgstr "Beklager, det er ikkje di inngåande epost addresse." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Beklager, inngåande epost er ikkje tillatt." - -#, fuzzy -#~ msgid "You are not allowed to change your password" -#~ msgstr "Endra passordet ditt" - -#~ msgid "notice id: %s" -#~ msgstr "Ny notis" diff --git a/locale/pl/LC_MESSAGES/statusnet.mo b/locale/pl/LC_MESSAGES/statusnet.mo index 3a3faf90a..2303f0fb2 100644 Binary files a/locale/pl/LC_MESSAGES/statusnet.mo and b/locale/pl/LC_MESSAGES/statusnet.mo differ diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index 499340022..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-12 21:38+0000\n" -"PO-Revision-Date: 2009-11-12 21:39:31+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(r58962); 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" @@ -3456,7 +3456,7 @@ 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!" @@ -4773,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 @@ -4891,11 +4892,3 @@ msgstr "Przepraszamy, to nie jest twój przychodzący adres e-mail." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Przepraszamy, przychodzący e-mail nie jest dozwolony." - -#, fuzzy -#~ msgid "You are not allowed to change your password" -#~ msgstr "Zmień hasło" - -#, fuzzy -#~ msgid "notice id: %s" -#~ msgstr "Brak identyfikatora wpisu" diff --git a/locale/pt/LC_MESSAGES/statusnet.mo b/locale/pt/LC_MESSAGES/statusnet.mo index ad28db804..77ba0509a 100644 Binary files a/locale/pt/LC_MESSAGES/statusnet.mo and b/locale/pt/LC_MESSAGES/statusnet.mo differ diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index 3460cc2fa..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-12 21:38+0000\n" -"PO-Revision-Date: 2009-11-12 21:39:33+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(r58962); 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" @@ -3301,7 +3301,7 @@ 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 "" @@ -4520,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." @@ -4638,11 +4639,3 @@ msgstr "" #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "" - -#, fuzzy -#~ msgid "You are not allowed to change your password" -#~ msgstr "Modificar a sua palavra-passe" - -#, fuzzy -#~ msgid "notice id: %s" -#~ msgstr "URI da mensagem inválido" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.mo b/locale/pt_BR/LC_MESSAGES/statusnet.mo index bb8d65071..58f25061d 100644 Binary files a/locale/pt_BR/LC_MESSAGES/statusnet.mo and b/locale/pt_BR/LC_MESSAGES/statusnet.mo differ diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index 228a08f6b..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-12 21:38+0000\n" -"PO-Revision-Date: 2009-11-12 21:39:36+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(r58962); 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" @@ -3444,7 +3444,7 @@ 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" @@ -4687,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 @@ -4808,11 +4809,3 @@ msgstr "Desculpe-me, mas este não é seu endereço de e-mail para recebimento." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Desculpe-me, mas não é permitido o recebimento de emails." - -#, fuzzy -#~ msgid "You are not allowed to change your password" -#~ msgstr "Altere a sua senha" - -#, fuzzy -#~ msgid "notice id: %s" -#~ msgstr "Feed de mensagens de %s" diff --git a/locale/ru/LC_MESSAGES/statusnet.mo b/locale/ru/LC_MESSAGES/statusnet.mo index 60ba76718..2ee87e9be 100644 Binary files a/locale/ru/LC_MESSAGES/statusnet.mo and b/locale/ru/LC_MESSAGES/statusnet.mo differ diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index 4202d8844..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-12 21:38+0000\n" -"PO-Revision-Date: 2009-11-12 21:39:39+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(r58962); 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" @@ -3442,7 +3442,7 @@ 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" @@ -4670,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 @@ -4788,11 +4789,3 @@ msgstr "Простите, это не Ваш входящий электронн #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Простите, входящих писем нет." - -#, fuzzy -#~ msgid "You are not allowed to change your password" -#~ msgstr "Изменить ваш пароль" - -#, fuzzy -#~ msgid "notice id: %s" -#~ msgstr "Новая запись" diff --git a/locale/statusnet.po b/locale/statusnet.po index 2b5d0b36e..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-12 21:38+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 \n" "Language-Team: LANGUAGE \n" @@ -3193,7 +3193,7 @@ 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 "" @@ -4383,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 diff --git a/locale/sv/LC_MESSAGES/statusnet.mo b/locale/sv/LC_MESSAGES/statusnet.mo index a4d3232e1..93760fe39 100644 Binary files a/locale/sv/LC_MESSAGES/statusnet.mo and b/locale/sv/LC_MESSAGES/statusnet.mo differ diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index ff7537edd..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-12 21:38+0000\n" -"PO-Revision-Date: 2009-11-12 21:39:41+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(r58962); 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" @@ -3430,7 +3430,7 @@ 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" @@ -4695,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 @@ -4817,10 +4818,3 @@ msgstr "Ledsen, men det är inte din inkommande emailadress." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Ledsen, men inga inkommande email är tillåtna." - -#, fuzzy -#~ msgid "You are not allowed to change your password" -#~ msgstr "Ändra ditt lösenord" - -#~ msgid "notice id: %s" -#~ msgstr "Nytt inlägg" diff --git a/locale/te/LC_MESSAGES/statusnet.mo b/locale/te/LC_MESSAGES/statusnet.mo index 5a7db18d7..2b70c53f2 100644 Binary files a/locale/te/LC_MESSAGES/statusnet.mo and b/locale/te/LC_MESSAGES/statusnet.mo differ diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index 82b93e719..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-12 21:38+0000\n" -"PO-Revision-Date: 2009-11-12 21:39:44+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(r58962); 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" @@ -295,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 @@ -690,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 @@ -705,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 " @@ -819,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." @@ -835,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 @@ -968,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." @@ -1005,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 @@ -1031,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." @@ -1074,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" @@ -1101,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" @@ -1111,7 +1106,7 @@ msgstr "జోడింపులు లేవు" #: actions/file.php:51 msgid "No uploaded attachments" -msgstr "" +msgstr "ఎక్కించిన జోడింపులేమీ లేవు" #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1290,7 +1285,7 @@ msgstr "" #: actions/groupmembers.php:473 msgid "Make Admin" -msgstr "" +msgstr "నిర్వాహకున్ని చేయి" #: actions/groupmembers.php:473 msgid "Make this user an admin" @@ -1852,15 +1847,15 @@ msgstr "" #: actions/othersettings.php:108 msgid " (free service)" -msgstr "" +msgstr " (స్వేచ్ఛా సేవ)" #: actions/othersettings.php:116 msgid "Shorten URLs with" -msgstr "" +msgstr "URL కుదింపు సేవ" #: actions/othersettings.php:117 msgid "Automatic shortening service to use." -msgstr "" +msgstr "ఉపయోగించాల్సిన యాంత్రిక కుదింపు సేవ." #: actions/othersettings.php:122 #, fuzzy @@ -1872,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 @@ -1895,9 +1889,8 @@ msgid "Change password" msgstr "సంకేతపదం మార్చుకోండి" #: actions/passwordsettings.php:69 -#, fuzzy msgid "Change your password." -msgstr "సంకేతపదం మార్చుకోండి" +msgstr "మీ సంకేతపదం మార్చుకోండి." #: actions/passwordsettings.php:96 actions/recoverpassword.php:231 #, fuzzy @@ -1995,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" @@ -2047,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 "" @@ -2086,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 @@ -2102,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." @@ -2120,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" @@ -2338,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 @@ -2600,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" @@ -2688,7 +2679,7 @@ msgstr "" #: actions/showgroup.php:482 msgid "Admins" -msgstr "" +msgstr "నిర్వాహకులు" #: actions/showmessage.php:81 msgid "No such message." @@ -2938,9 +2929,9 @@ msgid "%s subscriptions" 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." @@ -2976,9 +2967,8 @@ msgid "SMS" msgstr "" #: actions/tagother.php:33 -#, fuzzy msgid "Not logged in" -msgstr "లోనికి ప్రవేశించలేదు." +msgstr "లోనికి ప్రవేశించలేదు" #: actions/tagother.php:39 #, fuzzy @@ -3014,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." @@ -3090,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" @@ -3266,10 +3254,10 @@ 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:108 lib/personalgroupnav.php:109 msgid "Profile" @@ -3280,13 +3268,12 @@ msgid "Change your profile settings" msgstr "" #: lib/accountsettingsaction.php:112 -#, fuzzy msgid "Upload an avatar" -msgstr "అవతారపు తాజాకరణ విఫలమైంది." +msgstr "ఒక అవతారాన్ని ఎక్కించండి" #: lib/accountsettingsaction.php:116 msgid "Change your password" -msgstr "" +msgstr "మీ సంకేతపదాన్ని మార్చుకోండి" #: lib/accountsettingsaction.php:120 msgid "Change email handling" @@ -3294,7 +3281,7 @@ msgstr "" #: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" -msgstr "" +msgstr "రూపురేఖలు" #: lib/accountsettingsaction.php:124 #, fuzzy @@ -3364,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" @@ -3413,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" @@ -3478,7 +3463,7 @@ msgstr "" #: lib/action.php:1053 msgid "Pagination" -msgstr "" +msgstr "పేజీకరణ" #: lib/action.php:1062 msgid "After" @@ -3550,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" @@ -3731,7 +3719,7 @@ msgstr "" #: lib/designsettings.php:101 msgid "Change background image" -msgstr "" +msgstr "నేపథ్య చిత్రాన్ని మార్చు" #: lib/designsettings.php:105 #, fuzzy @@ -3741,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" @@ -3773,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" @@ -3800,7 +3786,7 @@ msgstr "" #: lib/designsettings.php:257 msgid "Save design" -msgstr "" +msgstr "రూపురేఖలని భద్రపరచు" #: lib/designsettings.php:372 msgid "Bad default color settings: " @@ -3907,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 @@ -3932,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 @@ -3975,26 +3961,24 @@ msgstr "అటువంటి సందేశమేమీ లేదు." #: lib/imagefile.php:150 lib/imagefile.php:197 msgid "Unknown file type" -msgstr "" +msgstr "తెలియని ఫైలు రకం" #: lib/jabber.php:192 #, php-format msgid "[%s]" -msgstr "" +msgstr "[%s]" #: lib/joinform.php:114 msgid "Join" 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 @@ -4124,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 @@ -4253,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 @@ -4273,7 +4256,7 @@ msgstr "జోడించు" #: lib/noticeform.php:184 msgid "Attach a file" -msgstr "" +msgstr "ఒక ఫైలుని జోడించు" #: lib/noticelist.php:478 #, fuzzy @@ -4282,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" @@ -4399,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 @@ -4447,7 +4428,7 @@ msgstr "" #: lib/section.php:106 msgid "More..." -msgstr "" +msgstr "మరింత..." #: lib/subgroupnav.php:83 #, php-format @@ -4496,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." @@ -4505,7 +4487,7 @@ msgstr "చందాని తొలగించలేకపోయాం." #: lib/tagcloudsection.php:56 msgid "None" -msgstr "" +msgstr "ఏమీలేదు" #: lib/topposterssection.php:74 msgid "Top posters" @@ -4520,9 +4502,8 @@ msgid "Unsubscribe" msgstr "" #: lib/userprofile.php:116 -#, fuzzy msgid "Edit Avatar" -msgstr "అవతారం" +msgstr "అవతారాన్ని మార్చు" #: lib/userprofile.php:236 msgid "User actions" @@ -4614,6 +4595,3 @@ msgstr "" #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "" - -#~ msgid "notice id: %s" -#~ msgstr "కొత్త సందేశం" diff --git a/locale/tr/LC_MESSAGES/statusnet.mo b/locale/tr/LC_MESSAGES/statusnet.mo index 03e33ec01..1ee9548bc 100644 Binary files a/locale/tr/LC_MESSAGES/statusnet.mo and b/locale/tr/LC_MESSAGES/statusnet.mo differ diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index e5bd043e0..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-12 21:38+0000\n" -"PO-Revision-Date: 2009-11-12 21:39:47+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(r58962); 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" @@ -3333,7 +3333,7 @@ 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 "" @@ -4580,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 @@ -4698,6 +4699,3 @@ msgstr "" #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "" - -#~ msgid "notice id: %s" -#~ msgstr "Yeni durum mesajı" diff --git a/locale/uk/LC_MESSAGES/statusnet.mo b/locale/uk/LC_MESSAGES/statusnet.mo index 1b4461151..fa541313f 100644 Binary files a/locale/uk/LC_MESSAGES/statusnet.mo and b/locale/uk/LC_MESSAGES/statusnet.mo differ diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index 23ca1e3f6..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-12 21:38+0000\n" -"PO-Revision-Date: 2009-11-12 21:39:49+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(r58962); 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" @@ -3419,7 +3419,7 @@ 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" @@ -4653,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 @@ -4772,10 +4773,3 @@ msgstr "Вибачте, але це не є вашою електронною а msgid "Sorry, no incoming email allowed." msgstr "" "Вибачте, але не затверджено жодної електронної адреси для вхідної пошти." - -#, fuzzy -#~ msgid "You are not allowed to change your password" -#~ msgstr "Змінити ваш пароль" - -#~ msgid "notice id: %s" -#~ msgstr "Нове повідомлення" diff --git a/locale/vi/LC_MESSAGES/statusnet.mo b/locale/vi/LC_MESSAGES/statusnet.mo index 2ac624b85..1b6b7f268 100644 Binary files a/locale/vi/LC_MESSAGES/statusnet.mo and b/locale/vi/LC_MESSAGES/statusnet.mo differ diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index 484368827..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-12 21:38+0000\n" -"PO-Revision-Date: 2009-11-12 21:39:52+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(r58962); 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" @@ -3468,7 +3468,7 @@ 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 " @@ -4797,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 @@ -4921,10 +4922,3 @@ msgstr "Xin lỗi, đó không phải là địa chỉ email mà bạn nhập v #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "Xin lỗi, không có địa chỉ email cho phép." - -#, fuzzy -#~ msgid "You are not allowed to change your password" -#~ msgstr "Thay đổi mật khẩu của bạn" - -#~ msgid "notice id: %s" -#~ msgstr "Thông báo mới" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.mo b/locale/zh_CN/LC_MESSAGES/statusnet.mo index b0fbc5e4a..18493304d 100644 Binary files a/locale/zh_CN/LC_MESSAGES/statusnet.mo and b/locale/zh_CN/LC_MESSAGES/statusnet.mo differ diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index 387ed1805..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-12 21:38+0000\n" -"PO-Revision-Date: 2009-11-12 21:39:55+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(r58962); 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" @@ -3393,7 +3393,7 @@ 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 消息" @@ -4658,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 @@ -4782,10 +4783,3 @@ msgstr "对不起，这个发布用的电子邮件属于其他用户。" #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "对不起，发布用的电子邮件无法使用。" - -#, fuzzy -#~ msgid "You are not allowed to change your password" -#~ msgstr "修改密码" - -#~ msgid "notice id: %s" -#~ msgstr "新通告" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.mo b/locale/zh_TW/LC_MESSAGES/statusnet.mo index 8bfb97041..d9cef9e4e 100644 Binary files a/locale/zh_TW/LC_MESSAGES/statusnet.mo and b/locale/zh_TW/LC_MESSAGES/statusnet.mo differ diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index 2a6099a23..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-12 21:38+0000\n" -"PO-Revision-Date: 2009-11-12 21:39:59+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(r58962); 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" @@ -3274,7 +3274,7 @@ 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 "" @@ -4504,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." @@ -4622,7 +4623,3 @@ msgstr "" #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." msgstr "" - -#, fuzzy -#~ msgid "notice id: %s" -#~ msgstr "新訊息" -- cgit v1.2.3-54-g00ecf From dedacbe66ba3b7f0ff1089378af12e6cc7411a2a Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Fri, 13 Nov 2009 20:56:55 +0000 Subject: Separated NoticeFavor and calling it from FormNoticeXHR success --- js/util.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/js/util.js b/js/util.js index 9bdc48507..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', @@ -386,8 +392,7 @@ var SN = { // StatusNet Notices: function() { if ($('body.user_in').length > 0) { - $('.form_favor').each(function() { SN.U.FormXHR($(this)); }); - $('.form_disfavor').each(function() { SN.U.FormXHR($(this)); }); + SN.U.NoticeFavor(); SN.U.NoticeReply(); } -- cgit v1.2.3-54-g00ecf From acfa086d21c9a2624cb27182ff4011ec57ac2680 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Wed, 11 Nov 2009 15:38:28 -0500 Subject: Resetup the ajaxification for replies and favors after inf. scrolling Made the selector much more specific, so it only works on pages that have notices --- plugins/InfiniteScroll/infinitescroll.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/plugins/InfiniteScroll/infinitescroll.js b/plugins/InfiniteScroll/infinitescroll.js index 09b2d4f72..82254613e 100644 --- a/plugins/InfiniteScroll/infinitescroll.js +++ b/plugins/InfiniteScroll/infinitescroll.js @@ -2,7 +2,13 @@ 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 : "Loading the next set of posts...", donetext : "Congratulations, you\'ve reached the end of the Internet.", @@ -11,5 +17,7 @@ jQuery(document).ready(function($){ itemSelector : "#notices_primary ol.notices li" },function(){ NoticeAttachments(); + NoticeReply(); + NoticeFavors(); }); }); -- cgit v1.2.3-54-g00ecf From c621a9db72978bbcb452d103949047c20ec2a745 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Fri, 13 Nov 2009 17:56:14 -0500 Subject: Fix to work with csarven's changes to util.js --- plugins/InfiniteScroll/infinitescroll.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/plugins/InfiniteScroll/infinitescroll.js b/plugins/InfiniteScroll/infinitescroll.js index 82254613e..0dafef6d5 100644 --- a/plugins/InfiniteScroll/infinitescroll.js +++ b/plugins/InfiniteScroll/infinitescroll.js @@ -16,8 +16,6 @@ jQuery(document).ready(function($){ contentSelector : "#notices_primary ol.notices", itemSelector : "#notices_primary ol.notices li" },function(){ - NoticeAttachments(); - NoticeReply(); - NoticeFavors(); + SN.Init.Notices(); }); }); -- cgit v1.2.3-54-g00ecf From 50234be398a376c1f62499c33f31d9eea398a486 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 13 Nov 2009 15:34:15 -0800 Subject: Fix regression in OpenID autosubmit page. Since core JS loads were moved to the bottom, the JavaScript was being run before jQuery was loaded, so the onload event never got set. Moved it down to the scripts section. --- plugins/OpenID/openid.php | 5 +++++ 1 file changed, 5 insertions(+) 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(); '. -- cgit v1.2.3-54-g00ecf From ab135faa7525924edc250850e9a6bcbc6ca4cee2 Mon Sep 17 00:00:00 2001 From: brenda Date: Sat, 14 Nov 2009 16:34:36 +1300 Subject: postgresl update script now working in postgres --- db/08to09_pg.sql | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql index fe9eccb2a..d9b57fb84 100644 --- a/db/08to09_pg.sql +++ b/db/08to09_pg.sql @@ -40,24 +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); -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); +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 notice - drop index notice_profile_id_idx, - add index notice_profile_id_idx using btree(profile_id,created,id); -- cgit v1.2.3-54-g00ecf From 2147ac510f5489c860a4bebf3ab48a069b89ecfb Mon Sep 17 00:00:00 2001 From: brenda Date: Sat, 14 Nov 2009 16:52:39 +1300 Subject: don't offer install.php on check-fancy requests this time, E_STRICT compliant --- lib/common.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/common.php b/lib/common.php index fbe4216e3..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 -- cgit v1.2.3-54-g00ecf From a256aee9bf81f65bede97f53a22625f1ac42ffc5 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sat, 14 Nov 2009 11:57:27 +0100 Subject: Removed list style from .xoxo --- theme/base/css/display.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 1be66fe5a..a6a93c405 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -93,14 +93,17 @@ border-radius:4px; -webkit-border-radius:4px; margin-bottom:18px; } + +.xoxo li { +list-style-type:none; +} + form label.submit { display:none; } - .form_settings { clear:both; } - .form_settings fieldset { margin-bottom:29px; } -- cgit v1.2.3-54-g00ecf From fe18063bd2bb00ac67d4afc038850cd3a7a63189 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 14 Nov 2009 17:38:10 +0100 Subject: Revert "Ask users if they wish to send statistics to SNI, default is off." This reverts commit 7efea1115f45b8880fe3161cc32b09510ddd2264. Conflicts: install.php --- install.php | 16 ++++------------ lib/default.php | 2 +- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/install.php b/install.php index 8e76f6198..e7f7cf318 100644 --- a/install.php +++ b/install.php @@ -1,3 +1,4 @@ + * @author CiaranG * @author Craig Andrews - * @author Eric Helgeson + * @author Eric Helgeson * @author Evan Prodromou * @author Robin Millette * @author Sarven Capadisli @@ -499,11 +500,6 @@ function showForm()

    Database password (optional)

    -
  • - - -

    Periodically send information about your site to StatusNet Inc

    -
    • @@ -525,7 +521,6 @@ 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); @@ -572,7 +567,7 @@ STR; } updateStatus("Writing config file..."); - $res = writeConf($sitename, $server, $path, $fancy, $db, $snapshot); + $res = writeConf($sitename, $server, $path, $fancy, $db); if (!$res) { updateStatus("Can't write config file.", true); @@ -693,7 +688,7 @@ function Mysql_Db_installer($host, $database, $username, $password) return $db; } -function writeConf($sitename, $server, $path, $fancy, $db, $snapshot) +function writeConf($sitename, $server, $path, $fancy, $db) { // assemble configuration file in a string $cfg = " null, 'welcome' => null), 'snapshot' => - array('run' => 'never', + array('run' => 'web', 'frequency' => 10000, 'reporturl' => 'http://status.net/stats/report'), 'attachments' => -- cgit v1.2.3-54-g00ecf From 133ca0ef6b13d4d693c2e03b831cc75517f89227 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Sat, 14 Nov 2009 13:10:47 -0800 Subject: Fix regression from 9f372da3da4bd445175eda9155fa7fdd13d3c85e: typo in refactoring caused fatal error on unrecognized message source --- lib/mailbox.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mailbox.php b/lib/mailbox.php index e1d384a06..90a58b4c4 100644 --- a/lib/mailbox.php +++ b/lib/mailbox.php @@ -282,7 +282,7 @@ class MailboxAction extends CurrentUserDesignAction $ns->name); $this->elementEnd('span'); } else { - $this->out->element('span', 'device', $source_name); + $this->element('span', 'device', $source_name); } break; } -- cgit v1.2.3-54-g00ecf From 017f8dc645062035fed898e4738f5b0cf5a1f3ac Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sat, 14 Nov 2009 22:12:25 +0100 Subject: Localisation updates from translatewiki.net --- locale/ar/LC_MESSAGES/statusnet.mo | Bin 29926 -> 29926 bytes locale/ar/LC_MESSAGES/statusnet.po | 22 +-- locale/bg/LC_MESSAGES/statusnet.mo | Bin 83558 -> 83558 bytes locale/bg/LC_MESSAGES/statusnet.po | 22 +-- locale/ca/LC_MESSAGES/statusnet.mo | Bin 71506 -> 71506 bytes locale/ca/LC_MESSAGES/statusnet.po | 22 +-- locale/cs/LC_MESSAGES/statusnet.mo | Bin 35136 -> 35136 bytes locale/cs/LC_MESSAGES/statusnet.po | 22 +-- locale/de/LC_MESSAGES/statusnet.mo | Bin 71700 -> 71700 bytes locale/de/LC_MESSAGES/statusnet.po | 22 +-- locale/el/LC_MESSAGES/statusnet.mo | Bin 29552 -> 29552 bytes locale/el/LC_MESSAGES/statusnet.po | 22 +-- locale/en_GB/LC_MESSAGES/statusnet.mo | Bin 67062 -> 67062 bytes locale/en_GB/LC_MESSAGES/statusnet.po | 22 +-- locale/es/LC_MESSAGES/statusnet.mo | Bin 70650 -> 70650 bytes locale/es/LC_MESSAGES/statusnet.po | 22 +-- locale/fi/LC_MESSAGES/statusnet.mo | Bin 74354 -> 74354 bytes locale/fi/LC_MESSAGES/statusnet.po | 22 +-- locale/fr/LC_MESSAGES/statusnet.mo | Bin 77122 -> 80381 bytes locale/fr/LC_MESSAGES/statusnet.po | 281 ++++++++++++++++------------------ locale/ga/LC_MESSAGES/statusnet.mo | Bin 74534 -> 74534 bytes locale/ga/LC_MESSAGES/statusnet.po | 22 +-- locale/he/LC_MESSAGES/statusnet.mo | Bin 38630 -> 38630 bytes locale/he/LC_MESSAGES/statusnet.po | 22 +-- locale/is/LC_MESSAGES/statusnet.mo | Bin 62874 -> 62874 bytes locale/is/LC_MESSAGES/statusnet.po | 22 +-- locale/it/LC_MESSAGES/statusnet.mo | Bin 70764 -> 70765 bytes locale/it/LC_MESSAGES/statusnet.po | 25 +-- locale/ja/LC_MESSAGES/statusnet.mo | Bin 47906 -> 47906 bytes locale/ja/LC_MESSAGES/statusnet.po | 22 +-- locale/ko/LC_MESSAGES/statusnet.mo | Bin 75096 -> 75096 bytes locale/ko/LC_MESSAGES/statusnet.po | 22 +-- locale/mk/LC_MESSAGES/statusnet.mo | Bin 45258 -> 45258 bytes locale/mk/LC_MESSAGES/statusnet.po | 22 +-- locale/nb/LC_MESSAGES/statusnet.mo | Bin 23373 -> 23373 bytes locale/nb/LC_MESSAGES/statusnet.po | 22 +-- locale/nl/LC_MESSAGES/statusnet.mo | Bin 100085 -> 100085 bytes locale/nl/LC_MESSAGES/statusnet.po | 23 ++- locale/nn/LC_MESSAGES/statusnet.mo | Bin 67928 -> 67928 bytes locale/nn/LC_MESSAGES/statusnet.po | 22 +-- locale/pl/LC_MESSAGES/statusnet.mo | Bin 96010 -> 96010 bytes locale/pl/LC_MESSAGES/statusnet.po | 22 +-- locale/pt/LC_MESSAGES/statusnet.mo | Bin 25533 -> 25533 bytes locale/pt/LC_MESSAGES/statusnet.po | 22 +-- locale/pt_BR/LC_MESSAGES/statusnet.mo | Bin 70360 -> 70360 bytes locale/pt_BR/LC_MESSAGES/statusnet.po | 22 +-- locale/ru/LC_MESSAGES/statusnet.mo | Bin 94451 -> 94451 bytes locale/ru/LC_MESSAGES/statusnet.po | 22 +-- locale/statusnet.po | 18 +-- locale/sv/LC_MESSAGES/statusnet.mo | Bin 58860 -> 58860 bytes locale/sv/LC_MESSAGES/statusnet.po | 22 +-- locale/te/LC_MESSAGES/statusnet.mo | Bin 52337 -> 55017 bytes locale/te/LC_MESSAGES/statusnet.po | 85 +++++----- locale/tr/LC_MESSAGES/statusnet.mo | Bin 34653 -> 34653 bytes locale/tr/LC_MESSAGES/statusnet.po | 22 +-- locale/uk/LC_MESSAGES/statusnet.mo | Bin 92215 -> 92215 bytes locale/uk/LC_MESSAGES/statusnet.po | 22 +-- locale/vi/LC_MESSAGES/statusnet.mo | Bin 68027 -> 68027 bytes locale/vi/LC_MESSAGES/statusnet.po | 22 +-- locale/zh_CN/LC_MESSAGES/statusnet.mo | Bin 64799 -> 64799 bytes locale/zh_CN/LC_MESSAGES/statusnet.po | 22 +-- locale/zh_TW/LC_MESSAGES/statusnet.mo | Bin 18835 -> 18835 bytes locale/zh_TW/LC_MESSAGES/statusnet.po | 22 +-- 63 files changed, 507 insertions(+), 519 deletions(-) diff --git a/locale/ar/LC_MESSAGES/statusnet.mo b/locale/ar/LC_MESSAGES/statusnet.mo index a6b411e4d..818f014b8 100644 Binary files a/locale/ar/LC_MESSAGES/statusnet.mo and b/locale/ar/LC_MESSAGES/statusnet.mo differ diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index af80e9c9c..0246be9cf 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-13 20:42+0000\n" -"PO-Revision-Date: 2009-11-13 20:42:15+0000\n" +"POT-Creation-Date: 2009-11-14 21:06+0000\n" +"PO-Revision-Date: 2009-11-14 21:06:59+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59079); 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" @@ -3394,19 +3394,19 @@ msgstr "" msgid "license." msgstr "الرخصة." -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "بعد" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "قبل" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "" @@ -3615,19 +3615,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:189 +#: lib/common.php:192 msgid "No configuration file found. " msgstr "" -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:192 +#: lib/common.php:195 msgid "Go to the installer." msgstr "اذهب إلى المُثبّت." diff --git a/locale/bg/LC_MESSAGES/statusnet.mo b/locale/bg/LC_MESSAGES/statusnet.mo index 518f6949a..aa6a392f6 100644 Binary files a/locale/bg/LC_MESSAGES/statusnet.mo and b/locale/bg/LC_MESSAGES/statusnet.mo differ diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index c47a06d3d..c45c3ad5f 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-13 20:42+0000\n" -"PO-Revision-Date: 2009-11-13 20:42:18+0000\n" +"POT-Creation-Date: 2009-11-14 21:06+0000\n" +"PO-Revision-Date: 2009-11-14 21:07:02+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59079); 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" @@ -3601,19 +3601,19 @@ msgstr "Всички " msgid "license." msgstr "лиценз." -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "Страниране" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "След" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "Преди" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "Имаше проблем със сесията ви в сайта." @@ -3823,20 +3823,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:189 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Няма код за потвърждение." -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:192 +#: lib/common.php:195 #, fuzzy msgid "Go to the installer." msgstr "Влизане в сайта" diff --git a/locale/ca/LC_MESSAGES/statusnet.mo b/locale/ca/LC_MESSAGES/statusnet.mo index c52451e28..bd7d5d740 100644 Binary files a/locale/ca/LC_MESSAGES/statusnet.mo and b/locale/ca/LC_MESSAGES/statusnet.mo differ diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index c76ac05a3..0ca99ec14 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-13 20:42+0000\n" -"PO-Revision-Date: 2009-11-13 20:42:21+0000\n" +"POT-Creation-Date: 2009-11-14 21:06+0000\n" +"PO-Revision-Date: 2009-11-14 21:07:04+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59079); 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" @@ -3635,19 +3635,19 @@ msgstr "Tot " msgid "license." msgstr "llicència." -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "Paginació" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "Posteriors" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "Anteriors" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "Ha ocorregut algun problema amb la teva sessió." @@ -3855,20 +3855,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:189 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Cap codi de confirmació." -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:192 +#: lib/common.php:195 #, fuzzy msgid "Go to the installer." msgstr "Accedir a aquest lloc" diff --git a/locale/cs/LC_MESSAGES/statusnet.mo b/locale/cs/LC_MESSAGES/statusnet.mo index e3141e70a..2252bb474 100644 Binary files a/locale/cs/LC_MESSAGES/statusnet.mo and b/locale/cs/LC_MESSAGES/statusnet.mo differ diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index 36e0f1c40..2d6d715b9 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-13 20:42+0000\n" -"PO-Revision-Date: 2009-11-13 20:42:23+0000\n" +"POT-Creation-Date: 2009-11-14 21:06+0000\n" +"PO-Revision-Date: 2009-11-14 21:07:07+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59079); 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" @@ -3547,21 +3547,21 @@ msgstr "" msgid "license." msgstr "" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "" -#: lib/action.php:1062 +#: lib/action.php:1061 #, fuzzy msgid "After" msgstr "« Novější" -#: lib/action.php:1070 +#: lib/action.php:1069 #, fuzzy msgid "Before" msgstr "Starší »" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "" @@ -3769,20 +3769,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:189 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Žádný potvrzující kód." -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:192 +#: lib/common.php:195 msgid "Go to the installer." msgstr "" diff --git a/locale/de/LC_MESSAGES/statusnet.mo b/locale/de/LC_MESSAGES/statusnet.mo index b5c2ef5d0..0d08a7aa5 100644 Binary files a/locale/de/LC_MESSAGES/statusnet.mo and b/locale/de/LC_MESSAGES/statusnet.mo differ diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index 93ce64cd5..8c77a9ff7 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-13 20:42+0000\n" -"PO-Revision-Date: 2009-11-13 20:42:26+0000\n" +"POT-Creation-Date: 2009-11-14 21:06+0000\n" +"PO-Revision-Date: 2009-11-14 21:07:09+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59079); 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" @@ -3647,19 +3647,19 @@ msgstr "Alle " msgid "license." msgstr "Lizenz." -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "Seitenerstellung" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "Später" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "Vorher" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "Es gab ein Problem mit deinem Sessiontoken." @@ -3867,20 +3867,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:189 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Kein Bestätigungs-Code." -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:192 +#: lib/common.php:195 #, fuzzy msgid "Go to the installer." msgstr "Auf der Seite anmelden" diff --git a/locale/el/LC_MESSAGES/statusnet.mo b/locale/el/LC_MESSAGES/statusnet.mo index 69dc7b9c4..88125f386 100644 Binary files a/locale/el/LC_MESSAGES/statusnet.mo and b/locale/el/LC_MESSAGES/statusnet.mo differ diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index 1b97f591c..bddf56a37 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-13 20:42+0000\n" -"PO-Revision-Date: 2009-11-13 20:42:28+0000\n" +"POT-Creation-Date: 2009-11-14 21:06+0000\n" +"PO-Revision-Date: 2009-11-14 21:07:11+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59079); 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" @@ -3499,19 +3499,19 @@ msgstr "" msgid "license." msgstr "" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "" @@ -3717,20 +3717,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:189 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Ο κωδικός επιβεβαίωσης δεν βρέθηκε." -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:192 +#: lib/common.php:195 msgid "Go to the installer." msgstr "" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.mo b/locale/en_GB/LC_MESSAGES/statusnet.mo index 7998fbcf0..6b6103f7c 100644 Binary files a/locale/en_GB/LC_MESSAGES/statusnet.mo and b/locale/en_GB/LC_MESSAGES/statusnet.mo differ diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index 27fd82b70..a7d10a6c6 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/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-13 20:42+0000\n" -"PO-Revision-Date: 2009-11-13 20:42:31+0000\n" +"POT-Creation-Date: 2009-11-14 21:06+0000\n" +"PO-Revision-Date: 2009-11-14 21:07:14+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(r59023); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59079); 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" @@ -3586,19 +3586,19 @@ msgstr "All " msgid "license." msgstr "licence." -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "Pagination" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "After" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "Before" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "There was a problem with your session token." @@ -3806,19 +3806,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:189 +#: lib/common.php:192 msgid "No configuration file found. " msgstr "No configuration file found" -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:192 +#: lib/common.php:195 #, fuzzy msgid "Go to the installer." msgstr "Login to the site" diff --git a/locale/es/LC_MESSAGES/statusnet.mo b/locale/es/LC_MESSAGES/statusnet.mo index 366d16819..97fdce7f4 100644 Binary files a/locale/es/LC_MESSAGES/statusnet.mo and b/locale/es/LC_MESSAGES/statusnet.mo differ diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index 1315f017c..a98c8529a 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-13 20:42+0000\n" -"PO-Revision-Date: 2009-11-13 20:42:34+0000\n" +"POT-Creation-Date: 2009-11-14 21:06+0000\n" +"PO-Revision-Date: 2009-11-14 21:07:16+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59079); 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" @@ -3661,19 +3661,19 @@ msgstr "Todo" msgid "license." msgstr "Licencia." -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "Paginación" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "Después" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "Antes" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "Hubo problemas con tu clave de sesión." @@ -3881,19 +3881,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:189 +#: lib/common.php:192 msgid "No configuration file found. " msgstr "Ningún archivo de configuración encontrado. " -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:192 +#: lib/common.php:195 msgid "Go to the installer." msgstr "Ir al instalador." diff --git a/locale/fi/LC_MESSAGES/statusnet.mo b/locale/fi/LC_MESSAGES/statusnet.mo index 9cd1fdbfa..876a379b9 100644 Binary files a/locale/fi/LC_MESSAGES/statusnet.mo and b/locale/fi/LC_MESSAGES/statusnet.mo differ diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index db933a25b..79f874365 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-13 20:42+0000\n" -"PO-Revision-Date: 2009-11-13 20:42:37+0000\n" +"POT-Creation-Date: 2009-11-14 21:06+0000\n" +"PO-Revision-Date: 2009-11-14 21:07:19+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59079); 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" @@ -3606,19 +3606,19 @@ msgstr "Kaikki " msgid "license." msgstr "lisenssi." -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "Sivutus" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "Myöhemmin" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "Aiemmin" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "Istuntoavaimesi kanssa oli ongelma." @@ -3826,20 +3826,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:189 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Varmistuskoodia ei ole annettu." -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:192 +#: lib/common.php:195 #, fuzzy msgid "Go to the installer." msgstr "Kirjaudu sisään palveluun" diff --git a/locale/fr/LC_MESSAGES/statusnet.mo b/locale/fr/LC_MESSAGES/statusnet.mo index 1549319bb..48bed3b51 100644 Binary files a/locale/fr/LC_MESSAGES/statusnet.mo and b/locale/fr/LC_MESSAGES/statusnet.mo differ diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 70d66e8eb..02d468395 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-13 20:42+0000\n" -"PO-Revision-Date: 2009-11-13 20:42:39+0000\n" +"POT-Creation-Date: 2009-11-14 21:06+0000\n" +"PO-Revision-Date: 2009-11-14 21:07:21+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59079); 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" @@ -116,7 +116,6 @@ msgstr "Statuts de %1$s et ses amis dans %2$s!" #: 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 !" @@ -140,7 +139,6 @@ msgid "" msgstr "" #: actions/apiaccountupdatedeliverydevice.php:132 -#, fuzzy msgid "Could not update user." msgstr "Impossible de mettre à jour l'utilisateur." @@ -178,7 +176,6 @@ 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." @@ -282,7 +279,7 @@ msgstr "Impossible de ne plus suivre l'utilisateur : utilisateur non trouvé." #: actions/apifriendshipsdestroy.php:120 msgid "You cannot unfollow yourself!" -msgstr "" +msgstr "Vous ne pouvez pas ne plus vous suivre vous-même !" #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." @@ -356,7 +353,7 @@ msgstr "Emplacement trop long (maximum de 255 caractères)." #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." -msgstr "" +msgstr "Trop d'alias ! Maximum %d." #: actions/apigroupcreate.php:312 actions/editgroup.php:224 #: actions/newgroup.php:168 @@ -381,7 +378,7 @@ msgstr "Vous êtes déjà membre de ce groupe." #: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221 msgid "You have been blocked from that group by the admin." -msgstr "" +msgstr "Vous avez été bloqué de ce groupe par l'administrateur." #: actions/apigroupjoin.php:138 #, php-format @@ -705,7 +702,7 @@ msgstr "Oui" #: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 #: lib/blockform.php:153 msgid "Block this user" -msgstr "Bloquer cet utilisateur " +msgstr "Bloquer cet utilisateur" #: actions/block.php:165 msgid "You have already blocked this user." @@ -717,7 +714,7 @@ msgstr "Impossible d'enregistrer les informations de blocage." #: actions/bookmarklet.php:50 msgid "Post to " -msgstr "Poster sur" +msgstr "Poster sur " #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -773,7 +770,7 @@ msgstr "Statuts" #: actions/deletenotice.php:52 actions/shownotice.php:92 msgid "No such notice." -msgstr "Statut non trouvé. " +msgstr "Statut non trouvé." #: actions/deletenotice.php:71 msgid "Can't delete this notice." @@ -804,7 +801,6 @@ msgid "Delete this notice" msgstr "Supprimer ce statut" #: actions/deletenotice.php:157 -#, fuzzy msgid "There was a problem with your session token. Try again, please." msgstr "" "Un problème est survenu avec votre jeton de session. Veuillez essayer à " @@ -820,7 +816,7 @@ msgstr "Ajouter aux favoris" #: actions/doc.php:69 msgid "No such document." -msgstr "Document non trouvé. " +msgstr "Document non trouvé." #: actions/editgroup.php:56 #, php-format @@ -875,7 +871,7 @@ msgstr "Adresse courriel actuellement confirmée." #: actions/imsettings.php:108 actions/smssettings.php:115 #: actions/smssettings.php:158 msgid "Remove" -msgstr "Retirer " +msgstr "Retirer" #: actions/emailsettings.php:113 msgid "" @@ -892,11 +888,11 @@ msgstr "Annuler" #: actions/emailsettings.php:121 msgid "Email Address" -msgstr "Adresse courriel" +msgstr "Adresse de courriel" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" -msgstr "Adresse courriel (ex : nom@example.org)" +msgstr "Adresse de courriel (ex : nom@example.org)" #: actions/emailsettings.php:126 actions/imsettings.php:133 #: actions/smssettings.php:145 @@ -939,9 +935,8 @@ msgid "Send me email when someone sends me a private message." msgstr "Envoyez-moi un courriel quand quelqu'un m'envoie un message personnel." #: actions/emailsettings.php:174 -#, fuzzy msgid "Send me email when someone sends me an \"@-reply\"." -msgstr "Envoyez-moi un courriel quand quelqu'un m'envoie un message personnel." +msgstr "Envoyez-moi un courriel quand quelqu'un m'envoie une réponse « @ »." #: actions/emailsettings.php:179 msgid "Allow friends to nudge me and send me an email." @@ -1058,12 +1053,16 @@ msgstr "Statuts les plus populaires sur le site en ce moment." #: actions/favorited.php:150 msgid "Favorite notices appear on this page but no one has favorited one yet." msgstr "" +"Les statuts favoris apparaissent sur cette page mais personne ne n'en a mis " +"un en favori actuellement." #: actions/favorited.php:153 msgid "" "Be the first to add a notice to your favorites by clicking the fave button " "next to any notice you like." msgstr "" +"Soyez le premier à un statut dans vos favoris en cliquant sur le bouton " +"favori à côté d'un statut que vous aimez." #: actions/favorited.php:156 #, php-format @@ -1107,13 +1106,12 @@ msgid "A selection of some of the great users on %s" msgstr "Les utilisateurs à ne pas manquer dans %s" #: actions/file.php:34 -#, fuzzy msgid "No notice id" -msgstr "Nouveau statut" +msgstr "Pas d'identifiant de statut" #: actions/file.php:38 msgid "No notice" -msgstr "Aucun avis" +msgstr "Aucun statut" #: actions/file.php:42 msgid "No attachments" @@ -1203,13 +1201,13 @@ msgid "Do not block this user from this group" msgstr "Ne pas bloquer cet utilisateur pour ce groupe" #: actions/groupblock.php:179 -#, fuzzy msgid "Block this user from this group" -msgstr "Liste des utilisateurs inscrits à ce groupe." +msgstr "Bloquer cet utilisateur de de groupe" #: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" +"Erreur de la base de données lors du blocage de l'utilisateur du groupe." #: actions/groupbyid.php:74 msgid "No ID" @@ -1220,9 +1218,8 @@ msgid "You must be logged in to edit a group." msgstr "Vous devez ouvrir une session pour modifier un groupe." #: actions/groupdesignsettings.php:141 -#, fuzzy msgid "Group design" -msgstr "Groupes" +msgstr "Conception du groupe" #: actions/groupdesignsettings.php:152 msgid "" @@ -1261,9 +1258,8 @@ msgstr "" "est de %s." #: actions/grouplogo.php:362 -#, fuzzy msgid "Pick a square area of the image to be the logo." -msgstr "Sélectionnez une zone de forme carrée pour définir votre avatar" +msgstr "Sélectionnez une zone de forme carrée sur l'image qui sera le logo." #: actions/grouplogo.php:396 msgid "Logo updated." @@ -1497,7 +1493,7 @@ msgstr "" #: actions/invite.php:39 msgid "Invites have been disabled." -msgstr "" +msgstr "Les invitation ont été désactivées." #: actions/invite.php:41 #, php-format @@ -1642,7 +1638,7 @@ msgstr "Vous devez ouvrir une session pour rejoindre un groupe." #: actions/joingroup.php:90 lib/command.php:217 msgid "You are already a member of that group" -msgstr "Vous êtes déjà membre de ce groupe " +msgstr "Vous êtes déjà membre de ce groupe" #: actions/joingroup.php:128 lib/command.php:234 #, php-format @@ -1681,9 +1677,8 @@ msgid "Already logged in." msgstr "Déjà connecté." #: actions/login.php:110 actions/login.php:120 -#, fuzzy msgid "Invalid or expired token." -msgstr "Contenu invalide" +msgstr "Jeton invalide ou expiré." #: actions/login.php:143 msgid "Incorrect username or password." @@ -1749,6 +1744,7 @@ msgstr "" #: actions/makeadmin.php:91 msgid "Only an admin can make another user an admin." msgstr "" +"Seul un administrateur peut faire d'un autre utilisateur un administrateur." #: actions/makeadmin.php:95 #, php-format @@ -1763,11 +1759,11 @@ msgstr "" #: actions/makeadmin.php:145 #, php-format msgid "Can't make %s an admin for group %s" -msgstr "" +msgstr "Impossible de faire %s un administrateur du groupe %s" #: actions/microsummary.php:69 msgid "No current status" -msgstr "Aucun statut " +msgstr "Aucun statut actuel" #: actions/newgroup.php:53 msgid "New group" @@ -1835,9 +1831,9 @@ msgid "Text search" msgstr "Recherche de texte" #: actions/noticesearch.php:91 -#, fuzzy, php-format +#, php-format msgid "Search results for \"%s\" on %s" -msgstr " Flux de recherche pour « %s »" +msgstr "Résultat de la recherche pour « %s » sur %s" #: actions/noticesearch.php:121 #, php-format @@ -1918,7 +1914,7 @@ msgstr "Autres options à configurer" #: actions/othersettings.php:108 msgid " (free service)" -msgstr "" +msgstr " (service gratuit)" #: actions/othersettings.php:116 msgid "Shorten URLs with" @@ -2106,7 +2102,7 @@ msgstr "Emplacement" #: actions/profilesettings.php:134 actions/register.php:472 msgid "Where you are, like \"City, State (or Region), Country\"" -msgstr "Indiquez votre emplacement, ex.: \"Ville, État (ou région), Pays\"" +msgstr "Indiquez votre emplacement, ex.: « Ville, État (ou région), Pays »" #: actions/profilesettings.php:138 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 @@ -2159,7 +2155,7 @@ msgstr "La langue est trop longue (255 caractères maximum)." #: actions/profilesettings.php:246 actions/tagother.php:178 #, php-format msgid "Invalid tag: \"%s\"" -msgstr "Marquage invalide : \"%s\"" +msgstr "Marquage invalide : « %s »" #: actions/profilesettings.php:295 msgid "Couldn't update user for autosubscribe." @@ -2171,7 +2167,7 @@ msgstr "Impossible d'enregistrer le profil." #: actions/profilesettings.php:336 msgid "Couldn't save tags." -msgstr "Impossible d'enregistrer les marquages. " +msgstr "Impossible d'enregistrer les marquages." #: actions/profilesettings.php:344 msgid "Settings saved." @@ -2196,19 +2192,16 @@ msgid "Public timeline" msgstr "Flux public" #: actions/public.php:151 -#, fuzzy msgid "Public Stream Feed (RSS 1.0)" -msgstr "Fil du flux public" +msgstr "Fil du flux public (RSS 1.0)" #: actions/public.php:155 -#, fuzzy msgid "Public Stream Feed (RSS 2.0)" -msgstr "Fil du flux public" +msgstr "Fil du flux public (RSS 2.0)" #: actions/public.php:159 -#, fuzzy msgid "Public Stream Feed (Atom)" -msgstr "Fil du flux public" +msgstr "Fil du flux public (Atom)" #: actions/public.php:179 #, php-format @@ -2219,7 +2212,7 @@ msgstr "" #: actions/public.php:182 msgid "Be the first to post!" -msgstr "" +msgstr "Soyez le premier à poster !" #: actions/public.php:186 #, php-format @@ -2252,9 +2245,8 @@ msgstr "" "wiki/Microblog) " #: actions/publictagcloud.php:57 -#, fuzzy msgid "Public tag cloud" -msgstr "Marquages publics" +msgstr "Nuage de mots clefs public" #: actions/publictagcloud.php:63 #, php-format @@ -2268,7 +2260,7 @@ msgstr "" #: actions/publictagcloud.php:72 msgid "Be the first to post one!" -msgstr "" +msgstr "Soyez le premier à en poster une !" #: actions/publictagcloud.php:75 #, php-format @@ -2278,9 +2270,8 @@ msgid "" msgstr "" #: actions/publictagcloud.php:135 -#, fuzzy msgid "Tag cloud" -msgstr "Marquages " +msgstr "Nuage de mots clefs" #: actions/recoverpassword.php:36 msgid "You are already logged in!" @@ -2288,7 +2279,7 @@ msgstr "Votre session est déjà ouverte !" #: actions/recoverpassword.php:62 msgid "No such recovery code." -msgstr "Code de récupération non trouvé. " +msgstr "Code de récupération non trouvé." #: actions/recoverpassword.php:66 msgid "Not a recovery code." @@ -2304,7 +2295,7 @@ msgstr "Erreur dans le code de confirmation." #: actions/recoverpassword.php:97 msgid "This confirmation code is too old. Please start again." -msgstr "Ce code de validation est périmé. Veuillez recommencer. " +msgstr "Ce code de validation est périmé. Veuillez recommencer." #: actions/recoverpassword.php:111 msgid "Could not update user with confirmed email address." @@ -2319,15 +2310,15 @@ msgstr "" #: actions/recoverpassword.php:158 msgid "You have been identified. Enter a new password below. " -msgstr "" +msgstr "Vous avez été identifié. Entrez un nouveau mot de passe ci-dessous. " #: actions/recoverpassword.php:188 msgid "Password recovery" -msgstr "" +msgstr "Récupération de mot de passe" #: actions/recoverpassword.php:191 msgid "Nickname or email address" -msgstr "" +msgstr "Pseudo ou adresse de courriel" #: actions/recoverpassword.php:193 msgid "Your nickname on this server, or your registered email address." @@ -2487,13 +2478,12 @@ msgid "Creative Commons Attribution 3.0" msgstr "Creative Commons Paternité 3.0" #: actions/register.php:496 -#, fuzzy msgid "" " except this private data: password, email address, IM address, and phone " "number." msgstr "" -"à l'exception de ces données personnelles : mot de passe, adresse e-mail, " -"adresse de messagerie instantanée, numéro de téléphone. " +" à l'exception de ces données personnelles : mot de passe, adresse e-mail, " +"adresse de messagerie instantanée, numéro de téléphone." #: actions/register.php:537 #, php-format @@ -2551,7 +2541,7 @@ msgstr "" #: actions/remotesubscribe.php:112 msgid "Remote subscribe" -msgstr "Abonnement à distance " +msgstr "Abonnement à distance" #: actions/remotesubscribe.php:124 msgid "Subscribe to a remote user" @@ -2583,10 +2573,10 @@ msgid "Invalid profile URL (bad format)" msgstr "URL du profil invalide (mauvais format)" #: actions/remotesubscribe.php:168 -#, fuzzy msgid "" "Not a valid profile URL (no YADIS document or no or invalid XRDS defined)." -msgstr "URL de profil invalide (aucun document YADIS)." +msgstr "" +"URL de profil invalide (aucun document YADIS ou définition XRDS invalide)." #: actions/remotesubscribe.php:176 msgid "That’s a local profile! Login to subscribe." @@ -2608,19 +2598,19 @@ msgid "Replies to %s, page %d" msgstr "Réponses à %s - page %d" #: actions/replies.php:144 -#, fuzzy, php-format +#, php-format msgid "Replies feed for %s (RSS 1.0)" -msgstr "Flux des statuts de %s" +msgstr "Flux des réponses pour %s (RSS 1.0)" #: actions/replies.php:151 -#, fuzzy, php-format +#, php-format msgid "Replies feed for %s (RSS 2.0)" -msgstr "Flux des statuts de %s" +msgstr "Flux des réponses pour %s (RSS 2.0)" #: actions/replies.php:158 #, php-format msgid "Replies feed for %s (Atom)" -msgstr "Flux des statuts de %s" +msgstr "Flux des réponses pour %s (Atom)" #: actions/replies.php:198 #, php-format @@ -2747,7 +2737,7 @@ msgstr "Fil des avis du groupe %s (Atom)" #: actions/showgroup.php:345 #, php-format msgid "FOAF for %s group" -msgstr "Boîte d'envoi de %s" +msgstr "ami d'un ami pour le groupe %s" #: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" @@ -2821,9 +2811,9 @@ msgid "Notice deleted." msgstr "Avis supprimé." #: actions/showstream.php:73 -#, fuzzy, php-format +#, php-format msgid " tagged %s" -msgstr "Statuts marqués avec %s" +msgstr " marqué %s" #: actions/showstream.php:79 #, php-format @@ -2831,29 +2821,29 @@ msgid "%s, page %d" msgstr "%s - page %d" #: actions/showstream.php:122 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s tagged %s (RSS 1.0)" -msgstr "Fil des statuts du groupe %s" +msgstr "Fil des statuts pour %s marqués %s (RSS 1.0)" #: actions/showstream.php:129 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s (RSS 1.0)" -msgstr "Flux des statuts de %s" +msgstr "Flux des statuts de %s (RSS 1.0)" #: actions/showstream.php:136 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s (RSS 2.0)" -msgstr "Flux des statuts de %s" +msgstr "Flux des statuts de %s (RSS 2.0)" #: actions/showstream.php:143 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s (Atom)" -msgstr "Flux des statuts de %s" +msgstr "Flux des statuts de %s (Atom)" #: actions/showstream.php:148 -#, fuzzy, php-format +#, php-format msgid "FOAF for %s" -msgstr "Boîte d'envoi de %s" +msgstr "ami d'un ami pour %s" #: actions/showstream.php:191 #, php-format @@ -2957,13 +2947,13 @@ msgid "That phone number already belongs to another user." msgstr "Ce numéro de téléphone est déjà utilisé." #: actions/smssettings.php:347 -#, fuzzy msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." msgstr "" "Un code de confirmation a été envoyé au numéro de téléphone indiqué. " -"Vérifiez votre boîte de réception pour récupérer le code et les instructions." +"Vérifiez votre boîte de réception pour récupérer le code et les instructions " +"pour son utilisation." #: actions/smssettings.php:374 msgid "That is the wrong confirmation number." @@ -3023,7 +3013,7 @@ msgstr "Abonnés à %s - page &d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." -msgstr "Ces personnes suivent vos statuts. " +msgstr "Ces personnes suivent vos statuts." #: actions/subscribers.php:67 #, php-format @@ -3143,19 +3133,19 @@ msgid "Notices tagged with %s, page %d" msgstr "Statuts marqués %s - page %d" #: actions/tag.php:86 -#, fuzzy, php-format +#, php-format msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "Flux des statuts de %s" +msgstr "Flux des statuts pour le marquage %s (RSS 1.0)" #: actions/tag.php:92 -#, fuzzy, php-format +#, php-format msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "Flux des statuts de %s" +msgstr "Flux des statuts pour le marquage %s (RSS 2.0)" #: actions/tag.php:98 -#, fuzzy, php-format +#, php-format msgid "Notice feed for tag %s (Atom)" -msgstr "Flux des statuts de %s" +msgstr "Flux des statuts pour le marquage %s (Atom)" #: actions/tagrss.php:35 msgid "No such tag." @@ -3187,7 +3177,6 @@ msgid "Authorize subscription" msgstr "Autoriser l'abonnement" #: actions/userauthorization.php:110 -#, fuzzy msgid "" "Please check these details to make sure that you want to subscribe to this " "user’s notices. If you didn’t just ask to subscribe to someone’s notices, " @@ -3195,7 +3184,7 @@ msgid "" msgstr "" "Veuillez vérifier ces détails pour vous assurer que vous souhaitez vous " "abonner aux statuts de cet utilisateur. Si vous n'avez pas demandé à vous " -"abonner aux statuts de quelqu'un, cliquez \"Annuler\"." +"abonner aux statuts de quelqu'un, cliquez « Rejeter »." #: actions/userauthorization.php:188 msgid "License" @@ -3242,15 +3231,14 @@ msgid "Subscription rejected" msgstr "Abonnement refusé" #: actions/userauthorization.php:261 -#, fuzzy msgid "" "The subscription has been rejected, but no callback URL was passed. Check " "with the site’s instructions for details on how to fully reject the " "subscription." msgstr "" -"L'abonnement a été refusé, mais l'URL de rappel n'a pas été validé. Vérifiez " -"les instructions du site pour savoir comment refuser pleinement " -"l'abonnement. " +"L'abonnement a été refusé, mais aucune URL de rappel n'a pas été passée. " +"Vérifiez les instructions du site pour savoir comment refuser pleinement " +"l'abonnement." #: actions/userauthorization.php:296 #, php-format @@ -3293,7 +3281,7 @@ msgstr "Aucun identifiant." #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" -msgstr "Conception de profile" +msgstr "Conception de profil" #: actions/userdesignsettings.php:87 lib/designsettings.php:76 msgid "" @@ -3392,9 +3380,9 @@ msgid "DB error inserting reply: %s" msgstr "Erreur de base de donnée en insérant la réponse :%s" #: classes/User.php:347 -#, fuzzy, php-format +#, php-format msgid "Welcome to %1$s, @%2$s!" -msgstr "Message adressé à %1$s le %2$s" +msgstr "Bienvenu à %1$s, %2$s !" #: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" @@ -3422,7 +3410,7 @@ msgstr "Conception" #: lib/accountsettingsaction.php:124 msgid "Design your profile" -msgstr "Concevez votre profile" +msgstr "Concevez votre profil" #: lib/accountsettingsaction.php:128 msgid "Other" @@ -3458,9 +3446,8 @@ msgid "Account" msgstr "Compte" #: lib/action.php:432 -#, fuzzy msgid "Change your email, avatar, password, profile" -msgstr "Modifier votre courriel, avatar, mot de passe, profil " +msgstr "Modifier votre courriel, avatar, mot de passe, profil" #: lib/action.php:435 msgid "Connect" @@ -3591,25 +3578,25 @@ msgstr "Licence du contenu du site" #: lib/action.php:794 msgid "All " -msgstr "Tous" +msgstr "Tous " #: lib/action.php:799 msgid "license." msgstr "licence." -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "Pagination" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "Après" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "Avant" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "Un problème est survenu avec votre jeton de session." @@ -3627,11 +3614,11 @@ msgstr "Fournisseur" #: lib/attachmentnoticesection.php:67 msgid "Notices where this attachment appears" -msgstr "" +msgstr "Statuts sur lesquels cette pièce jointe apparait." #: lib/attachmenttagcloudsection.php:48 msgid "Tags for this attachment" -msgstr "" +msgstr "Marques de cette pièce jointe" #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" @@ -3677,7 +3664,7 @@ msgstr "" #: lib/command.php:152 lib/command.php:400 msgid "Notice with that id does not exist" -msgstr "" +msgstr "Aucun statut avec cet identifiant n'existe" #: lib/command.php:168 lib/command.php:416 lib/command.php:471 msgid "User has no last notice" @@ -3741,7 +3728,7 @@ msgstr "Problème lors de l'enregistrement de l'avis." #: lib/command.php:495 msgid "Specify the name of the user to subscribe to" -msgstr "Indiquez le nom de l'utilisateur auquel vous souhaitez vous abonner " +msgstr "Indiquez le nom de l'utilisateur auquel vous souhaitez vous abonner" #: lib/command.php:502 #, php-format @@ -3778,9 +3765,9 @@ msgid "Can't turn on notification." msgstr "Impossible d'activer les avertissements." #: lib/command.php:597 -#, fuzzy, php-format +#, php-format msgid "Could not create login token for %s" -msgstr "Impossible de créer le formulaire OpenID : %s" +msgstr "Impossible de créer le jeton de connexion pour %s" #: lib/command.php:602 #, php-format @@ -3823,19 +3810,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:189 +#: lib/common.php:192 msgid "No configuration file found. " msgstr "Aucun fichier de configuration n'a été trouvé. " -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:192 +#: lib/common.php:195 msgid "Go to the installer." msgstr "Aller au programme d'installation" @@ -3857,17 +3844,18 @@ msgstr "Erreur de la base de données" #: lib/designsettings.php:101 msgid "Change background image" -msgstr "" +msgstr "Changer l'image d'arrière plan" #: lib/designsettings.php:105 -#, fuzzy msgid "Upload file" -msgstr "Transfert" +msgstr "Importer un fichier" #: lib/designsettings.php:109 msgid "" "You can upload your personal background image. The maximum file size is 2Mb." msgstr "" +"Vous pouvez importer une image d'arrière plan personnelle. La taille " +"maximale du fichier est de 2 Mo." #: lib/designsettings.php:139 msgid "On" @@ -3891,7 +3879,7 @@ msgstr "Modifier les couleurs" #: lib/designsettings.php:178 msgid "Background" -msgstr "" +msgstr "Arrière plan" #: lib/designsettings.php:191 msgid "Content" @@ -3911,7 +3899,7 @@ msgstr "Liens" #: lib/designsettings.php:247 msgid "Use defaults" -msgstr "" +msgstr "Utiliser les valeurs par défaut" #: lib/designsettings.php:248 msgid "Restore default designs" @@ -3963,7 +3951,7 @@ msgstr "Atom" #: lib/feed.php:91 msgid "FOAF" -msgstr "" +msgstr "Ami d'un ami" #: lib/galleryaction.php:121 msgid "Filter tags" @@ -3974,9 +3962,8 @@ msgid "All" msgstr "Tous" #: lib/galleryaction.php:139 -#, fuzzy msgid "Select tag to filter" -msgstr "Sélectionnez un fournisseur de téléphone mobile" +msgstr "Sélectionner une marque à filtrer" #: lib/galleryaction.php:140 msgid "Tag" @@ -3995,14 +3982,13 @@ msgid "URL of the homepage or blog of the group or topic" msgstr "URL du site Web ou blogue du groupe ou sujet " #: lib/groupeditform.php:168 -#, fuzzy msgid "Describe the group or topic" -msgstr "Description du groupe ou du sujet (140 caractères maximum)" +msgstr "Description du groupe ou du sujet" #: lib/groupeditform.php:170 -#, fuzzy, php-format +#, php-format msgid "Describe the group or topic in %d characters" -msgstr "Description du groupe ou du sujet (140 caractères maximum)" +msgstr "Description du groupe ou du sujet en %d caractères" #: lib/groupeditform.php:172 msgid "Description" @@ -4011,7 +3997,9 @@ msgstr "Description" #: lib/groupeditform.php:179 msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" -msgstr "Emplacement du groupe, s'il y a lieu \"Ville, État ou région, Pays\"" +msgstr "" +"Emplacement du groupe, s'il y a lieu, de la forme « Ville, État ou région, " +"Pays »" #: lib/groupeditform.php:187 #, php-format @@ -4100,7 +4088,7 @@ msgstr "Type de fichier inconnu" #: lib/jabber.php:192 #, php-format msgid "[%s]" -msgstr "" +msgstr "[%s]" #: lib/joinform.php:114 msgid "Join" @@ -4172,7 +4160,7 @@ msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s suit maintenant vos statuts dans %2$s." #: lib/mail.php:240 -#, fuzzy, php-format +#, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" "\n" @@ -4185,12 +4173,16 @@ msgid "" "----\n" "Change your email address or notification options at %8$s\n" msgstr "" -"%1$s suit maintenant vos statuts dans %2$s.\n" +"%1$s suit maintenant vos statuts sur %2$s.\n" "\n" -"\t%3$s\n" +"%3$s\n" "\n" +"%4$s%5$s%6$s\n" "Cordialement,\n" -"%4$s.\n" +"%7$s.\n" +"\n" +"----\n" +"Changez votre adresse de courriel ou vos options de notification sur %8$s\n" #: lib/mail.php:253 #, php-format @@ -4293,9 +4285,9 @@ msgid "" msgstr "" #: lib/mail.php:554 -#, fuzzy, php-format +#, php-format msgid "%s (@%s) added your notice as a favorite" -msgstr "%s a ajouté un de vos messages à ses favoris" +msgstr "%s (@%s) a ajouté un de vos statut à ses favoris" #: lib/mail.php:556 #, fuzzy, php-format @@ -4379,11 +4371,11 @@ msgstr "Impossible d'écrire sur le disque." #: lib/mediafile.php:165 msgid "File upload stopped by extension." -msgstr "" +msgstr "Import de fichier stoppé par une extension." #: lib/mediafile.php:179 lib/mediafile.php:216 msgid "File exceeds user's quota!" -msgstr "" +msgstr "Le fichier dépasse le quota de l'utilisateur." #: lib/mediafile.php:196 lib/mediafile.php:233 msgid "File could not be moved to destination directory." @@ -4401,7 +4393,7 @@ msgstr "" #: lib/mediafile.php:275 #, php-format msgid "%s is not a supported filetype on this server." -msgstr "" +msgstr "%s n'est pas un type de fichier supporté sur ce serveur." #: lib/messageform.php:120 msgid "Send a direct notice" @@ -4409,7 +4401,7 @@ msgstr "Envoyer un message direct" #: lib/messageform.php:146 msgid "To" -msgstr "À " +msgstr "À" #: lib/messageform.php:162 lib/noticeform.php:173 msgid "Available characters" @@ -4643,7 +4635,6 @@ msgid "Could not subscribe other to you." msgstr "Impossible d'abonner une autre personne à votre profil." #: lib/subs.php:124 -#, fuzzy msgid "Not subscribed!" msgstr "Pas abonné !" @@ -4689,11 +4680,11 @@ msgstr "Envoyer un message à cet utilisateur" #: lib/userprofile.php:273 msgid "Message" -msgstr "Message " +msgstr "Message" #: lib/util.php:821 msgid "a few seconds ago" -msgstr "il y a quelques secondes " +msgstr "il y a quelques secondes" #: lib/util.php:823 msgid "about a minute ago" @@ -4760,4 +4751,4 @@ msgstr "Désolé, ceci n'est pas votre adresse de courriel entrant." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." -msgstr "Désolé, la réception de courriels n'est pas permise. " +msgstr "Désolé, la réception de courriels n'est pas permise." diff --git a/locale/ga/LC_MESSAGES/statusnet.mo b/locale/ga/LC_MESSAGES/statusnet.mo index fa63d16af..66ed4107e 100644 Binary files a/locale/ga/LC_MESSAGES/statusnet.mo and b/locale/ga/LC_MESSAGES/statusnet.mo differ diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index edbe981a2..b730a14df 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-13 20:42+0000\n" -"PO-Revision-Date: 2009-11-13 20:42:42+0000\n" +"POT-Creation-Date: 2009-11-14 21:06+0000\n" +"PO-Revision-Date: 2009-11-14 21:07:24+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59079); 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" @@ -3673,21 +3673,21 @@ msgstr "Todos" msgid "license." msgstr "" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "" -#: lib/action.php:1062 +#: lib/action.php:1061 #, fuzzy msgid "After" msgstr "« Despois" -#: lib/action.php:1070 +#: lib/action.php:1069 #, fuzzy msgid "Before" msgstr "Antes »" -#: lib/action.php:1119 +#: lib/action.php:1117 #, fuzzy msgid "There was a problem with your session token." msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..." @@ -3926,20 +3926,20 @@ msgstr "" "tracks - non implementado por agora.\n" "tracking - non implementado por agora.\n" -#: lib/common.php:189 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Sen código de confirmación." -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:192 +#: lib/common.php:195 msgid "Go to the installer." msgstr "" diff --git a/locale/he/LC_MESSAGES/statusnet.mo b/locale/he/LC_MESSAGES/statusnet.mo index 51329ffd0..d7956f019 100644 Binary files a/locale/he/LC_MESSAGES/statusnet.mo and b/locale/he/LC_MESSAGES/statusnet.mo differ diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index af4ad9aae..de36e43f4 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-13 20:42+0000\n" -"PO-Revision-Date: 2009-11-13 20:42:45+0000\n" +"POT-Creation-Date: 2009-11-14 21:06+0000\n" +"PO-Revision-Date: 2009-11-14 21:07:27+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59079); 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" @@ -3541,21 +3541,21 @@ msgstr "" msgid "license." msgstr "" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "" -#: lib/action.php:1062 +#: lib/action.php:1061 #, fuzzy msgid "After" msgstr "<< אחרי" -#: lib/action.php:1070 +#: lib/action.php:1069 #, fuzzy msgid "Before" msgstr "לפני >>" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "" @@ -3763,20 +3763,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:189 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "אין קוד אישור." -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:192 +#: lib/common.php:195 msgid "Go to the installer." msgstr "" diff --git a/locale/is/LC_MESSAGES/statusnet.mo b/locale/is/LC_MESSAGES/statusnet.mo index bf148d7fa..031d9d72f 100644 Binary files a/locale/is/LC_MESSAGES/statusnet.mo and b/locale/is/LC_MESSAGES/statusnet.mo differ diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index 86be2cf8b..6e0fdfbc8 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-13 20:42+0000\n" -"PO-Revision-Date: 2009-11-13 20:42:49+0000\n" +"POT-Creation-Date: 2009-11-14 21:06+0000\n" +"PO-Revision-Date: 2009-11-14 21:07:29+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59079); 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" @@ -3554,19 +3554,19 @@ msgstr "Allt " msgid "license." msgstr "leyfi." -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "Uppröðun" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "Eftir" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "Áður" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "Það komu upp vandamál varðandi setutókann þinn." @@ -3773,20 +3773,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:189 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Enginn staðfestingarlykill." -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:192 +#: lib/common.php:195 #, fuzzy msgid "Go to the installer." msgstr "Skrá þig inn á síðuna" diff --git a/locale/it/LC_MESSAGES/statusnet.mo b/locale/it/LC_MESSAGES/statusnet.mo index a215ac0ac..d71c2eddc 100644 Binary files a/locale/it/LC_MESSAGES/statusnet.mo and b/locale/it/LC_MESSAGES/statusnet.mo differ diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index 03d397b52..6aad41073 100644 --- a/locale/it/LC_MESSAGES/statusnet.po +++ b/locale/it/LC_MESSAGES/statusnet.po @@ -1,16 +1,17 @@ # Translation of StatusNet to Italian # +# Author@translatewiki.net: Nemo bis # -- msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-13 20:42+0000\n" -"PO-Revision-Date: 2009-11-13 20:42:52+0000\n" +"POT-Creation-Date: 2009-11-14 21:06+0000\n" +"PO-Revision-Date: 2009-11-14 21:07:32+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59079); 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" @@ -3615,19 +3616,19 @@ msgstr "Tutto " msgid "license." msgstr "licenza." -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "Paginazione" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "Successivi" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "Precedenti" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "C'è stato un problema con il tuo token di sessione." @@ -3835,20 +3836,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:189 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Nessun codice di conferma." -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:192 +#: lib/common.php:195 #, fuzzy msgid "Go to the installer." msgstr "Accedi al sito" @@ -4414,7 +4415,7 @@ msgstr "Invia un messaggio" #: lib/noticeform.php:158 #, php-format msgid "What's up, %s?" -msgstr "Cosa succede %s?" +msgstr "Cosa succede, %s?" #: lib/noticeform.php:180 msgid "Attach" diff --git a/locale/ja/LC_MESSAGES/statusnet.mo b/locale/ja/LC_MESSAGES/statusnet.mo index 91a049b32..3a6e83a60 100644 Binary files a/locale/ja/LC_MESSAGES/statusnet.mo and b/locale/ja/LC_MESSAGES/statusnet.mo differ diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index f75460079..ee96f3778 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-13 20:42+0000\n" -"PO-Revision-Date: 2009-11-13 20:42:55+0000\n" +"POT-Creation-Date: 2009-11-14 21:06+0000\n" +"PO-Revision-Date: 2009-11-14 21:07:34+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59079); 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" @@ -3576,21 +3576,21 @@ msgstr "" msgid "license." msgstr "ライセンス。" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "" -#: lib/action.php:1062 +#: lib/action.php:1061 #, fuzzy msgid "After" msgstr "<< 前" -#: lib/action.php:1070 +#: lib/action.php:1069 #, fuzzy msgid "Before" msgstr "前 >>" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "" @@ -3798,20 +3798,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:189 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "確認コードがありません。" -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:192 +#: lib/common.php:195 #, fuzzy msgid "Go to the installer." msgstr "サイトへログイン" diff --git a/locale/ko/LC_MESSAGES/statusnet.mo b/locale/ko/LC_MESSAGES/statusnet.mo index ad6a2eca8..d930fe6d2 100644 Binary files a/locale/ko/LC_MESSAGES/statusnet.mo and b/locale/ko/LC_MESSAGES/statusnet.mo differ diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index 9c25104ac..6f569ee51 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-13 20:42+0000\n" -"PO-Revision-Date: 2009-11-13 20:42:57+0000\n" +"POT-Creation-Date: 2009-11-14 21:06+0000\n" +"PO-Revision-Date: 2009-11-14 21:07:38+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59079); 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" @@ -3580,19 +3580,19 @@ msgstr "모든 것" msgid "license." msgstr "라이선스" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "페이지수" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "뒷 페이지" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "앞 페이지" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "당신의 세션토큰관련 문제가 있습니다." @@ -3800,20 +3800,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:189 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "확인 코드가 없습니다." -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:192 +#: lib/common.php:195 #, fuzzy msgid "Go to the installer." msgstr "이 사이트 로그인" diff --git a/locale/mk/LC_MESSAGES/statusnet.mo b/locale/mk/LC_MESSAGES/statusnet.mo index cce86e74d..3b5378049 100644 Binary files a/locale/mk/LC_MESSAGES/statusnet.mo and b/locale/mk/LC_MESSAGES/statusnet.mo differ diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 01d416fa1..1a803cf95 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-13 20:42+0000\n" -"PO-Revision-Date: 2009-11-13 20:43:00+0000\n" +"POT-Creation-Date: 2009-11-14 21:06+0000\n" +"PO-Revision-Date: 2009-11-14 21:07:41+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59079); 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" @@ -3552,21 +3552,21 @@ msgstr "" msgid "license." msgstr "" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "" -#: lib/action.php:1062 +#: lib/action.php:1061 #, fuzzy msgid "After" msgstr "« Следни" -#: lib/action.php:1070 +#: lib/action.php:1069 #, fuzzy msgid "Before" msgstr "Предходни »" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "" @@ -3774,20 +3774,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:189 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Нема код за потврда." -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:192 +#: lib/common.php:195 msgid "Go to the installer." msgstr "" diff --git a/locale/nb/LC_MESSAGES/statusnet.mo b/locale/nb/LC_MESSAGES/statusnet.mo index 15f13ca51..6b16f5095 100644 Binary files a/locale/nb/LC_MESSAGES/statusnet.mo and b/locale/nb/LC_MESSAGES/statusnet.mo differ diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index d0c4ea124..cd1259eb7 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-13 20:42+0000\n" -"PO-Revision-Date: 2009-11-13 20:43:03+0000\n" +"POT-Creation-Date: 2009-11-14 21:06+0000\n" +"PO-Revision-Date: 2009-11-14 21:07:43+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(r59023); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59079); 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" @@ -3516,20 +3516,20 @@ msgstr "" msgid "license." msgstr "" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "" -#: lib/action.php:1070 +#: lib/action.php:1069 #, fuzzy msgid "Before" msgstr "Tidligere »" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "" @@ -3736,20 +3736,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:189 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Fant ikke bekreftelseskode." -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:192 +#: lib/common.php:195 msgid "Go to the installer." msgstr "" diff --git a/locale/nl/LC_MESSAGES/statusnet.mo b/locale/nl/LC_MESSAGES/statusnet.mo index 4fcdabaed..6c6dc8ea1 100644 Binary files a/locale/nl/LC_MESSAGES/statusnet.mo and b/locale/nl/LC_MESSAGES/statusnet.mo differ diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index 438a4e424..567ea58f8 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-13 20:42+0000\n" -"PO-Revision-Date: 2009-11-13 20:43:09+0000\n" +"POT-Creation-Date: 2009-11-14 21:06+0000\n" +"PO-Revision-Date: 2009-11-14 21:07:49+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59079); 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" @@ -3683,19 +3683,19 @@ msgstr "Alle " msgid "license." msgstr "licentie." -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "Paginering" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "Na" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "Voor" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "Er is een probleem met uw sessietoken." @@ -3945,20 +3945,20 @@ msgstr "" "tracks - nog niet beschikbaar\n" "tracking - nog niet beschikbaar\n" -#: lib/common.php:189 +#: lib/common.php:192 msgid "No configuration file found. " msgstr "Er is geen instellingenbestand aangetroffen. " -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "Er is gezocht naar instellingenbestanden op de volgende plaatsen: " -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" "U kunt proberen de installer uit te voeren om dit probleem op te lossen." -#: lib/common.php:192 +#: lib/common.php:195 msgid "Go to the installer." msgstr "Naar het installatieprogramma gaan." @@ -4819,7 +4819,6 @@ msgid "Could not subscribe other to you." msgstr "Het was niet mogelijk om een ander op u te laten abonneren" #: lib/subs.php:124 -#, fuzzy msgid "Not subscribed!" msgstr "Niet geabonneerd!" diff --git a/locale/nn/LC_MESSAGES/statusnet.mo b/locale/nn/LC_MESSAGES/statusnet.mo index d6fc4c4ca..32b5ccf2f 100644 Binary files a/locale/nn/LC_MESSAGES/statusnet.mo and b/locale/nn/LC_MESSAGES/statusnet.mo differ diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index 872f4eed0..00a846fe6 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-13 20:42+0000\n" -"PO-Revision-Date: 2009-11-13 20:43:05+0000\n" +"POT-Creation-Date: 2009-11-14 21:06+0000\n" +"PO-Revision-Date: 2009-11-14 21:07:46+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(r59023); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59079); 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" @@ -3596,19 +3596,19 @@ msgstr "Alle" msgid "license." msgstr "lisens." -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "Paginering" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "« Etter" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "Før »" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "Det var eit problem med sesjons billetten din." @@ -3816,20 +3816,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:189 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Ingen stadfestingskode." -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:192 +#: lib/common.php:195 #, fuzzy msgid "Go to the installer." msgstr "Logg inn or sida" diff --git a/locale/pl/LC_MESSAGES/statusnet.mo b/locale/pl/LC_MESSAGES/statusnet.mo index 2303f0fb2..b36c872fc 100644 Binary files a/locale/pl/LC_MESSAGES/statusnet.mo and b/locale/pl/LC_MESSAGES/statusnet.mo differ diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index e6c3ab182..66009ddaa 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-13 20:42+0000\n" -"PO-Revision-Date: 2009-11-13 20:43:13+0000\n" +"POT-Creation-Date: 2009-11-14 21:06+0000\n" +"PO-Revision-Date: 2009-11-14 21:07:51+0000\n" "Language-Team: Polish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59079); 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" @@ -3662,19 +3662,19 @@ msgstr "Wszystko " msgid "license." msgstr "licencja." -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "Paginacja" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "Następne" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "Wcześniej" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "Wystąpił problem z tokenem sesji." @@ -3911,20 +3911,20 @@ msgstr "" "tracks - jeszcze nie zaimplementowano.\n" "tracking - jeszcze nie zaimplementowano.\n" -#: lib/common.php:189 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Brak kodu potwierdzającego." -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:192 +#: lib/common.php:195 #, fuzzy msgid "Go to the installer." msgstr "Zaloguj się na stronę" diff --git a/locale/pt/LC_MESSAGES/statusnet.mo b/locale/pt/LC_MESSAGES/statusnet.mo index 77ba0509a..2c7df395b 100644 Binary files a/locale/pt/LC_MESSAGES/statusnet.mo and b/locale/pt/LC_MESSAGES/statusnet.mo differ diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index bdcc66468..744e46acf 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-13 20:42+0000\n" -"PO-Revision-Date: 2009-11-13 20:43:15+0000\n" +"POT-Creation-Date: 2009-11-14 21:06+0000\n" +"PO-Revision-Date: 2009-11-14 21:07:54+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59079); 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" @@ -3507,20 +3507,20 @@ msgstr "" msgid "license." msgstr "" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "" -#: lib/action.php:1070 +#: lib/action.php:1069 #, fuzzy msgid "Before" msgstr "Antes »" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "" @@ -3728,20 +3728,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:189 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Código de confirmação não encontrado" -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:192 +#: lib/common.php:195 msgid "Go to the installer." msgstr "" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.mo b/locale/pt_BR/LC_MESSAGES/statusnet.mo index 58f25061d..d5f7dc558 100644 Binary files a/locale/pt_BR/LC_MESSAGES/statusnet.mo and b/locale/pt_BR/LC_MESSAGES/statusnet.mo differ diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index d724f79b1..f133bed15 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-13 20:42+0000\n" -"PO-Revision-Date: 2009-11-13 20:43:18+0000\n" +"POT-Creation-Date: 2009-11-14 21:06+0000\n" +"PO-Revision-Date: 2009-11-14 21:07:56+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(r59023); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59079); 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" @@ -3656,19 +3656,19 @@ msgstr "Todas" msgid "license." msgstr "licença" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "Paginação" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "Próximo" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "Anterior" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "" "Ocorreu um problema com o seu token de sessão. Tente novamente, por favor." @@ -3880,20 +3880,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:189 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Nenhum código de confirmação." -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:192 +#: lib/common.php:195 #, fuzzy msgid "Go to the installer." msgstr "Entrar" diff --git a/locale/ru/LC_MESSAGES/statusnet.mo b/locale/ru/LC_MESSAGES/statusnet.mo index 2ee87e9be..495593c08 100644 Binary files a/locale/ru/LC_MESSAGES/statusnet.mo and b/locale/ru/LC_MESSAGES/statusnet.mo differ diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index 9c876cddf..f43a4f253 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-13 20:42+0000\n" -"PO-Revision-Date: 2009-11-13 20:43:20+0000\n" +"POT-Creation-Date: 2009-11-14 21:06+0000\n" +"PO-Revision-Date: 2009-11-14 21:07:59+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59079); 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" @@ -3651,19 +3651,19 @@ msgstr "Все" msgid "license." msgstr "лицензия." -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "Пагинация" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "Сюда" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "Туда" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "Проблема с Вашей сессией. Попробуйте ещё раз, пожалуйста." @@ -3871,20 +3871,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:189 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Нет кода подтверждения." -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:192 +#: lib/common.php:195 #, fuzzy msgid "Go to the installer." msgstr "Войти" diff --git a/locale/statusnet.po b/locale/statusnet.po index 448ab4fa5..7572c1008 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-13 20:42+0000\n" +"POT-Creation-Date: 2009-11-14 21:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3392,19 +3392,19 @@ msgstr "" msgid "license." msgstr "" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "" @@ -3610,19 +3610,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:189 +#: lib/common.php:192 msgid "No configuration file found. " msgstr "" -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:192 +#: lib/common.php:195 msgid "Go to the installer." msgstr "" diff --git a/locale/sv/LC_MESSAGES/statusnet.mo b/locale/sv/LC_MESSAGES/statusnet.mo index 93760fe39..64697b346 100644 Binary files a/locale/sv/LC_MESSAGES/statusnet.mo and b/locale/sv/LC_MESSAGES/statusnet.mo differ diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index 514a2e0fa..bfa20cd44 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-13 20:42+0000\n" -"PO-Revision-Date: 2009-11-13 20:43:23+0000\n" +"POT-Creation-Date: 2009-11-14 21:06+0000\n" +"PO-Revision-Date: 2009-11-14 21:08:02+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59079); 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" @@ -3647,21 +3647,21 @@ msgstr "" msgid "license." msgstr "" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "" -#: lib/action.php:1062 +#: lib/action.php:1061 #, fuzzy msgid "After" msgstr "« Nyare" -#: lib/action.php:1070 +#: lib/action.php:1069 #, fuzzy msgid "Before" msgstr "Tidigare »" -#: lib/action.php:1119 +#: lib/action.php:1117 #, fuzzy msgid "There was a problem with your session token." msgstr "Det var något problem med din session. Försök igen, tack." @@ -3870,20 +3870,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:189 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Ingen bekräftelsekod." -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:192 +#: lib/common.php:195 msgid "Go to the installer." msgstr "" diff --git a/locale/te/LC_MESSAGES/statusnet.mo b/locale/te/LC_MESSAGES/statusnet.mo index 2b70c53f2..91d6a1dfd 100644 Binary files a/locale/te/LC_MESSAGES/statusnet.mo and b/locale/te/LC_MESSAGES/statusnet.mo differ diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index 04a21fe1b..8447e7a44 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-13 20:42+0000\n" -"PO-Revision-Date: 2009-11-13 20:43:25+0000\n" +"POT-Creation-Date: 2009-11-14 21:06+0000\n" +"PO-Revision-Date: 2009-11-14 21:08:06+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59079); 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" @@ -76,7 +76,7 @@ msgstr "%s యొక్క మిత్రుల ఫీడు (ఆటమ్)" #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." -msgstr "" +msgstr "ఇది %s మరియు మిత్రుల కాలరేఖ కానీ ఇంకా ఎవరూ ఏమీ రాయలేదు." #: actions/all.php:132 #, php-format @@ -246,9 +246,8 @@ msgid "No status found with that ID." msgstr "" #: actions/apifavoritecreate.php:119 -#, fuzzy msgid "This status is already a favorite!" -msgstr "అది ఇప్పటికే మీ ఈమెయిల్ చిరునామా." +msgstr "ఈ నోటీసు ఇప్పటికే మీ ఇష్టాంశం!" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 msgid "Could not create favorite." @@ -807,7 +806,7 @@ msgstr "" #: actions/disfavor.php:94 msgid "Add to favorites" -msgstr "" +msgstr "ఇష్టాంశాలకు చేర్చు" #: actions/doc.php:69 msgid "No such document." @@ -1061,7 +1060,7 @@ msgstr "" #: lib/personalgroupnav.php:115 #, php-format msgid "%s's favorite notices" -msgstr "" +msgstr "%sకి ఇష్టమైన నోటీసులు" #: actions/favoritesrss.php:115 #, fuzzy, php-format @@ -1151,9 +1150,8 @@ msgid "No such file." msgstr "అటువంటి ఫైలు లేదు." #: actions/getfile.php:79 -#, fuzzy msgid "Cannot read file." -msgstr "అటువంటి సందేశమేమీ లేదు." +msgstr "ఫైలుని చదవలేకపోతున్నాం." #: actions/groupblock.php:81 actions/groupunblock.php:81 #: actions/makeadmin.php:81 @@ -1162,7 +1160,7 @@ msgstr "" #: actions/groupblock.php:91 msgid "Only an admin can block group members." -msgstr "" +msgstr "నిర్వాహకులు మాత్రమే గుంపు సభ్యులను నిరోధించగలరు." #: actions/groupblock.php:95 msgid "User is already blocked from group." @@ -1170,12 +1168,11 @@ msgstr "వాడుకరిని ఇప్పటికే గుంపున #: actions/groupblock.php:100 msgid "User is not a member of group." -msgstr "" +msgstr "వాడుకరి ఈ గుంపులో సభ్యులు కాదు." #: actions/groupblock.php:136 actions/groupmembers.php:314 -#, fuzzy msgid "Block user from group" -msgstr "అటువంటి వాడుకరి లేరు." +msgstr "వాడుకరిని గుంపు నుండి నిరోధించు" #: actions/groupblock.php:162 #, php-format @@ -1204,7 +1201,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" @@ -1610,7 +1607,7 @@ msgstr "ఓపెన్ఐడీ ఫారమును సృష్టించ #: actions/leavegroup.php:134 lib/command.php:289 #, php-format msgid "%s left group %s" -msgstr "" +msgstr "%2$s గుంపు నుండి %1$s వైదొలిగారు" #: actions/login.php:79 actions/register.php:137 msgid "Already logged in." @@ -2011,14 +2008,13 @@ msgid "URL of your homepage, blog, or profile on another site" msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వేరే సేటులోని మీ ప్రొఫైలు యొక్క చిరునామా" #: actions/profilesettings.php:122 actions/register.php:460 -#, fuzzy, php-format +#, php-format msgid "Describe yourself and your interests in %d chars" -msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి 140 అక్షరాల్లో చెప్పండి" +msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి %d అక్షరాల్లో చెప్పండి" #: actions/profilesettings.php:125 actions/register.php:463 -#, fuzzy msgid "Describe yourself and your interests" -msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి 140 అక్షరాల్లో చెప్పండి" +msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి చెప్పండి" #: actions/profilesettings.php:127 actions/register.php:465 msgid "Bio" @@ -2242,7 +2238,7 @@ msgstr "" #: actions/recoverpassword.php:191 msgid "Nickname or email address" -msgstr "" +msgstr "ముద్దుపేరు లేదా ఈమెయిలు చిరునామా" #: actions/recoverpassword.php:193 msgid "Your nickname on this server, or your registered email address." @@ -2320,7 +2316,7 @@ msgstr "మీ కొత్త సంకేతపదం భద్రమైంద #: actions/register.php:85 actions/register.php:189 actions/register.php:404 msgid "Sorry, only invited people can register." -msgstr "" +msgstr "క్షమించండి, ఆహ్వానితులు మాత్రమే నమోదుకాగలరు." #: actions/register.php:92 #, fuzzy @@ -2372,7 +2368,7 @@ msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షర #: actions/register.php:433 msgid "Same as password above. Required." -msgstr "" +msgstr "పై సంకేతపదం మరోసారి. తప్పనిసరి." #: actions/register.php:437 actions/register.php:441 #: lib/accountsettingsaction.php:120 @@ -2385,7 +2381,7 @@ msgstr "తాజా విశేషాలు, ప్రకటనలు, మర #: actions/register.php:449 msgid "Longer name, preferably your \"real\" name" -msgstr "" +msgstr "పొడుగాటి పేరు, మీ \"అసలు\" పేరైతే మంచిది" #: actions/register.php:493 msgid "My text and files are available under " @@ -3427,13 +3423,13 @@ msgid "StatusNet software license" msgstr "" #: lib/action.php:767 -#, fuzzy, php-format +#, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." "broughtby%%](%%site.broughtbyurl%%). " msgstr "" -"[%%site.broughtby%%](%%site.broughtbyurl%%) వారు అందిస్తున్న ఈ **%%site.name%%** " -"అనేది మైక్రో బ్లాగింగు సదుపాయం." +"**%%site.name%%** అనేది [%%site.broughtby%%](%%site.broughtbyurl%%) వారు " +"అందిస్తున్న మైక్రో బ్లాగింగు సదుపాయం. " #: lib/action.php:769 #, php-format @@ -3447,6 +3443,9 @@ msgid "" "s, available under the [GNU Affero General Public License](http://www.fsf." "org/licensing/licenses/agpl-3.0.html)." msgstr "" +"ఇది [గ్నూ ఆఫెరో జెనరల్ పబ్లిక్ లైసెన్సు](http://www.fsf.org/licensing/licenses/agpl-3.0." +"html) కింద లభ్యమయ్యే [స్టేటస్‌నెట్](http://status.net/) మైక్రోబ్లాగింగ్ ఉపకరణం సంచిక %s " +"పై నడుస్తుంది." #: lib/action.php:785 #, fuzzy @@ -3461,19 +3460,19 @@ msgstr "అన్నీ " msgid "license." msgstr "" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "పేజీకరణ" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "తర్వాత" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "ఇంతక్రితం" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "" @@ -3588,7 +3587,7 @@ msgstr "" #: lib/command.php:431 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" -msgstr "" +msgstr "నోటిసు చాలా పొడవుగా ఉంది - %d అక్షరాలు గరిష్ఠం, మీరు %d పంపించారు" #: lib/command.php:439 #, fuzzy, php-format @@ -3684,20 +3683,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:189 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "నిర్ధారణ సంకేతం లేదు." -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:192 +#: lib/common.php:195 msgid "Go to the installer." msgstr "" @@ -4359,9 +4358,8 @@ msgid "All subscribers" msgstr "అందరు చందాదార్లు" #: lib/profileaction.php:177 -#, fuzzy msgid "User ID" -msgstr "వాడుకరి" +msgstr "వాడుకరి ID" #: lib/profileaction.php:182 msgid "Member since" @@ -4443,7 +4441,7 @@ msgstr "%sకి స్పందనలు" #: lib/subgroupnav.php:99 #, php-format msgid "Groups %s is a member of" -msgstr "" +msgstr "%s సభ్యులుగా ఉన్న గుంపులు" #: lib/subscriberspeopleselftagcloudsection.php:48 #: lib/subscriptionspeopleselftagcloudsection.php:48 @@ -4464,9 +4462,8 @@ msgid "Already subscribed!" msgstr "" #: lib/subs.php:52 -#, fuzzy msgid "User has blocked you." -msgstr "వాడుకరికి ప్రొఫైలు లేదు." +msgstr "వాడుకరి మిమ్మల్ని నిరోధించారు." #: lib/subs.php:56 msgid "Could not subscribe." @@ -4499,7 +4496,7 @@ msgstr "" #: lib/unsubscribeform.php:137 msgid "Unsubscribe" -msgstr "" +msgstr "చందామాను" #: lib/userprofile.php:116 msgid "Edit Avatar" @@ -4571,9 +4568,9 @@ msgid "about a year ago" msgstr "ఒక సంవత్సరం క్రితం" #: lib/webcolor.php:82 -#, fuzzy, php-format +#, php-format msgid "%s is not a valid color!" -msgstr "హోమ్ పేజీ URL సరైనది కాదు." +msgstr "%s అనేది సరైన రంగు కాదు!" #: lib/webcolor.php:123 #, php-format diff --git a/locale/tr/LC_MESSAGES/statusnet.mo b/locale/tr/LC_MESSAGES/statusnet.mo index 1ee9548bc..d3e547bff 100644 Binary files a/locale/tr/LC_MESSAGES/statusnet.mo and b/locale/tr/LC_MESSAGES/statusnet.mo differ diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index cd84e1bd9..041ceb3a3 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-13 20:42+0000\n" -"PO-Revision-Date: 2009-11-13 20:43:28+0000\n" +"POT-Creation-Date: 2009-11-14 21:06+0000\n" +"PO-Revision-Date: 2009-11-14 21:08:08+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59079); 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" @@ -3547,21 +3547,21 @@ msgstr "" msgid "license." msgstr "" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "" -#: lib/action.php:1062 +#: lib/action.php:1061 #, fuzzy msgid "After" msgstr "« Sonra" -#: lib/action.php:1070 +#: lib/action.php:1069 #, fuzzy msgid "Before" msgstr "Önce »" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "" @@ -3769,20 +3769,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:189 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Onay kodu yok." -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:192 +#: lib/common.php:195 msgid "Go to the installer." msgstr "" diff --git a/locale/uk/LC_MESSAGES/statusnet.mo b/locale/uk/LC_MESSAGES/statusnet.mo index fa541313f..c73cc7fe6 100644 Binary files a/locale/uk/LC_MESSAGES/statusnet.mo and b/locale/uk/LC_MESSAGES/statusnet.mo differ diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index 3c803427b..d340b5dfd 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-13 20:42+0000\n" -"PO-Revision-Date: 2009-11-13 20:43:31+0000\n" +"POT-Creation-Date: 2009-11-14 21:06+0000\n" +"PO-Revision-Date: 2009-11-14 21:08:11+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59079); 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" @@ -3627,19 +3627,19 @@ msgstr "Всі " msgid "license." msgstr "ліцензія." -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "Нумерація сторінок" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "Вперед" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "Назад" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "Виникли певні проблеми з токеном поточної сесії." @@ -3847,20 +3847,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:189 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Немає коду підтвердження." -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:192 +#: lib/common.php:195 #, fuzzy msgid "Go to the installer." msgstr "Увійти на сайт" diff --git a/locale/vi/LC_MESSAGES/statusnet.mo b/locale/vi/LC_MESSAGES/statusnet.mo index 1b6b7f268..919c29a7a 100644 Binary files a/locale/vi/LC_MESSAGES/statusnet.mo and b/locale/vi/LC_MESSAGES/statusnet.mo differ diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index 0c6fd586b..a58a3b8fd 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-13 20:42+0000\n" -"PO-Revision-Date: 2009-11-13 20:43:33+0000\n" +"POT-Creation-Date: 2009-11-14 21:06+0000\n" +"PO-Revision-Date: 2009-11-14 21:08:13+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59079); 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" @@ -3687,21 +3687,21 @@ msgstr "" msgid "license." msgstr "" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "" -#: lib/action.php:1062 +#: lib/action.php:1061 #, fuzzy msgid "After" msgstr "Sau" -#: lib/action.php:1070 +#: lib/action.php:1069 #, fuzzy msgid "Before" msgstr "Trước" -#: lib/action.php:1119 +#: lib/action.php:1117 #, fuzzy msgid "There was a problem with your session token." msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa." @@ -3917,20 +3917,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:189 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Không có mã số xác nhận." -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:192 +#: lib/common.php:195 msgid "Go to the installer." msgstr "" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.mo b/locale/zh_CN/LC_MESSAGES/statusnet.mo index 18493304d..858418684 100644 Binary files a/locale/zh_CN/LC_MESSAGES/statusnet.mo and b/locale/zh_CN/LC_MESSAGES/statusnet.mo differ diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index d64c07436..6b0f4d26d 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-13 20:42+0000\n" -"PO-Revision-Date: 2009-11-13 20:43:36+0000\n" +"POT-Creation-Date: 2009-11-14 21:06+0000\n" +"PO-Revision-Date: 2009-11-14 21:08:16+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(r59023); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59079); 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" @@ -3607,21 +3607,21 @@ msgstr "全部" msgid "license." msgstr "注册证" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "分页" -#: lib/action.php:1062 +#: lib/action.php:1061 #, fuzzy msgid "After" msgstr "« 之后" -#: lib/action.php:1070 +#: lib/action.php:1069 #, fuzzy msgid "Before" msgstr "之前 »" -#: lib/action.php:1119 +#: lib/action.php:1117 #, fuzzy msgid "There was a problem with your session token." msgstr "会话标识有问题，请重试。" @@ -3830,20 +3830,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:189 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "没有验证码" -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:192 +#: lib/common.php:195 #, fuzzy msgid "Go to the installer." msgstr "登入本站" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.mo b/locale/zh_TW/LC_MESSAGES/statusnet.mo index d9cef9e4e..7bc92ed14 100644 Binary files a/locale/zh_TW/LC_MESSAGES/statusnet.mo and b/locale/zh_TW/LC_MESSAGES/statusnet.mo differ diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index 3bc2ebbd6..6c7417d67 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-13 20:42+0000\n" -"PO-Revision-Date: 2009-11-13 20:43:38+0000\n" +"POT-Creation-Date: 2009-11-14 21:06+0000\n" +"PO-Revision-Date: 2009-11-14 21:08:18+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(r59023); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59079); 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" @@ -3484,20 +3484,20 @@ msgstr "" msgid "license." msgstr "" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "" -#: lib/action.php:1070 +#: lib/action.php:1069 #, fuzzy msgid "Before" msgstr "之前的內容»" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "" @@ -3703,20 +3703,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:189 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "無確認碼" -#: lib/common.php:190 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:191 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:192 +#: lib/common.php:195 msgid "Go to the installer." msgstr "" -- cgit v1.2.3-54-g00ecf From e9225fabddb4c7dc2fef2c66b4ba3ecfd8c2f07d Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sun, 15 Nov 2009 15:57:37 +0100 Subject: common superclass for forms that operate on a profile --- lib/profileactionform.php | 187 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 187 insertions(+) create mode 100644 lib/profileactionform.php diff --git a/lib/profileactionform.php b/lib/profileactionform.php new file mode 100644 index 000000000..fb183b6b6 --- /dev/null +++ b/lib/profileactionform.php @@ -0,0 +1,187 @@ +. + * + * @category Form + * @package StatusNet + * @author Evan Prodromou + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Superclass for forms that operate on a profile + * + * Certain forms (block, silence, userflag, sandbox, delete) work on + * a single profile and work almost the same. So, this form extracts + * a lot of the common code to simplify those forms. + * + * @category Form + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class ProfileActionForm extends Form +{ + /** + * Profile of user to act on + */ + + var $profile = null; + + /** + * Return-to args + */ + + var $args = null; + + /** + * Constructor + * + * @param HTMLOutputter $out output channel + * @param Profile $profile profile of user to act on + * @param array $args return-to args + */ + + function __construct($out=null, $profile=null, $args=null) + { + parent::__construct($out); + + $this->profile = $profile; + $this->args = $args; + } + + /** + * ID of the form + * + * @return int ID of the form + */ + + function id() + { + return $this->target() . '-' . $this->profile->id; + } + + /** + * class of the form + * + * @return string class of the form + */ + + function formClass() + { + return 'form_user_'.$this->target(); + } + + /** + * Action of the form + * + * @return string URL of the action + */ + + function action() + { + return common_local_url($this->target()); + } + + /** + * Legend of the Form + * + * @return void + */ + + function formLegend() + { + $this->out->element('legend', null, $this->description()); + } + + /** + * Data elements of the form + * + * @return void + */ + + function formData() + { + $action = $this->target(); + + $this->out->hidden($action.'to-' . $this->profile->id, + $this->profile->id, + $action.'to'); + + if ($this->args) { + foreach ($this->args as $k => $v) { + $this->out->hidden('returnto-' . $k, $v); + } + } + } + + /** + * Action elements + * + * @return void + */ + + function formActions() + { + $this->out->submit('submit', $this->title(), 'submit', + null, $this->description()); + } + + /** + * Action this form targets + * + * @return string Name of the action, lowercased. + */ + + function target() + { + return null; + } + + /** + * Title of the form + * + * @return string Title of the form, internationalized + */ + + function title() + { + return null; + } + + /** + * Description of the form + * + * @return string description of the form, internationalized + */ + + function description() + { + return null; + } +} -- cgit v1.2.3-54-g00ecf From d5032fc3a31b2c31f3c90112a0c5519ba7ec7f11 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sun, 15 Nov 2009 15:57:52 +0100 Subject: blockform uses profileactionform --- lib/blockform.php | 99 ++++++++----------------------------------------------- 1 file changed, 13 insertions(+), 86 deletions(-) diff --git a/lib/blockform.php b/lib/blockform.php index 4820d09af..b6652b1f6 100644 --- a/lib/blockform.php +++ b/lib/blockform.php @@ -32,8 +32,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/form.php'; - /** * Form for blocking a user * @@ -47,109 +45,38 @@ require_once INSTALLDIR.'/lib/form.php'; * @see UnblockForm */ -class BlockForm extends Form +class BlockForm extends ProfileActionForm { /** - * Profile of user to block - */ - - var $profile = null; - - /** - * Return-to args - */ - - var $args = null; - - /** - * Constructor + * Action this form provides * - * @param HTMLOutputter $out output channel - * @param Profile $profile profile of user to block - * @param array $args return-to args + * @return string Name of the action, lowercased. */ - function __construct($out=null, $profile=null, $args=null) + function target() { - parent::__construct($out); - - $this->profile = $profile; - $this->args = $args; + return 'block'; } /** - * ID of the form - * - * @return int ID of the form - */ - - function id() - { - return 'block-' . $this->profile->id; - } - - - /** - * class of the form - * - * @return string class of the form - */ - - function formClass() - { - return 'form_user_block'; - } - - - /** - * Action of the form - * - * @return string URL of the action - */ - - function action() - { - return common_local_url('block'); - } - - - /** - * Legend of the Form - * - * @return void - */ - function formLegend() - { - $this->out->element('legend', null, _('Block this user')); - } - - - /** - * Data elements of the form + * Title of the form * - * @return void + * @return string Title of the form, internationalized */ - function formData() + function title() { - $this->out->hidden('blockto-' . $this->profile->id, - $this->profile->id, - 'blockto'); - if ($this->args) { - foreach ($this->args as $k => $v) { - $this->out->hidden('returnto-' . $k, $v); - } - } + return _('Block'); } /** - * Action elements + * Description of the form * - * @return void + * @return string description of the form, internationalized */ - function formActions() + function description() { - $this->out->submit('submit', _('Block'), 'submit', null, _('Block this user')); + return _('Block this user'); } } -- cgit v1.2.3-54-g00ecf From e3b53565bb5744116811cd88dbe67ae8df7547fd Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sun, 15 Nov 2009 15:57:59 +0100 Subject: unblockform uses profileactionform --- lib/unblockform.php | 98 ++++++++--------------------------------------------- 1 file changed, 14 insertions(+), 84 deletions(-) diff --git a/lib/unblockform.php b/lib/unblockform.php index f1343757c..4fe28b21a 100644 --- a/lib/unblockform.php +++ b/lib/unblockform.php @@ -28,12 +28,10 @@ * @link http://status.net/ */ -if (!defined('STATUSNET') && !defined('LACONICA')) { +if (!defined('STATUSNET')) { exit(1); } -require_once INSTALLDIR.'/lib/form.php'; - /** * Form for unblocking a user * @@ -47,106 +45,38 @@ require_once INSTALLDIR.'/lib/form.php'; * @see BlockForm */ -class UnblockForm extends Form +class UnblockForm extends ProfileActionForm { /** - * Profile of user to unblock - */ - - var $profile = null; - - /** - * Return-to args - */ - - var $args = null; - - /** - * Constructor - * - * @param HTMLOutputter $out output channel - * @param Profile $profile profile of user to unblock - * @param array $args return-to args - */ - - function __construct($out=null, $profile=null, $args=null) - { - parent::__construct($out); - - $this->profile = $profile; - $this->args = $args; - } - - /** - * ID of the form - * - * @return int ID of the form - */ - - function id() - { - return 'unblock-' . $this->profile->id; - } - - /** - * class of the form + * Action this form provides * - * @return string class of the form + * @return string Name of the action, lowercased. */ - function formClass() + function target() { - return 'form_user_unblock'; + return 'unblock'; } /** - * Action of the form - * - * @return string URL of the action - */ - - function action() - { - return common_local_url('unblock'); - } - - /** - * Legend of the Form - * - * @return void - */ - function formLegend() - { - $this->out->element('legend', null, _('Unblock this user')); - } - - - /** - * Data elements of the form + * Title of the form * - * @return void + * @return string Title of the form, internationalized */ - function formData() + function title() { - $this->out->hidden('unblockto-' . $this->profile->id, - $this->profile->id, - 'unblockto'); - if ($this->args) { - foreach ($this->args as $k => $v) { - $this->out->hidden('returnto-' . $k, $v); - } - } + return _('Unblock'); } /** - * Action elements + * Description of the form * - * @return void + * @return string description of the form, internationalized */ - function formActions() + function description() { - $this->out->submit('submit', _('Unblock'), 'submit', null, _('Unblock this user')); + return _('Unlock this user'); } } -- cgit v1.2.3-54-g00ecf From c9475c76a8b4c2bf32d1d3293b03b646e7e7a91e Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sun, 15 Nov 2009 15:59:10 +0100 Subject: define rights around how to silence, sandbox, and delete a user --- classes/User.php | 14 ++++++++++++++ classes/User_role.php | 2 ++ lib/right.php | 3 +++ 3 files changed, 19 insertions(+) diff --git a/classes/User.php b/classes/User.php index 9f1ee53f4..0e8404377 100644 --- a/classes/User.php +++ b/classes/User.php @@ -720,10 +720,14 @@ class User extends Memcached_DataObject switch ($right) { case Right::DELETEOTHERSNOTICE: + case Right::SANDBOXUSER: + case Right::SILENCEUSER: + case Right::DELETEUSER: $result = $this->hasRole(User_role::MODERATOR); break; case Right::CONFIGURESITE: $result = $this->hasRole(User_role::ADMINISTRATOR); + break; default: $result = false; break; @@ -774,4 +778,14 @@ class User extends Memcached_DataObject $block->delete(); // XXX delete group block? Reset blocker? } + + function isSandboxed() + { + return $this->hasRole(User_role::SANDBOXED); + } + + function isSilenced() + { + return $this->hasRole(User_role::SILENCED); + } } diff --git a/classes/User_role.php b/classes/User_role.php index fc3806897..b415642fc 100644 --- a/classes/User_role.php +++ b/classes/User_role.php @@ -48,4 +48,6 @@ class User_role extends Memcached_DataObject const MODERATOR = 'moderator'; const ADMINISTRATOR = 'administrator'; + const SANDBOXED = 'sandboxed'; + const SILENCED = 'silenced'; } diff --git a/lib/right.php b/lib/right.php index 4fc981af0..88abdf780 100644 --- a/lib/right.php +++ b/lib/right.php @@ -47,5 +47,8 @@ class Right { const DELETEOTHERSNOTICE = 'deleteothersnotice'; const CONFIGURESITE = 'configuresite'; + const DELETEUSER = 'deleteuser'; + const SILENCEUSER = 'silenceuser'; + const SANDBOXUSER = 'sandboxuser'; } -- cgit v1.2.3-54-g00ecf From d24ed193e7b19b50f7304790820c945e46ac2c95 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sun, 15 Nov 2009 16:00:29 +0100 Subject: add forms for silence, sandbox, delete user --- lib/deleteuserform.php | 79 ++++++++++++++++++++++++++++++++++++++++++++++++ lib/sandboxform.php | 80 ++++++++++++++++++++++++++++++++++++++++++++++++ lib/silenceform.php | 80 ++++++++++++++++++++++++++++++++++++++++++++++++ lib/unsandboxform.php | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++ lib/unsilenceform.php | 80 ++++++++++++++++++++++++++++++++++++++++++++++++ lib/userprofile.php | 44 +++++++++++++++++++++++---- 6 files changed, 439 insertions(+), 6 deletions(-) create mode 100644 lib/deleteuserform.php create mode 100644 lib/sandboxform.php create mode 100644 lib/silenceform.php create mode 100644 lib/unsandboxform.php create mode 100644 lib/unsilenceform.php diff --git a/lib/deleteuserform.php b/lib/deleteuserform.php new file mode 100644 index 000000000..09ea8f68d --- /dev/null +++ b/lib/deleteuserform.php @@ -0,0 +1,79 @@ +. + * + * @category Form + * @package StatusNet + * @author Evan Prodromou + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Form for deleting a user + * + * @category Form + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + * + */ + +class DeleteUserForm extends ProfileActionForm +{ + /** + * Action this form provides + * + * @return string Name of the action, lowercased. + */ + + function target() + { + return 'deleteuser'; + } + + /** + * Title of the form + * + * @return string Title of the form, internationalized + */ + + function title() + { + return _('Delete'); + } + + /** + * Description of the form + * + * @return string description of the form, internationalized + */ + + function description() + { + return _('Delete this user'); + } +} diff --git a/lib/sandboxform.php b/lib/sandboxform.php new file mode 100644 index 000000000..7a98e0a5f --- /dev/null +++ b/lib/sandboxform.php @@ -0,0 +1,80 @@ +. + * + * @category Form + * @package StatusNet + * @author Evan Prodromou + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Form for sandboxing a user + * + * @category Form + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + * + * @see UnSandboxForm + */ + +class SandboxForm extends ProfileActionForm +{ + /** + * Action this form provides + * + * @return string Name of the action, lowercased. + */ + + function target() + { + return 'sandbox'; + } + + /** + * Title of the form + * + * @return string Title of the form, internationalized + */ + + function title() + { + return _('Sandbox'); + } + + /** + * Description of the form + * + * @return string description of the form, internationalized + */ + + function description() + { + return _('Sandbox this user'); + } +} diff --git a/lib/silenceform.php b/lib/silenceform.php new file mode 100644 index 000000000..c9cf4b057 --- /dev/null +++ b/lib/silenceform.php @@ -0,0 +1,80 @@ +. + * + * @category Form + * @package StatusNet + * @author Evan Prodromou + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Form for silencing a user + * + * @category Form + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + * + * @see UnSilenceForm + */ + +class SilenceForm extends Form +{ + /** + * Action this form provides + * + * @return string Name of the action, lowercased. + */ + + function target() + { + return 'silence'; + } + + /** + * Title of the form + * + * @return string Title of the form, internationalized + */ + + function title() + { + return _('Silence'); + } + + /** + * Description of the form + * + * @return string description of the form, internationalized + */ + + function description() + { + return _('Silence this user'); + } +} diff --git a/lib/unsandboxform.php b/lib/unsandboxform.php new file mode 100644 index 000000000..559d1462d --- /dev/null +++ b/lib/unsandboxform.php @@ -0,0 +1,82 @@ +. + * + * @category Form + * @package StatusNet + * @author Evan Prodromou + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Form for unsandboxing a user + * + * Removes the "sandboxed" role for a user. + * + * @category Form + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + * + * @see UnSandboxForm + */ + +class UnsandboxForm extends Form +{ + /** + * Action this form provides + * + * @return string Name of the action, lowercased. + */ + + function target() + { + return 'unsandbox'; + } + + /** + * Title of the form + * + * @return string Title of the form, internationalized + */ + + function title() + { + return _('Unsandbox'); + } + + /** + * Description of the form + * + * @return string description of the form, internationalized + */ + + function description() + { + return _('Unsandbox this user'); + } +} diff --git a/lib/unsilenceform.php b/lib/unsilenceform.php new file mode 100644 index 000000000..324d278b9 --- /dev/null +++ b/lib/unsilenceform.php @@ -0,0 +1,80 @@ +. + * + * @category Form + * @package StatusNet + * @author Evan Prodromou + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Form for unsilencing a user + * + * @category Form + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + * + * @see UnSilenceForm + */ + +class UnSilenceForm extends Form +{ + /** + * Action this form provides + * + * @return string Name of the action, lowercased. + */ + + function target() + { + return 'unsilence'; + } + + /** + * Title of the form + * + * @return string Title of the form, internationalized + */ + + function title() + { + return _('Unsilence'); + } + + /** + * Description of the form + * + * @return string description of the form, internationalized + */ + + function description() + { + return _('Unsilence this user'); + } +} diff --git a/lib/userprofile.php b/lib/userprofile.php index 4f9d4984f..4321a2f93 100644 --- a/lib/userprofile.php +++ b/lib/userprofile.php @@ -283,22 +283,54 @@ class UserProfile extends Widget } } + // return-to args, so we don't have to keep re-writing them + + $r2args = array('action' => 'showstream', + 'nickname' => $this->profile->nickname); + // block/unblock $blocked = $cur->hasBlocked($this->profile); $this->out->elementStart('li', 'entity_block'); if ($blocked) { - $ubf = new UnblockForm($this->out, $this->profile, - array('action' => 'showstream', - 'nickname' => $this->profile->nickname)); + $ubf = new UnblockForm($this->out, $this->profile, $r2args); $ubf->show(); } else { - $bf = new BlockForm($this->out, $this->profile, - array('action' => 'showstream', - 'nickname' => $this->profile->nickname)); + $bf = new BlockForm($this->out, $this->profile, $r2args); $bf->show(); } $this->out->elementEnd('li'); + + if ($cur->hasRight(Right::SANDBOXUSER)) { + $this->out->elementStart('li', 'entity_sandbox'); + if ($this->user->isSandboxed()) { + $usf = new UnSandboxForm($this->out, $this->profile, $r2args); + $usf->show(); + } else { + $sf = new SandboxForm($this->out, $this->profile, $r2args); + $sf->show(); + } + $this->out->elementEnd('li'); + } + + if ($cur->hasRight(Right::SILENCEUSER)) { + $this->out->elementStart('li', 'entity_silence'); + if ($this->user->isSilenced()) { + $usf = new UnSilenceForm($this->out, $this->profile, $r2args); + $usf->show(); + } else { + $sf = new SilenceForm($this->out, $this->profile, $r2args); + $sf->show(); + } + $this->out->elementEnd('li'); + } + + if ($cur->hasRight(Right::DELETEUSER)) { + $this->out->elementStart('li', 'entity_delete'); + $df = DeleteUserForm($this->out, $this->profile, $r2args); + $df->show(); + $this->out->elementEnd('li'); + } } } -- cgit v1.2.3-54-g00ecf From 6470ccd1b869808d2fca530b9ee53e6a574646c4 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Mon, 16 Nov 2009 00:19:19 -0500 Subject: getSubscribers and getSubscriptions were not handling the case where limit=null correctly --- classes/Profile.php | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/classes/Profile.php b/classes/Profile.php index 7c1e9db33..9348248af 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -310,10 +310,12 @@ class Profile extends Memcached_DataObject 'AND subscription.subscribed != subscription.subscriber ' . 'ORDER BY subscription.created DESC '; - if (common_config('db','type') == 'pgsql') { - $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset; - } else { - $qry .= ' LIMIT ' . $offset . ', ' . $limit; + if ($offset>0 && !is_null($limit)){ + if (common_config('db','type') == 'pgsql') { + $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset; + } else { + $qry .= ' LIMIT ' . $offset . ', ' . $limit; + } } $profile = new Profile(); @@ -333,11 +335,13 @@ class Profile extends Memcached_DataObject 'AND subscription.subscribed != subscription.subscriber ' . 'ORDER BY subscription.created DESC '; - if ($offset) { - if (common_config('db','type') == 'pgsql') { - $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset; - } else { - $qry .= ' LIMIT ' . $offset . ', ' . $limit; + if ($offset>0 && !is_null($limit)){ + if ($offset) { + if (common_config('db','type') == 'pgsql') { + $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset; + } else { + $qry .= ' LIMIT ' . $offset . ', ' . $limit; + } } } -- cgit v1.2.3-54-g00ecf From f04dbc8fa21d86bae5c34ece2637c3c345e29927 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Mon, 16 Nov 2009 00:19:47 -0500 Subject: Add "followers" and "following" commands --- lib/command.php | 40 ++++++++++++++++++++++++++++++++++++++++ lib/commandinterpreter.php | 12 ++++++++++++ 2 files changed, 52 insertions(+) diff --git a/lib/command.php b/lib/command.php index 2ec3320de..c4a4f7cf4 100644 --- a/lib/command.php +++ b/lib/command.php @@ -605,6 +605,44 @@ class LoginCommand extends Command } } +class FollowingCommand extends Command +{ + function execute($channel) + { + $profile = $this->user->getSubscriptions(0); + $nicknames=array(); + while ($profile->fetch()) { + $nicknames[]=$profile->nickname; + } + if(count($nicknames)==0){ + $out=_('You are not subscribed to anyone.'); + }else{ + $out=_('You are subscribed to these people: '); + $out.=implode(', ',$nicknames); + } + $channel->output($this->user,$out); + } +} + +class FollowersCommand extends Command +{ + function execute($channel) + { + $profile = $this->user->getSubscribers(); + $nicknames=array(); + while ($profile->fetch()) { + $nicknames[]=$profile->nickname; + } + if(count($nicknames)==0){ + $out=_('No one is subscribed to you.'); + }else{ + $out=_('These people are subscribed to you: '); + $out.=implode(', ',$nicknames); + } + $channel->output($this->user,$out); + } +} + class HelpCommand extends Command { function execute($channel) @@ -615,6 +653,8 @@ class HelpCommand extends Command "off - turn off notifications\n". "help - show this help\n". "follow - subscribe to user\n". + "following - list the people you follow\n". + "followers - list the people that follow you\n". "leave - unsubscribe from user\n". "d - direct message to user\n". "get - get last notice from user\n". diff --git a/lib/commandinterpreter.php b/lib/commandinterpreter.php index d878fe268..ecc08f101 100644 --- a/lib/commandinterpreter.php +++ b/lib/commandinterpreter.php @@ -47,6 +47,18 @@ class CommandInterpreter } else { return new LoginCommand($user); } + case 'followers': + if ($arg) { + return null; + } else { + return new FollowersCommand($user); + } + case 'following': + if ($arg) { + return null; + } else { + return new FollowingCommand($user); + } case 'on': if ($arg) { list($other, $extra) = $this->split_arg($arg); -- cgit v1.2.3-54-g00ecf From 64677fc09a54546274a001ce9bec0fa4bc8132f7 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 16 Nov 2009 14:28:58 +0100 Subject: common superclass for actions that operate on a profile and return --- lib/profileactionform.php | 2 +- lib/profileformaction.php | 139 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+), 1 deletion(-) create mode 100644 lib/profileformaction.php diff --git a/lib/profileactionform.php b/lib/profileactionform.php index fb183b6b6..24d4595c0 100644 --- a/lib/profileactionform.php +++ b/lib/profileactionform.php @@ -131,7 +131,7 @@ class ProfileActionForm extends Form $this->out->hidden($action.'to-' . $this->profile->id, $this->profile->id, - $action.'to'); + 'profileid'); if ($this->args) { foreach ($this->args as $k => $v) { diff --git a/lib/profileformaction.php b/lib/profileformaction.php new file mode 100644 index 000000000..92e8611b9 --- /dev/null +++ b/lib/profileformaction.php @@ -0,0 +1,139 @@ +. + * + * @category Action + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +/** + * Superclass for actions that operate on a user + * + * @category Action + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://status.net/ + */ + +class ProfileFormAction extends Action +{ + var $profile = null; + + /** + * Take arguments for running + * + * @param array $args $_REQUEST args + * + * @return boolean success flag + */ + + function prepare($args) + { + parent::prepare($args); + + $this->checkSessionToken(); + + if (!common_logged_in()) { + $this->clientError(_('Not logged in.')); + return false; + } + + $id = $this->trimmed('profileid'); + + if (!$id) { + $this->clientError(_('No profile specified.')); + return false; + } + + $this->profile = Profile::staticGet('id', $id); + + if (!$this->profile) { + $this->clientError(_('No profile with that ID.')); + return false; + } + + return true; + } + + /** + * Handle request + * + * Shows a page with list of favorite notices + * + * @param array $args $_REQUEST args; handled in prepare() + * + * @return void + */ + + function handle($args) + { + parent::handle($args); + + if ($_SERVER['REQUEST_METHOD'] == 'POST') { + $this->handlePost(); + $this->returnToArgs(); + } + } + + /** + * Return to the calling page based on hidden arguments + * + * @return void + */ + + function returnToArgs() + { + foreach ($this->args as $k => $v) { + if ($k == 'returnto-action') { + $action = $v; + } else if (substr($k, 0, 9) == 'returnto-') { + $args[substr($k, 9)] = $v; + } + } + + if ($action) { + common_redirect(common_local_url($action, $args), 303); + } else { + $this->clientError(_("No return-to arguments")); + } + } + + /** + * handle a POST request + * + * sub-classes should overload this request + * + * @return void + */ + + function handlePost() + { + return; + } +} -- cgit v1.2.3-54-g00ecf From ff88ef407a344749c02d9d1d0dc104b4b720d7ae Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 16 Nov 2009 14:40:04 +0100 Subject: make block actions use profileformaction superclass --- actions/block.php | 6 ++-- actions/unblock.php | 72 +++++++++-------------------------------------- lib/profileformaction.php | 2 +- 3 files changed, 17 insertions(+), 63 deletions(-) diff --git a/actions/block.php b/actions/block.php index b125d2d8b..2443b3010 100644 --- a/actions/block.php +++ b/actions/block.php @@ -64,7 +64,7 @@ class BlockAction extends Action $this->clientError(_('There was a problem with your session token. Try again, please.')); return; } - $id = $this->trimmed('blockto'); + $id = $this->trimmed('profileid'); if (!$id) { $this->clientError(_('No profile specified.')); return false; @@ -97,7 +97,7 @@ class BlockAction extends Action 303); } elseif ($this->arg('yes')) { $this->blockProfile(); - } elseif ($this->arg('blockto')) { + } else { $this->showPage(); } } @@ -138,7 +138,7 @@ class BlockAction extends Action 'unable to subscribe to you in the future, and '. 'you will not be notified of any @-replies from them.')); $this->element('input', array('id' => 'blockto-' . $id, - 'name' => 'blockto', + 'name' => 'profileid', 'type' => 'hidden', 'value' => $id)); foreach ($this->args as $k => $v) { diff --git a/actions/unblock.php b/actions/unblock.php index dc28d5d54..c60458cd3 100644 --- a/actions/unblock.php +++ b/actions/unblock.php @@ -42,57 +42,25 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 * @link http://status.net/ */ -class UnblockAction extends Action -{ - var $profile = null; - /** - * Take arguments for running - * - * @param array $args $_REQUEST args - * - * @return boolean success flag - */ +class UnblockAction extends ProfileFormAction +{ function prepare($args) { - parent::prepare($args); - if (!common_logged_in()) { - $this->clientError(_('Not logged in.')); - return false; - } - $token = $this->trimmed('token'); - if (!$token || $token != common_session_token()) { - $this->clientError(_('There was a problem with your session token. Try again, please.')); - return; - } - $id = $this->trimmed('unblockto'); - if (!$id) { - $this->clientError(_('No profile specified.')); + if (!parent::prepare($args)) { return false; } - $this->profile = Profile::staticGet('id', $id); - if (!$this->profile) { - $this->clientError(_('No profile with that ID.')); + + $cur = common_current_user(); + + assert(!empty($cur)); // checked by parent + + if (!$cur->hasBlocked($this->profile)) { + $this->clientError(_("You haven't blocked that user.")); return false; } - return true; - } - /** - * Handle request - * - * Shows a page with list of favorite notices - * - * @param array $args $_REQUEST args; handled in prepare() - * - * @return void - */ - function handle($args) - { - parent::handle($args); - if ($_SERVER['REQUEST_METHOD'] == 'POST') { - $this->unblockProfile(); - } + return true; } /** @@ -100,7 +68,8 @@ class UnblockAction extends Action * * @return void */ - function unblockProfile() + + function handlePost() { $cur = common_current_user(); $result = $cur->unblock($this->profile); @@ -108,20 +77,5 @@ class UnblockAction extends Action $this->serverError(_('Error removing the block.')); return; } - foreach ($this->args as $k => $v) { - if ($k == 'returnto-action') { - $action = $v; - } else if (substr($k, 0, 9) == 'returnto-') { - $args[substr($k, 9)] = $v; - } - } - if ($action) { - common_redirect(common_local_url($action, $args), 303); - } else { - common_redirect(common_local_url('subscribers', - array('nickname' => $cur->nickname)), - 303); - } } } - diff --git a/lib/profileformaction.php b/lib/profileformaction.php index 92e8611b9..8cb5f6a93 100644 --- a/lib/profileformaction.php +++ b/lib/profileformaction.php @@ -134,6 +134,6 @@ class ProfileFormAction extends Action function handlePost() { - return; + $this->serverError(_("unimplemented method")); } } -- cgit v1.2.3-54-g00ecf From 792590bcdccfabc8565dea138d93f6f3405131da Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 16 Nov 2009 15:52:33 +0100 Subject: move role functions to Profile class --- classes/Profile.php | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++ classes/User.php | 68 ++++++++++++++++-------------------------------- 2 files changed, 96 insertions(+), 46 deletions(-) diff --git a/classes/Profile.php b/classes/Profile.php index 7c1e9db33..2668efcc7 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -587,4 +587,78 @@ class Profile extends Memcached_DataObject return $location; } + + function hasRole($name) + { + $role = User_role::pkeyGet(array('user_id' => $this->id, + 'role' => $name)); + return (!empty($role)); + } + + function grantRole($name) + { + $role = new User_role(); + + $role->user_id = $this->id; + $role->role = $name; + $role->created = common_sql_now(); + + $result = $role->insert(); + + if (!$result) { + common_log_db_error($role, 'INSERT', __FILE__); + return false; + } + + return true; + } + + function revokeRole($name) + { + $role = User_role::pkeyGet(array('user_id' => $this->id, + 'role' => $name)); + + if (empty($role)) { + throw new Exception('Cannot revoke role "'.$name.'" for user #'.$this->id.'; does not exist.'); + } + + $result = $role->delete(); + + if (!$result) { + common_log_db_error($role, 'DELETE', __FILE__); + throw new Exception('Cannot revoke role "'.$name.'" for user #'.$this->id.'; database error.'); + } + + return true; + } + + function isSandboxed() + { + return $this->hasRole(User_role::SANDBOXED); + } + + function isSilenced() + { + return $this->hasRole(User_role::SILENCED); + } + + function sandbox() + { + $this->grantRole(User_role::SANDBOXED); + } + + function unsandbox() + { + $this->revokeRole(User_role::SANDBOXED); + } + + function silence() + { + $this->grantRole(User_role::SILENCED); + } + + function unsilence() + { + $this->revokeRole(User_role::SILENCED); + } } diff --git a/classes/User.php b/classes/User.php index 0e8404377..1dca59f23 100644 --- a/classes/User.php +++ b/classes/User.php @@ -657,50 +657,6 @@ class User extends Memcached_DataObject return Design::staticGet('id', $this->design_id); } - function hasRole($name) - { - $role = User_role::pkeyGet(array('user_id' => $this->id, - 'role' => $name)); - return (!empty($role)); - } - - function grantRole($name) - { - $role = new User_role(); - - $role->user_id = $this->id; - $role->role = $name; - $role->created = common_sql_now(); - - $result = $role->insert(); - - if (!$result) { - common_log_db_error($role, 'INSERT', __FILE__); - return false; - } - - return true; - } - - function revokeRole($name) - { - $role = User_role::pkeyGet(array('user_id' => $this->id, - 'role' => $name)); - - if (empty($role)) { - throw new Exception('Cannot revoke role "'.$name.'" for user #'.$this->id.'; does not exist.'); - } - - $result = $role->delete(); - - if (!$result) { - common_log_db_error($role, 'DELETE', __FILE__); - throw new Exception('Cannot revoke role "'.$name.'" for user #'.$this->id.'; database error.'); - } - - return true; - } - /** * Does this user have the right to do X? * @@ -779,13 +735,33 @@ class User extends Memcached_DataObject // XXX delete group block? Reset blocker? } + function hasRole($name) + { + $profile = $this->getProfile(); + return $profile->hasRole($name); + } + + function grantRole($name) + { + $profile = $this->getProfile(); + return $profile->grantRole($name); + } + + function revokeRole($name) + { + $profile = $this->getProfile(); + return $profile->revokeRole($name); + } + function isSandboxed() { - return $this->hasRole(User_role::SANDBOXED); + $profile = $this->getProfile(); + return $profile->isSandboxed(); } function isSilenced() { - return $this->hasRole(User_role::SILENCED); + $profile = $this->getProfile(); + return $profile->isSilenced(); } } -- cgit v1.2.3-54-g00ecf From 4e00ce01a9841ac055c058a4f0e221cc56eca06e Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 16 Nov 2009 16:02:47 +0100 Subject: Rename user_role to profile_role Renamed the user_role table to profile_role. Remote users can have a role on the site; that 'role' may be negative (silenced or sandboxed). --- classes/Profile_role.php | 55 ++++++++++++++++++++++++++++++++++++++ classes/statusnet.ini | 69 +++++++++++++----------------------------------- db/statusnet.sql | 6 ++--- 3 files changed, 76 insertions(+), 54 deletions(-) create mode 100755 classes/Profile_role.php mode change 100644 => 100755 classes/statusnet.ini diff --git a/classes/Profile_role.php b/classes/Profile_role.php new file mode 100755 index 000000000..afa7fb74e --- /dev/null +++ b/classes/Profile_role.php @@ -0,0 +1,55 @@ +. + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Table Definition for profile_role + */ + +require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; + +class Profile_role extends Memcached_DataObject +{ + ###START_AUTOCODE + /* the code below is auto generated do not remove the above tag */ + + public $__table = 'profile_role'; // table name + public $profile_id; // int(4) primary_key not_null + public $role; // varchar(32) primary_key not_null + public $created; // datetime not_null default_0000-00-00%2000%3A00%3A00 + + /* Static get */ + function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Profile_role',$k,$v); } + + /* the code above is auto generated do not remove the tag below */ + ###END_AUTOCODE + + function &pkeyGet($kv) + { + return Memcached_DataObject::pkeyGet('Profile_role', $kv); + } + + const MODERATOR = 'moderator'; + const ADMINISTRATOR = 'administrator'; + const SANDBOXED = 'sandboxed'; + const SILENCED = 'silenced'; +} diff --git a/classes/statusnet.ini b/classes/statusnet.ini old mode 100644 new mode 100755 index 19ab7bf97..6a7be1008 --- a/classes/statusnet.ini +++ b/classes/statusnet.ini @@ -253,6 +253,15 @@ modified = 384 [location_namespace__keys] id = K +[login_token] +user_id = 129 +token = 130 +created = 142 +modified = 384 + +[login_token__keys] +user_id = K + [message] id = 129 uri = 2 @@ -358,6 +367,15 @@ modified = 384 blocker = K blocked = K +[profile_role] +profile_id = 129 +role = 130 +created = 142 + +[profile_role__keys] +profile_id = K +role = K + [profile_tag] tagger = 129 tagged = 129 @@ -525,54 +543,3 @@ modified = 384 [user_group__keys] id = N - -[user_openid] -canonical = 130 -display = 130 -user_id = 129 -created = 142 -modified = 384 - -[user_openid__keys] -canonical = K -display = U - -[user_openid_trustroot] -trustroot = 130 -user_id = 129 -created = 142 -modified = 384 - -[user_openid__keys] -trustroot = K -user_id = K - -[user_role] -user_id = 129 -role = 130 -created = 142 - -[user_role__keys] -user_id = K -role = K - -[login_token] -user_id = 129 -token = 130 -created = 142 -modified = 384 - -[login_token__keys] -user_id = K -token = K - -[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/statusnet.sql b/db/statusnet.sql index 732aded5a..18abcdfdb 100644 --- a/db/statusnet.sql +++ b/db/statusnet.sql @@ -557,13 +557,13 @@ create table config ( ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; -create table user_role ( +create table profile_role ( - user_id integer not null comment 'user having the role' references user (id), + profile_id integer not null comment 'account having the role' references profile (id), role varchar(32) not null comment 'string representing the role', created datetime not null comment 'date the role was granted', - constraint primary key (user_id, role) + constraint primary key (profile_id, role) ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; -- cgit v1.2.3-54-g00ecf From fa00aed88b8ee0afc63b0e19d05564d20dcd0b1e Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 16 Nov 2009 16:04:51 +0100 Subject: remove User_role class --- classes/User_role.php | 53 --------------------------------------------------- 1 file changed, 53 deletions(-) delete mode 100644 classes/User_role.php diff --git a/classes/User_role.php b/classes/User_role.php deleted file mode 100644 index b415642fc..000000000 --- a/classes/User_role.php +++ /dev/null @@ -1,53 +0,0 @@ -. - */ - -if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } - -/** - * Table Definition for user_role - */ - -require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; - -class User_role extends Memcached_DataObject -{ - ###START_AUTOCODE - /* the code below is auto generated do not remove the above tag */ - - public $__table = 'user_role'; // table name - public $user_id; // int(4) primary_key not_null - public $role; // varchar(32) primary_key not_null - public $created; // datetime() not_null - - /* Static get */ - function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('User_role',$k,$v); } - - /* the code above is auto generated do not remove the tag below */ - ###END_AUTOCODE - - function &pkeyGet($kv) - { - return Memcached_DataObject::pkeyGet('User_role', $kv); - } - - const MODERATOR = 'moderator'; - const ADMINISTRATOR = 'administrator'; - const SANDBOXED = 'sandboxed'; - const SILENCED = 'silenced'; -} -- cgit v1.2.3-54-g00ecf From dd10e9729bfa6dc712433db49e385f94cbc3cdea Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 16 Nov 2009 16:05:22 +0100 Subject: fix exe flag after createTable --- classes/Profile_role.php | 0 classes/statusnet.ini | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 classes/Profile_role.php mode change 100755 => 100644 classes/statusnet.ini diff --git a/classes/Profile_role.php b/classes/Profile_role.php old mode 100755 new mode 100644 diff --git a/classes/statusnet.ini b/classes/statusnet.ini old mode 100755 new mode 100644 -- cgit v1.2.3-54-g00ecf From 3e08309826f1f627676a02b85d6809fcbd27a37b Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 16 Nov 2009 16:06:52 +0100 Subject: change uses of User_role to Profile_role --- classes/Profile.php | 28 ++++++++++++++-------------- classes/User.php | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/classes/Profile.php b/classes/Profile.php index 2668efcc7..5b4394d3b 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -590,18 +590,18 @@ class Profile extends Memcached_DataObject function hasRole($name) { - $role = User_role::pkeyGet(array('user_id' => $this->id, - 'role' => $name)); + $role = Profile_role::pkeyGet(array('profile_id' => $this->id, + 'role' => $name)); return (!empty($role)); } function grantRole($name) { - $role = new User_role(); + $role = new Profile_role(); - $role->user_id = $this->id; - $role->role = $name; - $role->created = common_sql_now(); + $role->profile_id = $this->id; + $role->role = $name; + $role->created = common_sql_now(); $result = $role->insert(); @@ -615,8 +615,8 @@ class Profile extends Memcached_DataObject function revokeRole($name) { - $role = User_role::pkeyGet(array('user_id' => $this->id, - 'role' => $name)); + $role = Profile_role::pkeyGet(array('profile_id' => $this->id, + 'role' => $name)); if (empty($role)) { throw new Exception('Cannot revoke role "'.$name.'" for user #'.$this->id.'; does not exist.'); @@ -634,31 +634,31 @@ class Profile extends Memcached_DataObject function isSandboxed() { - return $this->hasRole(User_role::SANDBOXED); + return $this->hasRole(Profile_role::SANDBOXED); } function isSilenced() { - return $this->hasRole(User_role::SILENCED); + return $this->hasRole(Profile_role::SILENCED); } function sandbox() { - $this->grantRole(User_role::SANDBOXED); + $this->grantRole(Profile_role::SANDBOXED); } function unsandbox() { - $this->revokeRole(User_role::SANDBOXED); + $this->revokeRole(Profile_role::SANDBOXED); } function silence() { - $this->grantRole(User_role::SILENCED); + $this->grantRole(Profile_role::SILENCED); } function unsilence() { - $this->revokeRole(User_role::SILENCED); + $this->revokeRole(Profile_role::SILENCED); } } diff --git a/classes/User.php b/classes/User.php index 1dca59f23..82d3bd59a 100644 --- a/classes/User.php +++ b/classes/User.php @@ -679,10 +679,10 @@ class User extends Memcached_DataObject case Right::SANDBOXUSER: case Right::SILENCEUSER: case Right::DELETEUSER: - $result = $this->hasRole(User_role::MODERATOR); + $result = $this->hasRole(Profile_role::MODERATOR); break; case Right::CONFIGURESITE: - $result = $this->hasRole(User_role::ADMINISTRATOR); + $result = $this->hasRole(Profile_role::ADMINISTRATOR); break; default: $result = false; -- cgit v1.2.3-54-g00ecf From 985986e7e94862a943271b9c3030b35e74bc28e1 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 16 Nov 2009 16:08:06 +0100 Subject: add sandbox and silence actions --- actions/sandbox.php | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++ actions/silence.php | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++ actions/unsandbox.php | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++ actions/unsilence.php | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 356 insertions(+) create mode 100644 actions/sandbox.php create mode 100644 actions/silence.php create mode 100644 actions/unsandbox.php create mode 100644 actions/unsilence.php diff --git a/actions/sandbox.php b/actions/sandbox.php new file mode 100644 index 000000000..5b034ff07 --- /dev/null +++ b/actions/sandbox.php @@ -0,0 +1,89 @@ +. + * + * @category Action + * @package StatusNet + * @author Evan Prodromou + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Sandbox a user. + * + * @category Action + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://status.net/ + */ + +class SandboxAction extends ProfileFormAction +{ + /** + * Check parameters + * + * @param array $args action arguments (URL, GET, POST) + * + * @return boolean success flag + */ + + function prepare($args) + { + if (!parent::prepare($args)) { + return false; + } + + $cur = common_current_user(); + + assert(!empty($cur)); // checked by parent + + if (!$cur->hasRight(Right::SANDBOXUSER)) { + $this->clientError(_("You cannot sandbox users on this site.")); + return false; + } + + assert(!empty($this->profile)); // checked by parent + + if ($this->profile->isSandboxed()) { + $this->clientError(_("User is already sandboxed.")); + return false; + } + + return true; + } + + /** + * Sandbox a user. + * + * @return void + */ + + function handlePost() + { + $this->profile->sandbox(); + } +} diff --git a/actions/silence.php b/actions/silence.php new file mode 100644 index 000000000..206e5ba87 --- /dev/null +++ b/actions/silence.php @@ -0,0 +1,89 @@ +. + * + * @category Action + * @package StatusNet + * @author Evan Prodromou + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Silence a user. + * + * @category Action + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://status.net/ + */ + +class SilenceAction extends ProfileFormAction +{ + /** + * Check parameters + * + * @param array $args action arguments (URL, GET, POST) + * + * @return boolean success flag + */ + + function prepare($args) + { + if (!parent::prepare($args)) { + return false; + } + + $cur = common_current_user(); + + assert(!empty($cur)); // checked by parent + + if (!$cur->hasRight(Right::SILENCEUSER)) { + $this->clientError(_("You cannot silence users on this site.")); + return false; + } + + assert(!empty($this->profile)); // checked by parent + + if ($this->profile->isSilenced()) { + $this->clientError(_("User is already silenced.")); + return false; + } + + return true; + } + + /** + * Silence a user. + * + * @return void + */ + + function handlePost() + { + $this->profile->silence(); + } +} diff --git a/actions/unsandbox.php b/actions/unsandbox.php new file mode 100644 index 000000000..22f4d8e76 --- /dev/null +++ b/actions/unsandbox.php @@ -0,0 +1,89 @@ +. + * + * @category Action + * @package StatusNet + * @author Evan Prodromou + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Unsandbox a user. + * + * @category Action + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://status.net/ + */ + +class UnsandboxAction extends ProfileFormAction +{ + /** + * Check parameters + * + * @param array $args action arguments (URL, GET, POST) + * + * @return boolean success flag + */ + + function prepare($args) + { + if (!parent::prepare($args)) { + return false; + } + + $cur = common_current_user(); + + assert(!empty($cur)); // checked by parent + + if (!$cur->hasRight(Right::SANDBOXUSER)) { + $this->clientError(_("You cannot sandbox users on this site.")); + return false; + } + + assert(!empty($this->profile)); // checked by parent + + if (!$this->profile->isSandboxed()) { + $this->clientError(_("User is not sandboxed.")); + return false; + } + + return true; + } + + /** + * Unsandbox a user. + * + * @return void + */ + + function handlePost() + { + $this->profile->unsandbox(); + } +} diff --git a/actions/unsilence.php b/actions/unsilence.php new file mode 100644 index 000000000..9ff1b828b --- /dev/null +++ b/actions/unsilence.php @@ -0,0 +1,89 @@ +. + * + * @category Action + * @package StatusNet + * @author Evan Prodromou + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Silence a user. + * + * @category Action + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://status.net/ + */ + +class UnsilenceAction extends ProfileFormAction +{ + /** + * Check parameters + * + * @param array $args action arguments (URL, GET, POST) + * + * @return boolean success flag + */ + + function prepare($args) + { + if (!parent::prepare($args)) { + return false; + } + + $cur = common_current_user(); + + assert(!empty($cur)); // checked by parent + + if (!$cur->hasRight(Right::SILENCEUSER)) { + $this->clientError(_("You cannot silence users on this site.")); + return false; + } + + assert(!empty($this->profile)); // checked by parent + + if (!$this->profile->isSilenced()) { + $this->clientError(_("User is not silenced.")); + return false; + } + + return true; + } + + /** + * Silence a user. + * + * @return void + */ + + function handlePost() + { + $this->profile->unsilence(); + } +} -- cgit v1.2.3-54-g00ecf From e290f86c99f64385a9fdb9c94424beff0d3e3e82 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 16 Nov 2009 16:14:49 +0100 Subject: make block action use ProfileFormAction superclass --- actions/block.php | 65 +++++++++++++++++-------------------------------------- 1 file changed, 20 insertions(+), 45 deletions(-) diff --git a/actions/block.php b/actions/block.php index 2443b3010..71a34e087 100644 --- a/actions/block.php +++ b/actions/block.php @@ -42,9 +42,11 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 * @link http://status.net/ */ -class BlockAction extends Action + +class BlockAction extends ProfileFormAction { var $profile = null; + /** * Take arguments for running * @@ -52,28 +54,22 @@ class BlockAction extends Action * * @return boolean success flag */ + function prepare($args) { - parent::prepare($args); - if (!common_logged_in()) { - $this->clientError(_('Not logged in.')); - return false; - } - $token = $this->trimmed('token'); - if (!$token || $token != common_session_token()) { - $this->clientError(_('There was a problem with your session token. Try again, please.')); - return; - } - $id = $this->trimmed('profileid'); - if (!$id) { - $this->clientError(_('No profile specified.')); + if (!parent::prepare($args)) { return false; } - $this->profile = Profile::staticGet('id', $id); - if (!$this->profile) { - $this->clientError(_('No profile with that ID.')); + + $cur = common_current_user(); + + assert(!empty($cur)); // checked by parent + + if ($cur->hasBlocked($this->profile)) { + $this->clientError(_("You already blocked that user.")); return false; } + return true; } @@ -86,17 +82,15 @@ class BlockAction extends Action * * @return void */ + function handle($args) { - parent::handle($args); if ($_SERVER['REQUEST_METHOD'] == 'POST') { if ($this->arg('no')) { - $cur = common_current_user(); - $other = Profile::staticGet('id', $this->arg('blockto')); - common_redirect(common_local_url('showstream', array('nickname' => $other->nickname)), - 303); + $this->returnToArgs(); } elseif ($this->arg('yes')) { - $this->blockProfile(); + $this->handlePost(); + $this->returnToArgs(); } else { $this->showPage(); } @@ -157,36 +151,17 @@ class BlockAction extends Action * * @return void */ - function blockProfile() + + function handlePost() { $cur = common_current_user(); - if ($cur->hasBlocked($this->profile)) { - $this->clientError(_('You have already blocked this user.')); - return; - } $result = $cur->block($this->profile); + if (!$result) { $this->serverError(_('Failed to save block information.')); return; } - - // Now, gotta figure where we go back to - foreach ($this->args as $k => $v) { - if ($k == 'returnto-action') { - $action = $v; - } elseif (substr($k, 0, 9) == 'returnto-') { - $args[substr($k, 9)] = $v; - } - } - - if ($action) { - common_redirect(common_local_url($action, $args), 303); - } else { - common_redirect(common_local_url('subscribers', - array('nickname' => $cur->nickname)), - 303); - } } } -- cgit v1.2.3-54-g00ecf From a2acb2eec506e642f6f4b122277e13e724524af8 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 16 Nov 2009 17:04:40 +0100 Subject: DeleteUserAction --- actions/deleteuser.php | 164 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) create mode 100644 actions/deleteuser.php diff --git a/actions/deleteuser.php b/actions/deleteuser.php new file mode 100644 index 000000000..32b703aa7 --- /dev/null +++ b/actions/deleteuser.php @@ -0,0 +1,164 @@ +. + * + * @category Action + * @package StatusNet + * @author Evan Prodromou + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +/** + * Delete a user + * + * @category Action + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://status.net/ + */ + +class DeleteuserAction extends ProfileFormAction +{ + var $user = null; + + /** + * Take arguments for running + * + * @param array $args $_REQUEST args + * + * @return boolean success flag + */ + + function prepare($args) + { + if (!parent::prepare($args)) { + return false; + } + + $cur = common_current_user(); + + assert(!empty($cur)); // checked by parent + + if (!$cur->hasRight(Right::DELETEUSER)) { + $this->clientError(_("You cannot delete users.")); + return false; + } + + $this->user = User::staticGet('id', $this->profile->id); + + if (empty($this->user)) { + $this->clientError(_("You can only delete local users.")); + return false; + } + + return true; + } + + /** + * Handle request + * + * Shows a page with list of favorite notices + * + * @param array $args $_REQUEST args; handled in prepare() + * + * @return void + */ + + function handle($args) + { + if ($_SERVER['REQUEST_METHOD'] == 'POST') { + if ($this->arg('no')) { + $this->returnToArgs(); + } elseif ($this->arg('yes')) { + $this->handlePost(); + $this->returnToArgs(); + } else { + $this->showPage(); + } + } + } + + function showContent() { + $this->areYouSureForm(); + } + + function title() { + return _('Delete user'); + } + + function showNoticeForm() { + // nop + } + + /** + * Confirm with user. + * + * Shows a confirmation form. + * + * @return void + */ + function areYouSureForm() + { + $id = $this->profile->id; + $this->elementStart('form', array('id' => 'deleteuser-' . $id, + 'method' => 'post', + 'class' => 'form_settings form_entity_block', + 'action' => common_local_url('deleteuser'))); + $this->elementStart('fieldset'); + $this->hidden('token', common_session_token()); + $this->element('legend', _('Delete user')); + $this->element('p', null, + _('Are you sure you want to delete this user? '. + 'This will clear all data about the user from the '. + 'database, without a backup.')); + $this->element('input', array('id' => 'deleteuserto-' . $id, + 'name' => 'profileid', + 'type' => 'hidden', + 'value' => $id)); + foreach ($this->args as $k => $v) { + if (substr($k, 0, 9) == 'returnto-') { + $this->hidden($k, $v); + } + } + $this->submit('form_action-no', _('No'), 'submit form_action-primary', 'no', _("Do not block this user")); + $this->submit('form_action-yes', _('Yes'), 'submit form_action-secondary', 'yes', _('Delete this user')); + $this->elementEnd('fieldset'); + $this->elementEnd('form'); + } + + /** + * Actually delete a user. + * + * @return void + */ + + function handlePost() + { + $this->user->delete(); + } +} + -- cgit v1.2.3-54-g00ecf From d968b5b4f1db223c7fc8c105526e08ca64877c21 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 16 Nov 2009 17:05:03 +0100 Subject: give SilenceForm proper superclass --- lib/silenceform.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/silenceform.php b/lib/silenceform.php index c9cf4b057..9673fa120 100644 --- a/lib/silenceform.php +++ b/lib/silenceform.php @@ -43,7 +43,7 @@ if (!defined('STATUSNET')) { * @see UnSilenceForm */ -class SilenceForm extends Form +class SilenceForm extends ProfileActionForm { /** * Action this form provides -- cgit v1.2.3-54-g00ecf From 9cc0d6524073b0a997289c0998443d25130730f2 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 16 Nov 2009 17:05:31 +0100 Subject: give UnsandboxForm correct superclass --- lib/unsandboxform.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/unsandboxform.php b/lib/unsandboxform.php index 559d1462d..a77634244 100644 --- a/lib/unsandboxform.php +++ b/lib/unsandboxform.php @@ -45,7 +45,7 @@ if (!defined('STATUSNET')) { * @see UnSandboxForm */ -class UnsandboxForm extends Form +class UnsandboxForm extends ProfileActionForm { /** * Action this form provides -- cgit v1.2.3-54-g00ecf From ee5c9a5c9084a4ebf16e1aef7bb073bbf7c629da Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 16 Nov 2009 17:05:39 +0100 Subject: give UnsilenceForm correct superclass --- lib/unsilenceform.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/unsilenceform.php b/lib/unsilenceform.php index 324d278b9..ac02b8b6c 100644 --- a/lib/unsilenceform.php +++ b/lib/unsilenceform.php @@ -40,10 +40,10 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ * - * @see UnSilenceForm + * @see SilenceForm */ -class UnSilenceForm extends Form +class UnSilenceForm extends ProfileActionForm { /** * Action this form provides -- cgit v1.2.3-54-g00ecf From a723cc979b5f93d6b688c5d19522cb27fa6c17eb Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 16 Nov 2009 17:06:12 +0100 Subject: correct constructor for DeleteUserForm --- lib/userprofile.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/userprofile.php b/lib/userprofile.php index 4321a2f93..dedac5bf1 100644 --- a/lib/userprofile.php +++ b/lib/userprofile.php @@ -327,7 +327,7 @@ class UserProfile extends Widget if ($cur->hasRight(Right::DELETEUSER)) { $this->out->elementStart('li', 'entity_delete'); - $df = DeleteUserForm($this->out, $this->profile, $r2args); + $df = new DeleteUserForm($this->out, $this->profile, $r2args); $df->show(); $this->out->elementEnd('li'); } -- cgit v1.2.3-54-g00ecf From 4f9f3665f7958a6c56279e70de8f987728554d8d Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 16 Nov 2009 17:06:35 +0100 Subject: add routes for silence, sandbox, delete user --- lib/router.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/router.php b/lib/router.php index bad3decad..53f30dd3e 100644 --- a/lib/router.php +++ b/lib/router.php @@ -96,7 +96,10 @@ class Router 'unsubscribe', 'confirmaddress', 'recoverpassword', 'invite', 'favor', 'disfavor', 'sup', 'block', 'unblock', 'subedit', - 'groupblock', 'groupunblock'); + 'groupblock', 'groupunblock', + 'sandbox', 'unsandbox', + 'silence', 'unsilence', + 'deleteuser'); foreach ($main as $a) { $m->connect('main/'.$a, array('action' => $a)); -- cgit v1.2.3-54-g00ecf From 5b51eeeebb319d255e3f51d9946be57787207fda Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Mon, 16 Nov 2009 11:14:00 -0500 Subject: Bump to version 1.0.0 --- extlib/Stomp.php | 135 ++++++++++++++++++++++++------------------- extlib/Stomp/Exception.php | 8 +-- extlib/Stomp/Frame.php | 86 +++++++++++++-------------- extlib/Stomp/Message.php | 4 +- extlib/Stomp/Message/Map.php | 12 ++-- 5 files changed, 127 insertions(+), 118 deletions(-) diff --git a/extlib/Stomp.php b/extlib/Stomp.php index abd9cba62..b55a4aa6d 100644 --- a/extlib/Stomp.php +++ b/extlib/Stomp.php @@ -66,12 +66,13 @@ class Stomp protected $_sessionId; protected $_read_timeout_seconds = 60; protected $_read_timeout_milliseconds = 0; + protected $_connect_timeout_seconds = 60; /** * Constructor * * @param string $brokerUri Broker URL - * @throws Stomp_Exception + * @throws StompException */ public function __construct ($brokerUri) { @@ -81,7 +82,7 @@ class Stomp /** * Initialize connection * - * @throws Stomp_Exception + * @throws StompException */ protected function _init () { @@ -103,14 +104,14 @@ class Stomp } } else { require_once 'Stomp/Exception.php'; - throw new Stomp_Exception("Bad Broker URL {$this->_brokerUri}"); + throw new StompException("Bad Broker URL {$this->_brokerUri}"); } } /** * Process broker URL * * @param string $url Broker URL - * @throws Stomp_Exception + * @throws StompException * @return boolean */ protected function _processUrl ($url) @@ -120,19 +121,19 @@ class Stomp array_push($this->_hosts, array($parsed['host'] , $parsed['port'] , $parsed['scheme'])); } else { require_once 'Stomp/Exception.php'; - throw new Stomp_Exception("Bad Broker URL $url"); + throw new StompException("Bad Broker URL $url"); } } /** * Make socket connection to the server * - * @throws Stomp_Exception + * @throws StompException */ protected function _makeConnection () { if (count($this->_hosts) == 0) { require_once 'Stomp/Exception.php'; - throw new Stomp_Exception("No broker defined"); + throw new StompException("No broker defined"); } // force disconnect, if previous established connection exists @@ -141,6 +142,9 @@ class Stomp $i = $this->_currentHost; $att = 0; $connected = false; + $connect_errno = null; + $connect_errstr = null; + while (! $connected && $att ++ < $this->_attempts) { if (isset($this->_params['randomize']) && $this->_params['randomize'] == 'true') { $i = rand(0, count($this->_hosts) - 1); @@ -158,10 +162,10 @@ class Stomp fclose($this->_socket); $this->_socket = null; } - $this->_socket = @fsockopen($scheme . '://' . $host, $port); + $this->_socket = @fsockopen($scheme . '://' . $host, $port, $connect_errno, $connect_errstr, $this->_connect_timeout_seconds); if (!is_resource($this->_socket) && $att >= $this->_attempts && !array_key_exists($i + 1, $this->_hosts)) { require_once 'Stomp/Exception.php'; - throw new Stomp_Exception("Could not connect to $host:$port ($att/{$this->_attempts})"); + throw new StompException("Could not connect to $host:$port ($att/{$this->_attempts})"); } else if (is_resource($this->_socket)) { $connected = true; $this->_currentHost = $i; @@ -170,7 +174,7 @@ class Stomp } if (! $connected) { require_once 'Stomp/Exception.php'; - throw new Stomp_Exception("Could not connect to a broker"); + throw new StompException("Could not connect to a broker"); } } /** @@ -179,7 +183,7 @@ class Stomp * @param string $username * @param string $password * @return boolean - * @throws Stomp_Exception + * @throws StompException */ public function connect ($username = '', $password = '') { @@ -194,18 +198,18 @@ class Stomp if ($this->clientId != null) { $headers["client-id"] = $this->clientId; } - $frame = new Stomp_Frame("CONNECT", $headers); + $frame = new StompFrame("CONNECT", $headers); $this->_writeFrame($frame); $frame = $this->readFrame(); - if ($frame instanceof Stomp_Frame && $frame->command == 'CONNECTED') { + if ($frame instanceof StompFrame && $frame->command == 'CONNECTED') { $this->_sessionId = $frame->headers["session"]; return true; } else { require_once 'Stomp/Exception.php'; - if ($frame instanceof Stomp_Frame) { - throw new Stomp_Exception("Unexpected command: {$frame->command}", 0, $frame->body); + if ($frame instanceof StompFrame) { + throw new StompException("Unexpected command: {$frame->command}", 0, $frame->body); } else { - throw new Stomp_Exception("Connection not acknowledged"); + throw new StompException("Connection not acknowledged"); } } } @@ -232,21 +236,21 @@ class Stomp * Send a message to a destination in the messaging system * * @param string $destination Destination queue - * @param string|Stomp_Frame $msg Message + * @param string|StompFrame $msg Message * @param array $properties * @param boolean $sync Perform request synchronously * @return boolean */ - public function send ($destination, $msg, $properties = null, $sync = null) + public function send ($destination, $msg, $properties = array(), $sync = null) { - if ($msg instanceof Stomp_Frame) { + if ($msg instanceof StompFrame) { $msg->headers['destination'] = $destination; - $msg->headers = array_merge($msg->headers, $properties); + if (is_array($properties)) $msg->headers = array_merge($msg->headers, $properties); $frame = $msg; } else { $headers = $properties; $headers['destination'] = $destination; - $frame = new Stomp_Frame('SEND', $headers, $msg); + $frame = new StompFrame('SEND', $headers, $msg); } $this->_prepareReceipt($frame, $sync); $this->_writeFrame($frame); @@ -255,10 +259,10 @@ class Stomp /** * Prepair frame receipt * - * @param Stomp_Frame $frame + * @param StompFrame $frame * @param boolean $sync */ - protected function _prepareReceipt (Stomp_Frame $frame, $sync) + protected function _prepareReceipt (StompFrame $frame, $sync) { $receive = $this->sync; if ($sync !== null) { @@ -271,12 +275,12 @@ class Stomp /** * Wait for receipt * - * @param Stomp_Frame $frame + * @param StompFrame $frame * @param boolean $sync * @return boolean - * @throws Stomp_Exception + * @throws StompException */ - protected function _waitForReceipt (Stomp_Frame $frame, $sync) + protected function _waitForReceipt (StompFrame $frame, $sync) { $receive = $this->sync; @@ -289,19 +293,19 @@ class Stomp return true; } $frame = $this->readFrame(); - if ($frame instanceof Stomp_Frame && $frame->command == 'RECEIPT') { + if ($frame instanceof StompFrame && $frame->command == 'RECEIPT') { if ($frame->headers['receipt-id'] == $id) { return true; } else { require_once 'Stomp/Exception.php'; - throw new Stomp_Exception("Unexpected receipt id {$frame->headers['receipt-id']}", 0, $frame->body); + throw new StompException("Unexpected receipt id {$frame->headers['receipt-id']}", 0, $frame->body); } } else { require_once 'Stomp/Exception.php'; - if ($frame instanceof Stomp_Frame) { - throw new Stomp_Exception("Unexpected command {$frame->command}", 0, $frame->body); + if ($frame instanceof StompFrame) { + throw new StompException("Unexpected command {$frame->command}", 0, $frame->body); } else { - throw new Stomp_Exception("Receipt not received"); + throw new StompException("Receipt not received"); } } } @@ -314,7 +318,7 @@ class Stomp * @param array $properties * @param boolean $sync Perform request synchronously * @return boolean - * @throws Stomp_Exception + * @throws StompException */ public function subscribe ($destination, $properties = null, $sync = null) { @@ -329,7 +333,7 @@ class Stomp } } $headers['destination'] = $destination; - $frame = new Stomp_Frame('SUBSCRIBE', $headers); + $frame = new StompFrame('SUBSCRIBE', $headers); $this->_prepareReceipt($frame, $sync); $this->_writeFrame($frame); if ($this->_waitForReceipt($frame, $sync) == true) { @@ -346,7 +350,7 @@ class Stomp * @param array $properties * @param boolean $sync Perform request synchronously * @return boolean - * @throws Stomp_Exception + * @throws StompException */ public function unsubscribe ($destination, $properties = null, $sync = null) { @@ -357,7 +361,7 @@ class Stomp } } $headers['destination'] = $destination; - $frame = new Stomp_Frame('UNSUBSCRIBE', $headers); + $frame = new StompFrame('UNSUBSCRIBE', $headers); $this->_prepareReceipt($frame, $sync); $this->_writeFrame($frame); if ($this->_waitForReceipt($frame, $sync) == true) { @@ -373,7 +377,7 @@ class Stomp * @param string $transactionId * @param boolean $sync Perform request synchronously * @return boolean - * @throws Stomp_Exception + * @throws StompException */ public function begin ($transactionId = null, $sync = null) { @@ -381,7 +385,7 @@ class Stomp if (isset($transactionId)) { $headers['transaction'] = $transactionId; } - $frame = new Stomp_Frame('BEGIN', $headers); + $frame = new StompFrame('BEGIN', $headers); $this->_prepareReceipt($frame, $sync); $this->_writeFrame($frame); return $this->_waitForReceipt($frame, $sync); @@ -392,7 +396,7 @@ class Stomp * @param string $transactionId * @param boolean $sync Perform request synchronously * @return boolean - * @throws Stomp_Exception + * @throws StompException */ public function commit ($transactionId = null, $sync = null) { @@ -400,7 +404,7 @@ class Stomp if (isset($transactionId)) { $headers['transaction'] = $transactionId; } - $frame = new Stomp_Frame('COMMIT', $headers); + $frame = new StompFrame('COMMIT', $headers); $this->_prepareReceipt($frame, $sync); $this->_writeFrame($frame); return $this->_waitForReceipt($frame, $sync); @@ -417,7 +421,7 @@ class Stomp if (isset($transactionId)) { $headers['transaction'] = $transactionId; } - $frame = new Stomp_Frame('ABORT', $headers); + $frame = new StompFrame('ABORT', $headers); $this->_prepareReceipt($frame, $sync); $this->_writeFrame($frame); return $this->_waitForReceipt($frame, $sync); @@ -426,15 +430,19 @@ class Stomp * Acknowledge consumption of a message from a subscription * Note: This operation is always asynchronous * - * @param string|Stomp_Frame $messageMessage ID + * @param string|StompFrame $messageMessage ID * @param string $transactionId * @return boolean - * @throws Stomp_Exception + * @throws StompException */ public function ack ($message, $transactionId = null) { - if ($message instanceof Stomp_Frame) { - $frame = new Stomp_Frame('ACK', $message->headers); + if ($message instanceof StompFrame) { + $headers = $message->headers; + if (isset($transactionId)) { + $headers['transaction'] = $transactionId; + } + $frame = new StompFrame('ACK', $headers); $this->_writeFrame($frame); return true; } else { @@ -443,7 +451,7 @@ class Stomp $headers['transaction'] = $transactionId; } $headers['message-id'] = $message; - $frame = new Stomp_Frame('ACK', $headers); + $frame = new StompFrame('ACK', $headers); $this->_writeFrame($frame); return true; } @@ -461,7 +469,7 @@ class Stomp } if (is_resource($this->_socket)) { - $this->_writeFrame(new Stomp_Frame('DISCONNECT', $headers)); + $this->_writeFrame(new StompFrame('DISCONNECT', $headers)); fclose($this->_socket); } $this->_socket = null; @@ -474,13 +482,13 @@ class Stomp /** * Write frame to server * - * @param Stomp_Frame $stompFrame + * @param StompFrame $stompFrame */ - protected function _writeFrame (Stomp_Frame $stompFrame) + protected function _writeFrame (StompFrame $stompFrame) { if (!is_resource($this->_socket)) { require_once 'Stomp/Exception.php'; - throw new Stomp_Exception('Socket connection hasn\'t been established'); + throw new StompException('Socket connection hasn\'t been established'); } $data = $stompFrame->__toString(); @@ -504,9 +512,9 @@ class Stomp } /** - * Read responce frame from server + * Read response frame from server * - * @return Stomp_Frame|Stomp_Message_Map|boolean False when no frame to read + * @return StompFrame False when no frame to read */ public function readFrame () { @@ -516,15 +524,21 @@ class Stomp $rb = 1024; $data = ''; + $end = false; + do { - $read = fgets($this->_socket, $rb); + $read = fread($this->_socket, $rb); if ($read === false) { $this->_reconnect(); return $this->readFrame(); } $data .= $read; + if (strpos($data, "\x00") !== false) { + $end = true; + $data = rtrim($data, "\n"); + } $len = strlen($data); - } while (($len < 2 || ! ($data[$len - 2] == "\x00" && $data[$len - 1] == "\n"))); + } while ($len < 2 || $end == false); list ($header, $body) = explode("\n\n", $data, 2); $header = explode("\n", $header); @@ -538,13 +552,14 @@ class Stomp $command = $v; } } - $frame = new Stomp_Frame($command, $headers, trim($body)); - if (isset($frame->headers['amq-msg-type']) && $frame->headers['amq-msg-type'] == 'MapMessage') { + $frame = new StompFrame($command, $headers, trim($body)); + if (isset($frame->headers['transformation']) && $frame->headers['transformation'] == 'jms-map-json') { require_once 'Stomp/Message/Map.php'; - return new Stomp_Message_Map($frame); + return new StompMessageMap($frame); } else { return $frame; } + return $frame; } /** @@ -558,10 +573,14 @@ class Stomp $write = null; $except = null; - $has_frame_to_read = stream_select($read, $write, $except, $this->_read_timeout_seconds, $this->_read_timeout_milliseconds); + $has_frame_to_read = @stream_select($read, $write, $except, $this->_read_timeout_seconds, $this->_read_timeout_milliseconds); + + if ($has_frame_to_read !== false) + $has_frame_to_read = count($read); + if ($has_frame_to_read === false) { - throw new Stomp_Exception('Check failed to determin if the socket is readable'); + throw new StompException('Check failed to determine if the socket is readable'); } else if ($has_frame_to_read > 0) { return true; } else { diff --git a/extlib/Stomp/Exception.php b/extlib/Stomp/Exception.php index e6870bc15..8c479de24 100644 --- a/extlib/Stomp/Exception.php +++ b/extlib/Stomp/Exception.php @@ -23,10 +23,8 @@ * * * @package Stomp - * @author Michael Caplan - * @version $Revision: 23 $ - */ -class Stomp_Exception extends Exception + */ +class StompException extends Exception { protected $_details; @@ -53,5 +51,5 @@ class Stomp_Exception extends Exception { return $this->_details; } -} +} ?> \ No newline at end of file diff --git a/extlib/Stomp/Frame.php b/extlib/Stomp/Frame.php index dc59c1cb7..195e3b627 100644 --- a/extlib/Stomp/Frame.php +++ b/extlib/Stomp/Frame.php @@ -1,33 +1,29 @@ - - * @author Dejan Bosanac - * @author Michael Caplan - * @version $Revision: 36 $ */ -class Stomp_Frame +class StompFrame { public $command; public $headers = array(); @@ -54,27 +50,27 @@ class Stomp_Frame $this->body = $body; if ($this->command == 'ERROR') { - require_once 'Stomp/Exception.php'; - throw new Stomp_Exception($this->headers['message'], 0, $this->body); + require_once 'Exception.php'; + throw new StompException($this->headers['message'], 0, $this->body); + } + } + + /** + * Convert frame to transportable string + * + * @return string + */ + public function __toString() + { + $data = $this->command . "\n"; + + foreach ($this->headers as $name => $value) { + $data .= $name . ": " . $value . "\n"; } - } - - /** - * Convert frame to transportable string - * - * @return string - */ - public function __toString() - { - $data = $this->command . "\n"; - - foreach ($this->headers as $name => $value) { - $data .= $name . ": " . $value . "\n"; - } - - $data .= "\n"; - $data .= $this->body; - return $data .= "\x00\n"; + + $data .= "\n"; + $data .= $this->body; + return $data .= "\x00"; } } ?> \ No newline at end of file diff --git a/extlib/Stomp/Message.php b/extlib/Stomp/Message.php index 6bcad3efd..5a064090c 100644 --- a/extlib/Stomp/Message.php +++ b/extlib/Stomp/Message.php @@ -24,10 +24,8 @@ require_once 'Stomp/Frame.php'; * Basic text stomp message * * @package Stomp - * @author Dejan Bosanac - * @version $Revision: 23 $ */ -class Stomp_Message extends Stomp_Frame +class StompMessage extends StompFrame { public function __construct ($body, $headers = null) { diff --git a/extlib/Stomp/Message/Map.php b/extlib/Stomp/Message/Map.php index 288456a84..38a32c56c 100644 --- a/extlib/Stomp/Message/Map.php +++ b/extlib/Stomp/Message/Map.php @@ -24,30 +24,28 @@ require_once 'Stomp/Message.php'; * Message that contains a set of name-value pairs * * @package Stomp - * @author Dejan Bosanac - * @version $Revision: 23 $ */ -class Stomp_Message_Map extends Stomp_Message +class StompMessageMap extends StompMessage { public $map; /** * Constructor * - * @param Stomp_Frame|string $msg + * @param StompFrame|string $msg * @param array $headers */ function __construct ($msg, $headers = null) { - if ($msg instanceof Stomp_Frame) { + if ($msg instanceof StompFrame) { $this->_init($msg->command, $msg->headers, $msg->body); - $this->map = json_decode($msg->body); + $this->map = json_decode($msg->body, true); } else { $this->_init("SEND", $headers, $msg); if ($this->headers == null) { $this->headers = array(); } - $this->headers['amq-msg-type'] = 'MapMessage'; + $this->headers['transformation'] = 'jms-map-json'; $this->body = json_encode($msg); } } -- cgit v1.2.3-54-g00ecf From 73b4d770a2551018ea17d115d980972dc5f0865a Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Mon, 16 Nov 2009 11:17:14 -0500 Subject: Changed to StatusNet consistent terminology --- lib/command.php | 8 ++++---- lib/commandinterpreter.php | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/command.php b/lib/command.php index c4a4f7cf4..247ea4475 100644 --- a/lib/command.php +++ b/lib/command.php @@ -605,7 +605,7 @@ class LoginCommand extends Command } } -class FollowingCommand extends Command +class SubscriptionsCommand extends Command { function execute($channel) { @@ -624,7 +624,7 @@ class FollowingCommand extends Command } } -class FollowersCommand extends Command +class SubscribersCommand extends Command { function execute($channel) { @@ -653,8 +653,8 @@ class HelpCommand extends Command "off - turn off notifications\n". "help - show this help\n". "follow - subscribe to user\n". - "following - list the people you follow\n". - "followers - list the people that follow you\n". + "subscriptions - list the people you follow\n". + "subscribers - list the people that follow you\n". "leave - unsubscribe from user\n". "d - direct message to user\n". "get - get last notice from user\n". diff --git a/lib/commandinterpreter.php b/lib/commandinterpreter.php index ecc08f101..c39fafb62 100644 --- a/lib/commandinterpreter.php +++ b/lib/commandinterpreter.php @@ -47,17 +47,17 @@ class CommandInterpreter } else { return new LoginCommand($user); } - case 'followers': + case 'subscribers': if ($arg) { return null; } else { - return new FollowersCommand($user); + return new SubscribersCommand($user); } - case 'following': + case 'subscriptions': if ($arg) { return null; } else { - return new FollowingCommand($user); + return new SubscriptionsCommand($user); } case 'on': if ($arg) { -- cgit v1.2.3-54-g00ecf From 717758563038e802976fbd5fcdede45804b82c51 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Mon, 16 Nov 2009 11:22:45 -0500 Subject: getGroups was not handling the case where limit=null correctly --- classes/User.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/classes/User.php b/classes/User.php index 9f1ee53f4..4ddf94916 100644 --- a/classes/User.php +++ b/classes/User.php @@ -577,11 +577,13 @@ class User extends Memcached_DataObject 'WHERE group_member.profile_id = %d ' . 'ORDER BY group_member.created DESC '; - if ($offset) { - if (common_config('db','type') == 'pgsql') { - $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset; - } else { - $qry .= ' LIMIT ' . $offset . ', ' . $limit; + if ($offset>0 && !is_null($limit)) { + if ($offset) { + if (common_config('db','type') == 'pgsql') { + $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset; + } else { + $qry .= ' LIMIT ' . $offset . ', ' . $limit; + } } } -- cgit v1.2.3-54-g00ecf From 0e7dd81a6cf38c879f24f476411104d67b9eb177 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Mon, 16 Nov 2009 11:23:00 -0500 Subject: Added a "groups" command --- lib/command.php | 20 ++++++++++++++++++++ lib/commandinterpreter.php | 6 ++++++ 2 files changed, 26 insertions(+) diff --git a/lib/command.php b/lib/command.php index 247ea4475..0c98c94ac 100644 --- a/lib/command.php +++ b/lib/command.php @@ -643,6 +643,25 @@ class SubscribersCommand extends Command } } +class GroupsCommand extends Command +{ + function execute($channel) + { + $group = $this->user->getGroups(); + $groups=array(); + while ($group->fetch()) { + $groups[]=$group->nickname; + } + if(count($groups)==0){ + $out=_('You are not a member of any groups.'); + }else{ + $out=_('You are a member of these groups: '); + $out.=implode(', ',$groups); + } + $channel->output($this->user,$out); + } +} + class HelpCommand extends Command { function execute($channel) @@ -653,6 +672,7 @@ class HelpCommand extends Command "off - turn off notifications\n". "help - show this help\n". "follow - subscribe to user\n". + "groups - lists the groups you have joined\n". "subscriptions - list the people you follow\n". "subscribers - list the people that follow you\n". "leave - unsubscribe from user\n". diff --git a/lib/commandinterpreter.php b/lib/commandinterpreter.php index c39fafb62..665015afc 100644 --- a/lib/commandinterpreter.php +++ b/lib/commandinterpreter.php @@ -59,6 +59,12 @@ class CommandInterpreter } else { return new SubscriptionsCommand($user); } + case 'groups': + if ($arg) { + return null; + } else { + return new GroupsCommand($user); + } case 'on': if ($arg) { list($other, $extra) = $this->split_arg($arg); -- cgit v1.2.3-54-g00ecf From 84e427c6c147ec69f6d2f32ea64c1508e7c4dded Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 16 Nov 2009 17:43:15 +0100 Subject: start showing actions for flagged profiles --- plugins/UserFlag/adminprofileflag.php | 108 ++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/plugins/UserFlag/adminprofileflag.php b/plugins/UserFlag/adminprofileflag.php index b264beecb..629480991 100644 --- a/plugins/UserFlag/adminprofileflag.php +++ b/plugins/UserFlag/adminprofileflag.php @@ -53,6 +53,8 @@ class AdminprofileflagAction extends Action function prepare($args) { + parent::prepare($args); + return true; } @@ -83,6 +85,112 @@ class AdminprofileflagAction extends Action function showContent() { + $profile = $this->getProfiles(); + + $pl = new FlaggedProfileList($profile, $this); + + $pl->show(); + } + + function getProfiles() + { + $ufp = new User_flag_profile(); + + $ufp->selectAdd(); + $ufp->selectAdd('profile_id'); + $ufp->selectAdd('count(*) as flag_count'); + + $ufp->whereAdd('cleared is NULL'); + + $ufp->groupBy('profile_id'); + $ufp->orderBy('flag_count DESC'); + + $profiles = array(); + + if ($ufp->find()) { + while ($ufp->fetch()) { + $profile = Profile::staticGet('id', $ufp->profile_id); + if (!empty($profile)) { + $profiles[] = $profile; + } + } + } + + $ufp->free(); + + return new ArrayWrapper($profiles); } } +class FlaggedProfileList extends ProfileList { + + function newListItem($profile) + { + return new FlaggedProfileListItem($this->profile, $this->action); + } +} + +class FlaggedProfileListItem extends ProfileListItem +{ + var $user = null; + + function showActions() + { + $this->user = common_current_user(); + + $this->startActions(); + if (Event::handle('StartProfileListItemActionElements', array($this))) { + $this->showSandboxButton(); + $this->showSilenceButton(); + $this->showDeleteButton(); + $this->showClearButton(); + Event::handle('EndProfileListItemActionElements', array($this)); + } + $this->endActions(); + } + + function showSandboxButton() + { + if ($this->user->hasRight(Right::SANDBOXUSER)) { + $this->out->elementStart('li', 'entity_sandbox'); + if ($this->user->isSandboxed()) { + $usf = new UnSandboxForm($this->out, $this->profile); + $usf->show(); + } else { + $sf = new SandboxForm($this->out, $this->profile); + $sf->show(); + } + $this->out->elementEnd('li'); + } + } + + function showSilenceButton() + { + if ($this->user->hasRight(Right::SILENCEUSER)) { + $this->out->elementStart('li', 'entity_silence'); + if ($this->user->isSilenced()) { + $usf = new UnSilenceForm($this->out, $this->profile); + $usf->show(); + } else { + $sf = new SilenceForm($this->out, $this->profile); + $sf->show(); + } + $this->out->elementEnd('li'); + } + } + + function showDeleteButton() + { + + if ($this->user->hasRight(Right::DELETEUSER)) { + $this->out->elementStart('li', 'entity_delete'); + $df = new DeleteUserForm($this->out, $this->profile); + $df->show(); + $this->out->elementEnd('li'); + } + } + + function showClearButton() + { + } +} -- cgit v1.2.3-54-g00ecf From d080afebbe835c70ed5b6937f71df5a36aeb906e Mon Sep 17 00:00:00 2001 From: Eric Helgeson Date: Mon, 16 Nov 2009 11:44:31 -0500 Subject: Refactored Recaptcha plugin to use addPlugin() Also nicer log messages --- plugins/Recaptcha/LICENSE | 22 +++ plugins/Recaptcha/README | 28 ++++ plugins/Recaptcha/RecaptchaPlugin.php | 106 +++++++++++++ plugins/Recaptcha/recaptchalib.php | 277 ++++++++++++++++++++++++++++++++++ plugins/recaptcha/LICENSE | 22 --- plugins/recaptcha/README | 23 --- plugins/recaptcha/recaptcha.php | 104 ------------- plugins/recaptcha/recaptchalib.php | 277 ---------------------------------- 8 files changed, 433 insertions(+), 426 deletions(-) create mode 100644 plugins/Recaptcha/LICENSE create mode 100644 plugins/Recaptcha/README create mode 100644 plugins/Recaptcha/RecaptchaPlugin.php create mode 100644 plugins/Recaptcha/recaptchalib.php delete mode 100644 plugins/recaptcha/LICENSE delete mode 100644 plugins/recaptcha/README delete mode 100644 plugins/recaptcha/recaptcha.php delete mode 100644 plugins/recaptcha/recaptchalib.php diff --git a/plugins/Recaptcha/LICENSE b/plugins/Recaptcha/LICENSE new file mode 100644 index 000000000..b612f71f0 --- /dev/null +++ b/plugins/Recaptcha/LICENSE @@ -0,0 +1,22 @@ +Copyright (c) 2007 reCAPTCHA -- http://recaptcha.net +AUTHORS: + Mike Crawford + Ben Maurer + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/plugins/Recaptcha/README b/plugins/Recaptcha/README new file mode 100644 index 000000000..49c4b9c27 --- /dev/null +++ b/plugins/Recaptcha/README @@ -0,0 +1,28 @@ +StatusNet reCAPTCHA plugin 0.3 11/16/09 +======================================= +Adds a captcha to your registration page to reduce automated spam bots registering. + +Use: +1. Get an API key from http://recaptcha.net + +2. In config.php add: +addPlugin('recaptcha', array('private_key' => 'YourKeyHere', + 'public_key' => 'ReplaceWithYourKey')); +or +addPlugin('recaptcha', array('private_key' => 'YourKeyHere', + 'public_key' => 'ReplaceWithYourKey', + 'display_errors' => true)); +Changelog +========= +0.1 initial release +0.2 Work around for webkit browsers +0.3 Moved to new plugin arch for SN + **YOU WILL NEED TO CHANGE YOUR CONFIG.PHP!** + +reCAPTCHA Lib README +==================== + +The reCAPTCHA PHP Lirary helps you use the reCAPTCHA API. Documentation +for this library can be found at + + http://recaptcha.net/plugins/php diff --git a/plugins/Recaptcha/RecaptchaPlugin.php b/plugins/Recaptcha/RecaptchaPlugin.php new file mode 100644 index 000000000..1a51b16be --- /dev/null +++ b/plugins/Recaptcha/RecaptchaPlugin.php @@ -0,0 +1,106 @@ +. + * + * @category Plugin + * @package StatusNet + * @author Eric Helgeson + * @copyright 2009 + * @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); +} + +define('RECAPTCHA', '0.2'); + +require_once(INSTALLDIR.'/plugins/Recaptcha/recaptchalib.php'); + +class RecaptchaPlugin extends Plugin +{ + var $private_key; + var $public_key; + var $display_errors; + var $failed; + var $ssl; + + function onInitializePlugin(){ + if(!isset($this->private_key)){ + common_log(LOG_ERR, "Recaptcha: Must specify private_key in config.php"); + } + if(!isset($this->public_key)){ + common_log(LOG_ERR, "Recaptcha: Must specify public_key in config.php"); + } + } + + function checkssl(){ + if(common_config('site', 'ssl') === 'sometimes' || common_config('site', 'ssl') === 'always') { + return true; + } + return false; + } + + function onStartShowHTML($action) + { + //XXX: Horrible hack to make Safari, FF2, and Chrome work with + //reChapcha. reChapcha beaks xhtml strict + header('Content-Type: text/html'); + + $action->extraHeaders(); + + $action->startXML('html'); + + $action->raw(''); + return false; + } + + function onEndRegistrationFormData($action) + { + $action->elementStart('li'); + $action->raw(''); + if($this->checkssl() === true){ + $action->raw(recaptcha_get_html($this->public_key), null, true); + } else { + $action->raw(recaptcha_get_html($this->public_key)); + } + $action->elementEnd('li'); + return true; + } + + function onStartRegistrationTry($action) + { + $resp = recaptcha_check_answer ($this->private_key, + $_SERVER["REMOTE_ADDR"], + $action->trimmed('recaptcha_challenge_field'), + $action->trimmed('recaptcha_response_field')); + + if (!$resp->is_valid) + { + if($this->display_errors) + { + $action->showForm ("(reCAPTCHA said: " . $resp->error . ")"); + } + $action->showForm("Captcha does not match!"); + return false; + } + } +} diff --git a/plugins/Recaptcha/recaptchalib.php b/plugins/Recaptcha/recaptchalib.php new file mode 100644 index 000000000..897c50981 --- /dev/null +++ b/plugins/Recaptcha/recaptchalib.php @@ -0,0 +1,277 @@ + $value ) + $req .= $key . '=' . urlencode( stripslashes($value) ) . '&'; + + // Cut the last '&' + $req=substr($req,0,strlen($req)-1); + return $req; +} + + + +/** + * Submits an HTTP POST to a reCAPTCHA server + * @param string $host + * @param string $path + * @param array $data + * @param int port + * @return array response + */ +function _recaptcha_http_post($host, $path, $data, $port = 80) { + + $req = _recaptcha_qsencode ($data); + + $http_request = "POST $path HTTP/1.0\r\n"; + $http_request .= "Host: $host\r\n"; + $http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n"; + $http_request .= "Content-Length: " . strlen($req) . "\r\n"; + $http_request .= "User-Agent: reCAPTCHA/PHP\r\n"; + $http_request .= "\r\n"; + $http_request .= $req; + + $response = ''; + if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) { + die ('Could not open socket'); + } + + fwrite($fs, $http_request); + + while ( !feof($fs) ) + $response .= fgets($fs, 1160); // One TCP-IP packet + fclose($fs); + $response = explode("\r\n\r\n", $response, 2); + + return $response; +} + + + +/** + * Gets the challenge HTML (javascript and non-javascript version). + * This is called from the browser, and the resulting reCAPTCHA HTML widget + * is embedded within the HTML form it was called from. + * @param string $pubkey A public key for reCAPTCHA + * @param string $error The error given by reCAPTCHA (optional, default is null) + * @param boolean $use_ssl Should the request be made over ssl? (optional, default is false) + + * @return string - The HTML to be embedded in the user's form. + */ +function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false) +{ + if ($pubkey == null || $pubkey == '') { + die ("To use reCAPTCHA you must get an API key from http://recaptcha.net/api/getkey"); + } + + if ($use_ssl) { + $server = RECAPTCHA_API_SECURE_SERVER; + } else { + $server = RECAPTCHA_API_SERVER; + } + + $errorpart = ""; + if ($error) { + $errorpart = "&error=" . $error; + } + return ' + + '; +} + + + + +/** + * A ReCaptchaResponse is returned from recaptcha_check_answer() + */ +class ReCaptchaResponse { + var $is_valid; + var $error; +} + + +/** + * Calls an HTTP POST function to verify if the user's guess was correct + * @param string $privkey + * @param string $remoteip + * @param string $challenge + * @param string $response + * @param array $extra_params an array of extra variables to post to the server + * @return ReCaptchaResponse + */ +function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $extra_params = array()) +{ + if ($privkey == null || $privkey == '') { + die ("To use reCAPTCHA you must get an API key from http://recaptcha.net/api/getkey"); + } + + if ($remoteip == null || $remoteip == '') { + die ("For security reasons, you must pass the remote ip to reCAPTCHA"); + } + + + + //discard spam submissions + if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) { + $recaptcha_response = new ReCaptchaResponse(); + $recaptcha_response->is_valid = false; + $recaptcha_response->error = 'incorrect-captcha-sol'; + return $recaptcha_response; + } + + $response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/verify", + array ( + 'privatekey' => $privkey, + 'remoteip' => $remoteip, + 'challenge' => $challenge, + 'response' => $response + ) + $extra_params + ); + + $answers = explode ("\n", $response [1]); + $recaptcha_response = new ReCaptchaResponse(); + + if (trim ($answers [0]) == 'true') { + $recaptcha_response->is_valid = true; + } + else { + $recaptcha_response->is_valid = false; + $recaptcha_response->error = $answers [1]; + } + return $recaptcha_response; + +} + +/** + * gets a URL where the user can sign up for reCAPTCHA. If your application + * has a configuration page where you enter a key, you should provide a link + * using this function. + * @param string $domain The domain where the page is hosted + * @param string $appname The name of your application + */ +function recaptcha_get_signup_url ($domain = null, $appname = null) { + return "http://recaptcha.net/api/getkey?" . _recaptcha_qsencode (array ('domain' => $domain, 'app' => $appname)); +} + +function _recaptcha_aes_pad($val) { + $block_size = 16; + $numpad = $block_size - (strlen ($val) % $block_size); + return str_pad($val, strlen ($val) + $numpad, chr($numpad)); +} + +/* Mailhide related code */ + +function _recaptcha_aes_encrypt($val,$ky) { + if (! function_exists ("mcrypt_encrypt")) { + die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed."); + } + $mode=MCRYPT_MODE_CBC; + $enc=MCRYPT_RIJNDAEL_128; + $val=_recaptcha_aes_pad($val); + return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"); +} + + +function _recaptcha_mailhide_urlbase64 ($x) { + return strtr(base64_encode ($x), '+/', '-_'); +} + +/* gets the reCAPTCHA Mailhide url for a given email, public key and private key */ +function recaptcha_mailhide_url($pubkey, $privkey, $email) { + if ($pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null) { + die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " . + "you can do so at http://mailhide.recaptcha.net/apikey"); + } + + + $ky = pack('H*', $privkey); + $cryptmail = _recaptcha_aes_encrypt ($email, $ky); + + return "http://mailhide.recaptcha.net/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail); +} + +/** + * gets the parts of the email to expose to the user. + * eg, given johndoe@example,com return ["john", "example.com"]. + * the email is then displayed as john...@example.com + */ +function _recaptcha_mailhide_email_parts ($email) { + $arr = preg_split("/@/", $email ); + + if (strlen ($arr[0]) <= 4) { + $arr[0] = substr ($arr[0], 0, 1); + } else if (strlen ($arr[0]) <= 6) { + $arr[0] = substr ($arr[0], 0, 3); + } else { + $arr[0] = substr ($arr[0], 0, 4); + } + return $arr; +} + +/** + * Gets html to display an email address given a public an private key. + * to get a key, go to: + * + * http://mailhide.recaptcha.net/apikey + */ +function recaptcha_mailhide_html($pubkey, $privkey, $email) { + $emailparts = _recaptcha_mailhide_email_parts ($email); + $url = recaptcha_mailhide_url ($pubkey, $privkey, $email); + + return htmlentities($emailparts[0]) . "...@" . htmlentities ($emailparts [1]); + +} + + +?> diff --git a/plugins/recaptcha/LICENSE b/plugins/recaptcha/LICENSE deleted file mode 100644 index b612f71f0..000000000 --- a/plugins/recaptcha/LICENSE +++ /dev/null @@ -1,22 +0,0 @@ -Copyright (c) 2007 reCAPTCHA -- http://recaptcha.net -AUTHORS: - Mike Crawford - Ben Maurer - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/plugins/recaptcha/README b/plugins/recaptcha/README deleted file mode 100644 index b996f96cc..000000000 --- a/plugins/recaptcha/README +++ /dev/null @@ -1,23 +0,0 @@ -StatusNet reCAPTCHA plugin 0.2 8/3/09 -==================================== -Adds a captcha to your registration page to reduce automated spam bots registering. - -Use: -1. Get an API key from http://recaptcha.net - -2. In config.php add: -include_once('plugins/recaptcha/recaptcha.php'); -$captcha = new recaptcha(publickey, privatekey, showErrors); - -Changelog -========= -0.1 initial release -0.2 Work around for webkit browsers - -reCAPTCHA README -================ - -The reCAPTCHA PHP Lirary helps you use the reCAPTCHA API. Documentation -for this library can be found at - - http://recaptcha.net/plugins/php diff --git a/plugins/recaptcha/recaptcha.php b/plugins/recaptcha/recaptcha.php deleted file mode 100644 index 94cf0ccd1..000000000 --- a/plugins/recaptcha/recaptcha.php +++ /dev/null @@ -1,104 +0,0 @@ -. - * - * @category Plugin - * @package StatusNet - * @author Eric Helgeson - * @copyright 2009 - * @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); -} - -define('RECAPTCHA', '0.2'); - -class recaptcha extends Plugin -{ - var $private_key; - var $public_key; - var $display_errors; - var $failed; - var $ssl; - - function __construct($public_key, $private_key, $display_errors=false) - { - parent::__construct(); - require_once(INSTALLDIR.'/plugins/recaptcha/recaptchalib.php'); - $this->public_key = $public_key; - $this->private_key = $private_key; - $this->display_errors = $display_errors; - } - - function checkssl(){ - if(common_config('site', 'ssl') === 'sometimes' || common_config('site', 'ssl') === 'always') { - return true; - } - return false; - } - - function onStartShowHTML($action) - { - //XXX: Horrible hack to make Safari, FF2, and Chrome work with - //reChapcha. reChapcha beaks xhtml strict - header('Content-Type: text/html'); - - $action->extraHeaders(); - - $action->startXML('html'); - - $action->raw(''); - return false; - } - - function onEndRegistrationFormData($action) - { - $action->elementStart('li'); - $action->raw(''); - if($this->checkssl() === true){ - $action->raw(recaptcha_get_html($this->public_key), null, true); - } else { - $action->raw(recaptcha_get_html($this->public_key)); - } - $action->elementEnd('li'); - return true; - } - - function onStartRegistrationTry($action) - { - $resp = recaptcha_check_answer ($this->private_key, - $_SERVER["REMOTE_ADDR"], - $action->trimmed('recaptcha_challenge_field'), - $action->trimmed('recaptcha_response_field')); - - if (!$resp->is_valid) - { - if($this->display_errors) - { - $action->showForm ("(reCAPTCHA said: " . $resp->error . ")"); - } - $action->showForm("Captcha does not match!"); - return false; - } - } -} diff --git a/plugins/recaptcha/recaptchalib.php b/plugins/recaptcha/recaptchalib.php deleted file mode 100644 index 897c50981..000000000 --- a/plugins/recaptcha/recaptchalib.php +++ /dev/null @@ -1,277 +0,0 @@ - $value ) - $req .= $key . '=' . urlencode( stripslashes($value) ) . '&'; - - // Cut the last '&' - $req=substr($req,0,strlen($req)-1); - return $req; -} - - - -/** - * Submits an HTTP POST to a reCAPTCHA server - * @param string $host - * @param string $path - * @param array $data - * @param int port - * @return array response - */ -function _recaptcha_http_post($host, $path, $data, $port = 80) { - - $req = _recaptcha_qsencode ($data); - - $http_request = "POST $path HTTP/1.0\r\n"; - $http_request .= "Host: $host\r\n"; - $http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n"; - $http_request .= "Content-Length: " . strlen($req) . "\r\n"; - $http_request .= "User-Agent: reCAPTCHA/PHP\r\n"; - $http_request .= "\r\n"; - $http_request .= $req; - - $response = ''; - if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) { - die ('Could not open socket'); - } - - fwrite($fs, $http_request); - - while ( !feof($fs) ) - $response .= fgets($fs, 1160); // One TCP-IP packet - fclose($fs); - $response = explode("\r\n\r\n", $response, 2); - - return $response; -} - - - -/** - * Gets the challenge HTML (javascript and non-javascript version). - * This is called from the browser, and the resulting reCAPTCHA HTML widget - * is embedded within the HTML form it was called from. - * @param string $pubkey A public key for reCAPTCHA - * @param string $error The error given by reCAPTCHA (optional, default is null) - * @param boolean $use_ssl Should the request be made over ssl? (optional, default is false) - - * @return string - The HTML to be embedded in the user's form. - */ -function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false) -{ - if ($pubkey == null || $pubkey == '') { - die ("To use reCAPTCHA you must get an API key from http://recaptcha.net/api/getkey"); - } - - if ($use_ssl) { - $server = RECAPTCHA_API_SECURE_SERVER; - } else { - $server = RECAPTCHA_API_SERVER; - } - - $errorpart = ""; - if ($error) { - $errorpart = "&error=" . $error; - } - return ' - - '; -} - - - - -/** - * A ReCaptchaResponse is returned from recaptcha_check_answer() - */ -class ReCaptchaResponse { - var $is_valid; - var $error; -} - - -/** - * Calls an HTTP POST function to verify if the user's guess was correct - * @param string $privkey - * @param string $remoteip - * @param string $challenge - * @param string $response - * @param array $extra_params an array of extra variables to post to the server - * @return ReCaptchaResponse - */ -function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $extra_params = array()) -{ - if ($privkey == null || $privkey == '') { - die ("To use reCAPTCHA you must get an API key from http://recaptcha.net/api/getkey"); - } - - if ($remoteip == null || $remoteip == '') { - die ("For security reasons, you must pass the remote ip to reCAPTCHA"); - } - - - - //discard spam submissions - if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) { - $recaptcha_response = new ReCaptchaResponse(); - $recaptcha_response->is_valid = false; - $recaptcha_response->error = 'incorrect-captcha-sol'; - return $recaptcha_response; - } - - $response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/verify", - array ( - 'privatekey' => $privkey, - 'remoteip' => $remoteip, - 'challenge' => $challenge, - 'response' => $response - ) + $extra_params - ); - - $answers = explode ("\n", $response [1]); - $recaptcha_response = new ReCaptchaResponse(); - - if (trim ($answers [0]) == 'true') { - $recaptcha_response->is_valid = true; - } - else { - $recaptcha_response->is_valid = false; - $recaptcha_response->error = $answers [1]; - } - return $recaptcha_response; - -} - -/** - * gets a URL where the user can sign up for reCAPTCHA. If your application - * has a configuration page where you enter a key, you should provide a link - * using this function. - * @param string $domain The domain where the page is hosted - * @param string $appname The name of your application - */ -function recaptcha_get_signup_url ($domain = null, $appname = null) { - return "http://recaptcha.net/api/getkey?" . _recaptcha_qsencode (array ('domain' => $domain, 'app' => $appname)); -} - -function _recaptcha_aes_pad($val) { - $block_size = 16; - $numpad = $block_size - (strlen ($val) % $block_size); - return str_pad($val, strlen ($val) + $numpad, chr($numpad)); -} - -/* Mailhide related code */ - -function _recaptcha_aes_encrypt($val,$ky) { - if (! function_exists ("mcrypt_encrypt")) { - die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed."); - } - $mode=MCRYPT_MODE_CBC; - $enc=MCRYPT_RIJNDAEL_128; - $val=_recaptcha_aes_pad($val); - return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"); -} - - -function _recaptcha_mailhide_urlbase64 ($x) { - return strtr(base64_encode ($x), '+/', '-_'); -} - -/* gets the reCAPTCHA Mailhide url for a given email, public key and private key */ -function recaptcha_mailhide_url($pubkey, $privkey, $email) { - if ($pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null) { - die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " . - "you can do so at http://mailhide.recaptcha.net/apikey"); - } - - - $ky = pack('H*', $privkey); - $cryptmail = _recaptcha_aes_encrypt ($email, $ky); - - return "http://mailhide.recaptcha.net/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail); -} - -/** - * gets the parts of the email to expose to the user. - * eg, given johndoe@example,com return ["john", "example.com"]. - * the email is then displayed as john...@example.com - */ -function _recaptcha_mailhide_email_parts ($email) { - $arr = preg_split("/@/", $email ); - - if (strlen ($arr[0]) <= 4) { - $arr[0] = substr ($arr[0], 0, 1); - } else if (strlen ($arr[0]) <= 6) { - $arr[0] = substr ($arr[0], 0, 3); - } else { - $arr[0] = substr ($arr[0], 0, 4); - } - return $arr; -} - -/** - * Gets html to display an email address given a public an private key. - * to get a key, go to: - * - * http://mailhide.recaptcha.net/apikey - */ -function recaptcha_mailhide_html($pubkey, $privkey, $email) { - $emailparts = _recaptcha_mailhide_email_parts ($email); - $url = recaptcha_mailhide_url ($pubkey, $privkey, $email); - - return htmlentities($emailparts[0]) . "...@" . htmlentities ($emailparts [1]); - -} - - -?> -- cgit v1.2.3-54-g00ecf From 968058c68b0d23e3dccc85301d78dccf8bcc0ba1 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 16 Nov 2009 17:54:34 +0100 Subject: getting arguments for return-to processing --- lib/action.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/action.php b/lib/action.php index b5cf3240c..4c1e73564 100644 --- a/lib/action.php +++ b/lib/action.php @@ -985,6 +985,18 @@ class Action extends HTMLOutputter // lawsuit */ function selfUrl() + { + list($action, $args) = $this->returnToArgs(); + return common_local_url($action, $args); + } + + /** + * Returns arguments sufficient for re-constructing URL + * + * @return array two elements: action, other args + */ + + function returnToArgs() { $action = $this->trimmed('action'); $args = $this->args; @@ -998,8 +1010,7 @@ class Action extends HTMLOutputter // lawsuit foreach (array_keys($_COOKIE) as $cookie) { unset($args[$cookie]); } - - return common_local_url($action, $args); + return array($action, $args); } /** -- cgit v1.2.3-54-g00ecf From 0580e824f0d650d9f9091be131916945951faba5 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 16 Nov 2009 17:54:50 +0100 Subject: use return-to method for UserProfile widget --- lib/userprofile.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/userprofile.php b/lib/userprofile.php index dedac5bf1..ee205af85 100644 --- a/lib/userprofile.php +++ b/lib/userprofile.php @@ -285,8 +285,11 @@ class UserProfile extends Widget // return-to args, so we don't have to keep re-writing them - $r2args = array('action' => 'showstream', - 'nickname' => $this->profile->nickname); + list($action, $r2args) = $this->out->returnToArgs(); + + // push the action into the list + + $r2args['action'] = $action; // block/unblock -- cgit v1.2.3-54-g00ecf From bea580873f10c186a3e12047c28d693d3dcb26d2 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 16 Nov 2009 17:55:00 +0100 Subject: use return-to method for adminprofileflag --- plugins/UserFlag/adminprofileflag.php | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/plugins/UserFlag/adminprofileflag.php b/plugins/UserFlag/adminprofileflag.php index 629480991..1ac76b506 100644 --- a/plugins/UserFlag/adminprofileflag.php +++ b/plugins/UserFlag/adminprofileflag.php @@ -133,11 +133,16 @@ class FlaggedProfileList extends ProfileList { class FlaggedProfileListItem extends ProfileListItem { var $user = null; + var $r2args = null; function showActions() { $this->user = common_current_user(); + list($action, $this->r2args) = $this->out->returnToArgs(); + + $this->r2args['action'] = $action; + $this->startActions(); if (Event::handle('StartProfileListItemActionElements', array($this))) { $this->showSandboxButton(); @@ -153,11 +158,11 @@ class FlaggedProfileListItem extends ProfileListItem { if ($this->user->hasRight(Right::SANDBOXUSER)) { $this->out->elementStart('li', 'entity_sandbox'); - if ($this->user->isSandboxed()) { - $usf = new UnSandboxForm($this->out, $this->profile); + if ($this->profile->isSandboxed()) { + $usf = new UnSandboxForm($this->out, $this->profile, $this->r2args); $usf->show(); } else { - $sf = new SandboxForm($this->out, $this->profile); + $sf = new SandboxForm($this->out, $this->profile, $this->r2args); $sf->show(); } $this->out->elementEnd('li'); @@ -168,11 +173,11 @@ class FlaggedProfileListItem extends ProfileListItem { if ($this->user->hasRight(Right::SILENCEUSER)) { $this->out->elementStart('li', 'entity_silence'); - if ($this->user->isSilenced()) { - $usf = new UnSilenceForm($this->out, $this->profile); + if ($this->profile->isSilenced()) { + $usf = new UnSilenceForm($this->out, $this->profile, $this->r2args); $usf->show(); } else { - $sf = new SilenceForm($this->out, $this->profile); + $sf = new SilenceForm($this->out, $this->profile, $this->r2args); $sf->show(); } $this->out->elementEnd('li'); @@ -184,7 +189,7 @@ class FlaggedProfileListItem extends ProfileListItem if ($this->user->hasRight(Right::DELETEUSER)) { $this->out->elementStart('li', 'entity_delete'); - $df = new DeleteUserForm($this->out, $this->profile); + $df = new DeleteUserForm($this->out, $this->profile, $this->r2args); $df->show(); $this->out->elementEnd('li'); } -- cgit v1.2.3-54-g00ecf From 55d00a3a907fa275a0df580a82cea20da95889c6 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 16 Nov 2009 18:24:59 +0100 Subject: make profile flag actions work like other profile actions --- plugins/UserFlag/flagprofile.php | 94 +++++++---------------------------- plugins/UserFlag/flagprofileform.php | 96 +++++------------------------------- 2 files changed, 31 insertions(+), 159 deletions(-) diff --git a/plugins/UserFlag/flagprofile.php b/plugins/UserFlag/flagprofile.php index 77c86b233..8ff2f1f72 100644 --- a/plugins/UserFlag/flagprofile.php +++ b/plugins/UserFlag/flagprofile.php @@ -41,11 +41,8 @@ if (!defined('STATUSNET')) { * @link http://status.net/ */ -class FlagprofileAction extends Action +class FlagprofileAction extends ProfileFormAction { - var $profile = null; - var $flag = null; - /** * Take arguments for running * @@ -56,34 +53,14 @@ class FlagprofileAction extends Action function prepare($args) { - parent::prepare($args); - - if ($_SERVER['REQUEST_METHOD'] != 'POST') { - throw new ClientException(_('Action only accepts POST')); - } - - if (!common_logged_in()) { - $this->clientError(_('Not logged in.')); - return false; - } - - $id = $this->trimmed('flagprofileto'); - - if (!$id) { - $this->clientError(_('No profile specified.')); - return false; - } - - $this->profile = Profile::staticGet('id', $id); - - if (empty($this->profile)) { - $this->clientError(_('No profile with that ID.')); + if (!parent::prepare($args)) { return false; } $user = common_current_user(); assert(!empty($user)); // checked above + assert(!empty($this->profile)); // checked above if (User_flag_profile::exists($this->profile->id, $user->id)) @@ -96,46 +73,12 @@ class FlagprofileAction extends Action } /** - * Handle request - * - * @param array $args $_REQUEST args; handled in prepare() + * Handle POST * * @return void */ - function handle($args) - { - parent::handle($args); - - $this->flagProfile(); - - 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() { - return _('Flag profile'); - } - - /** - * save the profile flag - * - * @return void - */ - - function flagProfile() + function handlePost() { $user = common_current_user(); @@ -149,25 +92,24 @@ class FlagprofileAction extends Action $ufp->created = common_sql_now(); if (!$ufp->insert()) { - throw new ServerException(sprintf(_("Couldn't flag profile '%s' with flag '%s'."), - $this->profile->nickname, $this->flag)); + throw new ServerException(sprintf(_("Couldn't flag profile '%s' for review."), + $this->profile->nickname)); } $ufp->free(); } - function returnTo() - { - // Now, gotta figure where we go back to - foreach ($this->args as $k => $v) { - if ($k == 'returnto-action') { - $action = $v; - } elseif (substr($k, 0, 9) == 'returnto-') { - $args[substr($k, 9)] = $v; - } - } - - common_redirect(common_local_url($action, $args), 303); + function ajaxResults() { + header('Content-Type: text/xml;charset=utf-8'); + $this->xw->startDocument('1.0', 'UTF-8'); + $this->elementStart('html'); + $this->elementStart('head'); + $this->element('title', null, _('Flagged for review')); + $this->elementEnd('head'); + $this->elementStart('body'); + $this->element('p', 'flagged', _('Flagged')); + $this->elementEnd('body'); + $this->elementEnd('html'); } } diff --git a/plugins/UserFlag/flagprofileform.php b/plugins/UserFlag/flagprofileform.php index a8396e2d5..262dad4a7 100644 --- a/plugins/UserFlag/flagprofileform.php +++ b/plugins/UserFlag/flagprofileform.php @@ -45,108 +45,38 @@ require_once INSTALLDIR.'/lib/form.php'; * @link http://status.net/ */ -class FlagProfileForm extends Form +class FlagProfileForm extends ProfileActionForm { /** - * Profile of profile to flag - */ - - var $profile = null; - - /** - * Return-to args - */ - - var $args = null; - - /** - * Constructor - * - * @param HTMLOutputter $out output channel - * @param Profile $profile profile of user to flag - * @param array $args return-to args - */ - - function __construct($out=null, $profile=null, $args=null) - { - parent::__construct($out); - - $this->profile = $profile; - $this->args = $args; - } - - /** - * ID of the form - * - * @return int ID of the form - */ - - function id() - { - return 'flagprofile-' . $this->profile->id; - } - - /** - * class of the form + * Action this form provides * - * @return string class of the form + * @return string Name of the action, lowercased. */ - function formClass() + function target() { - return 'form_entity_flag'; + return 'flagprofile'; } /** - * Action of the form + * Title of the form * - * @return string URL of the action + * @return string Title of the form, internationalized */ - function action() - { - return common_local_url('flagprofile'); - } - - /** - * Legend of the Form - * - * @return void - */ - function formLegend() + function title() { - $this->out->element('legend', null, _('Flag profile for review')); - } - - /** - * Data elements of the form - * - * @return void - */ - - function formData() - { - // TODO: let the user choose a flag - - $this->out->hidden('flagprofileto-' . $this->profile->id, - $this->profile->id, - 'flagprofileto'); - - if ($this->args) { - foreach ($this->args as $k => $v) { - $this->out->hidden('returnto-' . $k, $v); - } - } + return _('Flag'); } /** - * Action elements + * Description of the form * - * @return void + * @return string description of the form, internationalized */ - function formActions() + function description() { - $this->out->submit('submit', _('Flag'), 'submit', null, _('Flag profile for review')); + return _('Flag profile for review'); } } -- cgit v1.2.3-54-g00ecf From 02cc7af1b6a6f8c460550ad0f884bf5e7a18d176 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 16 Nov 2009 18:29:13 +0100 Subject: try to return to the correct page from FlagProfileForm --- plugins/UserFlag/UserFlagPlugin.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php index 6410ee1ce..fd0c51f95 100644 --- a/plugins/UserFlag/UserFlagPlugin.php +++ b/plugins/UserFlag/UserFlagPlugin.php @@ -122,7 +122,11 @@ class UserFlagPlugin extends Plugin if (!empty($user)) { - $form = new FlagProfileForm($item->action, $item->profile); + list($action, $args) = $item->action->returnToArgs(); + + $args['action'] = $action; + + $form = new FlagProfileForm($item->action, $item->profile, $args); $form->show(); } -- cgit v1.2.3-54-g00ecf From d2145a5b7f3a95dcfa90edb4bcd5e5b3bf66c116 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 16 Nov 2009 19:03:59 +0100 Subject: Move rights check to profile and add right for new notices Added a right for new notices, realized that the hasRight() method should be on the profile, and moved it. Makes this a less atomic commit but that's the way it goes sometimes. --- classes/Notice.php | 6 ++---- classes/Profile.php | 38 ++++++++++++++++++++++++++++++++++++++ classes/User.php | 33 ++------------------------------- lib/right.php | 1 + 4 files changed, 43 insertions(+), 35 deletions(-) diff --git a/classes/Notice.php b/classes/Notice.php index 291e6202b..fde40240f 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -195,10 +195,8 @@ class Notice extends Memcached_DataObject ' take a breather and post again in a few minutes.')); } - $banned = common_config('profile', 'banned'); - - if ( in_array($profile_id, $banned) || in_array($profile->nickname, $banned)) { - common_log(LOG_WARNING, "Attempted post from banned user: $profile->nickname (user id = $profile_id)."); + if (!$profile->hasRight(Right::NEWNOTICE)) { + common_log(LOG_WARNING, "Attempted post from user disallowed to post: " . $profile->nickname); throw new ClientException(_('You are banned from posting notices on this site.')); } diff --git a/classes/Profile.php b/classes/Profile.php index 5b4394d3b..e3b35533a 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -661,4 +661,42 @@ class Profile extends Memcached_DataObject { $this->revokeRole(Profile_role::SILENCED); } + + /** + * Does this user have the right to do X? + * + * With our role-based authorization, this is merely a lookup for whether the user + * has a particular role. The implementation currently uses a switch statement + * to determine if the user has the pre-defined role to exercise the right. Future + * implementations may allow per-site roles, and different mappings of roles to rights. + * + * @param $right string Name of the right, usually a constant in class Right + * @return boolean whether the user has the right in question + */ + + function hasRight($right) + { + $result = false; + if (Event::handle('UserRightsCheck', array($this, $right, &$result))) { + switch ($right) + { + case Right::DELETEOTHERSNOTICE: + case Right::SANDBOXUSER: + case Right::SILENCEUSER: + case Right::DELETEUSER: + $result = $this->hasRole(Profile_role::MODERATOR); + break; + case Right::CONFIGURESITE: + $result = $this->hasRole(Profile_role::ADMINISTRATOR); + break; + case Right::NEWNOTICE: + $result = !$this->isSilenced(); + break; + default: + $result = false; + break; + } + } + return $result; + } } diff --git a/classes/User.php b/classes/User.php index 82d3bd59a..a466369a1 100644 --- a/classes/User.php +++ b/classes/User.php @@ -657,39 +657,10 @@ class User extends Memcached_DataObject return Design::staticGet('id', $this->design_id); } - /** - * Does this user have the right to do X? - * - * With our role-based authorization, this is merely a lookup for whether the user - * has a particular role. The implementation currently uses a switch statement - * to determine if the user has the pre-defined role to exercise the right. Future - * implementations may allow per-site roles, and different mappings of roles to rights. - * - * @param $right string Name of the right, usually a constant in class Right - * @return boolean whether the user has the right in question - */ - function hasRight($right) { - $result = false; - if (Event::handle('UserRightsCheck', array($this, $right, &$result))) { - switch ($right) - { - case Right::DELETEOTHERSNOTICE: - case Right::SANDBOXUSER: - case Right::SILENCEUSER: - case Right::DELETEUSER: - $result = $this->hasRole(Profile_role::MODERATOR); - break; - case Right::CONFIGURESITE: - $result = $this->hasRole(Profile_role::ADMINISTRATOR); - break; - default: - $result = false; - break; - } - } - return $result; + $profile = $this->getProfile(); + return $profile->hasRight($right); } function delete() diff --git a/lib/right.php b/lib/right.php index 88abdf780..ae8516602 100644 --- a/lib/right.php +++ b/lib/right.php @@ -50,5 +50,6 @@ class Right const DELETEUSER = 'deleteuser'; const SILENCEUSER = 'silenceuser'; const SANDBOXUSER = 'sandboxuser'; + const NEWNOTICE = 'newnotice'; } -- cgit v1.2.3-54-g00ecf From f1efb845e4955f398be3a7e36499474dc67bdade Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 16 Nov 2009 19:22:22 +0100 Subject: don't allow sandboxed users to post public notices --- classes/Notice.php | 5 ++--- classes/Profile.php | 3 +++ lib/right.php | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/classes/Notice.php b/classes/Notice.php index fde40240f..1db431f2a 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -203,12 +203,11 @@ class Notice extends Memcached_DataObject $notice = new Notice(); $notice->profile_id = $profile_id; - $blacklist = common_config('public', 'blacklist'); $autosource = common_config('public', 'autosource'); - # Blacklisted are non-false, but not 1, either + # Sandboxed are non-false, but not 1, either - if (($blacklist && in_array($profile_id, $blacklist)) || + if (!$user->hasRight(Right::PUBLICNOTICE) || ($source && $autosource && in_array($source, $autosource))) { $notice->is_local = Notice::LOCAL_NONPUBLIC; } else { diff --git a/classes/Profile.php b/classes/Profile.php index e3b35533a..291e3f064 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -692,6 +692,9 @@ class Profile extends Memcached_DataObject case Right::NEWNOTICE: $result = !$this->isSilenced(); break; + case Right::PUBLICNOTICE: + $result = !$this->isSandboxed(); + break; default: $result = false; break; diff --git a/lib/right.php b/lib/right.php index ae8516602..1a3a7d49a 100644 --- a/lib/right.php +++ b/lib/right.php @@ -51,5 +51,6 @@ class Right const SILENCEUSER = 'silenceuser'; const SANDBOXUSER = 'sandboxuser'; const NEWNOTICE = 'newnotice'; + const PUBLICNOTICE = 'publicnotice'; } -- cgit v1.2.3-54-g00ecf From e9321a18063911f28bb55e355298ce65b36b5b71 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 16 Nov 2009 19:46:08 +0100 Subject: more rights denied to silenced and sandboxed --- classes/Profile.php | 4 ++++ lib/right.php | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/classes/Profile.php b/classes/Profile.php index 291e3f064..8754c506c 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -690,9 +690,13 @@ class Profile extends Memcached_DataObject $result = $this->hasRole(Profile_role::ADMINISTRATOR); break; case Right::NEWNOTICE: + case Right::NEWMESSAGE: + case Right::SUBSCRIBE: $result = !$this->isSilenced(); break; case Right::PUBLICNOTICE: + case Right::EMAILONREPLY: + case Right::EMAILONSUBSCRIBE: $result = !$this->isSandboxed(); break; default: diff --git a/lib/right.php b/lib/right.php index 1a3a7d49a..90ca75fd5 100644 --- a/lib/right.php +++ b/lib/right.php @@ -52,5 +52,9 @@ class Right const SANDBOXUSER = 'sandboxuser'; const NEWNOTICE = 'newnotice'; const PUBLICNOTICE = 'publicnotice'; + const NEWMESSAGE = 'newmessage'; + const SUBSCRIBE = 'subscribe'; + const EMAILONREPLY = 'emailonreply'; + const EMAILONSUBSCRIBE = 'emailonsubscribe'; } -- cgit v1.2.3-54-g00ecf From 440af7ed7a2ae0a93d691c9a6a8081cbd065e53b Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 16 Nov 2009 19:51:41 +0100 Subject: silenced users can't send direct messages --- classes/Message.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/classes/Message.php b/classes/Message.php index 979e6e87c..718a9d922 100644 --- a/classes/Message.php +++ b/classes/Message.php @@ -39,6 +39,12 @@ class Message extends Memcached_DataObject static function saveNew($from, $to, $content, $source) { + $sender = Profile::staticGet('id', $from); + + if (!$sender->hasRight(Right::NEWMESSAGE)) { + throw new ClientException(_('You are banned from sending direct messages.')); + } + $msg = new Message(); $msg->from_profile = $from; -- cgit v1.2.3-54-g00ecf From e150d920a53cbafaf6ff3f6397fa40f8cc0e526e Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 16 Nov 2009 14:11:14 -0500 Subject: silently skip email for subs from sandboxed user --- lib/mail.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/mail.php b/lib/mail.php index 5218059e9..94d5dcb12 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -216,7 +216,8 @@ function mail_subscribe_notify($listenee, $listener) function mail_subscribe_notify_profile($listenee, $other) { - if ($listenee->email && $listenee->emailnotifysub) { + if ($other->hasRight(Right::EMAILONSUBSCRIBE) && + $listenee->email && $listenee->emailnotifysub) { // use the recipient's localization common_init_locale($listenee->language); @@ -597,7 +598,7 @@ function mail_notify_attn($user, $notice) $bestname = $sender->getBestName(); common_init_locale($user->language); - + if ($notice->conversation != $notice->id) { $conversationEmailText = "The full conversation can be read here:\n\n". "\t%5\$s\n\n "; @@ -607,9 +608,9 @@ function mail_notify_attn($user, $notice) $conversationEmailText = "%5\$s"; $conversationUrl = null; } - + $subject = sprintf(_('%s (@%s) sent a notice to your attention'), $bestname, $sender->nickname); - + $body = sprintf(_("%1\$s (@%9\$s) just sent a notice to your attention (an '@-reply') on %2\$s.\n\n". "The notice is here:\n\n". "\t%3\$s\n\n" . @@ -635,7 +636,7 @@ function mail_notify_attn($user, $notice) array('nickname' => $user->nickname)),//%7 common_local_url('emailsettings'), //%8 $sender->nickname); //%9 - + common_init_locale(); mail_to_user($user, $subject, $body); } -- cgit v1.2.3-54-g00ecf From 2ad4de45e6b0f7edc629fb08346d978039f1c8a3 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 16 Nov 2009 14:12:35 -0500 Subject: block subscribes by silenced users --- lib/oauthstore.php | 4 ++++ lib/subs.php | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/lib/oauthstore.php b/lib/oauthstore.php index a4ea5ad4d..b04bcbb8b 100644 --- a/lib/oauthstore.php +++ b/lib/oauthstore.php @@ -462,6 +462,10 @@ class StatusNetOAuthDataStore extends OAuthDataStore $subscribed = $this->_getAnyProfile($subscribed_user_uri); $subscriber = $this->_getAnyProfile($subscriber_uri); + if (!$subscriber->hasRight(Right::SUBSCRIBE)) { + return _('You have been banned from subscribing.'); + } + $sub->subscribed = $subscribed->id; $sub->subscriber = $subscriber->id; diff --git a/lib/subs.php b/lib/subs.php index 2f0f97049..2fc3160de 100644 --- a/lib/subs.php +++ b/lib/subs.php @@ -44,6 +44,10 @@ function subs_subscribe_user($user, $other_nickname) function subs_subscribe_to($user, $other) { + if (!$user->hasRight(Right::SUBSCRIBE)) { + return _('You have been banned from subscribing.'); + } + if ($user->isSubscribed($other)) { return _('Already subscribed!'); } -- cgit v1.2.3-54-g00ecf From 05ff8925bf2d115bf2c249d6901f7f67b7ac7ba8 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 16 Nov 2009 14:18:51 -0500 Subject: prevent email notification on replies by sandboxed users --- lib/mail.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/mail.php b/lib/mail.php index 94d5dcb12..6e74d1806 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -595,6 +595,10 @@ function mail_notify_attn($user, $notice) $sender = $notice->getProfile(); + if (!$sender->hasRight(Right::EMAILONREPLY)) { + return; + } + $bestname = $sender->getBestName(); common_init_locale($user->language); -- cgit v1.2.3-54-g00ecf From d59af0296070cd868855564a0280e4be2c16410d Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 16 Nov 2009 14:28:55 -0500 Subject: disallow email on faves from sandboxed users --- classes/Profile.php | 1 + lib/mail.php | 4 ++++ lib/right.php | 1 + 3 files changed, 6 insertions(+) diff --git a/classes/Profile.php b/classes/Profile.php index 8754c506c..d52dff5af 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -697,6 +697,7 @@ class Profile extends Memcached_DataObject case Right::PUBLICNOTICE: case Right::EMAILONREPLY: case Right::EMAILONSUBSCRIBE: + case Right::EMAILONFAVE: $result = !$this->isSandboxed(); break; default: diff --git a/lib/mail.php b/lib/mail.php index 6e74d1806..dffac3262 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -546,6 +546,10 @@ function mail_notify_message($message, $from=null, $to=null) function mail_notify_fave($other, $user, $notice) { + if (!$user->hasRight(Right::EMAILONFAVE)) { + return; + } + $profile = $user->getProfile(); $bestname = $profile->getBestName(); diff --git a/lib/right.php b/lib/right.php index 90ca75fd5..5e66eae0e 100644 --- a/lib/right.php +++ b/lib/right.php @@ -56,5 +56,6 @@ class Right const SUBSCRIBE = 'subscribe'; const EMAILONREPLY = 'emailonreply'; const EMAILONSUBSCRIBE = 'emailonsubscribe'; + const EMAILONFAVE = 'emailonfave'; } -- cgit v1.2.3-54-g00ecf From ca77d543844569cd1d401706bf19567bfc57b1eb Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Mon, 16 Nov 2009 20:54:19 +0100 Subject: Localisation updates from !translatewiki !StatusNet --- locale/ar/LC_MESSAGES/statusnet.mo | Bin 29926 -> 33408 bytes locale/ar/LC_MESSAGES/statusnet.po | 82 +++-- locale/bg/LC_MESSAGES/statusnet.mo | Bin 83558 -> 84188 bytes locale/bg/LC_MESSAGES/statusnet.po | 41 ++- locale/ca/LC_MESSAGES/statusnet.mo | Bin 71506 -> 72040 bytes locale/ca/LC_MESSAGES/statusnet.po | 41 ++- locale/cs/LC_MESSAGES/statusnet.mo | Bin 35136 -> 35624 bytes locale/cs/LC_MESSAGES/statusnet.po | 41 ++- locale/de/LC_MESSAGES/statusnet.mo | Bin 71700 -> 72263 bytes locale/de/LC_MESSAGES/statusnet.po | 41 ++- locale/el/LC_MESSAGES/statusnet.mo | Bin 29552 -> 30197 bytes locale/el/LC_MESSAGES/statusnet.po | 39 ++- locale/en_GB/LC_MESSAGES/statusnet.mo | Bin 67062 -> 67648 bytes locale/en_GB/LC_MESSAGES/statusnet.po | 41 ++- locale/es/LC_MESSAGES/statusnet.mo | Bin 70650 -> 71397 bytes locale/es/LC_MESSAGES/statusnet.po | 44 ++- locale/fi/LC_MESSAGES/statusnet.mo | Bin 74354 -> 77266 bytes locale/fi/LC_MESSAGES/statusnet.po | 158 +++++---- locale/fr/LC_MESSAGES/statusnet.mo | Bin 80381 -> 95012 bytes locale/fr/LC_MESSAGES/statusnet.po | 608 +++++++++++++++++++++------------- locale/ga/LC_MESSAGES/statusnet.mo | Bin 74534 -> 75182 bytes locale/ga/LC_MESSAGES/statusnet.po | 41 ++- locale/he/LC_MESSAGES/statusnet.mo | Bin 38630 -> 39222 bytes locale/he/LC_MESSAGES/statusnet.po | 41 ++- locale/is/LC_MESSAGES/statusnet.mo | Bin 62874 -> 63447 bytes locale/is/LC_MESSAGES/statusnet.po | 41 ++- locale/it/LC_MESSAGES/statusnet.mo | Bin 70765 -> 71290 bytes locale/it/LC_MESSAGES/statusnet.po | 41 ++- locale/ja/LC_MESSAGES/statusnet.mo | Bin 47906 -> 48534 bytes locale/ja/LC_MESSAGES/statusnet.po | 41 ++- locale/ko/LC_MESSAGES/statusnet.mo | Bin 75096 -> 75739 bytes locale/ko/LC_MESSAGES/statusnet.po | 41 ++- locale/mk/LC_MESSAGES/statusnet.mo | Bin 45258 -> 45910 bytes locale/mk/LC_MESSAGES/statusnet.po | 41 ++- locale/nb/LC_MESSAGES/statusnet.mo | Bin 23373 -> 23808 bytes locale/nb/LC_MESSAGES/statusnet.po | 41 ++- locale/nl/LC_MESSAGES/statusnet.mo | Bin 100085 -> 100798 bytes locale/nl/LC_MESSAGES/statusnet.po | 42 ++- locale/nn/LC_MESSAGES/statusnet.mo | Bin 67928 -> 68483 bytes locale/nn/LC_MESSAGES/statusnet.po | 41 ++- locale/pl/LC_MESSAGES/statusnet.mo | Bin 96010 -> 96716 bytes locale/pl/LC_MESSAGES/statusnet.po | 41 ++- locale/pt/LC_MESSAGES/statusnet.mo | Bin 25533 -> 25876 bytes locale/pt/LC_MESSAGES/statusnet.po | 39 ++- locale/pt_BR/LC_MESSAGES/statusnet.mo | Bin 70360 -> 70940 bytes locale/pt_BR/LC_MESSAGES/statusnet.po | 41 ++- locale/ru/LC_MESSAGES/statusnet.mo | Bin 94451 -> 95158 bytes locale/ru/LC_MESSAGES/statusnet.po | 44 ++- locale/statusnet.po | 31 +- locale/sv/LC_MESSAGES/statusnet.mo | Bin 58860 -> 59360 bytes locale/sv/LC_MESSAGES/statusnet.po | 41 ++- locale/te/LC_MESSAGES/statusnet.mo | Bin 55017 -> 55687 bytes locale/te/LC_MESSAGES/statusnet.po | 41 ++- locale/tr/LC_MESSAGES/statusnet.mo | Bin 34653 -> 35135 bytes locale/tr/LC_MESSAGES/statusnet.po | 41 ++- locale/uk/LC_MESSAGES/statusnet.mo | Bin 92215 -> 92880 bytes locale/uk/LC_MESSAGES/statusnet.po | 41 ++- locale/vi/LC_MESSAGES/statusnet.mo | Bin 68027 -> 68580 bytes locale/vi/LC_MESSAGES/statusnet.po | 41 ++- locale/zh_CN/LC_MESSAGES/statusnet.mo | Bin 64799 -> 65285 bytes locale/zh_CN/LC_MESSAGES/statusnet.po | 41 ++- locale/zh_TW/LC_MESSAGES/statusnet.mo | Bin 18835 -> 19305 bytes locale/zh_TW/LC_MESSAGES/statusnet.po | 41 ++- 63 files changed, 1599 insertions(+), 431 deletions(-) diff --git a/locale/ar/LC_MESSAGES/statusnet.mo b/locale/ar/LC_MESSAGES/statusnet.mo index 818f014b8..9d156ce91 100644 Binary files a/locale/ar/LC_MESSAGES/statusnet.mo and b/locale/ar/LC_MESSAGES/statusnet.mo differ diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index 0246be9cf..8cbdb40b1 100644 --- a/locale/ar/LC_MESSAGES/statusnet.po +++ b/locale/ar/LC_MESSAGES/statusnet.po @@ -6,12 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-14 21:06+0000\n" -"PO-Revision-Date: 2009-11-14 21:06:59+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:42:46+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59079); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ar\n" "X-Message-Group: out-statusnet\n" @@ -204,7 +204,7 @@ msgstr "" #: actions/apidirectmessage.php:89 #, php-format msgid "Direct messages from %s" -msgstr "" +msgstr "رسائل مباشرة من %s" #: actions/apidirectmessage.php:93 #, php-format @@ -253,7 +253,7 @@ msgstr "تعذّر إنشاء مفضلة." #: actions/apifavoritedestroy.php:122 msgid "That status is not a favorite!" -msgstr "" +msgstr "تلك الحالة ليست مفضلة!" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 msgid "Could not delete favorite." @@ -352,7 +352,7 @@ msgstr "" #: actions/newgroup.php:168 #, php-format msgid "Invalid alias: \"%s\"" -msgstr "" +msgstr "كنية غير صالحة: \"%s\"" #: actions/apigroupcreate.php:321 actions/editgroup.php:228 #: actions/newgroup.php:172 @@ -688,7 +688,7 @@ msgstr "نعم" #: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 #: lib/blockform.php:153 msgid "Block this user" -msgstr "" +msgstr "امنع هذا المستخدم" #: actions/block.php:165 msgid "You have already blocked this user." @@ -1060,7 +1060,7 @@ msgstr "" #: actions/favor.php:92 lib/disfavorform.php:140 msgid "Disfavor favorite" -msgstr "" +msgstr "ألغِ تفضيل المفضلة" #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 @@ -1768,11 +1768,11 @@ msgstr "" #: actions/nudge.php:94 msgid "Nudge sent" -msgstr "" +msgstr "أرسل التنبيه" #: actions/nudge.php:97 msgid "Nudge sent!" -msgstr "" +msgstr "أُرسل التنبيه!" #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" @@ -1822,11 +1822,11 @@ msgstr "قصّر المسارات بـ" #: actions/othersettings.php:117 msgid "Automatic shortening service to use." -msgstr "" +msgstr "خدمة التقصير المطلوب استخدامها." #: actions/othersettings.php:122 msgid "View profile designs" -msgstr "" +msgstr "اعرض تصاميم الملف الشخصي" #: actions/othersettings.php:123 msgid "Show or hide profile designs." @@ -2118,6 +2118,10 @@ msgid "" "tool. [Join now](%%action.register%%) to share notices about yourself with " "friends, family, and colleagues! ([Read more](%%doc.help%%))" msgstr "" +"هنا %%site.name%%، خدمة [التدوين المُصغّر](http://en.wikipedia.org/wiki/Micro-" +"blogging) المبنية على البرنامج الحر [StatusNet](http://status.net/). [انضم " +"الآن](%%action.register%%) لتشارك اشعاراتك مع أصدقائك وعائلتك وزملائك! " +"([اقرأ المزيد](%%doc.help%%))" #: actions/public.php:238 #, php-format @@ -2126,10 +2130,12 @@ msgid "" "blogging) service based on the Free Software [StatusNet](http://status.net/) " "tool." msgstr "" +"هنا %%site.name%%، خدمة [التدوين المُصغّر](http://en.wikipedia.org/wiki/Micro-" +"blogging) المبنية على البرنامج الحر [StatusNet](http://status.net/)." #: actions/publictagcloud.php:57 msgid "Public tag cloud" -msgstr "" +msgstr "سحابة الوسوم العمومية" #: actions/publictagcloud.php:63 #, php-format @@ -2536,7 +2542,7 @@ msgstr "" #: actions/showfavorites.php:242 msgid "This is a way to share what you like." -msgstr "" +msgstr "إنها إحدى وسائل مشاركة ما تحب." #: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format @@ -2641,7 +2647,7 @@ msgstr "لا رسالة كهذه." #: actions/showmessage.php:98 msgid "Only the sender and recipient may read this message." -msgstr "" +msgstr "يحق للمُرسل والمستلم فقط قراءة هذه الرسالة." #: actions/showmessage.php:108 #, php-format @@ -2884,12 +2890,12 @@ msgstr "اشتراكات %s، الصفحة %d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." -msgstr "" +msgstr "هؤلاء الأشخاص الذي تستمع إليهم." #: actions/subscriptions.php:69 #, php-format msgid "These are the people whose notices %s listens to." -msgstr "" +msgstr "هؤلاء الأشخاص الذي يستمع %s إليهم." #: actions/subscriptions.php:121 #, php-format @@ -3381,6 +3387,9 @@ msgid "" "s, available under the [GNU Affero General Public License](http://www.fsf." "org/licensing/licenses/agpl-3.0.html)." msgstr "" +"تعمل على برنامج التدوين المُصغّر [StatusNet](http://status.net/) -النسخة %s- " +"المتوفر تحت [رخصة غنو أفيرو العمومية](http://www.fsf.org/licensing/licenses/" +"agpl-3.0.html)." #: lib/action.php:785 msgid "Site content license" @@ -3579,13 +3588,46 @@ msgstr "" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "لا تملك تصريحًا." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "الأشخاص المشتركون ب%s" + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "الأشخاص الذين اشترك بهم %s" + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "الأشخاص المشتركون ب%s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "لست عضوا في تلك المجموعة." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "لست عضوا في تلك المجموعة." + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave - unsubscribe from user\n" "d - direct message to user\n" "get - get last notice from user\n" @@ -4191,11 +4233,11 @@ msgstr "رُد" #: lib/nudgeform.php:116 msgid "Nudge this user" -msgstr "" +msgstr "نبّه هذا المستخدم" #: lib/nudgeform.php:128 msgid "Nudge" -msgstr "" +msgstr "نبّه" #: lib/nudgeform.php:128 msgid "Send a nudge to this user" diff --git a/locale/bg/LC_MESSAGES/statusnet.mo b/locale/bg/LC_MESSAGES/statusnet.mo index aa6a392f6..48af8295b 100644 Binary files a/locale/bg/LC_MESSAGES/statusnet.mo and b/locale/bg/LC_MESSAGES/statusnet.mo differ diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index c45c3ad5f..c4930c6ff 100644 --- a/locale/bg/LC_MESSAGES/statusnet.po +++ b/locale/bg/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-14 21:06+0000\n" -"PO-Revision-Date: 2009-11-14 21:07:02+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:42:49+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59079); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: bg\n" "X-Message-Group: out-statusnet\n" @@ -3787,13 +3787,46 @@ msgstr "Грешка при създаване на OpenID форма: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Не сте абонирани за този профил" + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Не сте абонирани за този профил" + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Грешка при абониране на друг потребител за вас." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Абонирани за %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Не членувате в тази група." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Не членувате в тази група." + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave - unsubscribe from user\n" "d - direct message to user\n" "get - get last notice from user\n" diff --git a/locale/ca/LC_MESSAGES/statusnet.mo b/locale/ca/LC_MESSAGES/statusnet.mo index bd7d5d740..cd6cf878e 100644 Binary files a/locale/ca/LC_MESSAGES/statusnet.mo and b/locale/ca/LC_MESSAGES/statusnet.mo differ diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index 0ca99ec14..417607800 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-14 21:06+0000\n" -"PO-Revision-Date: 2009-11-14 21:07:04+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:42:52+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59079); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: out-statusnet\n" @@ -3819,13 +3819,46 @@ msgstr "No s'ha pogut crear el formulari OpenID: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "No estàs subscrit a aquest perfil." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "No estàs subscrit a aquest perfil." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "No pots subscriure a un altre a tu mateix." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Persones subscrites a %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "No ets membre d'aquest grup." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "No ets membre d'aquest grup." + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave - unsubscribe from user\n" "d - direct message to user\n" "get - get last notice from user\n" diff --git a/locale/cs/LC_MESSAGES/statusnet.mo b/locale/cs/LC_MESSAGES/statusnet.mo index 2252bb474..449e93cdc 100644 Binary files a/locale/cs/LC_MESSAGES/statusnet.mo and b/locale/cs/LC_MESSAGES/statusnet.mo differ diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index 2d6d715b9..6bba1da17 100644 --- a/locale/cs/LC_MESSAGES/statusnet.po +++ b/locale/cs/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-14 21:06+0000\n" -"PO-Revision-Date: 2009-11-14 21:07:07+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:42:56+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59079); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: cs\n" "X-Message-Group: out-statusnet\n" @@ -3733,13 +3733,46 @@ msgstr "Nelze vytvořit OpenID z: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Neodeslal jste nám profil" + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Neodeslal jste nám profil" + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Vzdálený odběr" + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Vzdálený odběr" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Neodeslal jste nám profil" + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Neodeslal jste nám profil" + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave - unsubscribe from user\n" "d - direct message to user\n" "get - get last notice from user\n" diff --git a/locale/de/LC_MESSAGES/statusnet.mo b/locale/de/LC_MESSAGES/statusnet.mo index 0d08a7aa5..358fc5be4 100644 Binary files a/locale/de/LC_MESSAGES/statusnet.mo and b/locale/de/LC_MESSAGES/statusnet.mo differ diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index 8c77a9ff7..4480f68c1 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -6,12 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-14 21:06+0000\n" -"PO-Revision-Date: 2009-11-14 21:07:09+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:12+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59079); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: out-statusnet\n" @@ -3831,13 +3831,46 @@ msgstr "Konnte OpenID-Formular nicht erstellen: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Du hast dieses Profil nicht abonniert." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Du hast dieses Profil nicht abonniert." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Die Gegenseite konnte Dich nicht abonnieren." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Leute, die %s abonniert haben" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Du bist kein Mitglied dieser Gruppe." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Du bist kein Mitglied dieser Gruppe." + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave - unsubscribe from user\n" "d - direct message to user\n" "get - get last notice from user\n" diff --git a/locale/el/LC_MESSAGES/statusnet.mo b/locale/el/LC_MESSAGES/statusnet.mo index 88125f386..464aca5ea 100644 Binary files a/locale/el/LC_MESSAGES/statusnet.mo and b/locale/el/LC_MESSAGES/statusnet.mo differ diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index bddf56a37..f8fa1eb63 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-14 21:06+0000\n" -"PO-Revision-Date: 2009-11-14 21:07:11+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:15+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59079); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: el\n" "X-Message-Group: out-statusnet\n" @@ -3681,13 +3681,44 @@ msgstr "Αδυναμία δημιουργίας φόρμας OpenID: %s " msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." + +#: lib/command.php:639 +msgid "These people are subscribed to you: " +msgstr "" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Ομάδες με τα περισσότερα μέλη" + +#: lib/command.php:658 +msgid "You are a member of these groups: " +msgstr "" + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave - unsubscribe from user\n" "d - direct message to user\n" "get - get last notice from user\n" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.mo b/locale/en_GB/LC_MESSAGES/statusnet.mo index 6b6103f7c..33531f33c 100644 Binary files a/locale/en_GB/LC_MESSAGES/statusnet.mo and b/locale/en_GB/LC_MESSAGES/statusnet.mo differ diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index a7d10a6c6..c65fc1c73 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/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-14 21:06+0000\n" -"PO-Revision-Date: 2009-11-14 21:07:14+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:18+0000\n" "Language-Team: British English\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59079); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" "X-Message-Group: out-statusnet\n" @@ -3770,13 +3770,46 @@ msgstr "Could not create OpenID from: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "You are not subscribed to that profile." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "You are not subscribed to that profile." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Could not subscribe other to you." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "People subscribed to %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "You are not a member of that group." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "You are not a member of that group." + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave - unsubscribe from user\n" "d - direct message to user\n" "get - get last notice from user\n" diff --git a/locale/es/LC_MESSAGES/statusnet.mo b/locale/es/LC_MESSAGES/statusnet.mo index 97fdce7f4..7bc7cf1b6 100644 Binary files a/locale/es/LC_MESSAGES/statusnet.mo and b/locale/es/LC_MESSAGES/statusnet.mo differ diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index a98c8529a..aa34e255c 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -2,6 +2,7 @@ # # Author@translatewiki.net: Brion # Author@translatewiki.net: Crazymadlover +# Author@translatewiki.net: Translationista # -- # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -12,12 +13,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-14 21:06+0000\n" -"PO-Revision-Date: 2009-11-14 21:07:16+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:21+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59079); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: es\n" "X-Message-Group: out-statusnet\n" @@ -156,6 +157,8 @@ msgid "" "The server was unable to handle that much POST data (%s bytes) due to its " "current configuration." msgstr "" +"El servidor no ha podido manejar tanta información del tipo POST (% de " +"bytes) a causa de su configuración actual." #: actions/apiaccountupdateprofilebackgroundimage.php:136 #: actions/apiaccountupdateprofilebackgroundimage.php:146 @@ -3845,13 +3848,46 @@ msgstr "No se pudo crear el formulario OpenID: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "No estás suscrito a ese perfil." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "No estás suscrito a ese perfil." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "No se pudo suscribir otro a ti." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Personas suscritas a %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "No eres miembro de ese grupo" + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "No eres miembro de este grupo." + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave - unsubscribe from user\n" "d - direct message to user\n" "get - get last notice from user\n" diff --git a/locale/fi/LC_MESSAGES/statusnet.mo b/locale/fi/LC_MESSAGES/statusnet.mo index 876a379b9..14026dc1e 100644 Binary files a/locale/fi/LC_MESSAGES/statusnet.mo and b/locale/fi/LC_MESSAGES/statusnet.mo differ diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index 79f874365..c75267286 100644 --- a/locale/fi/LC_MESSAGES/statusnet.po +++ b/locale/fi/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-14 21:06+0000\n" -"PO-Revision-Date: 2009-11-14 21:07:19+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:24+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59079); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fi\n" "X-Message-Group: out-statusnet\n" @@ -83,6 +83,8 @@ msgstr "Käyttäjän %s kavereiden syöte (Atom)" msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "" +"Tämä on käyttäjän %s ja kavereiden aikajana, mutta kukaan ei ole lähettyänyt " +"vielä mitään." #: actions/all.php:132 #, php-format @@ -90,6 +92,8 @@ msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " "something yourself." msgstr "" +"Kokeile useamman käyttäjän tilaamista, [liity ryhmään] (%%action.groups%%) " +"tai lähetä päivitys itse." #: actions/all.php:134 #, php-format @@ -641,9 +645,8 @@ msgid "%s blocked profiles, page %d" msgstr "%s ja kaverit, sivu %d" #: actions/blockedfromgroup.php:108 -#, fuzzy msgid "A list of the users blocked from joining this group." -msgstr "Lista ryhmän käyttäjistä." +msgstr "Lista käyttäjistä jotka ovat estetty liittymästä tähän ryhmään." #: actions/blockedfromgroup.php:281 msgid "Unblock user from group" @@ -695,9 +698,8 @@ msgid "No" msgstr "Ei" #: actions/block.php:149 -#, fuzzy msgid "Do not block this user" -msgstr "Poista esto tältä käyttäjältä" +msgstr "Älä estä tätä käyttäjää" #: actions/block.php:150 actions/deletenotice.php:146 #: actions/groupblock.php:179 @@ -1082,9 +1084,9 @@ msgid "%s's favorite notices" msgstr "Käyttäjän %s suosikkipäivitykset" #: actions/favoritesrss.php:115 -#, fuzzy, php-format +#, php-format msgid "Updates favored by %1$s on %2$s!" -msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!" +msgstr "Käyttäjän %1$s suosikit palvelussa %2$s!" #: actions/favor.php:79 msgid "This notice is already a favorite!" @@ -1181,7 +1183,7 @@ msgstr "Ryhmää ei ole määritelty." #: actions/groupblock.php:91 msgid "Only an admin can block group members." -msgstr "" +msgstr "Vain ylläpitäjä voi estää ryhmän jäseniä." #: actions/groupblock.php:95 #, fuzzy @@ -1189,14 +1191,12 @@ msgid "User is already blocked from group." msgstr "Käyttäjä on asettanut eston sinulle." #: actions/groupblock.php:100 -#, fuzzy msgid "User is not a member of group." -msgstr "Sinä et kuulu tähän ryhmään." +msgstr "Käyttäjä ei kuulu tähän ryhmään." #: actions/groupblock.php:136 actions/groupmembers.php:314 -#, fuzzy msgid "Block user from group" -msgstr "Estä käyttäjä" +msgstr "Estä käyttäjä ryhmästä" #: actions/groupblock.php:162 #, php-format @@ -1228,9 +1228,8 @@ msgstr "" "Sinun pitää olla kirjautunut sisään, jotta voit muuttaa ryhmän tietoja." #: actions/groupdesignsettings.php:141 -#, fuzzy msgid "Group design" -msgstr "Ryhmät" +msgstr "Ryhmän ulkoasu" #: actions/groupdesignsettings.php:152 msgid "" @@ -1240,21 +1239,18 @@ msgstr "" #: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 #: lib/designsettings.php:434 lib/designsettings.php:464 -#, fuzzy msgid "Couldn't update your design." -msgstr "Ei voitu päivittää käyttäjää." +msgstr "Ei voitu päivittää sinun sivusi ulkoasua." #: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -#, fuzzy msgid "Unable to save your design settings!" -msgstr "Twitter-asetuksia ei voitu tallentaa!" +msgstr "Ei voitu tallentaa sinun ulkoasuasetuksia!" #: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 -#, fuzzy msgid "Design preferences saved." -msgstr "Synkronointiasetukset tallennettiin." +msgstr "Ulkoasuasetukset tallennettu." #: actions/grouplogo.php:139 actions/grouplogo.php:192 msgid "Group logo" @@ -1305,18 +1301,17 @@ msgid "Make user an admin of the group" msgstr "Tee tästä käyttäjästä ylläpitäjä" #: actions/groupmembers.php:473 -#, fuzzy msgid "Make Admin" -msgstr "Ylläpito" +msgstr "Tee ylläpitäjäksi" #: actions/groupmembers.php:473 msgid "Make this user an admin" msgstr "Tee tästä käyttäjästä ylläpitäjä" #: actions/grouprss.php:133 -#, fuzzy, php-format +#, php-format msgid "Updates from members of %1$s on %2$s!" -msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!" +msgstr "Ryhmän %1$s käyttäjien päivitykset palvelussa %2$s!" #: actions/groupsearch.php:52 #, fuzzy, php-format @@ -1380,9 +1375,8 @@ msgid "Only an admin can unblock group members." msgstr "Vain ylläpitäjä voi poistaa eston ryhmän jäseniltä." #: actions/groupunblock.php:95 -#, fuzzy msgid "User is not blocked from group." -msgstr "Käyttäjä on asettanut eston sinulle." +msgstr "Käyttäjää ei ole estetty ryhmästä." #: actions/groupunblock.php:128 actions/unblock.php:108 msgid "Error removing the block." @@ -1402,9 +1396,8 @@ msgstr "" "im%%) käyttäen. Alla voit määrittää osoitteesi ja asetuksesi. " #: actions/imsettings.php:89 -#, fuzzy msgid "IM is not available." -msgstr "Tämä sivu ei ole saatavilla " +msgstr "Pikaviestin ei ole käytettävissä." #: actions/imsettings.php:106 msgid "Current confirmed Jabber/GTalk address." @@ -1501,7 +1494,7 @@ msgstr "Tämä on postilaatikkosi, jossa on sinulle saapuneet yksityisviestit." #: actions/invite.php:39 msgid "Invites have been disabled." -msgstr "" +msgstr "Kutsut ovat pois käytöstä." #: actions/invite.php:41 #, php-format @@ -1751,22 +1744,22 @@ msgstr "" #: actions/makeadmin.php:91 msgid "Only an admin can make another user an admin." -msgstr "" +msgstr "Vain ylläpitäjä voi tehdä toisesta käyttäjästä ylläpitäjän." #: actions/makeadmin.php:95 #, php-format msgid "%s is already an admin for group \"%s\"." -msgstr "" +msgstr "%s on jo ryhmän \"%s\" ylläpitäjä." #: actions/makeadmin.php:132 #, php-format msgid "Can't get membership record for %s in group %s" -msgstr "" +msgstr "Ei saatu käyttäjän %s jäsenyystietoja ryhmästä %s" #: actions/makeadmin.php:145 #, php-format msgid "Can't make %s an admin for group %s" -msgstr "" +msgstr "Ei voitu tehdä käyttäjästä %s ylläpitäjää ryhmään %s" #: actions/microsummary.php:69 msgid "No current status" @@ -1847,6 +1840,8 @@ msgid "" "Be the first to [post on this topic](%%%%action.newnotice%%%%?" "status_textarea=%s)!" msgstr "" +"Ole ensimmäinen joka [lähettää päivityksen tästä aiheesta] (%%%%action." +"newnotice%%%%?status_textarea=%s)!" #: actions/noticesearch.php:124 #, php-format @@ -1938,7 +1933,7 @@ msgstr "Profiiliasetukset" #: actions/othersettings.php:123 msgid "Show or hide profile designs." -msgstr "" +msgstr "Näytä tai piillota profiilin ulkoasu." #: actions/othersettings.php:153 msgid "URL shortening service is too long (max 50 chars)." @@ -2221,7 +2216,7 @@ msgstr "" #: actions/public.php:182 msgid "Be the first to post!" -msgstr "" +msgstr "Ole ensimmäinen joka lähettää päivityksen!" #: actions/public.php:186 #, php-format @@ -2261,10 +2256,12 @@ msgstr "Nämä ovat suosituimmat viimeaikaiset tagit %s -palvelussa" #, php-format msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet." msgstr "" +"Kukaan ei ole vielä lähettänyt päivitystä tagilla [hashtag] (%%doc.tags%%) " +"vielä." #: actions/publictagcloud.php:72 msgid "Be the first to post one!" -msgstr "" +msgstr "Ole ensimmäinen joka lähettää päivityksen!" #: actions/publictagcloud.php:75 #, php-format @@ -2313,11 +2310,11 @@ msgstr "" #: actions/recoverpassword.php:158 msgid "You have been identified. Enter a new password below. " -msgstr "" +msgstr "Sinut on tunnistettu. Syötä uusi salasana alapuolelle. " #: actions/recoverpassword.php:188 msgid "Password recovery" -msgstr "" +msgstr "Salasanan palautus" #: actions/recoverpassword.php:191 msgid "Nickname or email address" @@ -2406,9 +2403,8 @@ msgid "Sorry, only invited people can register." msgstr "Valitettavasti vain kutsutut ihmiset voivat rekisteröityä." #: actions/register.php:92 -#, fuzzy msgid "Sorry, invalid invitation code." -msgstr "Virhe vahvistuskoodin kanssa." +msgstr "Virheellinen kutsukoodin." #: actions/register.php:112 msgid "Registration successful" @@ -2485,12 +2481,11 @@ msgid "Creative Commons Attribution 3.0" msgstr "" #: actions/register.php:496 -#, fuzzy msgid "" " except this private data: password, email address, IM address, and phone " "number." msgstr "" -" poislukien yksityinen tieto: salasana, sähköpostiosoite, IM osoite, " +"poislukien yksityinen tieto: salasana, sähköpostiosoite, IM osoite, " "puhelinnumero." #: actions/register.php:537 @@ -2551,9 +2546,8 @@ msgid "Remote subscribe" msgstr "Etätilaus" #: actions/remotesubscribe.php:124 -#, fuzzy msgid "Subscribe to a remote user" -msgstr "Tilaa tämä käyttäjä" +msgstr "Tilaa tämä etäkäyttäjä" #: actions/remotesubscribe.php:129 msgid "User nickname" @@ -2589,13 +2583,11 @@ msgstr "" "löytynyt)." #: actions/remotesubscribe.php:176 -#, fuzzy msgid "That’s a local profile! Login to subscribe." msgstr "" "Tämä on paikallinen profiili. Kirjaudu sisään, jotta voit tilata päivitykset." #: actions/remotesubscribe.php:183 -#, fuzzy msgid "Couldn’t get a request token." msgstr "Ei saatu request tokenia." @@ -2726,26 +2718,26 @@ msgstr "Huomaa" #: actions/showgroup.php:284 lib/groupeditform.php:184 msgid "Aliases" -msgstr "" +msgstr "Aliakset" #: actions/showgroup.php:293 msgid "Group actions" msgstr "Ryhmän toiminnot" #: actions/showgroup.php:328 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s group (RSS 1.0)" -msgstr "Päivityssyöte ryhmälle %s" +msgstr "Syöte ryhmän %s päivityksille (RSS 1.0)" #: actions/showgroup.php:334 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s group (RSS 2.0)" -msgstr "Päivityssyöte ryhmälle %s" +msgstr "Syöte ryhmän %s päivityksille (RSS 2.0)" #: actions/showgroup.php:340 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s group (Atom)" -msgstr "Päivityssyöte ryhmälle %s" +msgstr "Syöte ryhmän %s päivityksille (Atom)" #: actions/showgroup.php:345 #, php-format @@ -2796,9 +2788,8 @@ msgstr "" "(http://en.wikipedia.org/wiki/Micro-blogging)" #: actions/showgroup.php:482 -#, fuzzy msgid "Admins" -msgstr "Ylläpito" +msgstr "Ylläpitäjät" #: actions/showmessage.php:81 msgid "No such message." @@ -2819,9 +2810,8 @@ msgid "Message from %1$s on %2$s" msgstr "Viesti käyttäjältä %1$s, %2$s" #: actions/shownotice.php:90 -#, fuzzy msgid "Notice deleted." -msgstr "Päivitys lähetetty" +msgstr "Päivitys on poistettu." #: actions/showstream.php:73 #, fuzzy, php-format @@ -2862,6 +2852,8 @@ msgstr "Käyttäjän %s lähetetyt viestit" #, php-format msgid "This is the timeline for %s but %s hasn't posted anything yet." msgstr "" +"Tämä on käyttäjän %s aikajana, mutta %s ei ole lähettänyt vielä yhtään " +"päivitystä." #: actions/showstream.php:196 msgid "" @@ -2906,9 +2898,8 @@ msgstr "" "Voit saada SMS viestit sähköpostin välityksellä %%site.name%% -palvelusta." #: actions/smssettings.php:91 -#, fuzzy msgid "SMS is not available." -msgstr "Tämä sivu ei ole saatavilla " +msgstr "SMS ei ole käytettävissä." #: actions/smssettings.php:112 msgid "Current confirmed SMS-enabled phone number." @@ -2959,13 +2950,12 @@ msgid "That phone number already belongs to another user." msgstr "Tämä puhelinnumero kuuluu jo toiselle käyttäjälle." #: actions/smssettings.php:347 -#, fuzzy msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." msgstr "" "Vahvistuskoodi on lähetetty puhelinnumeroosi. Katso tekstiviesteistäsi " -"vahvistuskoodisi ja miten sitä käytetään. " +"vahvistuskoodisi ja ohjeet miten sitä käytetään." #: actions/smssettings.php:374 msgid "That is the wrong confirmation number." @@ -3080,9 +3070,9 @@ msgid "" msgstr "" #: actions/subscriptions.php:123 actions/subscriptions.php:127 -#, fuzzy, php-format +#, php-format msgid "%s is not listening to anyone." -msgstr "%1$s seuraa nyt käyttäjää" +msgstr "%s ei seuraa ketään käyttäjää." #: actions/subscriptions.php:194 msgid "Jabber" @@ -3203,9 +3193,8 @@ msgstr "" "paina \"Peruuta\"." #: actions/userauthorization.php:188 -#, fuzzy msgid "License" -msgstr "lisenssi." +msgstr "Lisenssi" #: actions/userauthorization.php:209 msgid "Accept" @@ -3790,13 +3779,46 @@ msgstr "Ei voitu luoda OpenID lomaketta: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Et ole tilannut tämän käyttäjän päivityksiä." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Et ole tilannut tämän käyttäjän päivityksiä." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Toista ei voitu asettaa tilaamaan sinua." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Ihmiset jotka ovat käyttäjän %s tilaajia" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Sinä et kuulu tähän ryhmään." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Sinä et kuulu tähän ryhmään." + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave - unsubscribe from user\n" "d - direct message to user\n" "get - get last notice from user\n" diff --git a/locale/fr/LC_MESSAGES/statusnet.mo b/locale/fr/LC_MESSAGES/statusnet.mo index 48bed3b51..6328e2ed9 100644 Binary files a/locale/fr/LC_MESSAGES/statusnet.mo and b/locale/fr/LC_MESSAGES/statusnet.mo differ diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 02d468395..62ffbe99f 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -1,6 +1,7 @@ # Translation of StatusNet to French # # Author@translatewiki.net: IAlex +# Author@translatewiki.net: Isoph # Author@translatewiki.net: Jean-Frédéric # Author@translatewiki.net: Peter17 # Author@translatewiki.net: Zetud @@ -9,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-14 21:06+0000\n" -"PO-Revision-Date: 2009-11-14 21:07:21+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:27+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59079); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" "X-Message-Group: out-statusnet\n" @@ -80,6 +81,8 @@ msgstr "Flux pour les amis de %s (Atom)" msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "" +"Ceci est le flux pour %s et ses amis mais personne n’a rien posté pour le " +"moment." #: actions/all.php:132 #, php-format @@ -87,6 +90,8 @@ msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " "something yourself." msgstr "" +"Essayez de vous abonner à plus d’utilisateurs, de vous [inscrire à un groupe]" +"(%%action.groups%%) ou de publier quelque chose vous-même." #: actions/all.php:134 #, php-format @@ -140,7 +145,7 @@ msgstr "" #: actions/apiaccountupdatedeliverydevice.php:132 msgid "Could not update user." -msgstr "Impossible de mettre à jour l'utilisateur." +msgstr "Impossible de mettre à jour l’utilisateur." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 @@ -156,15 +161,13 @@ msgstr "" #: 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é !" +msgstr "Impossible de sauvegarder les parmètres de la conception." #: actions/apiaccountupdateprofilebackgroundimage.php:187 #: actions/apiaccountupdateprofilecolors.php:142 -#, fuzzy msgid "Could not update your design." -msgstr "Impossible de mettre à jour l'utilisateur." +msgstr "Impossible de mettre à jour votre conception." #: actions/apiaccountupdateprofilebackgroundimage.php:194 #: actions/apiaccountupdateprofilecolors.php:185 @@ -177,15 +180,15 @@ msgstr "Aucun profil ne correspond à cet utilisateur." #: actions/apiaccountupdateprofile.php:147 msgid "Could not save profile." -msgstr "Impossible d'enregistrer le profil." +msgstr "Impossible d’enregistrer le profil." #: actions/apiblockcreate.php:108 msgid "Block user failed." -msgstr "Le blocage de l'utilisateur a échoué." +msgstr "Le blocage de l’utilisateur a échoué." #: actions/apiblockdestroy.php:107 msgid "Unblock user failed." -msgstr "Le déblocage de l'utilisateur a échoué." +msgstr "Le déblocage de l’utilisateur a échoué." #: actions/apidirectmessagenew.php:126 msgid "No message text!" @@ -194,7 +197,7 @@ msgstr "Message sans texte !" #: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 #, php-format msgid "That's too long. Max message size is %d chars." -msgstr "C'est trop long ! La taille maximale du message est de %d caractères." +msgstr "C’est trop long ! La taille maximale du message est de %d caractères." #: actions/apidirectmessagenew.php:146 msgid "Recipient user not found." @@ -203,7 +206,7 @@ msgstr "Destinataire non trouvé." #: actions/apidirectmessagenew.php:150 msgid "Can't send direct messages to users who aren't your friend." msgstr "" -"Vous ne pouvez envoyer des messages personnels qu'aux utilisateurs inscrits " +"Vous ne pouvez envoyer des messages personnels qu’aux utilisateurs inscrits " "comme amis." #: actions/apidirectmessage.php:89 @@ -258,7 +261,7 @@ msgstr "Impossible de créer le favori." #: actions/apifavoritedestroy.php:122 msgid "That status is not a favorite!" -msgstr "Ce statut n'est pas un favori !" +msgstr "Ce statut n’est pas un favori !" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 msgid "Could not delete favorite." @@ -266,16 +269,16 @@ msgstr "Impossible de supprimer le favori." #: actions/apifriendshipscreate.php:109 msgid "Could not follow user: User not found." -msgstr "Impossible de suivre l'utilisateur : Utilisateur non trouvé." +msgstr "Impossible de suivre l’utilisateur : Utilisateur non trouvé." #: actions/apifriendshipscreate.php:118 #, php-format msgid "Could not follow user: %s is already on your list." -msgstr "Impossible de suivre l'utilisateur : %s est déjà dans votre liste." +msgstr "Impossible de suivre l’utilisateur : %s est déjà dans votre liste." #: actions/apifriendshipsdestroy.php:109 msgid "Could not unfollow user: User not found." -msgstr "Impossible de ne plus 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!" @@ -287,11 +290,11 @@ msgstr "Vous devez fournir 2 identifiants ou pseudos." #: actions/apifriendshipsshow.php:135 msgid "Could not determine source user." -msgstr "Impossible de déterminer l'utilisateur source." +msgstr "Impossible de déterminer l’utilisateur source." #: actions/apifriendshipsshow.php:143 msgid "Could not find target user." -msgstr "Impossible de trouver l'utilisateur cible." +msgstr "Impossible de trouver l’utilisateur cible." #: actions/apigroupcreate.php:136 actions/newgroup.php:204 msgid "Could not create group." @@ -304,7 +307,7 @@ msgstr "Impossible de créer les alias." #: actions/apigroupcreate.php:166 actions/newgroup.php:224 msgid "Could not set group membership." -msgstr "Impossible d'établir l'inscription au groupe." +msgstr "Impossible d'établir l’inscription au groupe." #: actions/apigroupcreate.php:212 actions/editgroup.php:182 #: actions/newgroup.php:126 actions/profilesettings.php:208 @@ -330,7 +333,7 @@ msgstr "Pseudo invalide." #: actions/newgroup.php:139 actions/profilesettings.php:215 #: actions/register.php:217 msgid "Homepage is not a valid URL." -msgstr "L'adresse du site personnel n'est pas un URL valide. " +msgstr "L’adresse du site personnel n’est pas un URL valide. " #: actions/apigroupcreate.php:253 actions/editgroup.php:198 #: actions/newgroup.php:142 actions/profilesettings.php:218 @@ -353,7 +356,7 @@ msgstr "Emplacement trop long (maximum de 255 caractères)." #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." -msgstr "Trop d'alias ! Maximum %d." +msgstr "Trop d’alias ! Maximum %d." #: actions/apigroupcreate.php:312 actions/editgroup.php:224 #: actions/newgroup.php:168 @@ -370,7 +373,7 @@ msgstr "Alias « %s » déjà utilisé. Essayez-en un autre." #: actions/apigroupcreate.php:334 actions/editgroup.php:234 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." -msgstr "" +msgstr "L’alias ne peut pas être le même que le pseudo." #: actions/apigroupjoin.php:110 msgid "You are already a member of that group." @@ -378,12 +381,12 @@ 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 "Vous avez été bloqué de ce groupe par l'administrateur." +msgstr "Vous avez été bloqué de ce groupe par l’administrateur." #: actions/apigroupjoin.php:138 #, php-format msgid "Could not join user %s to group %s." -msgstr "Impossible de joindre l'utilisateur %s au groupe %s." +msgstr "Impossible de joindre l’utilisateur %s au groupe %s." #: actions/apigroupleave.php:114 msgid "You are not a member of this group." @@ -392,7 +395,7 @@ msgstr "Vous n'êtes pas membre de ce groupe." #: actions/apigroupleave.php:124 #, php-format msgid "Could not remove user %s to group %s." -msgstr "Impossible de retirer l'utilisateur %s du groupe %s" +msgstr "Impossible de retirer l’utilisateur %s du groupe %s" #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format @@ -420,7 +423,7 @@ msgstr "Ce processus requiert un POST ou un DELETE." #: actions/apistatusesdestroy.php:130 msgid "You may not delete another user's status." -msgstr "Vous ne pouvez pas supprimer le statut d'un autre utilisateur." +msgstr "Vous ne pouvez pas supprimer le statut d’un autre utilisateur." #: actions/apistatusesshow.php:138 msgid "Status deleted." @@ -434,7 +437,7 @@ msgstr "Aucun statut trouvé avec cet identifiant." #: scripts/maildaemon.php:71 #, php-format msgid "That's too long. Max notice size is %d chars." -msgstr "C'est trop long ! La taille maximale de l'avis est de %d caractères." +msgstr "C’est trop long ! La taille maximale de l’avis est de %d caractères." #: actions/apistatusesupdate.php:198 msgid "Not found" @@ -444,6 +447,8 @@ msgstr "Non trouvé" #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" +"La taille maximale du statut est de %d caractères, en incluant l’URL de la " +"pièce jointe." #: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261 msgid "Unsupported format." @@ -542,7 +547,7 @@ msgstr "Utilisateur sans profil correspondant" #: actions/avatarsettings.php:119 actions/avatarsettings.php:194 #: actions/grouplogo.php:251 msgid "Avatar settings" -msgstr "Paramètres de l'avatar" +msgstr "Paramètres de l’avatar" #: actions/avatarsettings.php:126 actions/avatarsettings.php:202 #: actions/grouplogo.php:199 actions/grouplogo.php:259 @@ -604,7 +609,7 @@ msgstr "Avatar mis à jour." #: actions/avatarsettings.php:363 msgid "Failed updating avatar." -msgstr "La mise à jour de l'avatar a échoué." +msgstr "La mise à jour de l’avatar a échoué." #: actions/avatarsettings.php:387 msgid "Avatar deleted." @@ -636,11 +641,11 @@ msgstr "%s profils bloqués, page %d" #: actions/blockedfromgroup.php:108 msgid "A list of the users blocked from joining this group." -msgstr "Une liste des utilisateurs dont l'inscription à ce groupe est bloquée." +msgstr "Une liste des utilisateurs dont l’inscription à ce groupe est bloquée." #: actions/blockedfromgroup.php:281 msgid "Unblock user from group" -msgstr "Débloquer l'utilisateur du groupe" +msgstr "Débloquer l’utilisateur du groupe" #: actions/blockedfromgroup.php:313 lib/unblockform.php:150 msgid "Unblock" @@ -663,7 +668,7 @@ msgstr "Non connecté." #: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70 msgid "No profile specified." -msgstr "Aucun profil n'a été spécifié." +msgstr "Aucun profil n’a été spécifié." #: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 @@ -710,7 +715,7 @@ msgstr "Vous avez déjà bloqué cet utilisateur." #: actions/block.php:170 msgid "Failed to save block information." -msgstr "Impossible d'enregistrer les informations de blocage." +msgstr "Impossible d’enregistrer les informations de blocage." #: actions/bookmarklet.php:50 msgid "Post to " @@ -726,12 +731,12 @@ msgstr "Code de confirmation non trouvé." #: actions/confirmaddress.php:85 msgid "That confirmation code is not for you!" -msgstr "Ce code de confirmation n'est pas pour vous !" +msgstr "Ce code de confirmation n’est pas pour vous !" #: actions/confirmaddress.php:90 #, php-format msgid "Unrecognized address type %s" -msgstr "Type d'adresse non reconnu : %s" +msgstr "Type d’adresse non reconnu : %s" #: actions/confirmaddress.php:94 msgid "That address has already been confirmed." @@ -743,7 +748,7 @@ msgstr "Cette adresse a déjà été confirmée." #: actions/profilesettings.php:276 actions/smssettings.php:278 #: actions/smssettings.php:420 msgid "Couldn't update user." -msgstr "Impossible de mettre à jour l'utilisateur." +msgstr "Impossible de mettre à jour l’utilisateur." #: actions/confirmaddress.php:126 actions/emailsettings.php:390 #: actions/imsettings.php:363 actions/smssettings.php:382 @@ -752,7 +757,7 @@ msgstr "Impossible de supprimer le courriel de confirmation." #: actions/confirmaddress.php:144 msgid "Confirm Address" -msgstr "Confirmer l'adresse" +msgstr "Confirmer l’adresse" #: actions/confirmaddress.php:159 #, php-format @@ -782,7 +787,7 @@ msgid "" "be undone." msgstr "" "Vous êtes sur le point de supprimer définitivement un message. Une fois cela " -"fait, il est impossible de l'annuler." +"fait, il est impossible de l’annuler." #: actions/deletenotice.php:109 actions/deletenotice.php:141 msgid "Delete notice" @@ -808,7 +813,7 @@ msgstr "" #: actions/disfavor.php:81 msgid "This notice is not a favorite!" -msgstr "Ce statut n'est pas un favori !" +msgstr "Ce statut n’est pas un favori !" #: actions/disfavor.php:94 msgid "Add to favorites" @@ -830,7 +835,7 @@ msgstr "Vous devez ouvrir une session pour créer un groupe." #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 msgid "You must be an admin to edit the group" -msgstr "Seuls les administrateurs d'un groupe peuvent le modifier." +msgstr "Seuls les administrateurs d’un groupe peuvent le modifier." #: actions/editgroup.php:154 msgid "Use this form to edit the group." @@ -878,7 +883,7 @@ msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." msgstr "" -"En attente d'une confirmation pour cette adresse. Vérifiez votre compte " +"En attente d’une confirmation pour cette adresse. Vérifiez votre compte " "Jabber/GTalk pour recevoir de nouvelles instructions." #: actions/emailsettings.php:117 actions/imsettings.php:120 @@ -909,7 +914,7 @@ msgstr "Écrivez à cette adresse courriel pour publier de nouveaux statuts. " #: actions/emailsettings.php:145 actions/smssettings.php:162 msgid "Make a new email address for posting to; cancels the old one." -msgstr "Nouvelle adresse courriel pour poster ; annule l'ancienne." +msgstr "Nouvelle adresse courriel pour poster ; annule l’ancienne." #: actions/emailsettings.php:148 actions/smssettings.php:164 msgid "New" @@ -932,15 +937,15 @@ msgstr "" #: actions/emailsettings.php:169 msgid "Send me email when someone sends me a private message." -msgstr "Envoyez-moi un courriel quand quelqu'un m'envoie un message personnel." +msgstr "Envoyez-moi un courriel quand quelqu’un m’envoie un message personnel." #: actions/emailsettings.php:174 msgid "Send me email when someone sends me an \"@-reply\"." -msgstr "Envoyez-moi un courriel quand quelqu'un m'envoie une réponse « @ »." +msgstr "Envoyez-moi un courriel quand quelqu’un m’envoie une réponse « @ »." #: actions/emailsettings.php:179 msgid "Allow friends to nudge me and send me an email." -msgstr "Autoriser mes amis à m'envoyer des courriels et des clins d'oeil." +msgstr "Autoriser mes amis à m’envoyer des courriels et des clins d’œil." #: actions/emailsettings.php:185 msgid "I want to post notices by email." @@ -969,7 +974,7 @@ msgstr "Aucune adresse courriel." #: actions/emailsettings.php:326 msgid "Cannot normalize that email address" -msgstr "Impossible d'utiliser cette adresse courriel" +msgstr "Impossible d’utiliser cette adresse courriel" #: actions/emailsettings.php:330 msgid "Not a valid email address" @@ -986,14 +991,14 @@ msgstr "Cette adresse courriel appartient déjà à un autre utilisateur." #: actions/emailsettings.php:352 actions/imsettings.php:317 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." -msgstr "Impossible d'insérer le code de confirmation." +msgstr "Impossible d’insérer le code de confirmation." #: actions/emailsettings.php:358 msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." msgstr "" -"Un code de confirmation a été envoyé à l'adresse courriel indiquée. Vérifiez " +"Un code de confirmation a été envoyé à l’adresse courriel indiquée. Vérifiez " "votre boîte de réception pour récupérer le code et les instructions." #: actions/emailsettings.php:378 actions/imsettings.php:351 @@ -1012,12 +1017,12 @@ msgstr "Confirmation annulée." #: actions/emailsettings.php:412 msgid "That is not your email address." -msgstr "Ceci n'est pas votre adresse courriel." +msgstr "Ceci n’est pas votre adresse courriel." #: actions/emailsettings.php:431 actions/imsettings.php:408 #: actions/smssettings.php:425 msgid "The address was removed." -msgstr "L'adresse a été supprimée." +msgstr "L’adresse a été supprimée." #: actions/emailsettings.php:445 actions/smssettings.php:518 msgid "No incoming email address." @@ -1026,11 +1031,11 @@ msgstr "Aucune adresse pour le courriel entrant." #: actions/emailsettings.php:455 actions/emailsettings.php:477 #: actions/smssettings.php:528 actions/smssettings.php:552 msgid "Couldn't update user record." -msgstr "Impossible de mettre à jour le dossier de l'utilisateur." +msgstr "Impossible de mettre à jour le dossier de l’utilisateur." #: actions/emailsettings.php:458 actions/smssettings.php:531 msgid "Incoming email address removed." -msgstr "L'adresse de courriel entrant a été supprimée." +msgstr "L’adresse de courriel entrant a été supprimée." #: actions/emailsettings.php:480 actions/smssettings.php:555 msgid "New incoming email address added." @@ -1053,7 +1058,7 @@ msgstr "Statuts les plus populaires sur le site en ce moment." #: actions/favorited.php:150 msgid "Favorite notices appear on this page but no one has favorited one yet." msgstr "" -"Les statuts favoris apparaissent sur cette page mais personne ne n'en a mis " +"Les statuts favoris apparaissent sur cette page mais personne ne n’en a mis " "un en favori actuellement." #: actions/favorited.php:153 @@ -1062,7 +1067,7 @@ msgid "" "next to any notice you like." msgstr "" "Soyez le premier à un statut dans vos favoris en cliquant sur le bouton " -"favori à côté d'un statut que vous aimez." +"favori à côté d’un statut que vous aimez." #: actions/favorited.php:156 #, php-format @@ -1070,6 +1075,8 @@ msgid "" "Why not [register an account](%%action.register%%) and be the first to add a " "notice to your favorites!" msgstr "" +"Pourquoi ne pas [créer un nouveau compte](%%action.register%%) et être le " +"premier à ajouter un avis à vos favoris !" #: actions/favoritesrss.php:111 actions/showfavorites.php:77 #: lib/personalgroupnav.php:115 @@ -1107,7 +1114,7 @@ msgstr "Les utilisateurs à ne pas manquer dans %s" #: actions/file.php:34 msgid "No notice id" -msgstr "Pas d'identifiant de statut" +msgstr "Pas d’identifiant de statut" #: actions/file.php:38 msgid "No notice" @@ -1119,7 +1126,7 @@ msgstr "Aucune pièce jointe" #: actions/file.php:51 msgid "No uploaded attachments" -msgstr "" +msgstr "Aucune pièce jointe importée" #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1127,11 +1134,11 @@ msgstr "Réponse inattendue !" #: actions/finishremotesubscribe.php:80 msgid "User being listened to does not exist." -msgstr "L'utilisateur suivi n'existe pas." +msgstr "L’utilisateur suivi n’existe pas." #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59 msgid "You can use the local subscription!" -msgstr "Vous pouvez utiliser l'abonnement local." +msgstr "Vous pouvez utiliser l’abonnement local." #: actions/finishremotesubscribe.php:96 msgid "That user has blocked you from subscribing." @@ -1143,7 +1150,7 @@ msgstr "Vous n'êtes pas autorisé." #: actions/finishremotesubscribe.php:109 msgid "Could not convert request token to access token." -msgstr "Impossible de convertir le jeton de requête en jeton d'accès." +msgstr "Impossible de convertir le jeton de requête en jeton d’accès." #: actions/finishremotesubscribe.php:114 msgid "Remote service uses unknown version of OMB protocol." @@ -1170,7 +1177,7 @@ msgstr "Impossible de lire le fichier" #: actions/groupblock.php:81 actions/groupunblock.php:81 #: actions/makeadmin.php:81 msgid "No group specified." -msgstr "Aucun groupe n'a été spécifié." +msgstr "Aucun groupe n’a été spécifié." #: actions/groupblock.php:91 msgid "Only an admin can block group members." @@ -1182,7 +1189,7 @@ msgstr "Cet utilisateur est déjà bloqué pour le groupe." #: actions/groupblock.php:100 msgid "User is not a member of group." -msgstr "L'utilisateur n'est pas membre du groupe." +msgstr "L’utilisateur n’est pas membre du groupe." #: actions/groupblock.php:136 actions/groupmembers.php:314 msgid "Block user from group" @@ -1195,6 +1202,9 @@ msgid "" "be removed from the group, unable to post, and unable to subscribe to the " "group in the future." msgstr "" +"Êtes-vous sûr(e) de vouloir bloquer l’utilisateur \"%s\" du groupe \"%s\"? " +"Ils seront supprimés du groupe, il leur sera interdit d’y publier, et de s’y " +"abonner à l’avenir." #: actions/groupblock.php:178 msgid "Do not block this user from this group" @@ -1207,7 +1217,7 @@ msgstr "Bloquer cet utilisateur de de groupe" #: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" -"Erreur de la base de données lors du blocage de l'utilisateur du groupe." +"Erreur de la base de données lors du blocage de l’utilisateur du groupe." #: actions/groupbyid.php:74 msgid "No ID" @@ -1229,16 +1239,15 @@ msgstr "" #: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 #: lib/designsettings.php:434 lib/designsettings.php:464 -#, fuzzy msgid "Couldn't update your design." -msgstr "Impossible de mettre à jour l'utilisateur." +msgstr "Impossible de mettre à jour votre conception." #: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 #, fuzzy msgid "Unable to save your design settings!" -msgstr "L'enregistrement de votre configuration Twitter a échoué !" +msgstr "L’enregistrement de votre configuration Twitter a échoué !" #: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 #, fuzzy @@ -1259,7 +1268,7 @@ msgstr "" #: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." -msgstr "Sélectionnez une zone de forme carrée sur l'image qui sera le logo." +msgstr "Sélectionnez une zone de forme carrée sur l’image qui sera le logo." #: actions/grouplogo.php:396 msgid "Logo updated." @@ -1371,11 +1380,11 @@ msgstr "Seul un administrateur peut débloquer les membres du groupes." #: actions/groupunblock.php:95 msgid "User is not blocked from group." -msgstr "Cet utilisateur n'est pas bloqué du groupe." +msgstr "Cet utilisateur n’est pas bloqué du groupe." #: actions/groupunblock.php:128 actions/unblock.php:108 msgid "Error removing the block." -msgstr "Erreur lors de l'annulation du blocage." +msgstr "Erreur lors de l’annulation du blocage." #: actions/imsettings.php:59 msgid "IM Settings" @@ -1393,7 +1402,7 @@ msgstr "" #: actions/imsettings.php:89 msgid "IM is not available." -msgstr "La messagerie instantanée n'est pas disponible." +msgstr "La messagerie instantanée n’est pas disponible." #: actions/imsettings.php:106 msgid "Current confirmed Jabber/GTalk address." @@ -1405,7 +1414,7 @@ msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " "message with further instructions. (Did you add %s to your buddy list?)" msgstr "" -"En attente d'une confirmation pour cette adresse. Vérifiez votre compte " +"En attente d’une confirmation pour cette adresse. Vérifiez votre compte " "Jabber/GTalk pour recevoir de nouvelles instructions. (Avez-vous ajouté %s à " "votre liste de contacts ?)" @@ -1419,8 +1428,8 @@ msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." msgstr "" -"Adresse Jabber ou GTalk (ex : nom@mondomaine.com). Assurez-vous d'ajouter %s " -"à votre liste d'amis dans votre logiciel de messagerie instantanée ou dans " +"Adresse Jabber ou GTalk (ex : nom@mondomaine.com). Assurez-vous d’ajouter %s " +"à votre liste d’amis dans votre logiciel de messagerie instantanée ou dans " "GTalk." #: actions/imsettings.php:143 @@ -1448,7 +1457,7 @@ msgstr "Aucun identifiant Jabber" #: actions/imsettings.php:292 msgid "Cannot normalize that Jabber ID" -msgstr "Impossible d'utiliser cet identifiant Jabber" +msgstr "Impossible d’utiliser cet identifiant Jabber" #: actions/imsettings.php:296 msgid "Not a valid Jabber ID" @@ -1473,7 +1482,7 @@ msgstr "" #: actions/imsettings.php:387 msgid "That is not your Jabber ID." -msgstr "Ceci n'est pas votre identifiant Jabber." +msgstr "Ceci n’est pas votre identifiant Jabber." #: actions/inbox.php:59 #, php-format @@ -1499,7 +1508,7 @@ msgstr "Les invitation ont été désactivées." #, php-format msgid "You must be logged in to invite other users to use %s" msgstr "" -"Vous devez ouvrir une session pour inviter d'autres utilisateurs dans %s" +"Vous devez ouvrir une session pour inviter d’autres utilisateurs dans %s" #: actions/invite.php:72 #, php-format @@ -1554,7 +1563,7 @@ msgstr "Adresses courriel" #: actions/invite.php:189 msgid "Addresses of friends to invite (one per line)" -msgstr "Adresses d'amis à inviter (un par ligne)" +msgstr "Adresses d’amis à inviter (un par ligne)" #: actions/invite.php:192 msgid "Personal message" @@ -1562,7 +1571,7 @@ msgstr "Message personnel" #: actions/invite.php:194 msgid "Optionally add a personal message to the invitation." -msgstr "Ajouter un message personnel à l'invitation (optionnel)." +msgstr "Ajouter un message personnel à l’invitation (optionnel)." #: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208 msgid "Send" @@ -1610,7 +1619,7 @@ msgstr "" "intéressent.\n" "\n" "Vous pouvez aussi partager des informations sur vous, vos idées, ou votre " -"vie en ligne avec les personnes qui vous connaissent. C'est également un " +"vie en ligne avec les personnes qui vous connaissent. C’est également un " "outil utile pour rencontrer de nouvelles personnes qui partagent vos " "intérêts.\n" "\n" @@ -1623,7 +1632,7 @@ msgstr "" "%5$s\n" "\n" "Si vous souhaitez essayez ce service, cliquez sur le lien ci-dessous pour " -"accepter l'invitation\n" +"accepter l’invitation\n" "\n" "%6$s\n" "\n" @@ -1643,7 +1652,7 @@ msgstr "Vous êtes déjà membre de ce groupe" #: actions/joingroup.php:128 lib/command.php:234 #, php-format msgid "Could not join user %s to group %s" -msgstr "Impossible d'inscrire l'utilisateur %s au groupe %s" +msgstr "Impossible d’inscrire l’utilisateur %s au groupe %s" #: actions/joingroup.php:135 lib/command.php:239 #, php-format @@ -1660,12 +1669,12 @@ msgstr "Vous n'êtes pas membre de ce groupe." #: actions/leavegroup.php:119 lib/command.php:278 msgid "Could not find membership record." -msgstr "Aucun enregistrement à ce groupe n'a été trouvé." +msgstr "Aucun enregistrement à ce groupe n’a été trouvé." #: actions/leavegroup.php:127 lib/command.php:284 #, php-format msgid "Could not remove user %s to group %s" -msgstr "Impossible de retirer l'utilisateur %s du groupe %s" +msgstr "Impossible de retirer l’utilisateur %s du groupe %s" #: actions/leavegroup.php:134 lib/command.php:289 #, php-format @@ -1687,7 +1696,7 @@ msgstr "Identifiant ou mot de passe incorrect." #: actions/login.php:149 actions/recoverpassword.php:375 #: actions/register.php:248 msgid "Error setting user." -msgstr "Erreur lors de la configuration de l'utilisateur." +msgstr "Erreur lors de la configuration de l’utilisateur." #: actions/login.php:204 actions/login.php:257 lib/action.php:453 #: lib/logingroupnav.php:79 @@ -1716,7 +1725,7 @@ msgstr "Se souvenir de moi" #: actions/login.php:253 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "" -"Ouvrir automatiquement ma session à l'avenir (déconseillé pour les " +"Ouvrir automatiquement ma session à l’avenir (déconseillé pour les " "ordinateurs publics ou partagés)" #: actions/login.php:263 @@ -1729,7 +1738,7 @@ msgid "" "changing your settings." msgstr "" "Pour des raisons de sécurité, veuillez entrer à nouveau votre identifiant et " -"votre mot de passe afin d'enregistrer vos préférences." +"votre mot de passe afin d’enregistrer vos préférences." #: actions/login.php:286 #, fuzzy, php-format @@ -1744,7 +1753,7 @@ msgstr "" #: actions/makeadmin.php:91 msgid "Only an admin can make another user an admin." msgstr "" -"Seul un administrateur peut faire d'un autre utilisateur un administrateur." +"Seul un administrateur peut faire d’un autre utilisateur un administrateur." #: actions/makeadmin.php:95 #, php-format @@ -1788,13 +1797,13 @@ msgstr "Aucun contenu !" #: actions/newmessage.php:158 msgid "No recipient specified." -msgstr "Aucun destinataire n'a été spécifié." +msgstr "Aucun destinataire n’a été spécifié." #: actions/newmessage.php:164 lib/command.php:370 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" -"N'envoyez pas de message à vous-même ; dites-le plutôt dans votre tête..." +"N’envoyez pas de message à vous-même ; dites-le plutôt dans votre tête..." #: actions/newmessage.php:181 msgid "Message sent" @@ -1863,20 +1872,20 @@ msgstr "Statuts correspondant au(x) terme(s) \"%s\"" msgid "" "This user doesn't allow nudges or hasn't confirmed or set his email yet." msgstr "" -"Cet utilisateur n'accepte pas les clins d'œil ou n'a pas encore validé son " +"Cet utilisateur n’accepte pas les clins d’œil ou n’a pas encore validé son " "adresse courriel." #: actions/nudge.php:94 msgid "Nudge sent" -msgstr "Clin d'œil envoyé" +msgstr "Clin d’œil envoyé" #: actions/nudge.php:97 msgid "Nudge sent!" -msgstr "Clin d'œil envoyé !" +msgstr "Clin d’œil envoyé !" #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" -msgstr "Le statut n'a pas de profil" +msgstr "Le statut n’a pas de profil" #: actions/oembed.php:86 actions/shownotice.php:180 #, php-format @@ -1922,7 +1931,7 @@ 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." +msgstr "Sélectionnez un service de réduction d’URL." #: actions/othersettings.php:122 #, fuzzy @@ -1935,22 +1944,22 @@ msgstr "" #: actions/othersettings.php:153 msgid "URL shortening service is too long (max 50 chars)." -msgstr "Le service de réduction d'URL est trop long (50 caractères maximum)." +msgstr "Le service de réduction d’URL est trop long (50 caractères maximum)." #: actions/outbox.php:58 #, php-format msgid "Outbox for %s - page %d" -msgstr "Boîte d'envoi de %s - page %d" +msgstr "Boîte d’envoi de %s - page %d" #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" -msgstr "Boîte d'envoi de %s" +msgstr "Boîte d’envoi de %s" #: actions/outbox.php:116 msgid "This is your outbox, which lists private messages you have sent." msgstr "" -"Cette boîte d'envoi regroupe les messages personnels que vous avez envoyés." +"Cette boîte d’envoi regroupe les messages personnels que vous avez envoyés." #: actions/passwordsettings.php:58 msgid "Change password" @@ -2003,7 +2012,7 @@ msgstr "Ancien mot de passe incorrect" #: actions/passwordsettings.php:181 msgid "Error saving user; invalid." -msgstr "Erreur lors de l'enregistrement de l'utilisateur ; invalide." +msgstr "Erreur lors de l’enregistrement de l’utilisateur ; invalide." #: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." @@ -2054,7 +2063,7 @@ msgstr "Paramètres du profil" msgid "" "You can update your personal profile info here so people know more about you." msgstr "" -"Vous pouvez mettre à jour les informations de votre profil pour qu'on en " +"Vous pouvez mettre à jour les informations de votre profil pour qu’on en " "sache plus à votre sujet." #: actions/profilesettings.php:99 @@ -2136,7 +2145,7 @@ msgstr "Quel est votre fuseau horaire habituel ?" msgid "" "Automatically subscribe to whoever subscribes to me (best for non-humans)" msgstr "" -"M'abonner automatiquement à tous ceux qui s'abonnent à moi (recommandé pour " +"M’abonner automatiquement à tous ceux qui s’abonnent à moi (recommandé pour " "les utilisateurs non-humains)" #: actions/profilesettings.php:221 actions/register.php:223 @@ -2146,7 +2155,7 @@ msgstr "La bio est trop longue (%d caractères maximum)." #: actions/profilesettings.php:228 msgid "Timezone not selected." -msgstr "Aucun fuseau horaire n'a été choisi." +msgstr "Aucun fuseau horaire n’a été choisi." #: actions/profilesettings.php:234 msgid "Language is too long (max 50 chars)." @@ -2159,15 +2168,15 @@ msgstr "Marquage invalide : « %s »" #: actions/profilesettings.php:295 msgid "Couldn't update user for autosubscribe." -msgstr "Impossible de mettre à jour l'auto-abonnement." +msgstr "Impossible de mettre à jour l’auto-abonnement." #: actions/profilesettings.php:328 msgid "Couldn't save profile." -msgstr "Impossible d'enregistrer le profil." +msgstr "Impossible d’enregistrer le profil." #: actions/profilesettings.php:336 msgid "Couldn't save tags." -msgstr "Impossible d'enregistrer les marquages." +msgstr "Impossible d’enregistrer les marquages." #: actions/profilesettings.php:344 msgid "Settings saved." @@ -2283,11 +2292,11 @@ msgstr "Code de récupération non trouvé." #: actions/recoverpassword.php:66 msgid "Not a recovery code." -msgstr "Ceci n'est pas un code de récupération." +msgstr "Ceci n’est pas un code de récupération." #: actions/recoverpassword.php:73 msgid "Recovery code for unknown user." -msgstr "Code de récupération d'un utilisateur inconnu." +msgstr "Code de récupération d’un utilisateur inconnu." #: actions/recoverpassword.php:86 msgid "Error with confirmation code." @@ -2300,7 +2309,7 @@ msgstr "Ce code de validation est périmé. Veuillez recommencer." #: actions/recoverpassword.php:111 msgid "Could not update user with confirmed email address." msgstr "" -"Impossible de mettre l'utilisateur à jour avec l'adresse courriel confirmée." +"Impossible de mettre l’utilisateur à jour avec l’adresse courriel confirmée." #: actions/recoverpassword.php:152 msgid "" @@ -2323,7 +2332,7 @@ msgstr "Pseudo ou adresse de courriel" #: actions/recoverpassword.php:193 msgid "Your nickname on this server, or your registered email address." msgstr "" -"Votre pseudo sur ce serveur, ou l'adresse courriel que vous avez enregistrée." +"Votre pseudo sur ce serveur, ou l’adresse courriel que vous avez enregistrée." #: actions/recoverpassword.php:199 actions/recoverpassword.php:200 msgid "Recover" @@ -2347,7 +2356,7 @@ msgstr "Action inconnue" #: actions/recoverpassword.php:236 msgid "6 or more characters, and don't forget it!" -msgstr "6 caractères ou plus, et ne l'oubliez pas !" +msgstr "6 caractères ou plus, et ne l’oubliez pas !" #: actions/recoverpassword.php:240 msgid "Same as password above" @@ -2371,7 +2380,7 @@ msgstr "Aucune adresse courriel enregistrée pour cet utilisateur." #: actions/recoverpassword.php:301 msgid "Error saving address confirmation." -msgstr "Erreur lors de l'enregistrement de la confirmation du courriel." +msgstr "Erreur lors de l’enregistrement de la confirmation du courriel." #: actions/recoverpassword.php:325 msgid "" @@ -2379,7 +2388,7 @@ msgid "" "address registered to your account." msgstr "" "Les instructions pour récupérer votre mot de passe ont été envoyées à " -"l'adresse courriel indiquée dans votre compte." +"l’adresse courriel indiquée dans votre compte." #: actions/recoverpassword.php:344 msgid "Unexpected password reset." @@ -2400,11 +2409,11 @@ msgstr "" #: actions/register.php:85 actions/register.php:189 actions/register.php:404 msgid "Sorry, only invited people can register." -msgstr "Désolé ! Seules les personnes invitées peuvent s'inscrire." +msgstr "Désolé ! Seules les personnes invitées peuvent s’inscrire." #: actions/register.php:92 msgid "Sorry, invalid invitation code." -msgstr "Désolé, code d'invitation invalide." +msgstr "Désolé, code d’invitation invalide." #: actions/register.php:112 msgid "Registration successful" @@ -2482,7 +2491,7 @@ msgid "" " except this private data: password, email address, IM address, and phone " "number." msgstr "" -" à l'exception de ces données personnelles : mot de passe, adresse e-mail, " +" à l’exception de ces données personnelles : mot de passe, adresse e-mail, " "adresse de messagerie instantanée, numéro de téléphone." #: actions/register.php:537 @@ -2508,7 +2517,7 @@ msgstr "" "\n" "* Visiter [votre profil](%s) et publier votre premier statut.\n" "* Ajouter une adresse [Jabber/GTalk](%%%%action.imsettings%%%%) afin " -"d'envoyer et recevoir vos statuts par messagerie instantanée.\n" +"d’envoyer et recevoir vos statuts par messagerie instantanée.\n" "* [Chercher des personnes](%%%%action.peoplesearch%%%%) que vous pourriez " "connaître ou qui partagent vos intêrets.\n" "* Mettre votre [profil](%%%%action.profilesettings%%%%) à jour pour en dire " @@ -2516,7 +2525,7 @@ msgstr "" "* Parcourir la [documentation](%%%%doc.help%%%%) en ligne pour en savoir " "plus sur le fonctionnement du service.\n" "\n" -"Merci pour votre inscription ! Nous vous souhaitons d'apprécier notre " +"Merci pour votre inscription ! Nous vous souhaitons d’apprécier notre " "service." #: actions/register.php:561 @@ -2536,7 +2545,7 @@ msgid "" msgstr "" "Pour vous abonner, vous devez [ouvrir une session](%%action.login%%), ou " "[créer un nouveau compte](%%action.register%%). Si vous avez déjà un compte " -"sur un [site de micro-blogging compatible](%%doc.openmublog%%), entrez l'URL " +"sur un [site de micro-blogging compatible](%%doc.openmublog%%), entrez l’URL " "de votre profil ci-dessous." #: actions/remotesubscribe.php:112 @@ -2545,15 +2554,15 @@ msgstr "Abonnement à distance" #: actions/remotesubscribe.php:124 msgid "Subscribe to a remote user" -msgstr "S'abonner à un utilisateur distant" +msgstr "S’abonner à un utilisateur distant" #: actions/remotesubscribe.php:129 msgid "User nickname" -msgstr "Pseudo de l'utilisateur" +msgstr "Pseudo de l’utilisateur" #: actions/remotesubscribe.php:130 msgid "Nickname of the user you want to follow" -msgstr "Pseudo de l'utilisateur que vous voulez suivre" +msgstr "Pseudo de l’utilisateur que vous voulez suivre" #: actions/remotesubscribe.php:133 msgid "Profile URL" @@ -2566,7 +2575,7 @@ msgstr "URL de votre profil sur un autre service de micro-blogging compatible" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 #: lib/userprofile.php:321 msgid "Subscribe" -msgstr "S'abonner" +msgstr "S’abonner" #: actions/remotesubscribe.php:159 msgid "Invalid profile URL (bad format)" @@ -2584,7 +2593,7 @@ msgstr "Ce profil est local ! Connectez-vous pour vous abonner." #: actions/remotesubscribe.php:183 msgid "Couldn’t get a request token." -msgstr "Impossible d'obtenir un 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 @@ -2632,6 +2641,8 @@ msgid "" "You can try to [nudge %s](../%s) or [post something to his or her attention]" "(%%%%action.newnotice%%%%?status_textarea=%s)." msgstr "" +"Vous pouvez essayer de [faire un clin d’œil à %s](../%s) ou de [publier " +"quelque chose à son attention](%%%%action.newnotice%%%%?status_textarea=%s)" #: actions/repliesrss.php:72 #, fuzzy, php-format @@ -2645,7 +2656,7 @@ msgstr "Avis favoris de %s, page %d" #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." -msgstr "Impossible d'afficher les favoris." +msgstr "Impossible d’afficher les favoris." #: actions/showfavorites.php:170 #, php-format @@ -2667,6 +2678,9 @@ msgid "" "You haven't chosen any favorite notices yet. Click the fave button on " "notices you like to bookmark them for later or shed a spotlight on them." msgstr "" +"Vous n’avez pas choisi d’avis favori pour le moment. Cliquez sur le bouton " +"favori sur les avis que vous aimez pour les mémoriser à l’avenir ou les " +"mettre en lumière." #: actions/showfavorites.php:207 #, php-format @@ -2674,6 +2688,8 @@ msgid "" "%s hasn't added any notices to his favorites yet. Post something interesting " "they would add to their favorites :)" msgstr "" +"%s n’a pas ajouté d’avis à ses favoris pour le moment. Publiez quelque chose " +"d’intéressant, et cela pourrait être ajouté à ses favoris :)" #: actions/showfavorites.php:211 #, php-format @@ -2682,10 +2698,13 @@ msgid "" "account](%%%%action.register%%%%) and then post something interesting they " "would add to their favorites :)" msgstr "" +"%s n’a pas ajouté d’avis à ses favoris pour le moment. Vous pourriez [créer " +"un compte](%%%%action.register%%%%), puis publier quelque chose " +"d’intéressant, qui serait ajouté à ses favoris :)" #: actions/showfavorites.php:242 msgid "This is a way to share what you like." -msgstr "" +msgstr "C’est un moyen de partager ce que vous aimez." #: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format @@ -2737,7 +2756,7 @@ msgstr "Fil des avis du groupe %s (Atom)" #: actions/showgroup.php:345 #, php-format msgid "FOAF for %s group" -msgstr "ami d'un ami pour le groupe %s" +msgstr "ami d’un ami pour le groupe %s" #: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" @@ -2779,7 +2798,7 @@ msgid "" "[StatusNet](http://status.net/) tool. Its members share short messages about " "their life and interests. " msgstr "" -"**%s** est un groupe d'utilisateurs du service de [micro-blogging](http://fr." +"**%s** est un groupe d’utilisateurs du service de [micro-blogging](http://fr." "wikipedia.org/wiki/Microblog) %%%%site.name%%%%" #: actions/showgroup.php:482 @@ -2843,18 +2862,20 @@ msgstr "Flux des statuts de %s (Atom)" #: actions/showstream.php:148 #, php-format msgid "FOAF for %s" -msgstr "ami d'un ami pour %s" +msgstr "ami d’un ami pour %s" #: actions/showstream.php:191 #, php-format msgid "This is the timeline for %s but %s hasn't posted anything yet." -msgstr "" +msgstr "C’est le flux de %s mais %s n’a rien publié pour le moment." #: actions/showstream.php:196 msgid "" "Seen anything interesting recently? You haven't posted any notices yet, now " "would be a good time to start :)" msgstr "" +"Avez-vous vu quelque chose d’intéressant récemment ? Vous n’avez pas publié " +"d’avis pour le moment, vous pourriez commencer maintenant :)" #: actions/showstream.php:198 #, php-format @@ -2862,6 +2883,8 @@ msgid "" "You can try to nudge %s or [post something to his or her attention](%%%%" "action.newnotice%%%%?status_textarea=%s)." msgstr "" +"Vous pouvez essayer de faire un clin d’œil à %s ou de [publier quelque chose " +"à son attention](%%%%action.newnotice%%%%?status_textarea=%s)." #: actions/showstream.php:234 #, php-format @@ -2961,7 +2984,7 @@ msgstr "Ce code de confirmation est incorrect." #: actions/smssettings.php:405 msgid "That is not your phone number." -msgstr "Ceci n'est pas votre numéro de téléphone." +msgstr "Ceci n’est pas votre numéro de téléphone." #: actions/smssettings.php:465 msgid "Mobile carrier" @@ -2978,7 +3001,7 @@ msgid "" "email but isn't listed here, send email to let us know at %s." msgstr "" "Votre fournisseur de téléphonie mobile. Si vous connaissez un fournisseur " -"qui accepte la réception de SMS par courriel mais qui n'est pas listé ici, " +"qui accepte la réception de SMS par courriel mais qui n’est pas listé ici, " "écrivez-nous à %s." #: actions/smssettings.php:498 @@ -2991,11 +3014,11 @@ msgstr "Vous n'êtes pas abonné(e) à ce profil." #: actions/subedit.php:83 msgid "Could not save subscription." -msgstr "Impossible d'enregistrer l'abonnement." +msgstr "Impossible d’enregistrer l’abonnement." #: actions/subscribe.php:55 msgid "Not a local user." -msgstr "Ceci n'est pas un utilisateur local." +msgstr "Ceci n’est pas un utilisateur local." #: actions/subscribe.php:69 msgid "Subscribed" @@ -3025,11 +3048,13 @@ msgid "" "You have no subscribers. Try subscribing to people you know and they might " "return the favor" msgstr "" +"Vous n’avez pas d’abonnés. Essayez de vous abonner à des gens que vous " +"connaissez et ils pourraient vous retourner la faveur." #: actions/subscribers.php:110 #, php-format msgid "%s has no subscribers. Want to be the first?" -msgstr "" +msgstr "%s n’a pas d’abonnés. Voulez-vous être le premier ?" #: actions/subscribers.php:114 #, php-format @@ -3037,6 +3062,8 @@ msgid "" "%s has no subscribers. Why not [register an account](%%%%action.register%%%" "%) and be the first?" msgstr "" +"%s n’a pas d’abonnés. Vous pourriez [créer un compte](%%%%action.register%%%" +"%) et être le premier ?" #: actions/subscriptions.php:52 #, php-format @@ -3066,6 +3093,12 @@ msgid "" "featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can " "automatically subscribe to people you already follow there." msgstr "" +"Vous ne suivez les avis de personne pour le moment, essayez de vous abonnez " +"à des gens que vous connaissez. Essayez la [recherche de personnes](%%action." +"peoplesearch%%), cherchez les membres de groupes auquels vous vous " +"intéressez et nos [utilisateurs en vedette](%%action.featured%%). Si vous " +"êtes un [utilisateur de Twitter](%%action.twittersettings%%), vous pouvez " +"vous abonner automatiquement aux gens auquels vous êtes déjà abonné là-bas." #: actions/subscriptions.php:123 actions/subscriptions.php:127 #, php-format @@ -3086,7 +3119,7 @@ msgstr "Aucune session ouverte" #: actions/tagother.php:39 msgid "No id argument." -msgstr "Aucun argument d'identification." +msgstr "Aucun argument d’identification." #: actions/tagother.php:65 #, php-format @@ -3095,7 +3128,7 @@ msgstr "Marquage %s" #: actions/tagother.php:77 lib/userprofile.php:75 msgid "User profile" -msgstr "Profil de l'utilisateur" +msgstr "Profil de l’utilisateur" #: actions/tagother.php:81 lib/userprofile.php:102 msgid "Photo" @@ -3103,7 +3136,7 @@ msgstr "Photo" #: actions/tagother.php:141 msgid "Tag user" -msgstr "Marquer l'utilisateur" +msgstr "Marquer l’utilisateur" #: actions/tagother.php:151 msgid "" @@ -3120,7 +3153,7 @@ msgstr "" #: actions/tagother.php:200 msgid "Could not save tags." -msgstr "Impossible d'enregistrer les marquages." +msgstr "Impossible d’enregistrer les marquages." #: actions/tagother.php:236 msgid "Use this form to add tags to your subscribers or subscriptions." @@ -3171,10 +3204,12 @@ msgstr "Désabonné" #, php-format msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." msgstr "" +"La licence du flux auquel vous avez souscrit ‘%s’ n’est pas compatible avec " +"la licence du site ‘%s’." #: actions/userauthorization.php:105 msgid "Authorize subscription" -msgstr "Autoriser l'abonnement" +msgstr "Autoriser l’abonnement" #: actions/userauthorization.php:110 msgid "" @@ -3183,8 +3218,8 @@ msgid "" "click “Reject”." msgstr "" "Veuillez vérifier ces détails pour vous assurer que vous souhaitez vous " -"abonner aux statuts de cet utilisateur. Si vous n'avez pas demandé à vous " -"abonner aux statuts de quelqu'un, cliquez « Rejeter »." +"abonner aux statuts de cet utilisateur. Si vous n’avez pas demandé à vous " +"abonner aux statuts de quelqu’un, cliquez « Rejeter »." #: actions/userauthorization.php:188 msgid "License" @@ -3197,7 +3232,7 @@ msgstr "Accepter" #: actions/userauthorization.php:210 lib/subscribeform.php:115 #: lib/subscribeform.php:139 msgid "Subscribe to this user" -msgstr "S'abonner à cet utilisateur" +msgstr "S’abonner à cet utilisateur" #: actions/userauthorization.php:211 msgid "Reject" @@ -3209,7 +3244,7 @@ msgstr "Rejeter cette souscription" #: actions/userauthorization.php:225 msgid "No authorization request!" -msgstr "Pas de requête d'autorisation !" +msgstr "Pas de requête d’autorisation !" #: actions/userauthorization.php:247 msgid "Subscription authorized" @@ -3222,9 +3257,9 @@ msgid "" "with the site’s instructions for details on how to authorize the " "subscription. Your subscription token is:" msgstr "" -"L'abonnement a été autorisé, mais l'URL de rappel n'a pas été validé. " +"L’abonnement a été autorisé, mais l’URL de rappel n’a pas été validé. " "Vérifiez les instructions du site pour savoir comment compléter " -"l'autorisation de l'abonnement. Votre jeton d'abonnement est :" +"l’autorisation de l’abonnement. Votre jeton d’abonnement est :" #: actions/userauthorization.php:259 msgid "Subscription rejected" @@ -3236,44 +3271,44 @@ msgid "" "with the site’s instructions for details on how to fully reject the " "subscription." msgstr "" -"L'abonnement a été refusé, mais aucune URL de rappel n'a pas été passée. " +"L’abonnement a été refusé, mais aucune URL de rappel n’a pas été passée. " "Vérifiez les instructions du site pour savoir comment refuser pleinement " -"l'abonnement." +"l’abonnement." #: actions/userauthorization.php:296 #, php-format msgid "Listener URI ‘%s’ not found here" -msgstr "" +msgstr "L’URI de l’auditeur ‘%s’ n’a pas été trouvée" #: actions/userauthorization.php:301 #, php-format msgid "Listenee URI ‘%s’ is too long." -msgstr "" +msgstr "L’URI à laquelle vous avez souscrit ‘%s’ est trop longue." #: actions/userauthorization.php:307 #, php-format msgid "Listenee URI ‘%s’ is a local user." -msgstr "" +msgstr "L’URI à laquelle vous avez souscrit ‘%s’ est un utilisateur local." #: actions/userauthorization.php:322 #, php-format msgid "Profile URL ‘%s’ is for a local user." -msgstr "" +msgstr "L’URL du profil ‘%s’ est pour un utilisateur local." #: actions/userauthorization.php:338 #, php-format msgid "Avatar URL ‘%s’ is not valid." -msgstr "" +msgstr "L’URL de l’avatar ‘%s’ n’est pas valide." #: actions/userauthorization.php:343 #, php-format msgid "Can’t read avatar URL ‘%s’." -msgstr "Impossible de lire l'URL de l'avatar « %s »." +msgstr "Impossible de lire l’URL de l’avatar « %s »." #: actions/userauthorization.php:348 #, php-format msgid "Wrong image type for avatar URL ‘%s’." -msgstr "Format d'image invalide pour l'URL de l'avatar « %s »." +msgstr "Format d’image invalide pour l’URL de l’avatar « %s »." #: actions/userbyid.php:70 msgid "No id." @@ -3288,10 +3323,12 @@ msgid "" "Customize the way your profile looks with a background image and a colour " "palette of your choice." msgstr "" +"Personnalisez l’apparence de votre profil avec une image d’arrière plan et " +"une palette de couleurs de votre choix." #: actions/userdesignsettings.php:282 msgid "Enjoy your hotdog!" -msgstr "" +msgstr "Bon appétit !" #: actions/usergroups.php:64 #, php-format @@ -3305,12 +3342,14 @@ msgstr "Rechercher pour plus de groupes" #: actions/usergroups.php:153 #, php-format msgid "%s is not a member of any group." -msgstr "%s n'est pas membre d'aucun groupe." +msgstr "%s n’est pas membre d’un groupe." #: actions/usergroups.php:158 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" +"Essayez de [rechercher un groupe](%%action.groupsearch%%) et de vous y " +"inscrire." #: classes/File.php:137 #, php-format @@ -3318,20 +3357,22 @@ msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" +"Un fichier ne peut pas être plus gros que %d octets et le fichier que vous " +"avez envoyé pesait %d octets. Essayez d’importer une version moins grosse." #: classes/File.php:147 #, php-format msgid "A file this large would exceed your user quota of %d bytes." -msgstr "" +msgstr "Un fichier aussi gros dépasserai votre quota utilisateur de %d octets." #: classes/File.php:154 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." -msgstr "" +msgstr "Un fichier aussi gros dépasserai votre quota mensuel de %d octets." #: classes/Message.php:55 msgid "Could not insert message." -msgstr "Impossible d'insérer le message." +msgstr "Impossible d’insérer le message." #: classes/Message.php:65 msgid "Could not update message with new URI." @@ -3344,11 +3385,11 @@ msgstr "Erreur de base de donnée en insérant le hashtag : %s" #: classes/Notice.php:179 msgid "Problem saving notice. Too long." -msgstr "Problème lors de l'enregistrement de l'avis ; trop long." +msgstr "Problème lors de l’enregistrement de l’avis ; trop long." #: classes/Notice.php:183 msgid "Problem saving notice. Unknown user." -msgstr "Erreur lors de l'enregistrement du statut. Utilisateur inconnu." +msgstr "Erreur lors de l’enregistrement du statut. Utilisateur inconnu." #: classes/Notice.php:188 msgid "" @@ -3372,7 +3413,7 @@ msgstr "Il vous est interdit de publier des statuts dans ce site." #: classes/Notice.php:268 classes/Notice.php:293 msgid "Problem saving notice." -msgstr "Problème lors de l'enregistrement du statut." +msgstr "Problème lors de l’enregistrement du statut." #: classes/Notice.php:1120 #, php-format @@ -3488,7 +3529,7 @@ msgstr "Aide" #: lib/action.php:456 msgid "Help me!" -msgstr "À l'aide !" +msgstr "À l’aide !" #: lib/action.php:459 msgid "Search" @@ -3524,7 +3565,7 @@ msgstr "FAQ" #: lib/action.php:727 msgid "TOS" -msgstr "" +msgstr "CGU" #: lib/action.php:730 msgid "Privacy" @@ -3541,7 +3582,7 @@ msgstr "Contact" #: lib/action.php:736 #, fuzzy msgid "Badge" -msgstr "Clin d'œil" +msgstr "Clin d’œil" #: lib/action.php:764 msgid "StatusNet software license" @@ -3634,22 +3675,22 @@ msgstr "Échec de la commande" #: lib/command.php:44 msgid "Sorry, this command is not yet implemented." -msgstr "Désolé, cette commande n'a pas encore été implémantée." +msgstr "Désolé, cette commande n’a pas encore été implémentée." #: lib/command.php:88 #, fuzzy, php-format msgid "Could not find a user with nickname %s" msgstr "" -"Impossible de mettre l'utilisateur à jour avec l'adresse courriel confirmée." +"Impossible de mettre l’utilisateur à jour avec l’adresse courriel confirmée." #: lib/command.php:92 msgid "It does not make a lot of sense to nudge yourself!" -msgstr "" +msgstr "Ça n’a pas de sens de se faire un clin d’œil à soi-même !" #: lib/command.php:99 #, fuzzy, php-format msgid "Nudge sent to %s" -msgstr "Clin d'œil envoyé" +msgstr "Clin d’œil envoyé" #: lib/command.php:126 #, php-format @@ -3664,7 +3705,7 @@ msgstr "" #: lib/command.php:152 lib/command.php:400 msgid "Notice with that id does not exist" -msgstr "Aucun statut avec cet identifiant n'existe" +msgstr "Aucun statut avec cet identifiant n’existe" #: lib/command.php:168 lib/command.php:416 lib/command.php:471 msgid "User has no last notice" @@ -3708,7 +3749,7 @@ msgstr "" #: lib/command.php:377 msgid "Error sending direct message." -msgstr "Une erreur est survenue pendant l'envoi de votre message." +msgstr "Une erreur est survenue pendant l’envoi de votre message." #: lib/command.php:431 #, php-format @@ -3724,11 +3765,11 @@ msgstr "Réponse à %s envoyée" #: lib/command.php:441 msgid "Error saving notice." -msgstr "Problème lors de l'enregistrement de l'avis." +msgstr "Problème lors de l’enregistrement de l’avis." #: lib/command.php:495 msgid "Specify the name of the user to subscribe to" -msgstr "Indiquez le nom de l'utilisateur auquel vous souhaitez vous abonner" +msgstr "Indiquez le nom de l’utilisateur auquel vous souhaitez vous abonner" #: lib/command.php:502 #, php-format @@ -3737,7 +3778,7 @@ msgstr "Abonné à %s" #: lib/command.php:523 msgid "Specify the name of the user to unsubscribe from" -msgstr "Indiquez le nom de l'utilisateur duquel vous souhaitez vous désabonner" +msgstr "Indiquez le nom de l’utilisateur duquel vous souhaitez vous désabonner" #: lib/command.php:530 #, php-format @@ -3746,7 +3787,7 @@ msgstr "Désabonné de %s" #: lib/command.php:548 lib/command.php:571 msgid "Command not yet implemented." -msgstr "Cette commande n'a pas encore été implémantée." +msgstr "Cette commande n’a pas encore été implémentée." #: lib/command.php:551 msgid "Notification off." @@ -3762,7 +3803,7 @@ msgstr "Avertissements activés." #: lib/command.php:576 msgid "Can't turn on notification." -msgstr "Impossible d'activer les avertissements." +msgstr "Impossible d’activer les avertissements." #: lib/command.php:597 #, php-format @@ -3773,14 +3814,50 @@ msgstr "Impossible de créer le jeton de connexion pour %s" #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" +"Ce lien n’est utilisable qu’une seule fois, et est valable uniquement " +"pendant 2 minutes : %s" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Vous n'êtes pas abonné(e) à ce profil." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Vous n'êtes pas abonné(e) à ce profil." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Impossible d’abonner une autre personne à votre profil." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Abonnés de %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Vous n'êtes pas membre de ce groupe." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Vous n'êtes pas membre de ce groupe." + +#: lib/command.php:670 +#, fuzzy msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave - unsubscribe from user\n" "d - direct message to user\n" "get - get last notice from user\n" @@ -3809,6 +3886,38 @@ msgid "" "tracks - not yet implemented.\n" "tracking - not yet implemented.\n" msgstr "" +"Commandes :\n" +"on - activer les notifications\n" +"off - désactiver les notifications\n" +"help - montrer l’aide\n" +"follow - s’abonner à l’utilisateur\n" +"leave - se désabonner de l’utilisateur\n" +"d - message direct à l’utilisateur\n" +"get - obtenir le dernier avis de l’utilisateur\n" +"whois - obtenir le profil de cet utilisateur\n" +"fav - ajouter de dernier avis de l’utilisateur comme favori\n" +"fav # - ajouter l’avis correspondant à l’id comme favori\n" +"reply # - répondre à l’avis correspondant à l’id\n" +"reply - répondre au dernier avis de l’utilisateur\n" +"join - s’inscrire au groupe\n" +"login - Obtenir un lien pour s’identifier sur l’interface web\n" +"drop - quitter le groupe\n" +"stats - obtenir vos statistiques\n" +"stop - même effet que 'off'\n" +"quit - même effet que 'off'\n" +"sub - même effet que 'follow'\n" +"unsub - même effet que 'leave'\n" +"last - même effet que 'get'\n" +"on - pas encore implémenté.\n" +"off - pas encore implémenté.\n" +"nudge - rappeler à un utilisateur de publier.\n" +"invite - pas encore implémenté.\n" +"track - pas encore implémenté.\n" +"untrack - pas encore implémenté.\n" +"track off - pas encore implémenté.\n" +"untrack all - pas encore implémenté.\n" +"tracks - pas encore implémenté.\n" +"tracking - pas encore implémenté.\n" #: lib/common.php:192 msgid "No configuration file found. " @@ -3817,14 +3926,15 @@ msgstr "Aucun fichier de configuration n'a été trouvé. " #: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" +"J’ai cherché des fichiers de configuration dans les emplacements suivants : " #: lib/common.php:194 msgid "You may wish to run the installer to fix this." -msgstr "" +msgstr "Vous pouvez essayer de lancer l’installeur pour régler ce problème." #: lib/common.php:195 msgid "Go to the installer." -msgstr "Aller au programme d'installation" +msgstr "Aller au programme d’installation" #: lib/connectsettingsaction.php:110 msgid "IM" @@ -3844,7 +3954,7 @@ msgstr "Erreur de la base de données" #: lib/designsettings.php:101 msgid "Change background image" -msgstr "Changer l'image d'arrière plan" +msgstr "Changer l’image d’arrière plan" #: lib/designsettings.php:105 msgid "Upload file" @@ -3854,24 +3964,24 @@ msgstr "Importer un fichier" msgid "" "You can upload your personal background image. The maximum file size is 2Mb." msgstr "" -"Vous pouvez importer une image d'arrière plan personnelle. La taille " +"Vous pouvez importer une image d’arrière plan personnelle. La taille " "maximale du fichier est de 2 Mo." #: lib/designsettings.php:139 msgid "On" -msgstr "" +msgstr "Activé" #: lib/designsettings.php:155 msgid "Off" -msgstr "" +msgstr "Désactivé" #: lib/designsettings.php:156 msgid "Turn background image on or off." -msgstr "" +msgstr "Activer ou désactiver l’image d’arrière plan." #: lib/designsettings.php:161 msgid "Tile background image" -msgstr "" +msgstr "Répéter l’image d’arrière plan" #: lib/designsettings.php:170 msgid "Change colours" @@ -3903,15 +4013,15 @@ msgstr "Utiliser les valeurs par défaut" #: lib/designsettings.php:248 msgid "Restore default designs" -msgstr "" +msgstr "Restaurer les conceptions par défaut" #: lib/designsettings.php:254 msgid "Reset back to default" -msgstr "" +msgstr "Revenir aux valeurs par défaut" #: lib/designsettings.php:257 msgid "Save design" -msgstr "" +msgstr "Sauvegarder la conception" #: lib/designsettings.php:372 msgid "Bad default color settings: " @@ -3919,7 +4029,7 @@ msgstr "" #: lib/designsettings.php:468 msgid "Design defaults restored." -msgstr "" +msgstr "Les paramètre par défaut de la conception ont été restaurés." #: lib/disfavorform.php:114 lib/disfavorform.php:140 msgid "Disfavor this notice" @@ -3951,7 +4061,7 @@ msgstr "Atom" #: lib/feed.php:91 msgid "FOAF" -msgstr "Ami d'un ami" +msgstr "Ami d’un ami" #: lib/galleryaction.php:121 msgid "Filter tags" @@ -3998,13 +4108,15 @@ msgstr "Description" msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" msgstr "" -"Emplacement du groupe, s'il y a lieu, de la forme « Ville, État ou région, " +"Emplacement du groupe, s’il y a lieu, de la forme « Ville, État ou région, " "Pays »" #: lib/groupeditform.php:187 #, php-format msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" +"Pseudos supplémentaires pour le groupe, séparés par des virgules ou des " +"espaces, %d au maximum" #: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" @@ -4054,7 +4166,7 @@ msgstr "Marquages des statuts du groupe %s" #: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "" -"Cette page n'est pas disponible dans un des formats que vous avez autorisés." +"Cette page n’est pas disponible dans un des formats que vous avez autorisés." #: lib/imagefile.php:75 #, fuzzy, php-format @@ -4071,11 +4183,11 @@ msgstr "Erreur système lors du transfert du fichier." #: lib/imagefile.php:96 msgid "Not an image or corrupt file." -msgstr "Ceci n'est pas une image, ou c'est un fichier corrompu." +msgstr "Ceci n’est pas une image, ou c’est un fichier corrompu." #: lib/imagefile.php:105 msgid "Unsupported image file format." -msgstr "Format de fichier d'image non supporté." +msgstr "Format de fichier d’image non supporté." #: lib/imagefile.php:118 msgid "Lost our file." @@ -4108,13 +4220,16 @@ msgstr "Créer un nouveau compte" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." -msgstr "L'accès à cette boîte de réception est réservé à son utilisateur." +msgstr "L’accès à cette boîte de réception est réservé à son utilisateur." #: lib/mailbox.php:139 msgid "" "You have no private messages. You can send private message to engage other " "users in conversation. People can send you messages for your eyes only." msgstr "" +"Vous n’avez pas de messages privés. Vous pouvez envoyer des messages privés " +"pour démarrer des conversations avec d’autres utilisateurs. Ceux-ci peuvent " +"vous envoyer des messages destinés à vous seul(e)." #: lib/mailbox.php:227 lib/noticelist.php:424 msgid "from" @@ -4122,7 +4237,7 @@ msgstr "de" #: lib/mail.php:172 msgid "Email address confirmation" -msgstr "Confirmation de l'adresse courriel" +msgstr "Confirmation de l’adresse courriel" #: lib/mail.php:174 #, php-format @@ -4225,7 +4340,7 @@ msgstr "" "\n" "Écrivez à %2$s pour mettre à jour votre statut.\n" "\n" -"Plus d'info : %3$s.\n" +"Plus d’info : %3$s.\n" "\n" "Amicalement vôtre,\n" "%4$s" @@ -4242,7 +4357,7 @@ msgstr "Confirmation SMS" #: lib/mail.php:462 #, php-format msgid "You've been nudged by %s" -msgstr "Vous avez reçu un clin d'œil de %s" +msgstr "Vous avez reçu un clin d’œil de %s" #: lib/mail.php:466 #, php-format @@ -4259,6 +4374,17 @@ msgid "" "With kind regards,\n" "%4$s\n" msgstr "" +"%1$s (%2$s) se demande ce que vous devenez ces temps-ci et vous invite à " +"publier des nouvelles.\n" +"\n" +"Donc on vous écoute :)\n" +"\n" +"%3$s\n" +"\n" +"Ne répondez pas à ce courriel ; il ne sera pas envoyé.\n" +"\n" +"Bien à vous,\n" +"%4$s\n" #: lib/mail.php:509 #, php-format @@ -4283,6 +4409,20 @@ msgid "" "With kind regards,\n" "%5$s\n" msgstr "" +"%1$s (%2$s) vous a envoyé un message privé:\n" +"\n" +"------------------------------------------------------\n" +"%3$s\n" +"------------------------------------------------------\n" +"\n" +"Vous pouvez répondre à ce message ici:\n" +"\n" +"%4$s\n" +"\n" +"Ne répondez pas à ce courriel ; il ne sera pas envoyé.\n" +"\n" +"Bien à vous,\n" +"%5$s\n" #: lib/mail.php:554 #, php-format @@ -4326,7 +4466,7 @@ msgstr "" #: lib/mail.php:611 #, php-format msgid "%s (@%s) sent a notice to your attention" -msgstr "" +msgstr "%s (@%s) vous a envoyé un avis" #: lib/mail.php:613 #, php-format @@ -4342,24 +4482,38 @@ msgid "" "\t%4$s\n" "\n" msgstr "" +"%1$s (@%9$s) vient de vous envoyer un avis (une réponse « @ ») sur %2$s.\n" +"\n" +"L’avis est là :\n" +"\n" +"\t%3$s\n" +"\n" +"Il dit :\n" +"\n" +"\t%4$s\n" +"\n" #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" +"Une erreur de base de données s’est produite pendant la sauvegarde de votre " +"fichier. Veuillez réessayer." #: lib/mediafile.php:142 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." -msgstr "" +msgstr "Le fichier importé dépasse le réglage upload_max_filesize de php.ini." #: lib/mediafile.php:147 msgid "" "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " "the HTML form." msgstr "" +"Le fichier importé dépasse le réglage MAX_FILE_SIZE qui a été précisé dans " +"le formulaire HTML." #: lib/mediafile.php:152 msgid "The uploaded file was only partially uploaded." -msgstr "" +msgstr "Le fichier n’a été que partiellement importé." #: lib/mediafile.php:159 msgid "Missing a temporary folder." @@ -4375,25 +4529,25 @@ msgstr "Import de fichier stoppé par une extension." #: lib/mediafile.php:179 lib/mediafile.php:216 msgid "File exceeds user's quota!" -msgstr "Le fichier dépasse le quota de l'utilisateur." +msgstr "Le fichier dépasse le quota de l’utilisateur." #: lib/mediafile.php:196 lib/mediafile.php:233 msgid "File could not be moved to destination directory." -msgstr "" +msgstr "Le fichier n’a pas pu être déplacé dans le dossier de destination." #: lib/mediafile.php:201 lib/mediafile.php:237 msgid "Could not determine file's mime-type!" -msgstr "Impossible de récupérer le flux public." +msgstr "Impossible de déterminer le mime-type du fichier !" #: lib/mediafile.php:270 #, php-format msgid " Try using another %s format." -msgstr "" +msgstr " Essayez d’utiliser un autre %s format." #: lib/mediafile.php:275 #, php-format msgid "%s is not a supported filetype on this server." -msgstr "%s n'est pas un type de fichier supporté sur ce serveur." +msgstr "%s n’est pas un type de fichier supporté sur ce serveur." #: lib/messageform.php:120 msgid "Send a direct notice" @@ -4438,35 +4592,35 @@ msgstr "Répondre" #: lib/nudgeform.php:116 msgid "Nudge this user" -msgstr "Envoyer un clin d'œil à cet utilisateur" +msgstr "Envoyer un clin d’œil à cet utilisateur" #: lib/nudgeform.php:128 msgid "Nudge" -msgstr "Clin d'œil" +msgstr "Clin d’œil" #: lib/nudgeform.php:128 msgid "Send a nudge to this user" -msgstr "Envoyer un clin d'œil à cet utilisateur" +msgstr "Envoyer un clin d’œil à cet utilisateur" #: lib/oauthstore.php:283 msgid "Error inserting new profile" -msgstr "Erreur lors de l'insertion du nouveau profil" +msgstr "Erreur lors de l’insertion du nouveau profil" #: lib/oauthstore.php:291 msgid "Error inserting avatar" -msgstr "Erreur lors de l'insertion de l'avatar" +msgstr "Erreur lors de l’insertion de l’avatar" #: lib/oauthstore.php:311 msgid "Error inserting remote profile" -msgstr "Erreur lors de l'insertion du profil distant" +msgstr "Erreur lors de l’insertion du profil distant" #: lib/oauthstore.php:345 msgid "Duplicate notice" -msgstr "Dupliquer l'avis" +msgstr "Dupliquer l’avis" #: lib/oauthstore.php:487 msgid "Couldn't insert new subscription." -msgstr "Impossible d'insérer un nouvel abonnement." +msgstr "Impossible d’insérer un nouvel abonnement." #: lib/personalgroupnav.php:99 msgid "Personal" @@ -4494,7 +4648,7 @@ msgstr "Vos messages reçus" #: lib/personalgroupnav.php:129 msgid "Outbox" -msgstr "Boîte d'envoi" +msgstr "Boîte d’envoi" #: lib/personalgroupnav.php:130 msgid "Your sent messages" @@ -4523,7 +4677,7 @@ msgstr "Tous les abonnés" #: lib/profileaction.php:177 msgid "User ID" -msgstr "ID de l'utilisateur" +msgstr "ID de l’utilisateur" #: lib/profileaction.php:182 msgid "Member since" @@ -4539,7 +4693,7 @@ msgstr "Public" #: lib/publicgroupnav.php:82 msgid "User groups" -msgstr "Groupes d'utilisateurs" +msgstr "Groupes d’utilisateurs" #: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85 msgid "Recent tags" @@ -4628,11 +4782,11 @@ msgstr "Cet utilisateur vous a bloqué." #: lib/subs.php:56 msgid "Could not subscribe." -msgstr "Impossible de s'abonner." +msgstr "Impossible de s’abonner." #: lib/subs.php:75 msgid "Could not subscribe other to you." -msgstr "Impossible d'abonner une autre personne à votre profil." +msgstr "Impossible d’abonner une autre personne à votre profil." #: lib/subs.php:124 msgid "Not subscribed!" @@ -4640,7 +4794,7 @@ msgstr "Pas abonné !" #: lib/subs.php:136 msgid "Couldn't delete subscription." -msgstr "Impossible de cesser l'abonnement" +msgstr "Impossible de cesser l’abonnement" #: lib/tagcloudsection.php:56 msgid "None" @@ -4660,11 +4814,11 @@ msgstr "Désabonnement" #: lib/userprofile.php:116 msgid "Edit Avatar" -msgstr "Modifier l'avatar" +msgstr "Modifier l’avatar" #: lib/userprofile.php:236 msgid "User actions" -msgstr "Actions de l'utilisateur" +msgstr "Actions de l’utilisateur" #: lib/userprofile.php:248 msgid "Edit profile settings" @@ -4729,13 +4883,13 @@ msgstr "il y a environ 1 an" #: lib/webcolor.php:82 #, php-format msgid "%s is not a valid color!" -msgstr "&s n'est pas une couleur valide !" +msgstr "&s n’est pas une couleur valide !" #: lib/webcolor.php:123 #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -"%s n'est pas une couleur valide ! Utilisez 3 ou 6 caractères hexadécimaux." +"%s n’est pas une couleur valide ! Utilisez 3 ou 6 caractères hexadécimaux." #: scripts/maildaemon.php:48 msgid "Could not parse message." @@ -4743,12 +4897,12 @@ msgstr "Impossible de déchiffrer ce message." #: scripts/maildaemon.php:53 msgid "Not a registered user." -msgstr "Ceci n'est pas un utilisateur inscrit." +msgstr "Ceci n’est pas un utilisateur inscrit." #: scripts/maildaemon.php:57 msgid "Sorry, that is not your incoming email address." -msgstr "Désolé, ceci n'est pas votre adresse de courriel entrant." +msgstr "Désolé, ceci n’est pas votre adresse de courriel entrant." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." -msgstr "Désolé, la réception de courriels n'est pas permise." +msgstr "Désolé, la réception de courriels n’est pas permise." diff --git a/locale/ga/LC_MESSAGES/statusnet.mo b/locale/ga/LC_MESSAGES/statusnet.mo index 66ed4107e..78a0e7ba0 100644 Binary files a/locale/ga/LC_MESSAGES/statusnet.mo and b/locale/ga/LC_MESSAGES/statusnet.mo differ diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index b730a14df..bce6ff40a 100644 --- a/locale/ga/LC_MESSAGES/statusnet.po +++ b/locale/ga/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-14 21:06+0000\n" -"PO-Revision-Date: 2009-11-14 21:07:24+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:30+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59079); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ga\n" "X-Message-Group: out-statusnet\n" @@ -3863,7 +3863,37 @@ msgstr "Non se pode crear o formulario OpenID: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Non estás suscrito a ese perfil" + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Non estás suscrito a ese perfil" + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Outro usuario non se puido suscribir a ti." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Suscrito a %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Non estás suscrito a ese perfil" + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Non estás suscrito a ese perfil" + +#: lib/command.php:670 #, fuzzy msgid "" "Commands:\n" @@ -3871,6 +3901,9 @@ msgid "" "off - turn off notifications\n" "help - show this help\n" "follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave - unsubscribe from user\n" "d - direct message to user\n" "get - get last notice from user\n" diff --git a/locale/he/LC_MESSAGES/statusnet.mo b/locale/he/LC_MESSAGES/statusnet.mo index d7956f019..57b3fb49f 100644 Binary files a/locale/he/LC_MESSAGES/statusnet.mo and b/locale/he/LC_MESSAGES/statusnet.mo differ diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index de36e43f4..3de5c0072 100644 --- a/locale/he/LC_MESSAGES/statusnet.po +++ b/locale/he/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-14 21:06+0000\n" -"PO-Revision-Date: 2009-11-14 21:07:27+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:33+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59079); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: he\n" "X-Message-Group: out-statusnet\n" @@ -3727,13 +3727,46 @@ msgstr "נכשלה יצירת OpenID מתוך: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "לא שלחנו אלינו את הפרופיל הזה" + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "לא שלחנו אלינו את הפרופיל הזה" + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "הרשמה מרוחקת" + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "הרשמה מרוחקת" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "לא שלחנו אלינו את הפרופיל הזה" + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "לא שלחנו אלינו את הפרופיל הזה" + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave - unsubscribe from user\n" "d - direct message to user\n" "get - get last notice from user\n" diff --git a/locale/is/LC_MESSAGES/statusnet.mo b/locale/is/LC_MESSAGES/statusnet.mo index 031d9d72f..0d3848efd 100644 Binary files a/locale/is/LC_MESSAGES/statusnet.mo and b/locale/is/LC_MESSAGES/statusnet.mo differ diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index 6e0fdfbc8..e871d86a5 100644 --- a/locale/is/LC_MESSAGES/statusnet.po +++ b/locale/is/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-14 21:06+0000\n" -"PO-Revision-Date: 2009-11-14 21:07:29+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:36+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59079); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: is\n" "X-Message-Group: out-statusnet\n" @@ -3737,13 +3737,46 @@ msgstr "Gat ekki búið til OpenID eyðublað: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Þú ert ekki áskrifandi." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Þú ert ekki áskrifandi." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Fólk sem eru áskrifendur að %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Þú ert ekki meðlimur í þessum hópi." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Þú ert ekki meðlimur í þessum hópi." + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave - unsubscribe from user\n" "d - direct message to user\n" "get - get last notice from user\n" diff --git a/locale/it/LC_MESSAGES/statusnet.mo b/locale/it/LC_MESSAGES/statusnet.mo index d71c2eddc..479d105b0 100644 Binary files a/locale/it/LC_MESSAGES/statusnet.mo and b/locale/it/LC_MESSAGES/statusnet.mo differ diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index 6aad41073..231078cc7 100644 --- a/locale/it/LC_MESSAGES/statusnet.po +++ b/locale/it/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-14 21:06+0000\n" -"PO-Revision-Date: 2009-11-14 21:07:32+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:39+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59079); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: it\n" "X-Message-Group: out-statusnet\n" @@ -3800,13 +3800,46 @@ msgstr "Impossibile creare il modulo OpenID: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Non sei abbonato a quel profilo." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Non sei abbonato a quel profilo." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Impossibile abbonare altri a te." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Persone abbonate a %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Non sei un membro di quel gruppo." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Non sei un membro di quel gruppo." + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave - unsubscribe from user\n" "d - direct message to user\n" "get - get last notice from user\n" diff --git a/locale/ja/LC_MESSAGES/statusnet.mo b/locale/ja/LC_MESSAGES/statusnet.mo index 3a6e83a60..3fd89d064 100644 Binary files a/locale/ja/LC_MESSAGES/statusnet.mo and b/locale/ja/LC_MESSAGES/statusnet.mo differ diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index ee96f3778..eb63104c8 100644 --- a/locale/ja/LC_MESSAGES/statusnet.po +++ b/locale/ja/LC_MESSAGES/statusnet.po @@ -6,12 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-14 21:06+0000\n" -"PO-Revision-Date: 2009-11-14 21:07:34+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:42+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59079); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ja\n" "X-Message-Group: out-statusnet\n" @@ -3762,13 +3762,46 @@ msgstr "OpenIDを作成できません : %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "そのプロファイルは送信されていません。" + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "そのプロファイルは送信されていません。" + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "リモートサブスクライブ" + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "リモートサブスクライブ" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "そのプロファイルは送信されていません。" + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "そのプロファイルは送信されていません。" + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave - unsubscribe from user\n" "d - direct message to user\n" "get - get last notice from user\n" diff --git a/locale/ko/LC_MESSAGES/statusnet.mo b/locale/ko/LC_MESSAGES/statusnet.mo index d930fe6d2..870956380 100644 Binary files a/locale/ko/LC_MESSAGES/statusnet.mo and b/locale/ko/LC_MESSAGES/statusnet.mo differ diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index 6f569ee51..19a9f4a6e 100644 --- a/locale/ko/LC_MESSAGES/statusnet.po +++ b/locale/ko/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-14 21:06+0000\n" -"PO-Revision-Date: 2009-11-14 21:07:38+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:45+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59079); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ko\n" "X-Message-Group: out-statusnet\n" @@ -3764,13 +3764,46 @@ msgstr "OpenID를 작성 할 수 없습니다 : %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "당신은 이 프로필에 구독되지 않고있습니다." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "당신은 이 프로필에 구독되지 않고있습니다." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "다른 사람을 구독 하실 수 없습니다." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "%s에 의해 구독되는 사람들" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "당신은 해당 그룹의 멤버가 아닙니다." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "당신은 해당 그룹의 멤버가 아닙니다." + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave - unsubscribe from user\n" "d - direct message to user\n" "get - get last notice from user\n" diff --git a/locale/mk/LC_MESSAGES/statusnet.mo b/locale/mk/LC_MESSAGES/statusnet.mo index 3b5378049..6b2713593 100644 Binary files a/locale/mk/LC_MESSAGES/statusnet.mo and b/locale/mk/LC_MESSAGES/statusnet.mo differ diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 1a803cf95..d011d7379 100644 --- a/locale/mk/LC_MESSAGES/statusnet.po +++ b/locale/mk/LC_MESSAGES/statusnet.po @@ -6,12 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-14 21:06+0000\n" -"PO-Revision-Date: 2009-11-14 21:07:41+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:48+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59079); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: mk\n" "X-Message-Group: out-statusnet\n" @@ -3738,13 +3738,46 @@ msgstr "OpenID формуларот не може да се креира:%s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Не ни го испративте тој профил." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Не ни го испративте тој профил." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Оддалечена претплата" + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Оддалечена претплата" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Не ни го испративте тој профил." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Не ни го испративте тој профил." + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave - unsubscribe from user\n" "d - direct message to user\n" "get - get last notice from user\n" diff --git a/locale/nb/LC_MESSAGES/statusnet.mo b/locale/nb/LC_MESSAGES/statusnet.mo index 6b16f5095..ee9dea03a 100644 Binary files a/locale/nb/LC_MESSAGES/statusnet.mo and b/locale/nb/LC_MESSAGES/statusnet.mo differ diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index cd1259eb7..0ced02905 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -11,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-14 21:06+0000\n" -"PO-Revision-Date: 2009-11-14 21:07:43+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:51+0000\n" "Language-Team: Norwegian (bokmål)‬\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59079); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: no\n" "X-Message-Group: out-statusnet\n" @@ -3700,13 +3700,46 @@ msgstr "Klarte ikke å lagre avatar-informasjonen" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Ikke autorisert." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Svar til %s" + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Svar til %s" + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Svar til %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Du er allerede logget inn!" + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Du er allerede logget inn!" + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave - unsubscribe from user\n" "d - direct message to user\n" "get - get last notice from user\n" diff --git a/locale/nl/LC_MESSAGES/statusnet.mo b/locale/nl/LC_MESSAGES/statusnet.mo index 6c6dc8ea1..ff15e5ade 100644 Binary files a/locale/nl/LC_MESSAGES/statusnet.mo and b/locale/nl/LC_MESSAGES/statusnet.mo differ diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index 567ea58f8..2f3944f4e 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-14 21:06+0000\n" -"PO-Revision-Date: 2009-11-14 21:07:49+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:59+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59079); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: out-statusnet\n" @@ -3875,13 +3875,47 @@ msgstr "" "Deze verwijzing kan slechts één keer gebruikt worden en is twee minuten " "geldig: %s" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "U bent niet geabonneerd op dat profiel." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "U bent niet geabonneerd op dat profiel." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Het was niet mogelijk om een ander op u te laten abonneren" + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Gebruikers met een abonnement op %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "U bent geen lid van deze groep" + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "U bent geen lid van deze groep." + +#: lib/command.php:670 +#, fuzzy msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave - unsubscribe from user\n" "d - direct message to user\n" "get - get last notice from user\n" diff --git a/locale/nn/LC_MESSAGES/statusnet.mo b/locale/nn/LC_MESSAGES/statusnet.mo index 32b5ccf2f..abb9b6191 100644 Binary files a/locale/nn/LC_MESSAGES/statusnet.mo and b/locale/nn/LC_MESSAGES/statusnet.mo differ diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index 00a846fe6..7dcdcb0df 100644 --- a/locale/nn/LC_MESSAGES/statusnet.po +++ b/locale/nn/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-14 21:06+0000\n" -"PO-Revision-Date: 2009-11-14 21:07:46+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:54+0000\n" "Language-Team: Norwegian Nynorsk\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59079); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nn\n" "X-Message-Group: out-statusnet\n" @@ -3780,13 +3780,46 @@ msgstr "Kunne ikkje laga OpenID-form: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Du tingar ikkje oppdateringar til den profilen." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Du tingar ikkje oppdateringar til den profilen." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Kan ikkje tinga andre til deg." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Mennesker som tingar %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Du er ikkje medlem av den gruppa." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Du er ikkje medlem av den gruppa." + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave - unsubscribe from user\n" "d - direct message to user\n" "get - get last notice from user\n" diff --git a/locale/pl/LC_MESSAGES/statusnet.mo b/locale/pl/LC_MESSAGES/statusnet.mo index b36c872fc..d3ab4e974 100644 Binary files a/locale/pl/LC_MESSAGES/statusnet.mo and b/locale/pl/LC_MESSAGES/statusnet.mo differ diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index 66009ddaa..94fb477f1 100644 --- a/locale/pl/LC_MESSAGES/statusnet.po +++ b/locale/pl/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-14 21:06+0000\n" -"PO-Revision-Date: 2009-11-14 21:07:51+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:44:02+0000\n" "Language-Team: Polish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59079); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pl\n" "X-Message-Group: out-statusnet\n" @@ -3848,7 +3848,37 @@ msgstr "Nie można utworzyć formularza OpenID: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Nie jesteś zasubskrybowany do tego profilu." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Nie jesteś zasubskrybowany do tego profilu." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Nie można zasubskrybować innych do Ciebie." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Osoby zasubskrybowane do %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Nie jesteś członkiem tej grupy." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Nie jesteś członkiem tej grupy." + +#: lib/command.php:670 #, fuzzy msgid "" "Commands:\n" @@ -3856,6 +3886,9 @@ msgid "" "off - turn off notifications\n" "help - show this help\n" "follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave - unsubscribe from user\n" "d - direct message to user\n" "get - get last notice from user\n" diff --git a/locale/pt/LC_MESSAGES/statusnet.mo b/locale/pt/LC_MESSAGES/statusnet.mo index 2c7df395b..9d79df32c 100644 Binary files a/locale/pt/LC_MESSAGES/statusnet.mo and b/locale/pt/LC_MESSAGES/statusnet.mo differ diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index 744e46acf..4577be669 100644 --- a/locale/pt/LC_MESSAGES/statusnet.po +++ b/locale/pt/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-14 21:06+0000\n" -"PO-Revision-Date: 2009-11-14 21:07:54+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:44:05+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59079); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt\n" "X-Message-Group: out-statusnet\n" @@ -3692,13 +3692,44 @@ msgstr "Não foi possível criar o formulário de OpenID: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Não foi possível subscrever outros a si." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Já subscrito!." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Não foi possível subscrever outros a si." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Já subscrito!." + +#: lib/command.php:656 +msgid "You are not a member of any groups." +msgstr "" + +#: lib/command.php:658 +msgid "You are a member of these groups: " +msgstr "" + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave - unsubscribe from user\n" "d - direct message to user\n" "get - get last notice from user\n" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.mo b/locale/pt_BR/LC_MESSAGES/statusnet.mo index d5f7dc558..634c68c24 100644 Binary files a/locale/pt_BR/LC_MESSAGES/statusnet.mo and b/locale/pt_BR/LC_MESSAGES/statusnet.mo differ diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index f133bed15..73b63476b 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-14 21:06+0000\n" -"PO-Revision-Date: 2009-11-14 21:07:56+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:44:09+0000\n" "Language-Team: Brazilian Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59079); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt-br\n" "X-Message-Group: out-statusnet\n" @@ -3844,13 +3844,46 @@ msgstr "Não foi possível criar o formulário OpenID: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Você não está assinando esse perfil." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Você não está assinando esse perfil." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Não foi possível fazer com que o outros o sigam." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Assinantes de %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Você não está assinando esse perfil." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Você não está assinando esse perfil." + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave - unsubscribe from user\n" "d - direct message to user\n" "get - get last notice from user\n" diff --git a/locale/ru/LC_MESSAGES/statusnet.mo b/locale/ru/LC_MESSAGES/statusnet.mo index 495593c08..13d14c0f9 100644 Binary files a/locale/ru/LC_MESSAGES/statusnet.mo and b/locale/ru/LC_MESSAGES/statusnet.mo differ diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index f43a4f253..521b67091 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -6,21 +6,20 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-14 21:06+0000\n" -"PO-Revision-Date: 2009-11-14 21:07:59+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:44:12+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59079); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ru\n" "X-Message-Group: out-statusnet\n" #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 -#, fuzzy msgid "No such page" -msgstr "Нет такого тега." +msgstr "Нет такой страницы" #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdatedeliverydevice.php:113 @@ -3835,13 +3834,46 @@ msgstr "Не удаётся создать OpenID-форму: %s " msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Вы не подписаны на этот профиль." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Вы не подписаны на этот профиль." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Не удаётся подписать других на вашу ленту." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Люди подписанные на %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Вы не являетесь членом этой группы." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Вы не являетесь членом этой группы." + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave - unsubscribe from user\n" "d - direct message to user\n" "get - get last notice from user\n" diff --git a/locale/statusnet.po b/locale/statusnet.po index 7572c1008..0d0ea85f6 100644 --- a/locale/statusnet.po +++ b/locale/statusnet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-14 21:06+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3574,13 +3574,40 @@ msgstr "" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +msgid "You are not subscribed to anyone." +msgstr "" + +#: lib/command.php:620 +msgid "You are subscribed to these people: " +msgstr "" + +#: lib/command.php:637 +msgid "No one is subscribed to you." +msgstr "" + +#: lib/command.php:639 +msgid "These people are subscribed to you: " +msgstr "" + +#: lib/command.php:656 +msgid "You are not a member of any groups." +msgstr "" + +#: lib/command.php:658 +msgid "You are a member of these groups: " +msgstr "" + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave - unsubscribe from user\n" "d - direct message to user\n" "get - get last notice from user\n" diff --git a/locale/sv/LC_MESSAGES/statusnet.mo b/locale/sv/LC_MESSAGES/statusnet.mo index 64697b346..ed78309b1 100644 Binary files a/locale/sv/LC_MESSAGES/statusnet.mo and b/locale/sv/LC_MESSAGES/statusnet.mo differ diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index bfa20cd44..437c4b244 100644 --- a/locale/sv/LC_MESSAGES/statusnet.po +++ b/locale/sv/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-14 21:06+0000\n" -"PO-Revision-Date: 2009-11-14 21:08:02+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:44:15+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59079); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: sv\n" "X-Message-Group: out-statusnet\n" @@ -3834,13 +3834,46 @@ msgstr "Kan inte skapa OpenID formulär: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Du skickade inte oss den profilen" + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Du skickade inte oss den profilen" + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Kunde inte prenumerera på annat åt dig." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Fjärrprenumerera" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Du skickade inte oss den profilen" + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Du skickade inte oss den profilen" + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave - unsubscribe from user\n" "d - direct message to user\n" "get - get last notice from user\n" diff --git a/locale/te/LC_MESSAGES/statusnet.mo b/locale/te/LC_MESSAGES/statusnet.mo index 91d6a1dfd..059365e86 100644 Binary files a/locale/te/LC_MESSAGES/statusnet.mo and b/locale/te/LC_MESSAGES/statusnet.mo differ diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index 8447e7a44..b45d8a5a9 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -6,12 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-14 21:06+0000\n" -"PO-Revision-Date: 2009-11-14 21:08:06+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:44:17+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59079); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: te\n" "X-Message-Group: out-statusnet\n" @@ -3647,13 +3647,46 @@ msgstr "ఓపెన్ఐడీ ఫారమును సృష్టించ msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "%sకి స్పందనలు" + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "%sకి స్పందనలు" + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "%sకి స్పందనలు" + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "%sకి స్పందనలు" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!" + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!" + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave - unsubscribe from user\n" "d - direct message to user\n" "get - get last notice from user\n" diff --git a/locale/tr/LC_MESSAGES/statusnet.mo b/locale/tr/LC_MESSAGES/statusnet.mo index d3e547bff..84e32897a 100644 Binary files a/locale/tr/LC_MESSAGES/statusnet.mo and b/locale/tr/LC_MESSAGES/statusnet.mo differ diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index 041ceb3a3..78261edbb 100644 --- a/locale/tr/LC_MESSAGES/statusnet.po +++ b/locale/tr/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-14 21:06+0000\n" -"PO-Revision-Date: 2009-11-14 21:08:08+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:44:20+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59079); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: tr\n" "X-Message-Group: out-statusnet\n" @@ -3733,13 +3733,46 @@ msgstr "OpenID formu yaratılamadı: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Bize o profili yollamadınız" + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Bize o profili yollamadınız" + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Uzaktan abonelik" + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Uzaktan abonelik" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Bize o profili yollamadınız" + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Bize o profili yollamadınız" + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave - unsubscribe from user\n" "d - direct message to user\n" "get - get last notice from user\n" diff --git a/locale/uk/LC_MESSAGES/statusnet.mo b/locale/uk/LC_MESSAGES/statusnet.mo index c73cc7fe6..9cbb4440f 100644 Binary files a/locale/uk/LC_MESSAGES/statusnet.mo and b/locale/uk/LC_MESSAGES/statusnet.mo differ diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index d340b5dfd..2c54591aa 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-14 21:06+0000\n" -"PO-Revision-Date: 2009-11-14 21:08:11+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:44:23+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59079); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: out-statusnet\n" @@ -3811,13 +3811,46 @@ msgstr "Не вдалося створити форму OpenID: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Ви не підписані до цього профілю." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Ви не підписані до цього профілю." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Не вдалося підписати іншого до вас." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Люди підписані до %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Ви не є учасником цієї групи." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Ви не є учасником цієї групи." + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave - unsubscribe from user\n" "d - direct message to user\n" "get - get last notice from user\n" diff --git a/locale/vi/LC_MESSAGES/statusnet.mo b/locale/vi/LC_MESSAGES/statusnet.mo index 919c29a7a..0480dfd01 100644 Binary files a/locale/vi/LC_MESSAGES/statusnet.mo and b/locale/vi/LC_MESSAGES/statusnet.mo differ diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index a58a3b8fd..c0616649e 100644 --- a/locale/vi/LC_MESSAGES/statusnet.po +++ b/locale/vi/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-14 21:06+0000\n" -"PO-Revision-Date: 2009-11-14 21:08:13+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:44:26+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59079); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: vi\n" "X-Message-Group: out-statusnet\n" @@ -3881,13 +3881,46 @@ msgstr "Không thể tạo OpenID mẫu: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Bạn chưa cập nhật thông tin riêng" + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Bạn chưa cập nhật thông tin riêng" + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Không thể tạo favorite." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Theo nhóm này" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Bạn chưa cập nhật thông tin riêng" + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Bạn chưa cập nhật thông tin riêng" + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave - unsubscribe from user\n" "d - direct message to user\n" "get - get last notice from user\n" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.mo b/locale/zh_CN/LC_MESSAGES/statusnet.mo index 858418684..4fd7cd1dc 100644 Binary files a/locale/zh_CN/LC_MESSAGES/statusnet.mo and b/locale/zh_CN/LC_MESSAGES/statusnet.mo differ diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index 6b0f4d26d..722af7d34 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.po +++ b/locale/zh_CN/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-14 21:06+0000\n" -"PO-Revision-Date: 2009-11-14 21:08:16+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:44:29+0000\n" "Language-Team: Simplified Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59079); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hans\n" "X-Message-Group: out-statusnet\n" @@ -3794,13 +3794,46 @@ msgstr "无法创建 OpenID 表单：%s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "您未告知此个人信息" + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "您未告知此个人信息" + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "无法订阅他人更新。" + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "订阅 %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "您未告知此个人信息" + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "您未告知此个人信息" + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave - unsubscribe from user\n" "d - direct message to user\n" "get - get last notice from user\n" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.mo b/locale/zh_TW/LC_MESSAGES/statusnet.mo index 7bc92ed14..0db278848 100644 Binary files a/locale/zh_TW/LC_MESSAGES/statusnet.mo and b/locale/zh_TW/LC_MESSAGES/statusnet.mo differ diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index 6c7417d67..d251d4aa4 100644 --- a/locale/zh_TW/LC_MESSAGES/statusnet.po +++ b/locale/zh_TW/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-14 21:06+0000\n" -"PO-Revision-Date: 2009-11-14 21:08:18+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:44:31+0000\n" "Language-Team: Traditional Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59079); Translate extension (2009-11-13)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hant\n" "X-Message-Group: out-statusnet\n" @@ -3667,13 +3667,46 @@ msgstr "無法從 %s 建立OpenID" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "此帳號已註冊" + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "此帳號已註冊" + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "無此訂閱" + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "此帳號已註冊" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "無法連結到伺服器:%s" + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "無法連結到伺服器:%s" + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave - unsubscribe from user\n" "d - direct message to user\n" "get - get last notice from user\n" -- cgit v1.2.3-54-g00ecf From b7a08fdacc91c783b1e99f5dda2f3ce31ec8a6ee Mon Sep 17 00:00:00 2001 From: Eric Helgeson Date: Mon, 16 Nov 2009 14:59:17 -0500 Subject: +x deleteuser.php --- scripts/deleteuser.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/deleteuser.php diff --git a/scripts/deleteuser.php b/scripts/deleteuser.php old mode 100644 new mode 100755 -- cgit v1.2.3-54-g00ecf From e14c88f6c52fddeeb26c71f13e93db7a8fabdd3b Mon Sep 17 00:00:00 2001 From: Eric Helgeson Date: Mon, 16 Nov 2009 14:59:32 -0500 Subject: Consistant error for groups that dont exist in API --- actions/apigroupismember.php | 2 +- actions/apigroupjoin.php | 2 +- actions/apigroupleave.php | 2 +- actions/apigroupmembership.php | 5 +++++ actions/apigroupshow.php | 2 +- actions/apitimelinegroup.php | 8 +++++++- 6 files changed, 16 insertions(+), 5 deletions(-) diff --git a/actions/apigroupismember.php b/actions/apigroupismember.php index a822d18dd..08348e97b 100644 --- a/actions/apigroupismember.php +++ b/actions/apigroupismember.php @@ -92,7 +92,7 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction } if (empty($this->group)) { - $this->clientError('Group not found!', 404, $this->format); + $this->clientError(_('Group not found!'), 404, $this->format); return false; } diff --git a/actions/apigroupjoin.php b/actions/apigroupjoin.php index ffda3986f..b531d9501 100644 --- a/actions/apigroupjoin.php +++ b/actions/apigroupjoin.php @@ -101,7 +101,7 @@ class ApiGroupJoinAction extends ApiAuthAction } if (empty($this->group)) { - $this->clientError('Group not found!', 404, $this->format); + $this->clientError(_('Group not found!'), 404, $this->format); return false; } diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php index 8665ea1aa..514a3a557 100644 --- a/actions/apigroupleave.php +++ b/actions/apigroupleave.php @@ -101,7 +101,7 @@ class ApiGroupLeaveAction extends ApiAuthAction } if (empty($this->group)) { - $this->clientError('Group not found!', 404, $this->format); + $this->clientError(_('Group not found!'), 404, $this->format); return false; } diff --git a/actions/apigroupmembership.php b/actions/apigroupmembership.php index d221a6418..dd2843161 100644 --- a/actions/apigroupmembership.php +++ b/actions/apigroupmembership.php @@ -87,6 +87,11 @@ class ApiGroupMembershipAction extends ApiPrivateAuthAction { parent::handle($args); + if (empty($this->group)) { + $this->clientError(_('Group not found!'), 404, $this->format); + return false; + } + // XXX: RSS and Atom switch($this->format) { diff --git a/actions/apigroupshow.php b/actions/apigroupshow.php index b745ff92f..f9b960747 100644 --- a/actions/apigroupshow.php +++ b/actions/apigroupshow.php @@ -87,7 +87,7 @@ class ApiGroupShowAction extends ApiPrivateAuthAction if (empty($this->group)) { $this->clientError( - 'Group not found!', + _('Group not found!'), 404, $this->format ); diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php index f25f6ba51..de13e7eb9 100644 --- a/actions/apitimelinegroup.php +++ b/actions/apitimelinegroup.php @@ -69,7 +69,6 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction parent::prepare($args); $this->group = $this->getTargetGroup($this->arg('id')); - $this->notices = $this->getNotices(); return true; } @@ -87,6 +86,13 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction function handle($args) { parent::handle($args); + + if (empty($this->group)) { + $this->clientError(_('Group not found!'), 404, $this->format); + return false; + } + + $this->notices = $this->getNotices(); $this->showTimeline(); } -- cgit v1.2.3-54-g00ecf From a373d07ae00b878f47970f2e4a7d86c6ec3a65cf Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Mon, 16 Nov 2009 15:24:25 -0500 Subject: Allow plugin DB_DataObject classes to not have to use the .ini file by overriding keys(), table(), and sequenceKey() for them --- classes/Plugin_DataObject.php | 195 ++++++++++++++++++++++++ classes/statusnet.ini | 31 ---- lib/schema.php | 41 ++++- plugins/Authentication/AuthenticationPlugin.php | 11 +- plugins/Authentication/User_username.php | 22 ++- plugins/OpenID/OpenIDPlugin.php | 23 +-- plugins/OpenID/User_openid.php | 22 ++- plugins/OpenID/User_openid_trustroot.php | 20 ++- plugins/UserFlag/UserFlagPlugin.php | 11 +- plugins/UserFlag/User_flag_profile.php | 21 ++- 10 files changed, 318 insertions(+), 79 deletions(-) create mode 100644 classes/Plugin_DataObject.php diff --git a/classes/Plugin_DataObject.php b/classes/Plugin_DataObject.php new file mode 100644 index 000000000..d5cecf0f7 --- /dev/null +++ b/classes/Plugin_DataObject.php @@ -0,0 +1,195 @@ +. + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } + +require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; + +abstract class Plugin_DataObject extends Memcached_DataObject +{ + function table() { + static $table = null; + if($table == null) { + $table = array(); + $DB = $this->getDatabaseConnection(); + $dbtype = $DB->phptype; + $tableDef = $this->tableDef(); + foreach($tableDef->columns as $columnDef){ + switch(strtoupper($columnDef->type)) { + /*shamelessly copied from DB_DataObject_Generator*/ + case 'INT': + case 'INT2': // postgres + case 'INT4': // postgres + case 'INT8': // postgres + case 'SERIAL4': // postgres + case 'SERIAL8': // postgres + case 'INTEGER': + case 'TINYINT': + case 'SMALLINT': + case 'MEDIUMINT': + case 'BIGINT': + $type = DB_DATAOBJECT_INT; + if ($columnDef->size == 1) { + $type += DB_DATAOBJECT_BOOL; + } + break; + + case 'REAL': + case 'DOUBLE': + case 'DOUBLE PRECISION': // double precision (firebird) + case 'FLOAT': + case 'FLOAT4': // real (postgres) + case 'FLOAT8': // double precision (postgres) + case 'DECIMAL': + case 'MONEY': // mssql and maybe others + case 'NUMERIC': + case 'NUMBER': // oci8 + $type = DB_DATAOBJECT_INT; // should really by FLOAT!!! / MONEY... + break; + + case 'YEAR': + $type = DB_DATAOBJECT_INT; + break; + + case 'BIT': + case 'BOOL': + case 'BOOLEAN': + + $type = DB_DATAOBJECT_BOOL; + // postgres needs to quote '0' + if ($dbtype == 'pgsql') { + $type += DB_DATAOBJECT_STR; + } + break; + + case 'STRING': + case 'CHAR': + case 'VARCHAR': + case 'VARCHAR2': + case 'TINYTEXT': + + case 'ENUM': + case 'SET': // not really but oh well + + case 'POINT': // mysql geometry stuff - not really string - but will do.. + + case 'TIMESTAMPTZ': // postgres + case 'BPCHAR': // postgres + case 'INTERVAL': // postgres (eg. '12 days') + + case 'CIDR': // postgres IP net spec + case 'INET': // postgres IP + case 'MACADDR': // postgress network Mac address. + + case 'INTEGER[]': // postgres type + case 'BOOLEAN[]': // postgres type + + $type = DB_DATAOBJECT_STR; + break; + + case 'TEXT': + case 'MEDIUMTEXT': + case 'LONGTEXT': + + $type = DB_DATAOBJECT_STR + DB_DATAOBJECT_TXT; + break; + + + case 'DATE': + $type = DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE; + break; + + case 'TIME': + $type = DB_DATAOBJECT_STR + DB_DATAOBJECT_TIME; + break; + + + case 'DATETIME': + + $type = DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME; + break; + + case 'TIMESTAMP': // do other databases use this??? + + $type = ($dbtype == 'mysql') ? + DB_DATAOBJECT_MYSQLTIMESTAMP : + DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME; + break; + + + case 'BLOB': /// these should really be ignored!!!??? + case 'TINYBLOB': + case 'MEDIUMBLOB': + case 'LONGBLOB': + + case 'CLOB': // oracle character lob support + + case 'BYTEA': // postgres blob support.. + $type = DB_DATAOBJECT_STR + DB_DATAOBJECT_BLOB; + break; + + default: + throw new Exception("Cannot handle datatype: $columnDef->type"); + } + if(! $columnDef->nullable) { + $type+=DB_DATAOBJECT_NOTNULL; + } + $table[$columnDef->name]=$type; + } + } + return $table; + } + + function keys() { + static $keys = null; + if($keys == null) { + $keys = array(); + $tableDef = $this->tableDef(); + foreach($tableDef->columns as $columnDef){ + if($columnDef->key != null){ + $keys[] = $columnDef->name; + } + } + } + return $keys; + } + + function sequenceKey() { + static $sequenceKey = null; + if($sequenceKey == null) { + $sequenceKey = array(false,false); + $tableDef = $this->tableDef(); + foreach($tableDef->columns as $columnDef){ + if($columnDef->key == 'PRI' && $columnDef->auto_increment){ + $sequenceKey=array($columnDef->name,true); + } + } + } + return $sequenceKey; + } + + /** + * Get the TableDef object that represents the table backing this class + * Ideally, this function would a static function, but PHP doesn't allow + * abstract static functions + * @return TableDef TableDef instance + */ + abstract function tableDef(); +} + diff --git a/classes/statusnet.ini b/classes/statusnet.ini index 19ab7bf97..8572ea8ac 100644 --- a/classes/statusnet.ini +++ b/classes/statusnet.ini @@ -526,27 +526,6 @@ modified = 384 [user_group__keys] id = N -[user_openid] -canonical = 130 -display = 130 -user_id = 129 -created = 142 -modified = 384 - -[user_openid__keys] -canonical = K -display = U - -[user_openid_trustroot] -trustroot = 130 -user_id = 129 -created = 142 -modified = 384 - -[user_openid__keys] -trustroot = K -user_id = K - [user_role] user_id = 129 role = 130 @@ -566,13 +545,3 @@ 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/lib/schema.php b/lib/schema.php index 1e0c1f3e9..560884d9f 100644 --- a/lib/schema.php +++ b/lib/schema.php @@ -372,6 +372,26 @@ class Schema return true; } + /** + * Ensures that the table that backs a given + * Plugin_DataObject class exists. + * + * If the table does not yet exist, it will + * create the table. If it does exist, it will + * alter the table to match the column definitions. + * + * @param Plugin_DataObject $dataObjectClass + * + * @return boolean success flag + */ + + public function ensureDataObject($dataObjectClass) + { + $obj = new $dataObjectClass(); + $tableDef = $obj->tableDef(); + return $this->ensureTable($tableDef->name,$tableDef->columns); + } + /** * Ensures that a table exists with the given * name and the given column definitions. @@ -544,6 +564,19 @@ class TableDef public $name; /** array of ColumnDef objects for the columns. */ public $columns; + + /** + * Constructor. + * + * @param string $name name of the table + * @param array $columns columns in the table + */ + + function __construct($name=null,$columns=null) + { + $this->name = $name; + $this->columns = $columns; + } } /** @@ -576,6 +609,8 @@ class ColumnDef /** 'extra' stuff. Returned by MySQL, largely * unused. */ public $extra; + /** auto increment this field if no value is specific for it during an insert **/ + public $auto_increment; /** * Constructor. @@ -591,7 +626,7 @@ class ColumnDef function __construct($name=null, $type=null, $size=null, $nullable=true, $key=null, $default=null, - $extra=null) + $extra=null, $auto_increment=false) { $this->name = strtolower($name); $this->type = strtolower($type); @@ -600,6 +635,7 @@ class ColumnDef $this->key = $key; $this->default = $default; $this->extra = $extra; + $this->auto_increment = $auto_increment; } /** @@ -617,7 +653,8 @@ class ColumnDef $this->_typeMatch($other) && $this->_defaultMatch($other) && $this->_nullMatch($other) && - $this->key == $other->key); + $this->key == $other->key && + $this->auto_increment == $other->auto_increment); } /** diff --git a/plugins/Authentication/AuthenticationPlugin.php b/plugins/Authentication/AuthenticationPlugin.php index a76848b04..a80da901c 100644 --- a/plugins/Authentication/AuthenticationPlugin.php +++ b/plugins/Authentication/AuthenticationPlugin.php @@ -204,16 +204,7 @@ abstract class AuthenticationPlugin extends Plugin 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'))); + $schema->ensureDataObject(User_username); return true; } diff --git a/plugins/Authentication/User_username.php b/plugins/Authentication/User_username.php index f30f60d83..6826f2681 100644 --- a/plugins/Authentication/User_username.php +++ b/plugins/Authentication/User_username.php @@ -2,9 +2,9 @@ /** * Table Definition for user_username */ -require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; +require_once INSTALLDIR.'/classes/Plugin_DataObject.php'; -class User_username extends Memcached_DataObject +class User_username extends Plugin_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ @@ -43,4 +43,22 @@ class User_username extends Memcached_DataObject return false; } } + + /** + * Get the TableDef object that represents the table backing this class + * @return TableDef TableDef instance + */ + function tableDef() + { + return new TableDef($this->__table, + array(new ColumnDef('provider_name', 'varchar', + '255', false, 'PRI'), + new ColumnDef('username', 'varchar', + '255', false, 'PRI'), + new ColumnDef('user_id', 'integer', + null, false), + new ColumnDef('created', 'datetime', + null, false), + new ColumnDef('modified', 'timestamp'))); + } } diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php index 55c0eadaf..88e23ea3e 100644 --- a/plugins/OpenID/OpenIDPlugin.php +++ b/plugins/OpenID/OpenIDPlugin.php @@ -156,6 +156,9 @@ class OpenIDPlugin extends Plugin case 'User_openid': require_once(INSTALLDIR.'/plugins/OpenID/User_openid.php'); return false; + case 'User_openid_trustroot': + require_once(INSTALLDIR.'/plugins/OpenID/User_openid_trustroot.php'); + return false; default: return true; } @@ -278,24 +281,8 @@ class OpenIDPlugin extends Plugin function onCheckSchema() { $schema = Schema::get(); - $schema->ensureTable('user_openid', - array(new ColumnDef('canonical', 'varchar', - '255', false, 'PRI'), - new ColumnDef('display', 'varchar', - '255', false), - new ColumnDef('user_id', 'integer', - null, false, 'MUL'), - new ColumnDef('created', 'datetime', - null, false), - new ColumnDef('modified', 'timestamp'))); - $schema->ensureTable('user_openid_trustroot', - array(new ColumnDef('trustroot', 'varchar', - '255', false, 'PRI'), - new ColumnDef('user_id', 'integer', - null, false, 'PRI'), - new ColumnDef('created', 'datetime', - null, false), - new ColumnDef('modified', 'timestamp'))); + $schema->ensureDataObject(User_openid); + $schema->ensureDataObject(User_openid_trustroot); return true; } diff --git a/plugins/OpenID/User_openid.php b/plugins/OpenID/User_openid.php index 338e0f6e9..c3624118e 100644 --- a/plugins/OpenID/User_openid.php +++ b/plugins/OpenID/User_openid.php @@ -2,9 +2,9 @@ /** * Table Definition for user_openid */ -require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; +require_once INSTALLDIR.'/classes/Plugin_DataObject.php'; -class User_openid extends Memcached_DataObject +class User_openid extends Plugin_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ @@ -33,4 +33,22 @@ class User_openid extends Memcached_DataObject return ($cnt > 0); } + + /** + * Get the TableDef object that represents the table backing this class + * @return TableDef TableDef instance + */ + function tableDef() + { + return new TableDef($this->__table, + array(new ColumnDef('canonical', 'varchar', + '255', false, 'PRI'), + new ColumnDef('display', 'varchar', + '255', false), + new ColumnDef('user_id', 'integer', + null, false, 'MUL'), + new ColumnDef('created', 'datetime', + null, false), + new ColumnDef('modified', 'timestamp'))); + } } diff --git a/plugins/OpenID/User_openid_trustroot.php b/plugins/OpenID/User_openid_trustroot.php index 4654b72df..b208dddfd 100644 --- a/plugins/OpenID/User_openid_trustroot.php +++ b/plugins/OpenID/User_openid_trustroot.php @@ -2,9 +2,9 @@ /** * Table Definition for user_openid_trustroot */ -require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; +require_once INSTALLDIR.'/classes/Plugin_DataObject.php'; -class User_openid_trustroot extends Memcached_DataObject +class User_openid_trustroot extends Plugin_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ @@ -26,4 +26,20 @@ class User_openid_trustroot extends Memcached_DataObject { return Memcached_DataObject::pkeyGet('User_openid_trustroot', $kv); } + + /** + * Get the TableDef object that represents the table backing this class + * @return TableDef TableDef instance + */ + function tableDef() + { + return new TableDef($this->__table, + array(new ColumnDef('trustroot', 'varchar', + '255', false, 'PRI'), + new ColumnDef('user_id', 'integer', + null, false, 'PRI'), + new ColumnDef('created', 'datetime', + null, false), + new ColumnDef('modified', 'timestamp'))); + } } diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php index 6410ee1ce..df7eac7a2 100644 --- a/plugins/UserFlag/UserFlagPlugin.php +++ b/plugins/UserFlag/UserFlagPlugin.php @@ -48,16 +48,7 @@ class UserFlagPlugin extends Plugin $schema = Schema::get(); // For storing user-submitted flags on profiles - - $schema->ensureTable('user_flag_profile', - array(new ColumnDef('profile_id', 'integer', null, - false, 'PRI'), - new ColumnDef('user_id', 'integer', null, - false, 'PRI'), - new ColumnDef('created', 'datetime', null, - false, 'MUL'), - new ColumnDef('cleared', 'datetime', null, - true, 'MUL'))); + $schema->ensureDataObject(User_flag_profile); return true; } diff --git a/plugins/UserFlag/User_flag_profile.php b/plugins/UserFlag/User_flag_profile.php index 30bd4ae68..2fb27912d 100644 --- a/plugins/UserFlag/User_flag_profile.php +++ b/plugins/UserFlag/User_flag_profile.php @@ -21,9 +21,9 @@ if (!defined('STATUSNET')) { exit(1); } -require_once INSTALLDIR . '/classes/Memcached_DataObject.php'; +require_once INSTALLDIR.'/classes/Plugin_DataObject.php'; -class User_flag_profile extends Memcached_DataObject +class User_flag_profile extends Plugin_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ @@ -65,4 +65,21 @@ class User_flag_profile extends Memcached_DataObject return !empty($ufp); } + + /** + * Get the TableDef object that represents the table backing this class + * @return TableDef TableDef instance + */ + function tableDef() + { + return new TableDef($this->__table, + array(new ColumnDef('profile_id', 'integer', null, + false, 'PRI'), + new ColumnDef('user_id', 'integer', null, + false, 'PRI'), + new ColumnDef('created', 'datetime', null, + false, 'MUL'), + new ColumnDef('cleared', 'datetime', null, + true, 'MUL'))); + } } -- cgit v1.2.3-54-g00ecf From a99198ba94766dcfb58d4cc16358dc1438df422a Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Mon, 16 Nov 2009 15:57:57 -0500 Subject: Do proper translations for plurals --- lib/command.php | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/lib/command.php b/lib/command.php index 0c98c94ac..7e98156b6 100644 --- a/lib/command.php +++ b/lib/command.php @@ -617,8 +617,11 @@ class SubscriptionsCommand extends Command if(count($nicknames)==0){ $out=_('You are not subscribed to anyone.'); }else{ - $out=_('You are subscribed to these people: '); - $out.=implode(', ',$nicknames); + $out = ngettext('You are subscribed to this person:', + 'You are subscribed to these people:', + count($nicknames)); + $out .= ' '; + $out .= implode(', ',$nicknames); } $channel->output($this->user,$out); } @@ -636,8 +639,11 @@ class SubscribersCommand extends Command if(count($nicknames)==0){ $out=_('No one is subscribed to you.'); }else{ - $out=_('These people are subscribed to you: '); - $out.=implode(', ',$nicknames); + $out = ngettext('This person is subscribed to you:', + 'These people are subscribed to you:', + count($nicknames)); + $out .= ' '; + $out .= implode(', ',$nicknames); } $channel->output($this->user,$out); } @@ -655,7 +661,9 @@ class GroupsCommand extends Command if(count($groups)==0){ $out=_('You are not a member of any groups.'); }else{ - $out=_('You are a member of these groups: '); + $out = ngettext('You are a member of this group:', + 'You are a member of these groups:', + count($nicknames)); $out.=implode(', ',$groups); } $channel->output($this->user,$out); -- cgit v1.2.3-54-g00ecf From 6f9b90921188f477f8b8224c12d6ea7e8b3cc1d3 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 16 Nov 2009 15:36:30 -0800 Subject: Fix for PHP spewing notices from commit a373d07ae00b878f47970f2e4a7d86c6ec3a65cf Please test with error_reporting set to E_ALL! Classnames and function names aren't first-class objects in PHP and need to be referenced as strings here. :( --- plugins/Authentication/AuthenticationPlugin.php | 2 +- plugins/OpenID/OpenIDPlugin.php | 4 ++-- plugins/UserFlag/UserFlagPlugin.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/Authentication/AuthenticationPlugin.php b/plugins/Authentication/AuthenticationPlugin.php index a80da901c..1b9084187 100644 --- a/plugins/Authentication/AuthenticationPlugin.php +++ b/plugins/Authentication/AuthenticationPlugin.php @@ -204,7 +204,7 @@ abstract class AuthenticationPlugin extends Plugin function onCheckSchema() { $schema = Schema::get(); - $schema->ensureDataObject(User_username); + $schema->ensureDataObject('User_username'); return true; } diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php index 88e23ea3e..6dd8a3f5a 100644 --- a/plugins/OpenID/OpenIDPlugin.php +++ b/plugins/OpenID/OpenIDPlugin.php @@ -281,8 +281,8 @@ class OpenIDPlugin extends Plugin function onCheckSchema() { $schema = Schema::get(); - $schema->ensureDataObject(User_openid); - $schema->ensureDataObject(User_openid_trustroot); + $schema->ensureDataObject('User_openid'); + $schema->ensureDataObject('User_openid_trustroot'); return true; } diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php index df7eac7a2..b4d48c74b 100644 --- a/plugins/UserFlag/UserFlagPlugin.php +++ b/plugins/UserFlag/UserFlagPlugin.php @@ -48,7 +48,7 @@ class UserFlagPlugin extends Plugin $schema = Schema::get(); // For storing user-submitted flags on profiles - $schema->ensureDataObject(User_flag_profile); + $schema->ensureDataObject('User_flag_profile'); return true; } -- cgit v1.2.3-54-g00ecf From 8ab40e70518402071f50263ebae8cf9633500405 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 16 Nov 2009 15:35:16 -0800 Subject: Cleanup for bug 1813: workaround sometimes-missing dl() in PHP 5.3 by defining our own bogus function rather than attempting to patch upstream libs. This keeps our fix across upstream versions (or when loading upstream library from outside extlib) Note that fixes to OpenID libraries in commit fe9473ac7810d317e001a0fec19cbacaafc0c909 were lost in just such an update. --- extlib/PEAR.php | 2 +- lib/common.php | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/extlib/PEAR.php b/extlib/PEAR.php index fcefa964a..4c24c6006 100644 --- a/extlib/PEAR.php +++ b/extlib/PEAR.php @@ -746,7 +746,7 @@ class PEAR { if (!extension_loaded($ext)) { // if either returns true dl() will produce a FATAL error, stop that - if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1) || !function_exists('dl')) { + if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1)) { return false; } if (OS_WINDOWS) { diff --git a/lib/common.php b/lib/common.php index 4524d50fa..063d7d9d9 100644 --- a/lib/common.php +++ b/lib/common.php @@ -45,6 +45,14 @@ define('FOREIGN_FRIEND_RECV', 2); set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/extlib/'); +# To protect against upstream libraries which haven't updated +# for PHP 5.3 where dl() function may not be present... +if (!function_exists('dl')) { + function dl($library) { + return false; + } +} + # global configuration object require_once('PEAR.php'); -- cgit v1.2.3-54-g00ecf From 75c00f0054c08c7b49515c849260afbb6913f525 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 16 Nov 2009 17:25:38 -0800 Subject: Bug 1655/bug 1905: fix for Internet Explorer receiving FOAF output when clicking user links. User links using the ID number (such as created for @-replies) have been failing on Internet Explorer, since IE doesn't bother to actually say it supports text/html... We usually get something like this from IE, up through at least IE 8: Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/x-shockwave-flash, */* The */* ended up matching application/rdf+xml instead of text/html, so only other browsers which are more explicit would actually get sent on to the user profile/notice stream; IE visitors were directed on to the FOAF download. :( Swapping the order of items in the server-side of the negotiation list fixes this; clients actually asking for FOAF at a higher priority than HTML will still get it, but the wildcard */* now matches text/html which is usually what we want. Content negotiation for the user links was added August 2008 in commit 48fcfb8b0daeb272cb9d116af617daf15930d909. --- actions/userbyid.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/actions/userbyid.php b/actions/userbyid.php index 802bcb081..86a61f20b 100644 --- a/actions/userbyid.php +++ b/actions/userbyid.php @@ -74,8 +74,11 @@ class UserbyidAction extends Action $this->clientError(_('No such user.')); } - // support redirecting to FOAF rdf/xml if the agent prefers it - $page_prefs = 'application/rdf+xml,text/html,application/xhtml+xml,application/xml;q=0.3,text/xml;q=0.2'; + // Support redirecting to FOAF rdf/xml if the agent prefers it... + // Internet Explorer doesn't specify "text/html" and does list "*/*" + // at least through version 8. We need to list text/html up front to + // ensure that only user-agents who specifically ask for RDF get it. + $page_prefs = 'text/html,application/xhtml+xml,application/rdf+xml,application/xml;q=0.3,text/xml;q=0.2'; $httpaccept = isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : null; $type = common_negotiate_type(common_accept_to_prefs($httpaccept), -- cgit v1.2.3-54-g00ecf