From ff81384ee35347b52360ef17e3537bd741a20568 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 9 Nov 2009 11:10:24 +0000 Subject: Fixed notice option alignment in IE --- theme/base/css/ie.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css index 84bc1b1d6..4e50aadbe 100644 --- a/theme/base/css/ie.css +++ b/theme/base/css/ie.css @@ -27,11 +27,8 @@ padding:0 4px; } .notice-options input.submit { font-size:0; -margin-top:3px; -height:16px; text-align:right; text-indent:0; -width:24px; } .notice div.entry-content .timestamp a { margin-right:4px; -- cgit v1.2.3-54-g00ecf From 2577c85a38f94612f29183b6a0a36f14d1c1f07d Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 9 Nov 2009 11:11:06 +0000 Subject: Added flag icon for UserFlag plugin --- plugins/UserFlag/flag.gif | Bin 0 -> 80 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 plugins/UserFlag/flag.gif diff --git a/plugins/UserFlag/flag.gif b/plugins/UserFlag/flag.gif new file mode 100644 index 000000000..68c8aee25 Binary files /dev/null and b/plugins/UserFlag/flag.gif differ -- cgit v1.2.3-54-g00ecf From 22310d17a4886d5382832caee43da0bcf7914419 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 9 Nov 2009 13:45:10 -0500 Subject: shorten flag notification and include a class --- plugins/UserFlag/UserFlagPlugin.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php index 2376bb859..fe4a74869 100644 --- a/plugins/UserFlag/UserFlagPlugin.php +++ b/plugins/UserFlag/UserFlagPlugin.php @@ -102,8 +102,7 @@ class UserFlagPlugin extends Plugin $action->elementStart('li', 'entity_flag'); if (User_flag_profile::exists($profile->id, $user->id)) { - $action->element('p', array(), - _('Flagged for review')); + $action->element('p', 'flagged', _('Flagged')); } else { $form = new FlagProfileForm($action, $profile, array('action' => 'showstream', -- cgit v1.2.3-54-g00ecf From 088081675fb7d5250a9b9dfe5015de0822cb5ac2 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 9 Nov 2009 20:01:46 +0100 Subject: Revert "Remove more contractions" This reverts commit 5ab709b73977131813884558bf56d97172a7aa26. Missed this one yesterday... --- actions/allrss.php | 2 +- actions/apiaccountratelimitstatus.php | 2 +- actions/apifriendshipsdestroy.php | 2 +- actions/attachment.php | 4 ++-- actions/avatarbynickname.php | 2 +- actions/groupblock.php | 2 +- actions/login.php | 2 +- actions/logout.php | 2 +- actions/newmessage.php | 2 +- actions/newnotice.php | 2 +- actions/opensearch.php | 2 +- actions/passwordsettings.php | 2 +- actions/register.php | 2 +- actions/showgroup.php | 2 +- actions/showmessage.php | 8 ++++---- actions/shownotice.php | 6 +++--- actions/showstream.php | 2 +- actions/sup.php | 2 +- actions/twitapisearchatom.php | 2 +- actions/twitapitrends.php | 2 +- classes/File_redirection.php | 8 ++++---- classes/Notice.php | 6 +++--- classes/Profile.php | 4 ++-- classes/User.php | 6 +++--- lib/api.php | 14 +++++++------- lib/apiauth.php | 2 +- lib/dberroraction.php | 6 +++--- lib/error.php | 4 ++-- lib/htmloutputter.php | 2 +- lib/imagefile.php | 2 +- lib/jabber.php | 2 +- lib/mail.php | 6 +++--- lib/noticelist.php | 4 ++-- lib/queuehandler.php | 12 ++++++------ lib/rssaction.php | 2 +- lib/search_engines.php | 2 +- lib/util.php | 12 ++++++------ lib/xmloutputter.php | 2 +- lib/xmppqueuehandler.php | 2 +- plugins/Autocomplete/autocomplete.php | 2 +- plugins/BlogspamNetPlugin.php | 2 +- plugins/Facebook/FBConnectAuth.php | 4 ++-- plugins/Facebook/FacebookPlugin.php | 4 ++-- plugins/Facebook/facebook/facebook.php | 8 ++++---- plugins/Facebook/facebook/facebook_desktop.php | 2 +- plugins/Facebook/facebook/facebookapi_php5_restlib.php | 6 +++--- plugins/Facebook/facebook/jsonwrapper/jsonwrapper.php | 2 +- plugins/Facebook/facebookaction.php | 6 +++--- plugins/GeonamesPlugin.php | 8 ++++---- plugins/OpenID/finishopenidlogin.php | 4 ++-- plugins/OpenID/openid.php | 2 +- plugins/PiwikAnalyticsPlugin.php | 2 +- plugins/Realtime/RealtimePlugin.php | 2 +- plugins/TwitterBridge/daemons/synctwitterfriends.php | 2 +- plugins/TwitterBridge/daemons/twitterstatusfetcher.php | 4 ++-- plugins/TwitterBridge/twitter.php | 2 +- scripts/console.php | 4 ++-- scripts/maildaemon.php | 2 +- scripts/xmppconfirmhandler.php | 2 +- 59 files changed, 110 insertions(+), 110 deletions(-) diff --git a/actions/allrss.php b/actions/allrss.php index 4a5d15c7b..28b1be27d 100644 --- a/actions/allrss.php +++ b/actions/allrss.php @@ -56,7 +56,7 @@ class AllrssAction extends Rss10Action * * @param array $args Web and URL arguments * - * @return boolean false if user does not exist + * @return boolean false if user doesn't exist */ function prepare($args) { diff --git a/actions/apiaccountratelimitstatus.php b/actions/apiaccountratelimitstatus.php index c7c0e7c00..96179f175 100644 --- a/actions/apiaccountratelimitstatus.php +++ b/actions/apiaccountratelimitstatus.php @@ -36,7 +36,7 @@ if (!defined('STATUSNET')) { require_once INSTALLDIR . '/lib/apibareauth.php'; /** - * We do not have a rate limit, but some clients check this method. + * We don't have a rate limit, but some clients check this method. * It always returns the same thing: 150 hits left. * * @category API diff --git a/actions/apifriendshipsdestroy.php b/actions/apifriendshipsdestroy.php index fb73624c9..3d9b7e001 100644 --- a/actions/apifriendshipsdestroy.php +++ b/actions/apifriendshipsdestroy.php @@ -113,7 +113,7 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction return; } - // Do not allow unsubscribing from yourself! + // Don't allow unsubscribing from yourself! if ($this->user->id == $this->other->id) { $this->clientError( diff --git a/actions/attachment.php b/actions/attachment.php index ca9e57845..6981354d1 100644 --- a/actions/attachment.php +++ b/actions/attachment.php @@ -146,7 +146,7 @@ class AttachmentAction extends Action } /** - * Do not show local navigation + * Don't show local navigation * * @return void */ @@ -170,7 +170,7 @@ class AttachmentAction extends Action } /** - * Do not show page notice + * Don't show page notice * * @return void */ diff --git a/actions/avatarbynickname.php b/actions/avatarbynickname.php index 1a6925e11..537950792 100644 --- a/actions/avatarbynickname.php +++ b/actions/avatarbynickname.php @@ -49,7 +49,7 @@ class AvatarbynicknameAction extends Action * * @param array $args query arguments * - * @return boolean false if nickname or user is not found + * @return boolean false if nickname or user isn't found */ function handle($args) { diff --git a/actions/groupblock.php b/actions/groupblock.php index 133101eb7..979a56a81 100644 --- a/actions/groupblock.php +++ b/actions/groupblock.php @@ -95,7 +95,7 @@ class GroupblockAction extends Action $this->clientError(_('User is already blocked from group.')); return false; } - // XXX: could have proactive blocks, but we do not have UI for it. + // XXX: could have proactive blocks, but we don't have UI for it. if (!$this->profile->isMember($this->group)) { $this->clientError(_('User is not a member of group.')); return false; diff --git a/actions/login.php b/actions/login.php index 679817520..ad57dd667 100644 --- a/actions/login.php +++ b/actions/login.php @@ -159,7 +159,7 @@ class LoginAction extends Action $url = common_get_returnto(); if ($url) { - // We do not have to return to it again + // We don't have to return to it again common_set_returnto(null); } else { $url = common_local_url('all', diff --git a/actions/logout.php b/actions/logout.php index 7e768fca6..1e0adae57 100644 --- a/actions/logout.php +++ b/actions/logout.php @@ -81,7 +81,7 @@ class LogoutAction extends Action { common_set_user(null); common_real_login(false); // not logged in - common_forgetme(); // do not log back in! + common_forgetme(); // don't log back in! } } diff --git a/actions/newmessage.php b/actions/newmessage.php index 73307fdfc..0db2e7181 100644 --- a/actions/newmessage.php +++ b/actions/newmessage.php @@ -61,7 +61,7 @@ class NewmessageAction extends Action /** * Title of the page * - * Note that this usually does not get called unless something went wrong + * Note that this usually doesn't get called unless something went wrong * * @return string page title */ diff --git a/actions/newnotice.php b/actions/newnotice.php index fc06e5c98..fbd7ab6bc 100644 --- a/actions/newnotice.php +++ b/actions/newnotice.php @@ -59,7 +59,7 @@ class NewnoticeAction extends Action /** * Title of the page * - * Note that this usually does not get called unless something went wrong + * Note that this usually doesn't get called unless something went wrong * * @return string page title */ diff --git a/actions/opensearch.php b/actions/opensearch.php index b205d2fe2..861b53d7d 100644 --- a/actions/opensearch.php +++ b/actions/opensearch.php @@ -52,7 +52,7 @@ class OpensearchAction extends Action * * @param array $args query arguments * - * @return boolean false if user does not exist + * @return boolean false if user doesn't exist */ function handle($args) { diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php index 6658d279f..87eb45a7d 100644 --- a/actions/passwordsettings.php +++ b/actions/passwordsettings.php @@ -97,7 +97,7 @@ class PasswordsettingsAction extends AccountSettingsAction $this->elementStart('ul', 'form_data'); - // Users who logged in with OpenID will not have a pwd + // Users who logged in with OpenID won't have a pwd if ($user->password) { $this->elementStart('li'); $this->password('oldpassword', _('Old password')); diff --git a/actions/register.php b/actions/register.php index c4f6760aa..57f8e7bdf 100644 --- a/actions/register.php +++ b/actions/register.php @@ -174,7 +174,7 @@ class RegisterAction extends Action $bio = $this->trimmed('bio'); $location = $this->trimmed('location'); - // We do not trim these... whitespace is OK in a password! + // We don't trim these... whitespace is OK in a password! $password = $this->arg('password'); $confirm = $this->arg('confirm'); diff --git a/actions/showgroup.php b/actions/showgroup.php index ae956befa..a4af29391 100644 --- a/actions/showgroup.php +++ b/actions/showgroup.php @@ -418,7 +418,7 @@ class ShowgroupAction extends GroupDesignAction // XXX: WORM cache this $members = $this->group->getMembers(); $members_count = 0; - /** $member->count() does not work. */ + /** $member->count() doesn't work. */ while ($members->fetch()) { $members_count++; } diff --git a/actions/showmessage.php b/actions/showmessage.php index cf3a819c1..db757948b 100644 --- a/actions/showmessage.php +++ b/actions/showmessage.php @@ -137,7 +137,7 @@ class ShowmessageAction extends MailboxAction } /** - * Do not show local navigation + * Don't show local navigation * * @return void */ @@ -147,7 +147,7 @@ class ShowmessageAction extends MailboxAction } /** - * Do not show page notice + * Don't show page notice * * @return void */ @@ -157,7 +157,7 @@ class ShowmessageAction extends MailboxAction } /** - * Do not show aside + * Don't show aside * * @return void */ @@ -167,7 +167,7 @@ class ShowmessageAction extends MailboxAction } /** - * Do not show any instructions + * Don't show any instructions * * @return string */ diff --git a/actions/shownotice.php b/actions/shownotice.php index 688089f02..5d16fdad9 100644 --- a/actions/shownotice.php +++ b/actions/shownotice.php @@ -208,7 +208,7 @@ class ShownoticeAction extends OwnerDesignAction } /** - * Do not show local navigation + * Don't show local navigation * * @return void */ @@ -234,7 +234,7 @@ class ShownoticeAction extends OwnerDesignAction } /** - * Do not show page notice + * Don't show page notice * * @return void */ @@ -244,7 +244,7 @@ class ShownoticeAction extends OwnerDesignAction } /** - * Do not show aside + * Don't show aside * * @return void */ diff --git a/actions/showstream.php b/actions/showstream.php index 4952ebdb7..663638c18 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -253,7 +253,7 @@ class ShowstreamAction extends ProfileAction } } -// We do not show the author for a profile, since we already know who it is! +// We don't show the author for a profile, since we already know who it is! class ProfileNoticeList extends NoticeList { diff --git a/actions/sup.php b/actions/sup.php index a199f247e..5daf0a1c1 100644 --- a/actions/sup.php +++ b/actions/sup.php @@ -61,7 +61,7 @@ class SupAction extends Action $notice = new Notice(); # XXX: cache this. Depends on how big this protocol becomes; - # Re-doing this query every 15 seconds is not the end of the world. + # Re-doing this query every 15 seconds isn't the end of the world. $divider = common_sql_date(time() - $seconds); diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php index 511d7cdc6..7d618c471 100644 --- a/actions/twitapisearchatom.php +++ b/actions/twitapisearchatom.php @@ -250,7 +250,7 @@ class TwitapisearchatomAction extends ApiAction } // FIXME: this alternate link is not quite right because our - // web-based notice search does not support a rpp (responses per + // web-based notice search doesn't support a rpp (responses per // page) param yet $this->element('link', array('type' => 'text/html', diff --git a/actions/twitapitrends.php b/actions/twitapitrends.php index 2d17e77cc..779405e6d 100644 --- a/actions/twitapitrends.php +++ b/actions/twitapitrends.php @@ -55,7 +55,7 @@ class TwitapitrendsAction extends ApiAction * * @param array $args Web and URL arguments * - * @return boolean false if user does not exist + * @return boolean false if user doesn't exist */ function prepare($args) { diff --git a/classes/File_redirection.php b/classes/File_redirection.php index c951c1ee7..08a6e8d8b 100644 --- a/classes/File_redirection.php +++ b/classes/File_redirection.php @@ -53,7 +53,7 @@ class File_redirection extends Memcached_DataObject 'connect_timeout' => 10, // # seconds to wait 'max_redirs' => $redirs, // # max number of http redirections to follow 'follow_redirects' => true, // Follow redirects - 'store_body' => false, // We will not need body content here. + 'store_body' => false, // We won't need body content here. )); return $request; } @@ -81,12 +81,12 @@ class File_redirection extends Memcached_DataObject } try { $request = self::_commonHttp($short_url, $redirs); - // Do not include body in output + // Don't include body in output $request->setMethod(HTTP_Request2::METHOD_HEAD); $response = $request->send(); if (405 == $response->getStatus()) { - // Server does not support HEAD method? Can this really happen? + // Server doesn't support HEAD method? Can this really happen? // We'll try again as a GET and ignore the response data. $request = self::_commonHttp($short_url, $redirs); $response = $request->send(); @@ -178,7 +178,7 @@ class File_redirection extends Memcached_DataObject case 'aim': case 'jabber': case 'xmpp': - // do not touch anything + // don't touch anything break; default: diff --git a/classes/Notice.php b/classes/Notice.php index 32a8b693c..9886875cb 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -146,7 +146,7 @@ class Notice extends Memcached_DataObject /* Add them to the database */ foreach(array_unique($hashtags) as $hashtag) { - /* elide characters we do not want in the tag */ + /* elide characters we don't want in the tag */ $this->saveTag($hashtag); } return true; @@ -1105,7 +1105,7 @@ class Notice extends Memcached_DataObject if (empty($recipient)) { continue; } - // Do not save replies from blocked profile to local user + // Don't save replies from blocked profile to local user $recipient_user = User::staticGet('id', $recipient->id); if (!empty($recipient_user) && $recipient_user->hasBlocked($sender)) { continue; @@ -1131,7 +1131,7 @@ class Notice extends Memcached_DataObject $tagged = Profile_tag::getTagged($sender->id, $tag); foreach ($tagged as $t) { if (!$replied[$t->id]) { - // Do not save replies from blocked profile to local user + // Don't save replies from blocked profile to local user $t_user = User::staticGet('id', $t->id); if ($t_user && $t_user->hasBlocked($sender)) { continue; diff --git a/classes/Profile.php b/classes/Profile.php index a50f4951d..7c1e9db33 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -101,7 +101,7 @@ class Profile extends Memcached_DataObject } foreach (array(AVATAR_PROFILE_SIZE, AVATAR_STREAM_SIZE, AVATAR_MINI_SIZE) as $size) { - # We do not do a scaled one if original is our scaled size + # We don't do a scaled one if original is our scaled size if (!($avatar->width == $size && $avatar->height == $size)) { $scaled_filename = $imagefile->resize($size); @@ -174,7 +174,7 @@ class Profile extends Memcached_DataObject function getNotices($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0, $since=null) { - // XXX: I'm not sure this is going to be any faster. It probably is not. + // XXX: I'm not sure this is going to be any faster. It probably isn't. $ids = Notice::stream(array($this, '_streamDirect'), array(), 'profile:notice_ids:' . $this->id, diff --git a/classes/User.php b/classes/User.php index c529b82e0..9b90ce61b 100644 --- a/classes/User.php +++ b/classes/User.php @@ -87,7 +87,7 @@ class User extends Memcached_DataObject return (is_null($sub)) ? false : true; } - // 'update' will not write key columns, so we have to do it ourselves. + // 'update' won't write key columns, so we have to do it ourselves. function updateKeys(&$orig) { @@ -384,7 +384,7 @@ class User extends Memcached_DataObject return false; } - // Otherwise, cache does not have all faves; + // Otherwise, cache doesn't have all faves; // fall through to the default } @@ -463,7 +463,7 @@ class User extends Memcached_DataObject { $cache = common_memcache(); if ($cache) { - // Faves do not happen chronologically, so we need to blow + // Faves don't happen chronologically, so we need to blow // ;last cache, too $cache->delete(common_cache_key('fave:ids_by_user:'.$this->id)); $cache->delete(common_cache_key('fave:ids_by_user:'.$this->id.';last')); diff --git a/lib/api.php b/lib/api.php index fb4c4289b..a1236ab7e 100644 --- a/lib/api.php +++ b/lib/api.php @@ -66,7 +66,7 @@ class ApiAction extends Action * * @param array $args Web and URL arguments * - * @return boolean false if user does not exist + * @return boolean false if user doesn't exist */ function prepare($args) @@ -138,7 +138,7 @@ class ApiAction extends Action $design = null; $user = $profile->getUser(); - // Note: some profiles do not have an associated user + // Note: some profiles don't have an associated user if (!empty($user)) { $design = $user->getDesign(); @@ -203,7 +203,7 @@ class ApiAction extends Action if ($get_notice) { $notice = $profile->getCurrentNotice(); if ($notice) { - # do not get user! + # don't get user! $twitter_user['status'] = $this->twitterStatusArray($notice, false); } } @@ -263,7 +263,7 @@ class ApiAction extends Action } if ($include_user) { - # Do not get notice (recursive!) + # Don't get notice (recursive!) $twitter_user = $this->twitterUserArray($profile, false); $twitter_status['user'] = $twitter_user; } @@ -1074,7 +1074,7 @@ class ApiAction extends Action function initTwitterAtom() { $this->startXML(); - // FIXME: do not hardcode the language here! + // FIXME: don't hardcode the language here! $this->elementStart('feed', array('xmlns' => 'http://www.w3.org/2005/Atom', 'xml:lang' => 'en-US', 'xmlns:thr' => 'http://purl.org/syndication/thread/1.0')); @@ -1116,7 +1116,7 @@ class ApiAction extends Action return User::staticGet('nickname', $nickname); } else if ($this->arg('user_id')) { // This is to ensure that a non-numeric user_id still - // overrides screen_name even if it does not get used + // overrides screen_name even if it doesn't get used if (is_numeric($this->arg('user_id'))) { return User::staticGet('id', $this->arg('user_id')); } @@ -1146,7 +1146,7 @@ class ApiAction extends Action return User_group::staticGet('nickname', $nickname); } else if ($this->arg('group_id')) { // This is to ensure that a non-numeric user_id still - // overrides screen_name even if it does not get used + // overrides screen_name even if it doesn't get used if (is_numeric($this->arg('group_id'))) { return User_group::staticGet('id', $this->arg('group_id')); } diff --git a/lib/apiauth.php b/lib/apiauth.php index b8189f15d..2f2e44a26 100644 --- a/lib/apiauth.php +++ b/lib/apiauth.php @@ -87,7 +87,7 @@ class ApiAuthAction extends ApiAction } /** - * Check for a user specified via HTTP basic auth. If there is not + * Check for a user specified via HTTP basic auth. If there isn't * one, try to get one by outputting the basic auth header. * * @return boolean true or false diff --git a/lib/dberroraction.php b/lib/dberroraction.php index 893797b70..2cb66a022 100644 --- a/lib/dberroraction.php +++ b/lib/dberroraction.php @@ -39,7 +39,7 @@ require_once INSTALLDIR.'/lib/servererroraction.php'; * * This only occurs if there's been a DB_DataObject_Error that's * reported through PEAR, so we try to avoid doing anything that connects - * to the DB, so we do not trigger it again. + * to the DB, so we don't trigger it again. * * @category Action * @package StatusNet @@ -62,12 +62,12 @@ class DBErrorAction extends ServerErrorAction function getLanguage() { - // Do not try to figure out user's language; just show the page + // Don't try to figure out user's language; just show the page return common_config('site', 'language'); } function showPrimaryNav() { - // do not show primary nav + // don't show primary nav } } diff --git a/lib/error.php b/lib/error.php index 5ed5dec1b..3162cfe65 100644 --- a/lib/error.php +++ b/lib/error.php @@ -104,11 +104,11 @@ class ErrorAction extends Action { parent::showPage(); - // We do not want to have any more output after this + // We don't want to have any more output after this exit(); } - // Overload a bunch of stuff so the page is not too bloated + // Overload a bunch of stuff so the page isn't too bloated function showBody() { diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php index 73bd9ce81..c2ec83c28 100644 --- a/lib/htmloutputter.php +++ b/lib/htmloutputter.php @@ -76,7 +76,7 @@ class HTMLOutputter extends XMLOutputter /** * Start an HTML document * - * If $type is not specified, will attempt to do content negotiation. + * If $type isn't specified, will attempt to do content negotiation. * * Attempts to do content negotiation for language, also. * diff --git a/lib/imagefile.php b/lib/imagefile.php index edc7218d0..cf1668f20 100644 --- a/lib/imagefile.php +++ b/lib/imagefile.php @@ -119,7 +119,7 @@ class ImageFile return; } - // Do not crop/scale if it is not necessary + // Don't crop/scale if it isn't necessary if ($size === $this->width && $size === $this->height && $x === 0 diff --git a/lib/jabber.php b/lib/jabber.php index d666fcbb3..73f2ec660 100644 --- a/lib/jabber.php +++ b/lib/jabber.php @@ -437,7 +437,7 @@ function jabber_public_notice($notice) $public = common_config('xmpp', 'public'); - // FIXME PRIV do not send out private messages here + // FIXME PRIV don't send out private messages here // XXX: should we send out non-local messages if public,localonly // = false? I think not diff --git a/lib/mail.php b/lib/mail.php index 79630b721..5218059e9 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -467,7 +467,7 @@ function mail_notify_nudge($from, $to) "these days and is inviting you to post some news.\n\n". "So let's hear from you :)\n\n". "%3\$s\n\n". - "Do not reply to this email. It will not get to them.\n\n". + "Don't reply to this email; it won't get to them.\n\n". "With kind regards,\n". "%4\$s\n"), $from_profile->getBestName(), @@ -516,7 +516,7 @@ function mail_notify_message($message, $from=null, $to=null) "------------------------------------------------------\n\n". "You can reply to their message here:\n\n". "%4\$s\n\n". - "Do not reply to this email. It will not get to them.\n\n". + "Don't reply to this email; it won't get to them.\n\n". "With kind regards,\n". "%5\$s\n"), $from_profile->getBestName(), @@ -532,7 +532,7 @@ function mail_notify_message($message, $from=null, $to=null) /** * notify a user that one of their notices has been chosen as a 'fave' * - * Does not check that the user has an email address nor if they + * Doesn't check that the user has an email address nor if they * want to receive notification of faves. Maybe this happens higher * up the stack...? * diff --git a/lib/noticelist.php b/lib/noticelist.php index 4e5623ded..bf12bb73c 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -347,7 +347,7 @@ class NoticeListItem extends Widget * show the link to the main page for the notice * * Displays a link to the page for a notice, with "relative" time. Tries to - * get remote notice URLs correct, but does not always succeed. + * get remote notice URLs correct, but doesn't always succeed. * * @return void */ @@ -483,7 +483,7 @@ class NoticeListItem extends Widget * show a link to reply to the current notice * * Should either do the reply in the current notice form (if available), or - * link out to the notice-posting form. A little flakey, does not always work. + * link out to the notice-posting form. A little flakey, doesn't always work. * * @return void */ diff --git a/lib/queuehandler.php b/lib/queuehandler.php index 7c07ca4f9..cd43b1e09 100644 --- a/lib/queuehandler.php +++ b/lib/queuehandler.php @@ -96,8 +96,8 @@ class QueueHandler extends Daemon * Initialization, run when the queue handler starts. * If this function indicates failure, the handler run will be aborted. * - * @fixme run() will abort if this does not return true, - * but some subclasses do not bother. + * @fixme run() will abort if this doesn't return true, + * but some subclasses don't bother. * @return boolean true on success, false on failure */ function start() @@ -108,8 +108,8 @@ class QueueHandler extends Daemon * Cleanup, run when the queue handler ends. * If this function indicates failure, a warning will be logged. * - * @fixme run() will throw warnings if this does not return true, - * but many subclasses do not bother. + * @fixme run() will throw warnings if this doesn't return true, + * but many subclasses don't bother. * @return boolean true on success, false on failure */ function finish() @@ -137,7 +137,7 @@ class QueueHandler extends Daemon * method, which passes control back to our handle_notice() method for * each notice that comes in on the queue. * - * Most of the time this will not need to be overridden in a subclass. + * Most of the time this won't need to be overridden in a subclass. * * @return boolean true on success, false on failure */ @@ -173,7 +173,7 @@ class QueueHandler extends Daemon * Called by QueueHandler after each handled item or empty polling cycle. * This is a good time to e.g. service your XMPP connection. * - * Does not need to be overridden if there's no maintenance to do. + * Doesn't need to be overridden if there's no maintenance to do. * * @param int $timeout seconds to sleep if there's nothing to do */ diff --git a/lib/rssaction.php b/lib/rssaction.php index 0e84a65e9..faf6bec7d 100644 --- a/lib/rssaction.php +++ b/lib/rssaction.php @@ -386,7 +386,7 @@ class Rss10Action extends Action return null; } - // FIXME: does not handle modified profiles, avatars, deleted notices + // FIXME: doesn't handle modified profiles, avatars, deleted notices return strtotime($this->notices[0]->created); } diff --git a/lib/search_engines.php b/lib/search_engines.php index 82713235c..69f6ff468 100644 --- a/lib/search_engines.php +++ b/lib/search_engines.php @@ -119,7 +119,7 @@ class MySQLSearch extends SearchEngine return true; } else if ('identica_notices' === $this->table) { - // Do not show imported notices + // Don't show imported notices $this->target->whereAdd('notice.is_local != ' . Notice::GATEWAY); if (strtolower($q) != $q) { diff --git a/lib/util.php b/lib/util.php index b4f5af1af..a4865c46c 100644 --- a/lib/util.php +++ b/lib/util.php @@ -62,7 +62,7 @@ function common_init_language() $locale_set = common_init_locale($language); setlocale(LC_CTYPE, 'C'); - // So we do not have to make people install the gettext locales + // So we don't have to make people install the gettext locales $path = common_config('site','locale_path'); bindtextdomain("statusnet", $path); bind_textdomain_codeset("statusnet", "UTF-8"); @@ -139,7 +139,7 @@ function common_check_user($nickname, $password) } } }else{ - //no handler indicated the credentials were valid, and we know their not valid because the user is not in the database + //no handler indicated the credentials were valid, and we know their not valid because the user isn't in the database return false; } } else { @@ -396,7 +396,7 @@ function common_current_user() } // Logins that are 'remembered' aren't 'real' -- they're subject to -// cookie-stealing. So, we do not let them do certain things. New reg, +// cookie-stealing. So, we don't let them do certain things. New reg, // OpenID, and password logins _are_ real. function common_real_login($real=true) @@ -1147,7 +1147,7 @@ function common_accept_to_prefs($accept, $def = '*/*') $parts = explode(',', $accept); foreach($parts as $part) { - // FIXME: does not deal with params like 'text/html; level=1' + // FIXME: doesn't deal with params like 'text/html; level=1' @list($value, $qpart) = explode(';', trim($part)); $match = array(); if(!isset($qpart)) { @@ -1346,7 +1346,7 @@ function common_error_handler($errno, $errstr, $errfile, $errline, $errcontext) } // FIXME: show error page if we're on the Web - /* Do not execute PHP internal error handler */ + /* Don't execute PHP internal error handler */ return true; } @@ -1448,7 +1448,7 @@ function common_shorten_url($long_url) } global $_shorteners; if (!isset($_shorteners[$svc])) { - //the user selected service does not exist, so default to ur1.ca + //the user selected service doesn't exist, so default to ur1.ca $svc = 'ur1.ca'; } if (!isset($_shorteners[$svc])) { diff --git a/lib/xmloutputter.php b/lib/xmloutputter.php index 9d862b2d0..5f06e491d 100644 --- a/lib/xmloutputter.php +++ b/lib/xmloutputter.php @@ -112,7 +112,7 @@ class XMLOutputter * * Utility for outputting an XML element. A convenient wrapper * for a bunch of longer XMLWriter calls. This is best for - * when an element does not have any sub-elements; if that's the + * when an element doesn't have any sub-elements; if that's the * case, use elementStart() and elementEnd() instead. * * The $content element will be escaped for XML. If you need diff --git a/lib/xmppqueuehandler.php b/lib/xmppqueuehandler.php index 7caa078ae..f28fc9088 100644 --- a/lib/xmppqueuehandler.php +++ b/lib/xmppqueuehandler.php @@ -37,7 +37,7 @@ class XmppQueueHandler extends QueueHandler function start() { - # Low priority; we do not want to receive messages + # Low priority; we don't want to receive messages $this->log(LOG_INFO, "INITIALIZE"); $this->conn = jabber_connect($this->_id.$this->transport()); diff --git a/plugins/Autocomplete/autocomplete.php b/plugins/Autocomplete/autocomplete.php index aeb100cfa..379390ffd 100644 --- a/plugins/Autocomplete/autocomplete.php +++ b/plugins/Autocomplete/autocomplete.php @@ -79,7 +79,7 @@ class AutocompleteAction extends Action function etag() { return '"' . implode(':', array($this->arg('action'), - crc32($this->arg('q')), //the actual string can have funny characters in we do not want showing up in the etag + crc32($this->arg('q')), //the actual string can have funny characters in we don't want showing up in the etag $this->arg('limit'), $this->lastModified())) . '"'; } diff --git a/plugins/BlogspamNetPlugin.php b/plugins/BlogspamNetPlugin.php index bf60fdcaf..51236001a 100644 --- a/plugins/BlogspamNetPlugin.php +++ b/plugins/BlogspamNetPlugin.php @@ -85,7 +85,7 @@ class BlogspamNetPlugin extends Plugin } else if (preg_match('/^SPAM(:(.*))?$/', $response, $match)) { throw new ClientException(sprintf(_("Spam checker results: %s"), $match[2]), 400); } else if (preg_match('/^OK$/', $response)) { - // do not do anything + // don't do anything } else { throw new ServerException(sprintf(_("Unexpected response from %s: %s"), $this->baseUrl, $response), 500); } diff --git a/plugins/Facebook/FBConnectAuth.php b/plugins/Facebook/FBConnectAuth.php index 165477419..b909a4977 100644 --- a/plugins/Facebook/FBConnectAuth.php +++ b/plugins/Facebook/FBConnectAuth.php @@ -71,7 +71,7 @@ class FBConnectauthAction extends Action 'There is already a local user (' . $flink->user_id . ') linked with this Facebook (' . $this->fbuid . ').'); - // We do not want these cookies + // We don't want these cookies getFacebook()->clear_cookie_state(); $this->clientError(_('There is already a local user linked with this Facebook.')); @@ -364,7 +364,7 @@ class FBConnectauthAction extends Action { $url = common_get_returnto(); if ($url) { - // We do not have to return to it again + // We don't have to return to it again common_set_returnto(null); } else { $url = common_local_url('all', diff --git a/plugins/Facebook/FacebookPlugin.php b/plugins/Facebook/FacebookPlugin.php index cd1ad7b45..b68534b24 100644 --- a/plugins/Facebook/FacebookPlugin.php +++ b/plugins/Facebook/FacebookPlugin.php @@ -182,7 +182,7 @@ class FacebookPlugin extends Plugin $login_url = common_local_url('FBConnectAuth'); $logout_url = common_local_url('logout'); - // XXX: Facebook says we do not need this FB_RequireFeatures(), + // XXX: Facebook says we don't need this FB_RequireFeatures(), // but we actually do, for IE and Safari. Gar. $js = '"; } else { diff --git a/plugins/Facebook/facebook/facebook_desktop.php b/plugins/Facebook/facebook/facebook_desktop.php index 425bb5c7b..e79a2ca34 100644 --- a/plugins/Facebook/facebook/facebook_desktop.php +++ b/plugins/Facebook/facebook/facebook_desktop.php @@ -93,7 +93,7 @@ class FacebookDesktop extends Facebook { } public function verify_signature($fb_params, $expected_sig) { - // we do not want to verify the signature until we have a valid + // we don't want to verify the signature until we have a valid // session secret if ($this->verify_sig) { return parent::verify_signature($fb_params, $expected_sig); diff --git a/plugins/Facebook/facebook/facebookapi_php5_restlib.php b/plugins/Facebook/facebook/facebookapi_php5_restlib.php index c742df748..55cb7fb86 100755 --- a/plugins/Facebook/facebook/facebookapi_php5_restlib.php +++ b/plugins/Facebook/facebook/facebookapi_php5_restlib.php @@ -46,7 +46,7 @@ class FacebookRestClient { // on canvas pages public $added; public $is_user; - // we do not pass friends list to iframes, but we want to make + // we don't pass friends list to iframes, but we want to make // friends_get really simple in the canvas_user (non-logged in) case. // So we use the canvas_user as default arg to friends_get public $canvas_user; @@ -657,7 +657,7 @@ function toggleDisplay(id, type) { * deleted. * * IMPORTANT: If your application has registered public tags - * that other applications may be using, do not delete those tags! + * that other applications may be using, don't delete those tags! * Doing so can break the FBML ofapplications that are using them. * * @param array $tag_names the names of the tags to delete (optinal) @@ -820,7 +820,7 @@ function toggleDisplay(id, type) { if (is_array($target_ids)) { $target_ids = json_encode($target_ids); - $target_ids = trim($target_ids, "[]"); // we do not want square brackets + $target_ids = trim($target_ids, "[]"); // we don't want square brackets } return $this->call_method('facebook.feed.publishUserAction', diff --git a/plugins/Facebook/facebook/jsonwrapper/jsonwrapper.php b/plugins/Facebook/facebook/jsonwrapper/jsonwrapper.php index 9c6c62663..29509deba 100644 --- a/plugins/Facebook/facebook/jsonwrapper/jsonwrapper.php +++ b/plugins/Facebook/facebook/jsonwrapper/jsonwrapper.php @@ -1,5 +1,5 @@ location_id = $n->geonameId; $location->location_ns = self::NAMESPACE; - // handled, do not continue processing! + // handled, don't continue processing! return false; } } - // Continue processing; we do not have the answer + // Continue processing; we don't have the answer return true; } @@ -217,7 +217,7 @@ class GeonamesPlugin extends Plugin } } - // For some reason we do not know, so pass. + // For some reason we don't know, so pass. return true; } @@ -299,7 +299,7 @@ class GeonamesPlugin extends Plugin $url = 'http://www.geonames.org/' . $location->location_id; - // it's been filled, so do not process further. + // it's been filled, so don't process further. return false; } } diff --git a/plugins/OpenID/finishopenidlogin.php b/plugins/OpenID/finishopenidlogin.php index b5d978294..ff0b451d3 100644 --- a/plugins/OpenID/finishopenidlogin.php +++ b/plugins/OpenID/finishopenidlogin.php @@ -341,7 +341,7 @@ class FinishopenidloginAction extends Action { $url = common_get_returnto(); if ($url) { - # We do not have to return to it again + # We don't have to return to it again common_set_returnto(null); } else { $url = common_local_url('all', @@ -421,7 +421,7 @@ class FinishopenidloginAction extends Action $parts = parse_url($openid); - # If any of these parts exist, this will not work + # If any of these parts exist, this won't work foreach ($bad as $badpart) { if (array_key_exists($badpart, $parts)) { diff --git a/plugins/OpenID/openid.php b/plugins/OpenID/openid.php index c5f6d1713..ff7a93899 100644 --- a/plugins/OpenID/openid.php +++ b/plugins/OpenID/openid.php @@ -187,7 +187,7 @@ function oid_authenticate($openid_url, $returnto, $immediate=false) $form_html = $auth_request->formMarkup($trust_root, $process_url, $immediate, array('id' => $form_id)); - # XXX: This is cheap, but things choke if we do not escape ampersands + # XXX: This is cheap, but things choke if we don't escape ampersands # in the HTML attributes $form_html = preg_replace('/&/', '&', $form_html); diff --git a/plugins/PiwikAnalyticsPlugin.php b/plugins/PiwikAnalyticsPlugin.php index 81ef7c683..54faa0bdb 100644 --- a/plugins/PiwikAnalyticsPlugin.php +++ b/plugins/PiwikAnalyticsPlugin.php @@ -44,7 +44,7 @@ if (!defined('STATUSNET')) { * 'piwikId' => 'id')); * * Replace 'example.com/piwik/' with the URL to your Piwik installation and - * make sure you do not forget the final /. + * make sure you don't forget the final /. * Replace 'id' with the ID your statusnet installation has in your Piwik * analytics setup - for example '8'. * diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php index 88a87dcf9..0c7c1240c 100644 --- a/plugins/Realtime/RealtimePlugin.php +++ b/plugins/Realtime/RealtimePlugin.php @@ -240,7 +240,7 @@ class RealtimePlugin extends Plugin // FIXME: this code should be abstracted to a neutral third // party, like Notice::asJson(). I'm not sure of the ethics // of refactoring from within a plugin, so I'm just abusing - // the ApiAction method. Do not do this unless you're me! + // the ApiAction method. Don't do this unless you're me! require_once(INSTALLDIR.'/lib/api.php'); diff --git a/plugins/TwitterBridge/daemons/synctwitterfriends.php b/plugins/TwitterBridge/daemons/synctwitterfriends.php index c89c02eed..671e3c7af 100755 --- a/plugins/TwitterBridge/daemons/synctwitterfriends.php +++ b/plugins/TwitterBridge/daemons/synctwitterfriends.php @@ -115,7 +115,7 @@ class SyncTwitterFriendsDaemon extends ParallelizingDaemon // Each child ps needs its own DB connection // Note: DataObject::getDatabaseConnection() creates - // a new connection if there is not one already + // a new connection if there isn't one already $conn = &$flink->getDatabaseConnection(); diff --git a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php index 25df0d839..b5428316b 100755 --- a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php +++ b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php @@ -136,7 +136,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon // Each child ps needs its own DB connection // Note: DataObject::getDatabaseConnection() creates - // a new connection if there is not one already + // a new connection if there isn't one already $conn = &$flink->getDatabaseConnection(); @@ -499,7 +499,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon $avatar->height = 73; } - $avatar->original = 0; // we do not have the original + $avatar->original = 0; // we don't have the original $avatar->mediatype = $mediatype; $avatar->filename = $filename; $avatar->url = Avatar::url($filename); diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php index d48089caa..3c6803e49 100644 --- a/plugins/TwitterBridge/twitter.php +++ b/plugins/TwitterBridge/twitter.php @@ -33,7 +33,7 @@ function updateTwitter_user($twitter_id, $screen_name) $fuser->query('BEGIN'); - // Dropping down to SQL because regular DB_DataObject udpate stuff does not seem + // Dropping down to SQL because regular DB_DataObject udpate stuff doesn't seem // to work so good with tables that have multiple column primary keys // Any time we update the uri for a forein user we have to make sure there diff --git a/scripts/console.php b/scripts/console.php index 2a000d39b..41dd43f28 100755 --- a/scripts/console.php +++ b/scripts/console.php @@ -60,9 +60,9 @@ function read_input_line($prompt) } /** - * On Unix-like systems where PHP readline extension is not present, + * On Unix-like systems where PHP readline extension isn't present, * -cough- Mac OS X -cough- we can shell out to bash to do it for us. - * This lets us at least handle things like arrow keys, but we do not + * This lets us at least handle things like arrow keys, but we don't * get any entry history. :( * * Shamelessly ripped from when I wrote the same code for MediaWiki. :) diff --git a/scripts/maildaemon.php b/scripts/maildaemon.php index 4ec4526ef..b4e4d9f08 100755 --- a/scripts/maildaemon.php +++ b/scripts/maildaemon.php @@ -231,7 +231,7 @@ class MailerDaemon foreach ($parsed->parts as $part) { $this->extract_part($part,$msg,$attachments); } - //we do not want any attachments that are a result of this parsing + //we don't want any attachments that are a result of this parsing return $msg; } diff --git a/scripts/xmppconfirmhandler.php b/scripts/xmppconfirmhandler.php index f5f824dee..c7ed15e49 100755 --- a/scripts/xmppconfirmhandler.php +++ b/scripts/xmppconfirmhandler.php @@ -69,7 +69,7 @@ class XmppConfirmHandler extends XmppQueueHandler continue; } else { $this->log(LOG_INFO, 'Confirmation sent for ' . $confirm->address); - # Mark confirmation sent; need a dupe so we do not have the WHERE clause + # Mark confirmation sent; need a dupe so we don't have the WHERE clause $dupe = Confirm_address::staticGet('code', $confirm->code); if (!$dupe) { common_log(LOG_WARNING, 'Could not refetch confirm', __FILE__); -- cgit v1.2.3-54-g00ecf From 3be120571446880cb71a57845204b3213e6df67e Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Mon, 9 Nov 2009 17:43:37 -0500 Subject: Add a new event: CanUserChangeField --- EVENTS.txt | 4 ++++ actions/passwordsettings.php | 14 ++++++++++++++ lib/accountsettingsaction.php | 35 ++++++++++++++++++++--------------- plugins/Ldap/LdapPlugin.php | 11 +++++++++++ 4 files changed, 49 insertions(+), 15 deletions(-) diff --git a/EVENTS.txt b/EVENTS.txt index 25a51516b..c3fe73134 100644 --- a/EVENTS.txt +++ b/EVENTS.txt @@ -489,6 +489,10 @@ ChangePassword: Handle a password change request - $newpassword: the desired new password - &$errormsg: set this to an error message if the password could not be changed. If the password was changed, leave this as false +CanUserChangeField: Determines if a user is allowed to change a specific profile field +- $nickname: nickname of the user who would like to know which of their profile fields are mutable +- $field: name of the field the user wants to change (nickname, fullname, password, avatar, etc) + 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. diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php index 6658d279f..15539d4a0 100644 --- a/actions/passwordsettings.php +++ b/actions/passwordsettings.php @@ -58,6 +58,19 @@ class PasswordsettingsAction extends AccountSettingsAction return _('Change password'); } + function prepare($args){ + parent::prepare($args); + + $user = common_current_user(); + + Event::handle('CanUserChangeField', array($user->nickname, 'password')); + + if(! $fields['password']){ + //user is not allowed to change his password + $this->clientError(_('You are not allowed to change your password')); + } + } + /** * Instructions for use * @@ -86,6 +99,7 @@ class PasswordsettingsAction extends AccountSettingsAction function showContent() { $user = common_current_user(); + $this->elementStart('form', array('method' => 'POST', 'id' => 'form_password', 'class' => 'form_settings', diff --git a/lib/accountsettingsaction.php b/lib/accountsettingsaction.php index a004a3ed9..9865e1748 100644 --- a/lib/accountsettingsaction.php +++ b/lib/accountsettingsaction.php @@ -102,26 +102,31 @@ class AccountSettingsNav extends Widget $this->action->elementStart('ul', array('class' => 'nav')); if (Event::handle('StartAccountSettingsNav', array(&$this->action))) { + $user = common_current_user(); - $menu = - array('profilesettings' => + $menu = array(); + $menu['profilesettings'] = array(_('Profile'), - _('Change your profile settings')), - 'avatarsettings' => - array(_('Avatar'), - _('Upload an avatar')), - 'passwordsettings' => - array(_('Password'), - _('Change your password')), - 'emailsettings' => + _('Change your profile settings')); + if(Event::handle('CanUserChangeField', array($user->nickname, 'avatar'))){ + $menu['avatarsettings'] = + array(_('Avatar'), + _('Upload an avatar')); + } + if(Event::handle('CanUserChangeField', array($user->nickname, 'password'))){ + $menu['passwordsettings'] = + array(_('Password'), + _('Change your password')); + } + $menu['emailsettings'] = array(_('Email'), - _('Change email handling')), - 'userdesignsettings' => + _('Change email handling')); + $menu['userdesignsettings'] = array(_('Design'), - _('Design your profile')), - 'othersettings' => + _('Design your profile')); + $menu['othersettings'] = array(_('Other'), - _('Other options'))); + _('Other options')); foreach ($menu as $menuaction => $menudesc) { $this->action->menuItem(common_local_url($menuaction), diff --git a/plugins/Ldap/LdapPlugin.php b/plugins/Ldap/LdapPlugin.php index 755562f54..3795ffd7f 100644 --- a/plugins/Ldap/LdapPlugin.php +++ b/plugins/Ldap/LdapPlugin.php @@ -102,4 +102,15 @@ class LdapPlugin extends Plugin //return false, indicating that the event has been handled return false; } + + function onCanUserChangeField($nickname, $field) + { + switch($field) + { + case 'password': + case 'nickname': + case 'email': + return false; + } + } } -- cgit v1.2.3-54-g00ecf From 223fee2ad1430e827830265c9fe97f4d025bb060 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Tue, 10 Nov 2009 15:53:07 +1300 Subject: just sent a http 200 for the check-fancy from install.php --- lib/common.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/common.php b/lib/common.php index 6aac46807..c473d9cdb 100644 --- a/lib/common.php +++ b/lib/common.php @@ -38,6 +38,8 @@ define('FOREIGN_NOTICE_SEND_REPLY', 4); define('FOREIGN_FRIEND_SEND', 1); define('FOREIGN_FRIEND_RECV', 2); +if ( $_REQUEST['p'] == 'check-fancy') { exit; } //exit with 200 response, if this is checking fancy from the installer + define_syslog_variables(); # append our extlib dir as the last-resort place to find libs -- cgit v1.2.3-54-g00ecf From 2f3e414cd1226b328a63854592f0783a9088baae Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 10 Nov 2009 13:08:58 +0000 Subject: Updated group block markup --- actions/groupblock.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/actions/groupblock.php b/actions/groupblock.php index 133101eb7..fe09cbc2d 100644 --- a/actions/groupblock.php +++ b/actions/groupblock.php @@ -151,17 +151,19 @@ class GroupblockAction extends Action function areYouSureForm() { $id = $this->profile->id; + $this->elementStart('form', array('id' => 'block-' . $id, + 'method' => 'post', + 'class' => 'form_settings form_entity_block', + 'action' => common_local_url('groupblock'))); + $this->elementStart('fieldset'); + $this->hidden('token', common_session_token()); + $this->element('legend', _('Block user')); $this->element('p', null, sprintf(_('Are you sure you want to block user "%s" from the group "%s"? '. 'They will be removed from the group, unable to post, and '. 'unable to subscribe to the group in the future.'), $this->profile->getBestName(), $this->group->getBestName())); - $this->elementStart('form', array('id' => 'block-' . $id, - 'method' => 'post', - 'class' => 'block', - 'action' => common_local_url('groupblock'))); - $this->hidden('token', common_session_token()); $this->hidden('blockto-' . $this->profile->id, $this->profile->id, 'blockto'); @@ -173,8 +175,9 @@ class GroupblockAction extends Action $this->hidden($k, $v); } } - $this->submit('no', _('No')); - $this->submit('yes', _('Yes')); + $this->submit('form_action-no', _('No'), 'submit form_action-primary', 'no', _("Do not block this user from this group")); + $this->submit('form_action-yes', _('Yes'), 'submit form_action-secondary', 'yes', _('Block this user from this group')); + $this->elementEnd('fieldset'); $this->elementEnd('form'); } -- cgit v1.2.3-54-g00ecf From 91da72ede0b834d017165ececdc340ec0a24227b Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 10 Nov 2009 13:09:15 +0000 Subject: Updated block @title text (shouldn't say from group) --- actions/block.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/actions/block.php b/actions/block.php index 408f16434..b125d2d8b 100644 --- a/actions/block.php +++ b/actions/block.php @@ -146,8 +146,8 @@ class BlockAction extends Action $this->hidden($k, $v); } } - $this->submit('form_action-no', _('No'), 'submit form_action-primary', 'no', _("Do not block this user from this group")); - $this->submit('form_action-yes', _('Yes'), 'submit form_action-secondary', 'yes', _('Block this user from this group')); + $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', _('Block this user')); $this->elementEnd('fieldset'); $this->elementEnd('form'); } -- cgit v1.2.3-54-g00ecf From 069d3f2b2f912f2e7d2289bc58270341c9b1ecc5 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 10 Nov 2009 13:52:47 +0000 Subject: Added hook for the Group navigation items --- EVENTS.txt | 6 +++++ lib/groupnav.php | 79 +++++++++++++++++++++++++++++--------------------------- 2 files changed, 47 insertions(+), 38 deletions(-) diff --git a/EVENTS.txt b/EVENTS.txt index c3fe73134..af686b9cd 100644 --- a/EVENTS.txt +++ b/EVENTS.txt @@ -191,6 +191,12 @@ StartPersonalGroupNav: beginning of personal group nav menu EndPersonalGroupNav: end of personal group nav menu (good place to add a menu item) - $action: action object being shown +StartGroupGroupNav: Showing the group nav menu +- $action: the current action + +EndGroupGroupNav: At the end of the group nav menu +- $action: the current action + StartEndHTML: just before the tag - $action: action object being shown diff --git a/lib/groupnav.php b/lib/groupnav.php index 31cf378c8..131b38fa2 100644 --- a/lib/groupnav.php +++ b/lib/groupnav.php @@ -79,46 +79,49 @@ class GroupNav extends Widget $nickname = $this->group->nickname; $this->out->elementStart('ul', array('class' => 'nav')); - $this->out->menuItem(common_local_url('showgroup', array('nickname' => - $nickname)), - _('Group'), - sprintf(_('%s group'), $nickname), - $action_name == 'showgroup', - 'nav_group_group'); - $this->out->menuItem(common_local_url('groupmembers', array('nickname' => - $nickname)), - _('Members'), - sprintf(_('%s group members'), $nickname), - $action_name == 'groupmembers', - 'nav_group_members'); + if (Event::handle('StartGroupGroupNav', array($this))) { + $this->out->menuItem(common_local_url('showgroup', array('nickname' => + $nickname)), + _('Group'), + sprintf(_('%s group'), $nickname), + $action_name == 'showgroup', + 'nav_group_group'); + $this->out->menuItem(common_local_url('groupmembers', array('nickname' => + $nickname)), + _('Members'), + sprintf(_('%s group members'), $nickname), + $action_name == 'groupmembers', + 'nav_group_members'); - $cur = common_current_user(); + $cur = common_current_user(); - if ($cur && $cur->isAdmin($this->group)) { - $this->out->menuItem(common_local_url('blockedfromgroup', array('nickname' => - $nickname)), - _('Blocked'), - sprintf(_('%s blocked users'), $nickname), - $action_name == 'blockedfromgroup', - 'nav_group_blocked'); - $this->out->menuItem(common_local_url('editgroup', array('nickname' => - $nickname)), - _('Admin'), - sprintf(_('Edit %s group properties'), $nickname), - $action_name == 'editgroup', - 'nav_group_admin'); - $this->out->menuItem(common_local_url('grouplogo', array('nickname' => - $nickname)), - _('Logo'), - sprintf(_('Add or edit %s logo'), $nickname), - $action_name == 'grouplogo', - 'nav_group_logo'); - $this->out->menuItem(common_local_url('groupdesignsettings', array('nickname' => - $nickname)), - _('Design'), - sprintf(_('Add or edit %s design'), $nickname), - $action_name == 'groupdesignsettings', - 'nav_group_design'); + if ($cur && $cur->isAdmin($this->group)) { + $this->out->menuItem(common_local_url('blockedfromgroup', array('nickname' => + $nickname)), + _('Blocked'), + sprintf(_('%s blocked users'), $nickname), + $action_name == 'blockedfromgroup', + 'nav_group_blocked'); + $this->out->menuItem(common_local_url('editgroup', array('nickname' => + $nickname)), + _('Admin'), + sprintf(_('Edit %s group properties'), $nickname), + $action_name == 'editgroup', + 'nav_group_admin'); + $this->out->menuItem(common_local_url('grouplogo', array('nickname' => + $nickname)), + _('Logo'), + sprintf(_('Add or edit %s logo'), $nickname), + $action_name == 'grouplogo', + 'nav_group_logo'); + $this->out->menuItem(common_local_url('groupdesignsettings', array('nickname' => + $nickname)), + _('Design'), + sprintf(_('Add or edit %s design'), $nickname), + $action_name == 'groupdesignsettings', + 'nav_group_design'); + } + Event::handle('EndGroupGroupNav', array($this)); } $this->out->elementEnd('ul'); } -- cgit v1.2.3-54-g00ecf From 486dbe6aef380a9057c5ac609cd1c6086a5e34fc Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 10 Nov 2009 07:57:58 -0800 Subject: Revert untested code; spews PHP notice warnings on every page view: "just sent a http 200 for the check-fancy from install.php" Notice: Undefined index: p in /Library/WebServer/Documents/mublog/lib/common.php on line 41 This reverts commit 223fee2ad1430e827830265c9fe97f4d025bb060. --- lib/common.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/common.php b/lib/common.php index c473d9cdb..6aac46807 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); -if ( $_REQUEST['p'] == 'check-fancy') { exit; } //exit with 200 response, if this is checking fancy from the installer - define_syslog_variables(); # append our extlib dir as the last-resort place to find libs -- cgit v1.2.3-54-g00ecf From 9d0687b0559095f270a55af3467c53ad29bfd4c7 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 10 Nov 2009 08:23:24 -0800 Subject: Adjusting indexes to make favorites query more efficient, based on feedback from ops. fave_user_id_idx index changed from (user_id) to (user_id,modified), so the timestamp ordering can be done straight from the index while we're looking up the user's notices. Added to 08to09.sql and 08to09_pg.sql; may need to be run manually by folks doing development. (No harm if you don't update it, the favorites tab/rss feed will just stay inefficent.) --- db/08to09.sql | 3 +++ db/08to09_pg.sql | 3 +++ db/statusnet.sql | 2 +- db/statusnet_pg.sql | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/db/08to09.sql b/db/08to09.sql index a0e37f0f1..e6842225b 100644 --- a/db/08to09.sql +++ b/db/08to09.sql @@ -42,3 +42,6 @@ create table login_token ( constraint primary key (user_id) ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; +alter table fave + drop index fave_user_id_idx, + add index fave_user_id_idx (user_id,modified); diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql index 197fcabfd..956c4dee5 100644 --- a/db/08to09_pg.sql +++ b/db/08to09_pg.sql @@ -48,3 +48,6 @@ create table login_token ( constraint primary key (user_id) ); +alter table fave + drop index fave_user_id_idx, + add index fave_user_id_idx using btree(user_id,modified); diff --git a/db/statusnet.sql b/db/statusnet.sql index 3ed4e2c48..510c8866e 100644 --- a/db/statusnet.sql +++ b/db/statusnet.sql @@ -165,7 +165,7 @@ create table fave ( constraint primary key (notice_id, user_id), index fave_notice_id_idx (notice_id), - index fave_user_id_idx (user_id), + index fave_user_id_idx (user_id,modified), index fave_modified_idx (modified) ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql index 0e5e96c32..710883e57 100644 --- a/db/statusnet_pg.sql +++ b/db/statusnet_pg.sql @@ -171,7 +171,7 @@ create table fave ( ); create index fave_notice_id_idx on fave using btree(notice_id); -create index fave_user_id_idx on fave using btree(user_id); +create index fave_user_id_idx on fave using btree(user_id,modified); create index fave_modified_idx on fave using btree(modified); /* tables for OAuth */ -- cgit v1.2.3-54-g00ecf From 737fe763471bcb6ebd95c318363308a33e28e889 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 10 Nov 2009 08:47:54 -0800 Subject: Performance fix for subscription/subscriber lists based on feedback from ops. Extended subscription table indexes for subscriber and subscribed to include the created field, which is used to sort for display. This lets us skip a filesort and do the join much more efficiently. Alter table from 08to09.sql needs to be run manually (though no ill effects if you forget other than not getting the perf improvement). --- db/08to09.sql | 6 ++++++ db/08to09_pg.sql | 6 ++++++ db/statusnet.sql | 4 ++-- db/statusnet_pg.sql | 4 ++-- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/db/08to09.sql b/db/08to09.sql index e6842225b..1d37a759d 100644 --- a/db/08to09.sql +++ b/db/08to09.sql @@ -45,3 +45,9 @@ create table login_token ( alter table fave drop index fave_user_id_idx, add index fave_user_id_idx (user_id,modified); + +alter table subscription + drop index subscription_subscriber_idx, + add index subscription_subscriber_idx (subscriber,created), + drop index subscription_subscribed_idx, + add index subscription_subscribed_idx (subscribed,created); diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql index 956c4dee5..004c77b36 100644 --- a/db/08to09_pg.sql +++ b/db/08to09_pg.sql @@ -51,3 +51,9 @@ create table login_token ( alter table fave drop index fave_user_id_idx, add index fave_user_id_idx using btree(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); diff --git a/db/statusnet.sql b/db/statusnet.sql index 510c8866e..2983c67cf 100644 --- a/db/statusnet.sql +++ b/db/statusnet.sql @@ -107,8 +107,8 @@ create table subscription ( modified timestamp comment 'date this record was modified', constraint primary key (subscriber, subscribed), - index subscription_subscriber_idx (subscriber), - index subscription_subscribed_idx (subscribed), + index subscription_subscriber_idx (subscriber, created), + index subscription_subscribed_idx (subscribed, created), index subscription_token_idx (token) ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql index 710883e57..392a6a5f3 100644 --- a/db/statusnet_pg.sql +++ b/db/statusnet_pg.sql @@ -115,8 +115,8 @@ create table subscription ( primary key (subscriber, subscribed) ); -create index subscription_subscriber_idx on subscription using btree(subscriber); -create index subscription_subscribed_idx on subscription using btree(subscribed); +create index subscription_subscriber_idx on subscription using btree(subscriber,created); +create index subscription_subscribed_idx on subscription using btree(subscribed,created); create sequence notice_seq; create table notice ( -- cgit v1.2.3-54-g00ecf From 8d5c2b3129a1d7cefd78e311d5cbbe9ab426bb72 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 10 Nov 2009 14:06:30 -0500 Subject: fixup output of object attributes in db error code --- lib/util.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/util.php b/lib/util.php index b4f5af1af..0ed0688eb 100644 --- a/lib/util.php +++ b/lib/util.php @@ -57,11 +57,11 @@ function common_init_language() // we can set in another locale that may not be set up // (say, ga_ES for Galego/Galician) it seems to take it. common_init_locale("en_US"); - + $language = common_language(); $locale_set = common_init_locale($language); setlocale(LC_CTYPE, 'C'); - + // So we do not have to make people install the gettext locales $path = common_config('site','locale_path'); bindtextdomain("statusnet", $path); @@ -1112,7 +1112,11 @@ function common_log_objstring(&$object) $arr = $object->toArray(); $fields = array(); foreach ($arr as $k => $v) { - $fields[] = "$k='$v'"; + if (is_object($v)) { + $fields[] = "$k='".get_class($v)."'"; + } else { + $fields[] = "$k='$v'"; + } } $objstring = $object->tableName() . '[' . implode(',', $fields) . ']'; return $objstring; -- cgit v1.2.3-54-g00ecf From 923fa068a684a7e3b712714cda0cb75ffa58bd78 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 10 Nov 2009 14:45:19 -0500 Subject: change credential check to work more like other events --- EVENTS.txt | 10 ++++++---- lib/util.php | 47 +++++++++++------------------------------------ 2 files changed, 17 insertions(+), 40 deletions(-) diff --git a/EVENTS.txt b/EVENTS.txt index af686b9cd..ced130f5f 100644 --- a/EVENTS.txt +++ b/EVENTS.txt @@ -481,13 +481,15 @@ EndPublicXRDS: End XRDS output (right before the closing XRDS tag) - $action: the current action - &$xrdsoutputter - XRDSOutputter object to write to -CheckPassword: Check a username/password +StartCheckPassword: Check a username/password - $nickname: The nickname to check - $password: The password to check -- &$authenticated: set to true to indicate authentication succeeded. +- &$authenticatedUser: set to User object if credentials match a user. -AutoRegister: Register a new user with the given nickname. Should insert a new User and Profile into the database. -- $nickname: The nickname to register +EndCheckPassword: After checking a username/password pair +- $nickname: The nickname that was checked +- $password: The password that was checked +- $authenticatedUser: User object if credentials match a user, else null. ChangePassword: Handle a password change request - $nickname: user's nickname diff --git a/lib/util.php b/lib/util.php index 65bc6544d..81160d052 100644 --- a/lib/util.php +++ b/lib/util.php @@ -116,51 +116,26 @@ function common_munge_password($password, $id) } // check if a username exists and has matching password + function common_check_user($nickname, $password) { - $authenticated = false; - $eventResult = Event::handle('CheckPassword', array($nickname, $password, &$authenticated)); - $user = User::staticGet('nickname', $nickname); - if (is_null($user) || $user === false) { - //user does not exist - if($authenticated){ - //a handler said these are valid credentials, so see if a plugin wants to auto register the user - if(Event::handle('AutoRegister', array($nickname))){ - //no handler registered the user - return false; - }else{ - $user = User::staticGet('nickname', $nickname); - if (is_null($user) || $user === false) { - common_log(LOG_WARNING, "A plugin handled the AutoRegister event, but did not actually register the user, nickname: $nickname"); - return false; - }else{ - return $user; - } - } - }else{ - //no handler indicated the credentials were valid, and we know their not valid because the user isn't in the database - return false; - } - } else { - if($eventResult && ! $authenticated){ - //no handler was authoritative - if (mb_strlen($password) == 0) { - // NEVER allow blank passwords, even if they match the DB - return false; - }else{ + $authenticatedUser = false; + + if (Event::handle('StartCheckPassword', array($nickname, $password, &$authenticatedUser))) { + $user = User::staticGet('nickname', $nickname); + if (!empty($user)) { + if (!empty($password)) { // never allow login with blank password if (0 == strcmp(common_munge_password($password, $user->id), $user->password)) { //internal checking passed - $authenticated = true; + $authenticatedUser =& $user; } } } - if($authenticated){ - return $user; - } else { - return false; - } + Event::handle('EndCheckPassword', array($nickname, $password, $authenticatedUser)); } + + return $authenticatedUser; } // is the current user logged in? -- cgit v1.2.3-54-g00ecf From 27e6a3f36fb9a41d316bdd4fccd5e98c7a3e9ddc Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 10 Nov 2009 15:36:55 -0500 Subject: add lat and long parameters to api/statuses/update --- actions/apistatusesupdate.php | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php index 5c23accca..7ddf7703b 100644 --- a/actions/apistatusesupdate.php +++ b/actions/apistatusesupdate.php @@ -61,6 +61,9 @@ class ApiStatusesUpdateAction extends ApiAuthAction var $source = null; var $status = null; var $in_reply_to_status_id = null; + var $lat = null; + var $lon = null; + static $reserved_sources = array('web', 'omb', 'mail', 'xmpp', 'api'); /** @@ -79,6 +82,8 @@ class ApiStatusesUpdateAction extends ApiAuthAction $this->user = $this->auth_user; $this->status = $this->trimmed('status'); $this->source = $this->trimmed('source'); + $this->lat = $this->trimmed('lat'); + $this->lon = $this->trimmed('long'); if (empty($this->source) || in_array($source, self::$reserved_sources)) { $this->source = 'api'; @@ -198,6 +203,12 @@ class ApiStatusesUpdateAction extends ApiAuthAction } } + $location = null; + + if (!empty($this->lat) && !empty($this->lon)) { + $location = Location::fromLatLon($this->lat, $this->lon); + } + $upload = null; try { @@ -225,7 +236,13 @@ class ApiStatusesUpdateAction extends ApiAuthAction html_entity_decode($status_shortened, ENT_NOQUOTES, 'UTF-8'), $this->source, 1, - $reply_to + $reply_to, + null, + null, + empty($location) ? null : $location->lat, + empty($location) ? null : $location->lon, + empty($location) ? null : $location->location_id, + empty($location) ? null : $location->location_ns ); if (isset($upload)) { -- cgit v1.2.3-54-g00ecf From 5a5c6b145d7f6abac1b2a1f45c570ada248f5dba Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Tue, 10 Nov 2009 22:02:27 +0100 Subject: Update pot --- locale/statusnet.po | 135 ++++++++++++++++++++++++++++------------------------ 1 file changed, 72 insertions(+), 63 deletions(-) diff --git a/locale/statusnet.po b/locale/statusnet.po index 2c40b9f0e..30d449fba 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-08 22:51+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -469,7 +469,7 @@ msgid "Invalid size." msgstr "" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "" @@ -517,7 +517,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:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: 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 @@ -614,7 +614,7 @@ msgstr "" msgid "No profile with that ID." msgstr "" -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "" @@ -626,21 +626,22 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "" #: actions/block.php:149 -msgid "Do not block this user from this group" +msgid "Do not block this user" msgstr "" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "" -#: actions/block.php:150 -msgid "Block this user from this group" +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" msgstr "" #: actions/block.php:165 @@ -1113,7 +1114,7 @@ msgstr "" msgid "Block user from group" msgstr "" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1121,7 +1122,15 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +msgid "Do not block this user from this group" +msgstr "" + +#: actions/groupblock.php:179 +msgid "Block this user from this group" +msgstr "" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1180,7 +1189,7 @@ msgstr "" msgid "Failed updating logo." msgstr "" -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "" @@ -1194,7 +1203,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1202,10 +1211,6 @@ msgstr "" msgid "Block" msgstr "" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "" - #: actions/groupmembers.php:441 msgid "Make user an admin of the group" msgstr "" @@ -1567,7 +1572,7 @@ msgid "Nickname" msgstr "" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "" @@ -1799,60 +1804,64 @@ msgstr "" msgid "Change password" msgstr "" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +msgid "You are not allowed to change your password" +msgstr "" + +#: actions/passwordsettings.php:82 msgid "Change your password." msgstr "" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 msgid "Password change" msgstr "" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "" -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "" -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "" -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "" @@ -2277,7 +2286,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "" @@ -2483,7 +2492,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "" @@ -2535,7 +2544,7 @@ msgstr "" msgid "FOAF for %s group" msgstr "" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "" @@ -3145,39 +3154,39 @@ msgstr "" msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 msgid "Design your profile" msgstr "" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "" @@ -3749,34 +3758,34 @@ msgstr "" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 msgid "Blocked" msgstr "" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, php-format msgid "%s blocked users" msgstr "" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "" @@ -3962,7 +3971,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -3986,7 +3995,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4377,47 +4386,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "" -- cgit v1.2.3-54-g00ecf From da372c4d883eb93bcc90d37dac25bbf6273872a8 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Tue, 10 Nov 2009 22:03:11 +0100 Subject: Localisation updates from translatewiki.net * adding Arabic localisation --- lib/language.php | 1 + locale/ar/LC_MESSAGES/statusnet.mo | Bin 0 -> 22332 bytes locale/ar/LC_MESSAGES/statusnet.po | 4462 ++++++++++++++++++++++++++++++++++++ 3 files changed, 4463 insertions(+) create mode 100644 locale/ar/LC_MESSAGES/statusnet.mo create mode 100644 locale/ar/LC_MESSAGES/statusnet.po diff --git a/lib/language.php b/lib/language.php index bec5620fd..2570907b7 100644 --- a/lib/language.php +++ b/lib/language.php @@ -101,6 +101,7 @@ function get_nice_language_list() */ function get_all_languages() { return array( + 'ar' => array('q' => 0.8, 'lang' => 'ar', 'name' => 'Arabic', 'direction' => 'rtl'), 'bg' => array('q' => 0.8, 'lang' => 'bg', 'name' => 'Bulgarian', 'direction' => 'ltr'), 'ca' => array('q' => 0.5, 'lang' => 'ca', 'name' => 'Catalan', 'direction' => 'ltr'), 'cs' => array('q' => 0.5, 'lang' => 'cs', 'name' => 'Czech', 'direction' => 'ltr'), diff --git a/locale/ar/LC_MESSAGES/statusnet.mo b/locale/ar/LC_MESSAGES/statusnet.mo new file mode 100644 index 000000000..396f81227 Binary files /dev/null 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 new file mode 100644 index 000000000..d5000e633 --- /dev/null +++ b/locale/ar/LC_MESSAGES/statusnet.po @@ -0,0 +1,4462 @@ +# Translation of StatusNet to Arabic +# +# Author@translatewiki.net: OsamaK +# -- +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" +"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-Translation-Project: translatewiki.net at http://translatewiki.net\n" +"X-Language-Code: ar\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 +msgid "No such page" +msgstr "لا صفحة كهذه" + +#: actions/all.php:74 actions/allrss.php:68 +#: actions/apiaccountupdateprofileimage.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/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 +#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 +#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62 +#: actions/newmessage.php:116 actions/remotesubscribe.php:145 +#: actions/remotesubscribe.php:154 actions/replies.php:73 +#: actions/repliesrss.php:38 actions/showfavorites.php:105 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311 +#: lib/command.php:364 lib/command.php:411 lib/command.php:466 +#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: lib/subs.php:34 lib/subs.php:112 +msgid "No such user." +msgstr "لا مستخدم كهذا." + +#: actions/all.php:84 +#, php-format +msgid "%s and friends, page %d" +msgstr "" + +#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 +#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 +#, php-format +msgid "%s and friends" +msgstr "" + +#: actions/all.php:99 +#, php-format +msgid "Feed for friends of %s (RSS 1.0)" +msgstr "" + +#: actions/all.php:107 +#, php-format +msgid "Feed for friends of %s (RSS 2.0)" +msgstr "" + +#: actions/all.php:115 +#, php-format +msgid "Feed for friends of %s (Atom)" +msgstr "" + +#: actions/all.php:127 +#, php-format +msgid "" +"This is the timeline for %s and friends but no one has posted anything yet." +msgstr "" + +#: actions/all.php:132 +#, php-format +msgid "" +"Try subscribing to more people, [join a group](%%action.groups%%) or post " +"something yourself." +msgstr "" + +#: actions/all.php:134 +#, php-format +msgid "" +"You can try to [nudge %s](../%s) from his profile or [post something to his " +"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +msgstr "" + +#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 +#, php-format +msgid "" +"Why not [register an account](%%%%action.register%%%%) and then nudge %s or " +"post a notice to his or her attention." +msgstr "" + +#: actions/all.php:165 +msgid "You and friends" +msgstr "أنت والأصدقاء" + +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 +#, php-format +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/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 +#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 +#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 +#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +msgid "This method requires a POST." +msgstr "" + +#: actions/apiaccountupdateprofileimage.php:97 +#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/newnotice.php:94 lib/designsettings.php:283 +#, php-format +msgid "" +"The server was unable to handle that much POST data (%s bytes) due to its " +"current configuration." +msgstr "" + +#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 +#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +msgid "User has no profile." +msgstr "ليس للمستخدم ملف شخصي." + +#: actions/apiblockcreate.php:108 +msgid "Block user failed." +msgstr "" + +#: actions/apiblockdestroy.php:107 +msgid "Unblock user failed." +msgstr "" + +#: actions/apidirectmessagenew.php:126 +msgid "No message text!" +msgstr "لا نص في الرسالة!" + +#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 +#, php-format +msgid "That's too long. Max message size is %d chars." +msgstr "" + +#: actions/apidirectmessagenew.php:146 +msgid "Recipient user not found." +msgstr "لم يُعثر على المستخدم المستلم." + +#: actions/apidirectmessagenew.php:150 +msgid "Can't send direct messages to users who aren't your friend." +msgstr "" + +#: actions/apidirectmessage.php:89 +#, php-format +msgid "Direct messages from %s" +msgstr "" + +#: actions/apidirectmessage.php:93 +#, php-format +msgid "All the direct messages sent from %s" +msgstr "" + +#: actions/apidirectmessage.php:101 +#, php-format +msgid "Direct messages to %s" +msgstr "" + +#: actions/apidirectmessage.php:105 +#, php-format +msgid "All the direct messages sent to %s" +msgstr "" + +#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 +#: actions/apistatusesdestroy.php:113 +msgid "No status found with that ID." +msgstr "" + +#: actions/apifavoritecreate.php:119 +msgid "This status is already a favorite!" +msgstr "" + +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +msgid "Could not create favorite." +msgstr "تعذّر إنشاء مفضلة." + +#: actions/apifavoritedestroy.php:122 +msgid "That status is not a favorite!" +msgstr "" + +#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 +msgid "Could not delete favorite." +msgstr "تعذّر حذف المفضلة." + +#: actions/apifriendshipscreate.php:109 +msgid "Could not follow user: User not found." +msgstr "" + +#: actions/apifriendshipscreate.php:118 +#, php-format +msgid "Could not follow user: %s is already on your list." +msgstr "" + +#: actions/apifriendshipsdestroy.php:109 +msgid "Could not unfollow user: User not found." +msgstr "" + +#: actions/apifriendshipsdestroy.php:120 +msgid "You cannot unfollow yourself!" +msgstr "" + +#: actions/apifriendshipsexists.php:94 +msgid "Two user ids or screen_names must be supplied." +msgstr "" + +#: actions/apifriendshipsshow.php:135 +msgid "Could not determine source user." +msgstr "" + +#: actions/apifriendshipsshow.php:143 +msgid "Could not find target user." +msgstr "تعذّر إيجاد المستخدم الهدف." + +#: actions/apigroupcreate.php:136 actions/newgroup.php:204 +msgid "Could not create group." +msgstr "" + +#: actions/apigroupcreate.php:147 actions/editgroup.php:259 +#: actions/newgroup.php:210 +msgid "Could not create aliases." +msgstr "تعذّر إنشاء الكنى." + +#: actions/apigroupcreate.php:166 actions/newgroup.php:224 +msgid "Could not set group membership." +msgstr "تعذّر ضبط عضوية المجموعة." + +#: actions/apigroupcreate.php:212 actions/editgroup.php:182 +#: actions/newgroup.php:126 actions/profilesettings.php:208 +#: actions/register.php:205 +msgid "Nickname must have only lowercase letters and numbers and no spaces." +msgstr "" + +#: actions/apigroupcreate.php:221 actions/editgroup.php:186 +#: actions/newgroup.php:130 actions/profilesettings.php:231 +#: actions/register.php:208 +msgid "Nickname already in use. Try another one." +msgstr "" + +#: actions/apigroupcreate.php:228 actions/editgroup.php:189 +#: actions/newgroup.php:133 actions/profilesettings.php:211 +#: actions/register.php:210 +msgid "Not a valid nickname." +msgstr "ليس اسمًا مستعارًا صحيحًا." + +#: actions/apigroupcreate.php:244 actions/editgroup.php:195 +#: actions/newgroup.php:139 actions/profilesettings.php:215 +#: actions/register.php:217 +msgid "Homepage is not a valid URL." +msgstr "الصفحة الرئيسية ليست عنونًا صالحًا." + +#: actions/apigroupcreate.php:253 actions/editgroup.php:198 +#: actions/newgroup.php:142 actions/profilesettings.php:218 +#: actions/register.php:220 +msgid "Full name is too long (max 255 chars)." +msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)" + +#: actions/apigroupcreate.php:261 +#, php-format +msgid "Description is too long (max %d chars)." +msgstr "" + +#: actions/apigroupcreate.php:272 actions/editgroup.php:204 +#: actions/newgroup.php:148 actions/profilesettings.php:225 +#: actions/register.php:227 +msgid "Location is too long (max 255 chars)." +msgstr "" + +#: actions/apigroupcreate.php:291 actions/editgroup.php:215 +#: actions/newgroup.php:159 +#, php-format +msgid "Too many aliases! Maximum %d." +msgstr "" + +#: actions/apigroupcreate.php:312 actions/editgroup.php:224 +#: actions/newgroup.php:168 +#, php-format +msgid "Invalid alias: \"%s\"" +msgstr "" + +#: actions/apigroupcreate.php:321 actions/editgroup.php:228 +#: actions/newgroup.php:172 +#, php-format +msgid "Alias \"%s\" already in use. Try another one." +msgstr "" + +#: actions/apigroupcreate.php:334 actions/editgroup.php:234 +#: actions/newgroup.php:178 +msgid "Alias can't be the same as nickname." +msgstr "" + +#: actions/apigroupjoin.php:110 +msgid "You are already a member of that group." +msgstr "" + +#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221 +msgid "You have been blocked from that group by the admin." +msgstr "" + +#: actions/apigroupjoin.php:138 +#, php-format +msgid "Could not join user %s to group %s." +msgstr "" + +#: actions/apigroupleave.php:114 +msgid "You are not a member of this group." +msgstr "" + +#: actions/apigroupleave.php:124 +#, php-format +msgid "Could not remove user %s to group %s." +msgstr "" + +#: actions/apigrouplistall.php:90 actions/usergroups.php:62 +#, php-format +msgid "%s groups" +msgstr "مجموعات %s" + +#: actions/apigrouplistall.php:94 +#, php-format +msgid "groups on %s" +msgstr "" + +#: actions/apigrouplist.php:95 +#, php-format +msgid "%s's groups" +msgstr "مجموعات %s" + +#: actions/apigrouplist.php:103 +#, php-format +msgid "Groups %s is a member of on %s." +msgstr "" + +#: actions/apistatusesdestroy.php:107 +msgid "This method requires a POST or DELETE." +msgstr "" + +#: actions/apistatusesdestroy.php:130 +msgid "You may not delete another user's status." +msgstr "" + +#: actions/apistatusesshow.php:138 +msgid "Status deleted." +msgstr "حُذِفت الحالة." + +#: actions/apistatusesshow.php:144 +msgid "No status with that ID found." +msgstr "" + +#: actions/apistatusesupdate.php:152 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 +msgid "Not found" +msgstr "لم يوجد" + +#: actions/apistatusesupdate.php:216 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 +msgid "Unsupported format." +msgstr "نسق غير مدعوم." + +#: actions/apitimelinefavorites.php:107 +#, php-format +msgid "%s / Favorites from %s" +msgstr "" + +#: actions/apitimelinefavorites.php:119 +#, php-format +msgid "%s updates favorited by %s / %s." +msgstr "" + +#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117 +#: actions/grouprss.php:131 actions/userrss.php:90 +#, php-format +msgid "%s timeline" +msgstr "" + +#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125 +#: actions/userrss.php:92 +#, php-format +msgid "Updates from %1$s on %2$s!" +msgstr "" + +#: actions/apitimelinementions.php:116 +#, php-format +msgid "%1$s / Updates mentioning %2$s" +msgstr "" + +#: actions/apitimelinementions.php:126 +#, php-format +msgid "%1$s updates that reply to updates from %2$s / %3$s." +msgstr "" + +#: actions/apitimelinepublic.php:106 actions/publicrss.php:103 +#, php-format +msgid "%s public timeline" +msgstr "" + +#: actions/apitimelinepublic.php:110 actions/publicrss.php:105 +#, php-format +msgid "%s updates from everyone!" +msgstr "" + +#: actions/apitimelinetag.php:101 actions/tag.php:66 +#, php-format +msgid "Notices tagged with %s" +msgstr "" + +#: actions/apitimelinetag.php:107 actions/tagrss.php:64 +#, php-format +msgid "Updates tagged with %1$s on %2$s!" +msgstr "" + +#: actions/apiusershow.php:96 +msgid "Not found." +msgstr "" + +#: actions/attachment.php:73 +msgid "No such attachment." +msgstr "لا مرفق كهذا." + +#: actions/avatarbynickname.php:59 actions/leavegroup.php:76 +msgid "No nickname." +msgstr "لا اسم مستعار." + +#: actions/avatarbynickname.php:64 +msgid "No size." +msgstr "لا حجم." + +#: actions/avatarbynickname.php:69 +msgid "Invalid size." +msgstr "حجم غير صالح." + +#: actions/avatarsettings.php:67 actions/showgroup.php:221 +#: lib/accountsettingsaction.php:113 +msgid "Avatar" +msgstr "أفتار" + +#: actions/avatarsettings.php:78 +#, php-format +msgid "You can upload your personal avatar. The maximum file size is %s." +msgstr "" + +#: actions/avatarsettings.php:106 actions/avatarsettings.php:182 +#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 +#: actions/userauthorization.php:72 actions/userrss.php:103 +msgid "User without matching profile" +msgstr "" + +#: actions/avatarsettings.php:119 actions/avatarsettings.php:194 +#: actions/grouplogo.php:251 +msgid "Avatar settings" +msgstr "إعدادات الأفتار" + +#: actions/avatarsettings.php:126 actions/avatarsettings.php:202 +#: actions/grouplogo.php:199 actions/grouplogo.php:259 +msgid "Original" +msgstr "" + +#: actions/avatarsettings.php:141 actions/avatarsettings.php:214 +#: actions/grouplogo.php:210 actions/grouplogo.php:271 +msgid "Preview" +msgstr "عاين" + +#: actions/avatarsettings.php:148 lib/noticelist.php:522 +msgid "Delete" +msgstr "احذف" + +#: actions/avatarsettings.php:165 actions/grouplogo.php:233 +msgid "Upload" +msgstr "ارفع" + +#: actions/avatarsettings.php:228 actions/grouplogo.php:286 +msgid "Crop" +msgstr "" + +#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74 +#: actions/emailsettings.php:237 actions/favor.php:75 +#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/groupunblock.php:66 actions/imsettings.php:206 +#: actions/invite.php:56 actions/login.php: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/profilesettings.php:187 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 +#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69 +#: actions/userauthorization.php:52 lib/designsettings.php:294 +msgid "There was a problem with your session token. Try again, please." +msgstr "" + +#: actions/avatarsettings.php:277 actions/emailsettings.php:255 +#: actions/grouplogo.php:319 actions/imsettings.php:220 +#: actions/recoverpassword.php:44 actions/smssettings.php:248 +#: lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "" + +#: actions/avatarsettings.php:322 +msgid "Pick a square area of the image to be your avatar" +msgstr "" + +#: actions/avatarsettings.php:337 actions/grouplogo.php:377 +msgid "Lost our file data." +msgstr "" + +#: actions/avatarsettings.php:360 +msgid "Avatar updated." +msgstr "رُفع الأفتار." + +#: actions/avatarsettings.php:363 +msgid "Failed updating avatar." +msgstr "" + +#: actions/avatarsettings.php:387 +msgid "Avatar deleted." +msgstr "حُذف الأفتار." + +#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 +#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 +#: actions/groupmembers.php:76 actions/grouprss.php:91 +#: actions/joingroup.php:76 actions/showgroup.php:121 +msgid "No nickname" +msgstr "لا اسم مستعار" + +#: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 +#: actions/grouplogo.php:99 actions/groupmembers.php:83 +#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 +msgid "No such group" +msgstr "لا مجموعة كهذه" + +#: actions/blockedfromgroup.php:90 +#, php-format +msgid "%s blocked profiles" +msgstr "" + +#: actions/blockedfromgroup.php:93 +#, php-format +msgid "%s blocked profiles, page %d" +msgstr "" + +#: actions/blockedfromgroup.php:108 +msgid "A list of the users blocked from joining this group." +msgstr "" + +#: actions/blockedfromgroup.php:281 +msgid "Unblock user from group" +msgstr "" + +#: actions/blockedfromgroup.php:313 lib/unblockform.php:150 +msgid "Unblock" +msgstr "ألغِ المنع" + +#: actions/blockedfromgroup.php:313 lib/unblockform.php:120 +#: lib/unblockform.php:150 +msgid "Unblock this user" +msgstr "ألغِ منع هذا المستخدم" + +#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61 +#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61 +#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87 +#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31 +#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52 +#: lib/settingsaction.php:72 +msgid "Not logged in." +msgstr "لست والجًا." + +#: 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 "لا ملف شخصي مُحدّد." + +#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76 +#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 +#: actions/unblock.php:75 +msgid "No profile with that ID." +msgstr "لا ملف شخصي بهذه الهوية." + +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 +msgid "Block user" +msgstr "امنع المستخدم" + +#: actions/block.php:136 +msgid "" +"Are you sure you want to block this user? Afterwards, they will be " +"unsubscribed from you, unable to subscribe to you in the future, and you " +"will not be notified of any @-replies from them." +msgstr "" + +#: actions/block.php:149 actions/deletenotice.php:145 +#: actions/groupblock.php:178 +msgid "No" +msgstr "لا" + +#: actions/block.php:149 +#, fuzzy +msgid "Do not block this user" +msgstr "ألغِ منع هذا المستخدم" + +#: actions/block.php:150 actions/deletenotice.php:146 +#: actions/groupblock.php:179 +msgid "Yes" +msgstr "نعم" + +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" +msgstr "" + +#: actions/block.php:165 +msgid "You have already blocked this user." +msgstr "" + +#: actions/block.php:170 +msgid "Failed to save block information." +msgstr "" + +#: actions/bookmarklet.php:50 +msgid "Post to " +msgstr "" + +#: actions/confirmaddress.php:75 +msgid "No confirmation code." +msgstr "لا رمز تأكيد." + +#: actions/confirmaddress.php:80 +msgid "Confirmation code not found." +msgstr "لم يوجد رمز التأكيد." + +#: actions/confirmaddress.php:85 +msgid "That confirmation code is not for you!" +msgstr "" + +#: actions/confirmaddress.php:90 +#, php-format +msgid "Unrecognized address type %s" +msgstr "" + +#: actions/confirmaddress.php:94 +msgid "That address has already been confirmed." +msgstr "" + +#: actions/confirmaddress.php:114 actions/emailsettings.php:295 +#: actions/emailsettings.php:426 actions/imsettings.php:258 +#: actions/imsettings.php:401 actions/othersettings.php:174 +#: actions/profilesettings.php:276 actions/smssettings.php:278 +#: actions/smssettings.php:420 +msgid "Couldn't update user." +msgstr "تعذّر تحديث المستخدم." + +#: actions/confirmaddress.php:126 actions/emailsettings.php:390 +#: actions/imsettings.php:363 actions/smssettings.php:382 +msgid "Couldn't delete email confirmation." +msgstr "تعذّر حذف تأكيد البريد الإلكتروني." + +#: actions/confirmaddress.php:144 +msgid "Confirm Address" +msgstr "عنوان التأكيد" + +#: actions/confirmaddress.php:159 +#, php-format +msgid "The address \"%s\" has been confirmed for your account." +msgstr "" + +#: actions/conversation.php:99 +msgid "Conversation" +msgstr "محادثة" + +#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 +#: lib/profileaction.php:206 +msgid "Notices" +msgstr "الإشعارات" + +#: actions/deletenotice.php:52 actions/shownotice.php:92 +msgid "No such notice." +msgstr "لا إشعار كهذا." + +#: actions/deletenotice.php:71 +msgid "Can't delete this notice." +msgstr "تعذّر حذف هذا الإشعار." + +#: actions/deletenotice.php:103 +msgid "" +"You are about to permanently delete a notice. Once this is done, it cannot " +"be undone." +msgstr "" + +#: actions/deletenotice.php:109 actions/deletenotice.php:141 +msgid "Delete notice" +msgstr "احذف الملاحظة" + +#: actions/deletenotice.php:144 +msgid "Are you sure you want to delete this notice?" +msgstr "أمتأكد من أنك تريد حذف هذه الملاحظة؟" + +#: actions/deletenotice.php:145 +msgid "Do not delete this notice" +msgstr "لا تحذف هذا الإشعار" + +#: actions/deletenotice.php:146 lib/noticelist.php:522 +msgid "Delete this notice" +msgstr "" + +#: actions/deletenotice.php:157 +msgid "There was a problem with your session token. Try again, please." +msgstr "" + +#: actions/disfavor.php:81 +msgid "This notice is not a favorite!" +msgstr "" + +#: actions/disfavor.php:94 +msgid "Add to favorites" +msgstr "أضف إلى المفضلات" + +#: actions/doc.php:69 +msgid "No such document." +msgstr "" + +#: actions/editgroup.php:56 +#, php-format +msgid "Edit %s group" +msgstr "" + +#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65 +msgid "You must be logged in to create a group." +msgstr "" + +#: actions/editgroup.php:103 actions/editgroup.php:168 +#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 +msgid "You must be an admin to edit the group" +msgstr "" + +#: actions/editgroup.php:154 +msgid "Use this form to edit the group." +msgstr "" + +#: actions/editgroup.php:201 actions/newgroup.php:145 +#, php-format +msgid "description is too long (max %d chars)." +msgstr "" + +#: actions/editgroup.php:253 +msgid "Could not update group." +msgstr "تعذر تحديث المجموعة." + +#: actions/editgroup.php:269 +msgid "Options saved." +msgstr "حُفظت الخيارات." + +#: actions/emailsettings.php:60 +msgid "Email Settings" +msgstr "إعدادات البريد الإلكتروني" + +#: actions/emailsettings.php:71 +#, php-format +msgid "Manage how you get email from %%site.name%%." +msgstr "" + +#: actions/emailsettings.php:100 actions/imsettings.php:100 +#: actions/smssettings.php:104 +msgid "Address" +msgstr "العنوان" + +#: actions/emailsettings.php:105 +msgid "Current confirmed email address." +msgstr "" + +#: actions/emailsettings.php:107 actions/emailsettings.php:140 +#: actions/imsettings.php:108 actions/smssettings.php:115 +#: actions/smssettings.php:158 +msgid "Remove" +msgstr "أزل" + +#: actions/emailsettings.php:113 +msgid "" +"Awaiting confirmation on this address. Check your inbox (and spam box!) for " +"a message with further instructions." +msgstr "" + +#: actions/emailsettings.php:117 actions/imsettings.php:120 +#: actions/smssettings.php:126 +msgid "Cancel" +msgstr "ألغِ" + +#: actions/emailsettings.php:121 +msgid "Email Address" +msgstr "عنوان البريد الإلكتروني" + +#: actions/emailsettings.php:123 +msgid "Email address, like \"UserName@example.org\"" +msgstr "عنوان البريد الإلكتروني، مثل \"UserName@example.org\"" + +#: actions/emailsettings.php:126 actions/imsettings.php:133 +#: actions/smssettings.php:145 +msgid "Add" +msgstr "أضف" + +#: actions/emailsettings.php:133 actions/smssettings.php:152 +msgid "Incoming email" +msgstr "البريد الإلكتروني الوارد" + +#: actions/emailsettings.php:138 actions/smssettings.php:157 +msgid "Send email to this address to post new notices." +msgstr "" + +#: actions/emailsettings.php:145 actions/smssettings.php:162 +msgid "Make a new email address for posting to; cancels the old one." +msgstr "" + +#: actions/emailsettings.php:148 actions/smssettings.php:164 +msgid "New" +msgstr "جديد" + +#: actions/emailsettings.php:153 actions/imsettings.php:139 +#: actions/smssettings.php:169 +msgid "Preferences" +msgstr "التفضيلات" + +#: actions/emailsettings.php:158 +msgid "Send me notices of new subscriptions through email." +msgstr "" + +#: actions/emailsettings.php:163 +msgid "Send me email when someone adds my notice as a favorite." +msgstr "" + +#: actions/emailsettings.php:169 +msgid "Send me email when someone sends me a private message." +msgstr "" + +#: actions/emailsettings.php:174 +msgid "Send me email when someone sends me an \"@-reply\"." +msgstr "" + +#: actions/emailsettings.php:179 +msgid "Allow friends to nudge me and send me an email." +msgstr "" + +#: actions/emailsettings.php:185 +msgid "I want to post notices by email." +msgstr "أريد أن أرسل الملاحظات عبر البريد الإلكتروني." + +#: actions/emailsettings.php:191 +msgid "Publish a MicroID for my email address." +msgstr "" + +#: actions/emailsettings.php:195 actions/imsettings.php:163 +#: actions/othersettings.php:126 actions/profilesettings.php:167 +#: actions/smssettings.php:181 actions/subscriptions.php:203 +#: actions/tagother.php:154 lib/designsettings.php:256 +#: lib/groupeditform.php:202 +msgid "Save" +msgstr "أرسل" + +#: actions/emailsettings.php:301 actions/imsettings.php:264 +#: actions/othersettings.php:180 actions/smssettings.php:284 +msgid "Preferences saved." +msgstr "حُفِظت التفضيلات." + +#: actions/emailsettings.php:319 +msgid "No email address." +msgstr "لا عنوان بريد إلكتروني." + +#: actions/emailsettings.php:326 +msgid "Cannot normalize that email address" +msgstr "" + +#: actions/emailsettings.php:330 +msgid "Not a valid email address" +msgstr "ليس عنوان بريد صالح" + +#: actions/emailsettings.php:333 +msgid "That is already your email address." +msgstr "" + +#: actions/emailsettings.php:336 +msgid "That email address already belongs to another user." +msgstr "" + +#: actions/emailsettings.php:352 actions/imsettings.php:317 +#: actions/smssettings.php:337 +msgid "Couldn't insert confirmation code." +msgstr "" + +#: 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 "" + +#: actions/emailsettings.php:378 actions/imsettings.php:351 +#: actions/smssettings.php:370 +msgid "No pending confirmation to cancel." +msgstr "" + +#: actions/emailsettings.php:382 actions/imsettings.php:355 +msgid "That is the wrong IM address." +msgstr "" + +#: actions/emailsettings.php:394 actions/imsettings.php:367 +#: actions/smssettings.php:386 +msgid "Confirmation cancelled." +msgstr "أُلغي التأكيد." + +#: actions/emailsettings.php:412 +msgid "That is not your email address." +msgstr "هذا ليس عنوان بريدك الإلكتروني." + +#: actions/emailsettings.php:431 actions/imsettings.php:408 +#: actions/smssettings.php:425 +msgid "The address was removed." +msgstr "" + +#: actions/emailsettings.php:445 actions/smssettings.php:518 +msgid "No incoming email address." +msgstr "" + +#: actions/emailsettings.php:455 actions/emailsettings.php:477 +#: actions/smssettings.php:528 actions/smssettings.php:552 +msgid "Couldn't update user record." +msgstr "" + +#: actions/emailsettings.php:458 actions/smssettings.php:531 +msgid "Incoming email address removed." +msgstr "" + +#: actions/emailsettings.php:480 actions/smssettings.php:555 +msgid "New incoming email address added." +msgstr "" + +#: actions/favorited.php:65 lib/popularnoticesection.php:87 +#: lib/publicgroupnav.php:93 +msgid "Popular notices" +msgstr "" + +#: actions/favorited.php:67 +#, php-format +msgid "Popular notices, page %d" +msgstr "" + +#: actions/favorited.php:79 +msgid "The most popular notices on the site right now." +msgstr "" + +#: actions/favorited.php:150 +msgid "Favorite notices appear on this page but no one has favorited one yet." +msgstr "" + +#: actions/favorited.php:153 +msgid "" +"Be the first to add a notice to your favorites by clicking the fave button " +"next to any notice you like." +msgstr "" + +#: actions/favorited.php:156 +#, php-format +msgid "" +"Why not [register an account](%%action.register%%) and be the first to add a " +"notice to your favorites!" +msgstr "" + +#: actions/favoritesrss.php:111 actions/showfavorites.php:77 +#: lib/personalgroupnav.php:115 +#, php-format +msgid "%s's favorite notices" +msgstr "" + +#: actions/favoritesrss.php:115 +#, php-format +msgid "Updates favored by %1$s on %2$s!" +msgstr "" + +#: actions/favor.php:79 +msgid "This notice is already a favorite!" +msgstr "" + +#: actions/favor.php:92 lib/disfavorform.php:140 +msgid "Disfavor favorite" +msgstr "" + +#: actions/featured.php:69 lib/featureduserssection.php:87 +#: lib/publicgroupnav.php:89 +msgid "Featured users" +msgstr "مستخدمون مختارون" + +#: actions/featured.php:71 +#, php-format +msgid "Featured users, page %d" +msgstr "" + +#: actions/featured.php:99 +#, php-format +msgid "A selection of some of the great users on %s" +msgstr "" + +#: actions/file.php:34 +msgid "No notice id" +msgstr "لا هوية إشعار" + +#: actions/file.php:38 +msgid "No notice" +msgstr "لا إشعار" + +#: actions/file.php:42 +msgid "No attachments" +msgstr "لا مرفقات" + +#: actions/file.php:51 +msgid "No uploaded attachments" +msgstr "لا مرفقات مرفوعة" + +#: actions/finishremotesubscribe.php:69 +msgid "Not expecting this response!" +msgstr "" + +#: actions/finishremotesubscribe.php:80 +msgid "User being listened to does not exist." +msgstr "" + +#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59 +msgid "You can use the local subscription!" +msgstr "" + +#: actions/finishremotesubscribe.php:96 +msgid "That user has blocked you from subscribing." +msgstr "" + +#: actions/finishremotesubscribe.php:106 +msgid "You are not authorized." +msgstr "" + +#: actions/finishremotesubscribe.php:109 +msgid "Could not convert request token to access token." +msgstr "" + +#: actions/finishremotesubscribe.php:114 +msgid "Remote service uses unknown version of OMB protocol." +msgstr "" + +#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306 +msgid "Error updating remote profile" +msgstr "خطأ أثناء تحديث الملف الشخصي البعيد" + +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 +#: actions/groupunblock.php:86 actions/leavegroup.php:83 +#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 +msgid "No such group." +msgstr "لا مجموعة كهذه." + +#: actions/getfile.php:75 +msgid "No such file." +msgstr "لا ملف كهذا." + +#: actions/getfile.php:79 +msgid "Cannot read file." +msgstr "تعذّرت قراءة الملف." + +#: actions/groupblock.php:81 actions/groupunblock.php:81 +#: actions/makeadmin.php:81 +msgid "No group specified." +msgstr "لا مجموعة مُحدّدة." + +#: actions/groupblock.php:91 +msgid "Only an admin can block group members." +msgstr "" + +#: actions/groupblock.php:95 +msgid "User is already blocked from group." +msgstr "" + +#: actions/groupblock.php:100 +msgid "User is not a member of group." +msgstr "" + +#: actions/groupblock.php:136 actions/groupmembers.php:314 +msgid "Block user from group" +msgstr "امنع المستخدم من المجموعة" + +#: actions/groupblock.php:162 +#, php-format +msgid "" +"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " +"be removed from the group, unable to post, and unable to subscribe to the " +"group in the future." +msgstr "" + +#: actions/groupblock.php:178 +msgid "Do not block this user from this group" +msgstr "" + +#: actions/groupblock.php:179 +msgid "Block this user from this group" +msgstr "" + +#: actions/groupblock.php:196 +msgid "Database error blocking user from group." +msgstr "" + +#: actions/groupbyid.php:74 +msgid "No ID" +msgstr "لا هوية" + +#: actions/groupdesignsettings.php:68 +msgid "You must be logged in to edit a group." +msgstr "" + +#: actions/groupdesignsettings.php:141 +msgid "Group design" +msgstr "تصميم المجموعة" + +#: actions/groupdesignsettings.php:152 +msgid "" +"Customize the way your group looks with a background image and a colour " +"palette of your choice." +msgstr "" + +#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 +#: lib/designsettings.php:434 lib/designsettings.php:464 +msgid "Couldn't update your design." +msgstr "" + +#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 +msgid "Unable to save your design settings!" +msgstr "" + +#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 +msgid "Design preferences saved." +msgstr "" + +#: actions/grouplogo.php:139 actions/grouplogo.php:192 +msgid "Group logo" +msgstr "شعار المجموعة" + +#: actions/grouplogo.php:150 +#, php-format +msgid "" +"You can upload a logo image for your group. The maximum file size is %s." +msgstr "" + +#: actions/grouplogo.php:362 +msgid "Pick a square area of the image to be the logo." +msgstr "" + +#: actions/grouplogo.php:396 +msgid "Logo updated." +msgstr "" + +#: actions/grouplogo.php:398 +msgid "Failed updating logo." +msgstr "" + +#: actions/groupmembers.php:93 lib/groupnav.php:92 +#, php-format +msgid "%s group members" +msgstr "" + +#: actions/groupmembers.php:96 +#, php-format +msgid "%s group members, page %d" +msgstr "" + +#: actions/groupmembers.php:111 +msgid "A list of the users in this group." +msgstr "قائمة بمستخدمي هذه المجموعة." + +#: actions/groupmembers.php:175 lib/groupnav.php:107 +msgid "Admin" +msgstr "إداري" + +#: actions/groupmembers.php:346 lib/blockform.php:153 +msgid "Block" +msgstr "امنع" + +#: actions/groupmembers.php:441 +msgid "Make user an admin of the group" +msgstr "" + +#: actions/groupmembers.php:473 +msgid "Make Admin" +msgstr "" + +#: actions/groupmembers.php:473 +msgid "Make this user an admin" +msgstr "اجعل هذا المستخدم إداريًا" + +#: actions/grouprss.php:133 +#, php-format +msgid "Updates from members of %1$s on %2$s!" +msgstr "" + +#: actions/groupsearch.php:52 +#, php-format +msgid "" +"Search for groups on %%site.name%% by their name, location, or description. " +"Separate the terms by spaces; they must be 3 characters or more." +msgstr "" + +#: actions/groupsearch.php:58 +msgid "Group search" +msgstr "بحث في المجموعات" + +#: actions/groupsearch.php:79 actions/noticesearch.php:117 +#: actions/peoplesearch.php:83 +msgid "No results." +msgstr "لا نتائج." + +#: actions/groupsearch.php:82 +#, php-format +msgid "" +"If you can't find the group you're looking for, you can [create it](%%action." +"newgroup%%) yourself." +msgstr "" + +#: actions/groupsearch.php:85 +#, php-format +msgid "" +"Why not [register an account](%%action.register%%) and [create the group](%%" +"action.newgroup%%) yourself!" +msgstr "" + +#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81 +#: lib/subgroupnav.php:98 +msgid "Groups" +msgstr "مجموعات" + +#: actions/groups.php:64 +#, php-format +msgid "Groups, page %d" +msgstr "" + +#: actions/groups.php:90 +#, php-format +msgid "" +"%%%%site.name%%%% groups let you find and talk with people of similar " +"interests. After you join a group you can send messages to all other members " +"using the syntax \"!groupname\". Don't see a group you like? Try [searching " +"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" +"%%%%)" +msgstr "" + +#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 +msgid "Create a new group" +msgstr "أنشئ مجموعة جديدة" + +#: actions/groupunblock.php:91 +msgid "Only an admin can unblock group members." +msgstr "" + +#: actions/groupunblock.php:95 +msgid "User is not blocked from group." +msgstr "" + +#: actions/groupunblock.php:128 actions/unblock.php:108 +msgid "Error removing the block." +msgstr "" + +#: actions/imsettings.php:59 +msgid "IM Settings" +msgstr "إعدادات المراسلة الفورية" + +#: actions/imsettings.php:70 +#, php-format +msgid "" +"You can send and receive notices through Jabber/GTalk [instant messages](%%" +"doc.im%%). Configure your address and settings below." +msgstr "" + +#: actions/imsettings.php:89 +msgid "IM is not available." +msgstr "المراسلة الفورية غير متوفرة." + +#: actions/imsettings.php:106 +msgid "Current confirmed Jabber/GTalk address." +msgstr "" + +#: actions/imsettings.php:114 +#, php-format +msgid "" +"Awaiting confirmation on this address. Check your Jabber/GTalk account for a " +"message with further instructions. (Did you add %s to your buddy list?)" +msgstr "" + +#: actions/imsettings.php:124 +msgid "IM Address" +msgstr "عنوان المراسلة الفورية" + +#: actions/imsettings.php:126 +#, php-format +msgid "" +"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " +"add %s to your buddy list in your IM client or on GTalk." +msgstr "" + +#: actions/imsettings.php:143 +msgid "Send me notices through Jabber/GTalk." +msgstr "" + +#: actions/imsettings.php:148 +msgid "Post a notice when my Jabber/GTalk status changes." +msgstr "" + +#: actions/imsettings.php:153 +msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." +msgstr "" + +#: actions/imsettings.php:159 +msgid "Publish a MicroID for my Jabber/GTalk address." +msgstr "" + +#: actions/imsettings.php:285 +msgid "No Jabber ID." +msgstr "لا هوية جابر." + +#: actions/imsettings.php:292 +msgid "Cannot normalize that Jabber ID" +msgstr "" + +#: actions/imsettings.php:296 +msgid "Not a valid Jabber ID" +msgstr "" + +#: actions/imsettings.php:299 +msgid "That is already your Jabber ID." +msgstr "" + +#: actions/imsettings.php:302 +msgid "Jabber ID already belongs to another user." +msgstr "" + +#: actions/imsettings.php:327 +#, php-format +msgid "" +"A confirmation code was sent to the IM address you added. You must approve %" +"s for sending messages to you." +msgstr "" + +#: actions/imsettings.php:387 +msgid "That is not your Jabber ID." +msgstr "هذه ليست هويتك في جابر." + +#: actions/inbox.php:59 +#, php-format +msgid "Inbox for %s - page %d" +msgstr "" + +#: actions/inbox.php:62 +#, php-format +msgid "Inbox for %s" +msgstr "" + +#: actions/inbox.php:115 +msgid "This is your inbox, which lists your incoming private messages." +msgstr "" + +#: actions/invite.php:39 +msgid "Invites have been disabled." +msgstr "" + +#: actions/invite.php:41 +#, php-format +msgid "You must be logged in to invite other users to use %s" +msgstr "" + +#: actions/invite.php:72 +#, php-format +msgid "Invalid email address: %s" +msgstr "عنوان بريد إلكتروني غير صالح: %s" + +#: actions/invite.php:110 +msgid "Invitation(s) sent" +msgstr "" + +#: actions/invite.php:112 +msgid "Invite new users" +msgstr "" + +#: actions/invite.php:128 +msgid "You are already subscribed to these users:" +msgstr "" + +#: actions/invite.php:131 actions/invite.php:139 +#, php-format +msgid "%s (%s)" +msgstr "" + +#: actions/invite.php:136 +msgid "" +"These people are already users and you were automatically subscribed to them:" +msgstr "" + +#: actions/invite.php:144 +msgid "Invitation(s) sent to the following people:" +msgstr "" + +#: actions/invite.php:150 +msgid "" +"You will be notified when your invitees accept the invitation and register " +"on the site. Thanks for growing the community!" +msgstr "" + +#: actions/invite.php:162 +msgid "" +"Use this form to invite your friends and colleagues to use this service." +msgstr "" + +#: actions/invite.php:187 +msgid "Email addresses" +msgstr "عناوين البريد الإلكتروني" + +#: actions/invite.php:189 +msgid "Addresses of friends to invite (one per line)" +msgstr "" + +#: actions/invite.php:192 +msgid "Personal message" +msgstr "رسالة شخصية" + +#: actions/invite.php:194 +msgid "Optionally add a personal message to the invitation." +msgstr "" + +#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208 +msgid "Send" +msgstr "أرسل" + +#: actions/invite.php:226 +#, php-format +msgid "%1$s has invited you to join them on %2$s" +msgstr "" + +#: actions/invite.php:228 +#, php-format +msgid "" +"%1$s has invited you to join them on %2$s (%3$s).\n" +"\n" +"%2$s is a micro-blogging service that lets you keep up-to-date with people " +"you know and people who interest you.\n" +"\n" +"You can also share news about yourself, your thoughts, or your life online " +"with people who know about you. It's also great for meeting new people who " +"share your interests.\n" +"\n" +"%1$s said:\n" +"\n" +"%4$s\n" +"\n" +"You can see %1$s's profile page on %2$s here:\n" +"\n" +"%5$s\n" +"\n" +"If you'd like to try the service, click on the link below to accept the " +"invitation.\n" +"\n" +"%6$s\n" +"\n" +"If not, you can ignore this message. Thanks for your patience and your " +"time.\n" +"\n" +"Sincerely, %2$s\n" +msgstr "" + +#: actions/joingroup.php:60 +msgid "You must be logged in to join a group." +msgstr "" + +#: actions/joingroup.php:90 lib/command.php:217 +msgid "You are already a member of that group" +msgstr "" + +#: actions/joingroup.php:128 lib/command.php:234 +#, php-format +msgid "Could not join user %s to group %s" +msgstr "" + +#: actions/joingroup.php:135 lib/command.php:239 +#, php-format +msgid "%s joined group %s" +msgstr "" + +#: actions/leavegroup.php:60 +msgid "You must be logged in to leave a group." +msgstr "" + +#: actions/leavegroup.php:90 lib/command.php:268 +msgid "You are not a member of that group." +msgstr "لست عضوا في تلك المجموعة." + +#: actions/leavegroup.php:119 lib/command.php:278 +msgid "Could not find membership record." +msgstr "" + +#: actions/leavegroup.php:127 lib/command.php:284 +#, php-format +msgid "Could not remove user %s to group %s" +msgstr "" + +#: actions/leavegroup.php:134 lib/command.php:289 +#, php-format +msgid "%s left group %s" +msgstr "" + +#: actions/login.php:79 actions/register.php:137 +msgid "Already logged in." +msgstr "والج بالفعل." + +#: actions/login.php:110 actions/login.php:120 +msgid "Invalid or expired token." +msgstr "" + +#: actions/login.php:143 +msgid "Incorrect username or password." +msgstr "اسم المستخدم أو كلمة السر غير صحيحان." + +#: actions/login.php:149 actions/recoverpassword.php:375 +#: actions/register.php:248 +msgid "Error setting user." +msgstr "خطأ أثناء ضبط المستخدم." + +#: actions/login.php:204 actions/login.php:257 lib/action.php:453 +#: lib/logingroupnav.php:79 +msgid "Login" +msgstr "لُج" + +#: actions/login.php:243 +msgid "Login to site" +msgstr "لُج إلى الموقع" + +#: actions/login.php:246 actions/profilesettings.php:106 +#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: lib/groupeditform.php:152 lib/userprofile.php:131 +msgid "Nickname" +msgstr "الاسم المستعار" + +#: actions/login.php:249 actions/register.php:428 +#: lib/accountsettingsaction.php:118 +msgid "Password" +msgstr "كلمة السر" + +#: actions/login.php:252 actions/register.php:477 +msgid "Remember me" +msgstr "تذكّرني" + +#: actions/login.php:253 actions/register.php:479 +msgid "Automatically login in the future; not for shared computers!" +msgstr "" + +#: actions/login.php:263 +msgid "Lost or forgotten password?" +msgstr "أنسيت كلمة السر؟" + +#: actions/login.php:282 +msgid "" +"For security reasons, please re-enter your user name and password before " +"changing your settings." +msgstr "" + +#: actions/login.php:286 +#, php-format +msgid "" +"Login with your username and password. Don't have a username yet? [Register]" +"(%%action.register%%) a new account." +msgstr "" + +#: actions/makeadmin.php:91 +msgid "Only an admin can make another user an admin." +msgstr "" + +#: actions/makeadmin.php:95 +#, php-format +msgid "%s is already an admin for group \"%s\"." +msgstr "" + +#: actions/makeadmin.php:132 +#, php-format +msgid "Can't get membership record for %s in group %s" +msgstr "" + +#: actions/makeadmin.php:145 +#, php-format +msgid "Can't make %s an admin for group %s" +msgstr "" + +#: actions/microsummary.php:69 +msgid "No current status" +msgstr "" + +#: actions/newgroup.php:53 +msgid "New group" +msgstr "مجموعة جديدة" + +#: actions/newgroup.php:110 +msgid "Use this form to create a new group." +msgstr "" + +#: actions/newmessage.php:71 actions/newmessage.php:231 +msgid "New message" +msgstr "رسالة جديدة" + +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +msgid "You can't send a message to this user." +msgstr "" + +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 +#: lib/command.php:424 +msgid "No content!" +msgstr "لا محتوى!" + +#: actions/newmessage.php:158 +msgid "No recipient specified." +msgstr "" + +#: actions/newmessage.php:164 lib/command.php:370 +msgid "" +"Don't send a message to yourself; just say it to yourself quietly instead." +msgstr "" + +#: actions/newmessage.php:181 +msgid "Message sent" +msgstr "أُرسلت الرسالة" + +#: actions/newmessage.php:185 lib/command.php:375 +#, php-format +msgid "Direct message to %s sent" +msgstr "" + +#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170 +msgid "Ajax Error" +msgstr "" + +#: actions/newnotice.php:69 +msgid "New notice" +msgstr "إشعار جديد" + +#: actions/newnotice.php:199 +msgid "Notice posted" +msgstr "" + +#: actions/noticesearch.php:68 +#, php-format +msgid "" +"Search for notices on %%site.name%% by their contents. Separate search terms " +"by spaces; they must be 3 characters or more." +msgstr "" + +#: actions/noticesearch.php:78 +msgid "Text search" +msgstr "بحث النص" + +#: actions/noticesearch.php:91 +#, php-format +msgid "Search results for \"%s\" on %s" +msgstr "" + +#: actions/noticesearch.php:121 +#, php-format +msgid "" +"Be the first to [post on this topic](%%%%action.newnotice%%%%?" +"status_textarea=%s)!" +msgstr "" + +#: actions/noticesearch.php:124 +#, php-format +msgid "" +"Why not [register an account](%%%%action.register%%%%) and be the first to " +"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" +msgstr "" + +#: actions/noticesearchrss.php:89 +#, php-format +msgid "Updates with \"%s\"" +msgstr "" + +#: actions/noticesearchrss.php:91 +#, php-format +msgid "Updates matching search term \"%1$s\" on %2$s!" +msgstr "" + +#: actions/nudge.php:85 +msgid "" +"This user doesn't allow nudges or hasn't confirmed or set his email yet." +msgstr "" + +#: actions/nudge.php:94 +msgid "Nudge sent" +msgstr "" + +#: actions/nudge.php:97 +msgid "Nudge sent!" +msgstr "" + +#: actions/oembed.php:79 actions/shownotice.php:100 +msgid "Notice has no profile" +msgstr "" + +#: actions/oembed.php:86 actions/shownotice.php:180 +#, php-format +msgid "%1$s's status on %2$s" +msgstr "" + +#: actions/oembed.php:157 +msgid "content type " +msgstr "نوع المحتوى " + +#: actions/oembed.php:160 +msgid "Only " +msgstr "" + +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 +#: lib/api.php:991 lib/api.php:1101 +msgid "Not a supported data format." +msgstr "" + +#: actions/opensearch.php:64 +msgid "People Search" +msgstr "" + +#: actions/opensearch.php:67 +msgid "Notice Search" +msgstr "" + +#: actions/othersettings.php:60 +msgid "Other Settings" +msgstr "إعدادات أخرى" + +#: actions/othersettings.php:71 +msgid "Manage various other options." +msgstr "" + +#: actions/othersettings.php:117 +msgid "Shorten URLs with" +msgstr "قصّر المسارات بـ" + +#: actions/othersettings.php:118 +msgid "Automatic shortening service to use." +msgstr "" + +#: actions/othersettings.php:122 +msgid "View profile designs" +msgstr "" + +#: actions/othersettings.php:123 +msgid "Show or hide profile designs." +msgstr "" + +#: actions/othersettings.php:153 +msgid "URL shortening service is too long (max 50 chars)." +msgstr "" + +#: actions/outbox.php:58 +#, php-format +msgid "Outbox for %s - page %d" +msgstr "" + +#: actions/outbox.php:61 +#, php-format +msgid "Outbox for %s" +msgstr "" + +#: actions/outbox.php:116 +msgid "This is your outbox, which lists private messages you have sent." +msgstr "" + +#: actions/passwordsettings.php:58 +msgid "Change password" +msgstr "غيّر كلمة السر" + +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "غير كلمة سرّك" + +#: actions/passwordsettings.php:82 +msgid "Change your password." +msgstr "غيّر كلمة سرك." + +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +msgid "Password change" +msgstr "تغيير كلمة السر" + +#: actions/passwordsettings.php:117 +msgid "Old password" +msgstr "كلمة السر القديمة" + +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +msgid "New password" +msgstr "كلمة سر جديدة" + +#: actions/passwordsettings.php:122 +msgid "6 or more characters" +msgstr "" + +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/register.php:432 actions/smssettings.php:134 +msgid "Confirm" +msgstr "أكد" + +#: actions/passwordsettings.php:126 +msgid "same as password above" +msgstr "" + +#: actions/passwordsettings.php:130 +msgid "Change" +msgstr "غيّر" + +#: actions/passwordsettings.php:167 actions/register.php:230 +msgid "Password must be 6 or more characters." +msgstr "" + +#: actions/passwordsettings.php:170 actions/register.php:233 +msgid "Passwords don't match." +msgstr "كلمتا السر غير متطابقتين." + +#: actions/passwordsettings.php:178 +msgid "Incorrect old password" +msgstr "كلمة السر القديمة غير صحيحة" + +#: actions/passwordsettings.php:194 +msgid "Error saving user; invalid." +msgstr "خطأ أثناء حفظ المستخدم؛ غير صالح." + +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +msgid "Can't save new password." +msgstr "" + +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +msgid "Password saved." +msgstr "حُفظت كلمة السر." + +#: actions/peoplesearch.php:52 +#, php-format +msgid "" +"Search for people on %%site.name%% by their name, location, or interests. " +"Separate the terms by spaces; they must be 3 characters or more." +msgstr "" + +#: actions/peoplesearch.php:58 +msgid "People search" +msgstr "" + +#: actions/peopletag.php:70 +#, php-format +msgid "Not a valid people tag: %s" +msgstr "" + +#: actions/peopletag.php:144 +#, php-format +msgid "Users self-tagged with %s - page %d" +msgstr "" + +#: actions/postnotice.php:84 +msgid "Invalid notice content" +msgstr "محتوى إشعار غير صالح" + +#: actions/postnotice.php:90 +#, php-format +msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +msgstr "" + +#: actions/profilesettings.php:60 +msgid "Profile settings" +msgstr "" + +#: actions/profilesettings.php:71 +msgid "" +"You can update your personal profile info here so people know more about you." +msgstr "" + +#: actions/profilesettings.php:99 +msgid "Profile information" +msgstr "معلومات الملف الشخصي" + +#: actions/profilesettings.php:108 lib/groupeditform.php:154 +msgid "1-64 lowercase letters or numbers, no punctuation or spaces" +msgstr "" + +#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/showgroup.php:247 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:149 +msgid "Full name" +msgstr "الاسم الكامل" + +#: actions/profilesettings.php:115 actions/register.php:452 +#: lib/groupeditform.php:161 +msgid "Homepage" +msgstr "الصفحة الرئيسية" + +#: actions/profilesettings.php:117 actions/register.php:454 +msgid "URL of your homepage, blog, or profile on another site" +msgstr "" + +#: actions/profilesettings.php:122 actions/register.php:460 +#, php-format +msgid "Describe yourself and your interests in %d chars" +msgstr "" + +#: actions/profilesettings.php:125 actions/register.php:463 +msgid "Describe yourself and your interests" +msgstr "" + +#: actions/profilesettings.php:127 actions/register.php:465 +msgid "Bio" +msgstr "السيرة" + +#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/showgroup.php:256 actions/tagother.php:112 +#: actions/userauthorization.php:158 lib/groupeditform.php:177 +#: lib/userprofile.php:164 +msgid "Location" +msgstr "الموقع" + +#: actions/profilesettings.php:134 actions/register.php:472 +msgid "Where you are, like \"City, State (or Region), Country\"" +msgstr "" + +#: actions/profilesettings.php:138 actions/tagother.php:149 +#: actions/tagother.php:209 lib/subscriptionlist.php:106 +#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +msgid "Tags" +msgstr "الوسوم" + +#: actions/profilesettings.php:140 +msgid "" +"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" +msgstr "" + +#: actions/profilesettings.php:144 +msgid "Language" +msgstr "اللغة" + +#: actions/profilesettings.php:145 +msgid "Preferred language" +msgstr "اللغة المفضلة" + +#: actions/profilesettings.php:154 +msgid "Timezone" +msgstr "المنطقة الزمنية" + +#: actions/profilesettings.php:155 +msgid "What timezone are you normally in?" +msgstr "ما المنطقة الزمنية التي تتواجد فيها عادة؟" + +#: actions/profilesettings.php:160 +msgid "" +"Automatically subscribe to whoever subscribes to me (best for non-humans)" +msgstr "" + +#: actions/profilesettings.php:221 actions/register.php:223 +#, php-format +msgid "Bio is too long (max %d chars)." +msgstr "" + +#: actions/profilesettings.php:228 +msgid "Timezone not selected." +msgstr "لم تُختر المنطقة الزمنية." + +#: actions/profilesettings.php:234 +msgid "Language is too long (max 50 chars)." +msgstr "" + +#: actions/profilesettings.php:246 actions/tagother.php:178 +#, php-format +msgid "Invalid tag: \"%s\"" +msgstr "وسم غير صالح: \"%s\"" + +#: actions/profilesettings.php:295 +msgid "Couldn't update user for autosubscribe." +msgstr "" + +#: actions/profilesettings.php:328 +msgid "Couldn't save profile." +msgstr "تعذّر حفظ الملف الشخصي." + +#: actions/profilesettings.php:336 +msgid "Couldn't save tags." +msgstr "" + +#: actions/profilesettings.php:344 +msgid "Settings saved." +msgstr "حُفظت الإعدادات." + +#: actions/public.php:83 +#, php-format +msgid "Beyond the page limit (%s)" +msgstr "" + +#: actions/public.php:92 +msgid "Could not retrieve public stream." +msgstr "" + +#: actions/public.php:129 +#, php-format +msgid "Public timeline, page %d" +msgstr "" + +#: actions/public.php:131 lib/publicgroupnav.php:79 +msgid "Public timeline" +msgstr "المسار الزمني العام" + +#: actions/public.php:151 +msgid "Public Stream Feed (RSS 1.0)" +msgstr "" + +#: actions/public.php:155 +msgid "Public Stream Feed (RSS 2.0)" +msgstr "" + +#: actions/public.php:159 +msgid "Public Stream Feed (Atom)" +msgstr "" + +#: actions/public.php:179 +#, php-format +msgid "" +"This is the public timeline for %%site.name%% but no one has posted anything " +"yet." +msgstr "" + +#: actions/public.php:182 +msgid "Be the first to post!" +msgstr "كن أول من يُرسل!" + +#: actions/public.php:186 +#, php-format +msgid "" +"Why not [register an account](%%action.register%%) and be the first to post!" +msgstr "" + +#: actions/public.php:233 +#, php-format +msgid "" +"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-" +"blogging) service based on the Free Software [StatusNet](http://status.net/) " +"tool. [Join now](%%action.register%%) to share notices about yourself with " +"friends, family, and colleagues! ([Read more](%%doc.help%%))" +msgstr "" + +#: actions/public.php:238 +#, php-format +msgid "" +"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-" +"blogging) service based on the Free Software [StatusNet](http://status.net/) " +"tool." +msgstr "" + +#: actions/publictagcloud.php:57 +msgid "Public tag cloud" +msgstr "" + +#: actions/publictagcloud.php:63 +#, php-format +msgid "These are most popular recent tags on %s " +msgstr "" + +#: actions/publictagcloud.php:69 +#, php-format +msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet." +msgstr "" + +#: actions/publictagcloud.php:72 +msgid "Be the first to post one!" +msgstr "" + +#: actions/publictagcloud.php:75 +#, php-format +msgid "" +"Why not [register an account](%%action.register%%) and be the first to post " +"one!" +msgstr "" + +#: actions/publictagcloud.php:135 +msgid "Tag cloud" +msgstr "سحابة الوسوم" + +#: actions/recoverpassword.php:36 +msgid "You are already logged in!" +msgstr "" + +#: actions/recoverpassword.php:62 +msgid "No such recovery code." +msgstr "لا رمز استعادة كهذا." + +#: actions/recoverpassword.php:66 +msgid "Not a recovery code." +msgstr "ليس رمز استعادة." + +#: actions/recoverpassword.php:73 +msgid "Recovery code for unknown user." +msgstr "رمز استعادة لمستخدم غير معروف." + +#: actions/recoverpassword.php:86 +msgid "Error with confirmation code." +msgstr "خطأ في رمز التأكيد." + +#: actions/recoverpassword.php:97 +msgid "This confirmation code is too old. Please start again." +msgstr "" + +#: actions/recoverpassword.php:111 +msgid "Could not update user with confirmed email address." +msgstr "" + +#: actions/recoverpassword.php:152 +msgid "" +"If you have forgotten or lost your password, you can get a new one sent to " +"the email address you have stored in your account." +msgstr "" + +#: actions/recoverpassword.php:158 +msgid "You have been identified. Enter a new password below. " +msgstr "" + +#: actions/recoverpassword.php:188 +msgid "Password recovery" +msgstr "" + +#: actions/recoverpassword.php:191 +msgid "Nickname or email address" +msgstr "الاسم المستعار أو البريد الإلكتروني" + +#: actions/recoverpassword.php:193 +msgid "Your nickname on this server, or your registered email address." +msgstr "" + +#: actions/recoverpassword.php:199 actions/recoverpassword.php:200 +msgid "Recover" +msgstr "" + +#: actions/recoverpassword.php:208 +msgid "Reset password" +msgstr "أعد ضبط كلمة السر" + +#: actions/recoverpassword.php:209 +msgid "Recover password" +msgstr "" + +#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +msgid "Password recovery requested" +msgstr "" + +#: actions/recoverpassword.php:213 +msgid "Unknown action" +msgstr "إجراء غير معروف" + +#: actions/recoverpassword.php:236 +msgid "6 or more characters, and don't forget it!" +msgstr "" + +#: actions/recoverpassword.php:240 +msgid "Same as password above" +msgstr "" + +#: actions/recoverpassword.php:243 +msgid "Reset" +msgstr "" + +#: actions/recoverpassword.php:252 +msgid "Enter a nickname or email address." +msgstr "" + +#: actions/recoverpassword.php:272 +msgid "No user with that email address or username." +msgstr "" + +#: actions/recoverpassword.php:287 +msgid "No registered email address for that user." +msgstr "" + +#: actions/recoverpassword.php:301 +msgid "Error saving address confirmation." +msgstr "خطأ أثناء حفظ تأكيد العنوان." + +#: actions/recoverpassword.php:325 +msgid "" +"Instructions for recovering your password have been sent to the email " +"address registered to your account." +msgstr "" + +#: actions/recoverpassword.php:344 +msgid "Unexpected password reset." +msgstr "" + +#: actions/recoverpassword.php:352 +msgid "Password must be 6 chars or more." +msgstr "" + +#: actions/recoverpassword.php:356 +msgid "Password and confirmation do not match." +msgstr "" + +#: actions/recoverpassword.php:382 +msgid "New password successfully saved. You are now logged in." +msgstr "" + +#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +msgid "Sorry, only invited people can register." +msgstr "" + +#: actions/register.php:92 +msgid "Sorry, invalid invitation code." +msgstr "عذرا، رمز دعوة غير صالح." + +#: actions/register.php:112 +msgid "Registration successful" +msgstr "نجح التسجيل" + +#: actions/register.php:114 actions/register.php:502 lib/action.php:450 +#: lib/logingroupnav.php:85 +msgid "Register" +msgstr "سجّل" + +#: actions/register.php:135 +msgid "Registration not allowed." +msgstr "" + +#: actions/register.php:198 +msgid "You can't register if you don't agree to the license." +msgstr "" + +#: actions/register.php:201 +msgid "Not a valid email address." +msgstr "ليس عنوان بريد صالح." + +#: actions/register.php:212 +msgid "Email address already exists." +msgstr "عنوان البريد الإلكتروني موجود مسبقًا." + +#: actions/register.php:243 actions/register.php:264 +msgid "Invalid username or password." +msgstr "" + +#: actions/register.php:342 +msgid "" +"With this form you can create a new account. You can then post notices and " +"link up to friends and colleagues. " +msgstr "" + +#: actions/register.php:424 +msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." +msgstr "" + +#: actions/register.php:429 +msgid "6 or more characters. Required." +msgstr "" + +#: actions/register.php:433 +msgid "Same as password above. Required." +msgstr "" + +#: actions/register.php:437 actions/register.php:441 +#: lib/accountsettingsaction.php:122 +msgid "Email" +msgstr "البريد الإلكتروني" + +#: actions/register.php:438 actions/register.php:442 +msgid "Used only for updates, announcements, and password recovery" +msgstr "" + +#: actions/register.php:449 +msgid "Longer name, preferably your \"real\" name" +msgstr "" + +#: actions/register.php:493 +msgid "My text and files are available under " +msgstr "" + +#: actions/register.php:495 +msgid "Creative Commons Attribution 3.0" +msgstr "" + +#: actions/register.php:496 +msgid "" +" except this private data: password, email address, IM address, and phone " +"number." +msgstr "" + +#: actions/register.php:537 +#, php-format +msgid "" +"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"want to...\n" +"\n" +"* Go to [your profile](%s) and post your first message.\n" +"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " +"notices through instant messages.\n" +"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " +"share your interests. \n" +"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell " +"others more about you. \n" +"* Read over the [online docs](%%%%doc.help%%%%) for features you may have " +"missed. \n" +"\n" +"Thanks for signing up and we hope you enjoy using this service." +msgstr "" + +#: actions/register.php:561 +msgid "" +"(You should receive a message by email momentarily, with instructions on how " +"to confirm your email address.)" +msgstr "" + +#: actions/remotesubscribe.php:98 +#, php-format +msgid "" +"To subscribe, you can [login](%%action.login%%), or [register](%%action." +"register%%) a new account. If you already have an account on a [compatible " +"microblogging site](%%doc.openmublog%%), enter your profile URL below." +msgstr "" + +#: actions/remotesubscribe.php:112 +msgid "Remote subscribe" +msgstr "اشتراك بعيد" + +#: actions/remotesubscribe.php:124 +msgid "Subscribe to a remote user" +msgstr "" + +#: actions/remotesubscribe.php:129 +msgid "User nickname" +msgstr "اسم المستخدم المستعار" + +#: actions/remotesubscribe.php:130 +msgid "Nickname of the user you want to follow" +msgstr "" + +#: actions/remotesubscribe.php:133 +msgid "Profile URL" +msgstr "مسار الملف الشخصي" + +#: actions/remotesubscribe.php:134 +msgid "URL of your profile on another compatible microblogging service" +msgstr "" + +#: actions/remotesubscribe.php:137 lib/subscribeform.php:139 +#: lib/userprofile.php:321 +msgid "Subscribe" +msgstr "اشترك" + +#: actions/remotesubscribe.php:159 +msgid "Invalid profile URL (bad format)" +msgstr "" + +#: actions/remotesubscribe.php:168 +msgid "" +"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)." +msgstr "" + +#: actions/remotesubscribe.php:176 +msgid "That’s a local profile! Login to subscribe." +msgstr "" + +#: actions/remotesubscribe.php:183 +msgid "Couldn’t get a request token." +msgstr "" + +#: actions/replies.php:125 actions/repliesrss.php:68 +#: lib/personalgroupnav.php:105 +#, php-format +msgid "Replies to %s" +msgstr "" + +#: actions/replies.php:127 +#, php-format +msgid "Replies to %s, page %d" +msgstr "" + +#: actions/replies.php:144 +#, php-format +msgid "Replies feed for %s (RSS 1.0)" +msgstr "" + +#: actions/replies.php:151 +#, php-format +msgid "Replies feed for %s (RSS 2.0)" +msgstr "" + +#: actions/replies.php:158 +#, php-format +msgid "Replies feed for %s (Atom)" +msgstr "" + +#: actions/replies.php:198 +#, php-format +msgid "" +"This is the timeline showing replies to %s but %s hasn't received a notice " +"to his attention yet." +msgstr "" + +#: actions/replies.php:203 +#, php-format +msgid "" +"You can engage other users in a conversation, subscribe to more people or " +"[join groups](%%action.groups%%)." +msgstr "" + +#: actions/replies.php:205 +#, php-format +msgid "" +"You can try to [nudge %s](../%s) or [post something to his or her attention]" +"(%%%%action.newnotice%%%%?status_textarea=%s)." +msgstr "" + +#: actions/repliesrss.php:72 +#, php-format +msgid "Replies to %1$s on %2$s!" +msgstr "" + +#: actions/showfavorites.php:79 +#, php-format +msgid "%s's favorite notices, page %d" +msgstr "" + +#: actions/showfavorites.php:132 +msgid "Could not retrieve favorite notices." +msgstr "" + +#: actions/showfavorites.php:170 +#, php-format +msgid "Feed for favorites of %s (RSS 1.0)" +msgstr "" + +#: actions/showfavorites.php:177 +#, php-format +msgid "Feed for favorites of %s (RSS 2.0)" +msgstr "" + +#: actions/showfavorites.php:184 +#, php-format +msgid "Feed for favorites of %s (Atom)" +msgstr "" + +#: actions/showfavorites.php:205 +msgid "" +"You haven't chosen any favorite notices yet. Click the fave button on " +"notices you like to bookmark them for later or shed a spotlight on them." +msgstr "" + +#: actions/showfavorites.php:207 +#, php-format +msgid "" +"%s hasn't added any notices to his favorites yet. Post something interesting " +"they would add to their favorites :)" +msgstr "" + +#: actions/showfavorites.php:211 +#, php-format +msgid "" +"%s hasn't added any notices to his favorites yet. Why not [register an " +"account](%%%%action.register%%%%) and then post something interesting they " +"would add to their favorites :)" +msgstr "" + +#: actions/showfavorites.php:242 +msgid "This is a way to share what you like." +msgstr "" + +#: actions/showgroup.php:82 lib/groupnav.php:86 +#, php-format +msgid "%s group" +msgstr "مجموعة %s" + +#: actions/showgroup.php:84 +#, php-format +msgid "%s group, page %d" +msgstr "" + +#: actions/showgroup.php:218 +msgid "Group profile" +msgstr "ملف المجموعة الشخصي" + +#: actions/showgroup.php:263 actions/tagother.php:118 +#: actions/userauthorization.php:167 lib/userprofile.php:177 +msgid "URL" +msgstr "مسار" + +#: actions/showgroup.php:274 actions/tagother.php:128 +#: actions/userauthorization.php:179 lib/userprofile.php:194 +msgid "Note" +msgstr "ملاحظة" + +#: actions/showgroup.php:284 lib/groupeditform.php:184 +msgid "Aliases" +msgstr "الكنى" + +#: actions/showgroup.php:293 +msgid "Group actions" +msgstr "" + +#: actions/showgroup.php:328 +#, php-format +msgid "Notice feed for %s group (RSS 1.0)" +msgstr "" + +#: actions/showgroup.php:334 +#, php-format +msgid "Notice feed for %s group (RSS 2.0)" +msgstr "" + +#: actions/showgroup.php:340 +#, php-format +msgid "Notice feed for %s group (Atom)" +msgstr "" + +#: actions/showgroup.php:345 +#, php-format +msgid "FOAF for %s group" +msgstr "" + +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 +msgid "Members" +msgstr "الأعضاء" + +#: actions/showgroup.php:386 lib/profileaction.php:117 +#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95 +#: lib/tagcloudsection.php:71 +msgid "(None)" +msgstr "(لا شيء)" + +#: actions/showgroup.php:392 +msgid "All members" +msgstr "جميع الأعضاء" + +#: actions/showgroup.php:429 lib/profileaction.php:173 +msgid "Statistics" +msgstr "إحصاءات" + +#: actions/showgroup.php:432 +msgid "Created" +msgstr "أنشئ" + +#: actions/showgroup.php:448 +#, php-format +msgid "" +"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." +"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " +"[StatusNet](http://status.net/) tool. Its members share short messages about " +"their life and interests. [Join now](%%%%action.register%%%%) to become part " +"of this group and many more! ([Read more](%%%%doc.help%%%%))" +msgstr "" + +#: actions/showgroup.php:454 +#, php-format +msgid "" +"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." +"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " +"[StatusNet](http://status.net/) tool. Its members share short messages about " +"their life and interests. " +msgstr "" + +#: actions/showgroup.php:482 +msgid "Admins" +msgstr "الإداريون" + +#: actions/showmessage.php:81 +msgid "No such message." +msgstr "لا رسالة كهذه." + +#: actions/showmessage.php:98 +msgid "Only the sender and recipient may read this message." +msgstr "" + +#: actions/showmessage.php:108 +#, php-format +msgid "Message to %1$s on %2$s" +msgstr "" + +#: actions/showmessage.php:113 +#, php-format +msgid "Message from %1$s on %2$s" +msgstr "" + +#: actions/shownotice.php:90 +msgid "Notice deleted." +msgstr "حُذف الإشعار." + +#: actions/showstream.php:73 +#, php-format +msgid " tagged %s" +msgstr "" + +#: actions/showstream.php:79 +#, php-format +msgid "%s, page %d" +msgstr "" + +#: actions/showstream.php:122 +#, php-format +msgid "Notice feed for %s tagged %s (RSS 1.0)" +msgstr "" + +#: actions/showstream.php:129 +#, php-format +msgid "Notice feed for %s (RSS 1.0)" +msgstr "" + +#: actions/showstream.php:136 +#, php-format +msgid "Notice feed for %s (RSS 2.0)" +msgstr "" + +#: actions/showstream.php:143 +#, php-format +msgid "Notice feed for %s (Atom)" +msgstr "" + +#: actions/showstream.php:148 +#, php-format +msgid "FOAF for %s" +msgstr "" + +#: actions/showstream.php:191 +#, php-format +msgid "This is the timeline for %s but %s hasn't posted anything yet." +msgstr "" + +#: actions/showstream.php:196 +msgid "" +"Seen anything interesting recently? You haven't posted any notices yet, now " +"would be a good time to start :)" +msgstr "" + +#: actions/showstream.php:198 +#, php-format +msgid "" +"You can try to nudge %s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%s)." +msgstr "" + +#: actions/showstream.php:234 +#, php-format +msgid "" +"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en." +"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " +"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to " +"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))" +msgstr "" + +#: actions/showstream.php:239 +#, php-format +msgid "" +"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en." +"wikipedia.org/wiki/Micro-blogging) service based on the Free Software " +"[StatusNet](http://status.net/) tool. " +msgstr "" + +#: actions/smssettings.php:58 +msgid "SMS Settings" +msgstr "" + +#: actions/smssettings.php:69 +#, php-format +msgid "You can receive SMS messages through email from %%site.name%%." +msgstr "" + +#: actions/smssettings.php:91 +msgid "SMS is not available." +msgstr "" + +#: actions/smssettings.php:112 +msgid "Current confirmed SMS-enabled phone number." +msgstr "" + +#: actions/smssettings.php:123 +msgid "Awaiting confirmation on this phone number." +msgstr "" + +#: actions/smssettings.php:130 +msgid "Confirmation code" +msgstr "رمز التأكيد" + +#: actions/smssettings.php:131 +msgid "Enter the code you received on your phone." +msgstr "" + +#: actions/smssettings.php:138 +msgid "SMS Phone number" +msgstr "" + +#: actions/smssettings.php:140 +msgid "Phone number, no punctuation or spaces, with area code" +msgstr "" + +#: actions/smssettings.php:174 +msgid "" +"Send me notices through SMS; I understand I may incur exorbitant charges " +"from my carrier." +msgstr "" + +#: actions/smssettings.php:306 +msgid "No phone number." +msgstr "لا رقم هاتف." + +#: actions/smssettings.php:311 +msgid "No carrier selected." +msgstr "" + +#: actions/smssettings.php:318 +msgid "That is already your phone number." +msgstr "" + +#: actions/smssettings.php:321 +msgid "That phone number already belongs to another user." +msgstr "" + +#: actions/smssettings.php:347 +msgid "" +"A confirmation code was sent to the phone number you added. Check your phone " +"for the code and instructions on how to use it." +msgstr "" + +#: actions/smssettings.php:374 +msgid "That is the wrong confirmation number." +msgstr "" + +#: actions/smssettings.php:405 +msgid "That is not your phone number." +msgstr "هذا ليس رقم هاتفك." + +#: actions/smssettings.php:465 +msgid "Mobile carrier" +msgstr "" + +#: actions/smssettings.php:469 +msgid "Select a carrier" +msgstr "" + +#: actions/smssettings.php:476 +#, php-format +msgid "" +"Mobile carrier for your phone. If you know a carrier that accepts SMS over " +"email but isn't listed here, send email to let us know at %s." +msgstr "" + +#: actions/smssettings.php:498 +msgid "No code entered" +msgstr "" + +#: actions/subedit.php:70 +msgid "You are not subscribed to that profile." +msgstr "" + +#: actions/subedit.php:83 +msgid "Could not save subscription." +msgstr "" + +#: actions/subscribe.php:55 +msgid "Not a local user." +msgstr "" + +#: actions/subscribe.php:69 +msgid "Subscribed" +msgstr "مُشترك" + +#: actions/subscribers.php:50 +#, php-format +msgid "%s subscribers" +msgstr "" + +#: actions/subscribers.php:52 +#, php-format +msgid "%s subscribers, page %d" +msgstr "" + +#: actions/subscribers.php:63 +msgid "These are the people who listen to your notices." +msgstr "" + +#: actions/subscribers.php:67 +#, php-format +msgid "These are the people who listen to %s's notices." +msgstr "" + +#: actions/subscribers.php:108 +msgid "" +"You have no subscribers. Try subscribing to people you know and they might " +"return the favor" +msgstr "" + +#: actions/subscribers.php:110 +#, php-format +msgid "%s has no subscribers. Want to be the first?" +msgstr "" + +#: actions/subscribers.php:114 +#, php-format +msgid "" +"%s has no subscribers. Why not [register an account](%%%%action.register%%%" +"%) and be the first?" +msgstr "" + +#: actions/subscriptions.php:52 +#, php-format +msgid "%s subscriptions" +msgstr "" + +#: actions/subscriptions.php:54 +#, php-format +msgid "%s subscriptions, page %d" +msgstr "" + +#: actions/subscriptions.php:65 +msgid "These are the people whose notices you listen to." +msgstr "" + +#: actions/subscriptions.php:69 +#, php-format +msgid "These are the people whose notices %s listens to." +msgstr "" + +#: actions/subscriptions.php:121 +#, php-format +msgid "" +"You're not listening to anyone's notices right now, try subscribing to " +"people you know. Try [people search](%%action.peoplesearch%%), look for " +"members in groups you're interested in and in our [featured users](%%action." +"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can " +"automatically subscribe to people you already follow there." +msgstr "" + +#: actions/subscriptions.php:123 actions/subscriptions.php:127 +#, php-format +msgid "%s is not listening to anyone." +msgstr "" + +#: actions/subscriptions.php:194 +msgid "Jabber" +msgstr "جابر" + +#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115 +msgid "SMS" +msgstr "" + +#: actions/tagother.php:33 +msgid "Not logged in" +msgstr "لست والجًا" + +#: actions/tagother.php:39 +msgid "No id argument." +msgstr "" + +#: actions/tagother.php:65 +#, php-format +msgid "Tag %s" +msgstr "" + +#: actions/tagother.php:77 lib/userprofile.php:75 +msgid "User profile" +msgstr "ملف المستخدم الشخصي" + +#: actions/tagother.php:81 lib/userprofile.php:102 +msgid "Photo" +msgstr "صورة" + +#: actions/tagother.php:141 +msgid "Tag user" +msgstr "" + +#: actions/tagother.php:151 +msgid "" +"Tags for this user (letters, numbers, -, ., and _), comma- or space- " +"separated" +msgstr "" + +#: actions/tagother.php:193 +msgid "" +"You can only tag people you are subscribed to or who are subscribed to you." +msgstr "" + +#: actions/tagother.php:200 +msgid "Could not save tags." +msgstr "" + +#: actions/tagother.php:236 +msgid "Use this form to add tags to your subscribers or subscriptions." +msgstr "" + +#: actions/tag.php:68 +#, php-format +msgid "Notices tagged with %s, page %d" +msgstr "" + +#: actions/tag.php:86 +#, php-format +msgid "Notice feed for tag %s (RSS 1.0)" +msgstr "" + +#: actions/tag.php:92 +#, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "" + +#: actions/tag.php:98 +#, php-format +msgid "Notice feed for tag %s (Atom)" +msgstr "" + +#: actions/tagrss.php:35 +msgid "No such tag." +msgstr "لا وسم كهذا." + +#: actions/twitapitrends.php:87 +msgid "API method under construction." +msgstr "" + +#: actions/unsubscribe.php:77 +msgid "No profile id in request." +msgstr "" + +#: actions/unsubscribe.php:84 +msgid "No profile with that id." +msgstr "" + +#: actions/unsubscribe.php:98 +msgid "Unsubscribed" +msgstr "" + +#: actions/updateprofile.php:62 actions/userauthorization.php:330 +#, php-format +msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +msgstr "" + +#: actions/userauthorization.php:105 +msgid "Authorize subscription" +msgstr "" + +#: actions/userauthorization.php:110 +msgid "" +"Please check these details to make sure that you want to subscribe to this " +"user’s notices. If you didn’t just ask to subscribe to someone’s notices, " +"click “Reject”." +msgstr "" + +#: actions/userauthorization.php:188 +msgid "License" +msgstr "الرخصة" + +#: actions/userauthorization.php:209 +msgid "Accept" +msgstr "اقبل" + +#: actions/userauthorization.php:210 lib/subscribeform.php:115 +#: lib/subscribeform.php:139 +msgid "Subscribe to this user" +msgstr "اشترك بهذا المستخدم" + +#: actions/userauthorization.php:211 +msgid "Reject" +msgstr "ارفض" + +#: actions/userauthorization.php:212 +msgid "Reject this subscription" +msgstr "ارفض هذا الاشتراك" + +#: actions/userauthorization.php:225 +msgid "No authorization request!" +msgstr "" + +#: actions/userauthorization.php:247 +msgid "Subscription authorized" +msgstr "" + +#: actions/userauthorization.php:249 +msgid "" +"The subscription has been authorized, but no callback URL was passed. Check " +"with the site’s instructions for details on how to authorize the " +"subscription. Your subscription token is:" +msgstr "" + +#: actions/userauthorization.php:259 +msgid "Subscription rejected" +msgstr "" + +#: actions/userauthorization.php:261 +msgid "" +"The subscription has been rejected, but no callback URL was passed. Check " +"with the site’s instructions for details on how to fully reject the " +"subscription." +msgstr "" + +#: actions/userauthorization.php:296 +#, php-format +msgid "Listener URI ‘%s’ not found here" +msgstr "" + +#: actions/userauthorization.php:301 +#, php-format +msgid "Listenee URI ‘%s’ is too long." +msgstr "" + +#: actions/userauthorization.php:307 +#, php-format +msgid "Listenee URI ‘%s’ is a local user." +msgstr "" + +#: actions/userauthorization.php:322 +#, php-format +msgid "Profile URL ‘%s’ is for a local user." +msgstr "" + +#: actions/userauthorization.php:338 +#, php-format +msgid "Avatar URL ‘%s’ is not valid." +msgstr "" + +#: actions/userauthorization.php:343 +#, php-format +msgid "Can’t read avatar URL ‘%s’." +msgstr "" + +#: actions/userauthorization.php:348 +#, php-format +msgid "Wrong image type for avatar URL ‘%s’." +msgstr "" + +#: actions/userbyid.php:70 +msgid "No id." +msgstr "لا هوية." + +#: actions/userdesignsettings.php:76 lib/designsettings.php:65 +msgid "Profile design" +msgstr "تصميم الملف الشخصي" + +#: actions/userdesignsettings.php:87 lib/designsettings.php:76 +msgid "" +"Customize the way your profile looks with a background image and a colour " +"palette of your choice." +msgstr "" + +#: actions/userdesignsettings.php:282 +msgid "Enjoy your hotdog!" +msgstr "استمتع بالنقانق!" + +#: actions/usergroups.php:64 +#, php-format +msgid "%s groups, page %d" +msgstr "" + +#: actions/usergroups.php:130 +msgid "Search for more groups" +msgstr "" + +#: actions/usergroups.php:153 +#, php-format +msgid "%s is not a member of any group." +msgstr "" + +#: actions/usergroups.php:158 +#, php-format +msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." +msgstr "" + +#: classes/File.php:137 +#, php-format +msgid "" +"No file may be larger than %d bytes and the file you sent was %d bytes. Try " +"to upload a smaller version." +msgstr "" + +#: classes/File.php:147 +#, php-format +msgid "A file this large would exceed your user quota of %d bytes." +msgstr "" + +#: classes/File.php:154 +#, php-format +msgid "A file this large would exceed your monthly quota of %d bytes." +msgstr "" + +#: classes/Message.php:55 +msgid "Could not insert message." +msgstr "" + +#: classes/Message.php:65 +msgid "Could not update message with new URI." +msgstr "" + +#: classes/Notice.php:164 +#, php-format +msgid "DB error inserting hashtag: %s" +msgstr "" + +#: classes/Notice.php:179 +msgid "Problem saving notice. Too long." +msgstr "" + +#: classes/Notice.php:183 +msgid "Problem saving notice. Unknown user." +msgstr "" + +#: classes/Notice.php:188 +msgid "" +"Too many notices too fast; take a breather and post again in a few minutes." +msgstr "" + +#: classes/Notice.php:194 +msgid "" +"Too many duplicate messages too quickly; take a breather and post again in a " +"few minutes." +msgstr "" + +#: classes/Notice.php:202 +msgid "You are banned from posting notices on this site." +msgstr "" + +#: classes/Notice.php:268 classes/Notice.php:293 +msgid "Problem saving notice." +msgstr "مشكلة أثناء حفظ الإشعار." + +#: classes/Notice.php:1120 +#, php-format +msgid "DB error inserting reply: %s" +msgstr "" + +#: classes/User.php:333 +#, php-format +msgid "Welcome to %1$s, @%2$s!" +msgstr "" + +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +msgid "Profile" +msgstr "الملف الشخصي" + +#: lib/accountsettingsaction.php:110 +msgid "Change your profile settings" +msgstr "غيّر إعدادات ملفك الشخصي" + +#: lib/accountsettingsaction.php:114 +msgid "Upload an avatar" +msgstr "" + +#: lib/accountsettingsaction.php:119 +msgid "Change your password" +msgstr "غير كلمة سرّك" + +#: lib/accountsettingsaction.php:123 +msgid "Change email handling" +msgstr "غير أسلوب التعامل مع البريد الإلكتروني" + +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +msgid "Design" +msgstr "التصميم" + +#: lib/accountsettingsaction.php:126 +msgid "Design your profile" +msgstr "صمّم ملفك الشخصي" + +#: lib/accountsettingsaction.php:128 +msgid "Other" +msgstr "أخرى" + +#: lib/accountsettingsaction.php:129 +msgid "Other options" +msgstr "خيارات أخرى" + +#: lib/action.php:144 +#, php-format +msgid "%s - %s" +msgstr "%s - %s" + +#: lib/action.php:159 +msgid "Untitled page" +msgstr "صفحة غير مُعنونة" + +#: lib/action.php:424 +msgid "Primary site navigation" +msgstr "" + +#: lib/action.php:430 +msgid "Home" +msgstr "الرئيسية" + +#: lib/action.php:430 +msgid "Personal profile and friends timeline" +msgstr "" + +#: lib/action.php:432 +msgid "Account" +msgstr "الحساب" + +#: lib/action.php:432 +msgid "Change your email, avatar, password, profile" +msgstr "" + +#: lib/action.php:435 +msgid "Connect" +msgstr "اتصل" + +#: lib/action.php:435 +msgid "Connect to services" +msgstr "" + +#: lib/action.php:439 lib/subgroupnav.php:105 +msgid "Invite" +msgstr "ادعُ" + +#: lib/action.php:440 lib/subgroupnav.php:106 +#, php-format +msgid "Invite friends and colleagues to join you on %s" +msgstr "" + +#: lib/action.php:445 +msgid "Logout" +msgstr "اخرج" + +#: lib/action.php:445 +msgid "Logout from the site" +msgstr "" + +#: lib/action.php:450 +msgid "Create an account" +msgstr "" + +#: lib/action.php:453 +msgid "Login to the site" +msgstr "" + +#: lib/action.php:456 lib/action.php:719 +msgid "Help" +msgstr "مساعدة" + +#: lib/action.php:456 +msgid "Help me!" +msgstr "ساعدني!" + +#: lib/action.php:459 +msgid "Search" +msgstr "ابحث" + +#: lib/action.php:459 +msgid "Search for people or text" +msgstr "" + +#: lib/action.php:480 +msgid "Site notice" +msgstr "إشعار الموقع" + +#: lib/action.php:546 +msgid "Local views" +msgstr "" + +#: lib/action.php:612 +msgid "Page notice" +msgstr "إشعار الصفحة" + +#: lib/action.php:714 +msgid "Secondary site navigation" +msgstr "" + +#: lib/action.php:721 +msgid "About" +msgstr "عن" + +#: lib/action.php:723 +msgid "FAQ" +msgstr "الأسئلة المكررة" + +#: lib/action.php:727 +msgid "TOS" +msgstr "الشروط" + +#: lib/action.php:730 +msgid "Privacy" +msgstr "خصوصية" + +#: lib/action.php:732 +msgid "Source" +msgstr "المصدر" + +#: lib/action.php:734 +msgid "Contact" +msgstr "اتصل" + +#: lib/action.php:736 +msgid "Badge" +msgstr "" + +#: lib/action.php:764 +msgid "StatusNet software license" +msgstr "" + +#: lib/action.php:767 +#, php-format +msgid "" +"**%%site.name%%** is a microblogging service brought to you by [%%site." +"broughtby%%](%%site.broughtbyurl%%). " +msgstr "" + +#: lib/action.php:769 +#, php-format +msgid "**%%site.name%%** is a microblogging service. " +msgstr "" + +#: lib/action.php:771 +#, php-format +msgid "" +"It runs the [StatusNet](http://status.net/) microblogging software, version %" +"s, available under the [GNU Affero General Public License](http://www.fsf." +"org/licensing/licenses/agpl-3.0.html)." +msgstr "" + +#: lib/action.php:785 +msgid "Site content license" +msgstr "رخصة محتوى الموقع" + +#: lib/action.php:794 +msgid "All " +msgstr "" + +#: lib/action.php:799 +msgid "license." +msgstr "الرخصة." + +#: lib/action.php:1053 +msgid "Pagination" +msgstr "" + +#: lib/action.php:1062 +msgid "After" +msgstr "بعد" + +#: lib/action.php:1070 +msgid "Before" +msgstr "قبل" + +#: lib/action.php:1119 +msgid "There was a problem with your session token." +msgstr "" + +#: lib/attachmentlist.php:87 +msgid "Attachments" +msgstr "" + +#: lib/attachmentlist.php:265 +msgid "Author" +msgstr "المؤلف" + +#: lib/attachmentlist.php:278 +msgid "Provider" +msgstr "المزود" + +#: lib/attachmentnoticesection.php:67 +msgid "Notices where this attachment appears" +msgstr "" + +#: lib/attachmenttagcloudsection.php:48 +msgid "Tags for this attachment" +msgstr "وسوم هذا المرفق" + +#: lib/channel.php:138 lib/channel.php:158 +msgid "Command results" +msgstr "نتائج الأمر" + +#: lib/channel.php:210 +msgid "Command complete" +msgstr "اكتمل الأمر" + +#: lib/channel.php:221 +msgid "Command failed" +msgstr "فشل الأمر" + +#: lib/command.php:44 +msgid "Sorry, this command is not yet implemented." +msgstr "" + +#: lib/command.php:88 +#, php-format +msgid "Could not find a user with nickname %s" +msgstr "" + +#: lib/command.php:92 +msgid "It does not make a lot of sense to nudge yourself!" +msgstr "" + +#: lib/command.php:99 +#, php-format +msgid "Nudge sent to %s" +msgstr "" + +#: lib/command.php:126 +#, php-format +msgid "" +"Subscriptions: %1$s\n" +"Subscribers: %2$s\n" +"Notices: %3$s" +msgstr "" +"الاشتراكات: %1$s\n" +"المشتركون: %2$s\n" +"الإشعارات: %3$s" + +#: lib/command.php:152 lib/command.php:400 +msgid "Notice with that id does not exist" +msgstr "" + +#: lib/command.php:168 lib/command.php:416 lib/command.php:471 +msgid "User has no last notice" +msgstr "ليس للمستخدم إشعار أخير" + +#: lib/command.php:190 +msgid "Notice marked as fave." +msgstr "" + +#: lib/command.php:315 +#, php-format +msgid "%1$s (%2$s)" +msgstr "" + +#: lib/command.php:318 +#, php-format +msgid "Fullname: %s" +msgstr "الاسم الكامل: %s" + +#: lib/command.php:321 +#, php-format +msgid "Location: %s" +msgstr "الموقع: %s" + +#: lib/command.php:324 +#, php-format +msgid "Homepage: %s" +msgstr "الصفحة الرئيسية: %s" + +#: lib/command.php:327 +#, php-format +msgid "About: %s" +msgstr "عن: %s" + +#: lib/command.php:358 scripts/xmppdaemon.php:321 +#, php-format +msgid "Message too long - maximum is %d characters, you sent %d" +msgstr "" + +#: lib/command.php:377 +msgid "Error sending direct message." +msgstr "" + +#: lib/command.php:431 +#, php-format +msgid "Notice too long - maximum is %d characters, you sent %d" +msgstr "" + +#: lib/command.php:439 +#, php-format +msgid "Reply to %s sent" +msgstr "رُد على رسالة %s" + +#: lib/command.php:441 +msgid "Error saving notice." +msgstr "خطأ أثناء حفظ الملاحظة." + +#: lib/command.php:495 +msgid "Specify the name of the user to subscribe to" +msgstr "" + +#: lib/command.php:502 +#, php-format +msgid "Subscribed to %s" +msgstr "" + +#: lib/command.php:523 +msgid "Specify the name of the user to unsubscribe from" +msgstr "" + +#: lib/command.php:530 +#, php-format +msgid "Unsubscribed from %s" +msgstr "" + +#: lib/command.php:548 lib/command.php:571 +msgid "Command not yet implemented." +msgstr "" + +#: lib/command.php:551 +msgid "Notification off." +msgstr "" + +#: lib/command.php:553 +msgid "Can't turn off notification." +msgstr "" + +#: lib/command.php:574 +msgid "Notification on." +msgstr "" + +#: lib/command.php:576 +msgid "Can't turn on notification." +msgstr "" + +#: lib/command.php:597 +#, php-format +msgid "Could not create login token for %s" +msgstr "" + +#: lib/command.php:602 +#, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgstr "" + +#: lib/command.php:613 +msgid "" +"Commands:\n" +"on - turn on notifications\n" +"off - turn off notifications\n" +"help - show this help\n" +"follow - subscribe to user\n" +"leave - unsubscribe from user\n" +"d - direct message to user\n" +"get - get last notice from user\n" +"whois - get profile info on user\n" +"fav - add user's last notice as a 'fave'\n" +"fav # - add notice with the given id as a 'fave'\n" +"reply # - reply to notice with a given id\n" +"reply - reply to the last notice from user\n" +"join - join group\n" +"login - Get a link to login to the web interface\n" +"drop - leave group\n" +"stats - get your stats\n" +"stop - same as 'off'\n" +"quit - same as 'off'\n" +"sub - same as 'follow'\n" +"unsub - same as 'leave'\n" +"last - same as 'get'\n" +"on - not yet implemented.\n" +"off - not yet implemented.\n" +"nudge - remind a user to update.\n" +"invite - not yet implemented.\n" +"track - not yet implemented.\n" +"untrack - not yet implemented.\n" +"track off - not yet implemented.\n" +"untrack all - not yet implemented.\n" +"tracks - not yet implemented.\n" +"tracking - not yet implemented.\n" +msgstr "" + +#: lib/common.php:191 +msgid "No configuration file found. " +msgstr "" + +#: lib/common.php:192 +msgid "I looked for configuration files in the following places: " +msgstr "" + +#: lib/common.php:193 +msgid "You may wish to run the installer to fix this." +msgstr "" + +#: lib/common.php:194 +msgid "Go to the installer." +msgstr "اذهب إلى المُثبّت." + +#: lib/connectsettingsaction.php:110 +msgid "IM" +msgstr "محادثة فورية" + +#: lib/connectsettingsaction.php:111 +msgid "Updates by instant messenger (IM)" +msgstr "" + +#: lib/connectsettingsaction.php:116 +msgid "Updates by SMS" +msgstr "" + +#: lib/dberroraction.php:60 +msgid "Database error" +msgstr "خطأ قاعدة بيانات" + +#: lib/designsettings.php:101 +msgid "Change background image" +msgstr "غيّر صورة الخلفية" + +#: lib/designsettings.php:105 +msgid "Upload file" +msgstr "ارفع ملفًا" + +#: lib/designsettings.php:109 +msgid "" +"You can upload your personal background image. The maximum file size is 2Mb." +msgstr "" + +#: lib/designsettings.php:139 +msgid "On" +msgstr "" + +#: lib/designsettings.php:155 +msgid "Off" +msgstr "" + +#: lib/designsettings.php:156 +msgid "Turn background image on or off." +msgstr "" + +#: lib/designsettings.php:161 +msgid "Tile background image" +msgstr "" + +#: lib/designsettings.php:170 +msgid "Change colours" +msgstr "غيّر الألوان" + +#: lib/designsettings.php:178 +msgid "Background" +msgstr "الخلفية" + +#: lib/designsettings.php:191 +msgid "Content" +msgstr "المحتوى" + +#: lib/designsettings.php:204 +msgid "Sidebar" +msgstr "الشريط الجانبي" + +#: lib/designsettings.php:217 +msgid "Text" +msgstr "النص" + +#: lib/designsettings.php:230 +msgid "Links" +msgstr "وصلات" + +#: lib/designsettings.php:247 +msgid "Use defaults" +msgstr "استخدم المبدئيات" + +#: lib/designsettings.php:248 +msgid "Restore default designs" +msgstr "استعد التصميمات المبدئية" + +#: lib/designsettings.php:254 +msgid "Reset back to default" +msgstr "ارجع إلى المبدئي" + +#: lib/designsettings.php:257 +msgid "Save design" +msgstr "احفظ التصميم" + +#: lib/designsettings.php:372 +msgid "Bad default color settings: " +msgstr "" + +#: lib/designsettings.php:468 +msgid "Design defaults restored." +msgstr "استعيدت مبدئيات التصميم." + +#: lib/disfavorform.php:114 lib/disfavorform.php:140 +msgid "Disfavor this notice" +msgstr "" + +#: lib/favorform.php:114 lib/favorform.php:140 +msgid "Favor this notice" +msgstr "" + +#: lib/favorform.php:140 +msgid "Favor" +msgstr "" + +#: lib/feedlist.php:64 +msgid "Export data" +msgstr "صدّر البيانات" + +#: lib/feed.php:85 +msgid "RSS 1.0" +msgstr "آرإس​إس 1.0" + +#: lib/feed.php:87 +msgid "RSS 2.0" +msgstr "آرإس​إس 2.0" + +#: lib/feed.php:89 +msgid "Atom" +msgstr "أتوم" + +#: lib/feed.php:91 +msgid "FOAF" +msgstr "" + +#: lib/galleryaction.php:121 +msgid "Filter tags" +msgstr "رشّح الوسوم" + +#: lib/galleryaction.php:131 +msgid "All" +msgstr "الكل" + +#: lib/galleryaction.php:139 +msgid "Select tag to filter" +msgstr "اختر وسمًا لترشيحه" + +#: lib/galleryaction.php:140 +msgid "Tag" +msgstr "الوسم" + +#: lib/galleryaction.php:141 +msgid "Choose a tag to narrow list" +msgstr "" + +#: lib/galleryaction.php:143 +msgid "Go" +msgstr "اذهب" + +#: lib/groupeditform.php:163 +msgid "URL of the homepage or blog of the group or topic" +msgstr "" + +#: lib/groupeditform.php:168 +msgid "Describe the group or topic" +msgstr "" + +#: lib/groupeditform.php:170 +#, php-format +msgid "Describe the group or topic in %d characters" +msgstr "" + +#: lib/groupeditform.php:172 +msgid "Description" +msgstr "الوصف" + +#: lib/groupeditform.php:179 +msgid "" +"Location for the group, if any, like \"City, State (or Region), Country\"" +msgstr "" + +#: lib/groupeditform.php:187 +#, php-format +msgid "Extra nicknames for the group, comma- or space- separated, max %d" +msgstr "" + +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 +msgid "Group" +msgstr "المجموعة" + +#: lib/groupnav.php:101 +msgid "Blocked" +msgstr "ممنوع" + +#: lib/groupnav.php:102 +#, php-format +msgid "%s blocked users" +msgstr "" + +#: lib/groupnav.php:108 +#, php-format +msgid "Edit %s group properties" +msgstr "عدّل خصائص مجموعة %s" + +#: lib/groupnav.php:113 +msgid "Logo" +msgstr "الشعار" + +#: lib/groupnav.php:114 +#, php-format +msgid "Add or edit %s logo" +msgstr "أضف أو عدّل شعار %s" + +#: lib/groupnav.php:120 +#, php-format +msgid "Add or edit %s design" +msgstr "" + +#: lib/groupsbymemberssection.php:71 +msgid "Groups with most members" +msgstr "المجموعات الأكثر أعضاءً" + +#: lib/groupsbypostssection.php:71 +msgid "Groups with most posts" +msgstr "المجموعات الأكثر مرسلات" + +#: lib/grouptagcloudsection.php:56 +#, php-format +msgid "Tags in %s group's notices" +msgstr "" + +#: lib/htmloutputter.php:104 +msgid "This page is not available in a media type you accept" +msgstr "" + +#: lib/imagefile.php:75 +#, php-format +msgid "That file is too big. The maximum file size is %s." +msgstr "" + +#: lib/imagefile.php:80 +msgid "Partial upload." +msgstr "" + +#: lib/imagefile.php:88 lib/mediafile.php:170 +msgid "System error uploading file." +msgstr "" + +#: lib/imagefile.php:96 +msgid "Not an image or corrupt file." +msgstr "" + +#: lib/imagefile.php:105 +msgid "Unsupported image file format." +msgstr "" + +#: lib/imagefile.php:118 +msgid "Lost our file." +msgstr "" + +#: lib/imagefile.php:150 lib/imagefile.php:197 +msgid "Unknown file type" +msgstr "" + +#: lib/jabber.php:192 +#, php-format +msgid "notice id: %s" +msgstr "" + +#: lib/joinform.php:114 +msgid "Join" +msgstr "انضم" + +#: lib/leaveform.php:114 +msgid "Leave" +msgstr "غادر" + +#: lib/logingroupnav.php:80 +msgid "Login with a username and password" +msgstr "" + +#: lib/logingroupnav.php:86 +msgid "Sign up for a new account" +msgstr "" + +#: lib/mailbox.php:89 +msgid "Only the user can read their own mailboxes." +msgstr "" + +#: lib/mailbox.php:139 +msgid "" +"You have no private messages. You can send private message to engage other " +"users in conversation. People can send you messages for your eyes only." +msgstr "" + +#: lib/mailbox.php:227 lib/noticelist.php:424 +msgid "from" +msgstr "من" + +#: lib/mail.php:172 +msgid "Email address confirmation" +msgstr "تأكيد عنوان البريد الإلكتروني" + +#: lib/mail.php:174 +#, php-format +msgid "" +"Hey, %s.\n" +"\n" +"Someone just entered this email address on %s.\n" +"\n" +"If it was you, and you want to confirm your entry, use the URL below:\n" +"\n" +"\t%s\n" +"\n" +"If not, just ignore this message.\n" +"\n" +"Thanks for your time, \n" +"%s\n" +msgstr "" + +#: lib/mail.php:235 +#, php-format +msgid "%1$s is now listening to your notices on %2$s." +msgstr "" + +#: lib/mail.php:240 +#, php-format +msgid "" +"%1$s is now listening to your notices on %2$s.\n" +"\n" +"\t%3$s\n" +"\n" +"%4$s%5$s%6$s\n" +"Faithfully yours,\n" +"%7$s.\n" +"\n" +"----\n" +"Change your email address or notification options at %8$s\n" +msgstr "" + +#: lib/mail.php:253 +#, php-format +msgid "Location: %s\n" +msgstr "الموقع: %s\n" + +#: lib/mail.php:255 +#, php-format +msgid "Homepage: %s\n" +msgstr "الصفحة الرئيسية: %s\n" + +#: lib/mail.php:257 +#, php-format +msgid "" +"Bio: %s\n" +"\n" +msgstr "السيرة: %s\n" + +#: lib/mail.php:285 +#, php-format +msgid "New email address for posting to %s" +msgstr "" + +#: lib/mail.php:288 +#, php-format +msgid "" +"You have a new posting address on %1$s.\n" +"\n" +"Send email to %2$s to post new messages.\n" +"\n" +"More email instructions at %3$s.\n" +"\n" +"Faithfully yours,\n" +"%4$s" +msgstr "" + +#: lib/mail.php:412 +#, php-format +msgid "%s status" +msgstr "" + +#: lib/mail.php:438 +msgid "SMS confirmation" +msgstr "" + +#: lib/mail.php:462 +#, php-format +msgid "You've been nudged by %s" +msgstr "" + +#: lib/mail.php:466 +#, php-format +msgid "" +"%1$s (%2$s) is wondering what you are up to these days and is inviting you " +"to post some news.\n" +"\n" +"So let's hear from you :)\n" +"\n" +"%3$s\n" +"\n" +"Don't reply to this email; it won't get to them.\n" +"\n" +"With kind regards,\n" +"%4$s\n" +msgstr "" + +#: lib/mail.php:509 +#, php-format +msgid "New private message from %s" +msgstr "" + +#: lib/mail.php:513 +#, php-format +msgid "" +"%1$s (%2$s) sent you a private message:\n" +"\n" +"------------------------------------------------------\n" +"%3$s\n" +"------------------------------------------------------\n" +"\n" +"You can reply to their message here:\n" +"\n" +"%4$s\n" +"\n" +"Don't reply to this email; it won't get to them.\n" +"\n" +"With kind regards,\n" +"%5$s\n" +msgstr "" + +#: lib/mail.php:554 +#, php-format +msgid "%s (@%s) added your notice as a favorite" +msgstr "" + +#: lib/mail.php:556 +#, php-format +msgid "" +"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" +"\n" +"The URL of your notice is:\n" +"\n" +"%3$s\n" +"\n" +"The text of your notice is:\n" +"\n" +"%4$s\n" +"\n" +"You can see the list of %1$s's favorites here:\n" +"\n" +"%5$s\n" +"\n" +"Faithfully yours,\n" +"%6$s\n" +msgstr "" + +#: lib/mail.php:611 +#, php-format +msgid "%s (@%s) sent a notice to your attention" +msgstr "" + +#: lib/mail.php:613 +#, php-format +msgid "" +"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" +"\n" +"The notice is here:\n" +"\n" +"\t%3$s\n" +"\n" +"It reads:\n" +"\n" +"\t%4$s\n" +"\n" +msgstr "" + +#: lib/mediafile.php:98 lib/mediafile.php:123 +msgid "There was a database error while saving your file. Please try again." +msgstr "" + +#: lib/mediafile.php:142 +msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." +msgstr "" + +#: lib/mediafile.php:147 +msgid "" +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " +"the HTML form." +msgstr "" + +#: lib/mediafile.php:152 +msgid "The uploaded file was only partially uploaded." +msgstr "" + +#: lib/mediafile.php:159 +msgid "Missing a temporary folder." +msgstr "" + +#: lib/mediafile.php:162 +msgid "Failed to write file to disk." +msgstr "" + +#: lib/mediafile.php:165 +msgid "File upload stopped by extension." +msgstr "" + +#: lib/mediafile.php:179 lib/mediafile.php:216 +msgid "File exceeds user's quota!" +msgstr "" + +#: lib/mediafile.php:196 lib/mediafile.php:233 +msgid "File could not be moved to destination directory." +msgstr "" + +#: lib/mediafile.php:201 lib/mediafile.php:237 +msgid "Could not determine file's mime-type!" +msgstr "" + +#: lib/mediafile.php:270 +#, php-format +msgid " Try using another %s format." +msgstr "" + +#: lib/mediafile.php:275 +#, php-format +msgid "%s is not a supported filetype on this server." +msgstr "" + +#: lib/messageform.php:120 +msgid "Send a direct notice" +msgstr "أرسل ملاحظة مباشرة" + +#: lib/messageform.php:146 +msgid "To" +msgstr "إلى" + +#: lib/messageform.php:162 lib/noticeform.php:173 +msgid "Available characters" +msgstr "المحارف المتوفرة" + +#: lib/noticeform.php:145 +msgid "Send a notice" +msgstr "أرسل إشعارًا" + +#: lib/noticeform.php:158 +#, php-format +msgid "What's up, %s?" +msgstr "ما الأخبار يا %s؟" + +#: lib/noticeform.php:180 +msgid "Attach" +msgstr "أرفق" + +#: lib/noticeform.php:184 +msgid "Attach a file" +msgstr "أرفق ملفًا" + +#: lib/noticelist.php:478 +msgid "in context" +msgstr "في السياق" + +#: lib/noticelist.php:498 +msgid "Reply to this notice" +msgstr "رُد على هذا الإشعار" + +#: lib/noticelist.php:499 +msgid "Reply" +msgstr "رُد" + +#: lib/nudgeform.php:116 +msgid "Nudge this user" +msgstr "" + +#: lib/nudgeform.php:128 +msgid "Nudge" +msgstr "" + +#: lib/nudgeform.php:128 +msgid "Send a nudge to this user" +msgstr "" + +#: lib/oauthstore.php:283 +msgid "Error inserting new profile" +msgstr "خطأ أثناء إدراج الملف الشخصي الجديد" + +#: lib/oauthstore.php:291 +msgid "Error inserting avatar" +msgstr "" + +#: lib/oauthstore.php:311 +msgid "Error inserting remote profile" +msgstr "" + +#: lib/oauthstore.php:345 +msgid "Duplicate notice" +msgstr "" + +#: lib/oauthstore.php:487 +msgid "Couldn't insert new subscription." +msgstr "تعذّر إدراج اشتراك جديد." + +#: lib/personalgroupnav.php:99 +msgid "Personal" +msgstr "شخصية" + +#: lib/personalgroupnav.php:104 +msgid "Replies" +msgstr "الردود" + +#: lib/personalgroupnav.php:114 +msgid "Favorites" +msgstr "مفضلات" + +#: lib/personalgroupnav.php:115 +msgid "User" +msgstr "المستخدم" + +#: lib/personalgroupnav.php:124 +msgid "Inbox" +msgstr "صندوق الوارد" + +#: lib/personalgroupnav.php:125 +msgid "Your incoming messages" +msgstr "رسائلك الواردة" + +#: lib/personalgroupnav.php:129 +msgid "Outbox" +msgstr "صندوق الصادر" + +#: lib/personalgroupnav.php:130 +msgid "Your sent messages" +msgstr "" + +#: lib/personaltagcloudsection.php:56 +#, php-format +msgid "Tags in %s's notices" +msgstr "" + +#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82 +msgid "Subscriptions" +msgstr "الاشتراكات" + +#: lib/profileaction.php:126 +msgid "All subscriptions" +msgstr "جميع الاشتراكات" + +#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90 +msgid "Subscribers" +msgstr "المشتركون" + +#: lib/profileaction.php:157 +msgid "All subscribers" +msgstr "جميع المشتركين" + +#: lib/profileaction.php:177 +msgid "User ID" +msgstr "هوية المستخدم" + +#: lib/profileaction.php:182 +msgid "Member since" +msgstr "عضو منذ" + +#: lib/profileaction.php:235 +msgid "All groups" +msgstr "كل المجموعات" + +#: lib/publicgroupnav.php:78 +msgid "Public" +msgstr "عام" + +#: lib/publicgroupnav.php:82 +msgid "User groups" +msgstr "مجموعات المستخدمين" + +#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85 +msgid "Recent tags" +msgstr "الوسوم الحديثة" + +#: lib/publicgroupnav.php:88 +msgid "Featured" +msgstr "مُختارون" + +#: lib/publicgroupnav.php:92 +msgid "Popular" +msgstr "" + +#: lib/searchaction.php:120 +msgid "Search site" +msgstr "ابحث في الموقع" + +#: lib/searchaction.php:162 +msgid "Search help" +msgstr "ابحث في المساعدة" + +#: lib/searchgroupnav.php:80 +msgid "People" +msgstr "" + +#: lib/searchgroupnav.php:81 +msgid "Find people on this site" +msgstr "" + +#: lib/searchgroupnav.php:82 +msgid "Notice" +msgstr "إشعار" + +#: lib/searchgroupnav.php:83 +msgid "Find content of notices" +msgstr "" + +#: lib/searchgroupnav.php:85 +msgid "Find groups on this site" +msgstr "" + +#: lib/section.php:89 +msgid "Untitled section" +msgstr "قسم غير مُعنون" + +#: lib/section.php:106 +msgid "More..." +msgstr "المزيد..." + +#: lib/subgroupnav.php:83 +#, php-format +msgid "People %s subscribes to" +msgstr "" + +#: lib/subgroupnav.php:91 +#, php-format +msgid "People subscribed to %s" +msgstr "" + +#: lib/subgroupnav.php:99 +#, php-format +msgid "Groups %s is a member of" +msgstr "" + +#: lib/subscriberspeopleselftagcloudsection.php:48 +#: lib/subscriptionspeopleselftagcloudsection.php:48 +msgid "People Tagcloud as self-tagged" +msgstr "" + +#: lib/subscriberspeopletagcloudsection.php:48 +#: lib/subscriptionspeopletagcloudsection.php:48 +msgid "People Tagcloud as tagged" +msgstr "" + +#: lib/subscriptionlist.php:126 +msgid "(none)" +msgstr "(لا شيء)" + +#: lib/subs.php:48 +msgid "Already subscribed!" +msgstr "" + +#: lib/subs.php:52 +msgid "User has blocked you." +msgstr "لقد منعك المستخدم." + +#: lib/subs.php:56 +msgid "Could not subscribe." +msgstr "تعذّر الاشتراك." + +#: lib/subs.php:75 +msgid "Could not subscribe other to you." +msgstr "" + +#: lib/subs.php:124 +msgid "Not subscribed!." +msgstr "" + +#: lib/subs.php:136 +msgid "Couldn't delete subscription." +msgstr "تعذّر حذف الاشتراك." + +#: lib/tagcloudsection.php:56 +msgid "None" +msgstr "لا شيء" + +#: lib/topposterssection.php:74 +msgid "Top posters" +msgstr "أعلى المرسلين" + +#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137 +msgid "Unsubscribe from this user" +msgstr "ألغِ الاشتراك مع هذا المستخدم" + +#: lib/unsubscribeform.php:137 +msgid "Unsubscribe" +msgstr "ألغِ الاشتراك" + +#: lib/userprofile.php:116 +msgid "Edit Avatar" +msgstr "عدّل الأفتار" + +#: lib/userprofile.php:236 +msgid "User actions" +msgstr "تصرفات المستخدم" + +#: lib/userprofile.php:248 +msgid "Edit profile settings" +msgstr "عدّل إعدادات الملف الشخصي" + +#: lib/userprofile.php:249 +msgid "Edit" +msgstr "عدّل" + +#: lib/userprofile.php:272 +msgid "Send a direct message to this user" +msgstr "أرسل رسالة مباشرة إلى هذا المستخدم" + +#: lib/userprofile.php:273 +msgid "Message" +msgstr "رسالة" + +#: lib/util.php:818 +msgid "a few seconds ago" +msgstr "قبل لحظات قليلة" + +#: lib/util.php:820 +msgid "about a minute ago" +msgstr "قبل دقيقة تقريبًا" + +#: lib/util.php:822 +#, php-format +msgid "about %d minutes ago" +msgstr "" + +#: lib/util.php:824 +msgid "about an hour ago" +msgstr "قبل ساعة تقريبًا" + +#: lib/util.php:826 +#, php-format +msgid "about %d hours ago" +msgstr "" + +#: lib/util.php:828 +msgid "about a day ago" +msgstr "قبل يوم تقريبا" + +#: lib/util.php:830 +#, php-format +msgid "about %d days ago" +msgstr "" + +#: lib/util.php:832 +msgid "about a month ago" +msgstr "قبل شهر تقريبًا" + +#: lib/util.php:834 +#, php-format +msgid "about %d months ago" +msgstr "" + +#: lib/util.php:836 +msgid "about a year ago" +msgstr "قبل سنة تقريبًا" + +#: lib/webcolor.php:82 +#, php-format +msgid "%s is not a valid color!" +msgstr "" + +#: lib/webcolor.php:123 +#, php-format +msgid "%s is not a valid color! Use 3 or 6 hex chars." +msgstr "" + +#: scripts/maildaemon.php:48 +msgid "Could not parse message." +msgstr "" + +#: scripts/maildaemon.php:53 +msgid "Not a registered user." +msgstr "" + +#: scripts/maildaemon.php:57 +msgid "Sorry, that is not your incoming email address." +msgstr "" + +#: scripts/maildaemon.php:61 +msgid "Sorry, no incoming email allowed." +msgstr "" -- cgit v1.2.3-54-g00ecf From d9b9784b210c5d23084503d3e1761b1336b30ffa Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Tue, 10 Nov 2009 22:05:16 +0100 Subject: Localisation updates from translatewiki.net (2009-11-10) --- locale/bg/LC_MESSAGES/statusnet.mo | Bin 82931 -> 83123 bytes locale/bg/LC_MESSAGES/statusnet.po | 147 +++++++++-------- locale/ca/LC_MESSAGES/statusnet.mo | Bin 71073 -> 71227 bytes locale/ca/LC_MESSAGES/statusnet.po | 147 +++++++++-------- locale/cs/LC_MESSAGES/statusnet.mo | Bin 34815 -> 34906 bytes locale/cs/LC_MESSAGES/statusnet.po | 144 +++++++++-------- locale/de/LC_MESSAGES/statusnet.mo | Bin 71283 -> 71423 bytes locale/de/LC_MESSAGES/statusnet.po | 147 +++++++++-------- locale/el/LC_MESSAGES/statusnet.mo | Bin 29022 -> 29237 bytes locale/el/LC_MESSAGES/statusnet.po | 143 ++++++++-------- locale/en_GB/LC_MESSAGES/statusnet.mo | Bin 65966 -> 66104 bytes locale/en_GB/LC_MESSAGES/statusnet.po | 147 +++++++++-------- locale/es/LC_MESSAGES/statusnet.mo | Bin 70184 -> 70370 bytes locale/es/LC_MESSAGES/statusnet.po | 147 +++++++++-------- locale/fi/LC_MESSAGES/statusnet.mo | Bin 72747 -> 74094 bytes locale/fi/LC_MESSAGES/statusnet.po | 247 ++++++++++++++-------------- locale/fr/LC_MESSAGES/statusnet.mo | Bin 75273 -> 75427 bytes locale/fr/LC_MESSAGES/statusnet.po | 147 +++++++++-------- locale/ga/LC_MESSAGES/statusnet.mo | Bin 73097 -> 73257 bytes locale/ga/LC_MESSAGES/statusnet.po | 147 +++++++++-------- locale/he/LC_MESSAGES/statusnet.mo | Bin 38284 -> 38349 bytes locale/he/LC_MESSAGES/statusnet.po | 144 +++++++++-------- locale/is/LC_MESSAGES/statusnet.mo | Bin 62570 -> 62720 bytes locale/is/LC_MESSAGES/statusnet.po | 145 +++++++++-------- locale/it/LC_MESSAGES/statusnet.mo | Bin 70354 -> 70500 bytes locale/it/LC_MESSAGES/statusnet.po | 147 +++++++++-------- locale/ja/LC_MESSAGES/statusnet.mo | Bin 47537 -> 47704 bytes locale/ja/LC_MESSAGES/statusnet.po | 145 +++++++++-------- locale/ko/LC_MESSAGES/statusnet.mo | Bin 74615 -> 74777 bytes locale/ko/LC_MESSAGES/statusnet.po | 147 +++++++++-------- locale/mk/LC_MESSAGES/statusnet.mo | Bin 44819 -> 44896 bytes locale/mk/LC_MESSAGES/statusnet.po | 144 +++++++++-------- locale/nb/LC_MESSAGES/statusnet.mo | Bin 22937 -> 23106 bytes locale/nb/LC_MESSAGES/statusnet.po | 143 ++++++++-------- locale/nl/LC_MESSAGES/statusnet.mo | Bin 84387 -> 85178 bytes locale/nl/LC_MESSAGES/statusnet.po | 157 ++++++++++-------- locale/nn/LC_MESSAGES/statusnet.mo | Bin 67541 -> 67679 bytes locale/nn/LC_MESSAGES/statusnet.po | 147 +++++++++-------- locale/pl/LC_MESSAGES/statusnet.mo | Bin 94535 -> 94675 bytes locale/pl/LC_MESSAGES/statusnet.po | 145 +++++++++-------- locale/pt/LC_MESSAGES/statusnet.mo | Bin 25139 -> 25296 bytes locale/pt/LC_MESSAGES/statusnet.po | 143 ++++++++-------- locale/pt_BR/LC_MESSAGES/statusnet.mo | Bin 69895 -> 70063 bytes locale/pt_BR/LC_MESSAGES/statusnet.po | 145 +++++++++-------- locale/ru/LC_MESSAGES/statusnet.mo | Bin 93851 -> 94082 bytes locale/ru/LC_MESSAGES/statusnet.po | 147 +++++++++-------- locale/sv/LC_MESSAGES/statusnet.mo | Bin 58405 -> 58606 bytes locale/sv/LC_MESSAGES/statusnet.po | 145 +++++++++-------- locale/te/LC_MESSAGES/statusnet.mo | Bin 44836 -> 47515 bytes locale/te/LC_MESSAGES/statusnet.po | 296 +++++++++++++++++----------------- locale/tr/LC_MESSAGES/statusnet.mo | Bin 34346 -> 34413 bytes locale/tr/LC_MESSAGES/statusnet.po | 144 +++++++++-------- locale/uk/LC_MESSAGES/statusnet.mo | Bin 91655 -> 91848 bytes locale/uk/LC_MESSAGES/statusnet.po | 147 +++++++++-------- locale/vi/LC_MESSAGES/statusnet.mo | Bin 66939 -> 67147 bytes locale/vi/LC_MESSAGES/statusnet.po | 145 +++++++++-------- locale/zh_CN/LC_MESSAGES/statusnet.mo | Bin 64437 -> 64571 bytes locale/zh_CN/LC_MESSAGES/statusnet.po | 147 +++++++++-------- locale/zh_TW/LC_MESSAGES/statusnet.mo | Bin 18513 -> 18568 bytes locale/zh_TW/LC_MESSAGES/statusnet.po | 144 +++++++++-------- 60 files changed, 2461 insertions(+), 2169 deletions(-) diff --git a/locale/bg/LC_MESSAGES/statusnet.mo b/locale/bg/LC_MESSAGES/statusnet.mo index 2821c4d83..a05e3245c 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 f6b0cb3f2..33844a4c7 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-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:57:47+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:58:41+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); 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" @@ -486,7 +486,7 @@ msgid "Invalid size." msgstr "Неправилен размер." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Аватар" @@ -534,7 +534,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:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: 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 @@ -634,7 +634,7 @@ msgstr "Не е указан профил." msgid "No profile with that ID." msgstr "Не е открит профил с такъв идентификатор." -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "Блокиране на потребителя" @@ -646,24 +646,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "Не" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "Списък с потребителите в тази група." +msgid "Do not block this user" +msgstr "Разблокиране на този потребител" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Да" -#: actions/block.php:150 -#, fuzzy -msgid "Block this user from this group" -msgstr "Списък с потребителите в тази група." +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" +msgstr "Блокиране на потребителя" #: actions/block.php:165 msgid "You have already blocked this user." @@ -1159,7 +1159,7 @@ msgstr "Не членувате в тази група." msgid "Block user from group" msgstr "Блокиране на потребителя" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1167,7 +1167,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "Списък с потребителите в тази група." + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "Списък с потребителите в тази група." + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1232,7 +1242,7 @@ msgstr "Лотого е обновено." msgid "Failed updating logo." msgstr "Неуспешно обновяване на логото." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "" @@ -1246,7 +1256,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "Списък с потребителите в тази група." -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1254,10 +1264,6 @@ msgstr "" msgid "Block" msgstr "Блокиране" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "Блокиране на потребителя" - #: actions/groupmembers.php:441 #, fuzzy msgid "Make user an admin of the group" @@ -1666,7 +1672,7 @@ msgid "Nickname" msgstr "Псевдоним" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Парола" @@ -1910,61 +1916,66 @@ msgstr "Това е изходящата ви кутия с лични съоб msgid "Change password" msgstr "Смяна на паролата" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Смяна на паролата" + +#: actions/passwordsettings.php:82 msgid "Change your password." msgstr "Смяна на паролата." -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Паролата е записана." -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Стара парола" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Нова парола" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 или повече знака" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Потвърждаване" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "също като паролата по-горе" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Промяна" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Паролата трябва да е 6 или повече знака." -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Паролите не съвпадат." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Грешна стара парола" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Грешка при запазване на потребител — невалидност." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Грешка при запазване на новата парола." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Паролата е записана." @@ -2403,7 +2414,7 @@ msgid "Same as password above. Required." msgstr "Същото като паролата по-горе. Задължително поле." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Е-поща" @@ -2633,7 +2644,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "" @@ -2686,7 +2697,7 @@ msgstr "Емисия с бележки на %s" msgid "FOAF for %s group" msgstr "Изходяща кутия за %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "Членове" @@ -3335,40 +3346,40 @@ msgstr "Грешка в базата от данни — отговор при msgid "Welcome to %1$s, @%2$s!" msgstr "Съобщение до %1$s в %2$s" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Профил" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Промяна настройките на профила" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "Качване на аватар" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Смяна на паролата" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Промяна обработката на писмата" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "Потребителски профил" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Друго" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "Други настройки" @@ -3967,35 +3978,35 @@ msgstr "" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Група" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Блокиране" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Блокиране на потребителя" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "Редактиране настройките на групата %s" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "Лого" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "Добавяне или редактиране логото на %s" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, fuzzy, php-format msgid "Add or edit %s design" msgstr "Добавяне или редактиране логото на %s" @@ -4191,7 +4202,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4215,7 +4226,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4613,47 +4624,47 @@ msgstr "Изпращате на пряко съобщение до този по msgid "Message" msgstr "Съобщение" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "преди няколко секунди" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "преди около минута" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "преди около %d минути" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "преди около час" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "преди около %d часа" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "преди около ден" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "преди около %d дни" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "преди около месец" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "преди около %d месеца" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "преди около година" diff --git a/locale/ca/LC_MESSAGES/statusnet.mo b/locale/ca/LC_MESSAGES/statusnet.mo index 49b67a198..ac01d8ed9 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 25a572c8c..11d83cad8 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-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:57:50+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:58:44+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); 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" @@ -484,7 +484,7 @@ msgid "Invalid size." msgstr "Mida invàlida." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Avatar" @@ -532,7 +532,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:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: 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 @@ -636,7 +636,7 @@ msgstr "No s'ha especificat perfil." msgid "No profile with that ID." msgstr "No hi ha cap perfil amb aquesta ID." -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "Usuari bloquejat." @@ -648,24 +648,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "No" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "La llista dels usuaris d'aquest grup." +msgid "Do not block this user" +msgstr "Desbloquejar aquest usuari" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Sí" -#: actions/block.php:150 -#, fuzzy -msgid "Block this user from this group" -msgstr "La llista dels usuaris d'aquest grup." +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" +msgstr "Bloquejar aquest usuari" #: actions/block.php:165 msgid "You have already blocked this user." @@ -1168,7 +1168,7 @@ msgstr "No ets membre d'aquest grup." msgid "Block user from group" msgstr "Usuari bloquejat." -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1176,7 +1176,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "La llista dels usuaris d'aquest grup." + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "La llista dels usuaris d'aquest grup." + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1243,7 +1253,7 @@ msgstr "Logo actualitzat." msgid "Failed updating logo." msgstr "Error en actualitzar logo." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "%s membre/s en el grup" @@ -1257,7 +1267,7 @@ msgstr "%s membre/s en el grup, pàgina %d" msgid "A list of the users in this group." msgstr "La llista dels usuaris d'aquest grup." -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "Admin" @@ -1265,10 +1275,6 @@ msgstr "Admin" msgid "Block" msgstr "Bloquejar" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "Bloquejar aquest usuari" - #: actions/groupmembers.php:441 #, fuzzy msgid "Make user an admin of the group" @@ -1685,7 +1691,7 @@ msgid "Nickname" msgstr "Sobrenom" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Contrasenya" @@ -1934,60 +1940,65 @@ msgstr "" msgid "Change password" msgstr "Canviar contrasenya" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Canviar la teva contrasenya" + +#: actions/passwordsettings.php:82 msgid "Change your password." msgstr "Canviar contrasenya" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 msgid "Password change" msgstr "Contrasenya canviada." -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Antiga contrasenya" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Nova contrasenya" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 o més caràcters" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirmar" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "repeteix la contrasenya anterior" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Canviar" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 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:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Les contrasenyes no coincideixen." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Contrasenya antiga incorrecta" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Error en guardar usuari; invàlid." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "No es pot guardar la nova contrasenya." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Contrasenya guardada." @@ -2433,7 +2444,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:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Correu electrònic" @@ -2665,7 +2676,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "%s grup" @@ -2717,7 +2728,7 @@ msgstr "Feed d'avisos del grup %s" msgid "FOAF for %s group" msgstr "Safata de sortida per %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "Membres" @@ -3373,40 +3384,40 @@ 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:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Perfil" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Canviar les preferències del teu perfil" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "Pujar un avatar" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Canviar la teva contrasenya" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Canviar correu electrònic" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "Perfil de l'usuari" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Altres" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "Altres opcions" @@ -3998,35 +4009,35 @@ msgstr "" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Grup" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Bloquejar" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Usuari bloquejat." -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "Editar propietats del grup %s" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "Logo" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "Afegir o editar logo %s" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, fuzzy, php-format msgid "Add or edit %s design" msgstr "Afegir o editar logo %s" @@ -4229,7 +4240,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4253,7 +4264,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4651,47 +4662,47 @@ msgstr "Enviar un missatge directe a aquest usuari" msgid "Message" msgstr "Missatge" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "fa pocs segons" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "fa un minut" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "fa %d minuts" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "fa una hora" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "fa %d hores" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "fa un dia" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "fa %d dies" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "fa un mes" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "fa %d mesos" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "fa un any" diff --git a/locale/cs/LC_MESSAGES/statusnet.mo b/locale/cs/LC_MESSAGES/statusnet.mo index f9cf40b2e..275a5e3a3 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 096e49547..17a12027f 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-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:57:53+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:58:47+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); 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" @@ -482,7 +482,7 @@ msgid "Invalid size." msgstr "Neplatná velikost" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Obrázek" @@ -531,7 +531,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:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: 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 @@ -633,7 +633,7 @@ msgstr "" msgid "No profile with that ID." msgstr "" -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 #, fuzzy msgid "Block user" msgstr "Žádný takový uživatel." @@ -646,23 +646,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "Nelze přesměrovat na server: %s" +msgid "Do not block this user" +msgstr "Žádný takový uživatel." #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "" -#: actions/block.php:150 +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 #, fuzzy -msgid "Block this user from this group" +msgid "Block this user" msgstr "Žádný takový uživatel." #: actions/block.php:165 @@ -1153,7 +1154,7 @@ msgstr "Neodeslal jste nám profil" msgid "Block user from group" msgstr "Žádný takový uživatel." -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1161,7 +1162,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "Nelze přesměrovat na server: %s" + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "Žádný takový uživatel." + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1224,7 +1235,7 @@ msgstr "Obrázek nahrán" msgid "Failed updating logo." msgstr "Nahrávání obrázku selhalo." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "" @@ -1238,7 +1249,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1246,11 +1257,6 @@ msgstr "" msgid "Block" msgstr "" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -#, fuzzy -msgid "Block this user" -msgstr "Žádný takový uživatel." - #: actions/groupmembers.php:441 msgid "Make user an admin of the group" msgstr "" @@ -1631,7 +1637,7 @@ msgid "Nickname" msgstr "Přezdívka" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Heslo" @@ -1873,62 +1879,66 @@ msgstr "" msgid "Change password" msgstr "Změnit heslo" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +msgid "You are not allowed to change your password" +msgstr "" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "Změnit heslo" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Heslo uloženo" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Staré heslo" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Nové heslo" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 a více znaků" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Heslo znovu" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "stejné jako heslo výše" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Změnit" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Hesla nesouhlasí" -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Neplatné heslo" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Chyba při ukládaní uživatele; neplatný" -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Nelze uložit nové heslo" -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Heslo uloženo" @@ -2367,7 +2377,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Email" @@ -2582,7 +2592,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "" @@ -2636,7 +2646,7 @@ msgstr "Feed sdělení pro %s" msgid "FOAF for %s group" msgstr "Feed sdělení pro %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "Členem od" @@ -3280,41 +3290,41 @@ msgstr "Chyba v DB při vkládání odpovědi: %s" msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 #, fuzzy msgid "Upload an avatar" msgstr "Nahrávání obrázku selhalo." -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "Uživatel nemá profil." -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "" @@ -3914,36 +3924,36 @@ msgstr "Místo. Město, stát." msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Žádný takový uživatel." -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Žádný takový uživatel." -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 #, fuzzy msgid "Logo" msgstr "Odhlásit" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "" @@ -4141,7 +4151,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4165,7 +4175,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4570,47 +4580,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "před pár sekundami" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "asi před minutou" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "asi před %d minutami" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "asi před hodinou" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "asi před %d hodinami" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "asi přede dnem" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "před %d dny" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "asi před měsícem" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "asi před %d mesíci" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "asi před rokem" diff --git a/locale/de/LC_MESSAGES/statusnet.mo b/locale/de/LC_MESSAGES/statusnet.mo index fa4ddeb8c..9591afa0b 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 d6c1f3fdb..0cca46cb4 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-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:57:55+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:58:49+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); 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" @@ -489,7 +489,7 @@ msgid "Invalid size." msgstr "Ungültige Größe." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Avatar" @@ -538,7 +538,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:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: 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 @@ -640,7 +640,7 @@ msgstr "Kein Profil angegeben." msgid "No profile with that ID." msgstr "Kein Benutzer-Profil mit dieser ID." -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "Benutzer blockieren" @@ -652,24 +652,25 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "Nein" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "Liste der Benutzer in dieser Gruppe." +msgid "Do not block this user" +msgstr "Benutzer freigeben" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Ja" -#: actions/block.php:150 +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 #, fuzzy -msgid "Block this user from this group" -msgstr "Liste der Benutzer in dieser Gruppe." +msgid "Block this user" +msgstr "Benutzer blockieren" #: actions/block.php:165 msgid "You have already blocked this user." @@ -1172,7 +1173,7 @@ msgstr "Du bist kein Mitglied dieser Gruppe." msgid "Block user from group" msgstr "Benutzer blockieren" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1180,7 +1181,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "Liste der Benutzer in dieser Gruppe." + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "Liste der Benutzer in dieser Gruppe." + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1246,7 +1257,7 @@ msgstr "Logo aktualisiert." msgid "Failed updating logo." msgstr "Aktualisierung des Logos fehlgeschlagen." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "%s Gruppen-Mitglieder" @@ -1260,7 +1271,7 @@ msgstr "%s Gruppen-Mitglieder, Seite %d" msgid "A list of the users in this group." msgstr "Liste der Benutzer in dieser Gruppe." -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 #, fuzzy msgid "Admin" msgstr "Admin" @@ -1269,11 +1280,6 @@ msgstr "Admin" msgid "Block" msgstr "Blockieren" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -#, fuzzy -msgid "Block this user" -msgstr "Benutzer blockieren" - #: actions/groupmembers.php:441 #, fuzzy msgid "Make user an admin of the group" @@ -1692,7 +1698,7 @@ msgid "Nickname" msgstr "Nutzername" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Passwort" @@ -1939,60 +1945,65 @@ msgstr "" msgid "Change password" msgstr "Passwort ändern" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Ändere dein Passwort" + +#: actions/passwordsettings.php:82 msgid "Change your password." msgstr "Ändere dein Passwort." -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 msgid "Password change" msgstr "Passwort geändert" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Altes Passwort" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Neues Passwort" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 oder mehr Zeichen" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Bestätigen" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "Gleiches Passwort wie oben" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Ändern" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 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:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Passwörter stimmen nicht überein." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Altes Passwort falsch" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Fehler beim Speichern des Nutzers, ungültig." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Konnte neues Passwort nicht speichern" -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Passwort gespeichert." @@ -2439,7 +2450,7 @@ msgid "Same as password above. Required." msgstr "Gleiches Passwort wie zuvor. Pflichteingabe." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "E-Mail" @@ -2675,7 +2686,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "%s Gruppe" @@ -2727,7 +2738,7 @@ msgstr "Nachrichtenfeed der Gruppe %s" msgid "FOAF for %s group" msgstr "Postausgang von %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "Mitglieder" @@ -3384,40 +3395,40 @@ 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:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Ändern der Profileinstellungen" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "Avatar hochladen" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Ändere dein Passwort" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Ändere die E-Mail Verarbeitung" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "Benutzerprofil" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Sonstige" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "Sonstige Optionen" @@ -4016,36 +4027,36 @@ msgstr "Ort der Gruppe, optional, z.B. \"Stadt, Gebiet (oder Region), Land\"" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Gruppe" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Blockieren" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Benutzer blockieren" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, fuzzy, php-format msgid "Edit %s group properties" msgstr "%s Gruppeneinstellungen bearbeiten" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 #, fuzzy msgid "Logo" msgstr "Logo" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, fuzzy, php-format msgid "Add or edit %s logo" msgstr "%s Logo hinzufügen oder bearbeiten" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, fuzzy, php-format msgid "Add or edit %s design" msgstr "%s Logo hinzufügen oder bearbeiten" @@ -4252,7 +4263,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4276,7 +4287,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4684,47 +4695,47 @@ msgstr "Direkte Nachricht an Benutzer verschickt" msgid "Message" msgstr "Nachricht" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "vor wenigen Sekunden" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "vor einer Minute" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "vor %d Minuten" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "vor einer Stunde" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "vor %d Stunden" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "vor einem Tag" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "vor %d Tagen" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "vor einem Monat" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "vor %d Monaten" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "vor einem Jahr" diff --git a/locale/el/LC_MESSAGES/statusnet.mo b/locale/el/LC_MESSAGES/statusnet.mo index b7bd29447..72dc2ce58 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 5abc36274..a7163a762 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-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:57:58+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:58:52+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); 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" @@ -478,7 +478,7 @@ msgid "Invalid size." msgstr "" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "" @@ -527,7 +527,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:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: 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 @@ -627,7 +627,7 @@ msgstr "" msgid "No profile with that ID." msgstr "" -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "" @@ -639,21 +639,23 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "" #: actions/block.php:149 -msgid "Do not block this user from this group" -msgstr "" +#, fuzzy +msgid "Do not block this user" +msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "" -#: actions/block.php:150 -msgid "Block this user from this group" +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" msgstr "" #: actions/block.php:165 @@ -1142,7 +1144,7 @@ msgstr "" msgid "Block user from group" msgstr "" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1150,7 +1152,15 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +msgid "Do not block this user from this group" +msgstr "" + +#: actions/groupblock.php:179 +msgid "Block this user from this group" +msgstr "" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1212,7 +1222,7 @@ msgstr "Αποσύνδεση" msgid "Failed updating logo." msgstr "" -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "" @@ -1226,7 +1236,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "Διαχειριστής" @@ -1234,10 +1244,6 @@ msgstr "Διαχειριστής" msgid "Block" msgstr "" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "" - #: actions/groupmembers.php:441 msgid "Make user an admin of the group" msgstr "" @@ -1607,7 +1613,7 @@ msgid "Nickname" msgstr "Ψευδώνυμο" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Κωδικός" @@ -1847,62 +1853,67 @@ msgstr "" msgid "Change password" msgstr "Αλλαγή κωδικού" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Αλλάξτε τον κωδικό σας" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "Αλλαγή κωδικού" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Ο κωδικός αποθηκεύτηκε." -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Νέος κωδικός" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 ή περισσότεροι χαρακτήρες" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Επιβεβαίωση" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Αλλαγή" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Οι κωδικοί δεν ταυτίζονται." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Λάθος παλιός κωδικός" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "" -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Αδύνατη η αποθήκευση του νέου κωδικού" -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Ο κωδικός αποθηκεύτηκε." @@ -2335,7 +2346,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Email" @@ -2563,7 +2574,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "" @@ -2616,7 +2627,7 @@ msgstr "" msgid "FOAF for %s group" msgstr "Αδύνατη η αποθήκευση του προφίλ." -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "Μέλος από" @@ -3239,40 +3250,40 @@ msgstr "Σφάλμα βάσης δεδομένων κατά την εισαγω msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Αλλάξτε τις ρυθμίσεις του προφίλ σας" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Αλλάξτε τον κωδικό σας" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "Αδύνατη η αποθήκευση του προφίλ." -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "" @@ -3857,34 +3868,34 @@ msgstr "Τοποθεσία της ομάδας (εάν υπάρχει), πχ: \" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Ομάδα" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 msgid "Blocked" msgstr "" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, php-format msgid "%s blocked users" msgstr "" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "Επεξεργασία ιδιοτήτων της ομάδας %s" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "Λογότυπο" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "Προσθήκη ή επεξεργασία λογότυπου για την ομάδα %s" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, fuzzy, php-format msgid "Add or edit %s design" msgstr "Προσθήκη ή επεξεργασία λογότυπου για την ομάδα %s" @@ -4076,7 +4087,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4100,7 +4111,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4496,47 +4507,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.mo b/locale/en_GB/LC_MESSAGES/statusnet.mo index dfe476cb9..b6dc8fa58 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 71bcfd906..384e60927 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/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-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:02+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:58:54+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(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); 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" @@ -487,7 +487,7 @@ msgid "Invalid size." msgstr "Invalid size." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Avatar" @@ -535,7 +535,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:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: 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 @@ -635,7 +635,7 @@ msgstr "No profile specified." msgid "No profile with that ID." msgstr "No profile with that ID." -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "Block user" @@ -647,24 +647,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "No" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "A list of the users in this group." +msgid "Do not block this user" +msgstr "Unblock this user" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Yes" -#: actions/block.php:150 -#, fuzzy -msgid "Block this user from this group" -msgstr "A list of the users in this group." +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" +msgstr "Block this user" #: actions/block.php:165 msgid "You have already blocked this user." @@ -1160,7 +1160,7 @@ msgstr "You are not a member of that group." msgid "Block user from group" msgstr "Block user" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1168,7 +1168,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "A list of the users in this group." + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "A list of the users in this group." + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1233,7 +1243,7 @@ msgstr "Logo updated." msgid "Failed updating logo." msgstr "Failed updating logo." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "%s group members" @@ -1247,7 +1257,7 @@ msgstr "%s group members, page %d" msgid "A list of the users in this group." msgstr "A list of the users in this group." -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "Admin" @@ -1255,10 +1265,6 @@ msgstr "Admin" msgid "Block" msgstr "Block" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "Block this user" - #: actions/groupmembers.php:441 #, fuzzy msgid "Make user an admin of the group" @@ -1667,7 +1673,7 @@ msgid "Nickname" msgstr "Nickname" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Password" @@ -1911,60 +1917,65 @@ msgstr "This is your outbox, which lists private messages you have sent." msgid "Change password" msgstr "Change password" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Change your password" + +#: actions/passwordsettings.php:82 msgid "Change your password." msgstr "Change your password." -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 msgid "Password change" msgstr "Password change" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Old password" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "New password" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 or more characters" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirm" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "same as password above" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Change" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Password must be 6 or more characters." -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Passwords don't match." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Incorrect old password" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Error saving user; invalid." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Can't save new password." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Password saved." @@ -2403,7 +2414,7 @@ msgid "Same as password above. Required." msgstr "Same as password above. Required." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "E-mail" @@ -2635,7 +2646,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "%s group" @@ -2687,7 +2698,7 @@ msgstr "Notice feed for %s group" msgid "FOAF for %s group" msgstr "Outbox for %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "Members" @@ -3339,40 +3350,40 @@ msgstr "DB error inserting reply: %s" msgid "Welcome to %1$s, @%2$s!" msgstr "Message to %1$s on %2$s" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profile" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Change your profile settings" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "Upload an avatar" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Change your password" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Change e-mail handling" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "User profile" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Other" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "Other options" @@ -3964,35 +3975,35 @@ msgstr "" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Group" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Block" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Block user" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "Edit %s group properties" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "Logo" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "Add or edit %s logo" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, fuzzy, php-format msgid "Add or edit %s design" msgstr "Add or edit %s logo" @@ -4195,7 +4206,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4219,7 +4230,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4617,47 +4628,47 @@ msgstr "Send a direct message to this user" msgid "Message" msgstr "Message" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "a few seconds ago" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "about a minute ago" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "about %d minutes ago" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "about an hour ago" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "about %d hours ago" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "about a day ago" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "about %d days ago" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "about a month ago" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "about %d months ago" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "about a year ago" diff --git a/locale/es/LC_MESSAGES/statusnet.mo b/locale/es/LC_MESSAGES/statusnet.mo index a200a581f..eda910548 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 cd3cf31f4..d04d4f826 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-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:05+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:58:57+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); 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" @@ -487,7 +487,7 @@ msgid "Invalid size." msgstr "Tamaño inválido." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Avatar" @@ -535,7 +535,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:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: 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 @@ -637,7 +637,7 @@ msgstr "No se especificó perfil." msgid "No profile with that ID." msgstr "No existe perfil con ese ID" -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "Bloquear usuario." @@ -649,24 +649,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "No" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "Lista de los usuarios en este grupo." +msgid "Do not block this user" +msgstr "Desbloquear este usuario" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Sí" -#: actions/block.php:150 -#, fuzzy -msgid "Block this user from this group" -msgstr "Lista de los usuarios en este grupo." +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" +msgstr "Bloquear este usuario." #: actions/block.php:165 msgid "You have already blocked this user." @@ -1169,7 +1169,7 @@ msgstr "No eres miembro de ese grupo" msgid "Block user from group" msgstr "Bloquear usuario." -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1177,7 +1177,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "Lista de los usuarios en este grupo." + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "Lista de los usuarios en este grupo." + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1244,7 +1254,7 @@ msgstr "SE actualizó logo." msgid "Failed updating logo." msgstr "Error al actualizar logo." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "Miembros del grupo %s" @@ -1258,7 +1268,7 @@ msgstr "Miembros del grupo %s, página %d" msgid "A list of the users in this group." msgstr "Lista de los usuarios en este grupo." -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "Admin" @@ -1266,10 +1276,6 @@ msgstr "Admin" msgid "Block" msgstr "Bloquear" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "Bloquear este usuario." - #: actions/groupmembers.php:441 #, fuzzy msgid "Make user an admin of the group" @@ -1687,7 +1693,7 @@ msgid "Nickname" msgstr "Apodo" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Contraseña" @@ -1938,62 +1944,67 @@ msgstr "" msgid "Change password" msgstr "Cambiar contraseña" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Cambia tu contraseña" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "Cambia tu contraseña." -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Cambio de contraseña " -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Antigua contraseña" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Nueva contraseña" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 o más caracteres" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirmar" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "repita la contraseña anterior" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Cambiar" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 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:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Las contraseñas no coinciden" -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Contraseña antigua incorrecta." -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Error al guardar el usuario; inválido." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "No se puede guardar la nueva contraseña." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Se guardó Contraseña." @@ -2443,7 +2454,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:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Correo electrónico" @@ -2677,7 +2688,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "Grupo %s" @@ -2731,7 +2742,7 @@ msgstr "Feed de avisos de grupo %s" msgid "FOAF for %s group" msgstr "Bandeja de salida para %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "Miembros" @@ -3396,39 +3407,39 @@ 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:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Perfil" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Cambia tus opciones de perfil" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "Cargar un avatar." -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Cambia tu contraseña" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Cambiar el manejo del correo." -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 msgid "Design your profile" msgstr "Diseñar tu perfil" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Otro" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "Otras opciones" @@ -4019,34 +4030,34 @@ msgstr "" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Grupo" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 msgid "Blocked" msgstr "Bloqueado" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, php-format msgid "%s blocked users" msgstr "usuarios bloqueados" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "Editar propiedades del grupo %s" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "Logo" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "Agregar o editar el logo de %s" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "Agregar o editar el diseño de %s" @@ -4252,7 +4263,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4276,7 +4287,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4675,47 +4686,47 @@ msgstr "Enviar un mensaje directo a este usuario" msgid "Message" msgstr "Mensaje" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "hace unos segundos" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "hace un minuto" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "hace %d minutos" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "hace una hora" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "hace %d horas" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "hace un día" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "hace %d días" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "hace un mes" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "hace %d meses" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "hace un año" diff --git a/locale/fi/LC_MESSAGES/statusnet.mo b/locale/fi/LC_MESSAGES/statusnet.mo index f8bf4c211..61946bd6a 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 021c423d9..8202cd4f4 100644 --- a/locale/fi/LC_MESSAGES/statusnet.po +++ b/locale/fi/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-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:08+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:00+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); 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" #: 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 "Tuota tagia ei ole." +msgstr "Sivua ei ole." #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 @@ -167,9 +166,9 @@ msgid "No message text!" msgstr "Viestissä ei ole tekstiä!" #: 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 "Liian pitkä päivitys. Maksimikoko päivitykselle on 140 merkkiä." +msgstr "Liian pitkä päivitys. Maksimikoko päivitykselle on %d merkkiä." #: actions/apidirectmessagenew.php:146 msgid "Recipient user not found." @@ -181,7 +180,7 @@ msgstr "" "Et voi lähettää suoraa viestiä käyttäjälle, jonka kanssa et ole vielä kaveri." #: actions/apidirectmessage.php:89 -#, fuzzy, php-format +#, php-format msgid "Direct messages from %s" msgstr "Suorat viestit käyttäjälle %s" @@ -206,7 +205,6 @@ msgid "No status found with that ID." msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä." #: actions/apifavoritecreate.php:119 -#, fuzzy msgid "This status is already a favorite!" msgstr "Tämä päivitys on jo suosikki!" @@ -215,7 +213,6 @@ msgid "Could not create favorite." msgstr "Ei voitu lisätä suosikiksi." #: actions/apifavoritedestroy.php:122 -#, fuzzy msgid "That status is not a favorite!" msgstr "Tämä päivitys ei ole suosikki!" @@ -233,13 +230,12 @@ msgid "Could not follow user: %s is already on your list." msgstr "Ei voitu tilata käyttäjää: %s on jo listallasi" #: actions/apifriendshipsdestroy.php:109 -#, fuzzy msgid "Could not unfollow user: User not found." -msgstr "Ei voitu tilata käyttäjää: Käyttäjää ei löytynyt." +msgstr "Ei voitu lopettaa tilausta: Käyttäjää ei löytynyt." #: actions/apifriendshipsdestroy.php:120 msgid "You cannot unfollow yourself!" -msgstr "" +msgstr "Et voi lopettaa itsesi tilausta!" #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." @@ -315,7 +311,7 @@ msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)." #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." -msgstr "" +msgstr "Liikaa aliaksia. Maksimimäärä on %d." #: actions/apigroupcreate.php:312 actions/editgroup.php:224 #: actions/newgroup.php:168 @@ -332,16 +328,15 @@ msgstr "Alias \"%s\" on jo käytössä. Yritä toista aliasta." #: actions/apigroupcreate.php:334 actions/editgroup.php:234 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." -msgstr "" +msgstr "Alias ei voi olla sama kuin ryhmätunnus." #: actions/apigroupjoin.php:110 -#, fuzzy msgid "You are already a member of that group." -msgstr "Sinä kuulut jo tähän ryhmään " +msgstr "Sinä kuulut jo tähän ryhmään." #: 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 "Sinut on estetty osallistumasta tähän ryhmään ylläpitäjän toimesta." #: actions/apigroupjoin.php:138 #, fuzzy, php-format @@ -349,12 +344,11 @@ msgid "Could not join user %s to group %s." msgstr "Käyttäjää %s ei voinut liittää ryhmään %s" #: actions/apigroupleave.php:114 -#, fuzzy msgid "You are not a member of this group." msgstr "Sinä et kuulu tähän ryhmään." #: actions/apigroupleave.php:124 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %s to group %s." msgstr "Ei voitu poistaa käyttäjää %s ryhmästä %s" @@ -369,7 +363,7 @@ msgid "groups on %s" msgstr "Ryhmän toiminnot" #: actions/apigrouplist.php:95 -#, fuzzy, php-format +#, php-format msgid "%s's groups" msgstr "Käyttäjän %s ryhmät" @@ -387,9 +381,8 @@ msgid "You may not delete another user's status." msgstr "Et voi poistaa toisen käyttäjän päivitystä." #: actions/apistatusesshow.php:138 -#, fuzzy msgid "Status deleted." -msgstr "Kuva poistettu." +msgstr "Päivitys poistettu." #: actions/apistatusesshow.php:144 msgid "No status with that ID found." @@ -397,9 +390,9 @@ msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä." #: actions/apistatusesupdate.php:152 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 "Päivitys on liian pitkä. Maksimipituus on 140 merkkiä." +msgstr "Päivitys on liian pitkä. Maksimipituus on %d merkkiä." #: actions/apistatusesupdate.php:193 msgid "Not found" @@ -408,12 +401,11 @@ msgstr "Ei löytynyt" #: actions/apistatusesupdate.php:216 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." -msgstr "" +msgstr "Maksimikoko päivitykselle on %d merkkiä, mukaan lukien URL-osoite." #: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261 -#, fuzzy msgid "Unsupported format." -msgstr "Kuvatiedoston formaattia ei ole tuettu." +msgstr "Formaattia ei ole tuettu." #: actions/apitimelinefavorites.php:107 #, php-format @@ -489,7 +481,7 @@ msgid "Invalid size." msgstr "Koko ei kelpaa." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Kuva" @@ -537,7 +529,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:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: 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 @@ -605,9 +597,8 @@ msgid "A list of the users blocked from joining this group." msgstr "Lista ryhmän käyttäjistä." #: actions/blockedfromgroup.php:281 -#, fuzzy msgid "Unblock user from group" -msgstr "Käyttäjän eston poisto epäonnistui." +msgstr "Poista käyttäjän esto ryhmästä" #: actions/blockedfromgroup.php:313 lib/unblockform.php:150 msgid "Unblock" @@ -638,7 +629,7 @@ msgstr "Profiilia ei ole määritelty." msgid "No profile with that ID." msgstr "Ei profiilia tuolle ID:lle." -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "Estä käyttäjä" @@ -650,23 +641,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "Ei" #: actions/block.php:149 -msgid "Do not block this user from this group" -msgstr "Älä estä tätä käyttäjää tästä ryhmästä" +#, fuzzy +msgid "Do not block this user" +msgstr "Poista esto tältä käyttäjältä" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Kyllä" -#: actions/block.php:150 -#, fuzzy -msgid "Block this user from this group" -msgstr "Lista ryhmän käyttäjistä." +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" +msgstr "Estä tämä käyttäjä" #: actions/block.php:165 msgid "You have already blocked this user." @@ -802,9 +794,9 @@ msgid "Use this form to edit the group." msgstr "Käytä tätä lomaketta muokataksesi ryhmää." #: actions/editgroup.php:201 actions/newgroup.php:145 -#, fuzzy, php-format +#, php-format msgid "description is too long (max %d chars)." -msgstr "kuvaus on liian pitkä (max 140 merkkiä)." +msgstr "kuvaus on liian pitkä (max %d merkkiä)." #: actions/editgroup.php:253 msgid "Could not update group." @@ -1069,22 +1061,20 @@ msgid "A selection of some of the great users on %s" msgstr "Valikoima joitakin loistavia palvelun %s käyttäjiä" #: actions/file.php:34 -#, fuzzy msgid "No notice id" -msgstr "Uusi päivitys" +msgstr "Ei päivitystä id-tunnusta" #: actions/file.php:38 -#, fuzzy msgid "No notice" -msgstr "Uusi päivitys" +msgstr "Ei päivitystä" #: actions/file.php:42 msgid "No attachments" -msgstr "" +msgstr "Ei liitteitä" #: actions/file.php:51 msgid "No uploaded attachments" -msgstr "" +msgstr "Ei ladattuja liitteitä" #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1104,9 +1094,8 @@ msgid "That user has blocked you from subscribing." msgstr "Käyttäjä on estänyt sinua tilaamasta päivityksiä." #: actions/finishremotesubscribe.php:106 -#, fuzzy msgid "You are not authorized." -msgstr "Ei valtuutusta." +msgstr "Sinulla ei ole valtuutusta tähän." #: actions/finishremotesubscribe.php:109 #, fuzzy @@ -1129,20 +1118,17 @@ msgid "No such group." msgstr "Tuota ryhmää ei ole." #: actions/getfile.php:75 -#, fuzzy msgid "No such file." -msgstr "Päivitystä ei ole." +msgstr "Tiedostoa ei ole." #: actions/getfile.php:79 -#, fuzzy msgid "Cannot read file." -msgstr "Tiedosto hävisi." +msgstr "Tiedostoa ei voi lukea." #: actions/groupblock.php:81 actions/groupunblock.php:81 #: actions/makeadmin.php:81 -#, fuzzy msgid "No group specified." -msgstr "Profiilia ei ole määritelty." +msgstr "Ryhmää ei ole määritelty." #: actions/groupblock.php:91 msgid "Only an admin can block group members." @@ -1163,7 +1149,7 @@ msgstr "Sinä et kuulu tähän ryhmään." msgid "Block user from group" msgstr "Estä käyttäjä" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1171,7 +1157,15 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +msgid "Do not block this user from this group" +msgstr "Älä estä tätä käyttäjää tästä ryhmästä" + +#: actions/groupblock.php:179 +msgid "Block this user from this group" +msgstr "Estä tätä käyttäjää osallistumassa tähän ryhmään" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1180,9 +1174,9 @@ msgid "No ID" msgstr "ID-tunnusta ei ole" #: actions/groupdesignsettings.php:68 -#, fuzzy msgid "You must be logged in to edit a group." -msgstr "Sinun pitää olla kirjautunut sisään jotta voit luoda ryhmän." +msgstr "" +"Sinun pitää olla kirjautunut sisään, jotta voit muuttaa ryhmän tietoja." #: actions/groupdesignsettings.php:141 #, fuzzy @@ -1235,7 +1229,7 @@ msgstr "Logo päivitetty." msgid "Failed updating logo." msgstr "Logon päivittäminen epäonnistui." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "Ryhmän %s jäsenet" @@ -1249,7 +1243,7 @@ msgstr "Ryhmän %s jäsenet, sivu %d" msgid "A list of the users in this group." msgstr "Lista ryhmän käyttäjistä." -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "Ylläpito" @@ -1257,14 +1251,9 @@ msgstr "Ylläpito" msgid "Block" msgstr "Estä" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "Estä tämä käyttäjä" - #: actions/groupmembers.php:441 -#, fuzzy msgid "Make user an admin of the group" -msgstr "Sinun pitää olla ylläpitäjä, jotta voit muokata ryhmää" +msgstr "Tee tästä käyttäjästä ylläpitäjä" #: actions/groupmembers.php:473 #, fuzzy @@ -1273,7 +1262,7 @@ msgstr "Ylläpito" #: actions/groupmembers.php:473 msgid "Make this user an admin" -msgstr "" +msgstr "Tee tästä käyttäjästä ylläpitäjä" #: actions/grouprss.php:133 #, fuzzy, php-format @@ -1296,9 +1285,8 @@ msgstr "Ryhmähaku" #: actions/groupsearch.php:79 actions/noticesearch.php:117 #: actions/peoplesearch.php:83 -#, fuzzy msgid "No results." -msgstr "Ei hakutuloksia" +msgstr "Ei tuloksia" #: actions/groupsearch.php:82 #, php-format @@ -1340,7 +1328,7 @@ msgstr "Luo uusi ryhmä" #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." -msgstr "" +msgstr "Vain ylläpitäjä voi poistaa eston ryhmän jäseniltä." #: actions/groupunblock.php:95 #, fuzzy @@ -1676,7 +1664,7 @@ msgid "Nickname" msgstr "Tunnus" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Salasana" @@ -1766,9 +1754,8 @@ msgid "" msgstr "Älä lähetä viestiä itsellesi, vaan kuiskaa se vain hiljaa itsellesi." #: actions/newmessage.php:181 -#, fuzzy msgid "Message sent" -msgstr "Viesti" +msgstr "Viesti lähetetty" #: actions/newmessage.php:185 lib/command.php:375 #, php-format @@ -1860,7 +1847,7 @@ msgstr "Yhdistä" #: actions/oembed.php:160 msgid "Only " -msgstr "" +msgstr "Vain " #: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 #: lib/api.php:991 lib/api.php:1101 @@ -1885,7 +1872,7 @@ msgstr "Hallinnoi muita asetuksia." #: actions/othersettings.php:117 msgid "Shorten URLs with" -msgstr "" +msgstr "Lyhennä URL-osoitteita" #: actions/othersettings.php:118 msgid "Automatic shortening service to use." @@ -1922,60 +1909,65 @@ msgstr "Tämä on postilaatikkosi, jossa on lähettämäsi yksityisviestit." msgid "Change password" msgstr "Vaihda salasana" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Vaihda salasanasi" + +#: actions/passwordsettings.php:82 msgid "Change your password." msgstr "Vaihda salasanasi." -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 msgid "Password change" msgstr "Salasanan vaihto" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Vanha salasana" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Uusi salasana" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 tai useampia merkkejä" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Vahvista" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "sama salasana kuin yllä" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Vaihda" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Salasanassa pitää olla 6 tai useampia merkkejä." -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Salasanat eivät täsmää." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Väärä vanha salasana" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Virhe tapahtui käyttäjän tallentamisessa; epäkelpo." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Uutta salasanaa ei voida tallentaa." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Salasana tallennettu." @@ -2049,14 +2041,13 @@ msgid "URL of your homepage, blog, or profile on another site" msgstr "Kotisivusi, blogisi tai toisella sivustolla olevan profiilisi osoite." #: actions/profilesettings.php:122 actions/register.php:460 -#, fuzzy, php-format +#, php-format msgid "Describe yourself and your interests in %d chars" -msgstr "Kuvaile itseäsi ja kiinnostuksiasi 140 merkillä" +msgstr "Kuvaile itseäsi ja kiinnostuksen kohteitasi %d merkillä" #: actions/profilesettings.php:125 actions/register.php:463 -#, fuzzy msgid "Describe yourself and your interests" -msgstr "Kuvaile itseäsi ja" +msgstr "Kuvaile itseäsi ja kiinnostuksen kohteitasi" #: actions/profilesettings.php:127 actions/register.php:465 msgid "Bio" @@ -2282,7 +2273,7 @@ msgstr "" #: actions/recoverpassword.php:191 msgid "Nickname or email address" -msgstr "" +msgstr "Käyttäjätunnus tai sähköpostiosoite" #: actions/recoverpassword.php:193 msgid "Your nickname on this server, or your registered email address." @@ -2421,7 +2412,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:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Sähköposti" @@ -2661,7 +2652,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "Ryhmä %s" @@ -2713,7 +2704,7 @@ msgstr "Päivityssyöte ryhmälle %s" msgid "FOAF for %s group" msgstr "Käyttäjän %s lähetetyt viestit" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "Jäsenet" @@ -3364,40 +3355,40 @@ 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:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profiili" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Vaihda profiiliasetuksesi" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "Lataa kuva" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Vaihda salasanasi" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Muuta sähköpostin käsittelyasetuksia." -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "Käyttäjän profiili" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Muut" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "Muita asetuksia" @@ -3990,35 +3981,35 @@ msgstr "" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Ryhmä" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Estä" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Estä käyttäjä" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "Muokkaa %s ryhmän ominaisuuksia" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "Logo" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "Lisää ryhmälle %s logo tai muokkaa sitä " -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, fuzzy, php-format msgid "Add or edit %s design" msgstr "Lisää ryhmälle %s logo tai muokkaa sitä " @@ -4225,7 +4216,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4249,7 +4240,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4647,47 +4638,47 @@ msgstr "Lähetä suora viesti tälle käyttäjälle" msgid "Message" msgstr "Viesti" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "muutama sekunti sitten" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "noin minuutti sitten" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "noin %d minuuttia sitten" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "noin tunti sitten" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "noin %d tuntia sitten" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "noin päivä sitten" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "noin %d päivää sitten" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "noin kuukausi sitten" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "noin %d kuukautta sitten" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "noin vuosi sitten" diff --git a/locale/fr/LC_MESSAGES/statusnet.mo b/locale/fr/LC_MESSAGES/statusnet.mo index ca1b457b1..59b7812fc 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 a31cc3e03..7507e44db 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/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-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:10+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:03+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); 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" @@ -482,7 +482,7 @@ msgid "Invalid size." msgstr "Taille incorrecte." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Avatar" @@ -530,7 +530,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:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -631,7 +631,7 @@ msgstr "Aucun profil n'a été spécifié." msgid "No profile with that ID." msgstr "Aucun profil ne correspond à cet identifiant." -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "Bloquer cet utilisateur" @@ -646,24 +646,24 @@ msgstr "" "vous ne serez pas informé des @-réponses de sa part." #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "Non" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "Liste des utilisateurs inscrits à ce groupe." +msgid "Do not block this user" +msgstr "Débloquer cet utilisateur" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Oui" -#: actions/block.php:150 -#, fuzzy -msgid "Block this user from this group" -msgstr "Liste des utilisateurs inscrits à ce groupe." +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" +msgstr "Bloquer cet utilisateur " #: actions/block.php:165 msgid "You have already blocked this user." @@ -1157,7 +1157,7 @@ msgstr "L'utilisateur n'est pas membre du groupe." msgid "Block user from group" msgstr "Bloquer cet utilisateur du groupe" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1165,7 +1165,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "Liste des utilisateurs inscrits à ce groupe." + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "Liste des utilisateurs inscrits à ce groupe." + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1229,7 +1239,7 @@ msgstr "Logo mis à jour." msgid "Failed updating logo." msgstr "La mise à jour du logo a échoué." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "Membres du groupe %s" @@ -1243,7 +1253,7 @@ msgstr "Membres du groupe %s - page %d" msgid "A list of the users in this group." msgstr "Liste des utilisateurs inscrits à ce groupe." -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "Administrer" @@ -1251,10 +1261,6 @@ msgstr "Administrer" msgid "Block" msgstr "Bloquer" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "Bloquer cet utilisateur " - #: actions/groupmembers.php:441 msgid "Make user an admin of the group" msgstr "Faire de cet utilisateur un administrateur du groupe" @@ -1673,7 +1679,7 @@ msgid "Nickname" msgstr "Pseudo" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Mot de passe" @@ -1920,60 +1926,65 @@ msgstr "" msgid "Change password" msgstr "Modifier le mot de passe" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Modifier votre mot de passe" + +#: actions/passwordsettings.php:82 msgid "Change your password." msgstr "Modifier votre mot de passe." -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 msgid "Password change" msgstr "Modification du mot de passe" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Ancien mot de passe" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Nouveau mot de passe" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 caractères ou plus" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirmer" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "identique au mot de passe ci-dessus" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Modifier" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 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:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Les mots de passe ne correspondent pas." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Ancien mot de passe incorrect" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Erreur lors de l'enregistrement de l'utilisateur ; invalide." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Impossible de sauvegarder le nouveau mot de passe." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Mot de passe enregistré." @@ -2426,7 +2437,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:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Courriel" @@ -2662,7 +2673,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "Groupe %s" @@ -2714,7 +2725,7 @@ msgstr "Fil des statuts du groupe %s" msgid "FOAF for %s group" msgstr "Boîte d'envoi de %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "Membres" @@ -3365,39 +3376,39 @@ 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:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Modifier vos paramètres de profil" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "Ajouter un avatar" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Modifier votre mot de passe" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Modifier le traitement des courriels" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "Conception" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 msgid "Design your profile" msgstr "Concevez votre profile" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Autres " -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "Autres options " @@ -3993,34 +4004,34 @@ msgstr "Emplacement du groupe, s'il y a lieu \"Ville, État ou région, Pays\"" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Groupe" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 msgid "Blocked" msgstr "Bloqué" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, php-format msgid "%s blocked users" msgstr "%s utilisateurs bloqués" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "Modifier les propriétés du groupe %s" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "Logo" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "Ajouter ou modifier le logo de %s" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "Ajouter ou modifier la conception de %s" @@ -4237,7 +4248,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4261,7 +4272,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4666,47 +4677,47 @@ msgstr "Envoyer un message à cet utilisateur" msgid "Message" msgstr "Message " -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "il y a quelques secondes " -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "il y a 1 minute" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "il y a %d minutes" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "il y a 1 heure" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "il y a %d heures" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "il y a 1 jour" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "il y a %d jours" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "il y a 1 mois" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "il y a %d mois" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "il y a environ 1 an" diff --git a/locale/ga/LC_MESSAGES/statusnet.mo b/locale/ga/LC_MESSAGES/statusnet.mo index e419f3b44..bf827fd68 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 0433383fe..294ef6f94 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-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:13+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:05+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); 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" @@ -486,7 +486,7 @@ msgid "Invalid size." msgstr "Tamaño inválido." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Avatar" @@ -536,7 +536,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:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: 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 @@ -638,7 +638,7 @@ msgstr "Non se especificou ningún perfil." msgid "No profile with that ID." msgstr "Non se atopou un perfil con ese ID." -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "Bloquear usuario" @@ -653,22 +653,25 @@ msgstr "" "ser notificado de ningunha resposta-@ del." #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "No" #: actions/block.php:149 -msgid "Do not block this user from this group" -msgstr "" +#, fuzzy +msgid "Do not block this user" +msgstr "Bloquear usuario" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Si" -#: actions/block.php:150 -msgid "Block this user from this group" -msgstr "" +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +#, fuzzy +msgid "Block this user" +msgstr "Bloquear usuario" #: actions/block.php:165 msgid "You have already blocked this user." @@ -1171,7 +1174,7 @@ msgstr "%1s non é unha orixe fiable." msgid "Block user from group" msgstr "Bloquear usuario" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, fuzzy, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1182,7 +1185,15 @@ msgstr "" "do teur perfil, non será capaz de suscribirse a ti nun futuro, e non vas a " "ser notificado de ningunha resposta-@ del." -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +msgid "Do not block this user from this group" +msgstr "" + +#: actions/groupblock.php:179 +msgid "Block this user from this group" +msgstr "" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1247,7 +1258,7 @@ msgstr "Avatar actualizado." msgid "Failed updating logo." msgstr "Acounteceu un fallo ó actualizar o avatar." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "" @@ -1261,7 +1272,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1269,11 +1280,6 @@ msgstr "" msgid "Block" msgstr "Bloquear" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -#, fuzzy -msgid "Block this user" -msgstr "Bloquear usuario" - #: actions/groupmembers.php:441 msgid "Make user an admin of the group" msgstr "" @@ -1686,7 +1692,7 @@ msgid "Nickname" msgstr "Alcume" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Contrasinal" @@ -1933,62 +1939,67 @@ msgstr "" msgid "Change password" msgstr "Cambiar contrasinal" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Cambiar contrasinal" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "Cambiar contrasinal" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Contrasinal gardada." -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Contrasinal antiga" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Nova contrasinal" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 ou máis caracteres" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirmar" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "igual á contrasinal de enriba" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Modificado" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 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:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "As contrasinais non coinciden" -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Contrasinal actual incorrecta" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Acounteceu un erro gardando o usuario: é inválido." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Non se pode gardar a contrasinal." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Contrasinal gardada." @@ -2445,7 +2456,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:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Correo Electrónico" @@ -2678,7 +2689,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "" @@ -2733,7 +2744,7 @@ msgstr "Fonte de chíos para %s" msgid "FOAF for %s group" msgstr "Band. Saída para %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "Membro dende" @@ -3401,41 +3412,41 @@ 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:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Perfil" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Configuración de perfil" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 #, fuzzy msgid "Upload an avatar" msgstr "Acounteceu un fallo ó actualizar o avatar." -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Cambiar contrasinal" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Cambiar a xestión de email" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "O usuario non ten perfil." -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Outros" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "Outras opcions" @@ -4072,36 +4083,36 @@ msgstr "¿Onde estas, coma \"Cidade, Provincia, País\"" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Bloquear" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Bloquear usuario" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 #, fuzzy msgid "Logo" msgstr "Sair" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "" @@ -4320,7 +4331,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4344,7 +4355,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4772,47 +4783,47 @@ msgstr "Non podes enviar mensaxes a este usurio." msgid "Message" msgstr "Nova mensaxe" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "fai uns segundos" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "fai un minuto" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "fai %d minutos" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "fai unha hora" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "fai %d horas" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "fai un día" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "fai %d días" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "fai un mes" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "fai %d meses" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "fai un ano" diff --git a/locale/he/LC_MESSAGES/statusnet.mo b/locale/he/LC_MESSAGES/statusnet.mo index 700f4c5ce..faaf5f29b 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 7c043a5b3..902e4a5c0 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-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:16+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:08+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); 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" @@ -482,7 +482,7 @@ msgid "Invalid size." msgstr "גודל לא חוקי." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "תמונה" @@ -532,7 +532,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:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: 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 @@ -634,7 +634,7 @@ msgstr "" msgid "No profile with that ID." msgstr "" -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 #, fuzzy msgid "Block user" msgstr "אין משתמש כזה." @@ -647,23 +647,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "לא" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "נכשלה ההפניה לשרת: %s" +msgid "Do not block this user" +msgstr "אין משתמש כזה." #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "כן" -#: actions/block.php:150 +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 #, fuzzy -msgid "Block this user from this group" +msgid "Block this user" msgstr "אין משתמש כזה." #: actions/block.php:165 @@ -1155,7 +1156,7 @@ msgstr "לא שלחנו אלינו את הפרופיל הזה" msgid "Block user from group" msgstr "אין משתמש כזה." -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1163,7 +1164,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "נכשלה ההפניה לשרת: %s" + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "אין משתמש כזה." + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1227,7 +1238,7 @@ msgstr "התמונה עודכנה." msgid "Failed updating logo." msgstr "עדכון התמונה נכשל." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "" @@ -1241,7 +1252,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1249,11 +1260,6 @@ msgstr "" msgid "Block" msgstr "" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -#, fuzzy -msgid "Block this user" -msgstr "אין משתמש כזה." - #: actions/groupmembers.php:441 msgid "Make user an admin of the group" msgstr "" @@ -1634,7 +1640,7 @@ msgid "Nickname" msgstr "כינוי" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "סיסמה" @@ -1876,62 +1882,66 @@ msgstr "" msgid "Change password" msgstr "שנה סיסמה" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +msgid "You are not allowed to change your password" +msgstr "" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "שנה סיסמה" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "הסיסמה נשמרה." -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "סיסמה ישנה" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "סיסמה חדשה" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "לפחות 6 אותיות" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "אשר" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "זהה לסיסמה למעלה" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "שנה" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "הסיסמאות לא תואמות." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "הסיסמה הישנה לא נכונה" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "שגיאה בשמירת שם המשתמש, לא עומד בכללים." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "לא ניתן לשמור את הסיסמה" -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "הסיסמה נשמרה." @@ -2366,7 +2376,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "" @@ -2578,7 +2588,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "" @@ -2632,7 +2642,7 @@ msgstr "הזנת הודעות של %s" msgid "FOAF for %s group" msgstr "הזנת הודעות של %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "חבר מאז" @@ -3274,41 +3284,41 @@ msgstr "שגיאת מסד נתונים בהכנסת התגובה: %s" msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "פרופיל" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 #, fuzzy msgid "Upload an avatar" msgstr "עדכון התמונה נכשל." -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "למשתמש אין פרופיל." -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "" @@ -3908,36 +3918,36 @@ msgstr "מיקומך, למשל \"עיר, מדינה או מחוז, ארץ\"" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "אין משתמש כזה." -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "אין משתמש כזה." -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 #, fuzzy msgid "Logo" msgstr "צא" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "" @@ -4133,7 +4143,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4157,7 +4167,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4565,47 +4575,47 @@ msgstr "" msgid "Message" msgstr "הודעה חדשה" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "לפני מספר שניות" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "לפני כדקה" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "לפני כ-%d דקות" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "לפני כשעה" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "לפני כ-%d שעות" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "לפני כיום" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "לפני כ-%d ימים" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "לפני כחודש" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "לפני כ-%d חודשים" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "לפני כשנה" diff --git a/locale/is/LC_MESSAGES/statusnet.mo b/locale/is/LC_MESSAGES/statusnet.mo index f1850515b..eaf63735e 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 c4fad2f35..c0bef7ddf 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-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:18+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:10+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); 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" @@ -474,7 +474,7 @@ msgid "Invalid size." msgstr "Ótæk stærð." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Mynd" @@ -522,7 +522,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:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: 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 @@ -620,7 +620,7 @@ msgstr "Engin persónuleg síða tilgreind" msgid "No profile with that ID." msgstr "Engin persónulega síða með þessu einkenni" -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "Loka á notanda" @@ -632,22 +632,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "Nei" #: actions/block.php:149 -msgid "Do not block this user from this group" -msgstr "" +#, fuzzy +msgid "Do not block this user" +msgstr "Opna á þennan notanda" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Já" -#: actions/block.php:150 -msgid "Block this user from this group" -msgstr "" +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" +msgstr "Loka á þennan notanda" #: actions/block.php:165 msgid "You have already blocked this user." @@ -1132,7 +1134,7 @@ msgstr "" msgid "Block user from group" msgstr "" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1140,7 +1142,15 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +msgid "Do not block this user from this group" +msgstr "" + +#: actions/groupblock.php:179 +msgid "Block this user from this group" +msgstr "" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1199,7 +1209,7 @@ msgstr "Einkennismynd uppfærð." msgid "Failed updating logo." msgstr "Tókst ekki að uppfæra einkennismynd" -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "Hópmeðlimir %s" @@ -1213,7 +1223,7 @@ msgstr "Hópmeðlimir %s, síða %d" msgid "A list of the users in this group." msgstr "Listi yfir notendur í þessum hóp." -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "Stjórnandi" @@ -1221,10 +1231,6 @@ msgstr "Stjórnandi" msgid "Block" msgstr "Loka" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "Loka á þennan notanda" - #: actions/groupmembers.php:441 msgid "Make user an admin of the group" msgstr "" @@ -1632,7 +1638,7 @@ msgid "Nickname" msgstr "Stuttnefni" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Lykilorð" @@ -1879,60 +1885,65 @@ msgstr "" msgid "Change password" msgstr "Breyta lykilorði" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Breyta lykilorðinu þínu" + +#: actions/passwordsettings.php:82 msgid "Change your password." msgstr "Breyta lykilorðinu þínu." -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 msgid "Password change" msgstr "Lykilorðabreyting" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Eldra lykilorð" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Nýtt lykilorð" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 eða fleiri tákn" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Staðfesta" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "sama og lykilorðið hér fyrir ofan" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Breyta" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 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:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Lykilorðin passa ekki saman." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Rangt eldra lykilorð" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Villa kom upp í vistun notanda: ótækt." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Get ekki vistað nýja lykilorðið." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Lykilorð vistað." @@ -2373,7 +2384,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:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Tölvupóstur" @@ -2605,7 +2616,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "%s hópurinn" @@ -2657,7 +2668,7 @@ msgstr "" msgid "FOAF for %s group" msgstr "%s hópurinn" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "Meðlimir" @@ -3293,39 +3304,39 @@ msgstr "Gagnagrunnsvilla við innsetningu svars: %s" msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Persónuleg síða" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Breyta persónulegu stillingunum þínum" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "Hlaða upp einkennismynd" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Breyta lykilorðinu þínu" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Breyta tölvupóstumsjón" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 msgid "Design your profile" msgstr "" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Annað" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "Aðrir valkostir" @@ -3911,34 +3922,34 @@ msgstr "Staðsetning hópsins, ef einhver, eins og \"Borg, landshluti, land\"" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Hópur" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 msgid "Blocked" msgstr "" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, php-format msgid "%s blocked users" msgstr "" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "Breyta hópstillingum %s" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "Einkennismerki" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "Bæta við eða breyta einkennismerki %s" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "" @@ -4136,7 +4147,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4160,7 +4171,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4553,47 +4564,47 @@ msgstr "Senda bein skilaboð til þessa notanda" msgid "Message" msgstr "Skilaboð" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "fyrir nokkrum sekúndum" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "fyrir um einni mínútu síðan" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "fyrir um %d mínútum síðan" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "fyrir um einum klukkutíma síðan" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "fyrir um %d klukkutímum síðan" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "fyrir um einum degi síðan" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "fyrir um %d dögum síðan" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "fyrir um einum mánuði síðan" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "fyrir um %d mánuðum síðan" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "fyrir um einu ári síðan" diff --git a/locale/it/LC_MESSAGES/statusnet.mo b/locale/it/LC_MESSAGES/statusnet.mo index 29a83753a..1e33d6b95 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 e1ce3066d..06a8a0a12 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-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:21+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:13+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); 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" @@ -483,7 +483,7 @@ msgid "Invalid size." msgstr "Dimensione non valida." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Immagine" @@ -531,7 +531,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:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -631,7 +631,7 @@ msgstr "Nessun profilo specificato." msgid "No profile with that ID." msgstr "Nessun profilo con quel ID." -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "Blocca utente" @@ -643,24 +643,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "No" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "Un elenco degli utenti in questo gruppo." +msgid "Do not block this user" +msgstr "Sblocca questo utente" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Sì" -#: actions/block.php:150 -#, fuzzy -msgid "Block this user from this group" -msgstr "Un elenco degli utenti in questo gruppo." +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" +msgstr "Blocca questo utente" #: actions/block.php:165 msgid "You have already blocked this user." @@ -1161,7 +1161,7 @@ msgstr "Non sei un membro di quel gruppo." msgid "Block user from group" msgstr "Blocca utente" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1169,7 +1169,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "Un elenco degli utenti in questo gruppo." + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "Un elenco degli utenti in questo gruppo." + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1234,7 +1244,7 @@ msgstr "Logo aggiornato." msgid "Failed updating logo." msgstr "Errore nell'aggiornare il logo." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "Membri del gruppo %s" @@ -1248,7 +1258,7 @@ msgstr "Membri del gruppo %s, pagina %d" msgid "A list of the users in this group." msgstr "Un elenco degli utenti in questo gruppo." -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "Amministra" @@ -1256,10 +1266,6 @@ msgstr "Amministra" msgid "Block" msgstr "Blocca" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "Blocca questo utente" - #: actions/groupmembers.php:441 #, fuzzy msgid "Make user an admin of the group" @@ -1673,7 +1679,7 @@ msgid "Nickname" msgstr "Soprannome" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Password" @@ -1919,60 +1925,65 @@ msgstr "" msgid "Change password" msgstr "Modifica password" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Modifica la tua password" + +#: actions/passwordsettings.php:82 msgid "Change your password." msgstr "Modifica la tua password." -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 msgid "Password change" msgstr "Cambio password" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Vecchia password" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Nuova password" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 o più caratteri" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Conferma" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "stessa password di sopra" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Modifica" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 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:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Le password non corrispondono." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Vecchia password non corretta" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Errore nel salvare l'utente; non valido." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Impossibile salvare la nuova password." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Password salvata." @@ -2416,7 +2427,7 @@ msgid "Same as password above. Required." msgstr "Stessa password di sopra. Richiesta." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Email" @@ -2649,7 +2660,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "Gruppi di %s" @@ -2701,7 +2712,7 @@ msgstr "Feed dei messaggi per il gruppo %s" msgid "FOAF for %s group" msgstr "Casella posta inviata di %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "Membri" @@ -3353,40 +3364,40 @@ 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:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profilo" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Modifica le impostazioni del tuo profilo" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "Carica un'immagine" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Modifica la tua password" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Modifica la gestione dell'email" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "Profilo utente" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Altro" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "Altre opzioni" @@ -3977,35 +3988,35 @@ msgstr "Dove è situato il gruppo, tipo \"città, regione, stato\"" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Gruppo" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Blocca" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Blocca utente" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "Modifica le proprietà del gruppo %s" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "Logo" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "Aggiungi o modifica il logo di %s" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, fuzzy, php-format msgid "Add or edit %s design" msgstr "Aggiungi o modifica il logo di %s" @@ -4208,7 +4219,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4232,7 +4243,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4630,47 +4641,47 @@ msgstr "Invia un messaggio diretto a questo utente" msgid "Message" msgstr "Messaggio" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "pochi secondi fa" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "circa un minuto fa" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "circa %d minuti fa" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "circa un'ora fa" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "circa %d ore fa" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "circa un giorno fa" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "circa %d giorni fa" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "circa un mese fa" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "circa %d mesi fa" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "circa un anno fa" diff --git a/locale/ja/LC_MESSAGES/statusnet.mo b/locale/ja/LC_MESSAGES/statusnet.mo index c0931726b..9bbc582ac 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 409d64b0a..fd22e5177 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-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:23+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:16+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); 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" @@ -485,7 +485,7 @@ msgid "Invalid size." msgstr "不正なサイズ。" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "アバター" @@ -534,7 +534,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:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: 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 @@ -635,7 +635,7 @@ msgstr "" msgid "No profile with that ID." msgstr "" -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 #, fuzzy msgid "Block user" msgstr "そのようなユーザはいません。" @@ -648,23 +648,23 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "サーバへリダイレクトできません : %s" +msgid "Do not block this user" +msgstr "このユーザをアンブロックする" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "" -#: actions/block.php:150 -#, fuzzy -msgid "Block this user from this group" +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" msgstr "このユーザをブロックする" #: actions/block.php:165 @@ -1160,7 +1160,7 @@ msgstr "そのプロファイルは送信されていません。" msgid "Block user from group" msgstr "そのようなユーザはいません。" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1168,7 +1168,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "サーバへリダイレクトできません : %s" + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "このユーザをブロックする" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1231,7 +1241,7 @@ msgstr "アバターが更新されました。" msgid "Failed updating logo." msgstr "アバターの更新に失敗しました。" -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "" @@ -1245,7 +1255,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "管理者" @@ -1253,10 +1263,6 @@ msgstr "管理者" msgid "Block" msgstr "ブロック" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "このユーザをブロックする" - #: actions/groupmembers.php:441 msgid "Make user an admin of the group" msgstr "" @@ -1662,7 +1668,7 @@ msgid "Nickname" msgstr "ニックネーム" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "パスワード" @@ -1900,62 +1906,67 @@ msgstr "" msgid "Change password" msgstr "パスワードの変更" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "パスワードの変更" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "パスワードの変更" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "パスワードが保存されました。" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "古いパスワード" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "新しいパスワード" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6文字以上" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "確認" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "上のパスワードと同じ" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "変更" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "パスワードが一致しません。" -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "古いパスワードが間違っています。" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "ユーザ保存エラー; 不正なユーザ" -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "新しいパスワードを保存できません。" -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "パスワードが保存されました。" @@ -2392,7 +2403,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "メール" @@ -2622,7 +2633,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "" @@ -2676,7 +2687,7 @@ msgstr "%sの通知フィード" msgid "FOAF for %s group" msgstr "%sの通知フィード" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "からのメンバー" @@ -3312,40 +3323,40 @@ msgstr "返信を追加する際にデータベースエラー : %s" msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "プロファイル" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "プロファイル設定の変更" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "アバターのアップロード" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "パスワードの変更" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "メールの扱いを変更" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "プロファイルがありません。" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "その他" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "その他のオプション" @@ -3940,35 +3951,35 @@ msgstr "いる場所, 例えば \"City, State (or Region), Country\"" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "グループ" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "ブロック" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "そのようなユーザはいません。" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "%s グループプロパティを編集" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "ロゴ" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "%s ロゴの追加や編集" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, fuzzy, php-format msgid "Add or edit %s design" msgstr "%s ロゴの追加や編集" @@ -4161,7 +4172,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4185,7 +4196,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4585,47 +4596,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "数秒前" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "約 1 分前" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "約 %d 分前" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "約 1 時間前" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "約 %d 時間前" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "約 1 日前" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "約 %d 日前" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "約 1 ヵ月前" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "約 %d ヵ月前" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "約 1 年前" diff --git a/locale/ko/LC_MESSAGES/statusnet.mo b/locale/ko/LC_MESSAGES/statusnet.mo index bb916d356..b2e5f3d92 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 1c8b2350b..f521a9f09 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-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:26+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:19+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); 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" @@ -483,7 +483,7 @@ msgid "Invalid size." msgstr "옳지 않은 크기" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "아바타" @@ -531,7 +531,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:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -631,7 +631,7 @@ msgstr "프로필을 지정하지 않았습니다." msgid "No profile with that ID." msgstr "해당 ID의 프로필이 없습니다." -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "사용자를 차단합니다." @@ -643,24 +643,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "아니오" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "이 그룹의 회원리스트" +msgid "Do not block this user" +msgstr "이 사용자를 차단해제합니다." #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "네, 맞습니다." -#: actions/block.php:150 -#, fuzzy -msgid "Block this user from this group" -msgstr "이 그룹의 회원리스트" +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" +msgstr "이 사용자 차단하기" #: actions/block.php:165 msgid "You have already blocked this user." @@ -1155,7 +1155,7 @@ msgstr "당신은 해당 그룹의 멤버가 아닙니다." msgid "Block user from group" msgstr "사용자를 차단합니다." -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1163,7 +1163,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "이 그룹의 회원리스트" + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "이 그룹의 회원리스트" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1228,7 +1238,7 @@ msgstr "로고를 업데이트했습니다." msgid "Failed updating logo." msgstr "로고 업데이트에 실패했습니다." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "%s 그룹 회원" @@ -1242,7 +1252,7 @@ msgstr "%s 그룹 회원, %d페이지" msgid "A list of the users in this group." msgstr "이 그룹의 회원리스트" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "관리자" @@ -1250,10 +1260,6 @@ msgstr "관리자" msgid "Block" msgstr "차단하기" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "이 사용자 차단하기" - #: actions/groupmembers.php:441 #, fuzzy msgid "Make user an admin of the group" @@ -1655,7 +1661,7 @@ msgid "Nickname" msgstr "별명" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "비밀 번호" @@ -1898,60 +1904,65 @@ msgstr "당신의 보낸 쪽지함입니다. 이곳엔 당신이 보냈던 비 msgid "Change password" msgstr "비밀번호 바꾸기" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "비밀번호 바꾸기" + +#: actions/passwordsettings.php:82 msgid "Change your password." msgstr "비밀번호를 변경하세요." -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 msgid "Password change" msgstr "비밀번호 변경" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "기존 비밀 번호" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "새로운 비밀 번호" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6글자 이상" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "인증" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "위 비밀번호와 동일하게" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "변환" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "비밀번호는 6자리 이상이어야 합니다." -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "비밀 번호가 일치하지 않습니다." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "기존 비밀 번호가 틀렸습니다" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "사용자 저장 오류; 무효한 사용자" -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "새 비밀번호를 저장 할 수 없습니다." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "비밀 번호 저장" @@ -2390,7 +2401,7 @@ msgid "Same as password above. Required." msgstr "위와 같은 비밀 번호. 필수 사항." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "이메일" @@ -2620,7 +2631,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "%s 그룹" @@ -2672,7 +2683,7 @@ msgstr "%s 그룹을 위한 공지피드" msgid "FOAF for %s group" msgstr "%s의 보낸쪽지함" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "회원" @@ -3318,40 +3329,40 @@ msgstr "답신을 추가 할 때에 데이타베이스 에러 : %s" msgid "Welcome to %1$s, @%2$s!" msgstr "%2$s에서 %1$s까지 메시지" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "프로필" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "프로필 세팅 바꾸기" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "아바타를 업로드하세요." -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "비밀번호 바꾸기" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "이메일 처리 변경" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "이용자 프로필" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "기타" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "다른 옵션들" @@ -3942,35 +3953,35 @@ msgstr "그룹의 위치, \"시/군/구, 도, 나라\"" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "그룹" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "차단하기" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "사용자를 차단합니다." -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "%s 그룹 속성 편집" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "로고" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "%s logo 추가 혹은 수정" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, fuzzy, php-format msgid "Add or edit %s design" msgstr "%s logo 추가 혹은 수정" @@ -4165,7 +4176,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4189,7 +4200,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4587,47 +4598,47 @@ msgstr "이 회원에게 직접 메시지를 보냅니다." msgid "Message" msgstr "메시지" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "몇 초 전" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "1분 전" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "%d분 전" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "1시간 전" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "%d시간 전" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "하루 전" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "%d일 전" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "1달 전" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "%d달 전" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "1년 전" diff --git a/locale/mk/LC_MESSAGES/statusnet.mo b/locale/mk/LC_MESSAGES/statusnet.mo index 37f92cabd..3914f339c 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 558b936d8..91f7eaebe 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-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:29+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:21+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); 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" @@ -483,7 +483,7 @@ msgid "Invalid size." msgstr "Погрешна големина." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Аватар" @@ -532,7 +532,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:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: 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 @@ -633,7 +633,7 @@ msgstr "" msgid "No profile with that ID." msgstr "" -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 #, fuzzy msgid "Block user" msgstr "Нема таков корисник." @@ -646,23 +646,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "Не може да се пренасочи кон серверот: %s" +msgid "Do not block this user" +msgstr "Нема таков корисник." #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "" -#: actions/block.php:150 +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 #, fuzzy -msgid "Block this user from this group" +msgid "Block this user" msgstr "Нема таков корисник." #: actions/block.php:165 @@ -1153,7 +1154,7 @@ msgstr "Не ни го испративте тој профил." msgid "Block user from group" msgstr "Нема таков корисник." -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1161,7 +1162,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "Не може да се пренасочи кон серверот: %s" + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "Нема таков корисник." + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1224,7 +1235,7 @@ msgstr "Аватарот е ажуриран." msgid "Failed updating logo." msgstr "Товарањето на аватарот не успеа." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "" @@ -1238,7 +1249,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1246,11 +1257,6 @@ msgstr "" msgid "Block" msgstr "" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -#, fuzzy -msgid "Block this user" -msgstr "Нема таков корисник." - #: actions/groupmembers.php:441 msgid "Make user an admin of the group" msgstr "" @@ -1632,7 +1638,7 @@ msgid "Nickname" msgstr "Прекар" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Лозинка" @@ -1876,62 +1882,66 @@ msgstr "" msgid "Change password" msgstr "Промени ја лозинката" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +msgid "You are not allowed to change your password" +msgstr "" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "Промени ја лозинката" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Лозинката е снимена." -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Стара лозинка" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Нова лозинка" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 или повеќе знаци" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Потврди" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "исто како лозинката погоре" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Промени" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Лозинките не се совпаѓаат." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Неточна стара лозинка" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Грешка во снимањето на корисникот; неправилен." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Новата лозинка не може да се сними" -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Лозинката е снимена." @@ -2372,7 +2382,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Е-пошта" @@ -2588,7 +2598,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "" @@ -2642,7 +2652,7 @@ msgstr "Канал со известувања на %s" msgid "FOAF for %s group" msgstr "Канал со известувања на %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "Член од" @@ -3285,41 +3295,41 @@ msgstr "Одговор од внесот во базата: %s" msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Профил" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 #, fuzzy msgid "Upload an avatar" msgstr "Товарањето на аватарот не успеа." -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "Корисникот нема профил." -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "" @@ -3919,36 +3929,36 @@ msgstr "Каде се наоѓате, на пр. „Град, Држава“." msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Нема таков корисник." -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Нема таков корисник." -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 #, fuzzy msgid "Logo" msgstr "Одјави се" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "" @@ -4145,7 +4155,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4169,7 +4179,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4573,47 +4583,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "пред неколку секунди" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "пред една минута" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "пред %d минути" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "пред еден час" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "пред %d часа" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "пред еден ден" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "пред %d денови" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "пред еден месец" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "пред %d месеци" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "пред една година" diff --git a/locale/nb/LC_MESSAGES/statusnet.mo b/locale/nb/LC_MESSAGES/statusnet.mo index 48b0d829e..80e30b11f 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 f744e8273..fa895ce1c 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-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:31+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:24+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(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); 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" @@ -486,7 +486,7 @@ msgid "Invalid size." msgstr "Ugyldig størrelse" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Brukerbilde" @@ -536,7 +536,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:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: 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 @@ -636,7 +636,7 @@ msgstr "" msgid "No profile with that ID." msgstr "" -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "" @@ -648,21 +648,23 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "" #: actions/block.php:149 -msgid "Do not block this user from this group" -msgstr "" +#, fuzzy +msgid "Do not block this user" +msgstr "Kan ikke slette notisen." #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Ja" -#: actions/block.php:150 -msgid "Block this user from this group" +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" msgstr "" #: actions/block.php:165 @@ -1150,7 +1152,7 @@ msgstr "" msgid "Block user from group" msgstr "" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1158,7 +1160,15 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +msgid "Do not block this user from this group" +msgstr "" + +#: actions/groupblock.php:179 +msgid "Block this user from this group" +msgstr "" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1219,7 +1229,7 @@ msgstr "Avataren har blitt oppdatert." msgid "Failed updating logo." msgstr "" -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "" @@ -1233,7 +1243,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1241,10 +1251,6 @@ msgstr "" msgid "Block" msgstr "" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "" - #: actions/groupmembers.php:441 msgid "Make user an admin of the group" msgstr "" @@ -1634,7 +1640,7 @@ msgid "Nickname" msgstr "Nick" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Passord" @@ -1869,62 +1875,67 @@ msgstr "" msgid "Change password" msgstr "Endre passord" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Endre passordet ditt" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "Endre passord" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Passordet ble lagret" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Gammelt passord" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Nytt passord" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 eller flere tegn" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Bekreft" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Endre" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "" -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Feil gammelt passord" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "" -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Klarer ikke å lagre nytt passord." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Passordet ble lagret" @@ -2356,7 +2367,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "E-post" @@ -2581,7 +2592,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "" @@ -2634,7 +2645,7 @@ msgstr "" msgid "FOAF for %s group" msgstr "Klarte ikke å lagre profil." -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "Medlem siden" @@ -3258,40 +3269,40 @@ msgstr "" msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Endre profilinnstillingene dine" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Endre passordet ditt" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Endre eposthåndtering" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "Klarte ikke å lagre profil." -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "" @@ -3881,35 +3892,35 @@ msgstr "" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 msgid "Blocked" msgstr "" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, php-format msgid "%s blocked users" msgstr "" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 #, fuzzy msgid "Logo" msgstr "Logg ut" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "" @@ -4107,7 +4118,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4131,7 +4142,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4531,47 +4542,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "noen få sekunder siden" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "omtrent ett minutt siden" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "omtrent %d minutter siden" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "omtrent én time siden" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "omtrent %d timer siden" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "omtrent én dag siden" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "omtrent %d dager siden" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "omtrent én måned siden" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "omtrent %d måneder siden" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "omtrent ett år siden" diff --git a/locale/nl/LC_MESSAGES/statusnet.mo b/locale/nl/LC_MESSAGES/statusnet.mo index ef46506ae..74e52e10d 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 e979675fb..42b776809 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -1,17 +1,18 @@ # Translation of StatusNet to Dutch # +# Author@translatewiki.net: McDutchie # Author@translatewiki.net: Siebrand # -- msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:37+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:29+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); 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" @@ -83,7 +84,7 @@ msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " "something yourself." msgstr "" -"Probeer te abonneren op meer gebruikers, [wordt lid van een groep](%%action." +"Probeer te abonneren op meer gebruikers, [word lid van een groep](%%action." "groups%%) of plaats zelf berichten." #: actions/all.php:134 @@ -92,6 +93,9 @@ msgid "" "You can try to [nudge %s](../%s) from his profile or [post something to his " "or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." msgstr "" +"U kunt proberen [%s te porren](../%s) op de eigen profielpagina of [een " +"bericht aan die gebruiker richten](%%%%action.newnotice%%%%?status_textarea=%" +"s)." #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 #, php-format @@ -485,7 +489,7 @@ msgid "Invalid size." msgstr "Ongeldige afmetingen." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Avatar" @@ -534,7 +538,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:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: 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 @@ -633,7 +637,7 @@ msgstr "Er is geen profiel opgegeven." msgid "No profile with that ID." msgstr "Er is geen profiel met dat ID." -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "Gebruiker blokkeren" @@ -645,22 +649,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "Nee" #: actions/block.php:149 -msgid "Do not block this user from this group" -msgstr "Deze gebruiker niet de toegang tot deze groep ontzeggen" +#, fuzzy +msgid "Do not block this user" +msgstr "Deblokkeer deze gebruiker." #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Ja" -#: actions/block.php:150 -msgid "Block this user from this group" -msgstr "Deze gebruiker de toegang tot deze groep ontzeggen" +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" +msgstr "Deze gebruiker blokkeren" #: actions/block.php:165 msgid "You have already blocked this user." @@ -1012,6 +1018,8 @@ msgstr "De meest populaire mededelingen op de site op dit moment." #: actions/favorited.php:150 msgid "Favorite notices appear on this page but no one has favorited one yet." msgstr "" +"Favoriete mededelingen zijn te zien op deze pagina, maar er zijn nog geen " +"favoriete mededelingen." #: actions/favorited.php:153 msgid "" @@ -1150,7 +1158,7 @@ msgstr "De gebruiker is geen lid van de groep." msgid "Block user from group" msgstr "Gebruiker toegang tot de groep blokkeren" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1158,7 +1166,15 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +msgid "Do not block this user from this group" +msgstr "Deze gebruiker niet de toegang tot deze groep ontzeggen" + +#: actions/groupblock.php:179 +msgid "Block this user from this group" +msgstr "Deze gebruiker de toegang tot deze groep ontzeggen" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" "Er is een databasefout opgetreden bij het uitsluiten van de gebruiker van de " @@ -1221,7 +1237,7 @@ msgstr "Logo geactualiseerd." msgid "Failed updating logo." msgstr "Het bijwerken van het logo is mislukt." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "leden van de groep %s" @@ -1235,7 +1251,7 @@ msgstr "% groeps leden, pagina %d" msgid "A list of the users in this group." msgstr "Ledenlijst van deze groep" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "Beheerder" @@ -1243,10 +1259,6 @@ msgstr "Beheerder" msgid "Block" msgstr "Blokkeren" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "Deze gebruiker blokkeren" - #: actions/groupmembers.php:441 msgid "Make user an admin of the group" msgstr "Deze gebruiker groepsbeheerder maken" @@ -1656,7 +1668,7 @@ msgid "Nickname" msgstr "Gebruikersnaam" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Wachtwoord" @@ -1896,60 +1908,65 @@ msgstr "Dit is uw Postvak UIT waarin de door u verzonden privéberichten staan." msgid "Change password" msgstr "Wachtwoord wijzigen" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Uw wachtwoord wijzigen" + +#: actions/passwordsettings.php:82 msgid "Change your password." msgstr "Wachtwoord wijzigen" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 msgid "Password change" msgstr "Wachtwoord wijzigen" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Oud wachtwoord" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Nieuw wachtwoord" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "Zes of meer tekens" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Bevestigen" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "gelijk aan wachtwoord hierboven" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Wijzigen" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Het wachtwoord moet zes of meer tekens bevatten." -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "De wachtwoorden komen niet overeen." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Het oude wachtwoord is onjuist" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Fout bij opslaan gebruiker; ongeldig." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Het was niet mogelijk het nieuwe wachtwoord op te slaan." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Het wachtwoord is opgeslagen." @@ -2258,11 +2275,11 @@ msgstr "" #: actions/recoverpassword.php:188 msgid "Password recovery" -msgstr "" +msgstr "Wachtwoordherstel" #: actions/recoverpassword.php:191 msgid "Nickname or email address" -msgstr "" +msgstr "Gebruikersnaam of e-mailadres" #: actions/recoverpassword.php:193 msgid "Your nickname on this server, or your registered email address." @@ -2400,7 +2417,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:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "E-mail" @@ -2631,7 +2648,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "Dit is de manier om dat te delen wat u wilt." -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "%s groep" @@ -2683,7 +2700,7 @@ msgstr "Mededelingenfeed voor groep %s (Atom)" msgid "FOAF for %s group" msgstr "Vriend van een vriend voor de groep %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "Leden" @@ -3342,39 +3359,39 @@ msgstr "" msgid "Welcome to %1$s, @%2$s!" msgstr "Welkom bij %1$s, @%2$s!" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profiel" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Uw profielgegevens wijzigen" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "Avatar uploaden" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Uw wachtwoord wijzigen" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "E-mailafhandeling wijzigen" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "Ontwerp" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 msgid "Design your profile" msgstr "Uw profiel ontwerpen" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Overige" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "Overige instellingen" @@ -3966,34 +3983,34 @@ msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" "Extra namen voor de groep, gescheiden door komma's of spaties. Maximaal %d." -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Groep" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 msgid "Blocked" msgstr "Geblokkeerd" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, php-format msgid "%s blocked users" msgstr "%s geblokkeerde gebruikers" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "Eigenschappen van de groep %s bewerken" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "Logo" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "Logo voor %s toevoegen of verwijderen" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "%s-ontwerp toevoegen of bewerken" @@ -4214,7 +4231,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4238,7 +4255,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4646,47 +4663,47 @@ msgstr "Deze gebruiker een direct bericht zenden" msgid "Message" msgstr "Bericht" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "een paar seconden geleden" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "ongeveer een minuut geleden" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "ongeveer %d minuten geleden" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "ongeveer een uur geleden" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "ongeveer %d uur geleden" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "ongeveer een dag geleden" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "ongeveer %d dagen geleden" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "ongeveer een maand geleden" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "ongeveer %d maanden geleden" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "ongeveer een jaar geleden" diff --git a/locale/nn/LC_MESSAGES/statusnet.mo b/locale/nn/LC_MESSAGES/statusnet.mo index fe675d2f6..bf03dffcc 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 e9aac3e38..6de37a959 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-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:34+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:26+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(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); 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" @@ -481,7 +481,7 @@ msgid "Invalid size." msgstr "Ugyldig storleik." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Brukarbilete" @@ -529,7 +529,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:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: 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 @@ -629,7 +629,7 @@ msgstr "Ingen vald profil." msgid "No profile with that ID." msgstr "Fann ingen profil med den IDen." -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "Blokker brukaren" @@ -641,24 +641,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "Nei" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "Ei liste over brukarane i denne gruppa." +msgid "Do not block this user" +msgstr "Lås opp brukaren" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Jau" -#: actions/block.php:150 -#, fuzzy -msgid "Block this user from this group" -msgstr "Ei liste over brukarane i denne gruppa." +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" +msgstr "Blokkér denne brukaren" #: actions/block.php:165 msgid "You have already blocked this user." @@ -1155,7 +1155,7 @@ msgstr "Du er ikkje medlem av den gruppa." msgid "Block user from group" msgstr "Blokker brukaren" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1163,7 +1163,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "Ei liste over brukarane i denne gruppa." + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "Ei liste over brukarane i denne gruppa." + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1228,7 +1238,7 @@ msgstr "Logo oppdatert." msgid "Failed updating logo." msgstr "Feil ved oppdatering av logo." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "%s medlemmar i gruppa" @@ -1242,7 +1252,7 @@ msgstr "%s medlemmar i gruppa, side %d" msgid "A list of the users in this group." msgstr "Ei liste over brukarane i denne gruppa." -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "Administrator" @@ -1250,10 +1260,6 @@ msgstr "Administrator" msgid "Block" msgstr "Blokkér" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "Blokkér denne brukaren" - #: actions/groupmembers.php:441 #, fuzzy msgid "Make user an admin of the group" @@ -1657,7 +1663,7 @@ msgid "Nickname" msgstr "Kallenamn" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Passord" @@ -1903,60 +1909,65 @@ msgstr "Dette er din utboks som syner alle private meldingar du har sendt." msgid "Change password" msgstr "Endra passord" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Endra passordet ditt" + +#: actions/passwordsettings.php:82 msgid "Change your password." msgstr "Endra passordet ditt" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 msgid "Password change" msgstr "Endra passord" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Gamalt passord" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Nytt passord" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 eller fleire teikn" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Godta" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "same passord som ovanfor" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Endra" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Passord må være minst 6 teikn." -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Passorda var ikkje like." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Det gamle passordet stemmer ikkje" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Feil ved lagring av brukar; fungerer ikkje." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Klarar ikkje lagra nytt passord." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Lagra passord." @@ -2400,7 +2411,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:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Epost" @@ -2633,7 +2644,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "%s gruppe" @@ -2685,7 +2696,7 @@ msgstr "Notisstraum for %s gruppa" msgid "FOAF for %s group" msgstr "Utboks for %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "Medlemmar" @@ -3334,40 +3345,40 @@ 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:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Endra profilinnstillingane dine" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "Last opp ein avatar" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Endra passordet ditt" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Endra eposthandtering" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "Brukarprofil" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Anna" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "Andre val" @@ -3958,35 +3969,35 @@ msgstr "Kvar er du, t.d. «Stavanger, Rogaland, Noreg»" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Gruppe" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Blokkér" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Blokker brukaren" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "Rediger %s gruppa sine eigenskapar" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "Logo" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "Legg til eller rediger logoen til %s" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, fuzzy, php-format msgid "Add or edit %s design" msgstr "Legg til eller rediger logoen til %s" @@ -4188,7 +4199,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4212,7 +4223,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4610,47 +4621,47 @@ msgstr "Send ei direktemelding til denne brukaren" msgid "Message" msgstr "Melding" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "eit par sekund sidan" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "omtrent eitt minutt sidan" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "~%d minutt sidan" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "omtrent ein time sidan" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "~%d timar sidan" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "omtrent ein dag sidan" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "~%d dagar sidan" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "omtrent ein månad sidan" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "~%d månadar sidan" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "omtrent eitt år sidan" diff --git a/locale/pl/LC_MESSAGES/statusnet.mo b/locale/pl/LC_MESSAGES/statusnet.mo index 41e944d17..861243ce2 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 e77b821b1..6f5c7433c 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-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:39+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:32+0000\n" "Language-Team: Polish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); 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" @@ -487,7 +487,7 @@ msgid "Invalid size." msgstr "Nieprawidłowy rozmiar." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Awatar" @@ -535,7 +535,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:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: 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 @@ -632,7 +632,7 @@ msgstr "Nie podano profilu." msgid "No profile with that ID." msgstr "Brak profilu o tym identyfikatorze." -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "Zablokuj użytkownika" @@ -647,22 +647,24 @@ msgstr "" "przyszłości i nie będziesz powiadamiany o żadnych odpowiedziach @ od niego." #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "Nie" #: actions/block.php:149 -msgid "Do not block this user from this group" -msgstr "Nie blokuj tego użytkownika w tej grupie" +#, fuzzy +msgid "Do not block this user" +msgstr "Odblokuj tego użytkownika" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Tak" -#: actions/block.php:150 -msgid "Block this user from this group" -msgstr "Zablokuj tego użytkownika w tej grupie" +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" +msgstr "Zablokuj tego użytkownika" #: actions/block.php:165 msgid "You have already blocked this user." @@ -1155,7 +1157,7 @@ msgstr "Użytkownik nie jest członkiem grupy." msgid "Block user from group" msgstr "Zablokuj użytkownika w grupie" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1166,7 +1168,15 @@ msgstr "" "Zostanie usunięty z grupy, nie będzie mógł wysyłać wpisów i zasubskrybować " "grupy w przyszłości." -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +msgid "Do not block this user from this group" +msgstr "Nie blokuj tego użytkownika w tej grupie" + +#: actions/groupblock.php:179 +msgid "Block this user from this group" +msgstr "Zablokuj tego użytkownika w tej grupie" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "Błąd bazy danych podczas blokowania użytkownika w grupie." @@ -1225,7 +1235,7 @@ msgstr "Zaktualizowano logo." msgid "Failed updating logo." msgstr "Zaktualizowanie logo nie powiodło się." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "Członkowie grupy %s" @@ -1239,7 +1249,7 @@ msgstr "Członkowie grupy %s, strona %d" msgid "A list of the users in this group." msgstr "Lista użytkowników znajdujących się w tej grupie." -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "Administrator" @@ -1247,10 +1257,6 @@ msgstr "Administrator" msgid "Block" msgstr "Zablokuj" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "Zablokuj tego użytkownika" - #: actions/groupmembers.php:441 msgid "Make user an admin of the group" msgstr "Uczyń użytkownika administratorem grupy" @@ -1670,7 +1676,7 @@ msgid "Nickname" msgstr "Pseudonim" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Hasło" @@ -1918,60 +1924,65 @@ 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:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Zmień hasło" + +#: actions/passwordsettings.php:82 msgid "Change your password." msgstr "Zmień hasło." -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 msgid "Password change" msgstr "Zmiana hasła" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Stare hasło" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Nowe hasło" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 lub więcej znaków" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Potwierdź" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "takie samo jak hasło powyżej" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Zmień" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 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:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Hasła nie pasują do siebie." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Niepoprawne stare hasło" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Błąd podczas zapisywania użytkownika; nieprawidłowy." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Nie można zapisać nowego hasła." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Zapisano hasło." @@ -2428,7 +2439,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:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "E-mail" @@ -2673,7 +2684,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "To jest sposób na współdzielenie tego, co chcesz." -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "Grupa %s" @@ -2725,7 +2736,7 @@ msgstr "Kanał wpisów dla grupy %s (Atom)" msgid "FOAF for %s group" msgstr "FOAF dla %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "Członkowie" @@ -3402,39 +3413,39 @@ 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:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Zmień ustawienia profilu" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "Wyślij awatar" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Zmień hasło" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Zmień obsługę adresu e-mail" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "Wygląd" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 msgid "Design your profile" msgstr "Wygląd profilu" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Inne" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "Inne opcje" @@ -4052,34 +4063,34 @@ msgstr "" "Dodatkowe pseudonimy grupy, oddzielone przecinkami lub spacjami, maksymalnie " "%d" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Grupa" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 msgid "Blocked" msgstr "Zablokowano" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, php-format msgid "%s blocked users" msgstr "%s zablokowani użytkownicy" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "Edytuj właściwości grupy %s" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "Logo" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "Dodaj lub edytuj logo grupy %s" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "Dodaj lub edytuj wygląd %s" @@ -4302,7 +4313,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4326,7 +4337,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4736,47 +4747,47 @@ msgstr "Wyślij bezpośrednią wiadomość do tego użytkownika" msgid "Message" msgstr "Wiadomość" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "kilka sekund temu" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "około minutę temu" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "około %d minut temu" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "około godzinę temu" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "około %d godzin temu" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "blisko dzień temu" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "około %d dni temu" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "około miesiąc temu" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "około %d miesięcy temu" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "około rok temu" diff --git a/locale/pt/LC_MESSAGES/statusnet.mo b/locale/pt/LC_MESSAGES/statusnet.mo index a6a789632..116a7bacd 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 f7c53b719..cd7997a50 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-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:42+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:35+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); 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" @@ -479,7 +479,7 @@ msgid "Invalid size." msgstr "Tamanho inválido." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Avatar" @@ -527,7 +527,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:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: 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 @@ -626,7 +626,7 @@ msgstr "" msgid "No profile with that ID." msgstr "" -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "" @@ -638,21 +638,23 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "Não" #: actions/block.php:149 -msgid "Do not block this user from this group" -msgstr "" +#, fuzzy +msgid "Do not block this user" +msgstr "Desbloquear este utilizador" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "" -#: actions/block.php:150 -msgid "Block this user from this group" +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" msgstr "" #: actions/block.php:165 @@ -1140,7 +1142,7 @@ msgstr "" msgid "Block user from group" msgstr "" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1148,7 +1150,15 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +msgid "Do not block this user from this group" +msgstr "" + +#: actions/groupblock.php:179 +msgid "Block this user from this group" +msgstr "" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1209,7 +1219,7 @@ msgstr "Avatar actualizado." msgid "Failed updating logo." msgstr "" -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "" @@ -1223,7 +1233,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1231,10 +1241,6 @@ msgstr "" msgid "Block" msgstr "Bloquear" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "" - #: actions/groupmembers.php:441 msgid "Make user an admin of the group" msgstr "" @@ -1628,7 +1634,7 @@ msgid "Nickname" msgstr "Alcunha" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "" @@ -1867,61 +1873,66 @@ msgstr "" msgid "Change password" msgstr "Modificar palavra-passe" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Modificar a sua palavra-passe" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "Modificar a sua palavra-passe" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 msgid "Password change" msgstr "" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Nova palavra-passe" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 ou mais caracteres" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirmar" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Modificar" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "" -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Palavra-passe antiga incorrecta" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Erro ao guardar utilizador; inválido." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Não é possível guardar a nova password." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "" @@ -2354,7 +2365,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Email" @@ -2580,7 +2591,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "" @@ -2632,7 +2643,7 @@ msgstr "" msgid "FOAF for %s group" msgstr "Feed para a tag %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "" @@ -3248,39 +3259,39 @@ msgstr "Ocorreu um erro na base de dados ao inserir a resposta: %s" msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Modificar as suas definições de perfil" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Modificar a sua palavra-passe" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Alterar email handling" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 msgid "Design your profile" msgstr "" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "" @@ -3868,35 +3879,35 @@ msgstr "" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Bloquear" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Desbloquear este utilizador" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "" @@ -4089,7 +4100,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4113,7 +4124,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4511,47 +4522,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.mo b/locale/pt_BR/LC_MESSAGES/statusnet.mo index f6e2b38f0..478729896 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 c584ad869..aa7f47cca 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-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:45+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:40+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(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); 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" @@ -488,7 +488,7 @@ msgid "Invalid size." msgstr "Tamanho inválido." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Avatar" @@ -536,7 +536,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:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: 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 @@ -636,7 +636,7 @@ msgstr "Não foi especificado nenhum perfil." msgid "No profile with that ID." msgstr "Não foi encontrado nenhum perfil com esse ID." -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "Bloquear usuário" @@ -648,23 +648,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "Não" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "Não é possível acompanhar o usuário: Usuário não encontrado." +msgid "Do not block this user" +msgstr "Desbloquear este usuário" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Sim" -#: actions/block.php:150 +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 #, fuzzy -msgid "Block this user from this group" +msgid "Block this user" msgstr "Bloquear usuário" #: actions/block.php:165 @@ -1167,7 +1168,7 @@ msgstr "Você não está assinando esse perfil." msgid "Block user from group" msgstr "Bloquear usuário" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1175,7 +1176,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "Não é possível acompanhar o usuário: Usuário não encontrado." + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "Bloquear usuário" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1242,7 +1253,7 @@ msgstr "O avatar foi atualizado." msgid "Failed updating logo." msgstr "Não foi possível atualizar o avatar." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "" @@ -1256,7 +1267,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "Admin" @@ -1264,11 +1275,6 @@ msgstr "Admin" msgid "Block" msgstr "Bloquear" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -#, fuzzy -msgid "Block this user" -msgstr "Bloquear usuário" - #: actions/groupmembers.php:441 #, fuzzy msgid "Make user an admin of the group" @@ -1692,7 +1698,7 @@ msgid "Nickname" msgstr "Apelido" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Senha" @@ -1942,62 +1948,67 @@ msgstr "" msgid "Change password" msgstr "Alterar a senha" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Altere a sua senha" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "Altera a sua senha" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "A senha foi salva." -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Senha antiga" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Nova senha" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "No mínimo 6 caracteres" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirmar" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "igual à senha acima" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Alterar" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "A senha deve ter 6 ou mais caracteres." -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "As senhas não coincidem." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "A senha antiga está incorreta" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Erro ao salvar usuário; inválido." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Não é possível salvar a nova senha." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "A senha foi salva." @@ -2445,7 +2456,7 @@ msgid "Same as password above. Required." msgstr "Igual à senha acima. Obrigatório." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "E-mail" @@ -2678,7 +2689,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "" @@ -2733,7 +2744,7 @@ msgstr "Mensagens de %s" msgid "FOAF for %s group" msgstr "Mensagens de %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "Membro desde" @@ -3390,40 +3401,40 @@ 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:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Perfil" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Alterar as suas configurações de perfil" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "Enviar um avatar" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Altere a sua senha" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Configurações de uso do e-mail" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "O usuário não tem perfil." -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Outras" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "Outras opções" @@ -4022,35 +4033,35 @@ msgstr "Onde você está, ex: \"cidade, estado (ou região), país\"" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Grupo" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Bloquear" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Bloquear usuário" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "Editar propriedades do grupo %s" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "Logo" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "Adicionar ou editar logo de %s" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, fuzzy, php-format msgid "Add or edit %s design" msgstr "Adicionar ou editar logo de %s" @@ -4253,7 +4264,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4277,7 +4288,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4680,47 +4691,47 @@ msgstr "Você não pode enviar uma mensagem para esse usuário." msgid "Message" msgstr "Nova mensagem" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "segundos atrás" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "1 min atrás" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "%d mins atrás" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "1 hora atrás" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "%d horas atrás" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "1 dia atrás" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "%d dias atrás" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "1 mês atrás" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "%d meses atrás" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "1 ano atrás" diff --git a/locale/ru/LC_MESSAGES/statusnet.mo b/locale/ru/LC_MESSAGES/statusnet.mo index 932761df1..7a8ba6e3d 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 9f9bfc4a7..80bfd1d72 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-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:48+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:42+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); 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" @@ -488,7 +488,7 @@ msgid "Invalid size." msgstr "Неверный размер." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Аватар" @@ -536,7 +536,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:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: 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 @@ -636,7 +636,7 @@ msgstr "Профиль не определен." msgid "No profile with that ID." msgstr "Нет профиля с таким ID." -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "Заблокировать пользователя." @@ -648,24 +648,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "Нет" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "Список пользователей, являющихся членами этой группы." +msgid "Do not block this user" +msgstr "Разблокировать пользователя." #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Да" -#: actions/block.php:150 -#, fuzzy -msgid "Block this user from this group" -msgstr "Список пользователей, являющихся членами этой группы." +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" +msgstr "Заблокировать пользователя." #: actions/block.php:165 msgid "You have already blocked this user." @@ -1170,7 +1170,7 @@ msgstr "Вы не являетесь членом этой группы." msgid "Block user from group" msgstr "Заблокировать пользователя." -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1178,7 +1178,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "Список пользователей, являющихся членами этой группы." + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "Список пользователей, являющихся членами этой группы." + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1243,7 +1253,7 @@ msgstr "Логотип обновлён." msgid "Failed updating logo." msgstr "Неудача при обновлении логотипа." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "Участники группы %s" @@ -1257,7 +1267,7 @@ msgstr "Участники группы %s, страница %d" msgid "A list of the users in this group." msgstr "Список пользователей, являющихся членами этой группы." -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "Настройки" @@ -1265,10 +1275,6 @@ msgstr "Настройки" msgid "Block" msgstr "Блокировать" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "Заблокировать пользователя." - #: actions/groupmembers.php:441 #, fuzzy msgid "Make user an admin of the group" @@ -1682,7 +1688,7 @@ msgid "Nickname" msgstr "Имя" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Пароль" @@ -1928,60 +1934,65 @@ msgstr "" msgid "Change password" msgstr "Изменить пароль" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Изменить ваш пароль" + +#: actions/passwordsettings.php:82 msgid "Change your password." msgstr "Изменить ваш пароль" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 msgid "Password change" msgstr "Пароль сохранён." -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Старый пароль" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Новый пароль" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 или больше знаков" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Подтвердить" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "повторить пароль сверху" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Изменить" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Пароль должен быть длиной не менее 6 символов." -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Пароли не совпадают." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Некорректный старый пароль" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Ошибка сохранения пользователя; неверное имя." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Не удаётся сохранить новый пароль." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Пароль сохранён." @@ -2434,7 +2445,7 @@ msgid "Same as password above. Required." msgstr "Тот же пароль что и сверху. Обязательно." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Email" @@ -2666,7 +2677,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "Группа %s" @@ -2718,7 +2729,7 @@ msgstr "Лента записей от группы %s" msgid "FOAF for %s group" msgstr "Исходящие для %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "Участники" @@ -3388,40 +3399,40 @@ msgstr "Ошибка баз данных при вставке ответа дл msgid "Welcome to %1$s, @%2$s!" msgstr "Сообщение для %1$s на %2$s" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Профиль" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Изменить ваши настройки профиля" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "Загрузить аватар" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Изменить ваш пароль" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Изменить электронный адрес" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "Профиль пользователя" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Другое" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "Другие опции" @@ -4013,35 +4024,35 @@ msgstr "Где находится группа, например «Город, msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Группа" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Блокировать" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Заблокировать пользователя." -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "Редактировать информацию о группе %s" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "Логотип" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "Добавить или изменить логотип группы %s" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, fuzzy, php-format msgid "Add or edit %s design" msgstr "Добавить или изменить логотип группы %s" @@ -4237,7 +4248,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4261,7 +4272,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4660,47 +4671,47 @@ msgstr "Послать приватное сообщение этому поль msgid "Message" msgstr "Сообщение" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "пару секунд назад" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "около минуты назад" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "около %d минут(ы) назад" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "около часа назад" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "около %d часа(ов) назад" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "около дня назад" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "около %d дня(ей) назад" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "около месяца назад" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "около %d месяца(ев) назад" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "около года назад" diff --git a/locale/sv/LC_MESSAGES/statusnet.mo b/locale/sv/LC_MESSAGES/statusnet.mo index d9bcf82c8..8c1d54b02 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 9a9f25c70..f43a686b7 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-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:50+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:45+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); 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" @@ -486,7 +486,7 @@ msgid "Invalid size." msgstr "Felaktig storlek" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Användarbild" @@ -536,7 +536,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:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: 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 @@ -640,7 +640,7 @@ msgstr "Ingen mottagare tillagd." msgid "No profile with that ID." msgstr "Ingen status hittad med det ID" -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 #, fuzzy msgid "Block user" msgstr "Ingen sådan användare" @@ -653,23 +653,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "Nej" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "Kunde inte följa användaren: Användaren kunde inte hittas." +msgid "Do not block this user" +msgstr "Ingen sådan användare" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Ja" -#: actions/block.php:150 +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 #, fuzzy -msgid "Block this user from this group" +msgid "Block this user" msgstr "Ingen sådan användare" #: actions/block.php:165 @@ -1177,7 +1178,7 @@ msgstr "Du skickade inte oss den profilen" msgid "Block user from group" msgstr "Ingen sådan användare" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1185,7 +1186,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "Kunde inte följa användaren: Användaren kunde inte hittas." + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "Ingen sådan användare" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1250,7 +1261,7 @@ msgstr "Användarbilden uppdaterad." msgid "Failed updating logo." msgstr "Uppdatering av profilbild misslyckades." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "" @@ -1264,7 +1275,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1272,11 +1283,6 @@ msgstr "" msgid "Block" msgstr "" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -#, fuzzy -msgid "Block this user" -msgstr "Ingen sådan användare" - #: actions/groupmembers.php:441 #, fuzzy msgid "Make user an admin of the group" @@ -1692,7 +1698,7 @@ msgid "Nickname" msgstr "Smeknamn" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Lösenord" @@ -1937,62 +1943,67 @@ msgstr "Detta är din outbox som innehåller meddelanden som du skickat." msgid "Change password" msgstr "Byt lösenord" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Ändra ditt lösenord" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "Ändra ditt lösenord" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Lösenord är sparat." -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Gammalt lösenord" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Nytt lösenord" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "Minst 6 tecken" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Bekräfta" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "samma som lösenordet ovan" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Ändra" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Lösenordet måste vara minst 6 tecken." -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Lösenorden matchar inte." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Felaktigt, gammalt lösenord" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Fel uppstog när användare skulle sparas." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Kan inte spara det nya lösenordet." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Lösenord är sparat." @@ -2435,7 +2446,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:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Epost" @@ -2668,7 +2679,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "" @@ -2722,7 +2733,7 @@ msgstr "Inlägg flöde för %s" msgid "FOAF for %s group" msgstr "Outbox för %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "Medlem sedan" @@ -3376,41 +3387,41 @@ msgstr "Databasfel för svar: %s" msgid "Welcome to %1$s, @%2$s!" msgstr "Meddelande till %1$s på %2$s" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Ändra dina profilinställningar" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 #, fuzzy msgid "Upload an avatar" msgstr "Uppdatering av profilbild misslyckades." -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Ändra ditt lösenord" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Ändra email hantering" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "Användaren har ingen profil." -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "" @@ -4018,36 +4029,36 @@ msgstr "Var du håller till, såsom \"Stad, Län, Land\"" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Ingen sådan användare" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Ingen sådan användare" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 #, fuzzy msgid "Logo" msgstr "Logga ut" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "" @@ -4252,7 +4263,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4276,7 +4287,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4689,47 +4700,47 @@ msgstr "Du kan inte skicka meddelande till den användaren." msgid "Message" msgstr "Nytt meddelande" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "ett par sekunder sedan" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "för nån minut sedan" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "för %d minuter sedan" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "för en timma sedan" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "för %d timmar sedan" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "för en dag sedan" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "för %d dagar sedan" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "för en månad sedan" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "för %d månader sedan" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "för ett år sedan" diff --git a/locale/te/LC_MESSAGES/statusnet.mo b/locale/te/LC_MESSAGES/statusnet.mo index ca72f004c..d1784c5d8 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 00d73df85..b044aef99 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/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-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:53+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:48+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); 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" #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 -#, fuzzy msgid "No such page" -msgstr "అటువంటి సందేశమేమీ లేదు." +msgstr "అటువంటి పేజీ లేదు" #: actions/all.php:74 actions/allrss.php:68 #: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 @@ -45,9 +44,9 @@ msgid "No such user." msgstr "అటువంటి వాడుకరి లేరు." #: actions/all.php:84 -#, fuzzy, php-format +#, php-format msgid "%s and friends, page %d" -msgstr "%s మరియు మిత్రులు" +msgstr "%s మరియు మిత్రులు, పేజీ %d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100 @@ -56,19 +55,19 @@ msgid "%s and friends" msgstr "%s మరియు మిత్రులు" #: actions/all.php:99 -#, fuzzy, php-format +#, php-format msgid "Feed for friends of %s (RSS 1.0)" -msgstr "%s యొక్క మిత్రుల ఫీడు" +msgstr "%s యొక్క మిత్రుల ఫీడు (RSS 1.0)" #: actions/all.php:107 -#, fuzzy, php-format +#, php-format msgid "Feed for friends of %s (RSS 2.0)" -msgstr "%s యొక్క మిత్రుల ఫీడు" +msgstr "%s యొక్క మిత్రుల ఫీడు (RSS 2.0)" #: actions/all.php:115 -#, fuzzy, php-format +#, php-format msgid "Feed for friends of %s (Atom)" -msgstr "%s యొక్క మిత్రుల ఫీడు" +msgstr "%s యొక్క మిత్రుల ఫీడు (ఆటమ్)" #: actions/all.php:127 #, php-format @@ -98,9 +97,8 @@ msgid "" msgstr "" #: actions/all.php:165 -#, fuzzy msgid "You and friends" -msgstr "%s మరియు మిత్రులు" +msgstr "మీరు మరియు మీ స్నేహితులు" #: actions/allrss.php:119 actions/apitimelinefriends.php:121 #, php-format @@ -151,7 +149,7 @@ msgstr "వాడుకరికి ప్రొఫైలు లేదు." #: actions/apiblockcreate.php:108 msgid "Block user failed." -msgstr "" +msgstr "వాడుకరి నిరోధం విఫలమైంది." #: actions/apiblockdestroy.php:107 msgid "Unblock user failed." @@ -159,12 +157,12 @@ msgstr "" #: actions/apidirectmessagenew.php:126 msgid "No message text!" -msgstr "" +msgstr "సందేశపు పాఠ్యం లేదు!" #: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, fuzzy, php-format +#, php-format msgid "That's too long. Max message size is %d chars." -msgstr "ఇది చాలా పొడవుంది. గరిష్ఠ సందేశ పరిమాణం 140 అక్షరాలు." +msgstr "చాలా పొడవుంది. గరిష్ఠ సందేశ పరిమాణం %d అక్షరాలు." #: actions/apidirectmessagenew.php:146 msgid "Recipient user not found." @@ -255,9 +253,8 @@ msgstr "అవతారపు సమాచారాన్ని భద్రప #: actions/apigroupcreate.php:147 actions/editgroup.php:259 #: actions/newgroup.php:210 -#, fuzzy msgid "Could not create aliases." -msgstr "అవతారపు సమాచారాన్ని భద్రపరచలేకున్నాం" +msgstr "మారుపేర్లని సృష్టించలేకపోయాం." #: actions/apigroupcreate.php:166 actions/newgroup.php:224 #, fuzzy @@ -295,9 +292,9 @@ msgid "Full name is too long (max 255 chars)." msgstr "పూర్తి పేరు చాలా పెద్దగా ఉంది (గరిష్ఠంగా 255 అక్షరాలు)." #: actions/apigroupcreate.php:261 -#, fuzzy, php-format +#, php-format msgid "Description is too long (max %d chars)." -msgstr "స్వపరిచయం చాలా పెద్దగా ఉంది (140 అక్షరాలు గరిష్ఠం)." +msgstr "వివరణ చాలా పెద్దగా ఉంది (%d అక్షరాలు గరిష్ఠం)." #: actions/apigroupcreate.php:272 actions/editgroup.php:204 #: actions/newgroup.php:148 actions/profilesettings.php:225 @@ -309,29 +306,28 @@ msgstr "ప్రాంతం పేరు మరీ పెద్దగా ఉ #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." -msgstr "" +msgstr "చాలా మారుపేర్లు! %d గరిష్ఠం." #: actions/apigroupcreate.php:312 actions/editgroup.php:224 #: actions/newgroup.php:168 -#, fuzzy, php-format +#, php-format msgid "Invalid alias: \"%s\"" -msgstr "'%s' అనే హోమ్ పేజీ సరైనదికాదు" +msgstr "తప్పుడు మారుపేరు: \"%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 "ఆ పేరుని ఇప్పటికే వాడుతున్నారు. మరోటి ప్రయత్నించండి." +msgstr "\"%s\" అన్న మారుపేరుని ఇప్పటికే వాడుతున్నారు. మరొకటి ప్రయత్నించండి." #: actions/apigroupcreate.php:334 actions/editgroup.php:234 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." -msgstr "" +msgstr "మారుపేరు పేరుతో సమానంగా ఉండకూడదు." #: actions/apigroupjoin.php:110 -#, fuzzy msgid "You are already a member of that group." -msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!" +msgstr "మీరు ఇప్పటికే ఆ గుంపులో సభ్యులు." #: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221 msgid "You have been blocked from that group by the admin." @@ -360,12 +356,12 @@ msgstr "%s గుంపులు" #: actions/apigrouplistall.php:94 #, php-format msgid "groups on %s" -msgstr "" +msgstr "%s పై గుంపులు" #: actions/apigrouplist.php:95 -#, fuzzy, php-format +#, php-format msgid "%s's groups" -msgstr "%s గుంపులు" +msgstr "%s యొక్క గుంపులు" #: actions/apigrouplist.php:103 #, fuzzy, php-format @@ -378,12 +374,11 @@ msgstr "" #: actions/apistatusesdestroy.php:130 msgid "You may not delete another user's status." -msgstr "" +msgstr "ఇతర వాడుకరుల స్థితిని మీరు తొలగించలేరు." #: actions/apistatusesshow.php:138 -#, fuzzy msgid "Status deleted." -msgstr "అవతారాన్ని తాజాకరించాం." +msgstr "స్థితిని తొలగించాం." #: actions/apistatusesshow.php:144 msgid "No status with that ID found." @@ -484,7 +479,7 @@ msgid "Invalid size." msgstr "తప్పుడు పరిమాణం." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "అవతారం" @@ -524,7 +519,7 @@ msgstr "ఎగుమతించు" #: actions/avatarsettings.php:228 actions/grouplogo.php:286 msgid "Crop" -msgstr "" +msgstr "కత్తిరించు" #: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74 #: actions/emailsettings.php:237 actions/favor.php:75 @@ -532,7 +527,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:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: 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 @@ -565,9 +560,8 @@ msgid "Failed updating avatar." msgstr "అవతారపు తాజాకరణ విఫలమైంది." #: actions/avatarsettings.php:387 -#, fuzzy msgid "Avatar deleted." -msgstr "అవతారాన్ని తాజాకరించాం." +msgstr "అవతారాన్ని తొలగించాం." #: actions/blockedfromgroup.php:73 actions/editgroup.php:84 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 @@ -581,9 +575,8 @@ msgstr "పేరు లేదు." #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137 -#, fuzzy msgid "No such group" -msgstr "అటువంటి సందేశమేమీ లేదు." +msgstr "అటువంటి గుంపు లేదు" #: actions/blockedfromgroup.php:90 #, fuzzy, php-format @@ -634,10 +627,9 @@ msgstr "" msgid "No profile with that ID." msgstr "" -#: actions/block.php:111 actions/block.php:134 -#, fuzzy +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" -msgstr "అటువంటి వాడుకరి లేరు." +msgstr "వాడుకరిని నిరోధించు" #: actions/block.php:136 msgid "" @@ -647,23 +639,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "కాదు" #: actions/block.php:149 -msgid "Do not block this user from this group" -msgstr "" +#, fuzzy +msgid "Do not block this user" +msgstr "అటువంటి వాడుకరి లేరు." #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "అవును" -#: actions/block.php:150 -#, fuzzy -msgid "Block this user from this group" -msgstr "అటువంటి వాడుకరి లేరు." +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" +msgstr "ఈ వాడుకరిని నిరోధించు" #: actions/block.php:165 #, fuzzy @@ -722,9 +715,8 @@ msgid "The address \"%s\" has been confirmed for your account." msgstr "\"%s\" అనే చిరునామా మీ ఖాతాకి నిర్ధారితమైంది." #: actions/conversation.php:99 -#, fuzzy msgid "Conversation" -msgstr "ప్రాంతం" +msgstr "సంభాషణ" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 #: lib/profileaction.php:206 @@ -760,7 +752,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." @@ -807,9 +799,8 @@ msgid "Could not update group." msgstr "వాడుకరిని తాజాకరించలేకున్నాం." #: actions/editgroup.php:269 -#, fuzzy msgid "Options saved." -msgstr "అమరికలు భద్రమయ్యాయి." +msgstr "ఎంపికలు భద్రమయ్యాయి." #: actions/emailsettings.php:60 msgid "Email Settings" @@ -1046,12 +1037,12 @@ msgstr "" #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" -msgstr "" +msgstr "విశేష వాడుకరులు" #: actions/featured.php:71 #, php-format msgid "Featured users, page %d" -msgstr "" +msgstr "విశేష వాడుకరులు, పేజీ %d" #: actions/featured.php:99 #, php-format @@ -1070,7 +1061,7 @@ msgstr "కొత్త సందేశం" #: actions/file.php:42 msgid "No attachments" -msgstr "" +msgstr "జోడింపులు లేవు" #: actions/file.php:51 msgid "No uploaded attachments" @@ -1111,9 +1102,8 @@ msgstr "దూరపు ప్రొపైలుని తాజాకరిం #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupunblock.php:86 actions/leavegroup.php:83 #: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263 -#, fuzzy msgid "No such group." -msgstr "అటువంటి సందేశమేమీ లేదు." +msgstr "అటువంటి గుంపు లేదు." #: actions/getfile.php:75 #, fuzzy @@ -1135,9 +1125,8 @@ msgid "Only an admin can block group members." msgstr "" #: actions/groupblock.php:95 -#, fuzzy msgid "User is already blocked from group." -msgstr "వాడుకరికి ప్రొఫైలు లేదు." +msgstr "వాడుకరిని ఇప్పటికే గుంపునుండి నిరోధించారు." #: actions/groupblock.php:100 msgid "User is not a member of group." @@ -1148,7 +1137,7 @@ msgstr "" msgid "Block user from group" msgstr "అటువంటి వాడుకరి లేరు." -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1156,7 +1145,16 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +msgid "Do not block this user from this group" +msgstr "" + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "అటువంటి వాడుకరి లేరు." + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1219,7 +1217,7 @@ msgstr "అవతారాన్ని తాజాకరించాం." msgid "Failed updating logo." msgstr "అవతారపు తాజాకరణ విఫలమైంది." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "%s గుంపు సభ్యులు" @@ -1227,24 +1225,19 @@ msgstr "%s గుంపు సభ్యులు" #: actions/groupmembers.php:96 #, php-format msgid "%s group members, page %d" -msgstr "" +msgstr "%s గుంపు సభ్యులు, పేజీ %d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "ఈ గుంపులో వాడుకరులు జాబితా." -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "" #: actions/groupmembers.php:346 lib/blockform.php:153 msgid "Block" -msgstr "" - -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -#, fuzzy -msgid "Block this user" -msgstr "అటువంటి వాడుకరి లేరు." +msgstr "నిరోధించు" #: actions/groupmembers.php:441 msgid "Make user an admin of the group" @@ -1305,7 +1298,7 @@ msgstr "గుంపులు" #: actions/groups.php:64 #, php-format msgid "Groups, page %d" -msgstr "" +msgstr "గుంపులు, పేజీ %d" #: actions/groups.php:90 #, php-format @@ -1318,9 +1311,8 @@ msgid "" msgstr "" #: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 -#, fuzzy msgid "Create a new group" -msgstr "కొత్త ఖాతా సృష్టించుకోండి" +msgstr "కొత్త గుంపుని సృష్టించు" #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." @@ -1451,11 +1443,11 @@ msgstr "" #: 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:" @@ -1488,7 +1480,7 @@ msgstr "" #: actions/invite.php:187 msgid "Email addresses" -msgstr "" +msgstr "ఈమెయిలు చిరునామాలు" #: actions/invite.php:189 msgid "Addresses of friends to invite (one per line)" @@ -1544,12 +1536,11 @@ msgstr "" #: actions/joingroup.php:60 msgid "You must be logged in to join a group." -msgstr "" +msgstr "గుంపుల్లో చేరడానికి మీరు ప్రవేశించి ఉండాలి." #: actions/joingroup.php:90 lib/command.php:217 -#, fuzzy msgid "You are already a member of that group" -msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!" +msgstr "మీరు ఇప్పటికే ఆ గుంపులో సభ్యులు" #: actions/joingroup.php:128 lib/command.php:234 #, php-format @@ -1617,7 +1608,7 @@ msgid "Nickname" msgstr "పేరు" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "సంకేతపదం" @@ -1702,7 +1693,7 @@ msgstr "" #: actions/newmessage.php:181 msgid "Message sent" -msgstr "" +msgstr "సందేశాన్ని పంపించాం" #: actions/newmessage.php:185 lib/command.php:375 #, php-format @@ -1793,7 +1784,7 @@ msgstr "అనుసంధానించు" #: actions/oembed.php:160 msgid "Only " -msgstr "" +msgstr "మాత్రమే " #: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 #: lib/api.php:991 lib/api.php:1101 @@ -1856,62 +1847,66 @@ msgstr "" msgid "Change password" msgstr "సంకేతపదం మార్చుకోండి" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +msgid "You are not allowed to change your password" +msgstr "" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "సంకేతపదం మార్చుకోండి" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "సంకేతపదం భద్రమయ్యింది." -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "పాత సంకేతపదం" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "కొత్త సంకేతపదం" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "నిర్థారించు" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "పై సంకేతపదం వలెనే" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "మార్చు" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "సంకేతపదాలు సరిపోలలేదు." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "పాత సంకేతపదం తప్పు" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు: సరికాదు." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "కొత్త సంకేతపదాన్ని భద్రపరచలేము." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "సంకేతపదం భద్రమయ్యింది." @@ -1973,7 +1968,6 @@ msgstr "పూర్తి పేరు" #: actions/profilesettings.php:115 actions/register.php:452 #: lib/groupeditform.php:161 -#, fuzzy msgid "Homepage" msgstr "హోమ్ పేజీ" @@ -2347,7 +2341,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "ఈమెయిల్" @@ -2555,7 +2549,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "%s గుంపు" @@ -2566,9 +2560,8 @@ msgid "%s group, page %d" msgstr "" #: actions/showgroup.php:218 -#, fuzzy msgid "Group profile" -msgstr "అటువంటి సందేశమేమీ లేదు." +msgstr "గుంపు ప్రొఫైలు" #: actions/showgroup.php:263 actions/tagother.php:118 #: actions/userauthorization.php:167 lib/userprofile.php:177 @@ -2583,7 +2576,7 @@ msgstr "సందేశాలు" #: actions/showgroup.php:284 lib/groupeditform.php:184 msgid "Aliases" -msgstr "" +msgstr "మారుపేర్లు" #: actions/showgroup.php:293 msgid "Group actions" @@ -2609,7 +2602,7 @@ msgstr "%s యొక్క సందేశముల ఫీడు" msgid "FOAF for %s group" msgstr "%s గుంపు" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "సభ్యులు" @@ -2963,7 +2956,7 @@ msgstr "వాడుకరికి ప్రొఫైలు లేదు." #: actions/tagother.php:81 lib/userprofile.php:102 msgid "Photo" -msgstr "" +msgstr "ఫొటో" #: actions/tagother.php:141 msgid "Tag user" @@ -3049,7 +3042,7 @@ msgstr "" #: actions/userauthorization.php:188 msgid "License" -msgstr "" +msgstr "లైసెన్సు" #: actions/userauthorization.php:209 msgid "Accept" @@ -3238,41 +3231,41 @@ msgstr "" msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "ప్రొఫైలు" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 #, fuzzy msgid "Upload an avatar" msgstr "అవతారపు తాజాకరణ విఫలమైంది." -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "వాడుకరికి ప్రొఫైలు లేదు." -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "ఇతర" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "ఇతర ఎంపికలు" @@ -3437,7 +3430,7 @@ msgstr "కొత్త సందేశం" #: lib/action.php:794 msgid "All " -msgstr "" +msgstr "అన్నీ " #: lib/action.php:799 msgid "license." @@ -3465,7 +3458,7 @@ msgstr "జోడింపులు" #: lib/attachmentlist.php:265 msgid "Author" -msgstr "" +msgstr "రచయిత" #: lib/attachmentlist.php:278 #, fuzzy @@ -3727,13 +3720,12 @@ msgid "Tile background image" msgstr "" #: lib/designsettings.php:170 -#, fuzzy msgid "Change colours" -msgstr "సంకేతపదం మార్చుకోండి" +msgstr "రంగులను మార్చు" #: lib/designsettings.php:178 msgid "Background" -msgstr "" +msgstr "నేపథ్యం" #: lib/designsettings.php:191 #, fuzzy @@ -3865,35 +3857,35 @@ msgstr "మీరు ఎక్కడ నుండి, \"నగరం, రాష msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "గుంపు" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "అటువంటి వాడుకరి లేరు." -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "అటువంటి వాడుకరి లేరు." -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "చిహ్నం" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "" @@ -4027,7 +4019,7 @@ msgid "" msgstr "" #: lib/mail.php:253 -#, fuzzy, php-format +#, php-format msgid "Location: %s\n" msgstr "ప్రాంతం: %s\n" @@ -4085,7 +4077,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4109,7 +4101,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4239,7 +4231,7 @@ msgstr "%s, సంగతులేమిటి?" #: lib/noticeform.php:180 msgid "Attach" -msgstr "" +msgstr "జోడించు" #: lib/noticeform.php:184 msgid "Attach a file" @@ -4303,7 +4295,7 @@ msgstr "స్పందనలు" #: lib/personalgroupnav.php:114 msgid "Favorites" -msgstr "" +msgstr "ఇష్టాంశాలు" #: lib/personalgroupnav.php:115 msgid "User" @@ -4366,7 +4358,7 @@ msgstr "ప్రజా" #: lib/publicgroupnav.php:82 msgid "User groups" -msgstr "" +msgstr "వాడుకరి గుంపులు" #: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85 msgid "Recent tags" @@ -4447,7 +4439,7 @@ msgstr "" #: lib/subscriptionlist.php:126 msgid "(none)" -msgstr "" +msgstr "(ఏమీలేవు)" #: lib/subs.php:48 msgid "Already subscribed!" @@ -4514,49 +4506,49 @@ msgstr "" #: lib/userprofile.php:273 msgid "Message" -msgstr "" +msgstr "సందేశం" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "కొన్ని క్షణాల క్రితం" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "ఓ నిమిషం క్రితం" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "%d నిమిషాల క్రితం" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "ఒక గంట క్రితం" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "%d గంటల క్రితం" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "ఓ రోజు క్రితం" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "%d రోజుల క్రితం" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "ఓ నెల క్రితం" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "%d నెలల క్రితం" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "ఒక సంవత్సరం క్రితం" diff --git a/locale/tr/LC_MESSAGES/statusnet.mo b/locale/tr/LC_MESSAGES/statusnet.mo index 166d3bad6..49093b4dc 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 c27caff29..c25d1a8a6 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-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:56+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:50+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); 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" @@ -486,7 +486,7 @@ msgid "Invalid size." msgstr "Geçersiz büyüklük." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Avatar" @@ -535,7 +535,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:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: 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 @@ -637,7 +637,7 @@ msgstr "" msgid "No profile with that ID." msgstr "" -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 #, fuzzy msgid "Block user" msgstr "Böyle bir kullanıcı yok." @@ -650,23 +650,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "Sunucuya yönlendirme yapılamadı: %s" +msgid "Do not block this user" +msgstr "Böyle bir kullanıcı yok." #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "" -#: actions/block.php:150 +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 #, fuzzy -msgid "Block this user from this group" +msgid "Block this user" msgstr "Böyle bir kullanıcı yok." #: actions/block.php:165 @@ -1155,7 +1156,7 @@ msgstr "Bize o profili yollamadınız" msgid "Block user from group" msgstr "Böyle bir kullanıcı yok." -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1163,7 +1164,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "Sunucuya yönlendirme yapılamadı: %s" + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "Böyle bir kullanıcı yok." + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1226,7 +1237,7 @@ msgstr "Avatar güncellendi." msgid "Failed updating logo." msgstr "Avatar güncellemede hata." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "" @@ -1240,7 +1251,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1248,11 +1259,6 @@ msgstr "" msgid "Block" msgstr "" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -#, fuzzy -msgid "Block this user" -msgstr "Böyle bir kullanıcı yok." - #: actions/groupmembers.php:441 msgid "Make user an admin of the group" msgstr "" @@ -1635,7 +1641,7 @@ msgid "Nickname" msgstr "Takma ad" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Parola" @@ -1880,62 +1886,66 @@ msgstr "" msgid "Change password" msgstr "Parolayı değiştir" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +msgid "You are not allowed to change your password" +msgstr "" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "Parolayı değiştir" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Parola kaydedildi." -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Eski parola" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Yeni parola" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 veya daha fazla karakter" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Onayla" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "yukaridaki parola ile aynı" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Değiştir" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Parolalar birbirini tutmuyor." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Eski parola yanlış" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Kullanıcıyı kaydetmede hata oluştu; geçersiz." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Yeni parola kaydedilemedi." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Parola kaydedildi." @@ -2378,7 +2388,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Eposta" @@ -2590,7 +2600,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "" @@ -2644,7 +2654,7 @@ msgstr "%s için durum RSS beslemesi" msgid "FOAF for %s group" msgstr "%s için durum RSS beslemesi" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "Üyelik başlangıcı" @@ -3280,41 +3290,41 @@ msgstr "Cevap eklenirken veritabanı hatası: %s" msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 #, fuzzy msgid "Upload an avatar" msgstr "Avatar güncellemede hata." -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "Kullanıcının profili yok." -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "" @@ -3915,36 +3925,36 @@ msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Böyle bir kullanıcı yok." -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Böyle bir kullanıcı yok." -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 #, fuzzy msgid "Logo" msgstr "Çıkış" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "" @@ -4142,7 +4152,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4166,7 +4176,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4571,47 +4581,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "birkaç saniye önce" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "yaklaşık bir dakika önce" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "yaklaşık %d dakika önce" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "yaklaşık bir saat önce" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "yaklaşık %d saat önce" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "yaklaşık bir gün önce" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "yaklaşık %d gün önce" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "yaklaşık bir ay önce" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "yaklaşık %d ay önce" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "yaklaşık bir yıl önce" diff --git a/locale/uk/LC_MESSAGES/statusnet.mo b/locale/uk/LC_MESSAGES/statusnet.mo index 9e23cdc7f..e7e6fe0ea 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 7890af28f..a1a002b85 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-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:58:58+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:53+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); 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" @@ -484,7 +484,7 @@ msgid "Invalid size." msgstr "Недійсний розмір." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Аватара" @@ -532,7 +532,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:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: 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 @@ -633,7 +633,7 @@ msgstr "Не визначено жодного профілю." msgid "No profile with that ID." msgstr "Не визначено профілю з таким ID." -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 msgid "Block user" msgstr "Блокувати користувача." @@ -645,24 +645,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "Ні" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "Список учасників цієї групи." +msgid "Do not block this user" +msgstr "Розблокувати цього користувача" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Так" -#: actions/block.php:150 -#, fuzzy -msgid "Block this user from this group" -msgstr "Список учасників цієї групи." +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 +msgid "Block this user" +msgstr "Блокувати користувача" #: actions/block.php:165 msgid "You have already blocked this user." @@ -1161,7 +1161,7 @@ msgstr "Ви не є учасником цієї групи." msgid "Block user from group" msgstr "Блокувати користувача." -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1169,7 +1169,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "Список учасників цієї групи." + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "Список учасників цієї групи." + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1234,7 +1244,7 @@ msgstr "Логотип оновлено." msgid "Failed updating logo." msgstr "Оновлення логотипу завершилось невдачею." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "Учасники групи %s" @@ -1248,7 +1258,7 @@ msgstr "Учасники групи %s, сторінка %d" msgid "A list of the users in this group." msgstr "Список учасників цієї групи." -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "Адмін" @@ -1256,10 +1266,6 @@ msgstr "Адмін" msgid "Block" msgstr "Блок" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -msgid "Block this user" -msgstr "Блокувати користувача" - #: actions/groupmembers.php:441 #, fuzzy msgid "Make user an admin of the group" @@ -1677,7 +1683,7 @@ msgid "Nickname" msgstr "Ім'я користувача" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Пароль" @@ -1927,60 +1933,65 @@ msgstr "" msgid "Change password" msgstr "Змінити пароль" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Змінити ваш пароль" + +#: actions/passwordsettings.php:82 msgid "Change your password." msgstr "Змінити пароль." -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 msgid "Password change" msgstr "Пароль замінено" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Старий пароль" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Новий пароль" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 або більше знаків" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Підтвердити" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "такий само, як і пароль вище" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Змінити" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Пароль має складатись з 6-ти або більше знаків." -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Паролі не співпадають." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Старий пароль неточний" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Помилка при збереженні користувача; недійсний." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Не можна зберегти новий пароль." -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Пароль збережено." @@ -2428,7 +2439,7 @@ msgid "Same as password above. Required." msgstr "Такий само, як і пароль вище. Неодмінно." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Пошта" @@ -2661,7 +2672,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "Група %s" @@ -2713,7 +2724,7 @@ msgstr "Живлення повідомлень для групи %s" msgid "FOAF for %s group" msgstr "Вихідні для %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "Учасники" @@ -3365,40 +3376,40 @@ msgstr "Помилка бази даних при додаванні відпо msgid "Welcome to %1$s, @%2$s!" msgstr "Повідомлення до %1$s на %2$s" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Профіль" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Змінити налаштування профілю" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "Завантаження аватари" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Змінити ваш пароль" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Змінити електронну адресу вручну" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "Профіль користувача." -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Інше" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "Інші опції" @@ -3989,35 +4000,35 @@ msgstr "Локація групи, на зразок \"Місто, област msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Група" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Блок" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Блокувати користувача." -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "Редагувати властивості групи %s" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 msgid "Logo" msgstr "Лого" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "Додати або редагувати логотип %s" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, fuzzy, php-format msgid "Add or edit %s design" msgstr "Додати або редагувати логотип %s" @@ -4221,7 +4232,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4245,7 +4256,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4643,47 +4654,47 @@ msgstr "Надіслати пряме повідомлення цьому кор msgid "Message" msgstr "Повідомлення" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "мить тому" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "хвилину тому" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "близько %d хвилин тому" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "годину тому" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "близько %d годин тому" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "день тому" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "близько %d днів тому" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "місяць тому" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "близько %d місяців тому" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "рік тому" diff --git a/locale/vi/LC_MESSAGES/statusnet.mo b/locale/vi/LC_MESSAGES/statusnet.mo index df6915cec..bb42fbee7 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 b7bc3231a..f1b61c263 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-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:59:01+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:55+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); 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" @@ -488,7 +488,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:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Hình đại diện" @@ -541,7 +541,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:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: 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 @@ -643,7 +643,7 @@ msgstr "" msgid "No profile with that ID." msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó." -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 #, fuzzy msgid "Block user" msgstr "Ban user" @@ -656,23 +656,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "Không" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi." +msgid "Do not block this user" +msgstr "Bỏ chặn người dùng này" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Có" -#: actions/block.php:150 +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 #, fuzzy -msgid "Block this user from this group" +msgid "Block this user" msgstr "Ban user" #: actions/block.php:165 @@ -1190,7 +1191,7 @@ msgstr "Bạn chưa cập nhật thông tin riêng" msgid "Block user from group" msgstr "Ban user" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1198,7 +1199,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi." + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "Ban user" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1265,7 +1276,7 @@ msgstr "Hình đại diện đã được cập nhật." msgid "Failed updating logo." msgstr "Cập nhật hình đại diện không thành công." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, fuzzy, php-format msgid "%s group members" msgstr "Thành viên" @@ -1279,7 +1290,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1287,11 +1298,6 @@ msgstr "" msgid "Block" msgstr "" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -#, fuzzy -msgid "Block this user" -msgstr "Ban user" - #: actions/groupmembers.php:441 #, fuzzy msgid "Make user an admin of the group" @@ -1713,7 +1719,7 @@ msgid "Nickname" msgstr "Biệt danh" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Mật khẩu" @@ -1967,63 +1973,68 @@ msgstr "" msgid "Change password" msgstr "Đổi mật khẩu" -#: actions/passwordsettings.php:69 +#: 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 #, fuzzy msgid "Change your password." msgstr "Thay đổi mật khẩu của bạn" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Đã lưu mật khẩu." -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Mật khẩu cũ" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Mật khẩu mới" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "Nhiều hơn 6 ký tự" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Xác nhận" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "cùng mật khẩu ở trên" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Thay đổi" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 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:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Mật khẩu không khớp." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Mật khẩu cũ sai" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 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:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 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:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Đã lưu mật khẩu." @@ -2469,7 +2480,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:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Email" @@ -2697,7 +2708,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, fuzzy, php-format msgid "%s group" msgstr "%s và nhóm" @@ -2752,7 +2763,7 @@ msgstr "Dòng tin nhắn cho %s" msgid "FOAF for %s group" msgstr "Hộp thư đi của %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "Thành viên" @@ -3414,42 +3425,42 @@ 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:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Hồ sơ " -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 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:112 +#: lib/accountsettingsaction.php:114 #, fuzzy msgid "Upload an avatar" msgstr "Cập nhật hình đại diện không thành công." -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Thay đổi mật khẩu của bạn" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Đang thực hiện việc thay đổi email" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "Hồ sơ" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 #, fuzzy msgid "Other" msgstr "Sau" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "" @@ -4068,36 +4079,36 @@ msgstr "Bạn ở đâu, \"Thành phố, Tỉnh thành, Quốc gia\"" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Nhóm" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Ban user" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Ban user" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 #, fuzzy msgid "Logo" msgstr "Thoát" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "" @@ -4322,7 +4333,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4346,7 +4357,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4778,47 +4789,47 @@ msgstr "Bạn đã theo những người này:" msgid "Message" msgstr "Tin mới nhất" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "vài giây trước" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "1 phút trước" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "%d phút trước" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "1 giờ trước" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "%d giờ trước" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "1 ngày trước" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "%d ngày trước" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "1 tháng trước" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "%d tháng trước" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "1 năm trước" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.mo b/locale/zh_CN/LC_MESSAGES/statusnet.mo index 94772c6ca..f3b08115d 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 06465826f..1a5c6d5ba 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-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:59:05+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:58+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(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); 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" @@ -488,7 +488,7 @@ msgid "Invalid size." msgstr "大小不正确。" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "头像" @@ -537,7 +537,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:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: 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 @@ -641,7 +641,7 @@ msgstr "没有收件人。" msgid "No profile with that ID." msgstr "没有找到此ID的信息。" -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 #, fuzzy msgid "Block user" msgstr "阻止用户" @@ -654,24 +654,25 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "否" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "该组成员列表。" +msgid "Do not block this user" +msgstr "取消阻止次用户" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "是" -#: actions/block.php:150 +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 #, fuzzy -msgid "Block this user from this group" -msgstr "该组成员列表。" +msgid "Block this user" +msgstr "阻止该用户" #: actions/block.php:165 msgid "You have already blocked this user." @@ -1169,7 +1170,7 @@ msgstr "您未告知此个人信息" msgid "Block user from group" msgstr "阻止用户" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1177,7 +1178,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "该组成员列表。" + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "该组成员列表。" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1243,7 +1254,7 @@ msgstr "logo已更新。" msgid "Failed updating logo." msgstr "更新logo失败。" -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "%s 组成员" @@ -1257,7 +1268,7 @@ msgstr "%s 组成员, 第 %d 页" msgid "A list of the users in this group." msgstr "该组成员列表。" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "admin管理员" @@ -1265,11 +1276,6 @@ msgstr "admin管理员" msgid "Block" msgstr "阻止" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -#, fuzzy -msgid "Block this user" -msgstr "阻止该用户" - #: actions/groupmembers.php:441 #, fuzzy msgid "Make user an admin of the group" @@ -1671,7 +1677,7 @@ msgid "Nickname" msgstr "昵称" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "密码" @@ -1912,62 +1918,67 @@ msgstr "这是您的发件箱，包含您发送的私人消息。" msgid "Change password" msgstr "修改密码" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "修改密码" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "修改密码" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "密码已保存。" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "旧密码" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "新密码" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 个或更多字符" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "确认" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "相同的密码" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "修改" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "密码必须包含 6 个或更多字符。" -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "密码不匹配。" -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "旧密码不正确" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "保存用户时出错；不正确。" -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "无法保存新密码。" -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "密码已保存。" @@ -2405,7 +2416,7 @@ msgid "Same as password above. Required." msgstr "相同的密码。此项必填。" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "电子邮件" @@ -2631,7 +2642,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "%s 组" @@ -2685,7 +2696,7 @@ msgstr "%s 的通告聚合" msgid "FOAF for %s group" msgstr "%s 的发件箱" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "注册于" @@ -3339,40 +3350,40 @@ msgstr "添加回复时数据库出错：%s" msgid "Welcome to %1$s, @%2$s!" msgstr "发送给 %1$s 的 %2$s 消息" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "个人信息" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "修改您的个人信息" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "上载一个头像。" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "修改密码" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "修改电子邮件" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "用户没有个人信息。" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "其他" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "其他选项" @@ -3979,36 +3990,36 @@ msgstr "你的位置，格式类似\"城市，省份，国家\"" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "组" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "阻止" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "阻止用户" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "编辑 %s群选项" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 #, fuzzy msgid "Logo" msgstr "Logo图标" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "添加或编辑 %s 图标" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, fuzzy, php-format msgid "Add or edit %s design" msgstr "添加或编辑 %s 图标" @@ -4214,7 +4225,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4238,7 +4249,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4654,47 +4665,47 @@ msgstr "无法向此用户发送消息。" msgid "Message" msgstr "新消息" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "几秒前" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "一分钟前" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "%d 分钟前" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "一小时前" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "%d 小时前" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "一天前" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "%d 天前" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "一个月前" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "%d 个月前" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "一年前" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.mo b/locale/zh_TW/LC_MESSAGES/statusnet.mo index 2d9e59f00..36cdef3ba 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 e40803515..0843684be 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-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:59:08+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 21:00:00+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(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); 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" @@ -485,7 +485,7 @@ msgid "Invalid size." msgstr "尺寸錯誤" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "個人圖像" @@ -534,7 +534,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:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: 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 @@ -636,7 +636,7 @@ msgstr "" msgid "No profile with that ID." msgstr "" -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 #, fuzzy msgid "Block user" msgstr "無此使用者" @@ -649,23 +649,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "無法連結到伺服器:%s" +msgid "Do not block this user" +msgstr "無此使用者" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "" -#: actions/block.php:150 +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 #, fuzzy -msgid "Block this user from this group" +msgid "Block this user" msgstr "無此使用者" #: actions/block.php:165 @@ -1149,7 +1150,7 @@ msgstr "" msgid "Block user from group" msgstr "無此使用者" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1157,7 +1158,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "無法連結到伺服器:%s" + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "無此使用者" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1219,7 +1230,7 @@ msgstr "更新個人圖像" msgid "Failed updating logo." msgstr "無法上傳個人圖像" -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "" @@ -1233,7 +1244,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1241,11 +1252,6 @@ msgstr "" msgid "Block" msgstr "" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -#, fuzzy -msgid "Block this user" -msgstr "無此使用者" - #: actions/groupmembers.php:441 msgid "Make user an admin of the group" msgstr "" @@ -1613,7 +1619,7 @@ msgid "Nickname" msgstr "暱稱" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "" @@ -1848,61 +1854,65 @@ msgstr "" msgid "Change password" msgstr "更改密碼" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +msgid "You are not allowed to change your password" +msgstr "" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "更改密碼" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 msgid "Password change" msgstr "" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "新密碼" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6個以上字元" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "確認" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "更改" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "" -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "舊密碼錯誤" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "儲存使用者發生錯誤;使用者名稱無效" -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "無法存取新密碼" -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "" @@ -2331,7 +2341,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "電子信箱" @@ -2539,7 +2549,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "" @@ -2592,7 +2602,7 @@ msgstr "" msgid "FOAF for %s group" msgstr "無此通知" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "何時加入會員的呢？" @@ -3221,41 +3231,41 @@ msgstr "增加回覆時,資料庫發生錯誤: %s" msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 #, fuzzy msgid "Upload an avatar" msgstr "無法上傳個人圖像" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "無此通知" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "" @@ -3845,36 +3855,36 @@ msgstr "" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "無此使用者" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "無此使用者" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 #, fuzzy msgid "Logo" msgstr "登出" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "" @@ -4071,7 +4081,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4095,7 +4105,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4495,47 +4505,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "" -- cgit v1.2.3-54-g00ecf From cb64cfb44c7bf08f113444ccdde4b9a4b7fa6808 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 10 Nov 2009 16:15:05 -0500 Subject: add geo output to statuses in json, xml, atom, rss in API --- classes/Notice.php | 6 ++++++ lib/api.php | 45 ++++++++++++++++++++++++++++++++++++++------- 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/classes/Notice.php b/classes/Notice.php index 9886875cb..291e6202b 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -1254,6 +1254,12 @@ class Notice extends Memcached_DataObject } } + if (!empty($this->lat) && !empty($this->lon)) { + $xs->elementStart('geo', array('xmlns:georss' => 'http://www.georss.org/georss')); + $xs->element('georss:point', null, $this->lat . ' ' . $this->lon); + $xs->elementEnd('geo'); + } + $xs->elementEnd('entry'); return $xs->getString(); diff --git a/lib/api.php b/lib/api.php index a1236ab7e..5e66639c4 100644 --- a/lib/api.php +++ b/lib/api.php @@ -60,7 +60,7 @@ class ApiAction extends Action var $max_id = null; var $since_id = null; var $since = null; - + /** * Initialization. * @@ -72,14 +72,14 @@ class ApiAction extends Action function prepare($args) { parent::prepare($args); - + $this->format = $this->arg('format'); $this->page = (int)$this->arg('page', 1); $this->count = (int)$this->arg('count', 20); $this->max_id = (int)$this->arg('max_id', 0); $this->since_id = (int)$this->arg('since_id', 0); $this->since = $this->arg('since'); - + return true; } @@ -164,7 +164,6 @@ class ApiAction extends Action $twitter_user['favourites_count'] = $profile->faveCount(); // British spelling! - $timezone = 'UTC'; if ($user->timezone) { @@ -238,6 +237,15 @@ class ApiAction extends Action $twitter_status['in_reply_to_screen_name'] = ($replier_profile) ? $replier_profile->nickname : null; + if (isset($notice->lat) && isset($notice->lon)) { + // This is the format that GeoJSON expects stuff to be in + $twitter_status['geo'] = array('type' => 'Point', + 'coordinates' => array((float) $notice->lat, + (float) $notice->lon)); + } else { + $twitter_status['geo'] = null; + } + if (isset($this->auth_user)) { $twitter_status['favorited'] = $this->auth_user->hasFave($notice); } else { @@ -362,10 +370,19 @@ class ApiAction extends Action $entry['pubDate'] = common_date_rfc2822($notice->created); $entry['guid'] = $entry['link']; + if (isset($notice->lat) && isset($notice->lon)) { + // This is the format that GeoJSON expects stuff to be in. + // showGeoRSS() below uses it for XML output, so we reuse it + $entry['geo'] = array('type' => 'Point', + 'coordinates' => array((float) $notice->lat, + (float) $notice->lon)); + } else { + $entry['geo'] = null; + } + return $entry; } - function twitterRelationshipArray($source, $target) { $relationship = array(); @@ -441,6 +458,9 @@ class ApiAction extends Action case 'attachments': $this->showXmlAttachments($twitter_status['attachments']); break; + case 'geo': + $this->showGeoRSS($value); + break; default: $this->element($element, null, $value); } @@ -484,6 +504,18 @@ class ApiAction extends Action } } + function showGeoRSS($geo) + { + if (empty($geo)) { + // empty geo element + $this->element('geo'); + } else { + $this->elementStart('geo', array('xmlns:georss' => 'http://www.georss.org/georss')); + $this->element('georss:point', null, $geo['coordinates'][0] . ' ' . $geo['coordinates'][1]); + $this->elementEnd('geo'); + } + } + function showTwitterRssItem($entry) { $this->elementStart('item'); @@ -505,6 +537,7 @@ class ApiAction extends Action } } + $this->showGeoRSS($entry['geo']); $this->elementEnd('item'); } @@ -529,7 +562,6 @@ class ApiAction extends Action $this->endDocument('json'); } - function showXmlTimeline($notice) { @@ -649,7 +681,6 @@ class ApiAction extends Action $this->endTwitterRss(); } - function showTwitterAtomEntry($entry) { $this->elementStart('entry'); -- cgit v1.2.3-54-g00ecf