summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrenda Wallace <shiny@cpan.org>2009-12-03 00:10:49 +0000
committerBrenda Wallace <shiny@cpan.org>2009-12-03 00:10:49 +0000
commitce46cce73ef8e1c60888755586919afdf9afee14 (patch)
tree0f770974536bc4d9b67d42ef8016419a5627f1a3
parente42c18ededbc4b8c8e4ef89a7e7a324e6c7c8a8a (diff)
parent3e38d376a9ed53d6a6268106a7a85c1e9f131034 (diff)
Merge commit 'origin/0.9.x' into 0.9.x
-rw-r--r--README2
-rw-r--r--actions/apidirectmessagenew.php2
-rw-r--r--actions/apigroupshow.php2
-rw-r--r--actions/finishremotesubscribe.php13
-rw-r--r--actions/login.php9
-rw-r--r--actions/passwordsettings.php2
-rw-r--r--actions/remotesubscribe.php2
-rw-r--r--classes/Login_token.php42
-rw-r--r--classes/Notice.php13
-rw-r--r--classes/statusnet.ini3
-rw-r--r--db/08to09.sql11
-rw-r--r--db/08to09_pg.sql19
-rw-r--r--db/notice_source.sql1
-rw-r--r--db/statusnet.sql10
-rw-r--r--db/statusnet_pg.sql22
-rw-r--r--doc-src/faq2
-rw-r--r--install.php2
-rw-r--r--js/util.js163
-rw-r--r--lib/command.php27
-rw-r--r--lib/commandinterpreter.php6
-rw-r--r--lib/default.php2
-rw-r--r--lib/designsettings.php2
-rw-r--r--lib/imagefile.php4
-rw-r--r--lib/jabber.php1
-rw-r--r--lib/language.php1
-rw-r--r--lib/omb.php1
-rw-r--r--lib/popularnoticesection.php5
-rw-r--r--lib/profileaction.php10
-rw-r--r--lib/router.php6
-rw-r--r--lib/rssaction.php12
-rw-r--r--lib/userprofile.php57
-rw-r--r--lib/util.php19
-rw-r--r--locale/Makefile13
-rw-r--r--locale/README9
-rw-r--r--locale/ar/LC_MESSAGES/statusnet.mobin48583 -> 0 bytes
-rw-r--r--locale/ar/LC_MESSAGES/statusnet.po148
-rw-r--r--locale/bg/LC_MESSAGES/statusnet.mobin66029 -> 0 bytes
-rw-r--r--locale/bg/LC_MESSAGES/statusnet.po254
-rw-r--r--locale/ca/LC_MESSAGES/statusnet.mobin58477 -> 0 bytes
-rw-r--r--locale/ca/LC_MESSAGES/statusnet.po232
-rw-r--r--locale/cs/LC_MESSAGES/statusnet.mobin17684 -> 0 bytes
-rw-r--r--locale/cs/LC_MESSAGES/statusnet.po146
-rw-r--r--locale/de/LC_MESSAGES/statusnet.mobin56078 -> 0 bytes
-rw-r--r--locale/de/LC_MESSAGES/statusnet.po481
-rw-r--r--locale/el/LC_MESSAGES/statusnet.mobin15005 -> 0 bytes
-rw-r--r--locale/el/LC_MESSAGES/statusnet.po139
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.mobin61282 -> 0 bytes
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.po142
-rw-r--r--locale/es/LC_MESSAGES/statusnet.mobin51119 -> 0 bytes
-rw-r--r--locale/es/LC_MESSAGES/statusnet.po143
-rw-r--r--locale/fi/LC_MESSAGES/statusnet.mobin67531 -> 0 bytes
-rw-r--r--locale/fi/LC_MESSAGES/statusnet.po190
-rw-r--r--locale/fr/LC_MESSAGES/statusnet.mobin114660 -> 0 bytes
-rw-r--r--locale/fr/LC_MESSAGES/statusnet.po151
-rw-r--r--locale/ga/LC_MESSAGES/statusnet.mobin48102 -> 0 bytes
-rw-r--r--locale/ga/LC_MESSAGES/statusnet.po143
-rw-r--r--locale/he/LC_MESSAGES/statusnet.mobin19693 -> 0 bytes
-rw-r--r--locale/he/LC_MESSAGES/statusnet.po143
-rw-r--r--locale/hsb/LC_MESSAGES/statusnet.po2191
-rw-r--r--locale/is/LC_MESSAGES/statusnet.mobin55910 -> 0 bytes
-rw-r--r--locale/is/LC_MESSAGES/statusnet.po142
-rw-r--r--locale/it/LC_MESSAGES/statusnet.mobin54293 -> 0 bytes
-rw-r--r--locale/it/LC_MESSAGES/statusnet.po142
-rw-r--r--locale/ja/LC_MESSAGES/statusnet.mobin31052 -> 0 bytes
-rw-r--r--locale/ja/LC_MESSAGES/statusnet.po173
-rw-r--r--locale/ko/LC_MESSAGES/statusnet.mobin57596 -> 0 bytes
-rw-r--r--locale/ko/LC_MESSAGES/statusnet.po142
-rw-r--r--locale/mk/LC_MESSAGES/statusnet.mobin23107 -> 0 bytes
-rw-r--r--locale/mk/LC_MESSAGES/statusnet.po143
-rw-r--r--locale/nb/LC_MESSAGES/statusnet.mobin13985 -> 0 bytes
-rw-r--r--locale/nb/LC_MESSAGES/statusnet.po136
-rw-r--r--locale/nl/LC_MESSAGES/statusnet.mobin113010 -> 0 bytes
-rw-r--r--locale/nl/LC_MESSAGES/statusnet.po153
-rw-r--r--locale/nn/LC_MESSAGES/statusnet.mobin52282 -> 0 bytes
-rw-r--r--locale/nn/LC_MESSAGES/statusnet.po142
-rw-r--r--locale/pl/LC_MESSAGES/statusnet.mobin84319 -> 0 bytes
-rw-r--r--locale/pl/LC_MESSAGES/statusnet.po163
-rw-r--r--locale/pt/LC_MESSAGES/statusnet.mobin17764 -> 0 bytes
-rw-r--r--locale/pt/LC_MESSAGES/statusnet.po2473
-rw-r--r--locale/pt_BR/LC_MESSAGES/statusnet.mobin54022 -> 0 bytes
-rw-r--r--locale/pt_BR/LC_MESSAGES/statusnet.po145
-rw-r--r--locale/ru/LC_MESSAGES/statusnet.mobin136649 -> 0 bytes
-rw-r--r--locale/ru/LC_MESSAGES/statusnet.po235
-rw-r--r--locale/statusnet.po132
-rw-r--r--locale/sv/LC_MESSAGES/statusnet.mobin36689 -> 0 bytes
-rw-r--r--locale/sv/LC_MESSAGES/statusnet.po143
-rw-r--r--locale/te/LC_MESSAGES/statusnet.mobin41877 -> 0 bytes
-rw-r--r--locale/te/LC_MESSAGES/statusnet.po238
-rw-r--r--locale/tr/LC_MESSAGES/statusnet.mobin17491 -> 0 bytes
-rw-r--r--locale/tr/LC_MESSAGES/statusnet.po142
-rw-r--r--locale/uk/LC_MESSAGES/statusnet.mobin71199 -> 0 bytes
-rw-r--r--locale/uk/LC_MESSAGES/statusnet.po1919
-rw-r--r--locale/vi/LC_MESSAGES/statusnet.mobin36601 -> 0 bytes
-rw-r--r--locale/vi/LC_MESSAGES/statusnet.po143
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.mobin42849 -> 0 bytes
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.po143
-rw-r--r--locale/zh_TW/LC_MESSAGES/statusnet.mobin8296 -> 0 bytes
-rw-r--r--locale/zh_TW/LC_MESSAGES/statusnet.po140
-rw-r--r--plugins/InfiniteScroll/infinitescroll.js2
-rw-r--r--plugins/LilUrl/LilUrlPlugin.php2
-rw-r--r--plugins/Mapstraction/MapstractionPlugin.php68
-rw-r--r--plugins/Meteor/meteorupdater.js2
-rw-r--r--plugins/MobileProfile/MobileProfilePlugin.php10
-rw-r--r--plugins/MobileProfile/mp-screen.css45
-rw-r--r--plugins/PtitUrl/PtitUrlPlugin.php9
-rw-r--r--plugins/Realtime/realtimeupdate.js12
-rw-r--r--plugins/TightUrl/TightUrlPlugin.php9
-rw-r--r--plugins/UrlShortener/UrlShortenerPlugin.php8
-rw-r--r--plugins/UserFlag/UserFlagPlugin.php12
-rw-r--r--plugins/UserFlag/adminprofileflag.php5
-rw-r--r--plugins/UserFlag/flagprofile.php26
-rw-r--r--plugins/UserFlag/flagprofileform.php12
-rw-r--r--plugins/UserFlag/icon_flag.gif (renamed from plugins/UserFlag/flag.gif)bin80 -> 80 bytes
-rw-r--r--plugins/UserFlag/userflag.css4
-rwxr-xr-x[-rw-r--r--]scripts/checkschema.php0
-rwxr-xr-xscripts/stopdaemons.sh2
-rwxr-xr-xscripts/update_translations.php3
-rw-r--r--scripts/updateavatarurl.php128
-rw-r--r--theme/README (renamed from theme/readme.txt)8
-rw-r--r--theme/base/css/display.css42
-rw-r--r--theme/base/images/icons/icons-01.gifbin2913 -> 3097 bytes
-rw-r--r--theme/base/images/icons/twotone/green/badge.gifbin0 -> 105 bytes
-rw-r--r--theme/base/images/icons/twotone/green/sandbox.gifbin0 -> 104 bytes
-rw-r--r--theme/base/images/icons/twotone/green/silence.gifbin0 -> 103 bytes
-rw-r--r--theme/base/images/icons/twotone/green/skull.gifbin0 -> 85 bytes
-rw-r--r--theme/default/css/display.css44
-rw-r--r--theme/default/css/ie.css8
-rw-r--r--theme/identica/css/display.css44
-rw-r--r--theme/identica/css/ie.css2
129 files changed, 7662 insertions, 5032 deletions
diff --git a/README b/README
index eb1fb8cd7..51a8e91cc 100644
--- a/README
+++ b/README
@@ -98,7 +98,6 @@ released Aug 26 2009. Notable changes this version:
- Better error handling in Twitter posting.
- Show oEmbed data for XHTML files as well as plain HTML.
- Updated bug database link in README.
-- require HTML tidy extension.
- add support for HTTP Basic Auth in PHP CGI or FastCGI (e.g. GoDaddy).
- autofocus input to selected entry elements depending on page.
- updated layout for filter-by-tag form.
@@ -179,7 +178,6 @@ Your PHP installation must include the following PHP extensions:
- GD. For scaling down avatar images.
- mbstring. For handling Unicode (UTF-8) encoded strings.
- gettext. For multiple languages. Default on many PHP installs.
-- tidy. Used to clean up HTML/URLs for the URL shortener to consume.
For some functionality, you will also need the following extensions:
diff --git a/actions/apidirectmessagenew.php b/actions/apidirectmessagenew.php
index fed6acc30..e6c39ce4a 100644
--- a/actions/apidirectmessagenew.php
+++ b/actions/apidirectmessagenew.php
@@ -79,7 +79,7 @@ class ApiDirectMessageNewAction extends ApiAuthAction
$this->source = $this->trimmed('source'); // Not supported by Twitter.
$reserved_sources = array('web', 'omb', 'mail', 'xmpp', 'api');
- if (empty($thtis->source) || in_array($this->source, $reserved_sources)) {
+ if (empty($this->source) || in_array($this->source, $reserved_sources)) {
$source = 'api';
}
diff --git a/actions/apigroupshow.php b/actions/apigroupshow.php
index f9b960747..aae4d249c 100644
--- a/actions/apigroupshow.php
+++ b/actions/apigroupshow.php
@@ -96,7 +96,7 @@ class ApiGroupShowAction extends ApiPrivateAuthAction
switch($this->format) {
case 'xml':
- $this->show_single_xml_group($this->group);
+ $this->showSingleXmlGroup($this->group);
break;
case 'json':
$this->showSingleJsonGroup($this->group);
diff --git a/actions/finishremotesubscribe.php b/actions/finishremotesubscribe.php
index b1cec66f4..deee70f36 100644
--- a/actions/finishremotesubscribe.php
+++ b/actions/finishremotesubscribe.php
@@ -89,12 +89,16 @@ class FinishremotesubscribeAction extends Action
}
$remote = Remote_profile::staticGet('uri', $service->getListenerURI());
+ if ($remote) {
+ // Note remote profile may not have been saved yet.
+ // @fixme not convinced this is correct at all!
- $profile = Profile::staticGet($remote->id);
+ $profile = Profile::staticGet($remote->id);
- if ($user->hasBlocked($profile)) {
- $this->clientError(_('That user has blocked you from subscribing.'));
- return;
+ if ($user->hasBlocked($profile)) {
+ $this->clientError(_('That user has blocked you from subscribing.'));
+ return;
+ }
}
/* Perform the handling itself via libomb. */
@@ -122,6 +126,7 @@ class FinishremotesubscribeAction extends Action
/* The service URLs are not accessible from datastore, so setting them
after insertion of the profile. */
+ $remote = Remote_profile::staticGet('uri', $service->getListenerURI());
$orig_remote = clone($remote);
$remote->postnoticeurl =
diff --git a/actions/login.php b/actions/login.php
index cee29fd09..cd1326813 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -79,8 +79,6 @@ class LoginAction extends Action
$this->clientError(_('Already logged in.'));
} else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$this->checkLogin();
- } else if (isset($args['user_id']) && isset($args['token'])){
- $this->checkLogin($args['user_id'],$args['token']);
} else {
common_ensure_session();
$this->showForm();
@@ -97,7 +95,7 @@ class LoginAction extends Action
* @return void
*/
- function checkLogin($user_id=null, $token=null)
+ function checkLogin()
{
if(isset($token) && isset($user_id)){
//Token based login (from the LoginCommand)
@@ -139,6 +137,11 @@ class LoginAction extends Action
$user = common_check_user($nickname, $password);
}
+ $nickname = common_canonical_nickname($this->trimmed('nickname'));
+ $password = $this->arg('password');
+
+ $user = common_check_user($nickname, $password);
+
if (!$user) {
$this->showForm(_('Incorrect username or password.'));
return;
diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php
index 4395f772b..3bb8e3bb9 100644
--- a/actions/passwordsettings.php
+++ b/actions/passwordsettings.php
@@ -170,7 +170,7 @@ class PasswordsettingsAction extends AccountSettingsAction
}
$success = false;
- if(! Event::handle('StartChangePassword', array($user, $oldpassword, $newpassword))){
+ if(Event::handle('StartChangePassword', array($user, $oldpassword, $newpassword))){
//no handler changed the password, so change the password internally
$original = clone($user);
diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index 74025cf80..c723d53a1 100644
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -166,7 +166,7 @@ class RemotesubscribeAction extends Action
omb_oauth_datastore());
} catch (OMB_InvalidYadisException $e) {
$this->showForm(_('Not a valid profile URL (no YADIS document or ' .
- 'no or invalid XRDS defined).'));
+ 'invalid XRDS defined).'));
return;
}
diff --git a/classes/Login_token.php b/classes/Login_token.php
deleted file mode 100644
index bd6381f90..000000000
--- a/classes/Login_token.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Table Definition for group_alias
- *
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2009, StatusNet, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
-
-require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
-
-class Login_token extends Memcached_DataObject
-{
- ###START_AUTOCODE
- /* the code below is auto generated do not remove the above tag */
-
- public $__table = 'login_token'; // table name
- public $user_id; // int(4) primary_key not_null
- public $token; // char(32) not_null
- public $created; // datetime() not_null
- public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
-
- /* Static get */
- function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Login_token',$k,$v); }
-
- /* the code above is auto generated do not remove the tag below */
- ###END_AUTOCODE
-}
diff --git a/classes/Notice.php b/classes/Notice.php
index ebb5022b9..661072156 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -922,13 +922,14 @@ class Notice extends Memcached_DataObject
}
$groups = $this->saveGroups();
+ $profile = $this->getProfile();
foreach ($groups as $group) {
$users = $group->getUserMembers();
foreach ($users as $id) {
if (!array_key_exists($id, $ni)) {
$user = User::staticGet('id', $id);
- if (!$user->hasBlocked($notice->profile_id)) {
+ if (!$user->hasBlocked($profile)) {
$ni[$id] = NOTICE_INBOX_SOURCE_GROUP;
}
}
@@ -964,7 +965,10 @@ class Notice extends Memcached_DataObject
}
if ($cnt >= MAX_BOXCARS) {
$inbox = new Notice_inbox();
- $inbox->query($qry);
+ $result = $inbox->query($qry);
+ if (PEAR::isError($result)) {
+ common_log_db_error($inbox, $qry);
+ }
$qry = $qryhdr;
$cnt = 0;
}
@@ -972,7 +976,10 @@ class Notice extends Memcached_DataObject
if ($cnt > 0) {
$inbox = new Notice_inbox();
- $inbox->query($qry);
+ $result = $inbox->query($qry);
+ if (PEAR::isError($result)) {
+ common_log_db_error($inbox, $qry);
+ }
}
return;
diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index b2509dac5..835faeb0b 100644
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -1,4 +1,3 @@
-
[avatar]
profile_id = 129
original = 17
@@ -542,4 +541,4 @@ created = 142
modified = 384
[user_group__keys]
-id = N \ No newline at end of file
+id = N
diff --git a/db/08to09.sql b/db/08to09.sql
index 64640f4ce..8d463fab4 100644
--- a/db/08to09.sql
+++ b/db/08to09.sql
@@ -72,13 +72,4 @@ create table location_namespace (
created datetime not null comment 'date the record was created',
modified timestamp comment 'date this record was modified'
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table login_token (
- user_id integer not null comment 'user owning this token' references user (id),
- token char(32) not null comment 'token useable for logging in',
- created datetime not null comment 'date this record was created',
- modified timestamp comment 'date this record was modified',
-
- constraint primary key (user_id)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; \ No newline at end of file
diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql
index 7aaf3a7a0..b312d47dd 100644
--- a/db/08to09_pg.sql
+++ b/db/08to09_pg.sql
@@ -39,15 +39,6 @@ create table profile_role (
);
-create table login_token (
- user_id integer not null /* comment 'user owning this token'*/ references "user" (id),
- token char(32) not null /* comment 'token useable for logging in'*/,
- created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created'*/,
- modified timestamp /* comment 'date this record was modified'*/,
-
- primary key (user_id)
-);
-
DROP index fave_user_id_idx;
CREATE index fave_user_id_idx on fave (user_id,modified);
@@ -60,3 +51,13 @@ CREATE index subscription_subscribed_idx ON subscription (subscribed,created);
DROP index notice_profile_id_idx;
CREATE index notice_profile_id_idx ON notice (profile_id,created,id);
+ALTER TABLE notice ADD COLUMN lat decimal(10, 7) /* comment 'latitude'*/;
+ALTER TABLE notice ADD COLUMN lon decimal(10,7) /* comment 'longitude'*/;
+ALTER TABLE notice ADD COLUMN location_id integer /* comment 'location id if possible'*/ ;
+ALTER TABLE notice ADD COLUMN location_ns integer /* comment 'namespace for location'*/;
+
+ALTER TABLE profile ADD COLUMN lat decimal(10,7) /*comment 'latitude'*/ ;
+ALTER TABLE profile ADD COLUMN lon decimal(10,7) /*comment 'longitude'*/;
+ALTER TABLE profile ADD COLUMN location_id integer /* comment 'location id if possible'*/;
+ALTER TABLE profile ADD COLUMN location_ns integer /* comment 'namespace for location'*/;
+ \ No newline at end of file
diff --git a/db/notice_source.sql b/db/notice_source.sql
index 10ff0d55a..50660e948 100644
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -11,6 +11,7 @@ VALUES
('cliqset', 'Cliqset', 'http://www.cliqset.com/', now()),
('deskbar','Deskbar-Applet','http://www.gnome.org/projects/deskbar-applet/', now()),
('Do','Gnome Do','http://do.davebsd.com/wiki/index.php?title=Microblog_Plugin', now()),
+ ('drupal','Drupal','http://drupal.org/', now()),
('eventbox','EventBox','http://thecosmicmachine.com/eventbox/ ', now()),
('Facebook','Facebook','http://apps.facebook.com/identica/', now()),
('feed2omb','feed2omb','http://projects.ciarang.com/p/feed2omb/', now()),
diff --git a/db/statusnet.sql b/db/statusnet.sql
index 18abcdfdb..f7b3b113b 100644
--- a/db/statusnet.sql
+++ b/db/statusnet.sql
@@ -575,13 +575,3 @@ create table location_namespace (
modified timestamp comment 'date this record was modified'
) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table login_token (
- user_id integer not null comment 'user owning this token' references user (id),
- token char(32) not null comment 'token useable for logging in',
- created datetime not null comment 'date this record was created',
- modified timestamp comment 'date this record was modified',
-
- constraint primary key (user_id)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql
index 927925753..cd72d66ea 100644
--- a/db/statusnet_pg.sql
+++ b/db/statusnet_pg.sql
@@ -1,5 +1,4 @@
/* local and remote users have profiles */
-
create sequence profile_seq;
create table profile (
id bigint default nextval('profile_seq') primary key /* comment 'unique identifier' */,
@@ -132,11 +131,14 @@ create table notice (
reply_to integer /* comment 'notice replied to (usually a guess)' */ references notice (id) ,
is_local integer default 0 /* comment 'notice was generated by a user' */,
source varchar(32) /* comment 'source of comment, like "web", "im", or "clientname"' */,
- conversation integer /*id of root notice in this conversation' */ references notice (id)
-
-
+ conversation integer /*id of root notice in this conversation' */ references notice (id),
+ lat decimal(10,7) /* comment 'latitude'*/ ,
+ lon decimal(10,7) /* comment 'longitude'*/ ,
+ location_id integer /* comment 'location id if possible'*/ ,
+ location_ns integer /* comment 'namespace for location'*/
/* FULLTEXT(content) */
);
+
create index notice_profile_id_idx on notice using btree(profile_id,created,id);
create index notice_created_idx on notice using btree(created);
@@ -568,14 +570,4 @@ create table profile_role (
primary key (profile_id, role)
-);
-
-create table login_token (
- user_id integer not null /* comment 'user owning this token'*/ references "user" (id),
- token char(32) not null /* comment 'token useable for logging in'*/,
- created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created'*/,
- modified timestamp /* comment 'date this record was modified'*/,
-
- primary key (user_id)
-);
-
+); \ No newline at end of file
diff --git a/doc-src/faq b/doc-src/faq
index 6aadd2e60..8e394806f 100644
--- a/doc-src/faq
+++ b/doc-src/faq
@@ -36,7 +36,7 @@ and many features people expect from microblogging sites are not yet implemented
* [Facebook](http://www.facebook.com/) integration
* Image, video, audio notices
-There is [a list of bugs and features](http://status.net/trac/) that you may find
+There is [a list of bugs and features](http://status.net/bugs/) that you may find
interesting. New ideas or complaints are very welcome.
diff --git a/install.php b/install.php
index e7f7cf318..1c62bb2b2 100644
--- a/install.php
+++ b/install.php
@@ -301,7 +301,7 @@ function checkPrereqs()
}
$reqs = array('gd', 'curl',
- 'xmlwriter', 'mbstring','tidy');
+ 'xmlwriter', 'mbstring', 'xml', 'dom', 'simplexml');
foreach ($reqs as $req) {
if (!checkExtension($req)) {
diff --git a/js/util.js b/js/util.js
index 9c79f837f..73fcf37be 100644
--- a/js/util.js
+++ b/js/util.js
@@ -131,34 +131,37 @@ var SN = { // StatusNet
},
FormXHR: function(f) {
- f.bind('submit', function(e) {
- form_id = $(this)[0].id;
- $.ajax({
- type: 'POST',
- dataType: 'xml',
- url: $(this)[0].action,
- data: $(this).serialize() + '&ajax=1',
- beforeSend: function(xhr) {
- $('#'+form_id).addClass(SN.C.S.Processing);
- $('#'+form_id+' .submit').addClass(SN.C.S.Disabled);
- $('#'+form_id+' .submit').attr(SN.C.S.Disabled, SN.C.S.Disabled);
- },
- error: function (xhr, textStatus, errorThrown) {
- alert(errorThrown || textStatus);
- },
- success: function(data, textStatus) {
- if (typeof($('form', data)[0]) != 'undefined') {
- form_new = document._importNode($('form', data)[0], true);
- $('#'+form_id).replaceWith(form_new);
- $('#'+form_new.id).each(function() { SN.U.FormXHR($(this)); });
- }
- else {
- $('#'+form_id).replaceWith(document._importNode($('p', data)[0], true));
+ if (jQuery.data(f[0], "ElementData") === undefined) {
+ jQuery.data(f[0], "ElementData", {Bind:'submit'});
+ f.bind('submit', function(e) {
+ form_id = $(this)[0].id;
+ $.ajax({
+ type: 'POST',
+ dataType: 'xml',
+ url: $(this)[0].action,
+ data: $(this).serialize() + '&ajax=1',
+ beforeSend: function(xhr) {
+ $('#'+form_id).addClass(SN.C.S.Processing);
+ $('#'+form_id+' .submit').addClass(SN.C.S.Disabled);
+ $('#'+form_id+' .submit').attr(SN.C.S.Disabled, SN.C.S.Disabled);
+ },
+ error: function (xhr, textStatus, errorThrown) {
+ alert(errorThrown || textStatus);
+ },
+ success: function(data, textStatus) {
+ if (typeof($('form', data)[0]) != 'undefined') {
+ form_new = document._importNode($('form', data)[0], true);
+ $('#'+form_id).replaceWith(form_new);
+ $('#'+form_new.id).each(function() { SN.U.FormXHR($(this)); });
+ }
+ else {
+ $('#'+form_id).replaceWith(document._importNode($('p', data)[0], true));
+ }
}
- }
+ });
+ return false;
});
- return false;
- });
+ }
},
FormNoticeXHR: function(form) {
@@ -182,7 +185,7 @@ var SN = { // StatusNet
$('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled);
$('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled, SN.C.S.Disabled);
if (textStatus == 'timeout') {
- alert ('Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists');
+ form.append('<p class="error>Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.</p>');
}
else {
if ($('.'+SN.C.S.Error, xhr.responseXML).length > 0) {
@@ -190,7 +193,7 @@ var SN = { // StatusNet
}
else {
if(jQuery.inArray(parseInt(xhr.status), SN.C.I.HTTP20x30x) < 0) {
- alert('Sorry! We had trouble sending your notice ('+xhr.status+' '+xhr.statusText+'). Please report the problem to the site administrator if this happens again.');
+ form.append('<p class="error>(Sorry! We had trouble sending your notice ('+xhr.status+' '+xhr.statusText+'). Please report the problem to the site administrator if this happens again.</p>');
}
else {
$('#'+form_id+' #'+SN.C.S.NoticeDataText).val('');
@@ -202,8 +205,9 @@ var SN = { // StatusNet
success: function(data, textStatus) {
var result;
if ($('#'+SN.C.S.Error, data).length > 0) {
- result = document._importNode($('p', data)[0], true);
- alert(result.textContent || result.innerHTML);
+ result = document._importNode($('p', data)[0], true);
+ result = result.textContent || result.innerHTML;
+ form.append('<p class="error">'+result+'</p>');
}
else {
if($('body')[0].id == 'bookmarklet') {
@@ -212,28 +216,37 @@ var SN = { // StatusNet
if ($('#'+SN.C.S.CommandResult, data).length > 0) {
result = document._importNode($('p', data)[0], true);
- alert(result.textContent || result.innerHTML);
+ result = result.textContent || result.innerHTML;
+ form.append('<p class="success">'+result+'</p>');
}
else {
- notice = document._importNode($('li', data)[0], true);
- if ($('#'+notice.id).length === 0) {
- var notice_irt_value = $('#'+SN.C.S.NoticeInReplyTo).val();
- var notice_irt = '#notices_primary #notice-'+notice_irt_value;
- if($('body')[0].id == 'conversation') {
- if(notice_irt_value.length > 0 && $(notice_irt+' .notices').length < 1) {
- $(notice_irt).append('<ul class="notices"></ul>');
+ var notices = $('#notices_primary .notices');
+ if (notices.length > 0) {
+ var notice = document._importNode($('li', data)[0], true);
+ if ($('#'+notice.id).length === 0) {
+ var notice_irt_value = $('#'+SN.C.S.NoticeInReplyTo).val();
+ var notice_irt = '#notices_primary #notice-'+notice_irt_value;
+ if($('body')[0].id == 'conversation') {
+ if(notice_irt_value.length > 0 && $(notice_irt+' .notices').length < 1) {
+ $(notice_irt).append('<ul class="notices"></ul>');
+ }
+ $($(notice_irt+' .notices')[0]).append(notice);
}
- $($(notice_irt+' .notices')[0]).append(notice);
- }
- else {
- $("#notices_primary .notices").prepend(notice);
+ else {
+ notices.prepend(notice);
+ }
+ $('#'+notice.id).css({display:'none'});
+ $('#'+notice.id).fadeIn(2500);
+ SN.U.NoticeWithAttachment($('#'+notice.id));
+ SN.U.NoticeReplyTo($('#'+notice.id));
+ SN.U.FormXHR($('#'+notice.id+' .form_favor'));
}
- $('#'+notice.id).css({display:'none'});
- $('#'+notice.id).fadeIn(2500);
- SN.U.NoticeAttachments();
- SN.U.NoticeReply();
- SN.U.NoticeFavor();
- }
+ }
+ else {
+ result = document._importNode($('title', data)[0], true);
+ result_title = result.textContent || result.innerHTML;
+ form.append('<p class="success">'+result_title+'</p>');
+ }
}
$('#'+form_id+' #'+SN.C.S.NoticeDataText).val('');
$('#'+form_id+' #'+SN.C.S.NoticeDataAttach).val('');
@@ -252,13 +265,20 @@ var SN = { // StatusNet
NoticeReply: function() {
if ($('#'+SN.C.S.NoticeDataText).length > 0 && $('#content .notice_reply').length > 0) {
- $('#content .notice').each(function() {
- var notice = $(this)[0];
- $($('.notice_reply', notice)[0]).click(function() {
- var nickname = ($('.author .nickname', notice).length > 0) ? $($('.author .nickname', notice)[0]) : $('.author .nickname.uid');
- SN.U.NoticeReplySet(nickname.text(), $($('.notice_id', notice)[0]).text());
- return false;
- });
+ $('#content .notice').each(function() { SN.U.NoticeReplyTo($(this)); });
+ }
+ },
+
+ NoticeReplyTo: function(notice_item) {
+ var notice = notice_item[0];
+ var notice_reply = $('.notice_reply', notice)[0];
+
+ if (jQuery.data(notice_reply, "ElementData") === undefined) {
+ jQuery.data(notice_reply, "ElementData", {Bind:'submit'});
+ $(notice_reply).bind('click', function() {
+ var nickname = ($('.author .nickname', notice).length > 0) ? $($('.author .nickname', notice)[0]) : $('.author .nickname.uid');
+ SN.U.NoticeReplySet(nickname.text(), $($('.notice_id', notice)[0]).text());
+ return false;
});
}
},
@@ -266,19 +286,18 @@ var SN = { // StatusNet
NoticeReplySet: function(nick,id) {
if (nick.match(SN.C.I.PatternUsername)) {
var text = $('#'+SN.C.S.NoticeDataText);
- if (text.length) {
+ if (text.length > 0) {
replyto = '@' + nick + ' ';
text.val(replyto + text.val().replace(RegExp(replyto, 'i'), ''));
- $('#'+SN.C.S.FormNotice+' input#'+SN.C.S.NoticeInReplyTo).val(id);
+ $('#'+SN.C.S.FormNotice+' #'+SN.C.S.NoticeInReplyTo).val(id);
+
+ text[0].focus();
if (text[0].setSelectionRange) {
var len = text.val().length;
text[0].setSelectionRange(len,len);
- text[0].focus();
}
- return false;
}
}
- return true;
},
NoticeFavor: function() {
@@ -287,13 +306,25 @@ var SN = { // StatusNet
},
NoticeAttachments: function() {
+ $('.notice a.attachment').each(function() {
+ SN.U.NoticeWithAttachment($(this).closest('.notice'));
+ });
+ },
+
+ NoticeWithAttachment: function(notice) {
+ if ($('.attachment', notice).length === 0) {
+ return;
+ }
+
+ var notice_id = notice.attr('id');
+
$.fn.jOverlay.options = {
method : 'GET',
data : '',
url : '',
color : '#000',
opacity : '0.6',
- zIndex : 99,
+ zIndex : 9999,
center : false,
imgLoading : $('address .url')[0].href+'theme/base/images/illustrations/illu_progress_loading-01.gif',
bgClickToClose : true,
@@ -306,13 +337,13 @@ var SN = { // StatusNet
css : {'max-width':'542px', 'top':'5%', 'left':'32.5%'}
};
- $('#content .notice a.attachment').click(function() {
+ $('#'+notice_id+' a.attachment').click(function() {
$().jOverlay({url: $('address .url')[0].href+'attachment/' + ($(this).attr('id').substring('attachment'.length + 1)) + '/ajax'});
return false;
});
var t;
- $("body:not(#shownotice) #content .notice a.thumbnail").hover(
+ $("body:not(#shownotice) #"+notice_id+" a.thumbnail").hover(
function() {
var anchor = $(this);
$("a.thumbnail").children('img').hide();
@@ -365,9 +396,10 @@ var SN = { // StatusNet
NewDirectMessage: function() {
NDM = $('.entity_send-a-message a');
NDM.attr({'href':NDM.attr('href')+'&ajax=1'});
- NDM.click(function() {
+ NDM.bind('click', function() {
var NDMF = $('.entity_send-a-message form');
if (NDMF.length === 0) {
+ $(this).addClass('processing');
$.get(NDM.attr('href'), null, function(data) {
$('.entity_send-a-message').append(document._importNode($('form', data)[0], true));
NDMF = $('.entity_send-a-message .form_notice');
@@ -378,6 +410,7 @@ var SN = { // StatusNet
NDMF.hide();
return false;
});
+ NDM.removeClass('processing');
});
}
else {
@@ -419,8 +452,6 @@ var SN = { // StatusNet
$('.form_group_join').each(function() { SN.U.FormXHR($(this)); });
$('.form_group_leave').each(function() { SN.U.FormXHR($(this)); });
$('.form_user_nudge').each(function() { SN.U.FormXHR($(this)); });
-
- SN.U.NewDirectMessage();
}
}
}
diff --git a/lib/command.php b/lib/command.php
index 7e98156b6..bcc551c81 100644
--- a/lib/command.php
+++ b/lib/command.php
@@ -579,32 +579,6 @@ class OnCommand extends Command
}
}
-class LoginCommand extends Command
-{
- function execute($channel)
- {
- $login_token = Login_token::staticGet('user_id',$this->user->id);
- if($login_token){
- $login_token->delete();
- }
- $login_token = new Login_token();
- $login_token->user_id = $this->user->id;
- $login_token->token = common_good_rand(16);
- $login_token->created = common_sql_now();
- $result = $login_token->insert();
- if (!$result) {
- common_log_db_error($login_token, 'INSERT', __FILE__);
- $channel->error($this->user, sprintf(_('Could not create login token for %s'),
- $this->user->nickname));
- return;
- }
- $channel->output($this->user,
- sprintf(_('This link is useable only once, and is good for only 2 minutes: %s'),
- common_local_url('login',
- array('user_id'=>$login_token->user_id, 'token'=>$login_token->token))));
- }
-}
-
class SubscriptionsCommand extends Command
{
function execute($channel)
@@ -692,7 +666,6 @@ class HelpCommand extends Command
"reply #<notice_id> - reply to notice with a given id\n".
"reply <nickname> - reply to the last notice from user\n".
"join <group> - join group\n".
- "login - Get a link to login to the web interface\n".
"drop <group> - leave group\n".
"stats - get your stats\n".
"stop - same as 'off'\n".
diff --git a/lib/commandinterpreter.php b/lib/commandinterpreter.php
index 665015afc..25f2e4b3e 100644
--- a/lib/commandinterpreter.php
+++ b/lib/commandinterpreter.php
@@ -41,12 +41,6 @@ class CommandInterpreter
return null;
}
return new HelpCommand($user);
- case 'login':
- if ($arg) {
- return null;
- } else {
- return new LoginCommand($user);
- }
case 'subscribers':
if ($arg) {
return null;
diff --git a/lib/default.php b/lib/default.php
index 95366e0b3..d4ef045ea 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -226,4 +226,6 @@ $default =
array('contentlimit' => null),
'location' =>
array('namespace' => 1), // 1 = geonames, 2 = Yahoo Where on Earth
+ 'omb' =>
+ array('timeout' => 5), // HTTP request timeout in seconds when contacting remote hosts for OMB updates
);
diff --git a/lib/designsettings.php b/lib/designsettings.php
index 5ce9ddeda..99f44b5b7 100644
--- a/lib/designsettings.php
+++ b/lib/designsettings.php
@@ -107,7 +107,7 @@ class DesignSettingsAction extends AccountSettingsAction
'type' => 'file',
'id' => 'design_background-image_file'));
$this->element('p', 'form_guide', _('You can upload your personal ' .
- 'background image. The maximum file size is 2Mb.'));
+ 'background image. The maximum file size is 2MB.'));
$this->element('input', array('name' => 'MAX_FILE_SIZE',
'type' => 'hidden',
'id' => 'MAX_FILE_SIZE',
diff --git a/lib/imagefile.php b/lib/imagefile.php
index cf1668f20..6bc8e599b 100644
--- a/lib/imagefile.php
+++ b/lib/imagefile.php
@@ -214,9 +214,9 @@ class ImageFile
$value = ImageFile::maxFileSizeInt();
if ($value > 1024 * 1024) {
- return ($value/(1024*1024)).'Mb';
+ return ($value/(1024*1024)) . _('MB');
} else if ($value > 1024) {
- return ($value/(1024)).'kB';
+ return ($value/(1024)) . _('kB');
} else {
return $value;
}
diff --git a/lib/jabber.php b/lib/jabber.php
index a8e295ea5..01aed8ffa 100644
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -176,7 +176,6 @@ function jabber_format_entry($profile, $notice)
$xs = new XMLStringer();
$xs->elementStart('html', array('xmlns' => 'http://jabber.org/protocol/xhtml-im'));
$xs->elementStart('body', array('xmlns' => 'http://www.w3.org/1999/xhtml'));
- $xs->element("img", array('src'=> $profile->avatarUrl(AVATAR_MINI_SIZE)));
$xs->element('a', array('href' => $profile->profileurl),
$profile->nickname);
$xs->text(": ");
diff --git a/lib/language.php b/lib/language.php
index a99bf89e3..4fc45bafe 100644
--- a/lib/language.php
+++ b/lib/language.php
@@ -172,6 +172,7 @@ function get_all_languages() {
'fr-fr' => array('q' => 1, 'lang' => 'fr', 'name' => 'French', 'direction' => 'ltr'),
'ga' => array('q' => 0.5, 'lang' => 'ga', 'name' => 'Galician', 'direction' => 'ltr'),
'he' => array('q' => 0.5, 'lang' => 'he', 'name' => 'Hebrew', 'direction' => 'rtl'),
+ 'hsb' => array('q' => 0.8, 'lang' => 'hsb', 'name' => 'Upper Sorbian', 'direction' => 'ltr'),
'is' => array('q' => 0.1, 'lang' => 'is', 'name' => 'Icelandic', 'direction' => 'ltr'),
'it' => array('q' => 1, 'lang' => 'it', 'name' => 'Italian', 'direction' => 'ltr'),
'jp' => array('q' => 0.5, 'lang' => 'ja', 'name' => 'Japanese', 'direction' => 'ltr'),
diff --git a/lib/omb.php b/lib/omb.php
index e2a6d9f3f..0f38a4936 100644
--- a/lib/omb.php
+++ b/lib/omb.php
@@ -167,6 +167,7 @@ class StatusNet_OMB_Service_Consumer extends OMB_Service_Consumer {
$this->datastore = omb_oauth_datastore();
$this->oauth_consumer = omb_oauth_consumer();
$this->fetcher = Auth_Yadis_Yadis::getHTTPFetcher();
+ $this->fetcher->timeout = intval(common_config('omb', 'timeout'));
}
}
diff --git a/lib/popularnoticesection.php b/lib/popularnoticesection.php
index 35b914a50..9fbc9d2dd 100644
--- a/lib/popularnoticesection.php
+++ b/lib/popularnoticesection.php
@@ -68,8 +68,9 @@ class PopularNoticeSection extends NoticeSection
}
$qry .= ' GROUP BY notice.id,notice.profile_id,notice.content,notice.uri,' .
'notice.rendered,notice.url,notice.created,notice.modified,' .
- 'notice.reply_to,notice.is_local,notice.source,notice.conversation ' .
- 'ORDER BY weight DESC';
+ 'notice.reply_to,notice.is_local,notice.source,notice.conversation, ' .
+ 'notice.lat,notice.lon,location_id,location_ns' .
+ ' ORDER BY weight DESC';
$offset = 0;
$limit = NOTICES_PER_SECTION + 1;
diff --git a/lib/profileaction.php b/lib/profileaction.php
index e3a39ad8b..2d4d23265 100644
--- a/lib/profileaction.php
+++ b/lib/profileaction.php
@@ -166,6 +166,7 @@ class ProfileAction extends OwnerDesignAction
$subs_count = $this->profile->subscriptionCount();
$subbed_count = $this->profile->subscriberCount();
$notice_count = $this->profile->noticeCount();
+ $group_count = $this->user->getGroups()->N;
$this->elementStart('div', array('id' => 'entity_statistics',
'class' => 'section'));
@@ -202,6 +203,15 @@ class ProfileAction extends OwnerDesignAction
$this->element('dd', 'subscribers', $subbed_count);
$this->elementEnd('dl');
+ $this->elementStart('dl', 'entity_groups');
+ $this->elementStart('dt');
+ $this->element('a', array('href' => common_local_url('usergroups',
+ array('nickname' => $this->profile->nickname))),
+ _('Groups'));
+ $this->elementEnd('dt');
+ $this->element('dd', 'groups', $group_count);
+ $this->elementEnd('dl');
+
$this->elementStart('dl', 'entity_notices');
$this->element('dt', null, _('Notices'));
$this->element('dd', null, $notice_count);
diff --git a/lib/router.php b/lib/router.php
index b22185126..1a090861e 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -88,8 +88,6 @@ class Router
$m->connect('doc/:title', array('action' => 'doc'));
- $m->connect('main/login?user_id=:user_id&token=:token', array('action'=>'login'), array('user_id'=> '[0-9]+', 'token'=>'.+'));
-
// main stuff is repetitive
$main = array('login', 'logout', 'register', 'subscribe',
@@ -360,6 +358,10 @@ class Router
// users
+ $m->connect('api/users/show.:format',
+ array('action' => 'ApiUserShow',
+ 'format' => '(xml|json)'));
+
$m->connect('api/users/show/:id.:format',
array('action' => 'ApiUserShow',
'id' => '[a-zA-Z0-9]+',
diff --git a/lib/rssaction.php b/lib/rssaction.php
index 3b303f73e..d591c99ed 100644
--- a/lib/rssaction.php
+++ b/lib/rssaction.php
@@ -176,8 +176,10 @@ class Rss10Action extends Action
$this->showChannel();
$this->showImage();
- foreach ($this->notices as $n) {
- $this->showItem($n);
+ if (count($this->notices)) {
+ foreach ($this->notices as $n) {
+ $this->showItem($n);
+ }
}
$this->showCreators();
@@ -203,8 +205,10 @@ class Rss10Action extends Action
$this->elementStart('items');
$this->elementStart('rdf:Seq');
- foreach ($this->notices as $notice) {
- $this->element('rdf:li', array('rdf:resource' => $notice->uri));
+ if (count($this->notices)) {
+ foreach ($this->notices as $notice) {
+ $this->element('rdf:li', array('rdf:resource' => $notice->uri));
+ }
}
$this->elementEnd('rdf:Seq');
diff --git a/lib/userprofile.php b/lib/userprofile.php
index ee205af85..07e575085 100644
--- a/lib/userprofile.php
+++ b/lib/userprofile.php
@@ -304,34 +304,43 @@ class UserProfile extends Widget
}
$this->out->elementEnd('li');
- if ($cur->hasRight(Right::SANDBOXUSER)) {
- $this->out->elementStart('li', 'entity_sandbox');
- if ($this->user->isSandboxed()) {
- $usf = new UnSandboxForm($this->out, $this->profile, $r2args);
- $usf->show();
- } else {
- $sf = new SandboxForm($this->out, $this->profile, $r2args);
- $sf->show();
+ if ($cur->hasRight(Right::SANDBOXUSER) ||
+ $cur->hasRight(Right::SILENCEUSER) ||
+ $cur->hasRight(Right::DELETEUSER)) {
+ $this->out->elementStart('li', 'entity_moderation');
+ $this->out->element('p', null, _('Moderate'));
+ $this->out->elementStart('ul');
+ if ($cur->hasRight(Right::SANDBOXUSER)) {
+ $this->out->elementStart('li', 'entity_sandbox');
+ if ($this->user->isSandboxed()) {
+ $usf = new UnSandboxForm($this->out, $this->profile, $r2args);
+ $usf->show();
+ } else {
+ $sf = new SandboxForm($this->out, $this->profile, $r2args);
+ $sf->show();
+ }
+ $this->out->elementEnd('li');
}
- $this->out->elementEnd('li');
- }
- if ($cur->hasRight(Right::SILENCEUSER)) {
- $this->out->elementStart('li', 'entity_silence');
- if ($this->user->isSilenced()) {
- $usf = new UnSilenceForm($this->out, $this->profile, $r2args);
- $usf->show();
- } else {
- $sf = new SilenceForm($this->out, $this->profile, $r2args);
- $sf->show();
+ if ($cur->hasRight(Right::SILENCEUSER)) {
+ $this->out->elementStart('li', 'entity_silence');
+ if ($this->user->isSilenced()) {
+ $usf = new UnSilenceForm($this->out, $this->profile, $r2args);
+ $usf->show();
+ } else {
+ $sf = new SilenceForm($this->out, $this->profile, $r2args);
+ $sf->show();
+ }
+ $this->out->elementEnd('li');
}
- $this->out->elementEnd('li');
- }
- if ($cur->hasRight(Right::DELETEUSER)) {
- $this->out->elementStart('li', 'entity_delete');
- $df = new DeleteUserForm($this->out, $this->profile, $r2args);
- $df->show();
+ if ($cur->hasRight(Right::DELETEUSER)) {
+ $this->out->elementStart('li', 'entity_delete');
+ $df = new DeleteUserForm($this->out, $this->profile, $r2args);
+ $df->show();
+ $this->out->elementEnd('li');
+ }
+ $this->out->elementEnd('ul');
$this->out->elementEnd('li');
}
}
diff --git a/lib/util.php b/lib/util.php
index 6946f60fe..99a0a1db3 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1050,8 +1050,27 @@ function common_log_line($priority, $msg)
return date('Y-m-d H:i:s') . ' ' . $syslog_priorities[$priority] . ': ' . $msg . "\n";
}
+function common_request_id()
+{
+ $pid = getmypid();
+ if (php_sapi_name() == 'cli') {
+ return $pid;
+ } else {
+ static $req_id = null;
+ if (!isset($req_id)) {
+ $req_id = substr(md5(mt_rand()), 0, 8);
+ }
+ if (isset($_SERVER['REQUEST_URI'])) {
+ $url = $_SERVER['REQUEST_URI'];
+ }
+ $method = $_SERVER['REQUEST_METHOD'];
+ return "$pid.$req_id $method $url";
+ }
+}
+
function common_log($priority, $msg, $filename=null)
{
+ $msg = '[' . common_request_id() . '] ' . $msg;
$logfile = common_config('site', 'logfile');
if ($logfile) {
$log = fopen($logfile, "a");
diff --git a/locale/Makefile b/locale/Makefile
new file mode 100644
index 000000000..00700ada1
--- /dev/null
+++ b/locale/Makefile
@@ -0,0 +1,13 @@
+# Warning: do not transform tabs to spaces in this file.
+
+all : translations
+
+trans = $(patsubst %.po,%.mo,$(wildcard */LC_MESSAGES/statusnet.po))
+
+translations : $(trans)
+
+clean :
+ rm -f $(trans)
+
+%.mo : %.po
+ msgfmt -o $@ $<
diff --git a/locale/README b/locale/README
new file mode 100644
index 000000000..25df9ee74
--- /dev/null
+++ b/locale/README
@@ -0,0 +1,9 @@
+Localizations for StatusNet are being maintained through TranslateWiki:
+http://translatewiki.net/wiki/Translating:StatusNet
+
+Note if you are working with a direct git checkout, you will need to build
+the binary .mo files from the .po source files for translations to work
+in the web app.
+
+If gettext and GNU make are installed, you can simply run 'make' in this
+directory to build them.
diff --git a/locale/ar/LC_MESSAGES/statusnet.mo b/locale/ar/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 54a7df9a8..000000000
--- a/locale/ar/LC_MESSAGES/statusnet.mo
+++ /dev/null
Binary files differ
diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index 3de9756b8..2b8f80bdc 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-23 21:46+0000\n"
-"PO-Revision-Date: 2009-11-23 21:46:52+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:19:01+0000\n"
"Language-Team: Arabic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59365); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ar\n"
"X-Message-Group: out-statusnet\n"
@@ -560,7 +560,7 @@ msgstr ""
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -727,7 +727,7 @@ msgid "Conversation"
msgstr "محادثة"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "الإشعارات"
@@ -836,7 +836,7 @@ msgstr "سمة الموقع."
#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
-msgstr "غيّر صورة الخلفية"
+msgstr "تغيير صورة الخلفية"
#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
@@ -868,7 +868,7 @@ msgstr ""
#: actions/designadminpanel.php:483 lib/designsettings.php:170
msgid "Change colours"
-msgstr "غيّر الألوان"
+msgstr "تغيير الألوان"
#: actions/designadminpanel.php:505 lib/designsettings.php:191
msgid "Content"
@@ -1132,7 +1132,7 @@ msgstr ""
msgid "New incoming email address added."
msgstr ""
-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr ""
@@ -1225,23 +1225,23 @@ msgstr "المستخدم الذي تستمع إليه غير موجود."
msgid "You can use the local subscription!"
msgstr ""
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr ""
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
msgstr "لا تملك تصريحًا."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
msgid "Could not convert request token to access token."
msgstr ""
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
msgid "Remote service uses unknown version of OMB protocol."
msgstr ""
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "خطأ أثناء تحديث الملف الشخصي البعيد"
@@ -1302,7 +1302,7 @@ msgstr ""
#: actions/groupblock.php:178
msgid "Do not block this user from this group"
-msgstr ""
+msgstr "لا تمنع هذا المستخدم من هذه المجموعة"
#: actions/groupblock.php:179
msgid "Block this user from this group"
@@ -1436,8 +1436,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "مجموعات"
@@ -1721,57 +1721,57 @@ msgstr ""
msgid "Already logged in."
msgstr "والج بالفعل."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
msgid "Invalid or expired token."
msgstr ""
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "اسم المستخدم أو كلمة السر غير صحيحان."
-#: actions/login.php:149
+#: actions/login.php:152
msgid "Error setting user. You are probably not authorized."
msgstr "خطأ أثناء ضبط المستخدم. لست مُصرحًا على الأرجح."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "لُج"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "لُج إلى الموقع"
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "الاسم المستعار"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "كلمة السر"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "تذكّرني"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "أنسيت كلمة السر؟"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
-#: actions/login.php:286
+#: actions/login.php:289
#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2654,7 +2654,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:356
+#: lib/userprofile.php:365
msgid "Subscribe"
msgstr "اشترك"
@@ -2663,8 +2663,7 @@ 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)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr ""
#: actions/remotesubscribe.php:176
@@ -2845,7 +2844,7 @@ msgid "Members"
msgstr "الأعضاء"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(لا شيء)"
@@ -2854,7 +2853,7 @@ msgstr "(لا شيء)"
msgid "All members"
msgstr "جميع الأعضاء"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "إحصاءات"
@@ -3788,7 +3787,7 @@ msgstr ""
msgid "Problem saving notice."
msgstr "مشكلة أثناء حفظ الإشعار."
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
@@ -4204,21 +4203,11 @@ msgstr ""
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:618
+#: lib/command.php:592
msgid "You are not subscribed to anyone."
msgstr "لست مُشتركًا بأي أحد."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "لست مشتركًا بأحد."
@@ -4228,11 +4217,11 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:640
+#: lib/command.php:614
msgid "No one is subscribed to you."
msgstr "لا أحد مشترك بك."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "لا أحد مشترك بك."
@@ -4242,11 +4231,11 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:662
+#: lib/command.php:636
msgid "You are not a member of any groups."
msgstr "لست عضوًا في أي مجموعة."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "لست عضوًا في أي مجموعة."
@@ -4256,7 +4245,7 @@ msgstr[3] "أنت عضو في هذه المجموعات:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4275,7 +4264,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4332,9 +4320,10 @@ msgid "Upload file"
msgstr "ارفع ملفًا"
#: lib/designsettings.php:109
+#, fuzzy
msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
-msgstr ""
+"You can upload your personal background image. The maximum file size is 2MB."
+msgstr "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %s."
#: lib/designsettings.php:372
msgid "Bad default color settings: "
@@ -4505,7 +4494,15 @@ msgstr ""
msgid "Unknown file type"
msgstr "نوع ملف غير معروف"
-#: lib/jabber.php:192
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr "[%s]"
@@ -4862,11 +4859,11 @@ msgstr "خطأ أثناء إدراج الملف الشخصي البعيد"
msgid "Duplicate notice"
msgstr "ضاعف الإشعار"
-#: lib/oauthstore.php:466 lib/subs.php:48
+#: lib/oauthstore.php:467 lib/subs.php:48
msgid "You have been banned from subscribing."
msgstr ""
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr "تعذّر إدراج اشتراك جديد."
@@ -4903,7 +4900,7 @@ msgstr "رسائلك المُرسلة"
msgid "Tags in %s's notices"
msgstr ""
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "الاشتراكات"
@@ -4911,7 +4908,7 @@ msgstr "الاشتراكات"
msgid "All subscriptions"
msgstr "جميع الاشتراكات"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "المشتركون"
@@ -4919,15 +4916,15 @@ msgstr "المشتركون"
msgid "All subscribers"
msgstr "جميع المشتركين"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr "هوية المستخدم"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "عضو منذ"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "كل المجموعات"
@@ -5124,47 +5121,51 @@ msgstr "أرسل رسالة مباشرة إلى هذا المستخدم"
msgid "Message"
msgstr "رسالة"
-#: lib/util.php:826
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr ""
+
+#: lib/util.php:825
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
-#: lib/util.php:828
+#: lib/util.php:827
msgid "about a minute ago"
msgstr "قبل دقيقة تقريبًا"
-#: lib/util.php:830
+#: lib/util.php:829
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:832
+#: lib/util.php:831
msgid "about an hour ago"
msgstr "قبل ساعة تقريبًا"
-#: lib/util.php:834
+#: lib/util.php:833
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:836
+#: lib/util.php:835
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
-#: lib/util.php:838
+#: lib/util.php:837
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:840
+#: lib/util.php:839
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
-#: lib/util.php:842
+#: lib/util.php:841
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:844
+#: lib/util.php:843
msgid "about a year ago"
msgstr "قبل سنة تقريبًا"
@@ -5193,6 +5194,3 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
-
-#~ msgid "Notice"
-#~ msgstr "إشعارات"
diff --git a/locale/bg/LC_MESSAGES/statusnet.mo b/locale/bg/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 7450f5466..000000000
--- a/locale/bg/LC_MESSAGES/statusnet.mo
+++ /dev/null
Binary files differ
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index b4d48b9c9..8d020e084 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-23 21:46+0000\n"
-"PO-Revision-Date: 2009-11-23 21:46:55+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:19:07+0000\n"
"Language-Team: Bulgarian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59365); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: bg\n"
"X-Message-Group: out-statusnet\n"
@@ -116,7 +116,6 @@ msgstr "Бележки от %1$s и приятели в %2$s."
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountupdateprofile.php:97
-#, fuzzy
msgid "API method not found."
msgstr "Не е открит методът в API."
@@ -140,7 +139,6 @@ msgid ""
msgstr ""
#: actions/apiaccountupdatedeliverydevice.php:132
-#, fuzzy
msgid "Could not update user."
msgstr "Грешка при обновяване на потребителя."
@@ -179,7 +177,6 @@ msgid "User has no profile."
msgstr "Потребителят няма профил."
#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
msgid "Could not save profile."
msgstr "Грешка при запазване на профила."
@@ -253,7 +250,6 @@ msgid "No status found with that ID."
msgstr "Не е открита бележка с такъв идентификатор."
#: actions/apifavoritecreate.php:119
-#, fuzzy
msgid "This status is already a favorite!"
msgstr "Тази бележка вече е отбелязана като любима!"
@@ -262,7 +258,6 @@ msgid "Could not create favorite."
msgstr "Грешка при отбелязване като любима."
#: actions/apifavoritedestroy.php:122
-#, fuzzy
msgid "That status is not a favorite!"
msgstr "Тази бележка не е отбелязана като любима!"
@@ -280,13 +275,12 @@ msgid "Could not follow user: %s is already on your list."
msgstr "Грешка при проследяване на потребител: %s вече е в списъка ви."
#: actions/apifriendshipsdestroy.php:109
-#, fuzzy
msgid "Could not unfollow user: User not found."
-msgstr "Грешка при проследяване — потребителят не е намерен."
+msgstr "Грешка при спиране на проследяването — потребителят не е намерен."
#: actions/apifriendshipsdestroy.php:120
msgid "You cannot unfollow yourself!"
-msgstr ""
+msgstr "Не можете да спрете да следите себе си!"
#: actions/apifriendshipsexists.php:94
msgid "Two user ids or screen_names must be supplied."
@@ -335,9 +329,9 @@ msgid "Full name is too long (max 255 chars)."
msgstr "Пълното име е твърде дълго (макс. 255 знака)"
#: actions/apigroupcreate.php:213
-#, fuzzy, php-format
+#, php-format
msgid "Description is too long (max %d chars)."
-msgstr "Автобиографията е твърде дълга (до 140 символа)."
+msgstr "Описанието е твърде дълго (до %d символа)."
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
#: actions/newgroup.php:148 actions/profilesettings.php:225
@@ -425,9 +419,8 @@ msgid "You may not delete another user's status."
msgstr "Не може да изтривате бележки на друг потребител."
#: actions/apistatusesshow.php:138
-#, fuzzy
msgid "Status deleted."
-msgstr "Аватарът е обновен."
+msgstr "Бележката е изтрита."
#: actions/apistatusesshow.php:144
msgid "No status with that ID found."
@@ -449,9 +442,8 @@ msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
-#, fuzzy
msgid "Unsupported format."
-msgstr "Форматът на файла с изображението не се поддържа."
+msgstr "Неподдържан формат."
#: actions/apitimelinefavorites.php:107
#, php-format
@@ -574,7 +566,7 @@ msgstr "Изрязване"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -746,7 +738,7 @@ msgid "Conversation"
msgstr "Разговор"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Бележки"
@@ -783,9 +775,8 @@ msgid "Are you sure you want to delete this notice?"
msgstr "Наистина ли искате да изтриете тази бележка?"
#: actions/deletenotice.php:145
-#, fuzzy
msgid "Do not delete this notice"
-msgstr "Грешка при изтриване на бележката."
+msgstr "Да не се изтрива бележката"
#: actions/deletenotice.php:146 lib/noticelist.php:550
msgid "Delete this notice"
@@ -797,14 +788,12 @@ msgid "There was a problem with your session token. Try again, please."
msgstr "Имаше проблем със сесията ви в сайта. Моля, опитайте отново!"
#: actions/deleteuser.php:67
-#, fuzzy
msgid "You cannot delete users."
-msgstr "Грешка при обновяване на потребителя."
+msgstr "Не можете да изтривате потребители."
#: actions/deleteuser.php:74
-#, fuzzy
msgid "You can only delete local users."
-msgstr "Не може да изтривате бележки на друг потребител."
+msgstr "Може да изтривате само локални потребители."
#: actions/deleteuser.php:110 actions/deleteuser.php:133
msgid "Delete user"
@@ -865,12 +854,12 @@ msgstr "Излизане от сайта"
#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
-msgstr ""
+msgstr "Смяна на изображението за фон"
#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
-msgstr ""
+msgstr "Фон"
#: actions/designadminpanel.php:422
#, fuzzy, php-format
@@ -904,9 +893,8 @@ msgid "Content"
msgstr "Съдържание"
#: actions/designadminpanel.php:518 lib/designsettings.php:204
-#, fuzzy
msgid "Sidebar"
-msgstr "Търсене"
+msgstr "Страничен панел"
#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
@@ -974,9 +962,9 @@ msgid "Use this form to edit the group."
msgstr ""
#: actions/editgroup.php:201 actions/newgroup.php:145
-#, fuzzy, php-format
+#, php-format
msgid "description is too long (max %d chars)."
-msgstr "Автобиографията е твърде дълга (до 140 символа)."
+msgstr "Описанието е твърде дълго (до %d символа)."
#: actions/editgroup.php:253
msgid "Could not update group."
@@ -1170,7 +1158,7 @@ msgstr "Входящият адрес на е-поща е премахнат."
msgid "New incoming email address added."
msgstr "Добавен е нов входящ адрес на е-поща."
-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Популярни бележки"
@@ -1267,26 +1255,26 @@ msgstr "Потребителят, когото проследявате, не с
msgid "You can use the local subscription!"
msgstr "Можете да ползвате локален абонамент!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "Потребителят е забранил да се абонирате за него."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "Забранено."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "Грешка при преобразуване на tokens за одобрение в tokens за достъп."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Непозната версия на протокола OMB."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Грешка при обновяване на отдалечен профил"
@@ -1439,7 +1427,7 @@ msgstr "Списък с потребителите в тази група."
#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
msgid "Admin"
-msgstr ""
+msgstr "Настройки"
#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
@@ -1495,8 +1483,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Групи"
@@ -1642,7 +1630,7 @@ msgstr "Това е входящата ви кутия с лични съобщ
#: actions/invite.php:39
msgid "Invites have been disabled."
-msgstr ""
+msgstr "Поканите са изключени."
#: actions/invite.php:41
#, php-format
@@ -1816,59 +1804,59 @@ msgstr "Грешка при проследяване — потребителя
#: actions/leavegroup.php:134 lib/command.php:289
#, php-format
msgid "%s left group %s"
-msgstr ""
+msgstr "%s напусна групата %s"
#: actions/login.php:79 actions/register.php:137
msgid "Already logged in."
msgstr "Вече сте влезли."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "Невалидно съдържание на бележка"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Грешно име или парола."
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Забранено."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Вход"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr ""
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Псевдоним"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Парола"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Запомни ме"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "Автоматично влизане занапред. Да не се ползва на общи компютри!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Загубена или забравена парола"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1876,7 +1864,7 @@ msgstr ""
"За по-голяма сигурност, моля въведете отново потребителското си име и парола "
"при промяна на настройките."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -1941,9 +1929,8 @@ msgstr ""
"тихичко."
#: actions/newmessage.php:181
-#, fuzzy
msgid "Message sent"
-msgstr "Съобщение"
+msgstr "Съобщението е изпратено"
#: actions/newmessage.php:185 lib/command.php:375
#, php-format
@@ -1959,9 +1946,8 @@ msgid "New notice"
msgstr "Нова бележка"
#: actions/newnotice.php:206
-#, fuzzy
msgid "Notice posted"
-msgstr "Бележки"
+msgstr "Бележката е публикувана"
#: actions/noticesearch.php:68
#, php-format
@@ -2330,14 +2316,13 @@ msgid "URL of your homepage, blog, or profile on another site"
msgstr "Адрес на личната ви страница, блог или профил в друг сайт"
#: actions/profilesettings.php:122 actions/register.php:460
-#, fuzzy, php-format
+#, php-format
msgid "Describe yourself and your interests in %d chars"
-msgstr "Опишете себе си и интересите си в до 140 букви"
+msgstr "Опишете себе си и интересите си в до %d букви"
#: actions/profilesettings.php:125 actions/register.php:463
-#, fuzzy
msgid "Describe yourself and your interests"
-msgstr "Опишете себе си и интересите си в до 140 букви"
+msgstr "Опишете себе си и интересите си"
#: actions/profilesettings.php:127 actions/register.php:465
msgid "Bio"
@@ -2389,9 +2374,9 @@ msgstr ""
"ботове)."
#: actions/profilesettings.php:221 actions/register.php:223
-#, fuzzy, php-format
+#, php-format
msgid "Bio is too long (max %d chars)."
-msgstr "Автобиографията е твърде дълга (до 140 символа)."
+msgstr "Биографията е твърде дълга (до %d символа)."
#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
@@ -2441,19 +2426,16 @@ msgid "Public timeline"
msgstr "Общ поток"
#: actions/public.php:151
-#, fuzzy
msgid "Public Stream Feed (RSS 1.0)"
-msgstr "Емисия на общия поток"
+msgstr "Емисия на общия поток (RSS 1.0)"
#: actions/public.php:155
-#, fuzzy
msgid "Public Stream Feed (RSS 2.0)"
-msgstr "Емисия на общия поток"
+msgstr "Емисия на общия поток (RSS 2.0)"
#: actions/public.php:159
-#, fuzzy
msgid "Public Stream Feed (Atom)"
-msgstr "Емисия на общия поток"
+msgstr "Емисия на общия поток (Atom)"
#: actions/public.php:179
#, php-format
@@ -2559,7 +2541,7 @@ msgstr ""
#: actions/recoverpassword.php:188
msgid "Password recovery"
-msgstr ""
+msgstr "Възстановяване на парола"
#: actions/recoverpassword.php:191
msgid "Nickname or email address"
@@ -2806,7 +2788,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Адрес на профила ви в друга, съвместима услуга за микроблогване"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:356
+#: lib/userprofile.php:365
msgid "Subscribe"
msgstr "Абониране"
@@ -2816,8 +2798,7 @@ msgstr "Неправилен адрес на профил (грешен форм
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "Неправилен адрес на профил (няма YADIS документ)."
#: actions/remotesubscribe.php:176
@@ -2997,7 +2978,7 @@ msgid "Members"
msgstr "Членове"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
@@ -3006,7 +2987,7 @@ msgstr ""
msgid "All members"
msgstr "Всички членове"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Статистики"
@@ -3036,7 +3017,7 @@ msgstr ""
#: actions/showgroup.php:482
msgid "Admins"
-msgstr ""
+msgstr "Администратори"
#: actions/showmessage.php:81
msgid "No such message."
@@ -3057,9 +3038,8 @@ msgid "Message from %1$s on %2$s"
msgstr "Съобщение от %1$s в %2$s"
#: actions/shownotice.php:90
-#, fuzzy
msgid "Notice deleted."
-msgstr "Бележки"
+msgstr "Бележката е изтрита."
#: actions/showstream.php:73
#, fuzzy, php-format
@@ -3137,9 +3117,8 @@ msgid "You cannot silence users on this site."
msgstr "Не може да изпращате съобщения до този потребител."
#: actions/silence.php:72
-#, fuzzy
msgid "User is already silenced."
-msgstr "Потребителят ви е блокирал."
+msgstr "Потребителят вече е заглушен."
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
@@ -3341,7 +3320,7 @@ msgstr "Винаги"
#: actions/siteadminpanel.php:387
msgid "Use SSL"
-msgstr ""
+msgstr "Използване на SSL"
#: actions/siteadminpanel.php:388
msgid "When to use SSL"
@@ -3349,7 +3328,7 @@ msgstr "Кога да се използва SSL"
#: actions/siteadminpanel.php:393
msgid "SSL Server"
-msgstr ""
+msgstr "SSL-сървър"
#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
@@ -3763,11 +3742,11 @@ msgstr ""
#: actions/useradminpanel.php:265
msgid "Sessions"
-msgstr ""
+msgstr "Сесии"
#: actions/useradminpanel.php:270
msgid "Handle sessions"
-msgstr ""
+msgstr "Управление на сесии"
#: actions/useradminpanel.php:272
msgid "Whether to handle sessions ourselves."
@@ -3991,7 +3970,7 @@ msgstr "Забранено ви е да публикувате бележки в
msgid "Problem saving notice."
msgstr "Проблем при записване на бележката."
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Грешка в базата от данни — отговор при вмъкването: %s"
@@ -4424,49 +4403,39 @@ msgstr "Уведомлението е включено."
msgid "Can't turn on notification."
msgstr "Грешка при включване на уведомлението."
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Грешка при създаване на OpenID форма: %s"
-
-#: 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:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Не сте абонирани за този профил"
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Вече сте абонирани за следните потребители:"
msgstr[1] "Вече сте абонирани за следните потребители:"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Грешка при абониране на друг потребител за вас."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Грешка при абониране на друг потребител за вас."
msgstr[1] "Грешка при абониране на друг потребител за вас."
-#: lib/command.php:662
+#: lib/command.php:636
msgid "You are not a member of any groups."
msgstr "Не членувате в нито една група."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Не членувате в тази група."
msgstr[1] "Не членувате в тази група."
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4485,7 +4454,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4506,9 +4474,8 @@ msgid ""
msgstr ""
#: lib/common.php:199
-#, fuzzy
msgid "No configuration file found. "
-msgstr "Няма код за потвърждение."
+msgstr "Не е открит файл с настройки. "
#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
@@ -4540,14 +4507,14 @@ msgid "Database error"
msgstr "Грешка в базата от данни"
#: lib/designsettings.php:105
-#, fuzzy
msgid "Upload file"
-msgstr "Качване"
+msgstr "Качване на файл"
#: lib/designsettings.php:109
+#, fuzzy
msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
-msgstr ""
+"You can upload your personal background image. The maximum file size is 2MB."
+msgstr "Можете да качите личен аватар тук."
#: lib/designsettings.php:372
msgid "Bad default color settings: "
@@ -4576,19 +4543,19 @@ msgstr "Изнасяне на данните"
#: lib/feed.php:85
msgid "RSS 1.0"
-msgstr ""
+msgstr "RSS 1.0"
#: lib/feed.php:87
msgid "RSS 2.0"
-msgstr ""
+msgstr "RSS 2.0"
#: lib/feed.php:89
msgid "Atom"
-msgstr ""
+msgstr "Atom"
#: lib/feed.php:91
msgid "FOAF"
-msgstr ""
+msgstr "FOAF"
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -4724,7 +4691,15 @@ msgstr "Няма такава бележка."
msgid "Unknown file type"
msgstr "Неподдържан вид файл"
-#: lib/jabber.php:192
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5091,12 +5066,12 @@ msgstr "Грешка при вмъкване на отдалечен профи
msgid "Duplicate notice"
msgstr "Изтриване на бележката"
-#: lib/oauthstore.php:466 lib/subs.php:48
+#: lib/oauthstore.php:467 lib/subs.php:48
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "Потребителят е забранил да се абонирате за него."
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr "Грешка при добавяне на нов абонамент."
@@ -5133,7 +5108,7 @@ msgstr "Изпратените от вас съобщения"
msgid "Tags in %s's notices"
msgstr "Етикети в бележките на %s"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Абонаменти"
@@ -5141,7 +5116,7 @@ msgstr "Абонаменти"
msgid "All subscriptions"
msgstr "Всички абонаменти"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Абонати"
@@ -5149,16 +5124,16 @@ msgstr "Абонати"
msgid "All subscribers"
msgstr "Всички абонати"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
#, fuzzy
msgid "User ID"
msgstr "Потребител"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Участник от"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "Всички групи"
@@ -5240,14 +5215,12 @@ msgid "More..."
msgstr ""
#: lib/silenceform.php:67
-#, fuzzy
msgid "Silence"
-msgstr "Нова бележка"
+msgstr "Заглушаване"
#: lib/silenceform.php:78
-#, fuzzy
msgid "Silence this user"
-msgstr "Блокиране на потребителя"
+msgstr "Заглушаване на този потребител."
#: lib/subgroupnav.php:83
#, php-format
@@ -5353,7 +5326,7 @@ msgstr "Настройки на профила"
#: lib/userprofile.php:249
msgid "Edit"
-msgstr ""
+msgstr "Редактиране"
#: lib/userprofile.php:272
msgid "Send a direct message to this user"
@@ -5363,47 +5336,51 @@ msgstr "Изпращате на пряко съобщение до този по
msgid "Message"
msgstr "Съобщение"
-#: lib/util.php:826
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr ""
+
+#: lib/util.php:825
msgid "a few seconds ago"
msgstr "преди няколко секунди"
-#: lib/util.php:828
+#: lib/util.php:827
msgid "about a minute ago"
msgstr "преди около минута"
-#: lib/util.php:830
+#: lib/util.php:829
#, php-format
msgid "about %d minutes ago"
msgstr "преди около %d минути"
-#: lib/util.php:832
+#: lib/util.php:831
msgid "about an hour ago"
msgstr "преди около час"
-#: lib/util.php:834
+#: lib/util.php:833
#, php-format
msgid "about %d hours ago"
msgstr "преди около %d часа"
-#: lib/util.php:836
+#: lib/util.php:835
msgid "about a day ago"
msgstr "преди около ден"
-#: lib/util.php:838
+#: lib/util.php:837
#, php-format
msgid "about %d days ago"
msgstr "преди около %d дни"
-#: lib/util.php:840
+#: lib/util.php:839
msgid "about a month ago"
msgstr "преди около месец"
-#: lib/util.php:842
+#: lib/util.php:841
#, php-format
msgid "about %d months ago"
msgstr "преди около %d месеца"
-#: lib/util.php:844
+#: lib/util.php:843
msgid "about a year ago"
msgstr "преди около година"
@@ -5432,6 +5409,3 @@ msgstr "Това не е вашият входящ адрес."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Входящата поща не е разрешена."
-
-#~ msgid "Notice"
-#~ msgstr "Бележки"
diff --git a/locale/ca/LC_MESSAGES/statusnet.mo b/locale/ca/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 18771ecb2..000000000
--- a/locale/ca/LC_MESSAGES/statusnet.mo
+++ /dev/null
Binary files differ
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index 543975146..23102cfb1 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-23 21:46+0000\n"
-"PO-Revision-Date: 2009-11-23 21:46:59+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:19:11+0000\n"
"Language-Team: Catalan\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59365); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ca\n"
"X-Message-Group: out-statusnet\n"
@@ -348,7 +348,7 @@ msgstr "La ubicació és massa llarga (màx. 255 caràcters)."
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
-msgstr ""
+msgstr "Hi ha massa àlies! Màxim %d."
#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
@@ -370,9 +370,8 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
-#, fuzzy
msgid "Group not found!"
-msgstr "No s'ha trobat el mètode API!"
+msgstr "No s'ha trobat el grup!"
#: actions/apigroupjoin.php:110
#, fuzzy
@@ -574,7 +573,7 @@ msgstr "Crop"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -613,9 +612,8 @@ msgid "Failed updating avatar."
msgstr "Error en actualitzar avatar."
#: actions/avatarsettings.php:387
-#, fuzzy
msgid "Avatar deleted."
-msgstr "Avatar actualitzat."
+msgstr "S'ha suprimit l'avatar."
#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
@@ -681,9 +679,8 @@ msgid "No"
msgstr "No"
#: actions/block.php:143 actions/deleteuser.php:147
-#, fuzzy
msgid "Do not block this user"
-msgstr "Desbloquejar aquest usuari"
+msgstr "No bloquis l'usuari"
#: actions/block.php:144 actions/deletenotice.php:146
#: actions/deleteuser.php:148 actions/groupblock.php:179
@@ -751,7 +748,7 @@ msgid "Conversation"
msgstr "Conversa"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Avisos"
@@ -825,18 +822,17 @@ msgid ""
msgstr ""
#: actions/deleteuser.php:148 lib/deleteuserform.php:77
-#, fuzzy
msgid "Delete this user"
-msgstr "Eliminar aquesta nota"
+msgstr "Suprimeix l'usuari"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
-msgstr ""
+msgstr "Disseny"
#: actions/designadminpanel.php:73
msgid "Design settings for this StatusNet site."
-msgstr ""
+msgstr "Paràmetres de disseny d'aquest lloc StatusNet."
#: actions/designadminpanel.php:270
#, fuzzy
@@ -866,18 +862,17 @@ msgid "Site theme"
msgstr "Avís del lloc"
#: actions/designadminpanel.php:400
-#, fuzzy
msgid "Theme for the site."
-msgstr "Sortir d'aquest lloc"
+msgstr "Tema del lloc."
#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
-msgstr ""
+msgstr "Canvia la imatge de fons"
#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
-msgstr ""
+msgstr "Fons"
#: actions/designadminpanel.php:422
#, fuzzy, php-format
@@ -946,7 +941,7 @@ msgstr "Guardar"
#: actions/designadminpanel.php:582 lib/designsettings.php:257
msgid "Save design"
-msgstr ""
+msgstr "Desa el disseny"
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
@@ -1179,7 +1174,7 @@ msgstr "Eliminat el correu electrònic entrant."
msgid "New incoming email address added."
msgstr "Nou correu electrònic entrant afegit."
-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Notificacions populars"
@@ -1275,25 +1270,25 @@ msgstr "L'usuari que vols seguir no existeix."
msgid "You can use the local subscription!"
msgstr "Pots utilitzar la subscripció local!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "Aquest usuari t'ha bloquejat com a subscriptor."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
msgstr "No esteu autoritzat."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "No s'han pogut convertir els senyals de petició a senyals d'accés."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Versió desconeguda del protocol OMB."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Error en actualitzar el perfil remot"
@@ -1466,7 +1461,7 @@ msgstr "Admin"
#: actions/groupmembers.php:473
msgid "Make this user an admin"
-msgstr ""
+msgstr "Fes l'usuari administrador"
#: actions/grouprss.php:133
#, fuzzy, php-format
@@ -1505,8 +1500,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Grups"
@@ -1531,7 +1526,7 @@ msgstr "Crear nou grup"
#: actions/groupunblock.php:91
msgid "Only an admin can unblock group members."
-msgstr ""
+msgstr "Només un administrador pot desblocar els membres del grup."
#: actions/groupunblock.php:95
#, fuzzy
@@ -1839,55 +1834,55 @@ msgstr "%s ha abandonat el grup %s"
msgid "Already logged in."
msgstr "Ja estàs connectat."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "El contingut de l'avís és invàlid"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Nom d'usuari o contrasenya incorrectes."
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "No autoritzat."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Inici de sessió"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "Accedir al lloc"
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Sobrenom"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Contrasenya"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Recorda'm"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Iniciar sessió automàticament en el futur; no utilitzar en ordinadors "
"compartits!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Contrasenya oblidada o perduda?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1895,7 +1890,7 @@ msgstr ""
"Per raons de seguretat, si us plau torna a escriure el teu nom d'usuari i "
"contrasenya abans de canviar la teva configuració."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2179,7 +2174,7 @@ msgstr "Contrasenya guardada."
#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
msgid "Paths"
-msgstr ""
+msgstr "Camins"
#: actions/pathsadminpanel.php:70
msgid "Path and server settings for this StatusNet site."
@@ -2212,7 +2207,7 @@ msgstr "Lloc"
#: actions/pathsadminpanel.php:216
msgid "Path"
-msgstr ""
+msgstr "Camí"
#: actions/pathsadminpanel.php:216
#, fuzzy
@@ -2833,7 +2828,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL del teu perfil en un altre servei de microblogging compatible"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:356
+#: lib/userprofile.php:365
msgid "Subscribe"
msgstr "Subscriure's"
@@ -2843,8 +2838,7 @@ msgstr "L'URL del perfil és invàlid (format incorrecte)"
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "URL de perfil no vàlid (cap document YADIS)."
#: actions/remotesubscribe.php:176
@@ -3025,7 +3019,7 @@ msgid "Members"
msgstr "Membres"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(Cap)"
@@ -3034,7 +3028,7 @@ msgstr "(Cap)"
msgid "All members"
msgstr "Tots els membres"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Estadístiques"
@@ -3181,9 +3175,8 @@ msgid "Site name must have non-zero length."
msgstr ""
#: actions/siteadminpanel.php:155
-#, fuzzy
msgid "You must have a valid contact email address"
-msgstr "No és una direcció de correu electrònic vàlida."
+msgstr "Heu de tenir una adreça electrònica de contacte vàlida"
#: actions/siteadminpanel.php:173
#, php-format
@@ -3220,12 +3213,11 @@ msgstr ""
#: actions/siteadminpanel.php:266
msgid "General"
-msgstr ""
+msgstr "General"
#: actions/siteadminpanel.php:269
-#, fuzzy
msgid "Site name"
-msgstr "Avís del lloc"
+msgstr "Nom del lloc"
#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
@@ -3271,14 +3263,12 @@ msgid "Default site language"
msgstr "Preferència d'idioma"
#: actions/siteadminpanel.php:316
-#, fuzzy
msgid "URLs"
msgstr "URL"
#: actions/siteadminpanel.php:319
-#, fuzzy
msgid "Server"
-msgstr "Recuperar"
+msgstr "Servidor"
#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
@@ -3320,7 +3310,7 @@ msgstr "Bloquejar"
#: actions/siteadminpanel.php:348
msgid "Disable new registrations."
-msgstr ""
+msgstr "Inhabilita els nous registres."
#: actions/siteadminpanel.php:354
msgid "Snapshots"
@@ -3335,9 +3325,8 @@ msgid "In a scheduled job"
msgstr ""
#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
-#, fuzzy
msgid "Never"
-msgstr "Recuperar"
+msgstr "Mai"
#: actions/siteadminpanel.php:360
msgid "Data snapshots"
@@ -3349,7 +3338,7 @@ msgstr ""
#: actions/siteadminpanel.php:366
msgid "Frequency"
-msgstr ""
+msgstr "Freqüència"
#: actions/siteadminpanel.php:367
msgid "Snapshots will be sent once every N web hits"
@@ -3364,22 +3353,20 @@ msgid "Snapshots will be sent to this URL"
msgstr ""
#: actions/siteadminpanel.php:380
-#, fuzzy
msgid "SSL"
-msgstr "SMS"
+msgstr "SSL"
#: actions/siteadminpanel.php:384
-#, fuzzy
msgid "Sometimes"
-msgstr "Avisos"
+msgstr "A vegades"
#: actions/siteadminpanel.php:385
msgid "Always"
-msgstr ""
+msgstr "Sempre"
#: actions/siteadminpanel.php:387
msgid "Use SSL"
-msgstr ""
+msgstr "Utilitza l'SSL"
#: actions/siteadminpanel.php:388
msgid "When to use SSL"
@@ -3387,7 +3374,7 @@ msgstr ""
#: actions/siteadminpanel.php:393
msgid "SSL Server"
-msgstr ""
+msgstr "Servidor SSL"
#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
@@ -3395,11 +3382,11 @@ msgstr ""
#: actions/siteadminpanel.php:400
msgid "Limits"
-msgstr ""
+msgstr "Límits"
#: actions/siteadminpanel.php:403
msgid "Text limit"
-msgstr ""
+msgstr "Límits del text"
#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
@@ -4032,7 +4019,7 @@ msgstr "Ha estat bandejat de publicar notificacions en aquest lloc."
msgid "Problem saving notice."
msgstr "Problema en guardar l'avís."
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Error de BD en inserir resposta: %s"
@@ -4286,19 +4273,16 @@ msgid "Unable to delete design setting."
msgstr "No s'ha pogut guardar la teva configuració de Twitter!"
#: lib/adminpanelaction.php:300
-#, fuzzy
msgid "Basic site configuration"
-msgstr "Confirmació de l'adreça de correu electrònic"
+msgstr "Configuració bàsica del lloc"
#: lib/adminpanelaction.php:303
-#, fuzzy
msgid "Design configuration"
-msgstr "Confirmació SMS"
+msgstr "Configuració del disseny"
#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
-#, fuzzy
msgid "Paths configuration"
-msgstr "Confirmació SMS"
+msgstr "Configuració dels camins"
#: lib/attachmentlist.php:87
msgid "Attachments"
@@ -4306,7 +4290,7 @@ msgstr "Adjuncions"
#: lib/attachmentlist.php:265
msgid "Author"
-msgstr ""
+msgstr "Autoria"
#: lib/attachmentlist.php:278
#, fuzzy
@@ -4458,50 +4442,40 @@ msgstr "Notificacions on."
msgid "Can't turn on notification."
msgstr "No es poden posar en on les notificacions."
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "No s'ha pogut crear el formulari OpenID: %s"
-
-#: 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:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "No estàs subscrit a aquest perfil."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Ja estàs subscrit a aquests usuaris:"
msgstr[1] "Ja estàs subscrit a aquests usuaris:"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "No pots subscriure a un altre a tu mateix."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "No pots subscriure a un altre a tu mateix."
msgstr[1] "No pots subscriure a un altre a tu mateix."
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "No ets membre d'aquest grup."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "No sou un membre del grup."
msgstr[1] "No sou un membre del grup."
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4520,7 +4494,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4572,7 +4545,7 @@ msgstr "Actualitzacions per SMS"
#: lib/dberroraction.php:60
msgid "Database error"
-msgstr ""
+msgstr "Error de la base de dades"
#: lib/designsettings.php:105
#, fuzzy
@@ -4580,9 +4553,10 @@ msgid "Upload file"
msgstr "Pujar"
#: lib/designsettings.php:109
+#, fuzzy
msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
-msgstr ""
+"You can upload your personal background image. The maximum file size is 2MB."
+msgstr "Pots pujar el teu avatar personal."
#: lib/designsettings.php:372
msgid "Bad default color settings: "
@@ -4757,7 +4731,15 @@ msgstr "Hem perdut el nostre arxiu."
msgid "Unknown file type"
msgstr "Tipus de fitxer desconegut"
-#: lib/jabber.php:192
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5134,12 +5116,12 @@ msgstr "Error en inserir perfil remot"
msgid "Duplicate notice"
msgstr "Eliminar nota."
-#: lib/oauthstore.php:466 lib/subs.php:48
+#: lib/oauthstore.php:467 lib/subs.php:48
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "Aquest usuari t'ha bloquejat com a subscriptor."
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr "No s'ha pogut inserir una nova subscripció."
@@ -5176,7 +5158,7 @@ msgstr "Els teus missatges enviats"
msgid "Tags in %s's notices"
msgstr "Etiquetes en les notificacions de %s's"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Subscripcions"
@@ -5184,7 +5166,7 @@ msgstr "Subscripcions"
msgid "All subscriptions"
msgstr "Totes les subscripcions"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Subscriptors"
@@ -5192,16 +5174,16 @@ msgstr "Subscriptors"
msgid "All subscribers"
msgstr "Tots els subscriptors"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
#, fuzzy
msgid "User ID"
msgstr "Usuari"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Membre des de"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "Tots els grups"
@@ -5212,7 +5194,7 @@ msgstr "No argument de la id."
#: lib/profileformaction.php:137
msgid "unimplemented method"
-msgstr ""
+msgstr "mètode no implementat"
#: lib/publicgroupnav.php:78
msgid "Public"
@@ -5250,12 +5232,11 @@ msgstr "Cerca al lloc"
#: lib/searchaction.php:126
msgid "Keyword(s)"
-msgstr ""
+msgstr "Paraules clau"
#: lib/searchaction.php:162
-#, fuzzy
msgid "Search help"
-msgstr "Cercar"
+msgstr "Ajuda de la cerca"
#: lib/searchgroupnav.php:80
msgid "People"
@@ -5403,47 +5384,51 @@ msgstr "Enviar un missatge directe a aquest usuari"
msgid "Message"
msgstr "Missatge"
-#: lib/util.php:826
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr "Modera"
+
+#: lib/util.php:825
msgid "a few seconds ago"
msgstr "fa pocs segons"
-#: lib/util.php:828
+#: lib/util.php:827
msgid "about a minute ago"
msgstr "fa un minut"
-#: lib/util.php:830
+#: lib/util.php:829
#, php-format
msgid "about %d minutes ago"
msgstr "fa %d minuts"
-#: lib/util.php:832
+#: lib/util.php:831
msgid "about an hour ago"
msgstr "fa una hora"
-#: lib/util.php:834
+#: lib/util.php:833
#, php-format
msgid "about %d hours ago"
msgstr "fa %d hores"
-#: lib/util.php:836
+#: lib/util.php:835
msgid "about a day ago"
msgstr "fa un dia"
-#: lib/util.php:838
+#: lib/util.php:837
#, php-format
msgid "about %d days ago"
msgstr "fa %d dies"
-#: lib/util.php:840
+#: lib/util.php:839
msgid "about a month ago"
msgstr "fa un mes"
-#: lib/util.php:842
+#: lib/util.php:841
#, php-format
msgid "about %d months ago"
msgstr "fa %d mesos"
-#: lib/util.php:844
+#: lib/util.php:843
msgid "about a year ago"
msgstr "fa un any"
@@ -5472,6 +5457,3 @@ msgstr "Perdó, aquest no és el teu correu electrònic entrant permès."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Perdó, no hi ha un correu electrònic entrant permès."
-
-#~ msgid "Notice"
-#~ msgstr "Avisos"
diff --git a/locale/cs/LC_MESSAGES/statusnet.mo b/locale/cs/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index bd42c1563..000000000
--- a/locale/cs/LC_MESSAGES/statusnet.mo
+++ /dev/null
Binary files differ
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index b3b547cce..f1e002a9d 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -1,5 +1,6 @@
# Translation of StatusNet to Czech
#
+# Author@translatewiki.net: Kuvaly
# --
# This file is distributed under the same license as the StatusNet package.
#
@@ -7,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-23 21:46+0000\n"
-"PO-Revision-Date: 2009-11-23 21:47:02+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:19:14+0000\n"
"Language-Team: Czech\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59365); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: cs\n"
"X-Message-Group: out-statusnet\n"
@@ -559,7 +560,7 @@ msgstr ""
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
#: lib/noticelist.php:550
msgid "Delete"
-msgstr ""
+msgstr "Odstranit"
#: actions/avatarsettings.php:165 actions/grouplogo.php:233
msgid "Upload"
@@ -573,7 +574,7 @@ msgstr ""
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -750,7 +751,7 @@ msgid "Conversation"
msgstr "Umístění"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Sdělení"
@@ -1171,7 +1172,7 @@ msgstr ""
msgid "New incoming email address added."
msgstr ""
-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
#: lib/publicgroupnav.php:93
#, fuzzy
msgid "Popular notices"
@@ -1268,26 +1269,26 @@ msgstr "Úživatel, kterému nasloucháte neexistuje."
msgid "You can use the local subscription!"
msgstr "Můžete použít místní odebírání."
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr ""
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "Neautorizován."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "Nelze konvertovat řetězec požadavku na přístupový řetězec."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Neznámá verze OMB protokolu."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Chyba při aktualizaci vzdáleného profilu"
@@ -1498,8 +1499,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1797,59 +1798,59 @@ msgstr ""
msgid "Already logged in."
msgstr "Již přihlášen"
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "Neplatný obsah sdělení"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Neplatné jméno nebo heslo"
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Neautorizován."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Přihlásit"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr ""
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Přezdívka"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Heslo"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Zapamatuj si mě"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "Příště automaticky přihlásit; ne pro počítače, které používá "
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Ztracené nebo zapomenuté heslo?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr "Z bezpečnostních důvodů, prosím zadejte znovu své jméno a heslo."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2765,7 +2766,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Adresa profilu na jiných kompatibilních mikroblozích."
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:356
+#: lib/userprofile.php:365
msgid "Subscribe"
msgstr "Odebírat"
@@ -2775,8 +2776,7 @@ msgstr "Neplatná adresa profilu (špatný formát)"
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "Není platnou adresou profilu (není YADIS dokumentem)."
#: actions/remotesubscribe.php:176
@@ -2959,7 +2959,7 @@ msgid "Members"
msgstr "Členem od"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
@@ -2968,7 +2968,7 @@ msgstr ""
msgid "All members"
msgstr ""
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Statistiky"
@@ -3949,7 +3949,7 @@ msgstr ""
msgid "Problem saving notice."
msgstr "Problém při ukládání sdělení"
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Chyba v DB při vkládání odpovědi: %s"
@@ -4382,53 +4382,43 @@ msgstr ""
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Nelze vytvořit OpenID z: %s"
-
-#: 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:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Neodeslal jste nám profil"
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Neodeslal jste nám profil"
msgstr[1] "Neodeslal jste nám profil"
msgstr[2] ""
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Vzdálený odběr"
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Vzdálený odběr"
msgstr[1] "Vzdálený odběr"
msgstr[2] ""
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Neodeslal jste nám profil"
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Neodeslal jste nám profil"
msgstr[1] "Neodeslal jste nám profil"
msgstr[2] ""
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4447,7 +4437,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4506,9 +4495,10 @@ msgid "Upload file"
msgstr "Upload"
#: lib/designsettings.php:109
+#, fuzzy
msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
-msgstr ""
+"You can upload your personal background image. The maximum file size is 2MB."
+msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků"
#: lib/designsettings.php:372
msgid "Bad default color settings: "
@@ -4687,7 +4677,15 @@ msgstr "Žádné takové oznámení."
msgid "Unknown file type"
msgstr ""
-#: lib/jabber.php:192
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5061,11 +5059,11 @@ msgstr "Chyba při vkládaní vzdáleného profilu"
msgid "Duplicate notice"
msgstr "Nové sdělení"
-#: lib/oauthstore.php:466 lib/subs.php:48
+#: lib/oauthstore.php:467 lib/subs.php:48
msgid "You have been banned from subscribing."
msgstr ""
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr "Nelze vložit odebírání"
@@ -5102,7 +5100,7 @@ msgstr ""
msgid "Tags in %s's notices"
msgstr ""
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Odběry"
@@ -5110,7 +5108,7 @@ msgstr "Odběry"
msgid "All subscriptions"
msgstr "Všechny odběry"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Odběratelé"
@@ -5119,15 +5117,15 @@ msgstr "Odběratelé"
msgid "All subscribers"
msgstr "Odběratelé"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr ""
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Členem od"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr ""
@@ -5333,47 +5331,51 @@ msgstr ""
msgid "Message"
msgstr ""
-#: lib/util.php:826
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr ""
+
+#: lib/util.php:825
msgid "a few seconds ago"
msgstr "před pár sekundami"
-#: lib/util.php:828
+#: lib/util.php:827
msgid "about a minute ago"
msgstr "asi před minutou"
-#: lib/util.php:830
+#: lib/util.php:829
#, php-format
msgid "about %d minutes ago"
msgstr "asi před %d minutami"
-#: lib/util.php:832
+#: lib/util.php:831
msgid "about an hour ago"
msgstr "asi před hodinou"
-#: lib/util.php:834
+#: lib/util.php:833
#, php-format
msgid "about %d hours ago"
msgstr "asi před %d hodinami"
-#: lib/util.php:836
+#: lib/util.php:835
msgid "about a day ago"
msgstr "asi přede dnem"
-#: lib/util.php:838
+#: lib/util.php:837
#, php-format
msgid "about %d days ago"
msgstr "před %d dny"
-#: lib/util.php:840
+#: lib/util.php:839
msgid "about a month ago"
msgstr "asi před měsícem"
-#: lib/util.php:842
+#: lib/util.php:841
#, php-format
msgid "about %d months ago"
msgstr "asi před %d mesíci"
-#: lib/util.php:844
+#: lib/util.php:843
msgid "about a year ago"
msgstr "asi před rokem"
@@ -5402,7 +5404,3 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
-
-#, fuzzy
-#~ msgid "Notice"
-#~ msgstr "Sdělení"
diff --git a/locale/de/LC_MESSAGES/statusnet.mo b/locale/de/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 17472c1b4..000000000
--- a/locale/de/LC_MESSAGES/statusnet.mo
+++ /dev/null
Binary files differ
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 866cf3559..e68bc1fd4 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -1,5 +1,7 @@
# Translation of StatusNet to German
#
+# Author@translatewiki.net: Bavatar
+# Author@translatewiki.net: March
# Author@translatewiki.net: Umherirrender
# --
# This file is distributed under the same license as the StatusNet package.
@@ -8,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-23 21:46+0000\n"
-"PO-Revision-Date: 2009-11-23 21:47:05+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:19:18+0000\n"
"Language-Team: German\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59365); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
"X-Message-Group: out-statusnet\n"
@@ -275,11 +277,11 @@ msgstr "Kann Nutzer %s nicht folgen: schon in deiner Kontaktliste eingetragen"
#: actions/apifriendshipsdestroy.php:109
msgid "Could not unfollow user: User not found."
-msgstr "Kann Benutzer nicht folgen: Benutzer nicht gefunden."
+msgstr "Kann Benutzer nicht entfolgen: Benutzer nicht gefunden."
#: actions/apifriendshipsdestroy.php:120
msgid "You cannot unfollow yourself!"
-msgstr ""
+msgstr "Du kannst dich nicht selbst entfolgen!"
#: actions/apifriendshipsexists.php:94
msgid "Two user ids or screen_names must be supplied."
@@ -341,7 +343,7 @@ msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
-msgstr ""
+msgstr "Zu viele Pseudonyme! Maximale Anzahl ist %d."
#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
@@ -363,9 +365,8 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
-#, fuzzy
msgid "Group not found!"
-msgstr "API-Methode nicht gefunden!"
+msgstr "Gruppe nicht gefunden!"
#: actions/apigroupjoin.php:110
msgid "You are already a member of that group."
@@ -373,7 +374,7 @@ msgstr "Du bist bereits Mitglied dieser Gruppe"
#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
msgid "You have been blocked from that group by the admin."
-msgstr ""
+msgstr "Der Admin dieser Gruppe hat Sie gesperrt."
#: actions/apigroupjoin.php:138
#, php-format
@@ -440,6 +441,8 @@ msgstr "Nicht gefunden"
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
+"Die maximale Größe von Nachrichten ist %d Zeichen, inklusive der URL der "
+"Anhänge"
#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
msgid "Unsupported format."
@@ -468,9 +471,9 @@ msgid "Updates from %1$s on %2$s!"
msgstr "Aktualisierungen von %1$s auf %2$s!"
#: actions/apitimelinementions.php:116
-#, fuzzy, php-format
+#, php-format
msgid "%1$s / Updates mentioning %2$s"
-msgstr "%1$s Antworten an %2$s"
+msgstr "%1$s / Aktualisierungen erwähnen %2$s"
#: actions/apitimelinementions.php:126
#, php-format
@@ -493,18 +496,17 @@ msgid "Notices tagged with %s"
msgstr "Nachrichten, die mit %s getagt sind"
#: actions/apitimelinetag.php:107 actions/tagrss.php:64
-#, fuzzy, php-format
+#, php-format
msgid "Updates tagged with %1$s on %2$s!"
-msgstr "Updates von %1$s auf %2$s!"
+msgstr "Updates mit %1$s getagt auf %2$s!"
#: actions/apiusershow.php:96
msgid "Not found."
msgstr "Nicht gefunden."
#: actions/attachment.php:73
-#, fuzzy
msgid "No such attachment."
-msgstr "Unbekanntes Dokument."
+msgstr "Kein solcher Anhang."
#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
msgid "No nickname."
@@ -524,9 +526,10 @@ msgid "Avatar"
msgstr "Avatar"
#: actions/avatarsettings.php:78
-#, fuzzy, php-format
+#, php-format
msgid "You can upload your personal avatar. The maximum file size is %s."
-msgstr "Du kannst dein persönliches Avatar hochladen."
+msgstr ""
+"Du kannst dein persönliches Avatar hochladen. Die maximale Dateigröße ist %s."
#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
@@ -551,7 +554,6 @@ msgstr "Vorschau"
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
#: lib/noticelist.php:550
-#, fuzzy
msgid "Delete"
msgstr "Löschen"
@@ -567,7 +569,7 @@ msgstr "Zuschneiden"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -603,9 +605,8 @@ msgid "Failed updating avatar."
msgstr "Aktualisierung des Avatars fehlgeschlagen."
#: actions/avatarsettings.php:387
-#, fuzzy
msgid "Avatar deleted."
-msgstr "Avatar aktualisiert."
+msgstr "Avatar gelöscht."
#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
@@ -622,36 +623,32 @@ msgid "No such group"
msgstr "Keine derartige Gruppe"
#: actions/blockedfromgroup.php:90
-#, fuzzy, php-format
+#, php-format
msgid "%s blocked profiles"
-msgstr "Benutzerprofil"
+msgstr "%s blockierte Benutzerprofile"
#: actions/blockedfromgroup.php:93
-#, fuzzy, php-format
+#, php-format
msgid "%s blocked profiles, page %d"
-msgstr "%s und Freunde, Seite %d"
+msgstr "%s blockierte Benutzerprofile, Seite %d"
#: actions/blockedfromgroup.php:108
-#, fuzzy
msgid "A list of the users blocked from joining this group."
-msgstr "Liste der Benutzer in dieser Gruppe."
+msgstr "Liste der blockierten Benutzer in dieser Gruppe."
#: actions/blockedfromgroup.php:281
-#, fuzzy
msgid "Unblock user from group"
-msgstr "Freigeben des Benutzers fehlgeschlagen."
+msgstr "Sperrung des Nutzers für die Gruppe aufheben."
#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
msgstr "Freigeben"
#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
-#, fuzzy
msgid "Unblock this user"
-msgstr "Benutzer freigeben"
+msgstr "Diesen Benutzer freigeben"
#: actions/block.php:69
-#, fuzzy
msgid "You already blocked that user."
msgstr "Du hast diesen Benutzer bereits blockiert."
@@ -672,9 +669,8 @@ msgid "No"
msgstr "Nein"
#: actions/block.php:143 actions/deleteuser.php:147
-#, fuzzy
msgid "Do not block this user"
-msgstr "Benutzer freigeben"
+msgstr "Diesen Benutzer freigeben"
#: actions/block.php:144 actions/deletenotice.php:146
#: actions/deleteuser.php:148 actions/groupblock.php:179
@@ -682,9 +678,8 @@ msgid "Yes"
msgstr "Ja"
#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
-#, fuzzy
msgid "Block this user"
-msgstr "Benutzer blockieren"
+msgstr "Diesen Benutzer blockieren"
#: actions/block.php:162
msgid "Failed to save block information."
@@ -739,12 +734,11 @@ msgid "The address \"%s\" has been confirmed for your account."
msgstr "Die Adresse „%s“\" wurde für dein Konto bestätigt."
#: actions/conversation.php:99
-#, fuzzy
msgid "Conversation"
-msgstr "Bestätigungscode"
+msgstr "Unterhaltung"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Nachrichten"
@@ -766,7 +760,6 @@ msgid "Can't delete this notice."
msgstr "Die Nachricht konnte nicht gelöscht werden."
#: actions/deletenotice.php:103
-#, fuzzy
msgid ""
"You are about to permanently delete a notice. Once this is done, it cannot "
"be undone."
@@ -783,34 +776,28 @@ msgid "Are you sure you want to delete this notice?"
msgstr "Sind sie sicher, dass sie diese Nachricht löschen wollen?"
#: actions/deletenotice.php:145
-#, fuzzy
msgid "Do not delete this notice"
-msgstr "Die Nachricht konnte nicht gelöscht werden."
+msgstr "Diese Nachricht nicht löschen"
#: actions/deletenotice.php:146 lib/noticelist.php:550
-#, fuzzy
msgid "Delete this notice"
-msgstr "Notiz löschen"
+msgstr "Nachricht löschen"
#: actions/deletenotice.php:157
-#, fuzzy
msgid "There was a problem with your session token. Try again, please."
msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
#: actions/deleteuser.php:67
-#, fuzzy
msgid "You cannot delete users."
-msgstr "Konnte Benutzerdaten nicht aktualisieren."
+msgstr "Du kannst keine Benutzer löschen."
#: actions/deleteuser.php:74
-#, fuzzy
msgid "You can only delete local users."
-msgstr "Du kannst den Status eines anderen Benutzers nicht löschen."
+msgstr "Du kannst nur lokale Benutzer löschen."
#: actions/deleteuser.php:110 actions/deleteuser.php:133
-#, fuzzy
msgid "Delete user"
-msgstr "Löschen"
+msgstr "Benutzer löschen"
#: actions/deleteuser.php:135
msgid ""
@@ -819,9 +806,8 @@ msgid ""
msgstr ""
#: actions/deleteuser.php:148 lib/deleteuserform.php:77
-#, fuzzy
msgid "Delete this user"
-msgstr "Notiz löschen"
+msgstr "Diesen Benutzer löschen"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
#: lib/adminpanelaction.php:302 lib/groupnav.php:119
@@ -833,19 +819,17 @@ msgid "Design settings for this StatusNet site."
msgstr ""
#: actions/designadminpanel.php:270
-#, fuzzy
msgid "Invalid logo URL."
-msgstr "Ungültige Größe."
+msgstr "Ungültige URL für das Logo"
#: actions/designadminpanel.php:274
-#, fuzzy, php-format
+#, php-format
msgid "Theme not available: %s"
-msgstr "Diese Seite liegt in nicht verfügbar in einem "
+msgstr "Theme nicht verfügbar: %s"
#: actions/designadminpanel.php:370
-#, fuzzy
msgid "Change logo"
-msgstr "Ändere dein Passwort"
+msgstr "Logo ändern"
#: actions/designadminpanel.php:375
#, fuzzy
@@ -869,12 +853,12 @@ msgstr "Von der Seite abmelden"
#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
-msgstr ""
+msgstr "Hintergrundbild ändern"
#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
-msgstr ""
+msgstr "Hintergrund"
#: actions/designadminpanel.php:422
#, fuzzy, php-format
@@ -885,11 +869,11 @@ msgstr "Du kannst ein Logo für Deine Gruppe hochladen."
#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
-msgstr ""
+msgstr "An"
#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
-msgstr ""
+msgstr "Aus"
#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
@@ -900,14 +884,12 @@ msgid "Tile background image"
msgstr ""
#: actions/designadminpanel.php:483 lib/designsettings.php:170
-#, fuzzy
msgid "Change colours"
-msgstr "Ändere dein Passwort"
+msgstr "Farben ändern"
#: actions/designadminpanel.php:505 lib/designsettings.php:191
-#, fuzzy
msgid "Content"
-msgstr "Verbinden"
+msgstr "Inhalt"
#: actions/designadminpanel.php:518 lib/designsettings.php:204
#, fuzzy
@@ -919,9 +901,8 @@ msgid "Text"
msgstr "Text"
#: actions/designadminpanel.php:544 lib/designsettings.php:230
-#, fuzzy
msgid "Links"
-msgstr "Liste"
+msgstr "Links"
#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
@@ -929,11 +910,11 @@ msgstr ""
#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
-msgstr ""
+msgstr "Standard-Design wiederherstellen"
#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
-msgstr ""
+msgstr "Standard wiederherstellen"
#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
@@ -947,7 +928,7 @@ msgstr "Speichern"
#: actions/designadminpanel.php:582 lib/designsettings.php:257
msgid "Save design"
-msgstr ""
+msgstr "Design speichern"
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
@@ -980,9 +961,9 @@ msgid "Use this form to edit the group."
msgstr "Benutze dieses Formular, um die Gruppe zu bearbeiten."
#: actions/editgroup.php:201 actions/newgroup.php:145
-#, fuzzy, php-format
+#, php-format
msgid "description is too long (max %d chars)."
-msgstr "Die Beschreibung ist zu lang (max. 140 Zeichen)."
+msgstr "Die Beschreibung ist zu lang (max. %d Zeichen)."
#: actions/editgroup.php:253
msgid "Could not update group."
@@ -1084,10 +1065,8 @@ msgstr ""
"Mir eine E-Mail schicken, wenn mir jemand eine private Nachricht schickt."
#: actions/emailsettings.php:174
-#, fuzzy
msgid "Send me email when someone sends me an \"@-reply\"."
-msgstr ""
-"Mir eine E-Mail schicken, wenn mir jemand eine private Nachricht schickt."
+msgstr "Schick mir eine E-Mail, wenn mir jemand eine @Nachricht schickt."
#: actions/emailsettings.php:179
msgid "Allow friends to nudge me and send me an email."
@@ -1180,7 +1159,7 @@ msgstr "Eingehende E-Mail-Adresse entfernt"
msgid "New incoming email address added."
msgstr "Neue Eingangs-E-Mail-Adresse hinzugefügt."
-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Beliebte Nachrichten"
@@ -1246,18 +1225,16 @@ msgid "A selection of some of the great users on %s"
msgstr "Eine Auswahl der tollen Benutzer auf %s"
#: actions/file.php:34
-#, fuzzy
msgid "No notice id"
-msgstr "Neue Nachricht"
+msgstr "Keine Nachrichten ID"
#: actions/file.php:38
-#, fuzzy
msgid "No notice"
-msgstr "Neue Nachricht"
+msgstr "Keine Nachricht"
#: actions/file.php:42
msgid "No attachments"
-msgstr ""
+msgstr "Keine Anhänge vorhanden"
#: actions/file.php:51
msgid "No uploaded attachments"
@@ -1276,26 +1253,26 @@ msgstr "Aufgeführte Nutzer existiert nicht."
msgid "You can use the local subscription!"
msgstr "Du kannst ein lokales Abonnement erstellen!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "Dieser Benutzer erlaubt dir nicht ihn zu abonnieren."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "Nicht autorisiert."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "Konnte Anfrage-Token nicht in Zugriffs-Token umwandeln."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Unbekannte OMB-Protokollversion."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Fehler beim Aktualisieren des entfernten Profils"
@@ -1306,9 +1283,8 @@ msgid "No such group."
msgstr "Keine derartige Gruppe."
#: actions/getfile.php:75
-#, fuzzy
msgid "No such file."
-msgstr "Unbekannte Nachricht."
+msgstr "Datei nicht gefunden."
#: actions/getfile.php:79
#, fuzzy
@@ -1329,23 +1305,20 @@ msgstr "Kein Benutzer-Profil mit dieser ID."
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
-#, fuzzy
msgid "No group specified."
-msgstr "Kein Profil angegeben."
+msgstr "Keine Gruppe angegeben"
#: actions/groupblock.php:91
msgid "Only an admin can block group members."
-msgstr ""
+msgstr "Nur ein Administrator kann Mitglieder der Gruppe sperren."
#: actions/groupblock.php:95
-#, fuzzy
msgid "User is already blocked from group."
-msgstr "Dieser Benutzer hat dich blockiert."
+msgstr "Dieser Nutzer ist bereits von der Gruppe gesperrt"
#: actions/groupblock.php:100
-#, fuzzy
msgid "User is not a member of group."
-msgstr "Du bist kein Mitglied dieser Gruppe."
+msgstr "Nutzer ist kein Mitglied dieser Gruppe."
#: actions/groupblock.php:136 actions/groupmembers.php:314
#, fuzzy
@@ -1366,9 +1339,8 @@ 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."
+msgstr "Diesen Nutzer von der Gruppe sperren"
#: actions/groupblock.php:196
msgid "Database error blocking user from group."
@@ -1379,14 +1351,12 @@ msgid "No ID"
msgstr "Keine ID"
#: actions/groupdesignsettings.php:68
-#, fuzzy
msgid "You must be logged in to edit a group."
-msgstr "Du musst angemeldet sein, um eine Gruppe zu erstellen."
+msgstr "Du musst angemeldet sein, um eine Gruppe zu bearbeiten."
#: actions/groupdesignsettings.php:141
-#, fuzzy
msgid "Group design"
-msgstr "Gruppen"
+msgstr "Gruppen Design"
#: actions/groupdesignsettings.php:152
msgid ""
@@ -1408,9 +1378,8 @@ msgid "Unable to save your design settings!"
msgstr "Konnte Twitter Einstellungen nicht speichern!"
#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
-#, fuzzy
msgid "Design preferences saved."
-msgstr "Synchronisationseinstellungen gespeichert."
+msgstr "Design Einstellungen gespeichert."
#: actions/grouplogo.php:139 actions/grouplogo.php:192
msgid "Group logo"
@@ -1451,7 +1420,6 @@ msgid "A list of the users in this group."
msgstr "Liste der Benutzer in dieser Gruppe."
#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
-#, fuzzy
msgid "Admin"
msgstr "Admin"
@@ -1460,18 +1428,16 @@ msgid "Block"
msgstr "Blockieren"
#: actions/groupmembers.php:441
-#, fuzzy
msgid "Make user an admin of the group"
-msgstr "Du musst ein Administrator sein, um die Gruppe zu bearbeiten"
+msgstr "Benutzer zu einem Admin dieser Gruppe ernennen"
#: actions/groupmembers.php:473
-#, fuzzy
msgid "Make Admin"
-msgstr "Admin"
+msgstr "Zum Admin ernennen"
#: actions/groupmembers.php:473
msgid "Make this user an admin"
-msgstr ""
+msgstr "Diesen Benutzer zu einem Admin ernennen"
#: actions/grouprss.php:133
#, php-format
@@ -1494,9 +1460,8 @@ msgstr "Gruppen-Suche"
#: actions/groupsearch.php:79 actions/noticesearch.php:117
#: actions/peoplesearch.php:83
-#, fuzzy
msgid "No results."
-msgstr "Keine Ergebnisse"
+msgstr "Keine Ergebnisse."
#: actions/groupsearch.php:82
#, php-format
@@ -1512,8 +1477,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Gruppen"
@@ -1538,12 +1503,11 @@ msgstr "Neue Gruppe erstellen"
#: actions/groupunblock.php:91
msgid "Only an admin can unblock group members."
-msgstr ""
+msgstr "Nur Gruppen Administratoren können die Sperrung von Nutzern aufheben."
#: actions/groupunblock.php:95
-#, fuzzy
msgid "User is not blocked from group."
-msgstr "Dieser Benutzer hat dich blockiert."
+msgstr "Dieser Nutzer ist nicht von der Gruppe gesperrt."
#: actions/groupunblock.php:128 actions/unblock.php:77
msgid "Error removing the block."
@@ -1664,7 +1628,7 @@ msgstr ""
#: actions/invite.php:39
msgid "Invites have been disabled."
-msgstr ""
+msgstr "Einladungen wurden deaktiviert."
#: actions/invite.php:41
#, php-format
@@ -1847,53 +1811,53 @@ msgstr "%s hat die Gruppe %s verlassen"
msgid "Already logged in."
msgstr "Bereits angemeldet."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "Ungültiger Nachrichteninhalt"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Falscher Benutzername oder Passwort."
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Nicht autorisiert."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Einloggen"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "An Seite anmelden"
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Nutzername"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Passwort"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Anmeldedaten merken"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "Automatisch anmelden; nicht bei gemeinsam genutzten PCs einsetzen!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Passwort vergessen?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1901,7 +1865,7 @@ msgstr ""
"Bitte geben Sie aus Sicherheitsgründen ihren Benutzernamen und ihr Passwort "
"ein, bevor die Änderungen an ihren Einstellungen übernommen werden."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -1913,12 +1877,12 @@ msgstr ""
#: actions/makeadmin.php:91
msgid "Only an admin can make another user an admin."
-msgstr ""
+msgstr "Nur Administratoren können andere Nutzer zu Administratoren ernennen."
#: actions/makeadmin.php:95
#, php-format
msgid "%s is already an admin for group \"%s\"."
-msgstr ""
+msgstr "%s ist bereits ein Administrator der Gruppe &quot;%s&quot;."
#: actions/makeadmin.php:132
#, php-format
@@ -1966,9 +1930,8 @@ msgstr ""
"Schicke dir selbst keine Nachrichten; sag es dir stattdessen einfach leise."
#: actions/newmessage.php:181
-#, fuzzy
msgid "Message sent"
-msgstr "Nachricht"
+msgstr "Nachricht gesendet"
#: actions/newmessage.php:185 lib/command.php:375
#, php-format
@@ -2090,7 +2053,7 @@ msgstr ""
#: actions/othersettings.php:116
msgid "Shorten URLs with"
-msgstr ""
+msgstr "URLs kürzen mit"
#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
@@ -2362,14 +2325,13 @@ msgstr ""
"URL deiner Homepage, deines Blogs, oder deines Profils auf einer anderen Site"
#: actions/profilesettings.php:122 actions/register.php:460
-#, fuzzy, php-format
+#, php-format
msgid "Describe yourself and your interests in %d chars"
-msgstr "Beschreibe dich selbst in 140 Zeichen"
+msgstr "Beschreibe dich selbst und deine Interessen in %d Zeichen"
#: actions/profilesettings.php:125 actions/register.php:463
-#, fuzzy
msgid "Describe yourself and your interests"
-msgstr "Beschreibe dich selbst und deine "
+msgstr "Beschreibe dich selbst und deine Interessen"
#: actions/profilesettings.php:127 actions/register.php:465
msgid "Bio"
@@ -2423,9 +2385,9 @@ msgstr ""
"Menschen)"
#: actions/profilesettings.php:221 actions/register.php:223
-#, fuzzy, php-format
+#, php-format
msgid "Bio is too long (max %d chars)."
-msgstr "Die Biografie ist zu lang (max. 140 Zeichen)"
+msgstr "Die Biografie ist zu lang (max. %d Zeichen)"
#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
@@ -2847,7 +2809,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Profil-URL bei einem anderen kompatiblen Microbloggingdienst"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:356
+#: lib/userprofile.php:365
msgid "Subscribe"
msgstr "Abonnieren"
@@ -2857,12 +2819,10 @@ msgstr "Ungültige Profil-URL (falsches Format)"
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "Ungültige Profil-URL (kein YADIS-Dokument)."
#: actions/remotesubscribe.php:176
-#, fuzzy
msgid "That’s a local profile! Login to subscribe."
msgstr "Das ist ein lokales Profil! Zum Abonnieren anmelden."
@@ -2883,14 +2843,14 @@ msgid "Replies to %s, page %d"
msgstr "Antworten an %s, Seite %d"
#: actions/replies.php:144
-#, fuzzy, php-format
+#, php-format
msgid "Replies feed for %s (RSS 1.0)"
-msgstr "Feed der Nachrichten von %s"
+msgstr "Feed der Antworten an %s (RSS 1.0)"
#: actions/replies.php:151
-#, fuzzy, php-format
+#, php-format
msgid "Replies feed for %s (RSS 2.0)"
-msgstr "Feed der Nachrichten von %s"
+msgstr "Feed der Antworten an %s (RSS 2.0)"
#: actions/replies.php:158
#, php-format
@@ -2934,9 +2894,9 @@ msgid "User is already sandboxed."
msgstr "Dieser Benutzer hat dich blockiert."
#: actions/showfavorites.php:79
-#, fuzzy, php-format
+#, php-format
msgid "%s's favorite notices, page %d"
-msgstr "%ss favorisierte Nachrichten, Seite %d"
+msgstr "Von %s als Favoriten markierte Nachrichten, Seite %d"
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
@@ -3015,19 +2975,19 @@ msgid "Group actions"
msgstr "Gruppenaktionen"
#: actions/showgroup.php:328
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
-msgstr "Nachrichtenfeed der Gruppe %s"
+msgstr "Nachrichtenfeed der Gruppe %s (RSS 1.0)"
#: actions/showgroup.php:334
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
-msgstr "Nachrichtenfeed der Gruppe %s"
+msgstr "Nachrichtenfeed der Gruppe %s (RSS 2.0)"
#: actions/showgroup.php:340
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s group (Atom)"
-msgstr "Nachrichtenfeed der Gruppe %s"
+msgstr "Nachrichtenfeed der Gruppe %s (Atom)"
#: actions/showgroup.php:345
#, php-format
@@ -3039,7 +2999,7 @@ msgid "Members"
msgstr "Mitglieder"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(Kein)"
@@ -3048,7 +3008,7 @@ msgstr "(Kein)"
msgid "All members"
msgstr "Alle Mitglieder"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Statistiken"
@@ -3079,9 +3039,8 @@ msgstr ""
"(http://de.wikipedia.org/wiki/Mikro-blogging) Dienst "
#: actions/showgroup.php:482
-#, fuzzy
msgid "Admins"
-msgstr "Admin"
+msgstr "Administratoren"
#: actions/showmessage.php:81
msgid "No such message."
@@ -3102,9 +3061,8 @@ msgid "Message from %1$s on %2$s"
msgstr "Nachricht von %1$s auf %2$s"
#: actions/shownotice.php:90
-#, fuzzy
msgid "Notice deleted."
-msgstr "Nachricht hinzugefügt"
+msgstr "Nachricht gelöscht."
#: actions/showstream.php:73
#, fuzzy, php-format
@@ -3122,24 +3080,24 @@ msgid "Notice feed for %s tagged %s (RSS 1.0)"
msgstr "Nachrichtenfeed der Gruppe %s"
#: actions/showstream.php:129
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s (RSS 1.0)"
-msgstr "Feed der Nachrichten von %s"
+msgstr "Feed der Nachrichten von %s (RSS 1.0)"
#: actions/showstream.php:136
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s (RSS 2.0)"
-msgstr "Feed der Nachrichten von %s"
+msgstr "Feed der Nachrichten von %s (RSS 2.0)"
#: actions/showstream.php:143
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s (Atom)"
-msgstr "Feed der Nachrichten von %s"
+msgstr "Feed der Nachrichten von %s (Atom)"
#: actions/showstream.php:148
-#, fuzzy, php-format
+#, php-format
msgid "FOAF for %s"
-msgstr "Postausgang von %s"
+msgstr "FOAF von %s"
#: actions/showstream.php:191
#, php-format
@@ -3204,7 +3162,7 @@ msgstr "Ungültige E-Mail-Adresse"
#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
-msgstr ""
+msgstr "Unbekannte Sprache &quot;%s&quot;"
#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
@@ -3446,9 +3404,8 @@ msgid "You can receive SMS messages through email from %%site.name%%."
msgstr "Du kannst SMS per E-Mail empfangen von %%site.name%%."
#: actions/smssettings.php:91
-#, fuzzy
msgid "SMS is not available."
-msgstr "Diese Seite liegt in nicht verfügbar in einem "
+msgstr "SMS ist nicht verfügbar."
#: actions/smssettings.php:112
msgid "Current confirmed SMS-enabled phone number."
@@ -3582,7 +3539,7 @@ msgstr ""
#: actions/subscribers.php:110
#, php-format
msgid "%s has no subscribers. Want to be the first?"
-msgstr ""
+msgstr "%s hat keine Abonnenten. Willst du der erste sein?"
#: actions/subscribers.php:114
#, php-format
@@ -3779,9 +3736,8 @@ msgid "Maximum length of a profile bio in characters."
msgstr ""
#: actions/useradminpanel.php:231
-#, fuzzy
msgid "New users"
-msgstr "Lade neue Leute ein"
+msgstr "Neue Nutzer"
#: actions/useradminpanel.php:235
msgid "New user welcome"
@@ -3853,9 +3809,8 @@ msgstr ""
"\"Abbrechen\"."
#: actions/userauthorization.php:188
-#, fuzzy
msgid "License"
-msgstr "Lizenz."
+msgstr "Lizenz"
#: actions/userauthorization.php:209
msgid "Accept"
@@ -3950,9 +3905,8 @@ msgid "No id."
msgstr "Keine ID."
#: actions/userdesignsettings.php:76 lib/designsettings.php:65
-#, fuzzy
msgid "Profile design"
-msgstr "Profil Einstellungen"
+msgstr "Profil Design Einstellungen"
#: actions/userdesignsettings.php:87 lib/designsettings.php:76
msgid ""
@@ -3970,14 +3924,13 @@ msgid "%s groups, page %d"
msgstr "%s Gruppen, Seite %d"
#: actions/usergroups.php:130
-#, fuzzy
msgid "Search for more groups"
-msgstr "Suche nach Leuten oder Text"
+msgstr "Suche nach weiteren Gruppen"
#: actions/usergroups.php:153
-#, fuzzy, php-format
+#, php-format
msgid "%s is not a member of any group."
-msgstr "Du bist kein Mitglied dieser Gruppe."
+msgstr "%s ist in keiner Gruppe Mitglied."
#: actions/usergroups.php:158
#, php-format
@@ -4020,9 +3973,8 @@ msgid "DB error inserting hashtag: %s"
msgstr "Datenbankfehler beim Einfügen des Hashtags: %s"
#: classes/Notice.php:179
-#, fuzzy
msgid "Problem saving notice. Too long."
-msgstr "Problem bei Speichern der Nachricht."
+msgstr "Problem bei Speichern der Nachricht. Sie ist zu lang."
#: classes/Notice.php:183
msgid "Problem saving notice. Unknown user."
@@ -4053,7 +4005,7 @@ msgstr ""
msgid "Problem saving notice."
msgstr "Problem bei Speichern der Nachricht."
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Datenbankfehler beim Einfügen der Antwort: %s"
@@ -4067,9 +4019,9 @@ msgid "Could not set group membership."
msgstr "Konnte Gruppenmitgliedschaft nicht setzen."
#: classes/User.php:347
-#, fuzzy, php-format
+#, php-format
msgid "Welcome to %1$s, @%2$s!"
-msgstr "Nachricht an %1$s auf %2$s"
+msgstr "Herzlich willkommen bei %1$s, @%2$s!"
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
@@ -4148,9 +4100,9 @@ msgid "Invite"
msgstr "Einladen"
#: lib/action.php:445 lib/subgroupnav.php:106
-#, fuzzy, php-format
+#, php-format
msgid "Invite friends and colleagues to join you on %s"
-msgstr "Lade Freunde und Kollegen ein dir auf %s beizutreten"
+msgstr "Lade Freunde und Kollegen ein dir auf %s zu folgen"
#: lib/action.php:450
msgid "Logout"
@@ -4294,19 +4246,16 @@ msgid "You cannot make changes to this site."
msgstr "Du kannst diesem Benutzer keine Nachricht schicken."
#: lib/adminpanelaction.php:195
-#, fuzzy
msgid "showForm() not implemented."
-msgstr "Befehl noch nicht implementiert."
+msgstr "showForm() noch nicht implementiert."
#: lib/adminpanelaction.php:224
-#, fuzzy
msgid "saveSettings() not implemented."
-msgstr "Befehl noch nicht implementiert."
+msgstr "saveSettings() noch nicht implementiert."
#: lib/adminpanelaction.php:247
-#, fuzzy
msgid "Unable to delete design setting."
-msgstr "Konnte Twitter-Einstellungen nicht speichern."
+msgstr "Konnte die Design Einstellungen nicht löschen."
#: lib/adminpanelaction.php:300
#, fuzzy
@@ -4325,24 +4274,23 @@ msgstr "SMS-Konfiguration"
#: lib/attachmentlist.php:87
msgid "Attachments"
-msgstr ""
+msgstr "Anhänge"
#: lib/attachmentlist.php:265
msgid "Author"
-msgstr ""
+msgstr "Autor"
#: lib/attachmentlist.php:278
-#, fuzzy
msgid "Provider"
-msgstr "Profil"
+msgstr "Anbieter"
#: lib/attachmentnoticesection.php:67
msgid "Notices where this attachment appears"
-msgstr ""
+msgstr "Nachrichten in denen dieser Anhang erscheint"
#: lib/attachmenttagcloudsection.php:48
msgid "Tags for this attachment"
-msgstr ""
+msgstr "Tags für diesen Anhang"
#: lib/channel.php:138 lib/channel.php:158
msgid "Command results"
@@ -4384,7 +4332,7 @@ msgstr ""
#: lib/command.php:152 lib/command.php:400
msgid "Notice with that id does not exist"
-msgstr ""
+msgstr "Nachricht mit dieser ID existiert nicht"
#: lib/command.php:168 lib/command.php:416 lib/command.php:471
msgid "User has no last notice"
@@ -4420,9 +4368,9 @@ msgid "About: %s"
msgstr "Über: %s"
#: lib/command.php:358 scripts/xmppdaemon.php:321
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "Nachricht zu lange - maximal 140 Zeichen erlaubt, du hast %s gesendet"
+msgstr "Nachricht zu lang - maximal %d Zeichen erlaubt, du hast %d gesendet"
#: lib/command.php:377
msgid "Error sending direct message."
@@ -4434,14 +4382,13 @@ msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "Nachricht zu lange - maximal 140 Zeichen erlaubt, du hast %s gesendet"
#: lib/command.php:439
-#, fuzzy, php-format
+#, php-format
msgid "Reply to %s sent"
-msgstr "Auf diese Nachricht antworten"
+msgstr "Antwort an %s gesendet"
#: lib/command.php:441
-#, fuzzy
msgid "Error saving notice."
-msgstr "Problem bei Speichern der Nachricht."
+msgstr "Problem beim Speichern der Nachricht."
#: lib/command.php:495
msgid "Specify the name of the user to subscribe to"
@@ -4481,50 +4428,40 @@ msgstr "Benachrichtigung aktiviert."
msgid "Can't turn on notification."
msgstr "Konnte Benachrichtigung nicht aktivieren."
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Konnte OpenID-Formular nicht erstellen: %s"
-
-#: 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:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Du hast dieses Profil nicht abonniert."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Du hast diese Benutzer bereits abonniert:"
msgstr[1] "Du hast diese Benutzer bereits abonniert:"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Die Gegenseite konnte Dich nicht abonnieren."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Die Gegenseite konnte Dich nicht abonnieren."
msgstr[1] "Die Gegenseite konnte Dich nicht abonnieren."
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Du bist kein Mitglied dieser Gruppe."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Du bist kein Mitglied dieser Gruppe."
msgstr[1] "Du bist kein Mitglied dieser Gruppe."
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4543,7 +4480,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4603,9 +4539,11 @@ msgid "Upload file"
msgstr "Hochladen"
#: lib/designsettings.php:109
+#, fuzzy
msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
+"You can upload your personal background image. The maximum file size is 2MB."
msgstr ""
+"Du kannst dein persönliches Avatar hochladen. Die maximale Dateigröße ist %s."
#: lib/designsettings.php:372
msgid "Bad default color settings: "
@@ -4787,7 +4725,15 @@ msgstr "Daten verloren."
msgid "Unknown file type"
msgstr "Unbekannter Dateityp"
-#: lib/jabber.php:192
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5130,17 +5076,14 @@ msgid "at"
msgstr ""
#: lib/noticelist.php:506
-#, fuzzy
msgid "in context"
-msgstr "Kein Inhalt!"
+msgstr "im Zusammenhang"
#: lib/noticelist.php:526
-#, fuzzy
msgid "Reply to this notice"
msgstr "Auf diese Nachricht antworten"
#: lib/noticelist.php:527
-#, fuzzy
msgid "Reply"
msgstr "Antworten"
@@ -5176,12 +5119,12 @@ msgstr "Fehler beim Einfügen des entfernten Profils"
msgid "Duplicate notice"
msgstr "Notiz löschen"
-#: lib/oauthstore.php:466 lib/subs.php:48
+#: lib/oauthstore.php:467 lib/subs.php:48
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "Dieser Benutzer erlaubt dir nicht ihn zu abonnieren."
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr "Konnte neues Abonnement nicht eintragen."
@@ -5218,7 +5161,7 @@ msgstr "Deine gesendeten Nachrichten"
msgid "Tags in %s's notices"
msgstr "Tags in %ss Nachrichten"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Abonnements"
@@ -5226,7 +5169,7 @@ msgstr "Abonnements"
msgid "All subscriptions"
msgstr "Alle Abonnements"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Abonnenten"
@@ -5234,16 +5177,15 @@ msgstr "Abonnenten"
msgid "All subscribers"
msgstr "Alle Abonnenten"
-#: lib/profileaction.php:177
-#, fuzzy
+#: lib/profileaction.php:178
msgid "User ID"
-msgstr "Benutzer"
+msgstr "Nutzer ID"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Mitglied seit"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "Alle Gruppen"
@@ -5335,19 +5277,19 @@ msgid "Silence this user"
msgstr "Benutzer blockieren"
#: lib/subgroupnav.php:83
-#, fuzzy, php-format
+#, php-format
msgid "People %s subscribes to"
msgstr "Leute, die %s abonniert hat"
#: lib/subgroupnav.php:91
-#, fuzzy, php-format
+#, php-format
msgid "People subscribed to %s"
msgstr "Leute, die %s abonniert haben"
#: lib/subgroupnav.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Groups %s is a member of"
-msgstr "Gruppen zu denen %s gehört"
+msgstr "Gruppen in denen %s Mitglied ist"
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
@@ -5424,18 +5366,16 @@ msgid "Unsubscribe"
msgstr "Abbestellen"
#: lib/userprofile.php:116
-#, fuzzy
msgid "Edit Avatar"
-msgstr "Avatar"
+msgstr "Avatar bearbeiten"
#: lib/userprofile.php:236
msgid "User actions"
msgstr "Benutzeraktionen"
#: lib/userprofile.php:248
-#, fuzzy
msgid "Edit profile settings"
-msgstr "Profil Einstellungen"
+msgstr "Profil Einstellungen ändern"
#: lib/userprofile.php:249
msgid "Edit"
@@ -5449,60 +5389,63 @@ msgstr "Direkte Nachricht an Benutzer verschickt"
msgid "Message"
msgstr "Nachricht"
-#: lib/util.php:826
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr ""
+
+#: lib/util.php:825
msgid "a few seconds ago"
msgstr "vor wenigen Sekunden"
-#: lib/util.php:828
+#: lib/util.php:827
msgid "about a minute ago"
msgstr "vor einer Minute"
-#: lib/util.php:830
+#: lib/util.php:829
#, php-format
msgid "about %d minutes ago"
msgstr "vor %d Minuten"
-#: lib/util.php:832
+#: lib/util.php:831
msgid "about an hour ago"
msgstr "vor einer Stunde"
-#: lib/util.php:834
+#: lib/util.php:833
#, php-format
msgid "about %d hours ago"
msgstr "vor %d Stunden"
-#: lib/util.php:836
+#: lib/util.php:835
msgid "about a day ago"
msgstr "vor einem Tag"
-#: lib/util.php:838
+#: lib/util.php:837
#, php-format
msgid "about %d days ago"
msgstr "vor %d Tagen"
-#: lib/util.php:840
+#: lib/util.php:839
msgid "about a month ago"
msgstr "vor einem Monat"
-#: lib/util.php:842
+#: lib/util.php:841
#, php-format
msgid "about %d months ago"
msgstr "vor %d Monaten"
-#: lib/util.php:844
+#: lib/util.php:843
msgid "about a year ago"
msgstr "vor einem Jahr"
#: lib/webcolor.php:82
-#, fuzzy, php-format
+#, php-format
msgid "%s is not a valid color!"
-msgstr ""
-"Homepage ist kein gültiger URL. URL´s müssen ein Präfix wie http enthalten."
+msgstr "%s ist keine gültige Farbe!"
#: lib/webcolor.php:123
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
-msgstr ""
+msgstr "%s ist keine gültige Farbe! Verwenden Sie 3 oder 6 Hex-Zeichen."
#: scripts/maildaemon.php:48
msgid "Could not parse message."
@@ -5519,7 +5462,3 @@ msgstr "Sorry, das ist nicht deine Adresse für eingehende E-Mails."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Sorry, keinen eingehenden E-Mails gestattet."
-
-#, fuzzy
-#~ msgid "Notice"
-#~ msgstr "Nachricht"
diff --git a/locale/el/LC_MESSAGES/statusnet.mo b/locale/el/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 23652a257..000000000
--- a/locale/el/LC_MESSAGES/statusnet.mo
+++ /dev/null
Binary files differ
diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po
index cc70f3edc..6ab4721c2 100644
--- a/locale/el/LC_MESSAGES/statusnet.po
+++ b/locale/el/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-23 21:46+0000\n"
-"PO-Revision-Date: 2009-11-23 21:47:08+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:19:21+0000\n"
"Language-Team: Greek\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59365); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: el\n"
"X-Message-Group: out-statusnet\n"
@@ -569,7 +569,7 @@ msgstr ""
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -742,7 +742,7 @@ msgid "Conversation"
msgstr "Τοποθεσία"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr ""
@@ -1166,7 +1166,7 @@ msgstr "Η διεύθυνση του εισερχόμενου email αφαιρέ
msgid "New incoming email address added."
msgstr ""
-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr ""
@@ -1261,24 +1261,24 @@ msgstr ""
msgid "You can use the local subscription!"
msgstr ""
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr ""
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
msgstr ""
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "Απέτυχε η μετατροπή αιτούμενων tokens σε tokens πρόσβασης."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
msgid "Remote service uses unknown version of OMB protocol."
msgstr ""
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr ""
@@ -1480,8 +1480,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1772,51 +1772,51 @@ msgstr ""
msgid "Already logged in."
msgstr "Ήδη συνδεδεμένος."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
msgid "Invalid or expired token."
msgstr ""
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Λάθος όνομα χρήστη ή κωδικός"
-#: actions/login.php:149
+#: actions/login.php:152
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Σύνδεση"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr ""
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Ψευδώνυμο"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Κωδικός"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr ""
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "Αυτόματη σύνδεση στο μέλλον. ΟΧΙ για κοινόχρηστους υπολογιστές!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Χάσατε ή ξεχάσατε τον κωδικό σας;"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1824,7 +1824,7 @@ msgstr ""
"Για λόγους ασφαλείας, παρακαλώ εισάγετε ξανά το όνομα χρήστη και τον κωδικό "
"σας, πριν αλλάξετε τις ρυθμίσεις σας."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2742,7 +2742,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:356
+#: lib/userprofile.php:365
msgid "Subscribe"
msgstr ""
@@ -2751,8 +2751,7 @@ 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)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr ""
#: actions/remotesubscribe.php:176
@@ -2932,7 +2931,7 @@ msgid "Members"
msgstr "Μέλος από"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
@@ -2941,7 +2940,7 @@ msgstr ""
msgid "All members"
msgstr ""
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr ""
@@ -3897,7 +3896,7 @@ msgstr ""
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Σφάλμα βάσης δεδομένων κατά την εισαγωγή απάντησης: %s"
@@ -4318,50 +4317,40 @@ msgstr ""
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Αδυναμία δημιουργίας φόρμας OpenID: %s "
-
-#: 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:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
msgstr[1] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
msgstr[1] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Ομάδες με τα περισσότερα μέλη"
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Ομάδες με τα περισσότερα μέλη"
msgstr[1] "Ομάδες με τα περισσότερα μέλη"
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4380,7 +4369,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4440,7 +4428,7 @@ msgstr "Αδύνατη η αποθήκευση του προφίλ."
#: lib/designsettings.php:109
msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
+"You can upload your personal background image. The maximum file size is 2MB."
msgstr ""
#: lib/designsettings.php:372
@@ -4614,7 +4602,15 @@ msgstr "Αδύνατη η αποθήκευση του προφίλ."
msgid "Unknown file type"
msgstr ""
-#: lib/jabber.php:192
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -4979,11 +4975,11 @@ msgstr ""
msgid "Duplicate notice"
msgstr "Διαγραφή μηνύματος"
-#: lib/oauthstore.php:466 lib/subs.php:48
+#: lib/oauthstore.php:467 lib/subs.php:48
msgid "You have been banned from subscribing."
msgstr ""
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr "Απέτυχε η εισαγωγή νέας συνδρομής."
@@ -5020,7 +5016,7 @@ msgstr ""
msgid "Tags in %s's notices"
msgstr ""
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr ""
@@ -5028,7 +5024,7 @@ msgstr ""
msgid "All subscriptions"
msgstr "Όλες οι συνδρομές"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr ""
@@ -5036,15 +5032,15 @@ msgstr ""
msgid "All subscribers"
msgstr ""
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr ""
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Μέλος από"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr ""
@@ -5244,47 +5240,51 @@ msgstr ""
msgid "Message"
msgstr ""
-#: lib/util.php:826
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr ""
+
+#: lib/util.php:825
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:828
+#: lib/util.php:827
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:830
+#: lib/util.php:829
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:832
+#: lib/util.php:831
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:834
+#: lib/util.php:833
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:836
+#: lib/util.php:835
msgid "about a day ago"
msgstr ""
-#: lib/util.php:838
+#: lib/util.php:837
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:840
+#: lib/util.php:839
msgid "about a month ago"
msgstr ""
-#: lib/util.php:842
+#: lib/util.php:841
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:844
+#: lib/util.php:843
msgid "about a year ago"
msgstr ""
@@ -5313,6 +5313,3 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
-
-#~ msgid "Notice"
-#~ msgstr "Μήνυμα"
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.mo b/locale/en_GB/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 3a5c7d845..000000000
--- a/locale/en_GB/LC_MESSAGES/statusnet.mo
+++ /dev/null
Binary files differ
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index 456f739e9..fb598943c 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-23 21:46+0000\n"
-"PO-Revision-Date: 2009-11-23 21:47:12+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:19:24+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(r59365); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: en-gb\n"
"X-Message-Group: out-statusnet\n"
@@ -563,7 +563,7 @@ msgstr "Crop"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -733,7 +733,7 @@ msgid "Conversation"
msgstr "Conversation"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Notices"
@@ -1155,7 +1155,7 @@ msgstr "Incoming e-mail address removed."
msgid "New incoming email address added."
msgstr "New incoming e-mail address added."
-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Popular notices"
@@ -1253,24 +1253,24 @@ msgstr "User being listened to doesn't exist."
msgid "You can use the local subscription!"
msgstr "You can use the local subscription!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "That user has blocked you from subscribing."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
msgstr "You are not authorised."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
msgid "Could not convert request token to access token."
msgstr "Couldn't convert request tokens to access tokens."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Unknown version of OMB protocol."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Error updating remote profile."
@@ -1480,8 +1480,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Groups"
@@ -1804,53 +1804,53 @@ msgstr "%s left group %s"
msgid "Already logged in."
msgstr "Already logged in."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "Invalid notice content"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Incorrect username or password."
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "You are not authorised."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Login"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "Login to site"
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Nickname"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Password"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Remember me"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "Automatically login in the future; not for shared computers!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Lost or forgotten password?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1858,7 +1858,7 @@ msgstr ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
-#: actions/login.php:286
+#: actions/login.php:289
#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2785,7 +2785,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL of your profile on another compatible microblogging service"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:356
+#: lib/userprofile.php:365
msgid "Subscribe"
msgstr "Subscribe"
@@ -2795,8 +2795,7 @@ msgstr "Invalid profile URL (bad format)"
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "Not a valid profile URL (no YADIS document)."
#: actions/remotesubscribe.php:176
@@ -2975,7 +2974,7 @@ msgid "Members"
msgstr "Members"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(None)"
@@ -2984,7 +2983,7 @@ msgstr "(None)"
msgid "All members"
msgstr "All members"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Statistics"
@@ -3966,7 +3965,7 @@ msgstr "You are banned from posting notices on this site."
msgid "Problem saving notice."
msgstr "Problem saving notice."
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr "DB error inserting reply: %s"
@@ -4388,50 +4387,40 @@ msgstr "Notification on."
msgid "Can't turn on notification."
msgstr "Can't turn on notification."
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Could not create OpenID from: %s"
-
-#: 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:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "You are not subscribed to that profile."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "You are already subscribed to these users:"
msgstr[1] "You are already subscribed to these users:"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Could not subscribe other to you."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Could not subscribe other to you."
msgstr[1] "Could not subscribe other to you."
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "You are not a member of that group."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "You are not a member of that group."
msgstr[1] "You are not a member of that group."
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4450,7 +4439,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4508,9 +4496,10 @@ msgid "Upload file"
msgstr "Upload"
#: lib/designsettings.php:109
+#, fuzzy
msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
-msgstr ""
+"You can upload your personal background image. The maximum file size is 2MB."
+msgstr "You can upload your personal avatar. The maximum file size is %s."
#: lib/designsettings.php:372
msgid "Bad default color settings: "
@@ -4682,7 +4671,15 @@ msgstr "Lost our file."
msgid "Unknown file type"
msgstr "Unknown file type"
-#: lib/jabber.php:192
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5061,11 +5058,11 @@ msgstr "Error inserting remote profile."
msgid "Duplicate notice"
msgstr "Duplicate notice"
-#: lib/oauthstore.php:466 lib/subs.php:48
+#: lib/oauthstore.php:467 lib/subs.php:48
msgid "You have been banned from subscribing."
msgstr "You have been banned from subscribing."
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr "Couldn't insert new subscription."
@@ -5102,7 +5099,7 @@ msgstr "Your sent messages"
msgid "Tags in %s's notices"
msgstr "Tags in %s's notices"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Subscriptions"
@@ -5110,7 +5107,7 @@ msgstr "Subscriptions"
msgid "All subscriptions"
msgstr "All subscriptions"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Subscribers"
@@ -5118,15 +5115,15 @@ msgstr "Subscribers"
msgid "All subscribers"
msgstr "All subscribers"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr "User ID"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Member since"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "All groups"
@@ -5322,47 +5319,51 @@ msgstr "Send a direct message to this user"
msgid "Message"
msgstr "Message"
-#: lib/util.php:826
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr ""
+
+#: lib/util.php:825
msgid "a few seconds ago"
msgstr "a few seconds ago"
-#: lib/util.php:828
+#: lib/util.php:827
msgid "about a minute ago"
msgstr "about a minute ago"
-#: lib/util.php:830
+#: lib/util.php:829
#, php-format
msgid "about %d minutes ago"
msgstr "about %d minutes ago"
-#: lib/util.php:832
+#: lib/util.php:831
msgid "about an hour ago"
msgstr "about an hour ago"
-#: lib/util.php:834
+#: lib/util.php:833
#, php-format
msgid "about %d hours ago"
msgstr "about %d hours ago"
-#: lib/util.php:836
+#: lib/util.php:835
msgid "about a day ago"
msgstr "about a day ago"
-#: lib/util.php:838
+#: lib/util.php:837
#, php-format
msgid "about %d days ago"
msgstr "about %d days ago"
-#: lib/util.php:840
+#: lib/util.php:839
msgid "about a month ago"
msgstr "about a month ago"
-#: lib/util.php:842
+#: lib/util.php:841
#, php-format
msgid "about %d months ago"
msgstr "about %d months ago"
-#: lib/util.php:844
+#: lib/util.php:843
msgid "about a year ago"
msgstr "about a year ago"
@@ -5391,6 +5392,3 @@ msgstr "Sorry, that is not your incoming e-mail address."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Sorry, no incoming e-mail allowed."
-
-#~ msgid "Notice"
-#~ msgstr "Notice"
diff --git a/locale/es/LC_MESSAGES/statusnet.mo b/locale/es/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index f562bcaa3..000000000
--- a/locale/es/LC_MESSAGES/statusnet.mo
+++ /dev/null
Binary files differ
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index 835a89d52..393a3c602 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-23 21:46+0000\n"
-"PO-Revision-Date: 2009-11-23 21:47:16+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:19:28+0000\n"
"Language-Team: Spanish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59365); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: es\n"
"X-Message-Group: out-statusnet\n"
@@ -577,7 +577,7 @@ msgstr "Cortar"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -752,7 +752,7 @@ msgid "Conversation"
msgstr "Código de confirmación"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Avisos"
@@ -1184,7 +1184,7 @@ msgstr "Dirección de correo entrante removida."
msgid "New incoming email address added."
msgstr "Nueva dirección de correo entrante agregada."
-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
#: lib/publicgroupnav.php:93
#, fuzzy
msgid "Popular notices"
@@ -1282,26 +1282,26 @@ msgstr "El usuario al que quieres seguir no existe."
msgid "You can use the local subscription!"
msgstr "¡Puedes usar la suscripción local!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "Ese usuario te ha bloqueado la suscripción."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "No autorizado."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "No se pudieron convertir las clavesde petición a claves de acceso."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Versión desconocida del protocolo OMB."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Error al actualizar el perfil remoto"
@@ -1519,8 +1519,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Grupos"
@@ -1853,55 +1853,55 @@ msgstr "%s dejó grupo %s"
msgid "Already logged in."
msgstr "Ya estás conectado."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "El contenido del aviso es inválido"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Nombre de usuario o contraseña incorrectos."
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "No autorizado."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Inicio de sesión"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "Ingresar a sitio"
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Apodo"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Contraseña"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Recordarme"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Iniciar sesión automáticamente en el futuro. ¡No usar en ordenadores "
"compartidos! "
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "¿Contraseña olvidada o perdida?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1909,7 +1909,7 @@ msgstr ""
"Por razones de seguridad, por favor vuelve a escribir tu nombre de usuario y "
"contraseña antes de cambiar tu configuración."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2860,7 +2860,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "El URL de tu perfil en otro servicio de microblogueo compatible"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:356
+#: lib/userprofile.php:365
msgid "Subscribe"
msgstr "Suscribirse"
@@ -2870,8 +2870,7 @@ msgstr "El URL del perfil es inválido (formato incorrecto)"
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "URL de perfil no válido (ningún documento YADIS)."
#: actions/remotesubscribe.php:176
@@ -3055,7 +3054,7 @@ msgid "Members"
msgstr "Miembros"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(Ninguno)"
@@ -3064,7 +3063,7 @@ msgstr "(Ninguno)"
msgid "All members"
msgstr "Todos los miembros"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Estadísticas"
@@ -4076,7 +4075,7 @@ msgstr "Tienes prohibido publicar avisos en este sitio."
msgid "Problem saving notice."
msgstr "Hubo un problema al guardar el aviso."
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Error de BD al insertar respuesta: %s"
@@ -4508,50 +4507,40 @@ msgstr "Notificación activada."
msgid "Can't turn on notification."
msgstr "No se puede activar notificación."
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "No se pudo crear el formulario OpenID: %s"
-
-#: 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:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "No estás suscrito a ese perfil."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Ya estás suscrito a estos usuarios:"
msgstr[1] "Ya estás suscrito a estos usuarios:"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "No se pudo suscribir otro a ti."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "No se pudo suscribir otro a ti."
msgstr[1] "No se pudo suscribir otro a ti."
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "No eres miembro de ese grupo"
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "No eres miembro de este grupo."
msgstr[1] "No eres miembro de este grupo."
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4570,7 +4559,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4627,9 +4615,10 @@ msgid "Upload file"
msgstr "Cargar archivo"
#: lib/designsettings.php:109
+#, fuzzy
msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
-msgstr ""
+"You can upload your personal background image. The maximum file size is 2MB."
+msgstr "Puedes cargar tu avatar personal."
#: lib/designsettings.php:372
msgid "Bad default color settings: "
@@ -4804,7 +4793,15 @@ msgstr "Se perdió nuestro archivo."
msgid "Unknown file type"
msgstr "Tipo de archivo desconocido"
-#: lib/jabber.php:192
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5184,12 +5181,12 @@ msgstr "Error al insertar perfil remoto"
msgid "Duplicate notice"
msgstr "Duplicar aviso"
-#: lib/oauthstore.php:466 lib/subs.php:48
+#: lib/oauthstore.php:467 lib/subs.php:48
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "Ese usuario te ha bloqueado la suscripción."
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr "No se pudo insertar una nueva suscripción."
@@ -5226,7 +5223,7 @@ msgstr "Mensajes enviados"
msgid "Tags in %s's notices"
msgstr "Tags en avisos de %s"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Suscripciones"
@@ -5234,7 +5231,7 @@ msgstr "Suscripciones"
msgid "All subscriptions"
msgstr "Todas las suscripciones"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Suscriptores"
@@ -5243,15 +5240,15 @@ msgstr "Suscriptores"
msgid "All subscribers"
msgstr "Todos los suscriptores"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr "ID de usuario"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Miembro desde"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "Todos los grupos"
@@ -5456,47 +5453,51 @@ msgstr "Enviar un mensaje directo a este usuario"
msgid "Message"
msgstr "Mensaje"
-#: lib/util.php:826
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr ""
+
+#: lib/util.php:825
msgid "a few seconds ago"
msgstr "hace unos segundos"
-#: lib/util.php:828
+#: lib/util.php:827
msgid "about a minute ago"
msgstr "hace un minuto"
-#: lib/util.php:830
+#: lib/util.php:829
#, php-format
msgid "about %d minutes ago"
msgstr "hace %d minutos"
-#: lib/util.php:832
+#: lib/util.php:831
msgid "about an hour ago"
msgstr "hace una hora"
-#: lib/util.php:834
+#: lib/util.php:833
#, php-format
msgid "about %d hours ago"
msgstr "hace %d horas"
-#: lib/util.php:836
+#: lib/util.php:835
msgid "about a day ago"
msgstr "hace un día"
-#: lib/util.php:838
+#: lib/util.php:837
#, php-format
msgid "about %d days ago"
msgstr "hace %d días"
-#: lib/util.php:840
+#: lib/util.php:839
msgid "about a month ago"
msgstr "hace un mes"
-#: lib/util.php:842
+#: lib/util.php:841
#, php-format
msgid "about %d months ago"
msgstr "hace %d meses"
-#: lib/util.php:844
+#: lib/util.php:843
msgid "about a year ago"
msgstr "hace un año"
@@ -5525,7 +5526,3 @@ msgstr "Lo sentimos, pero este no es su dirección de correo entrante."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Lo sentimos, pero no se permite correos entrantes"
-
-#, fuzzy
-#~ msgid "Notice"
-#~ msgstr "Aviso"
diff --git a/locale/fi/LC_MESSAGES/statusnet.mo b/locale/fi/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index d0370b6d9..000000000
--- a/locale/fi/LC_MESSAGES/statusnet.mo
+++ /dev/null
Binary files differ
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 416e4eb7d..e5e8af795 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-23 21:46+0000\n"
-"PO-Revision-Date: 2009-11-23 21:47:19+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:19:32+0000\n"
"Language-Team: Finnish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59365); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fi\n"
"X-Message-Group: out-statusnet\n"
@@ -372,9 +372,8 @@ msgstr "Alias ei voi olla sama kuin ryhmätunnus."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
-#, fuzzy
msgid "Group not found!"
-msgstr "API-metodia ei löytynyt!"
+msgstr "Ryhmää ei löytynyt!"
#: actions/apigroupjoin.php:110
msgid "You are already a member of that group."
@@ -385,9 +384,9 @@ msgid "You have been blocked from that group by the admin."
msgstr "Sinut on estetty osallistumasta tähän ryhmään ylläpitäjän toimesta."
#: actions/apigroupjoin.php:138
-#, fuzzy, php-format
+#, php-format
msgid "Could not join user %s to group %s."
-msgstr "Käyttäjää %s ei voinut liittää ryhmään %s"
+msgstr "Käyttäjä %s ei voinut liittyä ryhmään %s."
#: actions/apigroupleave.php:114
msgid "You are not a member of this group."
@@ -574,7 +573,7 @@ msgstr "Rajaa"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -745,7 +744,7 @@ msgid "Conversation"
msgstr "Keskustelu"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Päivitykset"
@@ -797,9 +796,8 @@ msgstr ""
"uudelleen."
#: actions/deleteuser.php:67
-#, fuzzy
msgid "You cannot delete users."
-msgstr "Ei voitu päivittää käyttäjää."
+msgstr "Sinä et voi poistaa käyttäjiä."
#: actions/deleteuser.php:74
#, fuzzy
@@ -807,9 +805,8 @@ msgid "You can only delete local users."
msgstr "Et voi poistaa toisen käyttäjän päivitystä."
#: actions/deleteuser.php:110 actions/deleteuser.php:133
-#, fuzzy
msgid "Delete user"
-msgstr "Poista"
+msgstr "Poista käyttäjä"
#: actions/deleteuser.php:135
msgid ""
@@ -825,11 +822,11 @@ msgstr "Poista tämä päivitys"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
-msgstr ""
+msgstr "Ulkoasu"
#: actions/designadminpanel.php:73
msgid "Design settings for this StatusNet site."
-msgstr ""
+msgstr "Ulkoasuasetukset tälle StatusNet palvelulle."
#: actions/designadminpanel.php:270
#, fuzzy
@@ -868,12 +865,12 @@ msgstr "Kirjaudu ulos palvelusta"
#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
-msgstr ""
+msgstr "Vaihda tautakuva"
#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
-msgstr ""
+msgstr "Tausta"
#: actions/designadminpanel.php:422
#, fuzzy, php-format
@@ -884,11 +881,11 @@ msgstr "Voit ladata ryhmälle logokuvan. Maksimikoko on %s."
#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
-msgstr ""
+msgstr "On"
#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
-msgstr ""
+msgstr "Off"
#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
@@ -899,14 +896,12 @@ msgid "Tile background image"
msgstr ""
#: actions/designadminpanel.php:483 lib/designsettings.php:170
-#, fuzzy
msgid "Change colours"
-msgstr "Vaihda salasanasi"
+msgstr "Vaihda väriä"
#: actions/designadminpanel.php:505 lib/designsettings.php:191
-#, fuzzy
msgid "Content"
-msgstr "Yhdistä"
+msgstr "Sisältö"
#: actions/designadminpanel.php:518 lib/designsettings.php:204
#, fuzzy
@@ -918,13 +913,12 @@ msgid "Text"
msgstr "Teksti"
#: actions/designadminpanel.php:544 lib/designsettings.php:230
-#, fuzzy
msgid "Links"
-msgstr "Kirjaudu sisään"
+msgstr "Linkit"
#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
-msgstr ""
+msgstr "Käytä oletusasetuksia"
#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
@@ -1176,7 +1170,7 @@ msgstr "Saapuvan sähköpostin osoite poistettu."
msgid "New incoming email address added."
msgstr "Uusi saapuvan sähköpostin osoite lisätty."
-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Suosituimmat päivitykset"
@@ -1270,25 +1264,25 @@ msgstr "Käyttäjää jota seurataan ei ole olemassa."
msgid "You can use the local subscription!"
msgstr "Voit käyttää paikallista tilausta!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "Käyttäjä on estänyt sinua tilaamasta päivityksiä."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
msgstr "Sinulla ei ole valtuutusta tähän."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "Ei voitu muuttaa request tokeneita access tokeneiksi."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Tuntematon OMB-protokollan versio."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Virhe tapahtui etäprofiilin päivittämisessä"
@@ -1488,8 +1482,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Ryhmät"
@@ -1818,55 +1812,55 @@ msgstr "%s erosi ryhmästä %s"
msgid "Already logged in."
msgstr "Olet jo kirjautunut sisään."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "Päivityksen sisältö ei kelpaa"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Väärä käyttäjätunnus tai salasana"
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Sinulla ei ole valtuutusta tähän."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Kirjaudu sisään"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "Kirjaudu sisään"
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Tunnus"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Salasana"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Muista minut"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Kirjaudu sisään automaattisesti tulevaisuudessa; ei tietokoneille joilla "
"useampi käyttäjä!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Oletko hukannut tai unohtanut salasanasi?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1874,7 +1868,7 @@ msgstr ""
"Syötä turvallisuussyistä käyttäjätunnuksesi ja salasanasi uudelleen ennen "
"asetuksiesi muuttamista."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2158,11 +2152,11 @@ msgstr "Salasana tallennettu."
#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
msgid "Paths"
-msgstr ""
+msgstr "Polut"
#: actions/pathsadminpanel.php:70
msgid "Path and server settings for this StatusNet site."
-msgstr ""
+msgstr "Polut ja palvelin asetukset tälle StatusNet palvelulle."
#: actions/pathsadminpanel.php:140
#, fuzzy, php-format
@@ -2245,19 +2239,19 @@ msgstr "Kuva poistettu."
#: actions/pathsadminpanel.php:269
msgid "Backgrounds"
-msgstr ""
+msgstr "Taustakuvat"
#: actions/pathsadminpanel.php:273
msgid "Background server"
-msgstr ""
+msgstr "Taustakuvapalvelin"
#: actions/pathsadminpanel.php:277
msgid "Background path"
-msgstr ""
+msgstr "Taustakuvan hakemistopolku"
#: actions/pathsadminpanel.php:281
msgid "Background directory"
-msgstr ""
+msgstr "Taustakuvan hakemisto"
#: actions/pathsadminpanel.php:297
#, fuzzy
@@ -2816,7 +2810,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Profiilisi URL-osoite toisessa yhteensopivassa mikroblogauspalvelussa"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:356
+#: lib/userprofile.php:365
msgid "Subscribe"
msgstr "Tilaa"
@@ -2826,8 +2820,7 @@ msgstr "Profiilin URL-osoite '%s' ei kelpaa (virheellinen muoto)."
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr ""
"Tuo ei ole kelvollinen profiilin verkko-osoite (YADIS dokumenttia ei "
"löytynyt)."
@@ -3009,7 +3002,7 @@ msgid "Members"
msgstr "Jäsenet"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(Tyhjä)"
@@ -3018,7 +3011,7 @@ msgstr "(Tyhjä)"
msgid "All members"
msgstr "Kaikki jäsenet"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Tilastot"
@@ -4015,7 +4008,7 @@ msgstr "Päivityksesi tähän palveluun on estetty."
msgid "Problem saving notice."
msgstr "Ongelma päivityksen tallentamisessa."
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Tietokantavirhe tallennettaessa vastausta: %s"
@@ -4442,50 +4435,40 @@ msgstr "Ilmoitukset päällä."
msgid "Can't turn on notification."
msgstr "Ilmoituksia ei voi pistää päälle."
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Ei voitu luoda OpenID lomaketta: %s"
-
-#: 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:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Olet jos tilannut seuraavien käyttäjien päivitykset:"
msgstr[1] "Olet jos tilannut seuraavien käyttäjien päivitykset:"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Toista ei voitu asettaa tilaamaan sinua."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Toista ei voitu asettaa tilaamaan sinua."
msgstr[1] "Toista ei voitu asettaa tilaamaan sinua."
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Sinä et kuulu tähän ryhmään."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Sinä et kuulu tähän ryhmään."
msgstr[1] "Sinä et kuulu tähän ryhmään."
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4504,7 +4487,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4564,9 +4546,10 @@ msgid "Upload file"
msgstr "Lataa"
#: lib/designsettings.php:109
+#, fuzzy
msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
-msgstr ""
+"You can upload your personal background image. The maximum file size is 2MB."
+msgstr "Voit ladata oman profiilikuvasi. Maksimikoko on %s."
#: lib/designsettings.php:372
msgid "Bad default color settings: "
@@ -4742,7 +4725,15 @@ msgstr "Tiedosto hävisi."
msgid "Unknown file type"
msgstr "Tunnistamaton tiedoston tyyppi"
-#: lib/jabber.php:192
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5123,12 +5114,12 @@ msgstr "Virhe tapahtui uuden etäprofiilin lisäämisessä"
msgid "Duplicate notice"
msgstr "Poista päivitys"
-#: lib/oauthstore.php:466 lib/subs.php:48
+#: lib/oauthstore.php:467 lib/subs.php:48
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "Käyttäjä on estänyt sinua tilaamasta päivityksiä."
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr "Ei voitu lisätä uutta tilausta."
@@ -5165,7 +5156,7 @@ msgstr "Lähettämäsi viestit"
msgid "Tags in %s's notices"
msgstr "Tagit käyttäjän %s päivityksissä"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Tilaukset"
@@ -5173,7 +5164,7 @@ msgstr "Tilaukset"
msgid "All subscriptions"
msgstr "Kaikki tilaukset"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Tilaajat"
@@ -5181,16 +5172,16 @@ msgstr "Tilaajat"
msgid "All subscribers"
msgstr "Kaikki tilaajat"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
#, fuzzy
msgid "User ID"
msgstr "Käyttäjä"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Käyttäjänä alkaen"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "Kaikki ryhmät"
@@ -5395,47 +5386,51 @@ msgstr "Lähetä suora viesti tälle käyttäjälle"
msgid "Message"
msgstr "Viesti"
-#: lib/util.php:826
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr ""
+
+#: lib/util.php:825
msgid "a few seconds ago"
msgstr "muutama sekunti sitten"
-#: lib/util.php:828
+#: lib/util.php:827
msgid "about a minute ago"
msgstr "noin minuutti sitten"
-#: lib/util.php:830
+#: lib/util.php:829
#, php-format
msgid "about %d minutes ago"
msgstr "noin %d minuuttia sitten"
-#: lib/util.php:832
+#: lib/util.php:831
msgid "about an hour ago"
msgstr "noin tunti sitten"
-#: lib/util.php:834
+#: lib/util.php:833
#, php-format
msgid "about %d hours ago"
msgstr "noin %d tuntia sitten"
-#: lib/util.php:836
+#: lib/util.php:835
msgid "about a day ago"
msgstr "noin päivä sitten"
-#: lib/util.php:838
+#: lib/util.php:837
#, php-format
msgid "about %d days ago"
msgstr "noin %d päivää sitten"
-#: lib/util.php:840
+#: lib/util.php:839
msgid "about a month ago"
msgstr "noin kuukausi sitten"
-#: lib/util.php:842
+#: lib/util.php:841
#, php-format
msgid "about %d months ago"
msgstr "noin %d kuukautta sitten"
-#: lib/util.php:844
+#: lib/util.php:843
msgid "about a year ago"
msgstr "noin vuosi sitten"
@@ -5464,6 +5459,3 @@ msgstr "Valitettavasti tuo ei ole oikea osoite sähköpostipäivityksille."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Valitettavasti päivitysten teko sähköpostilla ei ole sallittua."
-
-#~ msgid "Notice"
-#~ msgstr "Päivitys"
diff --git a/locale/fr/LC_MESSAGES/statusnet.mo b/locale/fr/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 5351cd427..000000000
--- a/locale/fr/LC_MESSAGES/statusnet.mo
+++ /dev/null
Binary files differ
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index b8f449dd1..cb3c85af5 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -1,8 +1,10 @@
# Translation of StatusNet to French
#
+# Author@translatewiki.net: Brion
# Author@translatewiki.net: IAlex
# Author@translatewiki.net: Isoph
# Author@translatewiki.net: Jean-Frédéric
+# Author@translatewiki.net: McDutchie
# Author@translatewiki.net: Peter17
# Author@translatewiki.net: Zetud
# --
@@ -12,12 +14,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-23 21:46+0000\n"
-"PO-Revision-Date: 2009-11-23 21:47:22+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:19:36+0000\n"
"Language-Team: French\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59365); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: out-statusnet\n"
@@ -421,7 +423,7 @@ msgstr "Groupes de %s"
#: actions/apigrouplist.php:103
#, php-format
msgid "Groups %s is a member of on %s."
-msgstr "Les groupes %s sont membre de %s."
+msgstr "Les groupes dont %s est membre sur %s."
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
@@ -582,7 +584,7 @@ msgstr "Recadrer"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -754,7 +756,7 @@ msgid "Conversation"
msgstr "Conversation"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Statuts"
@@ -1173,7 +1175,7 @@ msgstr "L’adresse de courriel entrant a été supprimée."
msgid "New incoming email address added."
msgstr "Nouvelle adresse courriel ajoutée."
-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Statuts populaires"
@@ -1272,23 +1274,23 @@ msgstr "L’utilisateur suivi n’existe pas."
msgid "You can use the local subscription!"
msgstr "Vous pouvez utiliser l’abonnement local."
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "Cet utilisateur vous a empêché de vous inscrire."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
msgstr "Vous n'êtes pas autorisé."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
msgid "Could not convert request token to access token."
msgstr "Impossible de convertir le jeton de requête en jeton d’accès."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Le service distant utilise une version inconnue du protocole OMB."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Erreur lors de la mise à jour du profil distant"
@@ -1498,8 +1500,8 @@ msgstr ""
"Pourquoi ne pas [créer un compte](%%action.register%%) et [créer le groupe](%"
"%action.newgroup%%) vous-même !"
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Groupes"
@@ -1839,53 +1841,53 @@ msgstr "%s a quitté le groupe %s"
msgid "Already logged in."
msgstr "Déjà connecté."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
msgid "Invalid or expired token."
msgstr "Jeton invalide ou expiré."
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Identifiant ou mot de passe incorrect."
-#: actions/login.php:149
+#: actions/login.php:152
msgid "Error setting user. You are probably not authorized."
msgstr "Abonnements par défaut"
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Ouvrir une session"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "Ouverture de session"
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Pseudo"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Mot de passe"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Se souvenir de moi"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Ouvrir automatiquement ma session à l’avenir (déconseillé pour les "
"ordinateurs publics ou partagés)"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Mot de passe perdu ?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1893,7 +1895,7 @@ msgstr ""
"Pour des raisons de sécurité, veuillez entrer à nouveau votre identifiant et "
"votre mot de passe afin d’enregistrer vos préférences."
-#: actions/login.php:286
+#: actions/login.php:289
#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2847,7 +2849,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL de votre profil sur un autre service de micro-blogging compatible"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:356
+#: lib/userprofile.php:365
msgid "Subscribe"
msgstr "S’abonner"
@@ -2856,8 +2858,8 @@ msgid "Invalid profile URL (bad format)"
msgstr "URL du profil invalide (mauvais format)"
#: actions/remotesubscribe.php:168
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+#, fuzzy
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr ""
"URL de profil invalide (aucun document YADIS ou définition XRDS invalide)."
@@ -3050,7 +3052,7 @@ msgid "Members"
msgstr "Membres"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(aucun)"
@@ -3059,7 +3061,7 @@ msgstr "(aucun)"
msgid "All members"
msgstr "Tous les membres"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Statistiques"
@@ -4062,7 +4064,7 @@ msgstr "Il vous est interdit de publier des statuts dans ce site."
msgid "Problem saving notice."
msgstr "Problème lors de l’enregistrement du statut."
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Erreur de base de donnée en insérant la réponse :%s"
@@ -4078,7 +4080,7 @@ msgstr "Impossible d'établir l’inscription au groupe."
#: classes/User.php:347
#, php-format
msgid "Welcome to %1$s, @%2$s!"
-msgstr "Bienvenu à %1$s, %2$s !"
+msgstr "Bienvenu à %1$s, @%2$s !"
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
@@ -4482,49 +4484,38 @@ msgstr "Avertissements activés."
msgid "Can't turn on notification."
msgstr "Impossible d’activer les avertissements."
-#: lib/command.php:597
-#, php-format
-msgid "Could not create login token for %s"
-msgstr "Impossible de créer le jeton de connexion pour %s"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-"Ce lien n’est utilisable qu’une seule fois, et est valable uniquement "
-"pendant 2 minutes : %s"
-
-#: lib/command.php:618
+#: lib/command.php:592
msgid "You are not subscribed to anyone."
msgstr "Vous n'êtes pas abonné(e) à personne."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Vous êtes abonné à cette personne :"
msgstr[1] "Vous êtes abonné à ces personnes :"
-#: lib/command.php:640
+#: lib/command.php:614
msgid "No one is subscribed to you."
msgstr "Personne ne s'est abonné à vous."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Cette personne est abonnée à vous :"
msgstr[1] "Ces personnes sont abonnées à vous :"
-#: lib/command.php:662
+#: lib/command.php:636
msgid "You are not a member of any groups."
msgstr "Vous n'êtes pas membre d'aucun groupe."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Vous êtes membre de ce groupe :"
msgstr[1] "Vous êtes membre de ces groupes :"
-#: lib/command.php:678
+#: lib/command.php:652
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4543,7 +4534,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4637,9 +4627,9 @@ msgstr "Importer un fichier"
#: lib/designsettings.php:109
msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
+"You can upload your personal background image. The maximum file size is 2MB."
msgstr ""
-"Vous pouvez importer une image d’arrière plan personnelle. La taille "
+"Vous pouvez importer votre image d’arrière plan personnelle. La taille "
"maximale du fichier est de 2 Mo."
#: lib/designsettings.php:372
@@ -4816,7 +4806,15 @@ msgstr "Fichier perdu."
msgid "Unknown file type"
msgstr "Type de fichier inconnu"
-#: lib/jabber.php:192
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr "Mo"
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr "Ko"
+
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr "[%s]"
@@ -5266,11 +5264,11 @@ msgstr "Erreur lors de l’insertion du profil distant"
msgid "Duplicate notice"
msgstr "Dupliquer l’avis"
-#: lib/oauthstore.php:466 lib/subs.php:48
+#: lib/oauthstore.php:467 lib/subs.php:48
msgid "You have been banned from subscribing."
msgstr "Il vous avez été interdit de vous abonner."
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr "Impossible d’insérer un nouvel abonnement."
@@ -5307,7 +5305,7 @@ msgstr "Vos messages envoyés"
msgid "Tags in %s's notices"
msgstr "Marquages des statuts de %s"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Abonnements"
@@ -5315,7 +5313,7 @@ msgstr "Abonnements"
msgid "All subscriptions"
msgstr "Tous les abonnements"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Abonnés"
@@ -5323,15 +5321,15 @@ msgstr "Abonnés"
msgid "All subscribers"
msgstr "Tous les abonnés"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr "ID de l’utilisateur"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Membre depuis"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "Tous les groupes"
@@ -5524,47 +5522,51 @@ msgstr "Envoyer un message à cet utilisateur"
msgid "Message"
msgstr "Message"
-#: lib/util.php:826
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr "Modérer"
+
+#: lib/util.php:825
msgid "a few seconds ago"
msgstr "il y a quelques secondes"
-#: lib/util.php:828
+#: lib/util.php:827
msgid "about a minute ago"
msgstr "il y a 1 minute"
-#: lib/util.php:830
+#: lib/util.php:829
#, php-format
msgid "about %d minutes ago"
msgstr "il y a %d minutes"
-#: lib/util.php:832
+#: lib/util.php:831
msgid "about an hour ago"
msgstr "il y a 1 heure"
-#: lib/util.php:834
+#: lib/util.php:833
#, php-format
msgid "about %d hours ago"
msgstr "il y a %d heures"
-#: lib/util.php:836
+#: lib/util.php:835
msgid "about a day ago"
msgstr "il y a 1 jour"
-#: lib/util.php:838
+#: lib/util.php:837
#, php-format
msgid "about %d days ago"
msgstr "il y a %d jours"
-#: lib/util.php:840
+#: lib/util.php:839
msgid "about a month ago"
msgstr "il y a 1 mois"
-#: lib/util.php:842
+#: lib/util.php:841
#, php-format
msgid "about %d months ago"
msgstr "il y a %d mois"
-#: lib/util.php:844
+#: lib/util.php:843
msgid "about a year ago"
msgstr "il y a environ 1 an"
@@ -5594,6 +5596,3 @@ msgstr "Désolé, ceci n’est pas votre adresse de courriel entrant."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Désolé, la réception de courriels n’est pas permise."
-
-#~ msgid "Notice"
-#~ msgstr "Statut"
diff --git a/locale/ga/LC_MESSAGES/statusnet.mo b/locale/ga/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 58295cef7..000000000
--- a/locale/ga/LC_MESSAGES/statusnet.mo
+++ /dev/null
Binary files differ
diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po
index 4b8d4f103..445e580bb 100644
--- a/locale/ga/LC_MESSAGES/statusnet.po
+++ b/locale/ga/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-23 21:46+0000\n"
-"PO-Revision-Date: 2009-11-23 21:47:26+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:19:42+0000\n"
"Language-Team: Irish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59365); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ga\n"
"X-Message-Group: out-statusnet\n"
@@ -580,7 +580,7 @@ msgstr ""
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -760,7 +760,7 @@ msgid "Conversation"
msgstr "Código de confirmación."
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Chíos"
@@ -1196,7 +1196,7 @@ msgstr "Dirección de correo entrante eliminada."
msgid "New incoming email address added."
msgstr "Engadida nova dirección de correo entrante."
-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Chíos populares"
@@ -1293,26 +1293,26 @@ msgstr "O usuario que está sendo escoitado non existe."
msgid "You can use the local subscription!"
msgstr "¡Podes empregar a túa subscrición local!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "Este usuario non che permite suscribirte a el."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "Non está autorizado."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "Non se pode convertir o token da petición a tokens de acceso."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Versión de protocolo OMB descoñecida."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Acounteceu un erro actualizando o perfil remoto"
@@ -1525,8 +1525,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1856,53 +1856,53 @@ msgstr ""
msgid "Already logged in."
msgstr "Sesión xa iniciada"
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "Contido do chío inválido"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Usuario ou contrasinal incorrectos."
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Non está autorizado."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Inicio de sesión"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr ""
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Alcume"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Contrasinal"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Lembrarme"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "Endiante acceder automáticamente, coidado en equipos compartidos!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "¿Perdeches a contrasinal?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1910,7 +1910,7 @@ msgstr ""
"Por razóns de seguranza, por favor re-insire o teu nome de usuario e "
"contrasinal antes de cambiar as túas preferenzas."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2865,7 +2865,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Enderezo do teu perfil en outro servizo de microblogaxe compatíbel"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:356
+#: lib/userprofile.php:365
msgid "Subscribe"
msgstr "Subscribir"
@@ -2875,8 +2875,7 @@ msgstr "Enderezo de perfil inválido (formato incorrecto)"
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "Non é un enderezo de perfil válido (non ten documento YADIS)."
#: actions/remotesubscribe.php:176
@@ -3061,7 +3060,7 @@ msgid "Members"
msgstr "Membro dende"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
#, fuzzy
msgid "(None)"
@@ -3071,7 +3070,7 @@ msgstr "(nada)"
msgid "All members"
msgstr ""
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Estatísticas"
@@ -4084,7 +4083,7 @@ msgstr "Tes restrinxido o envio de chíos neste sitio."
msgid "Problem saving notice."
msgstr "Aconteceu un erro ó gardar o chío."
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Erro ó inserir a contestación na BD: %s"
@@ -4529,22 +4528,12 @@ msgstr "Notificación habilitada."
msgid "Can't turn on notification."
msgstr "Non se pode activar a notificación."
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Non se pode crear o formulario OpenID: %s"
-
-#: 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:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Non estás suscrito a ese perfil"
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Xa estas suscrito a estes usuarios:"
@@ -4553,12 +4542,12 @@ msgstr[2] ""
msgstr[3] ""
msgstr[4] ""
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Outro usuario non se puido suscribir a ti."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Outro usuario non se puido suscribir a ti."
@@ -4567,12 +4556,12 @@ msgstr[2] ""
msgstr[3] ""
msgstr[4] ""
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Non estás suscrito a ese perfil"
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Non estás suscrito a ese perfil"
@@ -4581,7 +4570,7 @@ msgstr[2] ""
msgstr[3] ""
msgstr[4] ""
-#: lib/command.php:678
+#: lib/command.php:652
#, fuzzy
msgid ""
"Commands:\n"
@@ -4601,7 +4590,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4686,9 +4674,10 @@ msgid "Upload file"
msgstr "Subir"
#: lib/designsettings.php:109
+#, fuzzy
msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
-msgstr ""
+"You can upload your personal background image. The maximum file size is 2MB."
+msgstr "Podes actualizar a túa información do perfil persoal aquí"
#: lib/designsettings.php:372
msgid "Bad default color settings: "
@@ -4870,7 +4859,15 @@ msgstr "Bloqueo de usuario fallido."
msgid "Unknown file type"
msgstr "tipo de ficheiro non soportado"
-#: lib/jabber.php:192
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5305,12 +5302,12 @@ msgstr "Aconteceu un erro ó inserir o perfil remoto"
msgid "Duplicate notice"
msgstr "Eliminar chío"
-#: lib/oauthstore.php:466 lib/subs.php:48
+#: lib/oauthstore.php:467 lib/subs.php:48
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "Este usuario non che permite suscribirte a el."
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr "Non se puido inserir a nova subscrición."
@@ -5347,7 +5344,7 @@ msgstr "As túas mensaxes enviadas"
msgid "Tags in %s's notices"
msgstr "O usuario non ten último chio."
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Subscricións"
@@ -5355,7 +5352,7 @@ msgstr "Subscricións"
msgid "All subscriptions"
msgstr "Tódalas subscricións"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Subscritores"
@@ -5364,16 +5361,16 @@ msgstr "Subscritores"
msgid "All subscribers"
msgstr "Subscritores"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
#, fuzzy
msgid "User ID"
msgstr "Usuario"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Membro dende"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
#, fuzzy
msgid "All groups"
msgstr "Tódalas etiquetas"
@@ -5586,47 +5583,51 @@ msgstr "Non podes enviar mensaxes a este usurio."
msgid "Message"
msgstr "Nova mensaxe"
-#: lib/util.php:826
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr ""
+
+#: lib/util.php:825
msgid "a few seconds ago"
msgstr "fai uns segundos"
-#: lib/util.php:828
+#: lib/util.php:827
msgid "about a minute ago"
msgstr "fai un minuto"
-#: lib/util.php:830
+#: lib/util.php:829
#, php-format
msgid "about %d minutes ago"
msgstr "fai %d minutos"
-#: lib/util.php:832
+#: lib/util.php:831
msgid "about an hour ago"
msgstr "fai unha hora"
-#: lib/util.php:834
+#: lib/util.php:833
#, php-format
msgid "about %d hours ago"
msgstr "fai %d horas"
-#: lib/util.php:836
+#: lib/util.php:835
msgid "about a day ago"
msgstr "fai un día"
-#: lib/util.php:838
+#: lib/util.php:837
#, php-format
msgid "about %d days ago"
msgstr "fai %d días"
-#: lib/util.php:840
+#: lib/util.php:839
msgid "about a month ago"
msgstr "fai un mes"
-#: lib/util.php:842
+#: lib/util.php:841
#, php-format
msgid "about %d months ago"
msgstr "fai %d meses"
-#: lib/util.php:844
+#: lib/util.php:843
msgid "about a year ago"
msgstr "fai un ano"
@@ -5655,7 +5656,3 @@ msgstr "Ise é un enderezo IM incorrecto."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Aivá, non se permiten correos entrantes."
-
-#, fuzzy
-#~ msgid "Notice"
-#~ msgstr "Chíos"
diff --git a/locale/he/LC_MESSAGES/statusnet.mo b/locale/he/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 8c7db4527..000000000
--- a/locale/he/LC_MESSAGES/statusnet.mo
+++ /dev/null
Binary files differ
diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po
index 02e557cd7..c48131307 100644
--- a/locale/he/LC_MESSAGES/statusnet.po
+++ b/locale/he/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-23 21:46+0000\n"
-"PO-Revision-Date: 2009-11-23 21:47:29+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:19:46+0000\n"
"Language-Team: Hebrew\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59365); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: he\n"
"X-Message-Group: out-statusnet\n"
@@ -574,7 +574,7 @@ msgstr ""
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -751,7 +751,7 @@ msgid "Conversation"
msgstr "מיקום"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "הודעות"
@@ -1174,7 +1174,7 @@ msgstr ""
msgid "New incoming email address added."
msgstr ""
-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
#: lib/publicgroupnav.php:93
#, fuzzy
msgid "Popular notices"
@@ -1271,26 +1271,26 @@ msgstr "המשתמש אליו אתה מאזין אינו קיים."
msgid "You can use the local subscription!"
msgstr "ניתן להשתמש במנוי המקומי!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr ""
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "לא מורשה."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "המרת אסימון הבקשה לאסימון גישה לא הצליחה."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "גירסה לא מוכרת של פרוטוקול OMB"
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "שגיאה בעדכון פרופיל מרוחק"
@@ -1502,8 +1502,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "קבוצות"
@@ -1801,59 +1801,59 @@ msgstr ""
msgid "Already logged in."
msgstr "כבר מחובר."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "תוכן ההודעה לא חוקי"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "שם משתמש או סיסמה לא נכונים."
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "לא מורשה."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "היכנס"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr ""
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "כינוי"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "סיסמה"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "זכור אותי"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "בעתיד התחבר אוטומטית; לא לשימוש במחשבים ציבוריים!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "שכחת או איבדת את הסיסמה?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr "לצרכי אבטחה, הכנס מחדש את שם המשתמש והסיסמה לפני שתשנה את ההגדרות."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2762,7 +2762,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "כתובת הפרופיל שלך בשרות ביקרובלוג תואם אחר"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:356
+#: lib/userprofile.php:365
msgid "Subscribe"
msgstr "הירשם כמנוי"
@@ -2772,8 +2772,7 @@ msgstr "כתובת פרופיל לא חוקית (פורמט לא תקין)"
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "Not a valid profile URL (no YADIS document)."
#: actions/remotesubscribe.php:176
@@ -2956,7 +2955,7 @@ msgid "Members"
msgstr "חבר מאז"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
@@ -2965,7 +2964,7 @@ msgstr ""
msgid "All members"
msgstr ""
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "סטטיסטיקה"
@@ -3944,7 +3943,7 @@ msgstr ""
msgid "Problem saving notice."
msgstr "בעיה בשמירת ההודעה."
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr "שגיאת מסד נתונים בהכנסת התגובה: %s"
@@ -4376,50 +4375,40 @@ msgstr ""
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "נכשלה יצירת OpenID מתוך: %s"
-
-#: 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:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "לא שלחנו אלינו את הפרופיל הזה"
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "לא שלחנו אלינו את הפרופיל הזה"
msgstr[1] "לא שלחנו אלינו את הפרופיל הזה"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "הרשמה מרוחקת"
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "הרשמה מרוחקת"
msgstr[1] "הרשמה מרוחקת"
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "לא שלחנו אלינו את הפרופיל הזה"
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "לא שלחנו אלינו את הפרופיל הזה"
msgstr[1] "לא שלחנו אלינו את הפרופיל הזה"
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4438,7 +4427,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4497,9 +4485,10 @@ msgid "Upload file"
msgstr "ההעלה"
#: lib/designsettings.php:109
+#, fuzzy
msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
-msgstr ""
+"You can upload your personal background image. The maximum file size is 2MB."
+msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות."
#: lib/designsettings.php:372
msgid "Bad default color settings: "
@@ -4678,7 +4667,15 @@ msgstr "אין הודעה כזו."
msgid "Unknown file type"
msgstr ""
-#: lib/jabber.php:192
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5051,11 +5048,11 @@ msgstr "שגיאה בהכנסת פרופיל מרוחק"
msgid "Duplicate notice"
msgstr "הודעה חדשה"
-#: lib/oauthstore.php:466 lib/subs.php:48
+#: lib/oauthstore.php:467 lib/subs.php:48
msgid "You have been banned from subscribing."
msgstr ""
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr "הכנסת מנוי חדש נכשלה."
@@ -5092,7 +5089,7 @@ msgstr ""
msgid "Tags in %s's notices"
msgstr ""
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "הרשמות"
@@ -5100,7 +5097,7 @@ msgstr "הרשמות"
msgid "All subscriptions"
msgstr "כל המנויים"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "מנויים"
@@ -5109,16 +5106,16 @@ msgstr "מנויים"
msgid "All subscribers"
msgstr "מנויים"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
#, fuzzy
msgid "User ID"
msgstr "מתשמש"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "חבר מאז"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr ""
@@ -5326,47 +5323,51 @@ msgstr ""
msgid "Message"
msgstr "הודעה חדשה"
-#: lib/util.php:826
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr ""
+
+#: lib/util.php:825
msgid "a few seconds ago"
msgstr "לפני מספר שניות"
-#: lib/util.php:828
+#: lib/util.php:827
msgid "about a minute ago"
msgstr "לפני כדקה"
-#: lib/util.php:830
+#: lib/util.php:829
#, php-format
msgid "about %d minutes ago"
msgstr "לפני כ-%d דקות"
-#: lib/util.php:832
+#: lib/util.php:831
msgid "about an hour ago"
msgstr "לפני כשעה"
-#: lib/util.php:834
+#: lib/util.php:833
#, php-format
msgid "about %d hours ago"
msgstr "לפני כ-%d שעות"
-#: lib/util.php:836
+#: lib/util.php:835
msgid "about a day ago"
msgstr "לפני כיום"
-#: lib/util.php:838
+#: lib/util.php:837
#, php-format
msgid "about %d days ago"
msgstr "לפני כ-%d ימים"
-#: lib/util.php:840
+#: lib/util.php:839
msgid "about a month ago"
msgstr "לפני כחודש"
-#: lib/util.php:842
+#: lib/util.php:841
#, php-format
msgid "about %d months ago"
msgstr "לפני כ-%d חודשים"
-#: lib/util.php:844
+#: lib/util.php:843
msgid "about a year ago"
msgstr "לפני כשנה"
@@ -5395,7 +5396,3 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
-
-#, fuzzy
-#~ msgid "Notice"
-#~ msgstr "הודעות"
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
new file mode 100644
index 000000000..c22ee263d
--- /dev/null
+++ b/locale/hsb/LC_MESSAGES/statusnet.po
@@ -0,0 +1,2191 @@
+# Translation of StatusNet to Upper Sorbian
+#
+# Author@translatewiki.net: Michawiki
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+""
+"Project-Id-Version: StatusNet\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-12-02 23:32:10+0000\n"
+"Language-Team: Dutch\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: hsb\n"
+"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : (n%100==3 || n%100==4) ? 2 : 3)\n"
+
+#: 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 "Strona njeeksistuje"
+
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:116
+msgid "No such user."
+msgstr "Wužiwar njeeksistuje"
+
+#: actions/all.php:84
+#, php-format
+msgid "%s and friends, page %d"
+msgstr "%s a přećeljo, bok %d"
+
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#, php-format
+msgid "%s and friends"
+msgstr "%s a přećeljo"
+
+#: actions/all.php:99
+#, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Kanal za přećelow wužiwarja %s (RSS 1.0)"
+
+#: actions/all.php:107
+#, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Kanal za přećelow wužiwarja %s (RSS 2.0)"
+
+#: actions/all.php:115
+#, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Kanal za přećelow wužiwarja %s (Atom)"
+
+#: actions/all.php:165
+msgid "You and friends"
+msgstr "Ty a přećeljo"
+
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+msgid "API method not found."
+msgstr "API-metoda njenamakana."
+
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
+msgstr "Tuta metoda wužaduje sej POST."
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+msgid "Could not update user."
+msgstr "Wužiwar njeje so dał aktualizować."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+msgid "Could not update your design."
+msgstr "Design njeda so aktualizować."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "Wužiwar nima profil."
+
+#: actions/apiaccountupdateprofile.php:147
+msgid "Could not save profile."
+msgstr "Profil njeje so składować dał."
+
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "Žadyn powěsćowy tekst!"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "To je předołho. Maksimalna powěsćowa wulkosć je %d znamješkow."
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "Přijimowar njenamakany."
+
+#: actions/apidirectmessage.php:89
+#, php-format
+msgid "Direct messages from %s"
+msgstr "Direktne powěsće z %s"
+
+#: actions/apidirectmessage.php:93
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr "Wšě z %s pósłane direktne powěsće"
+
+#: actions/apidirectmessage.php:101
+#, php-format
+msgid "Direct messages to %s"
+msgstr "Direktne powěsće do %s"
+
+#: actions/apidirectmessage.php:105
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr "Wšě do %s pósłane direktne powěsće"
+
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "API-metoda njenamakana!"
+
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
+msgstr "Status z tym ID njenamakany."
+
+#: actions/apifavoritecreate.php:119
+msgid "This status is already a favorite!"
+msgstr "Tutón status je hižo faworit!"
+
+#: actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
+msgstr "Tón status faworit njeje!"
+
+#: actions/apigroupcreate.php:173 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr "Přimjeno so hižo wužiwa. Spytaj druhe."
+
+#: actions/apigroupcreate.php:180 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "Žane płaćiwe přimjeno."
+
+#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "Startowa strona njeje płaćiwy URL."
+
+#: actions/apigroupcreate.php:205 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "Dospołne mjeno je předołho (maks. 255 znamješkow)."
+
+#: actions/apigroupcreate.php:213
+#, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "Wopisanje je předołho (maks. %d znamješkow)."
+
+#: actions/apigroupcreate.php:224 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "Městno je předołho (maks. 255 znamješkow)."
+
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "Přewjele aliasow! Maksimum: %d."
+
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Njepłaćiwy alias: \"%s\""
+
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Alias \"%s\" so hižo wužiwa. Spytaj druhi."
+
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr "Alias njemóže samsny kaž přimjeno być."
+
+#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
+#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+msgid "Group not found!"
+msgstr "Skupina njenamakana!"
+
+#: actions/apigroupjoin.php:110
+msgid "You are already a member of that group."
+msgstr "Sy hižo čłon teje skupiny."
+
+#: actions/apigroupleave.php:114
+msgid "You are not a member of this group."
+msgstr "Njejsy čłon tuteje skupiny."
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr "skupiny na %s"
+
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
+msgstr "Tuta metoda wužaduje sej POST abo DELETE."
+
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
+msgstr "Njemóžeš status druheho wužiwarja zničić."
+
+#: actions/apistatusesshow.php:138
+msgid "Status deleted."
+msgstr "Status zničeny."
+
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
+msgstr "Žadyn status z tym ID namakany."
+
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "To je předołho. Maksimalna wulkosć zdźělenki je %d znamješkow."
+
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
+msgstr "Njenamakany"
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+msgid "Unsupported format."
+msgstr "Njepodpěrany format."
+
+#: actions/apiusershow.php:96
+msgid "Not found."
+msgstr "Njenamakany."
+
+#: actions/attachment.php:73
+msgid "No such attachment."
+msgstr "Přiwěšk njeeksistuje."
+
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
+msgstr "Žane přimjeno."
+
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "Žana wulkosć."
+
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+msgstr "Njepłaćiwa wulkosć."
+
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "Awatar"
+
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "Móžeš swój wosobinski awatar nahrać. Maksimalna datajowa wulkosć je %s."
+
+#: 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 "Wužiwar bjez hodźaceho so profila"
+
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+msgid "Avatar settings"
+msgstr "Nastajenja awatara"
+
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
+msgstr "Original"
+
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+msgstr "Přehlad"
+
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:550
+msgid "Delete"
+msgstr "Zničić"
+
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+msgstr "Nahrać"
+
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+msgstr "Awatar zaktualizowany."
+
+#: actions/avatarsettings.php:387
+msgid "Avatar deleted."
+msgstr "Awatar zničeny."
+
+#: 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 "Žane přimjeno"
+
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+msgid "No such group"
+msgstr "Skupina njeeksistuje"
+
+#: actions/block.php:69
+msgid "You already blocked that user."
+msgstr "Sy tutoho wužiwarja hižo zablokował."
+
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Wužiwarja blokować"
+
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
+msgid "No"
+msgstr "Ně"
+
+#: actions/block.php:143 actions/deleteuser.php:147
+msgid "Do not block this user"
+msgstr "Tutoho wužiwarja njeblokować"
+
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+msgid "Yes"
+msgstr "Haj"
+
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+msgid "Block this user"
+msgstr "Tutoho wužiwarja blokować"
+
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+msgstr "Žadyn wobkrućenski kod."
+
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "Wobkrućenski kod njenamakany."
+
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "Tutón wobkrućenski kod njeje za tebje!"
+
+#: actions/confirmaddress.php:90
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr "Njespóznany adresowy typ %s"
+
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr "Tuta adresa bu hižo wobkrućena."
+
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "Adresu wobkrućić"
+
+#: actions/confirmaddress.php:159
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "Adresa \"%s\" bu za twoje konto wobkrućena."
+
+#: actions/conversation.php:99
+msgid "Conversation"
+msgstr "Konwersacija"
+
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+msgid "Notices"
+msgstr "Zdźělenki"
+
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
+msgstr "Zdźělenka njeeksistuje."
+
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Njepřizjewjeny."
+
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr "Tuta zdźělenka njeda so zničić."
+
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr "Zdźělenku wušmórnyć"
+
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
+msgstr "Chceš woprawdźe tutu zdźělenku wušmórnyć?"
+
+#: actions/deletenotice.php:145
+msgid "Do not delete this notice"
+msgstr "Tutu zdźělenku njewušmórnyć"
+
+#: actions/deletenotice.php:146 lib/noticelist.php:550
+msgid "Delete this notice"
+msgstr "Tutu zdźělenku wušmórnyć"
+
+#: actions/deleteuser.php:67
+msgid "You cannot delete users."
+msgstr "Njemóžeš wužiwarjow wušmórnyć."
+
+#: actions/deleteuser.php:74
+msgid "You can only delete local users."
+msgstr "Móžeš jenož lokalnych wužiwarjow wušmórnyć."
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+msgid "Delete user"
+msgstr "Wužiwarja wušmórnyć"
+
+#: actions/deleteuser.php:148 lib/deleteuserform.php:77
+msgid "Delete this user"
+msgstr "Tutoho wužiwarja wušmórnyć"
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
+msgid "Design"
+msgstr "Design"
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr "Designowe nastajenja za tute sydło StatusNet."
+
+#: actions/designadminpanel.php:270
+msgid "Invalid logo URL."
+msgstr "Njepłaćiwy logowy URL."
+
+#: actions/designadminpanel.php:274
+#, php-format
+msgid "Theme not available: %s"
+msgstr "Šat njesteji k dispoziciji: %s"
+
+#: actions/designadminpanel.php:370
+msgid "Change logo"
+msgstr "Logo změnić"
+
+#: actions/designadminpanel.php:375
+msgid "Site logo"
+msgstr "Logo sydła"
+
+#: actions/designadminpanel.php:382
+msgid "Change theme"
+msgstr "Šat změnić"
+
+#: actions/designadminpanel.php:399
+msgid "Site theme"
+msgstr "Šat sydła"
+
+#: actions/designadminpanel.php:400
+msgid "Theme for the site."
+msgstr "Šat za sydło."
+
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
+msgid "Change background image"
+msgstr "Pozadkowy wobraz změnić"
+
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr "Pozadk"
+
+#: actions/designadminpanel.php:422
+#, php-format
+msgid "You can upload a background image for the site. The maximum file size is %1$s."
+msgstr "Móžeš pozadkowy wobraz za sydło nahrać. Maksimalna datajowa wulkosć je %1$s."
+
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
+msgid "On"
+msgstr "Zapinjeny"
+
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
+msgid "Off"
+msgstr "Wupinjeny"
+
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
+msgid "Change colours"
+msgstr "Barby změnić"
+
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
+msgid "Content"
+msgstr "Wobsah"
+
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
+msgid "Sidebar"
+msgstr "Bóčnica"
+
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
+msgid "Text"
+msgstr "Tekst"
+
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
+msgid "Links"
+msgstr "Wotkazy"
+
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr "Standardne hódnoty wužiwać"
+
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr "Standardne designy wobnowić"
+
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr "Na standard wróćo stajić"
+
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/pathsadminpanel.php:296 actions/profilesettings.php:167
+#: actions/siteadminpanel.php:421 actions/smssettings.php:181
+#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/useradminpanel.php:313 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Składować"
+
+#: actions/designadminpanel.php:582 lib/designsettings.php:257
+msgid "Save design"
+msgstr "Design składować"
+
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr "Tuta zdźělenka faworit njeje!"
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "K faworitam přidać"
+
+#: actions/doc.php:69
+msgid "No such document."
+msgstr "Dokument njeeksistuje."
+
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
+msgstr "Dyrbiš přizjewjeny być, zo by skupinu wutworił."
+
+#: 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 "Dyrbiš administrator być, zo by skupinu wobdźěłał."
+
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
+msgstr "Wuž tutón formular, zo by skupinu wobdźěłał."
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, php-format
+msgid "description is too long (max %d chars)."
+msgstr "wopisanje je předołho (maks. %d znamješkow)."
+
+#: actions/editgroup.php:253
+msgid "Could not update group."
+msgstr "Skupina njeje so dała aktualizować."
+
+#: actions/editgroup.php:259 classes/User_group.php:390
+msgid "Could not create aliases."
+msgstr "Aliasy njejsu so dali wutworić."
+
+#: actions/editgroup.php:269
+msgid "Options saved."
+msgstr "Opcije składowane."
+
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "E-mejlowe nastajenja"
+
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "Adresa"
+
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr "Aktualna wobkrućena e-mejlowa adresa."
+
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "Wotstronić"
+
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "Přetorhnyć"
+
+#: actions/emailsettings.php:121
+msgid "Email Address"
+msgstr "E-mejlowa adresa"
+
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr "E-mejlowa adresa, kaž na př. \"WužiwarskeMjeno@přikład.org\""
+
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "Přidać"
+
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+msgstr "Dochadźaca e-mejl"
+
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
+msgstr "Nowy"
+
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+msgid "Preferences"
+msgstr "Nastajenja"
+
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
+msgstr "Chcu zdźělenki přez e-mejl pósłać."
+
+#: actions/emailsettings.php:191
+msgid "Publish a MicroID for my email address."
+msgstr "MicroID za moju e-mejlowu adresu publikować"
+
+#: actions/emailsettings.php:302 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
+msgstr "Nastajenja składowane."
+
+#: actions/emailsettings.php:320
+msgid "No email address."
+msgstr "Žana e-mejlowa adresa."
+
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
+msgid "Not a valid email address"
+msgstr "Njeje płaćiwa e-mejlowa adresa"
+
+#: actions/emailsettings.php:334
+msgid "That is already your email address."
+msgstr "To je hižo twoja e-mejlowa adresa."
+
+#: actions/emailsettings.php:337
+msgid "That email address already belongs to another user."
+msgstr "Ta e-mejlowa adresa hižo słuša k druhemu wužiwarjej."
+
+#: actions/emailsettings.php:383 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr "to je wopačna IM-adresa."
+
+#: actions/emailsettings.php:395 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "Wobkrućenje přetorhnjene."
+
+#: actions/emailsettings.php:413
+msgid "That is not your email address."
+msgstr "To njeje twoja e-mejlowa adresa."
+
+#: actions/emailsettings.php:432 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "Adresa bu wotstronjena."
+
+#: actions/emailsettings.php:446 actions/smssettings.php:518
+msgid "No incoming email address."
+msgstr "Žana adresa za dochadźace e-mejle."
+
+#: actions/emailsettings.php:459 actions/smssettings.php:531
+msgid "Incoming email address removed."
+msgstr "Adresa za dochadźaće e-mejle wotstronjena."
+
+#: actions/emailsettings.php:481 actions/smssettings.php:555
+msgid "New incoming email address added."
+msgstr "Nowa adresa za dochadźace e-mejle přidata."
+
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: lib/publicgroupnav.php:93
+msgid "Popular notices"
+msgstr "Woblubowane zdźělenki"
+
+#: actions/favorited.php:67
+#, php-format
+msgid "Popular notices, page %d"
+msgstr "Woblubowane zdźělenki, strona %d"
+
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Tuta zdźělenka je hižo faworit!"
+
+#: actions/file.php:34
+msgid "No notice id"
+msgstr "Žadyn ID zdźělenki"
+
+#: actions/file.php:38
+msgid "No notice"
+msgstr "Žana zdźělenka"
+
+#: actions/file.php:42
+msgid "No attachments"
+msgstr "Žane přiwěški"
+
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr "Žane nahrate přiwěški"
+
+#: actions/finishremotesubscribe.php:69
+msgid "Not expecting this response!"
+msgstr "Njewočakowana wotmołwa!"
+
+#: actions/finishremotesubscribe.php:106
+msgid "You are not authorized."
+msgstr "Njejsy awtorizowany."
+
+#: 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 "Skupina njeeksistuje."
+
+#: actions/getfile.php:75
+msgid "No such file."
+msgstr "Dataja njeeksistuje."
+
+#: actions/getfile.php:79
+msgid "Cannot read file."
+msgstr "Dataja njeda so čitać."
+
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr "Žadyn profil podaty."
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr "Žadyn profil z tym ID."
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
+msgstr "Žana skupina podata."
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr "Jenož administrator móže skupinskich čłonow blokować."
+
+#: actions/groupblock.php:95
+msgid "User is already blocked from group."
+msgstr "Wužiwar je hižo za skupinu zablokowany."
+
+#: actions/groupblock.php:100
+msgid "User is not a member of group."
+msgstr "Wužiwar njeje čłon skupiny."
+
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+msgid "Block user from group"
+msgstr "Wužiwarja za skupinu blokować"
+
+#: actions/groupblock.php:178
+msgid "Do not block this user from this group"
+msgstr "Tutoho wužiwarja za tutu skupinu blokować"
+
+#: actions/groupblock.php:179
+msgid "Block this user from this group"
+msgstr "Tutoho wužiwarja za tutu skupinu blokować"
+
+#: actions/groupbyid.php:74
+msgid "No ID"
+msgstr "Žadyn ID"
+
+#: actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
+msgstr "Dyrbiš přizjewjeny być, zo by skupinu wobdźěłał."
+
+#: actions/groupdesignsettings.php:141
+msgid "Group design"
+msgstr "Skupinski design"
+
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+msgid "Design preferences saved."
+msgstr "Designowe nastajenja składowane."
+
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
+msgstr "Skupinske logo"
+
+#: actions/grouplogo.php:150
+#, php-format
+msgid "You can upload a logo image for your group. The maximum file size is %s."
+msgstr "Móžeš logowy wobraz za swoju skupinu nahrać. Maksimalna datajowa wulkosć je %s."
+
+#: actions/grouplogo.php:396
+msgid "Logo updated."
+msgstr "Logo zaktualizowane."
+
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr "Lisćina wužiwarjow w tutej skupinje."
+
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+msgid "Admin"
+msgstr "Administrator"
+
+#: actions/groupmembers.php:346 lib/blockform.php:69
+msgid "Block"
+msgstr "Blokować"
+
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr "Tutoho wužiwarja k administratorej činić"
+
+#: actions/groupsearch.php:58
+msgid "Group search"
+msgstr "Skupinske pytanje"
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+msgid "No results."
+msgstr "Žane wuslědki."
+
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Skupiny"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Skupiny, strona %d"
+
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Nowu skupinu wutworić"
+
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "IM-nastajenja"
+
+#: actions/imsettings.php:89
+msgid "IM is not available."
+msgstr "IM k dispoziciji njesteji."
+
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "IM-adresa"
+
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "Žadyn ID Jabber."
+
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "Njepłaćiwy ID Jabber"
+
+#: actions/imsettings.php:299
+msgid "That is already your Jabber ID."
+msgstr "To je hižo twój ID Jabber."
+
+#: actions/imsettings.php:387
+msgid "That is not your Jabber ID."
+msgstr "To njeje twój ID Jabber."
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr "Přeprošenja buchu znjemóžnjene."
+
+#: actions/invite.php:72
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "Njepłaćiwa e-mejlowa adresa: %s"
+
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
+msgstr "Přeprošenja pósłane"
+
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr "Nowych wužiwarjow přeprosyć"
+
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
+msgstr "Sy tutych wužiwarjow hižo abonował:"
+
+#: actions/invite.php:131 actions/invite.php:139
+#, php-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: actions/invite.php:162
+msgid "Use this form to invite your friends and colleagues to use this service."
+msgstr "Wužij tutón formular, zo by swojich přećelow a kolegow přeprosył, zo bychu tutu słužbu wužiwali."
+
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr "E-mejlowe adresy"
+
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr "Adresy přećelow, kotřiž maja so přeprosyć (jedna na linku)"
+
+#: actions/invite.php:192
+msgid "Personal message"
+msgstr "Wosobinska powěsć"
+
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
+msgstr "Wosobinsku powěsć po dobrozdaću přeprošenju přidać."
+
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
+msgid "Send"
+msgstr "Pósłać"
+
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
+msgstr "Dyrbiš přizjewjeny być, zo by skupinu wopušćił."
+
+#: actions/leavegroup.php:90 lib/command.php:268
+msgid "You are not a member of that group."
+msgstr "Njejsy čłon teje skupiny."
+
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "Hižo přizjewjeny."
+
+#: actions/login.php:143
+msgid "Incorrect username or password."
+msgstr "Wopačne wužiwarske mjeno abo hesło."
+
+#: actions/login.php:149
+msgid "Error setting user. You are probably not authorized."
+msgstr "Zmylk při nastajenju wužiwarja. Snano njejsy awtorizowany."
+
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "Přizjewić"
+
+#: actions/login.php:243
+msgid "Login to site"
+msgstr "Při sydle přizjewić"
+
+#: 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 "Přimjeno"
+
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Hesło"
+
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
+msgstr "Składować"
+
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "Hesło zhubjene abo zabyte?"
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr "Jenož administrator móže druheho wužiwarja k administratorej činić."
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr "%s je hižo administrator za skupinu \"%s\"."
+
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr "Žadyn aktualny status"
+
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr "Nowa skupina"
+
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
+msgstr "Wužij tutón formular, zo by nowu skupinu wutworił."
+
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
+msgstr "Nowa powěsć"
+
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+msgid "You can't send a message to this user."
+msgstr "Njemóžeš tutomu wužiwarju powěsć pósłać."
+
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+msgstr "Žadyn wobsah!"
+
+#: actions/newmessage.php:158
+msgid "No recipient specified."
+msgstr "Žadyn přijimowar podaty."
+
+#: actions/newmessage.php:181
+msgid "Message sent"
+msgstr "Powěsć pósłana"
+
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+msgid "Ajax Error"
+msgstr "Zmylk Ajax"
+
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "Nowa zdźělenka"
+
+#: actions/newnotice.php:206
+msgid "Notice posted"
+msgstr "Zdźělenka wotpósłana"
+
+#: actions/noticesearch.php:78
+msgid "Text search"
+msgstr "Tekstowe pytanje"
+
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
+msgstr "Zdźělenka nima profil"
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr "Jenož "
+
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
+msgstr "Njeje podpěrany datowy format."
+
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "Ludźi pytać"
+
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "Zdźělenku pytać"
+
+#: actions/othersettings.php:60
+msgid "Other Settings"
+msgstr "Druhe nastajenja"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr "Wšelake druhe opcije zrjadować."
+
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr " (swobodna słužba)"
+
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "Hesło změnić"
+
+#: actions/passwordsettings.php:69
+msgid "Change your password."
+msgstr "Změń swoje hesło."
+
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+msgid "Password change"
+msgstr "Hesło změnjene"
+
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "Stare hesło"
+
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "Nowe hesło"
+
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "6 abo wjace znamješkow"
+
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "Wobkrućić"
+
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "Změnić"
+
+#: actions/passwordsettings.php:154 actions/register.php:230
+msgid "Password must be 6 or more characters."
+msgstr "Hesło dyrbi 6 abo wjace znamješkow měć."
+
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+msgstr "Hesle so njekryjetej."
+
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "Wopačne stare hesło"
+
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "Hesło składowane."
+
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr "Šćežki"
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr "Šćežka a serwerowe nastajenja za tute sydło StatusNet."
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+msgid "Site"
+msgstr "Sydło"
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr "Šćežka"
+
+#: actions/pathsadminpanel.php:216
+msgid "Site path"
+msgstr "Sydłowa šćežka"
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr "Šćežka k lokalam"
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr "Zapisowa šćežka k lokalam"
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr "Šat"
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr "Šatowy serwer"
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr "Šatowa šćežka"
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr "Šatowy zapis"
+
+#: actions/pathsadminpanel.php:247
+msgid "Avatars"
+msgstr "Awatary"
+
+#: actions/pathsadminpanel.php:252
+msgid "Avatar server"
+msgstr "Awatarowy serwer"
+
+#: actions/pathsadminpanel.php:256
+msgid "Avatar path"
+msgstr "Awatarowa šćežka"
+
+#: actions/pathsadminpanel.php:260
+msgid "Avatar directory"
+msgstr "Awatarowy zapis"
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr "Pozadki"
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr "Pozadkowy serwer"
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr "Pozadkowa šćežka"
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr "Pozadkowy zapis"
+
+#: actions/pathsadminpanel.php:297
+msgid "Save paths"
+msgstr "Šćežki składować"
+
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "Za ludźimi pytać"
+
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "Njepłaćiwy wobsah zdźělenki"
+
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "Profilowe nastajenja"
+
+#: actions/profilesettings.php:99
+msgid "Profile information"
+msgstr "Profilowe informacije"
+
+#: 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 "Dospołne mjeno"
+
+#: actions/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "Startowa strona"
+
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "Biografija"
+
+#: 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 "Městno"
+
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
+msgid "Language"
+msgstr "Rěč"
+
+#: actions/profilesettings.php:145
+msgid "Preferred language"
+msgstr "Preferowana rěč"
+
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr "Časowe pasmo"
+
+#: actions/profilesettings.php:221 actions/register.php:223
+#, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "Biografija je předołha (maks. %d znamješkow)."
+
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
+msgid "Timezone not selected."
+msgstr "Časowe pasmo njeje wubrane."
+
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr "Mjeno rěče je předołhe (maks. 50 znamješkow)."
+
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+msgid "Settings saved."
+msgstr "Nastajenja składowane."
+
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "Sy hižo přizjewjeny!"
+
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
+msgstr "Sy so identifikował. Zapodaj deleka nowe hesło. "
+
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "Hesło wróćo stajić"
+
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
+msgstr "Njeznata akcija"
+
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "6 abo wjace znamješkow, a njezabudź jo!"
+
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "Wróćo stajić"
+
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "Zapodaj přimjeno abo e-mejlowu adresu."
+
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
+msgstr "Wužiwar z tej e-mejlowej adresu abo tym wužiwarskim mjenom njeeksistuje."
+
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr "Wužiwar nima žanu zregistrowanu e-mejlowu adresu."
+
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "Hesło dyrbi 6 znamješkow abo wjace měć."
+
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
+msgstr "Wodaj, jenož přeprošeni ludźo móžeja so registrować."
+
+#: actions/register.php:92
+msgid "Sorry, invalid invitation code."
+msgstr "Wodaj, njepłaćiwy přeprošenski kod."
+
+#: actions/register.php:112
+msgid "Registration successful"
+msgstr "Registrowanje wuspěšne"
+
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: lib/logingroupnav.php:85
+msgid "Register"
+msgstr "Registrować"
+
+#: actions/register.php:135
+msgid "Registration not allowed."
+msgstr "Registracija njedowolena."
+
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "Njepłaćiwa e-mejlowa adresa."
+
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "E-mejlowa adresa hižo eksistuje."
+
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "Njepłaćiwe wužiwarske mjeno abo hesło."
+
+#: actions/register.php:429
+msgid "6 or more characters. Required."
+msgstr "6 abo wjace znamješkow. Trěbne."
+
+#: actions/register.php:433
+msgid "Same as password above. Required."
+msgstr "Jenake kaž hesło horjeka. Trěbne."
+
+#: actions/register.php:437 actions/register.php:441
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "E-mejl"
+
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
+msgstr "Dlěše mjeno, wosebje twoje \"woprawdźite\" mjeno"
+
+#: actions/register.php:493
+msgid "My text and files are available under "
+msgstr "Mój tekst a moje dataje steja k dispoziciji pod "
+
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
+msgstr "Creative Commons Attribution 3.0"
+
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "Wužiwarske přimjeno"
+
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr "URL profila"
+
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:365
+msgid "Subscribe"
+msgstr "Abonować"
+
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr "Njepłaćiwy profilowy URL (wopačny format)"
+
+#: actions/showgroup.php:218
+msgid "Group profile"
+msgstr "Skupinski profil"
+
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
+msgid "URL"
+msgstr "URL"
+
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr "Aliasy"
+
+#: actions/showgroup.php:293
+msgid "Group actions"
+msgstr "Skupinske akcije"
+
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
+msgid "Members"
+msgstr "Čłonojo"
+
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/tagcloudsection.php:71
+msgid "(None)"
+msgstr "(Žadyn)"
+
+#: actions/showgroup.php:392
+msgid "All members"
+msgstr "Wšitcy čłonojo"
+
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr "Statistika"
+
+#: actions/showgroup.php:432
+msgid "Created"
+msgstr "Wutworjeny"
+
+#: actions/showgroup.php:482
+msgid "Admins"
+msgstr "Administratorojo"
+
+#: actions/showmessage.php:81
+msgid "No such message."
+msgstr "Powěsć njeeksistuje."
+
+#: actions/shownotice.php:90
+msgid "Notice deleted."
+msgstr "Zdźělenka zničena."
+
+#: actions/showstream.php:148
+#, php-format
+msgid "FOAF for %s"
+msgstr "FOAF za %s"
+
+#: actions/siteadminpanel.php:173
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr "Njeznata rěč \"%s\""
+
+#: actions/siteadminpanel.php:266
+msgid "General"
+msgstr "Powšitkowny"
+
+#: actions/siteadminpanel.php:269
+msgid "Site name"
+msgstr "Sydłowe mjeno"
+
+#: actions/siteadminpanel.php:290
+msgid "Local"
+msgstr "Lokalny"
+
+#: actions/siteadminpanel.php:301
+msgid "Default timezone"
+msgstr "Standardne časowe pasmo"
+
+#: actions/siteadminpanel.php:308
+msgid "Default site language"
+msgstr "Standardna sydłowa rěč"
+
+#: actions/siteadminpanel.php:316
+msgid "URLs"
+msgstr "URL"
+
+#: actions/siteadminpanel.php:319
+msgid "Server"
+msgstr "Serwer"
+
+#: actions/siteadminpanel.php:331
+msgid "Access"
+msgstr "Přistup"
+
+#: actions/siteadminpanel.php:334
+msgid "Private"
+msgstr "Priwatny"
+
+#: actions/siteadminpanel.php:340
+msgid "Invite only"
+msgstr "Jenož přeprosyć"
+
+#: actions/siteadminpanel.php:346
+msgid "Closed"
+msgstr "Začinjeny"
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr "Nowe registrowanja znjemóžnić."
+
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
+msgid "Never"
+msgstr "Ženje"
+
+#: actions/siteadminpanel.php:366
+msgid "Frequency"
+msgstr "Frekwenca"
+
+#: actions/siteadminpanel.php:380
+msgid "SSL"
+msgstr "SSL"
+
+#: actions/siteadminpanel.php:384
+msgid "Sometimes"
+msgstr "Druhdy"
+
+#: actions/siteadminpanel.php:385
+msgid "Always"
+msgstr "Přeco"
+
+#: actions/siteadminpanel.php:387
+msgid "Use SSL"
+msgstr "SSL wužiwać"
+
+#: actions/siteadminpanel.php:393
+msgid "SSL Server"
+msgstr "SSL-serwer"
+
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr "Limity"
+
+#: actions/siteadminpanel.php:403
+msgid "Text limit"
+msgstr "Tekstowy limit"
+
+#: actions/siteadminpanel.php:403
+msgid "Maximum number of characters for notices."
+msgstr "Maksimalna ličba znamješkow za zdźělenki."
+
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
+msgid "Save site settings"
+msgstr "Sydłowe nastajenja składować"
+
+#: actions/smssettings.php:91
+msgid "SMS is not available."
+msgstr "SMS k dispoziciji njesteji."
+
+#: actions/smssettings.php:306
+msgid "No phone number."
+msgstr "Žane telefonowe čisło."
+
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
+msgstr "To je hižo twoje telefonowe čisło."
+
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
+msgstr "Te telefonowe čisło hižo druhemu wužiwarjej słuša."
+
+#: actions/smssettings.php:498
+msgid "No code entered"
+msgstr "Žadyn kod zapodaty"
+
+#: actions/subedit.php:70
+msgid "You are not subscribed to that profile."
+msgstr "Njejsy tón profil abonował."
+
+#: actions/subscribe.php:55
+msgid "Not a local user."
+msgstr "Njeje lokalny wužiwar."
+
+#: actions/subscribe.php:69
+msgid "Subscribed"
+msgstr "Abonowany"
+
+#: actions/subscribers.php:50
+#, php-format
+msgid "%s subscribers"
+msgstr "%s abonentow"
+
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %d"
+msgstr "%s abonentow, strona %d"
+
+#: actions/subscriptions.php:52
+#, php-format
+msgid "%s subscriptions"
+msgstr "%s abonementow"
+
+#: actions/subscriptions.php:54
+#, php-format
+msgid "%s subscriptions, page %d"
+msgstr "%s abonementow, strona %d"
+
+#: actions/subscriptions.php:194
+msgid "Jabber"
+msgstr "Jabber"
+
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
+msgstr "SMS"
+
+#: actions/tagother.php:33
+msgid "Not logged in"
+msgstr "Njepřizjewjeny"
+
+#: actions/tagother.php:39
+msgid "No id argument."
+msgstr "Žadyn argument ID."
+
+#: actions/tagother.php:77 lib/userprofile.php:75
+msgid "User profile"
+msgstr "Wužiwarski profil"
+
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
+msgstr "Foto"
+
+#: actions/unblock.php:59
+msgid "You haven't blocked that user."
+msgstr "Njejsy toho wužiwarja zablokował."
+
+#: actions/unsubscribe.php:98
+msgid "Unsubscribed"
+msgstr "Wotskazany"
+
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr "Wužiwar"
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr "Wužiwarske nastajenja za sydło StatusNet."
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Profil"
+
+#: actions/useradminpanel.php:231
+msgid "New users"
+msgstr "Nowi wužiwarjo"
+
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr "Powitanje noweho wužiwarja"
+
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr "Powitanski tekst za nowych wužiwarjow (maks. 255 znamješkow)."
+
+#: actions/useradminpanel.php:241
+msgid "Default subscription"
+msgstr "Standardny abonement"
+
+#: actions/useradminpanel.php:251
+msgid "Invitations"
+msgstr "Přeprošenja"
+
+#: actions/useradminpanel.php:256
+msgid "Invitations enabled"
+msgstr "Přeprošenja zmóžnjene"
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr "Posedźenja"
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr "Z posedźenjemi wobchadźeć"
+
+#: actions/userauthorization.php:188
+msgid "License"
+msgstr "Licenca"
+
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "Akceptować"
+
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Tutoho wužiwarja abonować"
+
+#: actions/userauthorization.php:211
+msgid "Reject"
+msgstr "Wotpokazać"
+
+#: actions/userauthorization.php:212
+msgid "Reject this subscription"
+msgstr "Tutón abonement wotpokazać"
+
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
+msgstr "Abonement awtorizowany"
+
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
+msgstr "Abonement wotpokazany"
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to this person:"
+msgid_plural "You are subscribed to these people:"
+# Plural problem
+
+#: lib/command.php:642
+#, fuzzy
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+# Plural problem
+
+#: lib/command.php:664
+#, fuzzy
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+# Plural problem
+
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr "RSS 1.0"
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr "RSS 2.0"
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr "Atom"
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr "FOAF"
+
+#: lib/galleryaction.php:131
+msgid "All"
+msgstr "Wšě"
+
+#: lib/groupeditform.php:168
+msgid "Describe the group or topic"
+msgstr "Skupinu abo temu wopisać"
+
+#: lib/groupeditform.php:170
+#, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "Skupinu abo temu w %d znamješkach wopisać"
+
+#: lib/groupeditform.php:172
+msgid "Description"
+msgstr "Wopisanje"
+
+#: lib/groupnav.php:85
+msgid "Group"
+msgstr "Skupina"
+
+#: lib/groupnav.php:101
+msgid "Blocked"
+msgstr "Blokowany"
+
+#: lib/groupnav.php:113
+msgid "Logo"
+msgstr "Logo"
+
+#: lib/groupsbymemberssection.php:71
+msgid "Groups with most members"
+msgstr "Skupiny z najwjace čłonami"
+
+#: lib/groupsbypostssection.php:71
+msgid "Groups with most posts"
+msgstr "Skupiny z njawjace powěsćemi"
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr "Dźělne nahraće."
+
+#: lib/imagefile.php:118
+msgid "Lost our file."
+msgstr "Naša dataja je so zhubiła."
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
+msgstr "Njeznaty datajowy typ"
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr "[%s]"
+
+#: lib/leaveform.php:114
+msgid "Leave"
+msgstr "Wopušćić"
+
+#: lib/logingroupnav.php:80
+msgid "Login with a username and password"
+msgstr "Přizjewjenje z wužiwarskim mjenom a hesłom"
+
+#: lib/logingroupnav.php:86
+msgid "Sign up for a new account"
+msgstr "Nowe konto registrować"
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+msgid "from"
+msgstr "wot"
+
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "Wobkrućenje e-mejloweje adresy"
+
+#: lib/mail.php:254
+#, php-format
+msgid "Location: %s\n"
+msgstr "Městno: %s\n"
+
+#: lib/mail.php:256
+#, php-format
+msgid "Homepage: %s\n"
+msgstr "Startowa strona: %s\n"
+
+#: lib/mail.php:258
+#, php-format
+msgid "Bio: %s\n\n"
+msgstr "Biografija: %s\n\n"
+
+#: lib/mail.php:439
+msgid "SMS confirmation"
+msgstr "SMS-wobkrućenje"
+
+#: lib/mail.php:510
+#, php-format
+msgid "New private message from %s"
+msgstr "Nowa priwatna powěsć wot %s"
+
+#: lib/mail.php:559
+#, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s (@%s) je twoju zdźělenku jako faworit přidał"
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr "Nahrata dataja bu jenož zdźěla nahrata."
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr "Temporerny rjadowka faluje."
+
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr "%s njeje podpěrany datajowy typ na tutym serwerje."
+
+#: lib/messageform.php:120
+msgid "Send a direct notice"
+msgstr "Direktnu zdźělenku pósłać"
+
+#: lib/messageform.php:146
+msgid "To"
+msgstr "Komu"
+
+#: lib/messageform.php:162 lib/noticeform.php:186
+msgid "Available characters"
+msgstr "K dispoziciji stejace znamješka"
+
+#: lib/noticeform.php:158
+msgid "Send a notice"
+msgstr "Zdźělenku pósłać"
+
+#: lib/noticeform.php:193
+msgid "Attach"
+msgstr "Připowěsnyć"
+
+#: lib/noticeform.php:197
+msgid "Attach a file"
+msgstr "Dataju připowěsnyć"
+
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+
+#: lib/noticelist.php:404
+msgid "N"
+msgstr "S"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr "J"
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr "W"
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr "Z"
+
+#: lib/noticelist.php:526
+msgid "Reply to this notice"
+msgstr "Na tutu zdźělenku wotmołwić"
+
+#: lib/noticelist.php:527
+msgid "Reply"
+msgstr "Wotmołwić"
+
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "Zmylk při zasunjenju noweho profila"
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr "Zmylk při zasunjenju awatara"
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "Zmylk při zasunjenju zdaleneho profila"
+
+#: lib/oauthstore.php:345
+msgid "Duplicate notice"
+msgstr "Dwójna zdźělenka"
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "Wosobinski"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "Wotmołwy"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr "Fawority"
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr "Twoje dochadźace powěsće"
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr "Twoje pósłane powěsće"
+
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "Abonementy"
+
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "Wšě abonementy"
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "Abonenća"
+
+#: lib/profileaction.php:157
+msgid "All subscribers"
+msgstr "Wšitcy abonenća"
+
+#: lib/profileaction.php:177
+msgid "User ID"
+msgstr "Wužiwarski ID"
+
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "Čłon wot"
+
+#: lib/profileaction.php:235
+msgid "All groups"
+msgstr "Wšě skupiny"
+
+#: lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "Zjawny"
+
+#: lib/publicgroupnav.php:82
+msgid "User groups"
+msgstr "Wužiwarske skupiny"
+
+#: lib/publicgroupnav.php:92
+msgid "Popular"
+msgstr "Woblubowany"
+
+#: lib/searchaction.php:120
+msgid "Search site"
+msgstr "Pytanske sydło"
+
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr "Klučowe hesła"
+
+#: lib/searchaction.php:162
+msgid "Search help"
+msgstr "Pytanska pomoc"
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "Ludźo"
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr "Ludźi na tutym sydle pytać"
+
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr "Wobsah zdźělenkow přepytać"
+
+#: lib/searchgroupnav.php:85
+msgid "Find groups on this site"
+msgstr "Skupiny na tutym sydle pytać"
+
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr "Wotrězk bjez titula"
+
+#: lib/section.php:106
+msgid "More..."
+msgstr "Wjace..."
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(žadyn)"
+
+#: lib/subs.php:52
+msgid "Already subscribed!"
+msgstr "Hižo abonowany!"
+
+#: lib/subs.php:56
+msgid "User has blocked you."
+msgstr "Wužiwar je će zablokował."
+
+#: lib/subs.php:60
+msgid "Could not subscribe."
+msgstr "Abonowanje njebě móžno"
+
+#: lib/subs.php:128
+msgid "Not subscribed!"
+msgstr "Njeje abonowany!"
+
+#: lib/subs.php:140
+msgid "Couldn't delete subscription."
+msgstr "Abonoment njeje so dał zničić."
+
+#: lib/tagcloudsection.php:56
+msgid "None"
+msgstr "Žadyn"
+
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+msgid "Unsubscribe from this user"
+msgstr "Tutoho wužiwarja wotskazać"
+
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "Wotskazać"
+
+#: lib/userprofile.php:116
+msgid "Edit Avatar"
+msgstr "Awatar wobdźěłać"
+
+#: lib/userprofile.php:236
+msgid "User actions"
+msgstr "Wužiwarske akcije"
+
+#: lib/userprofile.php:248
+msgid "Edit profile settings"
+msgstr "Profilowe nastajenja wobdźěłać"
+
+#: lib/userprofile.php:249
+msgid "Edit"
+msgstr "Wobdźěłać"
+
+#: lib/userprofile.php:272
+msgid "Send a direct message to this user"
+msgstr "Tutomu wužiwarja direktnu powěsć pósłać"
+
+#: lib/userprofile.php:273
+msgid "Message"
+msgstr "Powěsć"
+
+#: lib/util.php:825
+msgid "a few seconds ago"
+msgstr "před něšto sekundami"
+
+#: lib/util.php:827
+msgid "about a minute ago"
+msgstr "před něhdźe jednej mjeńšinu"
+
+#: lib/util.php:829
+#, php-format
+msgid "about %d minutes ago"
+msgstr "před %d mjeńšinami"
+
+#: lib/util.php:831
+msgid "about an hour ago"
+msgstr "před něhdźe jednej hodźinu"
+
+#: lib/util.php:833
+#, php-format
+msgid "about %d hours ago"
+msgstr "před něhdźe %d hodźinami"
+
+#: lib/util.php:835
+msgid "about a day ago"
+msgstr "před něhdźe jednym dnjom"
+
+#: lib/util.php:837
+#, php-format
+msgid "about %d days ago"
+msgstr "před něhdźe %d dnjemi"
+
+#: lib/util.php:839
+msgid "about a month ago"
+msgstr "před něhdźe jednym měsacom"
+
+#: lib/util.php:841
+#, php-format
+msgid "about %d months ago"
+msgstr "před něhdźe %d měsacami"
+
+#: lib/util.php:843
+msgid "about a year ago"
+msgstr "před něhdźe jednym lětom"
+
+#: lib/webcolor.php:82
+#, php-format
+msgid "%s is not a valid color!"
+msgstr "%s płaćiwa barba njeje!"
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr "%s płaćiwa barba njeje! Wužij 3 heksadecimalne znamješka abo 6 heksadecimalnych znamješkow."
+
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr "Žadyn zregistrowany wužiwar."
+
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr "Wodaj, to twoja adresa za dochadźace e-mejle njeje."
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr "Wodaj, dochadźaće e-mejle njejsu dowolene."
+
diff --git a/locale/is/LC_MESSAGES/statusnet.mo b/locale/is/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index eb8debe0e..000000000
--- a/locale/is/LC_MESSAGES/statusnet.mo
+++ /dev/null
Binary files differ
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index 249c21aee..5cb39db10 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-23 21:46+0000\n"
-"PO-Revision-Date: 2009-11-23 21:47:32+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:19:52+0000\n"
"Language-Team: Icelandic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59365); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: is\n"
"X-Message-Group: out-statusnet\n"
@@ -569,7 +569,7 @@ msgstr "Skera af"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -741,7 +741,7 @@ msgid "Conversation"
msgstr ""
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Babl"
@@ -1161,7 +1161,7 @@ msgstr "Móttökutölvupóstfang fjarlægt."
msgid "New incoming email address added."
msgstr "Nýju móttökutölvupóstfangi bætt við."
-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Vinsælt babl"
@@ -1255,26 +1255,26 @@ msgstr "Notandi sem verið er að hlusta á er ekki til."
msgid "You can use the local subscription!"
msgstr "Þú getur notað staðbundna áskrift!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "Þessi notandi hefur bannað þér að gerast áskrifandi"
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "Engin heimild."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "Gat ekki breytt beiðnistókum í aðgangstóka."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Óþekkt útgáfa OMB samskiptamátans."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Villa kom upp í uppfærslu persónulegrar fjarsíðu"
@@ -1471,8 +1471,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Hópar"
@@ -1801,55 +1801,55 @@ msgstr "%s gekk úr hópnum %s"
msgid "Already logged in."
msgstr "Þú hefur nú þegar skráð þig inn."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "Ótækt bablinnihald"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Rangt notendanafn eða lykilorð."
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Engin heimild."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Innskráning"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "Skrá þig inn á síðuna"
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Stuttnefni"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Lykilorð"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Muna eftir mér"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Sjálfvirk innskráning í framtíðinni. Ekki nota þetta á tölvu sem aðrir deila "
"með þér!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Tapað eða gleymt lykilorð?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1857,7 +1857,7 @@ msgstr ""
"Af öryggisástæðum, vinsamlegast sláðu aftur inn notendanafnið þitt og "
"lykilorð áður en þú breytir stillingunum þínum."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2788,7 +2788,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Veffang persónulegrar síðu á samvirkandi örbloggsþjónustu"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:356
+#: lib/userprofile.php:365
msgid "Subscribe"
msgstr "Gerast áskrifandi"
@@ -2798,8 +2798,7 @@ msgstr "Ótækt veffang persónulegrar síðu (vitlaust snið)"
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "Ekki tækt veffang á persónulega síðu (ekkert YADIS skjal)."
#: actions/remotesubscribe.php:176
@@ -2981,7 +2980,7 @@ msgid "Members"
msgstr "Meðlimir"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(Ekkert)"
@@ -2990,7 +2989,7 @@ msgstr "(Ekkert)"
msgid "All members"
msgstr "Allir meðlimir"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Tölfræði"
@@ -3972,7 +3971,7 @@ msgstr "Það hefur verið lagt bann við babli frá þér á þessari síðu."
msgid "Problem saving notice."
msgstr "Vandamál komu upp við að vista babl."
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Gagnagrunnsvilla við innsetningu svars: %s"
@@ -4397,50 +4396,40 @@ msgstr "Tilkynningar á."
msgid "Can't turn on notification."
msgstr "Get ekki kveikt á tilkynningum."
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Gat ekki búið til OpenID eyðublað: %s"
-
-#: 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:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Þú ert ekki áskrifandi."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Þú ert nú þegar í áskrift að þessum notendum:"
msgstr[1] "Þú ert nú þegar í áskrift að þessum notendum:"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Gat ekki leyft öðrum að gerast áskrifandi að þér."
msgstr[1] "Gat ekki leyft öðrum að gerast áskrifandi að þér."
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Þú ert ekki meðlimur í þessum hópi."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Þú ert ekki meðlimur í þessum hópi."
msgstr[1] "Þú ert ekki meðlimur í þessum hópi."
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4459,7 +4448,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4518,9 +4506,10 @@ msgid "Upload file"
msgstr ""
#: lib/designsettings.php:109
+#, fuzzy
msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
-msgstr ""
+"You can upload your personal background image. The maximum file size is 2MB."
+msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
#: lib/designsettings.php:372
msgid "Bad default color settings: "
@@ -4694,7 +4683,15 @@ msgstr "Týndum skránni okkar"
msgid "Unknown file type"
msgstr "Óþekkt skráargerð"
-#: lib/jabber.php:192
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5065,12 +5062,12 @@ msgstr "Villa kom upp við að setja inn persónulega fjarsíðu"
msgid "Duplicate notice"
msgstr "Eyða babli"
-#: lib/oauthstore.php:466 lib/subs.php:48
+#: lib/oauthstore.php:467 lib/subs.php:48
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "Þessi notandi hefur bannað þér að gerast áskrifandi"
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr "Gat ekki sett inn nýja áskrift."
@@ -5107,7 +5104,7 @@ msgstr "Skilaboð sem þú hefur sent"
msgid "Tags in %s's notices"
msgstr "Merki í babli %s"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Áskriftir"
@@ -5115,7 +5112,7 @@ msgstr "Áskriftir"
msgid "All subscriptions"
msgstr "Allar áskriftir"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Áskrifendur"
@@ -5123,15 +5120,15 @@ msgstr "Áskrifendur"
msgid "All subscribers"
msgstr "Allir áskrifendur"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr ""
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Meðlimur síðan"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "Allir hópar"
@@ -5332,47 +5329,51 @@ msgstr "Senda bein skilaboð til þessa notanda"
msgid "Message"
msgstr "Skilaboð"
-#: lib/util.php:826
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr ""
+
+#: lib/util.php:825
msgid "a few seconds ago"
msgstr "fyrir nokkrum sekúndum"
-#: lib/util.php:828
+#: lib/util.php:827
msgid "about a minute ago"
msgstr "fyrir um einni mínútu síðan"
-#: lib/util.php:830
+#: lib/util.php:829
#, php-format
msgid "about %d minutes ago"
msgstr "fyrir um %d mínútum síðan"
-#: lib/util.php:832
+#: lib/util.php:831
msgid "about an hour ago"
msgstr "fyrir um einum klukkutíma síðan"
-#: lib/util.php:834
+#: lib/util.php:833
#, php-format
msgid "about %d hours ago"
msgstr "fyrir um %d klukkutímum síðan"
-#: lib/util.php:836
+#: lib/util.php:835
msgid "about a day ago"
msgstr "fyrir um einum degi síðan"
-#: lib/util.php:838
+#: lib/util.php:837
#, php-format
msgid "about %d days ago"
msgstr "fyrir um %d dögum síðan"
-#: lib/util.php:840
+#: lib/util.php:839
msgid "about a month ago"
msgstr "fyrir um einum mánuði síðan"
-#: lib/util.php:842
+#: lib/util.php:841
#, php-format
msgid "about %d months ago"
msgstr "fyrir um %d mánuðum síðan"
-#: lib/util.php:844
+#: lib/util.php:843
msgid "about a year ago"
msgstr "fyrir um einu ári síðan"
@@ -5401,6 +5402,3 @@ msgstr "Afsakið en þetta er ekki móttökutölvupóstfangið þitt."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Því miður er móttökutölvupóstur ekki leyfður."
-
-#~ msgid "Notice"
-#~ msgstr "Babl"
diff --git a/locale/it/LC_MESSAGES/statusnet.mo b/locale/it/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index dce2fa137..000000000
--- a/locale/it/LC_MESSAGES/statusnet.mo
+++ /dev/null
Binary files differ
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index f46f46331..79b6ef8c0 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-23 21:46+0000\n"
-"PO-Revision-Date: 2009-11-23 21:47:35+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:19:56+0000\n"
"Language-Team: Italian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59365); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: it\n"
"X-Message-Group: out-statusnet\n"
@@ -577,7 +577,7 @@ msgstr "Ritaglia"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -751,7 +751,7 @@ msgid "Conversation"
msgstr "Codice di conferma"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Messaggi"
@@ -1185,7 +1185,7 @@ msgstr "Indirizzo email di ricezione rimosso."
msgid "New incoming email address added."
msgstr "Nuovo indirizzo email di ricezione aggiunto."
-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Messaggi famosi"
@@ -1281,27 +1281,27 @@ msgstr "L'utente che intendi seguire non esiste."
msgid "You can use the local subscription!"
msgstr "Puoi usare l'abbonamento locale!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "Quell'utente ti ha bloccato dall'abbonarti."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "Non autorizzato."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr ""
"Impossibile convertire le credenziali di richiesta in credenziali di accesso."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Versione del protocollo OMB sconosciuta."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Errore nell'aggiornare il profilo remoto"
@@ -1515,8 +1515,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Gruppi"
@@ -1846,53 +1846,53 @@ msgstr "%s ha lasciato il gruppo %s"
msgid "Already logged in."
msgstr "Accesso già effettuato."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "Contenuto del messaggio non valido"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Nome utente o password non corretto."
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Non autorizzato."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Accedi"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "Accedi al sito"
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Soprannome"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Password"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Ricordami"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "Accedi automaticamente in futuro; non per computer condivisi!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Password persa o dimenticata?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1900,7 +1900,7 @@ msgstr ""
"Per motivi di sicurezza è necessario reinserire il proprio nome utente e la "
"propria password prima di modificare le impostazioni."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2839,7 +2839,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL del tuo profilo su un altro servizio di micro-blog compatibile"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:356
+#: lib/userprofile.php:365
msgid "Subscribe"
msgstr "Abbonati"
@@ -2849,8 +2849,7 @@ msgstr "URL del profilo non valido (formato errato)"
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "Non è un URL di profilo valido (nessun documento YADIS)."
#: actions/remotesubscribe.php:176
@@ -3031,7 +3030,7 @@ msgid "Members"
msgstr "Membri"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(nessuno)"
@@ -3040,7 +3039,7 @@ msgstr "(nessuno)"
msgid "All members"
msgstr "Tutti i membri"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Statistiche"
@@ -4040,7 +4039,7 @@ msgstr "Ti è proibito inviare messaggi su questo sito."
msgid "Problem saving notice."
msgstr "Problema nel salvare il messaggio."
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Errore del DB nell'inserire la risposta: %s"
@@ -4467,50 +4466,40 @@ msgstr "Notifiche attivate."
msgid "Can't turn on notification."
msgstr "Impossibile attivare le notifiche."
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Impossibile creare il modulo OpenID: %s"
-
-#: 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:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Non sei abbonato a quel profilo."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Sei già abbonato a questi utenti:"
msgstr[1] "Sei già abbonato a questi utenti:"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Impossibile abbonare altri a te."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Impossibile abbonare altri a te."
msgstr[1] "Impossibile abbonare altri a te."
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Non sei un membro di quel gruppo."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Non sei un membro di quel gruppo."
msgstr[1] "Non sei un membro di quel gruppo."
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4529,7 +4518,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4589,9 +4577,10 @@ msgid "Upload file"
msgstr "Carica"
#: lib/designsettings.php:109
+#, fuzzy
msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
-msgstr ""
+"You can upload your personal background image. The maximum file size is 2MB."
+msgstr "Qui puoi caricare la tua immagine personale."
#: lib/designsettings.php:372
msgid "Bad default color settings: "
@@ -4765,7 +4754,15 @@ msgstr "Perso il nostro file."
msgid "Unknown file type"
msgstr "Tipo di file sconosciuto"
-#: lib/jabber.php:192
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5142,12 +5139,12 @@ msgstr "Errore nell'inserire un profilo remoto"
msgid "Duplicate notice"
msgstr "Elimina messaggio"
-#: lib/oauthstore.php:466 lib/subs.php:48
+#: lib/oauthstore.php:467 lib/subs.php:48
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "Quell'utente ti ha bloccato dall'abbonarti."
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr "Impossibile inserire un nuovo abbonamento."
@@ -5184,7 +5181,7 @@ msgstr "I tuoi messaggi inviati"
msgid "Tags in %s's notices"
msgstr "Etichette nei messaggi di %s"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Abbonamenti"
@@ -5192,7 +5189,7 @@ msgstr "Abbonamenti"
msgid "All subscriptions"
msgstr "Tutti gli abbonamenti"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Abbonati"
@@ -5200,16 +5197,16 @@ msgstr "Abbonati"
msgid "All subscribers"
msgstr "Tutti gli abbonati"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
#, fuzzy
msgid "User ID"
msgstr "Utente"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Membro dal"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "Tutti i gruppi"
@@ -5414,47 +5411,51 @@ msgstr "Invia un messaggio diretto a questo utente"
msgid "Message"
msgstr "Messaggio"
-#: lib/util.php:826
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr ""
+
+#: lib/util.php:825
msgid "a few seconds ago"
msgstr "pochi secondi fa"
-#: lib/util.php:828
+#: lib/util.php:827
msgid "about a minute ago"
msgstr "circa un minuto fa"
-#: lib/util.php:830
+#: lib/util.php:829
#, php-format
msgid "about %d minutes ago"
msgstr "circa %d minuti fa"
-#: lib/util.php:832
+#: lib/util.php:831
msgid "about an hour ago"
msgstr "circa un'ora fa"
-#: lib/util.php:834
+#: lib/util.php:833
#, php-format
msgid "about %d hours ago"
msgstr "circa %d ore fa"
-#: lib/util.php:836
+#: lib/util.php:835
msgid "about a day ago"
msgstr "circa un giorno fa"
-#: lib/util.php:838
+#: lib/util.php:837
#, php-format
msgid "about %d days ago"
msgstr "circa %d giorni fa"
-#: lib/util.php:840
+#: lib/util.php:839
msgid "about a month ago"
msgstr "circa un mese fa"
-#: lib/util.php:842
+#: lib/util.php:841
#, php-format
msgid "about %d months ago"
msgstr "circa %d mesi fa"
-#: lib/util.php:844
+#: lib/util.php:843
msgid "about a year ago"
msgstr "circa un anno fa"
@@ -5483,6 +5484,3 @@ msgstr "Quella non è la tua email di ricezione."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Email di ricezione non consentita."
-
-#~ msgid "Notice"
-#~ msgstr "Messaggio"
diff --git a/locale/ja/LC_MESSAGES/statusnet.mo b/locale/ja/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 5b4f3cf1e..000000000
--- a/locale/ja/LC_MESSAGES/statusnet.mo
+++ /dev/null
Binary files differ
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index 35918a4af..5317bc7a3 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -1,5 +1,6 @@
# Translation of StatusNet to Japanese
#
+# Author@translatewiki.net: Aotake
# Author@translatewiki.net: Fryed-peach
# --
# This file is distributed under the same license as the StatusNet package.
@@ -8,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-23 21:46+0000\n"
-"PO-Revision-Date: 2009-11-23 21:47:38+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:19:59+0000\n"
"Language-Team: Japanese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59365); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ja\n"
"X-Message-Group: out-statusnet\n"
@@ -21,9 +22,8 @@ msgstr ""
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
-#, fuzzy
msgid "No such page"
-msgstr "そのような通知はありません。"
+msgstr "そのようなページはありません。"
#: actions/all.php:74 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
@@ -51,9 +51,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
@@ -62,25 +62,25 @@ msgid "%s and friends"
msgstr "%s と友人"
#: actions/all.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
-msgstr "%s のともだちのフィード"
+msgstr "%s のともだちのフィード(RSS 1.0)"
#: actions/all.php:107
-#, fuzzy, php-format
+#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
-msgstr "%s のともだちのフィード"
+msgstr "%s のともだちのフィード (RSS 2.0)"
#: actions/all.php:115
-#, fuzzy, php-format
+#, php-format
msgid "Feed for friends of %s (Atom)"
-msgstr "%s のともだちのフィード"
+msgstr "%s のともだちのフィード (Atom)"
#: actions/all.php:127
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
-msgstr ""
+msgstr "これは%sとともだちの予定表です。まだ誰も投稿していません。"
#: actions/all.php:132
#, php-format
@@ -88,6 +88,8 @@ msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
"something yourself."
msgstr ""
+"もっと多くの人とつながってみましょう。[グループに参加](%%action.groups%%) し"
+"てみたり、何か投稿してみましょう。"
#: actions/all.php:134
#, php-format
@@ -95,6 +97,8 @@ msgid ""
"You can try to [nudge %s](../%s) from his profile or [post something to his "
"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
msgstr ""
+"プロフィールから[%sさんに合図](../%s) したり、[知らせたいことについて投稿](%%"
+"%%action.newnotice%%%%?status_textarea=%s)したりできます。"
#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
#, php-format
@@ -102,11 +106,12 @@ msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
"post a notice to his or her attention."
msgstr ""
+"[アカウントを登録](%%%%action.register%%%%) して%sさんに合図したり、お知らせ"
+"を送ってみませんか。"
#: actions/all.php:165
-#, fuzzy
msgid "You and friends"
-msgstr "%s & ともだち"
+msgstr "あなたとともだち"
#: actions/allrss.php:119 actions/apitimelinefriends.php:121
#, php-format
@@ -576,7 +581,7 @@ msgstr ""
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -751,7 +756,7 @@ msgid "Conversation"
msgstr "確認コード"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "通知"
@@ -1178,7 +1183,7 @@ msgstr ""
msgid "New incoming email address added."
msgstr ""
-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
#: lib/publicgroupnav.php:93
#, fuzzy
msgid "Popular notices"
@@ -1275,26 +1280,26 @@ msgstr "リストされているユーザは存在しません。"
msgid "You can use the local subscription!"
msgstr "ローカルサブスクリプションを使用可能です!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr ""
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "認証されていません。"
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "リクエストトークンをアクセストークンに変換できません"
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "予期せぬ OMB プロトコルのバージョンです。"
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "リモートプロファイル更新エラー"
@@ -1505,8 +1510,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1829,53 +1834,53 @@ msgstr ""
msgid "Already logged in."
msgstr "既にログインしています。"
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "不正な通知内容"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "ユーザ名またはパスワードが間違っています。"
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "認証されていません。"
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "ログイン"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr ""
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "ニックネーム"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "パスワード"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "ログイン状態を保持"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "以降は自動的にログインする。共用コンピューターでは避けましょう!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "パスワードを紛失、忘れた?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1883,7 +1888,7 @@ msgstr ""
"セキュリティー上の理由により、設定を変更する前にユーザ名とパスワードを入力し"
"て下さい。"
-#: actions/login.php:286
+#: actions/login.php:289
#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2806,7 +2811,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "プロファイルサービスまたはマイクロブロギングサービスのURL"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:356
+#: lib/userprofile.php:365
msgid "Subscribe"
msgstr "購読"
@@ -2816,8 +2821,7 @@ msgstr "不正なプロファイルURL。(形式不備)"
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "有効なプロファイルURLではありません。(XRDSドキュメントが無い)"
#: actions/remotesubscribe.php:176
@@ -3000,7 +3004,7 @@ msgid "Members"
msgstr "からのメンバー"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
@@ -3009,7 +3013,7 @@ msgstr ""
msgid "All members"
msgstr ""
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "統計データ"
@@ -3983,7 +3987,7 @@ msgstr ""
msgid "Problem saving notice."
msgstr "通知を保存する際に問題が発生しました。"
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr "返信を追加する際にデータベースエラー : %s"
@@ -4413,47 +4417,37 @@ msgstr ""
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "OpenIDを作成できません : %s"
-
-#: 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:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "そのプロファイルは送信されていません。"
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "そのプロファイルは送信されていません。"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "リモートサブスクライブ"
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "リモートサブスクライブ"
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "そのプロファイルは送信されていません。"
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "そのプロファイルは送信されていません。"
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4472,7 +4466,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4532,9 +4525,10 @@ msgid "Upload file"
msgstr "アップロード"
#: lib/designsettings.php:109
+#, fuzzy
msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
-msgstr ""
+"You can upload your personal background image. The maximum file size is 2MB."
+msgstr "長すぎます。通知は最大 140 字までです。"
#: lib/designsettings.php:372
msgid "Bad default color settings: "
@@ -4709,7 +4703,15 @@ msgstr "そのような通知はありません。"
msgid "Unknown file type"
msgstr ""
-#: lib/jabber.php:192
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5075,11 +5077,11 @@ msgstr "リモートプロファイル追加エラー"
msgid "Duplicate notice"
msgstr "新しい通知"
-#: lib/oauthstore.php:466 lib/subs.php:48
+#: lib/oauthstore.php:467 lib/subs.php:48
msgid "You have been banned from subscribing."
msgstr ""
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr "サブスクリプションを追加できません"
@@ -5116,7 +5118,7 @@ msgstr ""
msgid "Tags in %s's notices"
msgstr ""
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "サブスクリプション"
@@ -5124,7 +5126,7 @@ msgstr "サブスクリプション"
msgid "All subscriptions"
msgstr "すべての購読"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "購読者"
@@ -5133,15 +5135,15 @@ msgstr "購読者"
msgid "All subscribers"
msgstr "購読者"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr ""
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "からのメンバー"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr ""
@@ -5346,47 +5348,51 @@ msgstr ""
msgid "Message"
msgstr ""
-#: lib/util.php:826
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr ""
+
+#: lib/util.php:825
msgid "a few seconds ago"
msgstr "数秒前"
-#: lib/util.php:828
+#: lib/util.php:827
msgid "about a minute ago"
msgstr "約 1 分前"
-#: lib/util.php:830
+#: lib/util.php:829
#, php-format
msgid "about %d minutes ago"
msgstr "約 %d 分前"
-#: lib/util.php:832
+#: lib/util.php:831
msgid "about an hour ago"
msgstr "約 1 時間前"
-#: lib/util.php:834
+#: lib/util.php:833
#, php-format
msgid "about %d hours ago"
msgstr "約 %d 時間前"
-#: lib/util.php:836
+#: lib/util.php:835
msgid "about a day ago"
msgstr "約 1 日前"
-#: lib/util.php:838
+#: lib/util.php:837
#, php-format
msgid "about %d days ago"
msgstr "約 %d 日前"
-#: lib/util.php:840
+#: lib/util.php:839
msgid "about a month ago"
msgstr "約 1 ヵ月前"
-#: lib/util.php:842
+#: lib/util.php:841
#, php-format
msgid "about %d months ago"
msgstr "約 %d ヵ月前"
-#: lib/util.php:844
+#: lib/util.php:843
msgid "about a year ago"
msgstr "約 1 年前"
@@ -5415,6 +5421,3 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
-
-#~ msgid "Notice"
-#~ msgstr "通知"
diff --git a/locale/ko/LC_MESSAGES/statusnet.mo b/locale/ko/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 3d3438d36..000000000
--- a/locale/ko/LC_MESSAGES/statusnet.mo
+++ /dev/null
Binary files differ
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 63800df5d..60ac94a30 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-23 21:46+0000\n"
-"PO-Revision-Date: 2009-11-23 21:47:41+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:20:03+0000\n"
"Language-Team: Korean\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59365); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ko\n"
"X-Message-Group: out-statusnet\n"
@@ -576,7 +576,7 @@ msgstr "자르기"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -750,7 +750,7 @@ msgid "Conversation"
msgstr "인증 코드"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "통지"
@@ -1179,7 +1179,7 @@ msgstr "받은 이메일 계정 삭제"
msgid "New incoming email address added."
msgstr "새로운 이메일 주소가 추가 되었습니다."
-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "인기있는 게시글"
@@ -1275,26 +1275,26 @@ msgstr "살펴 보고 있는 사용자가 없습니다."
msgid "You can use the local subscription!"
msgstr "당신은 로컬 구독을 사용할 수 있습니다."
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "이 회원은 구독으로부터 당신을 차단해왔다."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "인증이 되지 않았습니다."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "리퀘스트 토큰을 엑세스 토큰으로 변환 할 수 없습니다."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "OMB 프로토콜의 알려지지 않은 버전"
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "리모트 프로필 업데이트 오류"
@@ -1508,8 +1508,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "그룹"
@@ -1827,60 +1827,60 @@ msgstr "%s가 그룹%s를 떠났습니다."
msgid "Already logged in."
msgstr "이미 로그인 하셨습니다."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "옳지 않은 통지 내용"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "틀린 계정 또는 비밀 번호"
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "인증이 되지 않았습니다."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "로그인"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "사이트에 로그인하세요."
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "별명"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "비밀 번호"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "자동 로그인"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "앞으로는 자동으로 로그인합니다. 공용 컴퓨터에서는 이용하지 마십시오!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "비밀 번호를 잊으셨나요?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
"보안을 위해 세팅을 저장하기 전에 계정과 비밀 번호를 다시 입력 해 주십시오."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2809,7 +2809,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "다른 마이크로블로깅 서비스의 귀하의 프로필 URL"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:356
+#: lib/userprofile.php:365
msgid "Subscribe"
msgstr "구독"
@@ -2819,8 +2819,7 @@ msgstr "옳지 않은 프로필 URL (나쁜 포멧)"
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "유효한 프로필 URL이 아닙니다. (YADIS 문서가 없습니다)"
#: actions/remotesubscribe.php:176
@@ -3001,7 +3000,7 @@ msgid "Members"
msgstr "회원"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(없습니다.)"
@@ -3010,7 +3009,7 @@ msgstr "(없습니다.)"
msgid "All members"
msgstr "모든 회원"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "통계"
@@ -4002,7 +4001,7 @@ msgstr "이 사이트에 게시글 포스팅으로부터 당신은 금지되었
msgid "Problem saving notice."
msgstr "통지를 저장하는데 문제가 발생했습니다."
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr "답신을 추가 할 때에 데이타베이스 에러 : %s"
@@ -4429,47 +4428,37 @@ msgstr "알림이 켜졌습니다."
msgid "Can't turn on notification."
msgstr "알림을 켤 수 없습니다."
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "OpenID를 작성 할 수 없습니다 : %s"
-
-#: 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:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "당신은 이 프로필에 구독되지 않고있습니다."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "당신은 다음 사용자를 이미 구독하고 있습니다."
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "다른 사람을 구독 하실 수 없습니다."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "다른 사람을 구독 하실 수 없습니다."
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "당신은 해당 그룹의 멤버가 아닙니다."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "당신은 해당 그룹의 멤버가 아닙니다."
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4488,7 +4477,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4548,9 +4536,10 @@ msgid "Upload file"
msgstr "올리기"
#: lib/designsettings.php:109
+#, fuzzy
msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
-msgstr ""
+"You can upload your personal background image. The maximum file size is 2MB."
+msgstr "당신의 개인적인 아바타를 업로드할 수 있습니다."
#: lib/designsettings.php:372
msgid "Bad default color settings: "
@@ -4724,7 +4713,15 @@ msgstr "파일을 잃어버렸습니다."
msgid "Unknown file type"
msgstr "알 수 없는 종류의 파일입니다"
-#: lib/jabber.php:192
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5093,12 +5090,12 @@ msgstr "리모트 프로필 추가 오류"
msgid "Duplicate notice"
msgstr "통지 삭제"
-#: lib/oauthstore.php:466 lib/subs.php:48
+#: lib/oauthstore.php:467 lib/subs.php:48
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "이 회원은 구독으로부터 당신을 차단해왔다."
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr "예약 구독을 추가 할 수 없습니다."
@@ -5135,7 +5132,7 @@ msgstr "당신의 보낸 메시지들"
msgid "Tags in %s's notices"
msgstr "%s의 게시글의 태그"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "구독"
@@ -5143,7 +5140,7 @@ msgstr "구독"
msgid "All subscriptions"
msgstr "모든 예약 구독"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "구독자"
@@ -5151,16 +5148,16 @@ msgstr "구독자"
msgid "All subscribers"
msgstr "모든 구독자"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
#, fuzzy
msgid "User ID"
msgstr "이용자"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "가입한 때"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "모든 그룹"
@@ -5365,47 +5362,51 @@ msgstr "이 회원에게 직접 메시지를 보냅니다."
msgid "Message"
msgstr "메시지"
-#: lib/util.php:826
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr ""
+
+#: lib/util.php:825
msgid "a few seconds ago"
msgstr "몇 초 전"
-#: lib/util.php:828
+#: lib/util.php:827
msgid "about a minute ago"
msgstr "1분 전"
-#: lib/util.php:830
+#: lib/util.php:829
#, php-format
msgid "about %d minutes ago"
msgstr "%d분 전"
-#: lib/util.php:832
+#: lib/util.php:831
msgid "about an hour ago"
msgstr "1시간 전"
-#: lib/util.php:834
+#: lib/util.php:833
#, php-format
msgid "about %d hours ago"
msgstr "%d시간 전"
-#: lib/util.php:836
+#: lib/util.php:835
msgid "about a day ago"
msgstr "하루 전"
-#: lib/util.php:838
+#: lib/util.php:837
#, php-format
msgid "about %d days ago"
msgstr "%d일 전"
-#: lib/util.php:840
+#: lib/util.php:839
msgid "about a month ago"
msgstr "1달 전"
-#: lib/util.php:842
+#: lib/util.php:841
#, php-format
msgid "about %d months ago"
msgstr "%d달 전"
-#: lib/util.php:844
+#: lib/util.php:843
msgid "about a year ago"
msgstr "1년 전"
@@ -5434,6 +5435,3 @@ msgstr "죄송합니다. 귀하의 이메일이 아닙니다."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "죄송합니다. 이메일이 허용되지 않습니다."
-
-#~ msgid "Notice"
-#~ msgstr "게시글"
diff --git a/locale/mk/LC_MESSAGES/statusnet.mo b/locale/mk/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index e6258bf4b..000000000
--- a/locale/mk/LC_MESSAGES/statusnet.mo
+++ /dev/null
Binary files differ
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 0bf913950..94511070d 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-23 21:46+0000\n"
-"PO-Revision-Date: 2009-11-23 21:47:44+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:20:07+0000\n"
"Language-Team: Macedonian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59365); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: out-statusnet\n"
@@ -574,7 +574,7 @@ msgstr ""
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -750,7 +750,7 @@ msgid "Conversation"
msgstr "Локација"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Известувања"
@@ -1171,7 +1171,7 @@ msgstr ""
msgid "New incoming email address added."
msgstr ""
-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
#: lib/publicgroupnav.php:93
#, fuzzy
msgid "Popular notices"
@@ -1268,26 +1268,26 @@ msgstr "Корисникот кој го следите не постои."
msgid "You can use the local subscription!"
msgstr "Може да ја користите локалната претплата."
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr ""
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "Не е одобрено."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "Белезите за барање не може да се конвертираат во белези за пристап."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Непозната верзија на протоколот OMB."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Грешка во освежувањето на оддалечениот профил"
@@ -1498,8 +1498,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1798,54 +1798,54 @@ msgstr ""
msgid "Already logged in."
msgstr "Веќе сте најавени."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "Неправилна содржина за известување"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Неточно корисничко име или лозинка"
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Не е одобрено."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Пријави се"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr ""
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Прекар"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Лозинка"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Запамети ме"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Следниот пат најавете се автоматски; не за компјутери кои ги делите со други!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Загубена или заборавена лозинка?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1853,7 +1853,7 @@ msgstr ""
"Поради безбедносни причини треба повторно да го внесете Вашето корисничко "
"име и лозинка пред да ги смените Вашите поставки."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2771,7 +2771,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL на Вашиот профил на друго компатибилно место за микроблогирање."
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:356
+#: lib/userprofile.php:365
msgid "Subscribe"
msgstr "Претплати се"
@@ -2781,8 +2781,7 @@ msgstr "Неправилно URL на профил (лош формат)"
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "Неправилно URL на профил (нема YADIS документ)."
#: actions/remotesubscribe.php:176
@@ -2965,7 +2964,7 @@ msgid "Members"
msgstr "Член од"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
@@ -2974,7 +2973,7 @@ msgstr ""
msgid "All members"
msgstr ""
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Статистика"
@@ -3954,7 +3953,7 @@ msgstr ""
msgid "Problem saving notice."
msgstr "Проблем во снимањето на известувањето."
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Одговор од внесот во базата: %s"
@@ -4387,50 +4386,40 @@ msgstr ""
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "OpenID формуларот не може да се креира:%s"
-
-#: 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:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Не ни го испративте тој профил."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Не ни го испративте тој профил."
msgstr[1] "Не ни го испративте тој профил."
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Оддалечена претплата"
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Оддалечена претплата"
msgstr[1] "Оддалечена претплата"
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Не ни го испративте тој профил."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Не ни го испративте тој профил."
msgstr[1] "Не ни го испративте тој профил."
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4449,7 +4438,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4508,9 +4496,10 @@ msgid "Upload file"
msgstr "Товари"
#: lib/designsettings.php:109
+#, fuzzy
msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
-msgstr ""
+"You can upload your personal background image. The maximum file size is 2MB."
+msgstr "Ова е предолго. Максималната должина е 140 знаци."
#: lib/designsettings.php:372
msgid "Bad default color settings: "
@@ -4689,7 +4678,15 @@ msgstr "Нема такво известување."
msgid "Unknown file type"
msgstr ""
-#: lib/jabber.php:192
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5061,11 +5058,11 @@ msgstr "Грешка во внесувањето на оддалечениот
msgid "Duplicate notice"
msgstr "Дуплирано известување"
-#: lib/oauthstore.php:466 lib/subs.php:48
+#: lib/oauthstore.php:467 lib/subs.php:48
msgid "You have been banned from subscribing."
msgstr ""
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr "Не може да се внесе нова претплата."
@@ -5102,7 +5099,7 @@ msgstr ""
msgid "Tags in %s's notices"
msgstr ""
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Претплати"
@@ -5110,7 +5107,7 @@ msgstr "Претплати"
msgid "All subscriptions"
msgstr "Сите претплати"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Претплатници"
@@ -5119,15 +5116,15 @@ msgstr "Претплатници"
msgid "All subscribers"
msgstr "Претплатници"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr ""
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Член од"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr ""
@@ -5333,47 +5330,51 @@ msgstr ""
msgid "Message"
msgstr ""
-#: lib/util.php:826
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr ""
+
+#: lib/util.php:825
msgid "a few seconds ago"
msgstr "пред неколку секунди"
-#: lib/util.php:828
+#: lib/util.php:827
msgid "about a minute ago"
msgstr "пред една минута"
-#: lib/util.php:830
+#: lib/util.php:829
#, php-format
msgid "about %d minutes ago"
msgstr "пред %d минути"
-#: lib/util.php:832
+#: lib/util.php:831
msgid "about an hour ago"
msgstr "пред еден час"
-#: lib/util.php:834
+#: lib/util.php:833
#, php-format
msgid "about %d hours ago"
msgstr "пред %d часа"
-#: lib/util.php:836
+#: lib/util.php:835
msgid "about a day ago"
msgstr "пред еден ден"
-#: lib/util.php:838
+#: lib/util.php:837
#, php-format
msgid "about %d days ago"
msgstr "пред %d денови"
-#: lib/util.php:840
+#: lib/util.php:839
msgid "about a month ago"
msgstr "пред еден месец"
-#: lib/util.php:842
+#: lib/util.php:841
#, php-format
msgid "about %d months ago"
msgstr "пред %d месеци"
-#: lib/util.php:844
+#: lib/util.php:843
msgid "about a year ago"
msgstr "пред една година"
@@ -5402,7 +5403,3 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
-
-#, fuzzy
-#~ msgid "Notice"
-#~ msgstr "Известувања"
diff --git a/locale/nb/LC_MESSAGES/statusnet.mo b/locale/nb/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 28fe57a4f..000000000
--- a/locale/nb/LC_MESSAGES/statusnet.mo
+++ /dev/null
Binary files differ
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 453664335..e6eb1e5d1 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-23 21:46+0000\n"
-"PO-Revision-Date: 2009-11-23 21:47:46+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:20:10+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(r59365); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: no\n"
"X-Message-Group: out-statusnet\n"
@@ -572,7 +572,7 @@ msgstr ""
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -745,7 +745,7 @@ msgid "Conversation"
msgstr "Bekreftelseskode"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr ""
@@ -1169,7 +1169,7 @@ msgstr ""
msgid "New incoming email address added."
msgstr ""
-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr ""
@@ -1264,24 +1264,24 @@ msgstr ""
msgid "You can use the local subscription!"
msgstr ""
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr ""
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "Ikke autorisert."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
msgid "Could not convert request token to access token."
msgstr ""
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
msgid "Remote service uses unknown version of OMB protocol."
msgstr ""
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr ""
@@ -1483,8 +1483,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1795,59 +1795,59 @@ msgstr ""
msgid "Already logged in."
msgstr "Allerede innlogget."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
msgid "Invalid or expired token."
msgstr ""
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Feil brukernavn eller passord"
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Ikke autorisert."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Logg inn"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr ""
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Nick"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Passord"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Husk meg"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Logg inn automatisk i framtiden. Ikke for datamaskiner du deler med andre!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Mistet eller glemt passordet?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
-#: actions/login.php:286
+#: actions/login.php:289
#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2758,7 +2758,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:356
+#: lib/userprofile.php:365
msgid "Subscribe"
msgstr ""
@@ -2767,8 +2767,7 @@ 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)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr ""
#: actions/remotesubscribe.php:176
@@ -2949,7 +2948,7 @@ msgid "Members"
msgstr "Medlem siden"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
@@ -2958,7 +2957,7 @@ msgstr ""
msgid "All members"
msgstr ""
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Statistikk"
@@ -3913,7 +3912,7 @@ msgstr ""
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
@@ -4331,50 +4330,40 @@ msgstr ""
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Klarte ikke å lagre avatar-informasjonen"
-
-#: 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:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Ikke autorisert."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Ikke autorisert."
msgstr[1] "Ikke autorisert."
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Svar til %s"
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Svar til %s"
msgstr[1] "Svar til %s"
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Du er allerede logget inn!"
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Du er allerede logget inn!"
msgstr[1] "Du er allerede logget inn!"
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4393,7 +4382,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4453,7 +4441,7 @@ msgstr "Last opp"
#: lib/designsettings.php:109
msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
+"You can upload your personal background image. The maximum file size is 2MB."
msgstr ""
#: lib/designsettings.php:372
@@ -4632,7 +4620,15 @@ msgstr "Klarte ikke å lagre profil."
msgid "Unknown file type"
msgstr ""
-#: lib/jabber.php:192
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5002,11 +4998,11 @@ msgstr ""
msgid "Duplicate notice"
msgstr ""
-#: lib/oauthstore.php:466 lib/subs.php:48
+#: lib/oauthstore.php:467 lib/subs.php:48
msgid "You have been banned from subscribing."
msgstr ""
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr ""
@@ -5043,7 +5039,7 @@ msgstr ""
msgid "Tags in %s's notices"
msgstr ""
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr ""
@@ -5051,7 +5047,7 @@ msgstr ""
msgid "All subscriptions"
msgstr "Alle abonnementer"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr ""
@@ -5060,15 +5056,15 @@ msgstr ""
msgid "All subscribers"
msgstr "Alle abonnementer"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr ""
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Medlem siden"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr ""
@@ -5272,47 +5268,51 @@ msgstr ""
msgid "Message"
msgstr ""
-#: lib/util.php:826
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr ""
+
+#: lib/util.php:825
msgid "a few seconds ago"
msgstr "noen få sekunder siden"
-#: lib/util.php:828
+#: lib/util.php:827
msgid "about a minute ago"
msgstr "omtrent ett minutt siden"
-#: lib/util.php:830
+#: lib/util.php:829
#, php-format
msgid "about %d minutes ago"
msgstr "omtrent %d minutter siden"
-#: lib/util.php:832
+#: lib/util.php:831
msgid "about an hour ago"
msgstr "omtrent én time siden"
-#: lib/util.php:834
+#: lib/util.php:833
#, php-format
msgid "about %d hours ago"
msgstr "omtrent %d timer siden"
-#: lib/util.php:836
+#: lib/util.php:835
msgid "about a day ago"
msgstr "omtrent én dag siden"
-#: lib/util.php:838
+#: lib/util.php:837
#, php-format
msgid "about %d days ago"
msgstr "omtrent %d dager siden"
-#: lib/util.php:840
+#: lib/util.php:839
msgid "about a month ago"
msgstr "omtrent én måned siden"
-#: lib/util.php:842
+#: lib/util.php:841
#, php-format
msgid "about %d months ago"
msgstr "omtrent %d måneder siden"
-#: lib/util.php:844
+#: lib/util.php:843
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
deleted file mode 100644
index af1150fb0..000000000
--- a/locale/nl/LC_MESSAGES/statusnet.mo
+++ /dev/null
Binary files differ
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index 2dd1a24e0..e9c4ef9e7 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-23 21:46+0000\n"
-"PO-Revision-Date: 2009-11-23 21:47:52+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:20:26+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59365); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: out-statusnet\n"
@@ -290,7 +290,7 @@ msgstr "U kunt de gebruiker %s niet volgen, omdat deze al op uw lijst staat."
#: actions/apifriendshipsdestroy.php:109
msgid "Could not unfollow user: User not found."
msgstr ""
-"Het is niet mogelijk deze gebruiker niet langer te volgende: de gebruiker is "
+"Het is niet mogelijk deze gebruiker niet langer te volgen: de gebruiker is "
"niet aangetroffen."
#: actions/apifriendshipsdestroy.php:120
@@ -369,7 +369,7 @@ msgstr "Ongeldig alias: \"%s\""
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
-msgstr "De alias \"%s\" wordt al gebruikt. Geef een ander alias op."
+msgstr "De alias \"%s\" wordt al gebruikt. Geef een andere alias op."
#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
@@ -388,7 +388,7 @@ msgstr "U bent al lid van die groep."
#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
msgid "You have been blocked from that group by the admin."
-msgstr "Een beheerder heeft ingesteld dat u geen lid mag worden can die groep."
+msgstr "Een beheerder heeft ingesteld dat u geen lid mag worden van die groep."
#: actions/apigroupjoin.php:138
#, php-format
@@ -582,7 +582,7 @@ msgstr "Uitsnijden"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -755,7 +755,7 @@ msgid "Conversation"
msgstr "Dialoog"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Mededelingen"
@@ -1175,7 +1175,7 @@ msgstr "Het e-mailadres voor inkomende mail is verwijderd."
msgid "New incoming email address added."
msgstr "Het nieuwe binnenkomende e-mailadres is toegevoegd."
-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Populaire mededelingen"
@@ -1275,26 +1275,26 @@ msgstr "De gebruiker waarnaar wordt geluisterd bestaat niet."
msgid "You can use the local subscription!"
msgstr "U kunt het lokale abonnement gebruiken!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr ""
"Die gebruiker heeft de mogelijkheid om te abonneren voor u geblokkeerd."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
msgstr "U hebt niet de juiste toegangsrechten."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
msgid "Could not convert request token to access token."
msgstr ""
"Het was niet mogelijk het verzoektoken te converteren naar een toegangstoken."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
msgid "Remote service uses unknown version of OMB protocol."
msgstr ""
"De diensten op afstand gebruiken een onbekende versie van het OMB-protocol."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr ""
"Er is een fout opgetreden tijdens het bijwerken van het profiel op afstand."
@@ -1506,8 +1506,8 @@ msgstr ""
"U kunt een [gebruiker registreren](%%action.register%%) en de groep zelf "
"[aanmaken](%%action.newgroup%%)!"
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Groepen"
@@ -1842,53 +1842,53 @@ msgstr "%s heeft de groep %s verlaten"
msgid "Already logged in."
msgstr "U bent al aangemeld."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
msgid "Invalid or expired token."
msgstr "Het token is ongeldig of verlopen."
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "De gebruikersnaam of wachtwoord is onjuist."
-#: actions/login.php:149
+#: actions/login.php:152
msgid "Error setting user. You are probably not authorized."
msgstr ""
"Er is een fout opgetreden bij het maken van de instellingen. U hebt "
"waarschijnlijk niet de juiste rechten."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Aanmelden"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "Aanmelden"
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Gebruikersnaam"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Wachtwoord"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Aanmeldgegevens onthouden"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "Voortaan automatisch aanmelden. Niet gebruiken op gedeelde computers!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Wachtwoord kwijt of vergeten?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1896,7 +1896,7 @@ msgstr ""
"Om veiligheidsredenen moet u uw gebruikersnaam en wachtwoord nogmaals "
"invoeren alvorens u uw instellingen kunt wijzigen."
-#: actions/login.php:286
+#: actions/login.php:289
#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2845,7 +2845,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "De URL van uw profiel bij een andere, compatibele microblogdienst"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:356
+#: lib/userprofile.php:365
msgid "Subscribe"
msgstr "Abonneren"
@@ -2854,8 +2854,8 @@ msgid "Invalid profile URL (bad format)"
msgstr "Ongeldige profiel-URL (foutieve opmaak)"
#: actions/remotesubscribe.php:168
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+#, fuzzy
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr ""
"De URL voor het profiel is niet geldig (het is geen YADIS-document of er is "
"geen of ongeldige XRDS gedefinieerd)."
@@ -3049,7 +3049,7 @@ msgid "Members"
msgstr "Leden"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(geen)"
@@ -3058,7 +3058,7 @@ msgstr "(geen)"
msgid "All members"
msgstr "Alle leden"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Statistieken"
@@ -4070,7 +4070,7 @@ msgstr ""
msgid "Problem saving notice."
msgstr "Er is een probleem opgetreden bij het opslaan van de mededeling."
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
@@ -4132,7 +4132,7 @@ msgstr "Primaire sitenavigatie"
#: lib/action.php:431
msgid "Home"
-msgstr "Thuispagina"
+msgstr "Start"
#: lib/action.php:431
msgid "Personal profile and friends timeline"
@@ -4492,49 +4492,38 @@ msgstr "Notificaties ingeschakeld."
msgid "Can't turn on notification."
msgstr "Het is niet mogelijk de notificatie uit te schakelen."
-#: lib/command.php:597
-#, php-format
-msgid "Could not create login token for %s"
-msgstr "Het was niet mogelijk een aanmeldtoken aan te maken voor %s"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-"Deze verwijzing kan slechts één keer gebruikt worden en is twee minuten "
-"geldig: %s"
-
-#: lib/command.php:618
+#: lib/command.php:592
msgid "You are not subscribed to anyone."
msgstr "U bent op geen enkele gebruiker geabonneerd."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "U bent geabonneerd op deze gebruiker:"
msgstr[1] "U bent geabonneerd op deze gebruikers:"
-#: lib/command.php:640
+#: lib/command.php:614
msgid "No one is subscribed to you."
msgstr "Niemand heeft een abonnenment op u."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Deze gebruiker is op u geabonneerd:"
msgstr[1] "Deze gebruikers zijn op u geabonneerd:"
-#: lib/command.php:662
+#: lib/command.php:636
msgid "You are not a member of any groups."
msgstr "U bent lid van geen enkele groep."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "U bent lid van deze groep:"
msgstr[1] "U bent lid van deze groepen:"
-#: lib/command.php:678
+#: lib/command.php:652
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4553,7 +4542,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4649,10 +4637,10 @@ msgstr "Bestand uploaden"
#: lib/designsettings.php:109
msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
+"You can upload your personal background image. The maximum file size is 2MB."
msgstr ""
"U kunt een persoonlijke achtergrondafbeelding uploaden. De maximale "
-"bestandsgroote is 2 megabyte."
+"bestandsgrootte is 2 megabyte."
#: lib/designsettings.php:372
msgid "Bad default color settings: "
@@ -4825,7 +4813,15 @@ msgstr "Het bestand is zoekgeraakt."
msgid "Unknown file type"
msgstr "Onbekend bestandstype"
-#: lib/jabber.php:192
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr "MB"
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr "kB"
+
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr "[%s]"
@@ -5278,11 +5274,11 @@ msgstr ""
msgid "Duplicate notice"
msgstr "Duplicaatmelding"
-#: lib/oauthstore.php:466 lib/subs.php:48
+#: lib/oauthstore.php:467 lib/subs.php:48
msgid "You have been banned from subscribing."
msgstr "U mag zich niet abonneren."
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr "Kon nieuw abonnement niet toevoegen."
@@ -5319,7 +5315,7 @@ msgstr "Uw verzonden berichten"
msgid "Tags in %s's notices"
msgstr "Labels in de mededelingen van %s"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Abonnementen"
@@ -5327,7 +5323,7 @@ msgstr "Abonnementen"
msgid "All subscriptions"
msgstr "Alle abonnementen"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Abonnees"
@@ -5335,15 +5331,15 @@ msgstr "Abonnees"
msgid "All subscribers"
msgstr "Alle abonnees"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr "Gebruikers-ID"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Lid sinds"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "Alle groepen"
@@ -5536,47 +5532,51 @@ msgstr "Deze gebruiker een direct bericht zenden"
msgid "Message"
msgstr "Bericht"
-#: lib/util.php:826
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr "Modereren"
+
+#: lib/util.php:825
msgid "a few seconds ago"
msgstr "een paar seconden geleden"
-#: lib/util.php:828
+#: lib/util.php:827
msgid "about a minute ago"
msgstr "ongeveer een minuut geleden"
-#: lib/util.php:830
+#: lib/util.php:829
#, php-format
msgid "about %d minutes ago"
msgstr "ongeveer %d minuten geleden"
-#: lib/util.php:832
+#: lib/util.php:831
msgid "about an hour ago"
msgstr "ongeveer een uur geleden"
-#: lib/util.php:834
+#: lib/util.php:833
#, php-format
msgid "about %d hours ago"
msgstr "ongeveer %d uur geleden"
-#: lib/util.php:836
+#: lib/util.php:835
msgid "about a day ago"
msgstr "ongeveer een dag geleden"
-#: lib/util.php:838
+#: lib/util.php:837
#, php-format
msgid "about %d days ago"
msgstr "ongeveer %d dagen geleden"
-#: lib/util.php:840
+#: lib/util.php:839
msgid "about a month ago"
msgstr "ongeveer een maand geleden"
-#: lib/util.php:842
+#: lib/util.php:841
#, php-format
msgid "about %d months ago"
msgstr "ongeveer %d maanden geleden"
-#: lib/util.php:844
+#: lib/util.php:843
msgid "about a year ago"
msgstr "ongeveer een jaar geleden"
@@ -5605,6 +5605,3 @@ msgstr "Dit is niet uw inkomende e-mailadres."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Inkomende e-mail is niet toegestaan."
-
-#~ msgid "Notice"
-#~ msgstr "Mededeling"
diff --git a/locale/nn/LC_MESSAGES/statusnet.mo b/locale/nn/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 90632f0ac..000000000
--- a/locale/nn/LC_MESSAGES/statusnet.mo
+++ /dev/null
Binary files differ
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index 2a186afcb..fdae960a3 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-23 21:46+0000\n"
-"PO-Revision-Date: 2009-11-23 21:47:49+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:20:13+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(r59365); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nn\n"
"X-Message-Group: out-statusnet\n"
@@ -574,7 +574,7 @@ msgstr "Skaler"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -748,7 +748,7 @@ msgid "Conversation"
msgstr "Stadfestingskode"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Notisar"
@@ -1179,7 +1179,7 @@ msgstr "Fjerna innkomande epostadresse."
msgid "New incoming email address added."
msgstr "La til ny innkomande epostadresse."
-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Populære notisar"
@@ -1275,26 +1275,26 @@ msgstr "Brukaren du lyttar til eksisterer ikkje."
msgid "You can use the local subscription!"
msgstr "Du kan nytta det lokale abonnementet!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "Brukaren tillet deg ikkje å tinga meldingane sine."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "Ikkje autorisert."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "Kan ikkje konvertera spyrjebillett til tilgongsbillett."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Ukjend versjon av OMB-protokollen."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Feil ved oppdatering av ekstern profil"
@@ -1508,8 +1508,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Grupper"
@@ -1829,53 +1829,53 @@ msgstr "%s forlot %s gruppa"
msgid "Already logged in."
msgstr "Allereie logga inn."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "Ugyldig notisinnhald"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Feil brukarnamn eller passord"
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Ikkje autorisert."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Logg inn"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "Logg inn "
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Kallenamn"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Passord"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Hugs meg"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "Logg inn automatisk i framtidi (ikkje for delte maskiner)."
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Mista eller gløymd passord?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1883,7 +1883,7 @@ msgstr ""
"Skriv inn brukarnam og passord før du endrar innstillingar (av "
"tryggleiksomsyn)."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2822,7 +2822,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL til profilsida di på ei anna kompatibel mikrobloggingteneste."
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:356
+#: lib/userprofile.php:365
msgid "Subscribe"
msgstr "Ting"
@@ -2832,8 +2832,7 @@ msgstr "Ugyldig profil-nettadresse (feil format)"
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "Ikkje ein brukande profil-netadresse (ingen YADIS-dokument)."
#: actions/remotesubscribe.php:176
@@ -3014,7 +3013,7 @@ msgid "Members"
msgstr "Medlemmar"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(Ingen)"
@@ -3023,7 +3022,7 @@ msgstr "(Ingen)"
msgid "All members"
msgstr "Alle medlemmar"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Statistikk"
@@ -4019,7 +4018,7 @@ msgstr "Du kan ikkje lengre legge inn notisar på denne sida."
msgid "Problem saving notice."
msgstr "Eit problem oppstod ved lagring av notis."
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Databasefeil, kan ikkje lagra svar: %s"
@@ -4446,50 +4445,40 @@ msgstr "Notifikasjon på."
msgid "Can't turn on notification."
msgstr "Kan ikkje slå på notifikasjon."
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Kunne ikkje laga OpenID-form: %s"
-
-#: 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:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Du tingar ikkje oppdateringar til den profilen."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Du tingar allereie oppdatering frå desse brukarane:"
msgstr[1] "Du tingar allereie oppdatering frå desse brukarane:"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Kan ikkje tinga andre til deg."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Kan ikkje tinga andre til deg."
msgstr[1] "Kan ikkje tinga andre til deg."
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Du er ikkje medlem av den gruppa."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Du er ikkje medlem av den gruppa."
msgstr[1] "Du er ikkje medlem av den gruppa."
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4508,7 +4497,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4568,9 +4556,10 @@ msgid "Upload file"
msgstr "Last opp"
#: lib/designsettings.php:109
+#, fuzzy
msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
-msgstr ""
+"You can upload your personal background image. The maximum file size is 2MB."
+msgstr "Du kan laste opp ein personleg avatar."
#: lib/designsettings.php:372
msgid "Bad default color settings: "
@@ -4744,7 +4733,15 @@ msgstr "Mista fila vår."
msgid "Unknown file type"
msgstr "Ukjend fil type"
-#: lib/jabber.php:192
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5120,12 +5117,12 @@ msgstr "Feil med å henta inn ekstern profil"
msgid "Duplicate notice"
msgstr "Slett notis"
-#: lib/oauthstore.php:466 lib/subs.php:48
+#: lib/oauthstore.php:467 lib/subs.php:48
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "Brukaren tillet deg ikkje å tinga meldingane sine."
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr "Kan ikkje leggja til ny tinging."
@@ -5162,7 +5159,7 @@ msgstr "Dine sende meldingar"
msgid "Tags in %s's notices"
msgstr "Merkelappar i %s sine notisar"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Tingingar"
@@ -5170,7 +5167,7 @@ msgstr "Tingingar"
msgid "All subscriptions"
msgstr "Alle tingingar"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Tingarar"
@@ -5178,16 +5175,16 @@ msgstr "Tingarar"
msgid "All subscribers"
msgstr "Tingarar"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
#, fuzzy
msgid "User ID"
msgstr "Brukar"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Medlem sidan"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "Alle gruppar"
@@ -5392,47 +5389,51 @@ msgstr "Send ei direktemelding til denne brukaren"
msgid "Message"
msgstr "Melding"
-#: lib/util.php:826
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr ""
+
+#: lib/util.php:825
msgid "a few seconds ago"
msgstr "eit par sekund sidan"
-#: lib/util.php:828
+#: lib/util.php:827
msgid "about a minute ago"
msgstr "omtrent eitt minutt sidan"
-#: lib/util.php:830
+#: lib/util.php:829
#, php-format
msgid "about %d minutes ago"
msgstr "~%d minutt sidan"
-#: lib/util.php:832
+#: lib/util.php:831
msgid "about an hour ago"
msgstr "omtrent ein time sidan"
-#: lib/util.php:834
+#: lib/util.php:833
#, php-format
msgid "about %d hours ago"
msgstr "~%d timar sidan"
-#: lib/util.php:836
+#: lib/util.php:835
msgid "about a day ago"
msgstr "omtrent ein dag sidan"
-#: lib/util.php:838
+#: lib/util.php:837
#, php-format
msgid "about %d days ago"
msgstr "~%d dagar sidan"
-#: lib/util.php:840
+#: lib/util.php:839
msgid "about a month ago"
msgstr "omtrent ein månad sidan"
-#: lib/util.php:842
+#: lib/util.php:841
#, php-format
msgid "about %d months ago"
msgstr "~%d månadar sidan"
-#: lib/util.php:844
+#: lib/util.php:843
msgid "about a year ago"
msgstr "omtrent eitt år sidan"
@@ -5461,6 +5462,3 @@ msgstr "Beklager, det er ikkje di inngåande epost addresse."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Beklager, inngåande epost er ikkje tillatt."
-
-#~ msgid "Notice"
-#~ msgstr "Notis"
diff --git a/locale/pl/LC_MESSAGES/statusnet.mo b/locale/pl/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 4ca003cf6..000000000
--- a/locale/pl/LC_MESSAGES/statusnet.mo
+++ /dev/null
Binary files differ
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index 121956fe1..62d92064c 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -1,4 +1,7 @@
# Translation of StatusNet to Polish
+#
+# Author@translatewiki.net: Raven
+# --
# Paweł Wilk <siefca@gnu.org>, 2008.
# Piotr Drąg <piotrdrag@gmail.com>, 2009.
#
@@ -6,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-23 21:46+0000\n"
-"PO-Revision-Date: 2009-11-24 20:09+0100\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:20:31+0000\n"
"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
"Language-Team: Polish <pl@li.org>\n"
"MIME-Version: 1.0\n"
@@ -15,6 +18,10 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pl\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
@@ -217,7 +224,7 @@ msgstr ""
#: actions/apidirectmessage.php:89
#, php-format
msgid "Direct messages from %s"
-msgstr "Bezpośrednia wiadomość do użytkownika %s"
+msgstr "Bezpośrednie wiadomości do użytkownika %s"
#: actions/apidirectmessage.php:93
#, php-format
@@ -529,7 +536,7 @@ msgstr "Awatar"
#: actions/avatarsettings.php:78
#, php-format
msgid "You can upload your personal avatar. The maximum file size is %s."
-msgstr "Można wysłać swój osobisty awatar. Maksymalny rozmiar pliku to %s."
+msgstr "Można wysłać osobisty awatar. Maksymalny rozmiar pliku to %s."
#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
@@ -569,7 +576,7 @@ msgstr "Przytnij"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -672,7 +679,7 @@ msgstr "Nie"
#: actions/block.php:143 actions/deleteuser.php:147
msgid "Do not block this user"
-msgstr "Odblokuj tego użytkownika"
+msgstr "Nie blokuj tego użytkownika"
#: actions/block.php:144 actions/deletenotice.php:146
#: actions/deleteuser.php:148 actions/groupblock.php:179
@@ -739,7 +746,7 @@ msgid "Conversation"
msgstr "Rozmowa"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Wpisy"
@@ -1154,7 +1161,7 @@ msgstr "Usunięto przychodzący adres e-mail."
msgid "New incoming email address added."
msgstr "Dodano nowy przychodzący adres e-mail."
-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Popularne wpisy"
@@ -1253,23 +1260,23 @@ msgstr "Nasłuchiwany użytkownik nie istnieje."
msgid "You can use the local subscription!"
msgstr "Można używać lokalnej subskrypcji."
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "Ten użytkownik zablokował cię z subskrypcji."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
msgstr "Brak upoważnienia."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
msgid "Could not convert request token to access token."
msgstr "Nie można przekonwertować tokenów żądań na tokeny dostępu."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Zdalna usługa używa nieznanej wersji protokołu OMB."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Błąd podczas aktualizowania zdalnego profilu"
@@ -1473,8 +1480,8 @@ msgstr ""
"Dlaczego nie [zarejestrujesz konta](%%action.register%%) i sam [utworzysz "
"grupę](%%action.newgroup%%)."
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Grupy"
@@ -1555,9 +1562,8 @@ msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
"add %s to your buddy list in your IM client or on GTalk."
msgstr ""
-"Adres Jabber lub GTalk, taki jak \"NazwaUżytkownika@przykład.org\". "
-"Najpierw upewnij się, że dodałeś %s do listy znajomych w komunikatorze lub "
-"na GTalk."
+"Adres Jabber lub GTalk, taki jak \"NazwaUżytkownika@przykład.org\". Najpierw "
+"upewnij się, że dodałeś %s do listy znajomych w komunikatorze lub na GTalk."
#: actions/imsettings.php:143
msgid "Send me notices through Jabber/GTalk."
@@ -1807,53 +1813,53 @@ msgstr "Użytkownik %s opuścił grupę %s"
msgid "Already logged in."
msgstr "Jesteś już zalogowany."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
msgid "Invalid or expired token."
msgstr "Nieprawidłowy lub wygasły token."
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Niepoprawna nazwa użytkownika lub hasło."
-#: actions/login.php:149
+#: actions/login.php:152
msgid "Error setting user. You are probably not authorized."
msgstr "Błąd podczas ustawiania użytkownika. Prawdopodobnie brak upoważnienia."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Zaloguj się"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "Zaloguj się na stronie"
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Pseudonim"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Hasło"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Zapamiętaj mnie"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Automatyczne logowanie. Nie należy używać na komputerach używanych przez "
"wiele osób."
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Zgubione lub zapomniane hasło?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1861,7 +1867,7 @@ msgstr ""
"Z powodów bezpieczeństwa ponownie podaj nazwę użytkownika i hasło przed "
"zmienianiem ustawień."
-#: actions/login.php:286
+#: actions/login.php:289
#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2800,7 +2806,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Adres URL profilu na innej, zgodnej usłudze mikroblogowania"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:356
+#: lib/userprofile.php:365
msgid "Subscribe"
msgstr "Subskrybuj"
@@ -2809,8 +2815,8 @@ msgid "Invalid profile URL (bad format)"
msgstr "Nieprawidłowy adres URL profilu (błędny format)"
#: actions/remotesubscribe.php:168
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+#, fuzzy
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr ""
"To nie jest prawidłowy adres URL profilu (brak dokumentu YADIS lub określono "
"nieprawidłowe XRDS)."
@@ -3003,7 +3009,7 @@ msgid "Members"
msgstr "Członkowie"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(Brak)"
@@ -3012,7 +3018,7 @@ msgstr "(Brak)"
msgid "All members"
msgstr "Wszyscy członkowie"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Statystyki"
@@ -3287,7 +3293,7 @@ msgstr "Dostęp"
#: actions/siteadminpanel.php:334
msgid "Private"
-msgstr "Prywatność"
+msgstr "Prywatna"
#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
@@ -3396,7 +3402,8 @@ msgstr "Ograniczenie duplikatów"
#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-"Ile czasu użytkownicy muszą czekać (w sekundach), aby ponownie wysłać to samo."
+"Ile czasu użytkownicy muszą czekać (w sekundach), aby ponownie wysłać to "
+"samo."
#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
msgid "Save site settings"
@@ -4009,7 +4016,7 @@ msgstr "Zabroniono ci wysyłania wpisów na tej stronie."
msgid "Problem saving notice."
msgstr "Problem podczas zapisywania wpisu."
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Błąd bazy danych podczas wprowadzania odpowiedzi: %s"
@@ -4425,52 +4432,41 @@ msgstr "Włączono powiadomienia."
msgid "Can't turn on notification."
msgstr "Nie można włączyć powiadomień."
-#: lib/command.php:597
-#, php-format
-msgid "Could not create login token for %s"
-msgstr "Nie można utworzyć tokenu logowania dla %s"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-"Ten odnośnik można użyć tylko raz i będzie prawidłowy tylko przez dwie "
-"minuty: %s"
-
-#: lib/command.php:618
+#: lib/command.php:592
msgid "You are not subscribed to anyone."
msgstr "Nie subskrybujesz nikogo."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Subskrybujesz tę osobę:"
msgstr[1] "Subskrybujesz te osoby:"
msgstr[2] "Subskrybujesz te osoby:"
-#: lib/command.php:640
+#: lib/command.php:614
msgid "No one is subscribed to you."
msgstr "Nikt cię nie subskrybuje."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Ta osoba cię subskrybuje:"
msgstr[1] "Te osoby cię subskrybują:"
msgstr[2] "Te osoby cię subskrybują:"
-#: lib/command.php:662
+#: lib/command.php:636
msgid "You are not a member of any groups."
msgstr "Nie jesteś członkiem żadnej grupy."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Jesteś członkiem tej grupy:"
msgstr[1] "Jesteś członkiem tych grup:"
msgstr[2] "Jesteś członkiem tych grup:"
-#: lib/command.php:678
+#: lib/command.php:652
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4489,7 +4485,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4583,8 +4578,8 @@ msgstr "Wyślij plik"
#: lib/designsettings.php:109
msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
-msgstr "Można wysłać swój osobisty obraz. Maksymalny rozmiar pliku to 2 MB."
+"You can upload your personal background image. The maximum file size is 2MB."
+msgstr "Można wysłać osobisty obraz tła. Maksymalny rozmiar pliku to 2 MB."
#: lib/designsettings.php:372
msgid "Bad default color settings: "
@@ -4759,7 +4754,15 @@ msgstr "Utracono plik."
msgid "Unknown file type"
msgstr "Nieznany typ pliku"
-#: lib/jabber.php:192
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr "MB"
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr "KB"
+
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr "[%s]"
@@ -5206,11 +5209,11 @@ msgstr "Błąd podczas wprowadzania zdalnego profilu"
msgid "Duplicate notice"
msgstr "Duplikat wpisu"
-#: lib/oauthstore.php:466 lib/subs.php:48
+#: lib/oauthstore.php:467 lib/subs.php:48
msgid "You have been banned from subscribing."
msgstr "Zablokowano subskrybowanie."
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr "Nie można wprowadzić nowej subskrypcji."
@@ -5247,7 +5250,7 @@ msgstr "Wysłane wiadomości"
msgid "Tags in %s's notices"
msgstr "Znaczniki we wpisach użytkownika %s"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Subskrypcje"
@@ -5255,7 +5258,7 @@ msgstr "Subskrypcje"
msgid "All subscriptions"
msgstr "Wszystkie subskrypcje"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Subskrybenci"
@@ -5263,15 +5266,15 @@ msgstr "Subskrybenci"
msgid "All subscribers"
msgstr "Wszyscy subskrybenci"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr "Identyfikator użytkownika"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Członek od"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "Wszystkie grupy"
@@ -5464,47 +5467,51 @@ msgstr "Wyślij bezpośrednią wiadomość do tego użytkownika"
msgid "Message"
msgstr "Wiadomość"
-#: lib/util.php:826
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr "Moderuj"
+
+#: lib/util.php:825
msgid "a few seconds ago"
msgstr "kilka sekund temu"
-#: lib/util.php:828
+#: lib/util.php:827
msgid "about a minute ago"
msgstr "około minutę temu"
-#: lib/util.php:830
+#: lib/util.php:829
#, php-format
msgid "about %d minutes ago"
msgstr "około %d minut temu"
-#: lib/util.php:832
+#: lib/util.php:831
msgid "about an hour ago"
msgstr "około godzinę temu"
-#: lib/util.php:834
+#: lib/util.php:833
#, php-format
msgid "about %d hours ago"
msgstr "około %d godzin temu"
-#: lib/util.php:836
+#: lib/util.php:835
msgid "about a day ago"
msgstr "blisko dzień temu"
-#: lib/util.php:838
+#: lib/util.php:837
#, php-format
msgid "about %d days ago"
msgstr "około %d dni temu"
-#: lib/util.php:840
+#: lib/util.php:839
msgid "about a month ago"
msgstr "około miesiąc temu"
-#: lib/util.php:842
+#: lib/util.php:841
#, php-format
msgid "about %d months ago"
msgstr "około %d miesięcy temu"
-#: lib/util.php:844
+#: lib/util.php:843
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
deleted file mode 100644
index 516eec1d0..000000000
--- a/locale/pt/LC_MESSAGES/statusnet.mo
+++ /dev/null
Binary files differ
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 5c18e0d09..c5b3c9515 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-22 18:40+0000\n"
-"PO-Revision-Date: 2009-11-22 18:41:01+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:20: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(r59338); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt\n"
"X-Message-Group: out-statusnet\n"
@@ -22,7 +22,7 @@ msgstr ""
#: 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 ""
+msgstr "Página não encontrada."
#: actions/all.php:74 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
@@ -47,12 +47,12 @@ msgstr ""
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
#: lib/subs.php:34 lib/subs.php:116
msgid "No such user."
-msgstr ""
+msgstr "Utilizador não encontrado."
#: actions/all.php:84
-#, fuzzy, php-format
+#, php-format
msgid "%s and friends, page %d"
-msgstr "%s e amigos"
+msgstr "%s e amigos, página %d"
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
@@ -61,25 +61,25 @@ msgid "%s and friends"
msgstr "%s e amigos"
#: actions/all.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
-msgstr "Feed para os amigos de %s"
+msgstr "''Feed'' para amigos de %s (RSS 1.0)"
#: actions/all.php:107
-#, fuzzy, php-format
+#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
-msgstr "Feed para os amigos de %s"
+msgstr "''Feed'' para amigos de %s (RSS 2.0)"
#: actions/all.php:115
-#, fuzzy, php-format
+#, php-format
msgid "Feed for friends of %s (Atom)"
-msgstr "Feed para os amigos de %s"
+msgstr "''Feed'' para amigos de %s (Atom)"
#: actions/all.php:127
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
-msgstr ""
+msgstr "Esta é a cronolinha de %s e amigos, mas ainda não publicaram nada."
#: actions/all.php:132
#, php-format
@@ -87,6 +87,8 @@ msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
"something yourself."
msgstr ""
+"Tente subscrever mais pessoas, [entrar num grupo] (%%action.groups%%) ou "
+"publicar qualquer coisa."
#: actions/all.php:134
#, php-format
@@ -94,6 +96,8 @@ msgid ""
"You can try to [nudge %s](../%s) from his profile or [post something to his "
"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
msgstr ""
+"Tente [acotovelar o(a) %s](../%s) a partir do perfil ou [publicar qualquer "
+"coisa à sua atenção](%%%%action.newnotice%%%%?status_textarea=%s)."
#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
#, php-format
@@ -101,25 +105,25 @@ msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
"post a notice to his or her attention."
msgstr ""
+"Podia [registar uma conta](%%%%action.register%%%%) e depois acotovelar o(a) "
+"%s ou publicar uma nota à sua atenção."
#: actions/all.php:165
-#, fuzzy
msgid "You and friends"
-msgstr "%s e amigos"
+msgstr "Você e amigos"
#: actions/allrss.php:119 actions/apitimelinefriends.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
+msgstr "Actualizações do(a) %1$s e amigos no %2$s!"
#: actions/apiaccountratelimitstatus.php:70
#: actions/apiaccountupdatedeliverydevice.php:93
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountupdateprofile.php:97
-#, fuzzy
msgid "API method not found."
-msgstr "Método da API não encontrado!"
+msgstr "Método da API não encontrado."
#: actions/apiaccountupdatedeliverydevice.php:85
#: actions/apiaccountupdateprofilebackgroundimage.php:86
@@ -132,16 +136,16 @@ msgstr "Método da API não encontrado!"
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
-msgstr ""
+msgstr "Este método requer um POST."
#: actions/apiaccountupdatedeliverydevice.php:105
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none"
msgstr ""
+"Tem de especificar um parâmetro 'device' com um dos valores: sms, im, none"
#: actions/apiaccountupdatedeliverydevice.php:132
-#, fuzzy
msgid "Could not update user."
msgstr "Não foi possível actualizar o utilizador."
@@ -155,19 +159,20 @@ msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
"current configuration."
msgstr ""
+"O servidor não conseguiu processar tantos dados POST (%s bytes) devido à sua "
+"configuração actual."
#: actions/apiaccountupdateprofilebackgroundimage.php:136
#: actions/apiaccountupdateprofilebackgroundimage.php:146
#: actions/apiaccountupdateprofilecolors.php:164
#: actions/apiaccountupdateprofilecolors.php:174
msgid "Unable to save your design settings."
-msgstr ""
+msgstr "Não foi possível gravar as configurações do design."
#: actions/apiaccountupdateprofilebackgroundimage.php:187
#: actions/apiaccountupdateprofilecolors.php:142
-#, fuzzy
msgid "Could not update your design."
-msgstr "Não foi possível actualizar o utilizador."
+msgstr "Não foi possível actualizar o seu design."
#: actions/apiaccountupdateprofilebackgroundimage.php:194
#: actions/apiaccountupdateprofilecolors.php:185
@@ -176,57 +181,57 @@ msgstr "Não foi possível actualizar o utilizador."
#: 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 ""
+msgstr "Utilizador não tem perfil."
#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
msgid "Could not save profile."
-msgstr "Não foi possível salvar o perfil."
+msgstr "Não foi possível gravar o perfil."
#: actions/apiblockcreate.php:108
msgid "Block user failed."
-msgstr ""
+msgstr "Bloqueio do utilizador falhou."
#: actions/apiblockdestroy.php:107
msgid "Unblock user failed."
-msgstr ""
+msgstr "Desbloqueio do utilizador falhou."
#: actions/apidirectmessagenew.php:126
msgid "No message text!"
-msgstr ""
+msgstr "Mensagem não tem texto!"
#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
-msgstr ""
+msgstr "Demasiado longo. Tamanho máx. das mensagens é %d caracteres."
#: actions/apidirectmessagenew.php:146
msgid "Recipient user not found."
-msgstr ""
+msgstr "Destinatário não encontrado."
#: actions/apidirectmessagenew.php:150
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
+"Não pode enviar mensagens directas a utilizadores que não sejam amigos."
#: actions/apidirectmessage.php:89
#, php-format
msgid "Direct messages from %s"
-msgstr ""
+msgstr "Mensagens directas do(a) %s"
#: actions/apidirectmessage.php:93
#, php-format
msgid "All the direct messages sent from %s"
-msgstr ""
+msgstr "Todas as mensagens directas enviadas por %s"
#: actions/apidirectmessage.php:101
#, php-format
msgid "Direct messages to %s"
-msgstr ""
+msgstr "Mensagens directas para %s"
#: actions/apidirectmessage.php:105
#, php-format
msgid "All the direct messages sent to %s"
-msgstr ""
+msgstr "Todas as mensagens directas enviadas para %s"
#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
@@ -252,19 +257,19 @@ msgstr "Nenhum estado encontrado com esse ID."
#: actions/apifavoritecreate.php:119
msgid "This status is already a favorite!"
-msgstr ""
+msgstr "Este estado já é um favorito!"
#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
msgid "Could not create favorite."
-msgstr ""
+msgstr "Não foi possível criar o favorito."
#: actions/apifavoritedestroy.php:122
msgid "That status is not a favorite!"
-msgstr ""
+msgstr "Esse estado não é um favorito!"
#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
msgid "Could not delete favorite."
-msgstr ""
+msgstr "Não foi possível eliminar o favorito."
#: actions/apifriendshipscreate.php:109
msgid "Could not follow user: User not found."
@@ -286,7 +291,7 @@ msgstr "Não pode deixar de seguir-se a si próprio!"
#: actions/apifriendshipsexists.php:94
msgid "Two user ids or screen_names must be supplied."
-msgstr ""
+msgstr "Devem ser fornecidos dois nomes de utilizador ou alcunhas."
#: actions/apifriendshipsshow.php:135
msgid "Could not determine source user."
@@ -306,181 +311,179 @@ msgstr "Alcunha só deve conter letras minúsculas e números. Sem espaços."
#: actions/newgroup.php:130 actions/profilesettings.php:231
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
-msgstr "Alcunha já é usada. Tente outra diferente."
+msgstr "Alcunha já é usada. Tente outra."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
#: actions/newgroup.php:133 actions/profilesettings.php:211
#: actions/register.php:210
msgid "Not a valid nickname."
-msgstr ""
+msgstr "Alcunha não é válida."
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
#: actions/newgroup.php:139 actions/profilesettings.php:215
#: actions/register.php:217
msgid "Homepage is not a valid URL."
-msgstr "A página de início não é uma URL válida."
+msgstr "Página de acolhimento não é uma URL válida."
#: actions/apigroupcreate.php:205 actions/editgroup.php:198
#: actions/newgroup.php:142 actions/profilesettings.php:218
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
-msgstr "Nome completo é demasiado longo (máx. 255 caracteres)."
+msgstr "Nome completo demasiado longo (máx. 255 caracteres)."
#: actions/apigroupcreate.php:213
-#, fuzzy, php-format
+#, php-format
msgid "Description is too long (max %d chars)."
-msgstr "Bio é demasiada extensa (máx 140 car)."
+msgstr "Descrição demasiado longa (máx. 140 caracteres)."
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
#: actions/newgroup.php:148 actions/profilesettings.php:225
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
-msgstr "Localidade é muito longa (máx. 255 caracteres)."
+msgstr "Localidade demasiado longa (máx. 255 caracteres)."
#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
-msgstr ""
+msgstr "Demasiados cognomes (máx. %d)."
#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
-#, fuzzy, php-format
+#, php-format
msgid "Invalid alias: \"%s\""
-msgstr "Endereço de email inválido: %s"
+msgstr "Cognome inválido: \"%s\""
#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
-#, fuzzy, php-format
+#, php-format
msgid "Alias \"%s\" already in use. Try another one."
-msgstr "Alcunha já em uso. Tente outra diferente."
+msgstr "Cognome \"%s\" já é usado. Tente outro."
#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
-msgstr ""
+msgstr "Os cognomes não podem ser iguais à alcunha."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
-#, fuzzy
msgid "Group not found!"
-msgstr "Método da API não encontrado!"
+msgstr "Grupo não foi encontrado!"
#: actions/apigroupjoin.php:110
msgid "You are already a member of that group."
-msgstr ""
+msgstr "Já é membro desse grupo."
#: 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 "Foi bloqueado desse grupo pelo administrador."
#: actions/apigroupjoin.php:138
-#, fuzzy, php-format
+#, php-format
msgid "Could not join user %s to group %s."
-msgstr "Não foi possível seguir utilizador: Utilizador não encontrado."
+msgstr "Não foi possível adicionar %s ao grupo %s."
#: actions/apigroupleave.php:114
msgid "You are not a member of this group."
-msgstr ""
+msgstr "Não é membro deste grupo."
#: actions/apigroupleave.php:124
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %s to group %s."
-msgstr "Não foi possível seguir utilizador: Utilizador não encontrado."
+msgstr "Não foi possível remover %s do grupo %s."
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
-msgstr ""
+msgstr "Grupos do(a) %s"
#: actions/apigrouplistall.php:94
#, php-format
msgid "groups on %s"
-msgstr ""
+msgstr "Grupos em %s"
#: actions/apigrouplist.php:95
#, php-format
msgid "%s's groups"
-msgstr ""
+msgstr "Grupos de %s"
#: actions/apigrouplist.php:103
#, php-format
msgid "Groups %s is a member of on %s."
-msgstr ""
+msgstr "Grupos de que %s é membro em %s."
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
-msgstr ""
+msgstr "Este método requer um POST ou DELETE."
#: actions/apistatusesdestroy.php:130
msgid "You may not delete another user's status."
-msgstr ""
+msgstr "Não pode apagar o estado de outro utilizador."
#: actions/apistatusesshow.php:138
-#, fuzzy
msgid "Status deleted."
-msgstr "Avatar actualizado."
+msgstr "Estado apagado."
#: actions/apistatusesshow.php:144
msgid "No status with that ID found."
-msgstr "Nenhum estado com esse ID encontrado."
+msgstr "Não foi encontrado um estado com esse ID."
#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
#, php-format
msgid "That's too long. Max notice size is %d chars."
-msgstr ""
+msgstr "Demasiado longo. Tamanho máx. das notas é %d caracteres."
#: actions/apistatusesupdate.php:198
msgid "Not found"
-msgstr ""
+msgstr "Não encontrado"
#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
-msgstr ""
+msgstr "Tamanho máx. das notas é %d caracteres, incluíndo a URL do anexo."
#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
msgid "Unsupported format."
-msgstr ""
+msgstr "Formato não suportado."
#: actions/apitimelinefavorites.php:107
#, php-format
msgid "%s / Favorites from %s"
-msgstr ""
+msgstr "%s / Favoritas de %s"
#: actions/apitimelinefavorites.php:119
#, php-format
msgid "%s updates favorited by %s / %s."
-msgstr ""
+msgstr "%s actualizações preferidas por %s / %s"
#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
#: actions/grouprss.php:131 actions/userrss.php:90
#, php-format
msgid "%s timeline"
-msgstr "Mensagens de %s"
+msgstr "cronolinha de %s"
#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
-msgstr ""
+msgstr "Actualizações de %1#s a %2$s!"
#: actions/apitimelinementions.php:116
-#, fuzzy, php-format
+#, php-format
msgid "%1$s / Updates mentioning %2$s"
-msgstr "%1$s / Actualizações em resposta a %2$s"
+msgstr "%1$s / Actualizações que mencionam %2$s"
#: actions/apitimelinementions.php:126
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "Updates de %1$s como resposta às actualizações de %2$s / %3$s."
+msgstr "%1$s actualizações em resposta a actualizações de %2$s / %3$s."
#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
-msgstr "Mensagens públicas de %s"
+msgstr "Cronolinha pública de %s"
#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
#, php-format
@@ -490,20 +493,20 @@ msgstr "%s actualizações de todos!"
#: actions/apitimelinetag.php:101 actions/tag.php:66
#, php-format
msgid "Notices tagged with %s"
-msgstr ""
+msgstr "Notas categorizadas com %s"
#: actions/apitimelinetag.php:107 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
-msgstr ""
+msgstr "Actualizações categorizadas com %1$s em %2$s!"
#: actions/apiusershow.php:96
msgid "Not found."
-msgstr ""
+msgstr "Não encontrado."
#: actions/attachment.php:73
msgid "No such attachment."
-msgstr ""
+msgstr "Anexo não encontrado."
#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
msgid "No nickname."
@@ -511,7 +514,7 @@ msgstr "Nenhuma alcunha."
#: actions/avatarbynickname.php:64
msgid "No size."
-msgstr ""
+msgstr "Tamanho não definido."
#: actions/avatarbynickname.php:69
msgid "Invalid size."
@@ -525,47 +528,47 @@ msgstr "Avatar"
#: actions/avatarsettings.php:78
#, php-format
msgid "You can upload your personal avatar. The maximum file size is %s."
-msgstr ""
+msgstr "Pode carregar o seu avatar pessoal. O tamanho máximo do ficheiro é %s."
#: 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 ""
+msgstr "Utilizador sem perfil correspondente"
#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
#: actions/grouplogo.php:251
msgid "Avatar settings"
-msgstr ""
+msgstr "Configurações do avatar"
#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
#: actions/grouplogo.php:199 actions/grouplogo.php:259
msgid "Original"
-msgstr ""
+msgstr "Original"
#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
#: actions/grouplogo.php:210 actions/grouplogo.php:271
msgid "Preview"
-msgstr ""
+msgstr "Antever"
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
#: lib/noticelist.php:550
msgid "Delete"
-msgstr ""
+msgstr "Apagar"
#: actions/avatarsettings.php:165 actions/grouplogo.php:233
msgid "Upload"
-msgstr ""
+msgstr "Carregar"
#: actions/avatarsettings.php:228 actions/grouplogo.php:286
msgid "Crop"
-msgstr ""
+msgstr "Cortar"
#: actions/avatarsettings.php:265 actions/disfavor.php:74
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -575,21 +578,22 @@ msgstr ""
#: actions/userauthorization.php:52 lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr ""
+"Ocorreu um problema com a sua chave de sessão. Por favor, tente novamente."
#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
#: actions/emailsettings.php:256 actions/grouplogo.php:319
#: actions/imsettings.php:220 actions/recoverpassword.php:44
#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
-msgstr ""
+msgstr "Envio inesperado de formulário."
#: actions/avatarsettings.php:322
msgid "Pick a square area of the image to be your avatar"
-msgstr ""
+msgstr "Escolha uma área quadrada da imagem para ser o seu avatar"
#: actions/avatarsettings.php:337 actions/grouplogo.php:377
msgid "Lost our file data."
-msgstr ""
+msgstr "Perdi os dados do nosso ficheiro."
#: actions/avatarsettings.php:360
msgid "Avatar updated."
@@ -600,42 +604,40 @@ msgid "Failed updating avatar."
msgstr "Falha ao actualizar avatar."
#: actions/avatarsettings.php:387
-#, fuzzy
msgid "Avatar deleted."
-msgstr "Avatar actualizado."
+msgstr "Avatar apagado."
#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
#: actions/groupmembers.php:76 actions/grouprss.php:91
#: actions/joingroup.php:76 actions/showgroup.php:121
msgid "No nickname"
-msgstr ""
+msgstr "Sem alcunha"
#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
msgid "No such group"
-msgstr ""
+msgstr "Grupo não existe"
#: actions/blockedfromgroup.php:90
#, php-format
msgid "%s blocked profiles"
-msgstr ""
+msgstr "%s perfis bloqueados"
#: actions/blockedfromgroup.php:93
-#, fuzzy, php-format
+#, php-format
msgid "%s blocked profiles, page %d"
-msgstr "%s e amigos"
+msgstr "%s perfis bloqueados, página %d"
#: actions/blockedfromgroup.php:108
msgid "A list of the users blocked from joining this group."
-msgstr ""
+msgstr "Uma lista dos utilizadores com entrada bloqueada neste grupo."
#: actions/blockedfromgroup.php:281
-#, fuzzy
msgid "Unblock user from group"
-msgstr "Desbloquear este utilizador"
+msgstr "Desbloquear utilizador do grupo"
#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
@@ -646,13 +648,12 @@ msgid "Unblock this user"
msgstr "Desbloquear este utilizador"
#: actions/block.php:69
-#, fuzzy
msgid "You already blocked that user."
-msgstr "Desbloquear este utilizador"
+msgstr "Já bloqueou esse utilizador."
#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
msgid "Block user"
-msgstr ""
+msgstr "Bloquear utilizador"
#: actions/block.php:130
msgid ""
@@ -660,6 +661,9 @@ msgid ""
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
+"Tem a certeza de que quer bloquear este utilizador? Após o bloqueio, a sua "
+"subscrição por este utilizador será cancelada, ele não poderá subscrevê-lo "
+"de futuro e você não receberá notificações das @-respostas dele."
#: actions/block.php:143 actions/deletenotice.php:145
#: actions/deleteuser.php:147 actions/groupblock.php:178
@@ -667,30 +671,29 @@ msgid "No"
msgstr "Não"
#: actions/block.php:143 actions/deleteuser.php:147
-#, fuzzy
msgid "Do not block this user"
-msgstr "Desbloquear este utilizador"
+msgstr "Não bloquear este utilizador"
#: actions/block.php:144 actions/deletenotice.php:146
#: actions/deleteuser.php:148 actions/groupblock.php:179
msgid "Yes"
-msgstr ""
+msgstr "Sim"
#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
msgid "Block this user"
-msgstr ""
+msgstr "Bloquear este utilizador"
#: actions/block.php:162
msgid "Failed to save block information."
-msgstr ""
+msgstr "Não foi possível gravar informação do bloqueio."
#: actions/bookmarklet.php:50
msgid "Post to "
-msgstr ""
+msgstr "Publicar em "
#: actions/confirmaddress.php:75
msgid "No confirmation code."
-msgstr ""
+msgstr "Sem código de confimação."
#: actions/confirmaddress.php:80
msgid "Confirmation code not found."
@@ -698,16 +701,16 @@ msgstr "Código de confirmação não encontrado"
#: actions/confirmaddress.php:85
msgid "That confirmation code is not for you!"
-msgstr ""
+msgstr "Esse código de confirmação não é para si!"
#: actions/confirmaddress.php:90
#, php-format
msgid "Unrecognized address type %s"
-msgstr ""
+msgstr "Tipo do endereço %s não reconhecido"
#: actions/confirmaddress.php:94
msgid "That address has already been confirmed."
-msgstr ""
+msgstr "Esse endereço já tinha sido confirmado."
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
@@ -720,7 +723,7 @@ msgstr "Não foi possível actualizar o utilizador."
#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
-msgstr "Não foi possível apagar a confirmação do email."
+msgstr "Não foi possível apagar a confirmação do endereço electrónico."
#: actions/confirmaddress.php:144
msgid "Confirm Address"
@@ -729,21 +732,20 @@ msgstr "Confirmar Endereço"
#: actions/confirmaddress.php:159
#, php-format
msgid "The address \"%s\" has been confirmed for your account."
-msgstr ""
+msgstr "O endereço \"%s\" foi confirmado para a sua conta."
#: actions/conversation.php:99
-#, fuzzy
msgid "Conversation"
-msgstr "Código de confirmação"
+msgstr "Conversação"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
-msgstr ""
+msgstr "Notas"
#: actions/deletenotice.php:52 actions/shownotice.php:92
msgid "No such notice."
-msgstr ""
+msgstr "Nota não encontrada."
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -752,117 +754,111 @@ msgstr ""
#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
#: lib/profileformaction.php:63 lib/settingsaction.php:72
msgid "Not logged in."
-msgstr ""
+msgstr "Não iniciou sessão."
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
-msgstr "Não é possível remover a mensagem."
+msgstr "Nota não pode ser apagada."
#: actions/deletenotice.php:103
-#, fuzzy
msgid ""
"You are about to permanently delete a notice. Once this is done, it cannot "
"be undone."
-msgstr "Tem a certeza que permite remover esta mensagem?"
+msgstr ""
+"Está prestes a apagar permamentemente uma nota. Esta acção não pode ser "
+"desfeita."
#: actions/deletenotice.php:109 actions/deletenotice.php:141
msgid "Delete notice"
-msgstr "Apagar mensagem"
+msgstr "Apagar nota"
#: actions/deletenotice.php:144
msgid "Are you sure you want to delete this notice?"
-msgstr "Tem a certeza que permite remover esta mensagem?"
+msgstr "Tem a certeza de que quer apagar esta nota?"
#: actions/deletenotice.php:145
-#, fuzzy
msgid "Do not delete this notice"
-msgstr "Não é possível remover a mensagem."
+msgstr "Não apagar esta nota"
#: actions/deletenotice.php:146 lib/noticelist.php:550
-#, fuzzy
msgid "Delete this notice"
-msgstr "Não é possível remover a mensagem."
+msgstr "Apagar esta nota"
#: actions/deletenotice.php:157
msgid "There was a problem with your session token. Try again, please."
msgstr ""
+"Ocorreu um problema com o seu código de sessão. Tente novamente, por favor."
#: actions/deleteuser.php:67
-#, fuzzy
msgid "You cannot delete users."
-msgstr "Não foi possível actualizar o utilizador."
+msgstr "Não pode apagar utilizadores."
#: actions/deleteuser.php:74
msgid "You can only delete local users."
-msgstr ""
+msgstr "Só pode apagar utilizadores locais."
#: actions/deleteuser.php:110 actions/deleteuser.php:133
-#, fuzzy
msgid "Delete user"
-msgstr "Apagar mensagem"
+msgstr "Apagar utilizador"
#: actions/deleteuser.php:135
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
msgstr ""
+"Tem a certeza de que quer apagar este utilizador? Todos os dados do "
+"utilizador serão eliminados da base de dados, sem haver cópias."
#: actions/deleteuser.php:148 lib/deleteuserform.php:77
-#, fuzzy
msgid "Delete this user"
-msgstr "Não é possível remover a mensagem."
+msgstr "Apagar este utilizador"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
-msgstr ""
+msgstr "Design"
#: actions/designadminpanel.php:73
msgid "Design settings for this StatusNet site."
-msgstr ""
+msgstr "Configurações do design deste site StatusNet."
#: actions/designadminpanel.php:270
-#, fuzzy
msgid "Invalid logo URL."
-msgstr "Tamanho inválido."
+msgstr "URL do logótipo inválida."
#: actions/designadminpanel.php:274
#, php-format
msgid "Theme not available: %s"
-msgstr ""
+msgstr "Tema não está disponível: %s"
#: actions/designadminpanel.php:370
-#, fuzzy
msgid "Change logo"
-msgstr "Modificar a sua palavra-passe"
+msgstr "Alterar logótipo"
#: actions/designadminpanel.php:375
-#, fuzzy
msgid "Site logo"
-msgstr "Convidar"
+msgstr "Logótipo do site"
#: actions/designadminpanel.php:382
-#, fuzzy
msgid "Change theme"
-msgstr "Modificar"
+msgstr "Alterar tema"
#: actions/designadminpanel.php:399
-#, fuzzy
msgid "Site theme"
-msgstr "Modificar"
+msgstr "Tema do site"
#: actions/designadminpanel.php:400
msgid "Theme for the site."
-msgstr ""
+msgstr "O tema para o site."
#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
-msgstr ""
+msgstr "Alterar imagem de fundo"
#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
-msgstr ""
+msgstr "Imagem de fundo"
#: actions/designadminpanel.php:422
#, php-format
@@ -870,6 +866,8 @@ msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr ""
+"Pode carregar uma imagem de fundo para o site. O tamanho máximo do ficheiro "
+"é %1$s."
#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
@@ -885,42 +883,39 @@ msgstr ""
#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
-msgstr ""
+msgstr "Repetir imagem de fundo em mosaico"
#: actions/designadminpanel.php:483 lib/designsettings.php:170
-#, fuzzy
msgid "Change colours"
-msgstr "Modificar a sua palavra-passe"
+msgstr "Alterar cores"
#: actions/designadminpanel.php:505 lib/designsettings.php:191
-#, fuzzy
msgid "Content"
-msgstr "Ligar"
+msgstr "Conteúdo"
#: actions/designadminpanel.php:518 lib/designsettings.php:204
msgid "Sidebar"
-msgstr ""
+msgstr "Barra lateral"
#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
-msgstr ""
+msgstr "Texto"
#: actions/designadminpanel.php:544 lib/designsettings.php:230
-#, fuzzy
msgid "Links"
-msgstr "Entrar"
+msgstr "Ligações"
#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
-msgstr ""
+msgstr "Usar predefinições"
#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
-msgstr ""
+msgstr "Repor designs predefinidos"
#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
-msgstr ""
+msgstr "Repor predefinição"
#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
@@ -930,68 +925,67 @@ msgstr ""
#: actions/useradminpanel.php:313 lib/designsettings.php:256
#: lib/groupeditform.php:202
msgid "Save"
-msgstr ""
+msgstr "Gravar"
#: actions/designadminpanel.php:582 lib/designsettings.php:257
msgid "Save design"
-msgstr ""
+msgstr "Gravar o design"
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
-msgstr ""
+msgstr "Esta nota não é uma favorita!"
#: actions/disfavor.php:94
msgid "Add to favorites"
-msgstr ""
+msgstr "Adicionar às favoritas"
#: actions/doc.php:69
msgid "No such document."
-msgstr ""
+msgstr "Documento não encontrado."
#: actions/editgroup.php:56
#, php-format
msgid "Edit %s group"
-msgstr ""
+msgstr "Editar grupo %s"
#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
msgid "You must be logged in to create a group."
-msgstr ""
+msgstr "Tem de iniciar uma sessão para criar o grupo."
#: actions/editgroup.php:103 actions/editgroup.php:168
#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
msgid "You must be an admin to edit the group"
-msgstr ""
+msgstr "Tem de ser administrador para editar o grupo"
#: actions/editgroup.php:154
msgid "Use this form to edit the group."
-msgstr ""
+msgstr "Use este formulário para editar o grupo."
#: actions/editgroup.php:201 actions/newgroup.php:145
-#, fuzzy, php-format
+#, php-format
msgid "description is too long (max %d chars)."
-msgstr "Bio é demasiada extensa (máx 140 car)."
+msgstr "descrição é demasiada extensa (máx. 140 caracteres)."
#: actions/editgroup.php:253
msgid "Could not update group."
-msgstr ""
+msgstr "Não foi possível actualizar o grupo."
#: actions/editgroup.php:259 classes/User_group.php:390
-#, fuzzy
msgid "Could not create aliases."
-msgstr "Não foi possível criar o formulário de OpenID: %s"
+msgstr "Não foi possível criar cognomes."
#: actions/editgroup.php:269
msgid "Options saved."
-msgstr ""
+msgstr "Opções gravadas."
#: actions/emailsettings.php:60
msgid "Email Settings"
-msgstr "Definições do Email"
+msgstr "Configurações do correio electrónico"
#: actions/emailsettings.php:71
#, php-format
msgid "Manage how you get email from %%site.name%%."
-msgstr ""
+msgstr "Defina como receberá mensagens electrónicas do site %%site.name%%."
#: actions/emailsettings.php:100 actions/imsettings.php:100
#: actions/smssettings.php:104
@@ -1000,21 +994,21 @@ msgstr "Endereço"
#: actions/emailsettings.php:105
msgid "Current confirmed email address."
-msgstr "Endereço de email já confirmado."
+msgstr "Endereço de correio já confirmado."
#: actions/emailsettings.php:107 actions/emailsettings.php:140
#: actions/imsettings.php:108 actions/smssettings.php:115
#: actions/smssettings.php:158
msgid "Remove"
-msgstr ""
+msgstr "Remover"
#: actions/emailsettings.php:113
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
msgstr ""
-"A aguardar confirmação deste endereço. Procure na sua 'Caixa de Entrada' (e "
-"caixa de spam) pela mensagem com as instrucções."
+"A aguardar a confirmação deste endereço. Procure na sua caixa de entrada (e "
+"na caixa de spam!) uma mensagem com mais instruções."
#: actions/emailsettings.php:117 actions/imsettings.php:120
#: actions/smssettings.php:126
@@ -1023,11 +1017,12 @@ msgstr "Cancelar"
#: actions/emailsettings.php:121
msgid "Email Address"
-msgstr "Endereço de Email"
+msgstr "Endereço electrónico"
#: actions/emailsettings.php:123
msgid "Email address, like \"UserName@example.org\""
-msgstr "Endereço de Email, como \"nomedeutilizador@exemplo.org\""
+msgstr ""
+"Endereço de correio electrónico, por ex. \"nomedeutilizador@exemplo.org\""
#: actions/emailsettings.php:126 actions/imsettings.php:133
#: actions/smssettings.php:145
@@ -1036,15 +1031,15 @@ msgstr "Adicionar"
#: actions/emailsettings.php:133 actions/smssettings.php:152
msgid "Incoming email"
-msgstr "Email a receber"
+msgstr "Correio recebido"
#: actions/emailsettings.php:138 actions/smssettings.php:157
msgid "Send email to this address to post new notices."
-msgstr ""
+msgstr "Envie mensagens electrónicas para este endereço para publicar notas."
#: actions/emailsettings.php:145 actions/smssettings.php:162
msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
+msgstr "Crie um endereço electrónico novo para publicações; cancela o antigo."
#: actions/emailsettings.php:148 actions/smssettings.php:164
msgid "New"
@@ -1053,60 +1048,64 @@ msgstr "Novo"
#: actions/emailsettings.php:153 actions/imsettings.php:139
#: actions/smssettings.php:169
msgid "Preferences"
-msgstr ""
+msgstr "Preferências"
#: actions/emailsettings.php:158
msgid "Send me notices of new subscriptions through email."
-msgstr ""
+msgstr "Enviem-me notificação electrónica das novas subscrições."
#: actions/emailsettings.php:163
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
+"Enviem-me notificação electrónica quando uma nota minha é adicionada às "
+"favoritas."
#: actions/emailsettings.php:169
msgid "Send me email when someone sends me a private message."
msgstr ""
+"Enviem-me notificação electrónica quando me enviarem uma mensagem privada."
#: actions/emailsettings.php:174
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr ""
+"Enviem-me notificação electrónica quando me enviarem uma \"@-resposta\"."
#: actions/emailsettings.php:179
msgid "Allow friends to nudge me and send me an email."
-msgstr ""
+msgstr "Permitir que amigos me acotovelem e enviem mensagens electrónicas."
#: actions/emailsettings.php:185
msgid "I want to post notices by email."
-msgstr "Quero postar mensagens por email."
+msgstr "Quero publicar notas por correio electrónico."
#: actions/emailsettings.php:191
msgid "Publish a MicroID for my email address."
-msgstr ""
+msgstr "Publicar uma MicroID para o meu endereço electrónico."
#: actions/emailsettings.php:302 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
-msgstr ""
+msgstr "Preferências gravadas."
#: actions/emailsettings.php:320
msgid "No email address."
-msgstr ""
+msgstr "Sem endereço de correio electrónico."
#: actions/emailsettings.php:327
msgid "Cannot normalize that email address"
-msgstr "Não é possível normalizar esse endereço de email"
+msgstr "Não é possível normalizar esse endereço electrónico"
#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
msgid "Not a valid email address"
-msgstr ""
+msgstr "Endereço electrónico inválido."
#: actions/emailsettings.php:334
msgid "That is already your email address."
-msgstr ""
+msgstr "Esse já é o seu endereço electrónico."
#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
-msgstr ""
+msgstr "Esse endereço electrónico já pertence a outro utilizador."
#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
@@ -1118,9 +1117,9 @@ 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 ""
-"Um código de confirmação foi enviado para o endereço de email fornecido. "
-"Procure na sua 'Caixa de Entrada' (e caixa de spam) pelo email com o código "
-"e instrucções de utilização."
+"Um código de confirmação foi enviado para o correio electrónico que "
+"forneceu. Procure na caixa de entrada (e na caixa de spam!) o código e as "
+"respectivas instruções de utilização."
#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
@@ -1129,7 +1128,7 @@ msgstr "Nenhuma confirmação pendente para cancelar."
#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
-msgstr ""
+msgstr "Esse endereço de mensagens instantâneas está errado."
#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
@@ -1138,16 +1137,16 @@ msgstr "Confirmação cancelada."
#: actions/emailsettings.php:413
msgid "That is not your email address."
-msgstr ""
+msgstr "Esse não é o seu endereço electrónico."
#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
-msgstr ""
+msgstr "O endereço foi removido."
#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
-msgstr ""
+msgstr "Sem endereço electrónico de entrada."
#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
@@ -1156,35 +1155,38 @@ msgstr "Não foi possível actualizar o registo do utilizador."
#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
-msgstr "O endereço de email de recepção removido."
+msgstr "Endereço electrónico de entrada foi removido."
#: actions/emailsettings.php:481 actions/smssettings.php:555
msgid "New incoming email address added."
-msgstr ""
+msgstr "Adicionado endereço electrónico de entrada novo."
-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
#: lib/publicgroupnav.php:93
msgid "Popular notices"
-msgstr ""
+msgstr "Notas populares"
#: actions/favorited.php:67
#, php-format
msgid "Popular notices, page %d"
-msgstr ""
+msgstr "Notas populares, página %d"
#: actions/favorited.php:79
msgid "The most popular notices on the site right now."
-msgstr ""
+msgstr "As notas mais populares do site neste momento."
#: actions/favorited.php:150
msgid "Favorite notices appear on this page but no one has favorited one yet."
msgstr ""
+"As notas favoritas aparecem nesta página, mas ninguém elegeu nenhuma ainda."
#: 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 ""
+"Seja a primeira pessoa a adicionar uma nota às favoritas, clicando o botão "
+"de favorecimento correspondente a uma nota de que goste."
#: actions/favorited.php:156
#, php-format
@@ -1192,90 +1194,88 @@ msgid ""
"Why not [register an account](%%action.register%%) and be the first to add a "
"notice to your favorites!"
msgstr ""
+"Podia [registar uma conta](%%action.register%%) e ser o primeiro a adicionar "
+"uma nota às favoritas!"
#: actions/favoritesrss.php:111 actions/showfavorites.php:77
#: lib/personalgroupnav.php:115
#, php-format
msgid "%s's favorite notices"
-msgstr ""
+msgstr "Notas favoritas do(a) %s"
#: actions/favoritesrss.php:115
#, php-format
msgid "Updates favored by %1$s on %2$s!"
-msgstr ""
+msgstr "Actualizações favorecidas por %1$s em %2$s!"
#: actions/favor.php:79
msgid "This notice is already a favorite!"
-msgstr ""
+msgstr "Esta nota já é uma favorita!"
#: actions/favor.php:92 lib/disfavorform.php:140
msgid "Disfavor favorite"
-msgstr ""
+msgstr "Desfavorecer favorita"
#: actions/featured.php:69 lib/featureduserssection.php:87
#: lib/publicgroupnav.php:89
msgid "Featured users"
-msgstr ""
+msgstr "Utilizadores em destaque"
#: actions/featured.php:71
#, php-format
msgid "Featured users, page %d"
-msgstr ""
+msgstr "utilizadores em destaque, página %d"
#: actions/featured.php:99
#, php-format
msgid "A selection of some of the great users on %s"
-msgstr ""
+msgstr "Uma selecção de alguns utilizadores excelentes em %s"
#: actions/file.php:34
-#, fuzzy
msgid "No notice id"
-msgstr "URI da mensagem inválido"
+msgstr "Sem ID de nota"
#: actions/file.php:38
-#, fuzzy
msgid "No notice"
-msgstr "Nenhuma alcunha."
+msgstr "Sem notas"
#: actions/file.php:42
msgid "No attachments"
-msgstr ""
+msgstr "Sem anexos"
#: actions/file.php:51
msgid "No uploaded attachments"
-msgstr ""
+msgstr "Sem anexos carregados"
#: actions/finishremotesubscribe.php:69
msgid "Not expecting this response!"
-msgstr ""
+msgstr "Não esperava esta resposta!"
#: actions/finishremotesubscribe.php:80
msgid "User being listened to does not exist."
-msgstr ""
+msgstr "O utilizador que está a escutar não existe."
#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
msgid "You can use the local subscription!"
-msgstr ""
+msgstr "Pode usar a subscrição local!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
-msgstr ""
+msgstr "Esse utilizador bloqueou-o, impedindo que o subscreva."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
-msgstr ""
+msgstr "Não tem autorização."
-#: actions/finishremotesubscribe.php:109
-#, fuzzy
+#: actions/finishremotesubscribe.php:113
msgid "Could not convert request token to access token."
-msgstr ""
-"Não foi possível converter os tokens de requisição em tokens de acesso."
+msgstr "Não foi possível converter a chave de pedido numa chave de acesso."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
msgid "Remote service uses unknown version of OMB protocol."
-msgstr ""
+msgstr "Serviço remoto usa uma versão desconhecida do protocolo OMB."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Erro ao actualizar o perfil remoto"
@@ -1283,50 +1283,48 @@ msgstr "Erro ao actualizar o perfil remoto"
#: 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 ""
+msgstr "Grupo não foi encontrado."
#: actions/getfile.php:75
msgid "No such file."
-msgstr ""
+msgstr "Ficheiro não foi encontrado."
#: actions/getfile.php:79
-#, fuzzy
msgid "Cannot read file."
-msgstr "Não foi possível salvar o perfil."
+msgstr "Não foi possível ler o ficheiro."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
#: lib/profileformaction.php:70
msgid "No profile specified."
-msgstr ""
+msgstr "Não foi especificado um perfil."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
#: lib/profileformaction.php:77
msgid "No profile with that ID."
-msgstr ""
+msgstr "Não foi encontrado um perfil com essa identificação."
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
msgid "No group specified."
-msgstr ""
+msgstr "Não foi especificado um grupo."
#: actions/groupblock.php:91
msgid "Only an admin can block group members."
-msgstr ""
+msgstr "Só um administrador pode bloquear membros de um grupo."
#: actions/groupblock.php:95
-#, fuzzy
msgid "User is already blocked from group."
-msgstr "O utilizador bloqueou-o."
+msgstr "Acesso do utilizador ao grupo já foi bloqueado."
#: actions/groupblock.php:100
msgid "User is not a member of group."
-msgstr ""
+msgstr "Utilizador não é membro do grupo."
#: actions/groupblock.php:136 actions/groupmembers.php:314
msgid "Block user from group"
-msgstr ""
+msgstr "Bloquear acesso do utilizador ao grupo"
#: actions/groupblock.php:162
#, php-format
@@ -1335,93 +1333,98 @@ msgid ""
"be removed from the group, unable to post, and unable to subscribe to the "
"group in the future."
msgstr ""
+"Tem a certeza de que quer bloquear o acesso do utilizador \"%s\" ao grupo \"%"
+"s\"? Ele será removido do grupo, impossibilitado de publicar e "
+"impossibilitado de subscrever o grupo no futuro."
#: actions/groupblock.php:178
msgid "Do not block this user from this group"
-msgstr ""
+msgstr "Não bloquear acesso deste utilizador a este grupo"
#: actions/groupblock.php:179
msgid "Block this user from this group"
-msgstr ""
+msgstr "Bloquear acesso deste utilizador a este grupo"
#: actions/groupblock.php:196
msgid "Database error blocking user from group."
-msgstr ""
+msgstr "Erro na base de dados ao bloquear acesso do utilizador ao grupo."
#: actions/groupbyid.php:74
msgid "No ID"
-msgstr ""
+msgstr "Sem ID"
#: actions/groupdesignsettings.php:68
msgid "You must be logged in to edit a group."
-msgstr ""
+msgstr "Precisa de iniciar sessão para editar um grupo."
#: actions/groupdesignsettings.php:141
msgid "Group design"
-msgstr ""
+msgstr "Design do grupo"
#: actions/groupdesignsettings.php:152
msgid ""
"Customize the way your group looks with a background image and a colour "
"palette of your choice."
msgstr ""
+"Personalize o aspecto do seu grupo com uma imagem de fundo e uma paleta de "
+"cores à sua escolha."
#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
#: lib/designsettings.php:434 lib/designsettings.php:464
-#, fuzzy
msgid "Couldn't update your design."
-msgstr "Não foi possível actualizar o utilizador."
+msgstr "Não foi possível actualizar o design."
#: 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 ""
+msgstr "Não foi possível actualizar as suas configurações do design!"
#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
msgid "Design preferences saved."
-msgstr ""
+msgstr "Preferências do design foram gravadas."
#: actions/grouplogo.php:139 actions/grouplogo.php:192
msgid "Group logo"
-msgstr ""
+msgstr "Logótipo do grupo"
#: actions/grouplogo.php:150
#, php-format
msgid ""
"You can upload a logo image for your group. The maximum file size is %s."
msgstr ""
+"Pode carregar uma imagem para logótipo do seu grupo. O tamanho máximo do "
+"ficheiro é %s."
#: actions/grouplogo.php:362
msgid "Pick a square area of the image to be the logo."
-msgstr ""
+msgstr "Escolha uma área quadrada da imagem para ser o logótipo."
#: actions/grouplogo.php:396
-#, fuzzy
msgid "Logo updated."
-msgstr "Avatar actualizado."
+msgstr "Logótipo actualizado."
#: actions/grouplogo.php:398
msgid "Failed updating logo."
-msgstr ""
+msgstr "Não foi possível actualizar o logótipo."
#: actions/groupmembers.php:93 lib/groupnav.php:92
#, php-format
msgid "%s group members"
-msgstr ""
+msgstr "Membros do grupo %s"
#: actions/groupmembers.php:96
#, php-format
msgid "%s group members, page %d"
-msgstr ""
+msgstr "Membros do grupo %s, página %d"
#: actions/groupmembers.php:111
msgid "A list of the users in this group."
-msgstr ""
+msgstr "Uma lista dos utilizadores neste grupo."
#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
msgid "Admin"
-msgstr ""
+msgstr "Admin"
#: actions/groupmembers.php:346 lib/blockform.php:69
msgid "Block"
@@ -1429,20 +1432,20 @@ msgstr "Bloquear"
#: actions/groupmembers.php:441
msgid "Make user an admin of the group"
-msgstr ""
+msgstr "Tornar utilizador o administrador do grupo"
#: actions/groupmembers.php:473
msgid "Make Admin"
-msgstr ""
+msgstr "Tornar Admin"
#: actions/groupmembers.php:473
msgid "Make this user an admin"
-msgstr ""
+msgstr "Tornar este utilizador um administrador"
#: actions/grouprss.php:133
#, php-format
msgid "Updates from members of %1$s on %2$s!"
-msgstr ""
+msgstr "Actualizações dos membros de %1$s em %2$s!"
#: actions/groupsearch.php:52
#, php-format
@@ -1450,16 +1453,17 @@ msgid ""
"Search for groups on %%site.name%% by their name, location, or description. "
"Separate the terms by spaces; they must be 3 characters or more."
msgstr ""
+"Procure grupos em %%site.name%% pelo seu nome, localização ou descrição. "
+"Separe os termos de busca com espaços; precisam de ter 3 ou mais caracteres."
#: actions/groupsearch.php:58
msgid "Group search"
-msgstr ""
+msgstr "Pesquisa de grupos"
#: actions/groupsearch.php:79 actions/noticesearch.php:117
#: actions/peoplesearch.php:83
-#, fuzzy
msgid "No results."
-msgstr "Nenhum resultado"
+msgstr "Sem resultados."
#: actions/groupsearch.php:82
#, php-format
@@ -1467,6 +1471,8 @@ msgid ""
"If you can't find the group you're looking for, you can [create it](%%action."
"newgroup%%) yourself."
msgstr ""
+"Se não encontra o grupo que procura, pode [criá-lo](%%action.newgroup%%) "
+"você mesmo."
#: actions/groupsearch.php:85
#, php-format
@@ -1474,16 +1480,18 @@ msgid ""
"Why not [register an account](%%action.register%%) and [create the group](%%"
"action.newgroup%%) yourself!"
msgstr ""
+"Podia [registar uma conta](%%action.register%%) e [criar o grupo](%%action."
+"newgroup%%) você mesmo!"
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
-msgstr ""
+msgstr "Grupos"
#: actions/groups.php:64
#, php-format
msgid "Groups, page %d"
-msgstr ""
+msgstr "Grupos, página %d"
#: actions/groups.php:90
#, php-format
@@ -1494,23 +1502,27 @@ msgid ""
"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
"%%%%)"
msgstr ""
+"Os grupos no site %%%%site.name%%%% permitem-lhe encontrar e falar com "
+"pessoas que têm interesses semelhantes aos seus. Após juntar-se a um grupo, "
+"pode enviar mensagens a outros membros usando a sintaxe \"!groupname\". Não "
+"encontra nenhum grupo de que gosta? Tente [pesquisar um grupo](%%%%action."
+"groupsearch%%%%) ou [crie o seu!](%%%%action.newgroup%%%%)"
#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
msgid "Create a new group"
-msgstr ""
+msgstr "Criar um grupo novo"
#: actions/groupunblock.php:91
msgid "Only an admin can unblock group members."
-msgstr ""
+msgstr "Só um administrador pode desbloquear membros de um grupo."
#: actions/groupunblock.php:95
-#, fuzzy
msgid "User is not blocked from group."
-msgstr "O utilizador bloqueou-o."
+msgstr "Acesso do utilizador ao grupo não foi bloqueado."
#: actions/groupunblock.php:128 actions/unblock.php:77
msgid "Error removing the block."
-msgstr ""
+msgstr "Erro ao remover o bloqueio."
#: actions/imsettings.php:59
msgid "IM Settings"
@@ -1522,10 +1534,12 @@ msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
"doc.im%%). Configure your address and settings below."
msgstr ""
+"Pode enviar e receber notas através de [mensagens instantâneas](%%doc.im%%) "
+"Jabber/GTalk. Configure o seu endereço e outras definições abaixo."
#: actions/imsettings.php:89
msgid "IM is not available."
-msgstr ""
+msgstr "IM não está disponível."
#: actions/imsettings.php:106
msgid "Current confirmed Jabber/GTalk address."
@@ -1537,8 +1551,9 @@ 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 ""
-"A aguardar confirmação deste endereço. Verifique as instrucções enviadas "
-"para a sua conta de Jabber/GTalk. (Adicionou %s à sua lista de amigos?)"
+"A aguardar confirmação deste endereço. Verifique as instruções que foram "
+"enviadas para a sua conta de Jabber/GTalk. (Adicionou %s à sua lista de "
+"amigos?)"
#: actions/imsettings.php:124
msgid "IM Address"
@@ -1550,38 +1565,41 @@ msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
"add %s to your buddy list in your IM client or on GTalk."
msgstr ""
+"Endereço Jabber ou GTalk, por exemplo \"NomeDeUtilizador@exemplo.org\". "
+"Primeiro, certifique-se de que adicionou %s à sua lista de amigos no cliente "
+"IM ou no GTalk."
#: actions/imsettings.php:143
msgid "Send me notices through Jabber/GTalk."
-msgstr ""
+msgstr "Enviar-me notas via Jabber/GTalk."
#: actions/imsettings.php:148
msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr ""
+msgstr "Publicar uma nota quando o meu estado no Jabber/GTalk se altera."
#: actions/imsettings.php:153
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr ""
+msgstr "Enviar-me via Jabber/GTalk respostas de pessoas que não subscrevo."
#: actions/imsettings.php:159
msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
+msgstr "Publicar uma MicroID para o meu endereço Jabber/GTalk."
#: actions/imsettings.php:285
msgid "No Jabber ID."
-msgstr ""
+msgstr "Não introduziu o Jabber ID."
#: actions/imsettings.php:292
msgid "Cannot normalize that Jabber ID"
-msgstr "Não é possível normalizar esse ID de Jabber"
+msgstr "Não é possível normalizar esse Jabber ID"
#: actions/imsettings.php:296
msgid "Not a valid Jabber ID"
-msgstr ""
+msgstr "Jabber ID não é válido"
#: actions/imsettings.php:299
msgid "That is already your Jabber ID."
-msgstr ""
+msgstr "Esse já é o seu Jabber ID."
#: actions/imsettings.php:302
msgid "Jabber ID already belongs to another user."
@@ -1598,35 +1616,38 @@ msgstr ""
#: actions/imsettings.php:387
msgid "That is not your Jabber ID."
-msgstr ""
+msgstr "Esse não é o seu Jabber ID."
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %s - page %d"
-msgstr ""
+msgstr "Caixa de entrada de %s - página %d"
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
-msgstr ""
+msgstr "Caixa de entrada de %s"
#: actions/inbox.php:115
msgid "This is your inbox, which lists your incoming private messages."
msgstr ""
+"Esta é a sua caixa de entrada, que apresenta as mensagens privadas recebidas."
#: actions/invite.php:39
msgid "Invites have been disabled."
-msgstr ""
+msgstr "Convites foram impossibilitados."
#: actions/invite.php:41
#, php-format
msgid "You must be logged in to invite other users to use %s"
msgstr ""
+"Precisa de iniciar uma sessão para convidar outros utilizadores a usarem o "
+"site %s."
#: actions/invite.php:72
#, php-format
msgid "Invalid email address: %s"
-msgstr "Endereço de email inválido: %s"
+msgstr "Endereço electrónico inválido: %s"
#: actions/invite.php:110
msgid "Invitation(s) sent"
@@ -1638,7 +1659,7 @@ msgstr "Convidar novos utilizadores"
#: actions/invite.php:128
msgid "You are already subscribed to these users:"
-msgstr ""
+msgstr "Já subscreveu estes utilizadores:"
#: actions/invite.php:131 actions/invite.php:139
#, php-format
@@ -1649,6 +1670,7 @@ msgstr "%s (%s)"
msgid ""
"These people are already users and you were automatically subscribed to them:"
msgstr ""
+"Estas pessoas já são utilizadores e foram automaticamente subscritos por si:"
#: actions/invite.php:144
msgid "Invitation(s) sent to the following people:"
@@ -1659,15 +1681,18 @@ msgid ""
"You will be notified when your invitees accept the invitation and register "
"on the site. Thanks for growing the community!"
msgstr ""
+"Receberá uma notificação quando os seus convidados aceitarem o convite e se "
+"registarem no site. Obrigado por aumentar a comunidade!"
#: actions/invite.php:162
msgid ""
"Use this form to invite your friends and colleagues to use this service."
msgstr ""
+"Use este formulário para convidar amigos e colegas a usar este serviço."
#: actions/invite.php:187
msgid "Email addresses"
-msgstr "Endereços de Email"
+msgstr "Endereços de correio electrónico"
#: actions/invite.php:189
msgid "Addresses of friends to invite (one per line)"
@@ -1675,15 +1700,15 @@ msgstr "Endereços dos amigos a convidar (um por linha)"
#: actions/invite.php:192
msgid "Personal message"
-msgstr ""
+msgstr "Mensagem pessoal"
#: actions/invite.php:194
msgid "Optionally add a personal message to the invitation."
-msgstr ""
+msgstr "Pode optar por acrescentar uma mensagem pessoal ao convite."
#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
-msgstr ""
+msgstr "Enviar"
#: actions/invite.php:226
#, php-format
@@ -1720,14 +1745,14 @@ msgid ""
"\n"
"Sincerely, %2$s\n"
msgstr ""
-"%1$s convidou-o a juntar-se a ele no %2$s (%3$s).\n"
+"%1$s fez-lhe um convite para se juntar a ele(a) no %2$s (%3$s).\n"
"\n"
-"%2$s é um serviço de micro-blogging que o deixa actualizado com pessoas que "
-"conhece e que lhe interessam.\n"
+"%2$s é um serviço de microblogues que lhe permite manter-se em contacto com "
+"pessoas que conhece e pessoas do seu interesse.\n"
"\n"
"Também pode partilhar notícias suas, pensamentos, ou a sua vida online com "
-"pessoas que o conheça. É também ideal para conhecer pessoas com interesses "
-"semelhantes aos seus.\n"
+"pessoas que queiram saber de si. É também ideal para conhecer pessoas com "
+"interesses semelhantes aos seus.\n"
"\n"
"%1$s disse:\n"
"\n"
@@ -1737,8 +1762,8 @@ msgstr ""
"\n"
"%5$s\n"
"\n"
-"Se gostaria de experimentar este serviço visite o endereço a baixo para "
-"aceitar este convite.\n"
+"Se gostaria de experimentar o serviço visite o endereço abaixo para aceitar "
+"este convite.\n"
"\n"
"%6$s\n"
"\n"
@@ -1748,95 +1773,95 @@ msgstr ""
#: actions/joingroup.php:60
msgid "You must be logged in to join a group."
-msgstr ""
+msgstr "Precisa de iniciar uma sessão para se juntar a um grupo."
#: actions/joingroup.php:90 lib/command.php:217
msgid "You are already a member of that group"
-msgstr ""
+msgstr "Já é membro desse grupo"
#: actions/joingroup.php:128 lib/command.php:234
#, php-format
msgid "Could not join user %s to group %s"
-msgstr ""
+msgstr "Não foi possível juntar o utilizador %s ao grupo %s"
#: actions/joingroup.php:135 lib/command.php:239
#, php-format
msgid "%s joined group %s"
-msgstr ""
+msgstr "%s juntou-se ao grupo %s"
#: actions/leavegroup.php:60
msgid "You must be logged in to leave a group."
-msgstr ""
+msgstr "Precisa de iniciar uma sessão para deixar um grupo."
#: actions/leavegroup.php:90 lib/command.php:268
msgid "You are not a member of that group."
-msgstr ""
+msgstr "Não é um membro desse grupo."
#: actions/leavegroup.php:119 lib/command.php:278
msgid "Could not find membership record."
-msgstr ""
+msgstr "Não foi encontrado um registo de membro de grupo."
#: actions/leavegroup.php:127 lib/command.php:284
#, php-format
msgid "Could not remove user %s to group %s"
-msgstr ""
+msgstr "Não foi possível remover o utilizador %s do grupo %s"
#: actions/leavegroup.php:134 lib/command.php:289
#, php-format
msgid "%s left group %s"
-msgstr ""
+msgstr "%s deixou o grupo %s"
#: actions/login.php:79 actions/register.php:137
msgid "Already logged in."
-msgstr "Login já efectuado."
+msgstr "Sessão já foi iniciada."
-#: actions/login.php:110 actions/login.php:120
-#, fuzzy
+#: actions/login.php:108 actions/login.php:118
msgid "Invalid or expired token."
-msgstr "Conteúdo da mensagem inválido"
+msgstr "Chave inválida ou expirada."
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
-msgstr "Nome de utilizador ou palavra-passe incorrecta"
+msgstr "Nome de utilizador ou palavra-passe incorrectos."
-#: actions/login.php:149
+#: actions/login.php:152
msgid "Error setting user. You are probably not authorized."
-msgstr ""
+msgstr "Erro ao preparar o utilizador. Provavelmente não está autorizado."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Entrar"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
-msgstr ""
+msgstr "Iniciar sessão no site"
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Alcunha"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
-msgstr ""
+msgstr "Palavra-chave"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
-msgstr ""
+msgstr "Lembrar-me neste computador"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
-"Efectuar login automático; não utilizar em computadores de uso partilhado!"
+"De futuro, iniciar sessão automaticamente. Não usar em computadores "
+"partilhados!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Perdeu ou esqueceu-se da palavra-passe?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1844,89 +1869,88 @@ msgstr ""
"Por razões de segurança, por favor reintroduza o seu nome de utilizador e "
"palavra-passe antes de alterar as suas configurações."
-#: actions/login.php:286
-#, fuzzy, php-format
+#: actions/login.php:289
+#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
"(%%action.register%%) a new account."
msgstr ""
-"Entrar com o seu nome de utilizador e palavra passe. Não está registado "
-"ainda?[Registe-se](%%action.register%%), ou tente entrar com [OpenID](%%"
-"action.openidlogin%%). "
+"Entrar com o seu nome de utilizador e palavra-chave. Ainda não está "
+"registado? [Registe](%%action.register%%) uma conta."
#: actions/makeadmin.php:91
msgid "Only an admin can make another user an admin."
-msgstr ""
+msgstr "Só um administrador pode tornar outro utilizador num administrador."
#: actions/makeadmin.php:95
#, php-format
msgid "%s is already an admin for group \"%s\"."
-msgstr ""
+msgstr "%s já é um administrador do grupo \"%s\"."
#: actions/makeadmin.php:132
#, php-format
msgid "Can't get membership record for %s in group %s"
-msgstr ""
+msgstr "Não existe registo de %s ter entrado no grupo %s"
#: actions/makeadmin.php:145
#, php-format
msgid "Can't make %s an admin for group %s"
-msgstr ""
+msgstr "Não é possível tornar %s administrador do grupo %s"
#: actions/microsummary.php:69
msgid "No current status"
-msgstr ""
+msgstr "Sem estado actual"
#: actions/newgroup.php:53
msgid "New group"
-msgstr ""
+msgstr "Grupo novo"
#: actions/newgroup.php:110
msgid "Use this form to create a new group."
-msgstr ""
+msgstr "Use este formulário para criar um grupo novo."
#: actions/newmessage.php:71 actions/newmessage.php:231
msgid "New message"
-msgstr ""
+msgstr "Mensagem nova"
#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
msgid "You can't send a message to this user."
-msgstr ""
+msgstr "Não pode enviar uma mensagem a este utilizador."
#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
#: lib/command.php:424
msgid "No content!"
-msgstr ""
+msgstr "Sem conteúdo!"
#: actions/newmessage.php:158
msgid "No recipient specified."
-msgstr ""
+msgstr "Não especificou um destinatário."
#: actions/newmessage.php:164 lib/command.php:370
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr ""
+msgstr "Não auto-envie uma mensagem; basta lê-la baixinho a si próprio."
#: actions/newmessage.php:181
msgid "Message sent"
-msgstr ""
+msgstr "Mensagem enviada"
#: actions/newmessage.php:185 lib/command.php:375
#, php-format
msgid "Direct message to %s sent"
-msgstr ""
+msgstr "Mensagem directa para %s enviada"
#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
msgid "Ajax Error"
-msgstr ""
+msgstr "Erro do Ajax"
#: actions/newnotice.php:69
msgid "New notice"
-msgstr ""
+msgstr "Nota nova"
#: actions/newnotice.php:206
msgid "Notice posted"
-msgstr ""
+msgstr "Nota publicada"
#: actions/noticesearch.php:68
#, php-format
@@ -1934,15 +1958,17 @@ msgid ""
"Search for notices on %%site.name%% by their contents. Separate search terms "
"by spaces; they must be 3 characters or more."
msgstr ""
+"Procure notas em %%site.name%% pelo seu conteúdo. Separe os termos de busca "
+"com espaços; precisam de ter 3 ou mais caracteres."
#: actions/noticesearch.php:78
msgid "Text search"
-msgstr ""
+msgstr "Pesquisa de texto"
#: actions/noticesearch.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Search results for \"%s\" on %s"
-msgstr "Procurar por \"%s\" no fluxo de mensagens"
+msgstr "Resultados da pesquisa de \"%s\" em %s"
#: actions/noticesearch.php:121
#, php-format
@@ -1950,6 +1976,8 @@ msgid ""
"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
"status_textarea=%s)!"
msgstr ""
+"Seja o primeiro a [publicar neste tópico](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
#: actions/noticesearch.php:124
#, php-format
@@ -1957,43 +1985,46 @@ msgid ""
"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
+"Podia [registar uma conta](%%%%action.register%%%%) e ser a primeira pessoa "
+"a [publicar neste tópico](%%%%action.newnotice%%%%?status_textarea=%s)!"
#: actions/noticesearchrss.php:96
#, php-format
msgid "Updates with \"%s\""
-msgstr ""
+msgstr "Actualizações com \"%s\""
#: actions/noticesearchrss.php:98
-#, fuzzy, php-format
+#, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr "Todas as actualizações com o termo \"%s\""
+msgstr "Actualizações que contêm o termo \"%1$s\" em %2$s!"
#: actions/nudge.php:85
msgid ""
"This user doesn't allow nudges or hasn't confirmed or set his email yet."
msgstr ""
+"Este utilizador não aceita cotoveladas ou ainda não confirmou ou forneceu o "
+"endereço electrónico."
#: actions/nudge.php:94
msgid "Nudge sent"
-msgstr ""
+msgstr "Cotovelada enviada"
#: actions/nudge.php:97
msgid "Nudge sent!"
-msgstr ""
+msgstr "Cotovelada enviada!"
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
-msgstr ""
+msgstr "Nota não tem perfil"
#: actions/oembed.php:86 actions/shownotice.php:180
#, php-format
msgid "%1$s's status on %2$s"
-msgstr "%1$s's estado em %2$s"
+msgstr "Estado de %1$s em %2$s"
#: actions/oembed.php:157
-#, fuzzy
msgid "content type "
-msgstr "Ligar"
+msgstr "tipo de conteúdo "
#: actions/oembed.php:160
msgid "Only "
@@ -2002,82 +2033,82 @@ msgstr ""
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
-msgstr ""
+msgstr "Formato de dados não suportado."
#: actions/opensearch.php:64
msgid "People Search"
-msgstr ""
+msgstr "Pesquisa de Pessoas"
#: actions/opensearch.php:67
msgid "Notice Search"
-msgstr ""
+msgstr "Pesquisa de Notas"
#: actions/othersettings.php:60
msgid "Other Settings"
-msgstr ""
+msgstr "Outras Configurações"
#: actions/othersettings.php:71
msgid "Manage various other options."
-msgstr ""
+msgstr "Gerir várias outras opções."
#: actions/othersettings.php:108
msgid " (free service)"
-msgstr ""
+msgstr " (serviço gratuito)"
#: actions/othersettings.php:116
msgid "Shorten URLs with"
-msgstr ""
+msgstr "Compactar URLs com"
#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
-msgstr ""
+msgstr "Serviço de compactação automático a utilizar."
#: actions/othersettings.php:122
msgid "View profile designs"
-msgstr ""
+msgstr "Ver designs de perfis"
#: actions/othersettings.php:123
msgid "Show or hide profile designs."
-msgstr ""
+msgstr "Mostrar ou esconder designs de perfis"
#: actions/othersettings.php:153
msgid "URL shortening service is too long (max 50 chars)."
-msgstr ""
+msgstr "Serviço de compactação de URLs demasiado extenso (máx. 50 caracteres)"
#: actions/outbox.php:58
#, php-format
msgid "Outbox for %s - page %d"
-msgstr ""
+msgstr "Caixa de saída de %s - página %d"
#: actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
-msgstr ""
+msgstr "Caixa de saída de %s"
#: actions/outbox.php:116
msgid "This is your outbox, which lists private messages you have sent."
msgstr ""
+"Esta é a sua caixa de saída, que apresenta as mensagens privadas enviadas."
#: actions/passwordsettings.php:58
msgid "Change password"
-msgstr "Modificar palavra-passe"
+msgstr "Modificar palavra-chave"
#: actions/passwordsettings.php:69
-#, fuzzy
msgid "Change your password."
-msgstr "Modificar a sua palavra-passe"
+msgstr "Modificar a sua palavra-chave."
#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
msgid "Password change"
-msgstr ""
+msgstr "Mudança da palavra-chave"
#: actions/passwordsettings.php:104
msgid "Old password"
-msgstr ""
+msgstr "Antiga"
#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
-msgstr "Nova palavra-passe"
+msgstr "Nova"
#: actions/passwordsettings.php:109
msgid "6 or more characters"
@@ -2086,11 +2117,11 @@ msgstr "6 ou mais caracteres"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
-msgstr "Confirmar"
+msgstr "Confirmação"
#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
msgid "Same as password above"
-msgstr ""
+msgstr "Repita a palavra-chave nova"
#: actions/passwordsettings.php:117
msgid "Change"
@@ -2098,15 +2129,15 @@ msgstr "Modificar"
#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
-msgstr ""
+msgstr "Palavra-chave tem de ter 6 ou mais caracteres."
#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
-msgstr ""
+msgstr "Palavras-chave não coincidem."
#: actions/passwordsettings.php:165
msgid "Incorrect old password"
-msgstr "Palavra-passe antiga incorrecta"
+msgstr "Palavra-chave antiga incorrecta."
#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
@@ -2114,119 +2145,112 @@ msgstr "Erro ao guardar utilizador; inválido."
#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
-msgstr "Não é possível guardar a nova password."
+msgstr "Não é possível guardar a nova palavra-chave."
#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
-msgstr ""
+msgstr "Palavra-chave gravada."
#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
msgid "Paths"
-msgstr ""
+msgstr "Localizações"
#: actions/pathsadminpanel.php:70
msgid "Path and server settings for this StatusNet site."
-msgstr ""
+msgstr "Configurações de localização e servidor deste site StatusNet."
#: actions/pathsadminpanel.php:140
#, php-format
msgid "Theme directory not readable: %s"
-msgstr ""
+msgstr "Sem acesso de leitura do directório do tema: %s"
#: actions/pathsadminpanel.php:146
#, php-format
msgid "Avatar directory not writable: %s"
-msgstr ""
+msgstr "Sem acesso de escrita no directório do avatar: %s"
#: actions/pathsadminpanel.php:152
#, php-format
msgid "Background directory not writable: %s"
-msgstr ""
+msgstr "Sem acesso de escrita no directório do fundo: %s"
#: actions/pathsadminpanel.php:160
#, php-format
msgid "Locales directory not readable: %s"
-msgstr ""
+msgstr "Sem acesso de leitura do directório do locales: %s"
#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:299
-#, fuzzy
msgid "Site"
-msgstr "Convidar"
+msgstr "Site"
#: actions/pathsadminpanel.php:216
msgid "Path"
-msgstr ""
+msgstr "Localização"
#: actions/pathsadminpanel.php:216
-#, fuzzy
msgid "Site path"
-msgstr "Convidar"
+msgstr "Localização do site"
#: actions/pathsadminpanel.php:220
msgid "Path to locales"
-msgstr ""
+msgstr "Localização do locales"
#: actions/pathsadminpanel.php:220
msgid "Directory path to locales"
-msgstr ""
+msgstr "Localização do directório do locales"
#: actions/pathsadminpanel.php:227
msgid "Theme"
-msgstr ""
+msgstr "Tema"
#: actions/pathsadminpanel.php:232
msgid "Theme server"
-msgstr ""
+msgstr "Servidor do tema"
#: actions/pathsadminpanel.php:236
msgid "Theme path"
-msgstr ""
+msgstr "Localização do tema"
#: actions/pathsadminpanel.php:240
msgid "Theme directory"
-msgstr ""
+msgstr "Directório do tema"
#: actions/pathsadminpanel.php:247
-#, fuzzy
msgid "Avatars"
-msgstr "Avatar"
+msgstr "Avatares"
#: actions/pathsadminpanel.php:252
-#, fuzzy
msgid "Avatar server"
-msgstr "Avatar actualizado."
+msgstr "Servidor do avatar"
#: actions/pathsadminpanel.php:256
-#, fuzzy
msgid "Avatar path"
-msgstr "Avatar actualizado."
+msgstr "Localização do avatar"
#: actions/pathsadminpanel.php:260
-#, fuzzy
msgid "Avatar directory"
-msgstr "Avatar actualizado."
+msgstr "Directório do avatar"
#: actions/pathsadminpanel.php:269
msgid "Backgrounds"
-msgstr ""
+msgstr "Fundos"
#: actions/pathsadminpanel.php:273
msgid "Background server"
-msgstr ""
+msgstr "Servidor do fundo"
#: actions/pathsadminpanel.php:277
msgid "Background path"
-msgstr ""
+msgstr "Localização do fundo"
#: actions/pathsadminpanel.php:281
msgid "Background directory"
-msgstr ""
+msgstr "Directório do fundo"
#: actions/pathsadminpanel.php:297
-#, fuzzy
msgid "Save paths"
-msgstr "Convidar"
+msgstr "Gravar localizações"
#: actions/peoplesearch.php:52
#, php-format
@@ -2234,42 +2258,46 @@ msgid ""
"Search for people on %%site.name%% by their name, location, or interests. "
"Separate the terms by spaces; they must be 3 characters or more."
msgstr ""
+"Procure pessoas em %%site.name%% pelo seu nome, localidade ou interesses. "
+"Separe os termos de busca com espaços; precisam de ter 3 ou mais caracteres."
#: actions/peoplesearch.php:58
msgid "People search"
-msgstr ""
+msgstr "Pesquisa de pessoas"
#: actions/peopletag.php:70
#, php-format
msgid "Not a valid people tag: %s"
-msgstr ""
+msgstr "Categoria de pessoas inválida: %s"
#: actions/peopletag.php:144
#, php-format
msgid "Users self-tagged with %s - page %d"
-msgstr ""
+msgstr "Utilizadores auto-categorizados com %s - página %d"
#: actions/postnotice.php:84
msgid "Invalid notice content"
-msgstr "Conteúdo da mensagem inválido"
+msgstr "Conteúdo da nota é inválido"
#: actions/postnotice.php:90
#, php-format
msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
-msgstr ""
+msgstr "A licença ‘%s’ da nota não é compatível com a licença ‘%s’ do site."
#: actions/profilesettings.php:60
msgid "Profile settings"
-msgstr ""
+msgstr "Configurações do perfil"
#: actions/profilesettings.php:71
msgid ""
"You can update your personal profile info here so people know more about you."
msgstr ""
+"Pode actualizar aqui a informação do seu perfil pessoal, para que as pessoas "
+"saibam mais sobre si."
#: actions/profilesettings.php:99
msgid "Profile information"
-msgstr ""
+msgstr "Informação do perfil"
#: actions/profilesettings.php:108 lib/groupeditform.php:154
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
@@ -2279,30 +2307,29 @@ msgstr "1-64 letras minúsculas ou números, sem pontuação ou espaços"
#: actions/showgroup.php:247 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:149
msgid "Full name"
-msgstr "Nome Completo"
+msgstr "Nome completo"
#: actions/profilesettings.php:115 actions/register.php:452
#: lib/groupeditform.php:161
msgid "Homepage"
-msgstr "Página Principal"
+msgstr "Página de acolhimento"
#: actions/profilesettings.php:117 actions/register.php:454
msgid "URL of your homepage, blog, or profile on another site"
-msgstr ""
+msgstr "URL da uma página sua, blogue ou perfil noutro sítio na internet"
#: actions/profilesettings.php:122 actions/register.php:460
-#, fuzzy, php-format
+#, php-format
msgid "Describe yourself and your interests in %d chars"
-msgstr "Descreva-se e aos seus interesses em 140 caracteres"
+msgstr "Descreva-se e aos seus interesses (máx. 140 caracteres)"
#: actions/profilesettings.php:125 actions/register.php:463
-#, fuzzy
msgid "Describe yourself and your interests"
-msgstr "Descreva-se e aos seus interesses em 140 caracteres"
+msgstr "Descreva-se e aos seus interesses"
#: actions/profilesettings.php:127 actions/register.php:465
msgid "Bio"
-msgstr "Bio"
+msgstr "Biografia"
#: actions/profilesettings.php:132 actions/register.php:470
#: actions/showgroup.php:256 actions/tagother.php:112
@@ -2313,18 +2340,20 @@ msgstr "Localidade"
#: actions/profilesettings.php:134 actions/register.php:472
msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr ""
+msgstr "Onde está, por ex. \"Cidade, Região, País\""
#: actions/profilesettings.php:138 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
-msgstr ""
+msgstr "Categorias"
#: actions/profilesettings.php:140
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
+"Categorias para si (letras, números, -, ., _), separadas por vírgulas ou "
+"espaços"
#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
@@ -2346,13 +2375,12 @@ msgstr "Em que fuso horário se encontra normalmente?"
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-"Subscrever automaticamente a quem se subscrever a mim (recomendado para não-"
-"humanos)"
+"Subscrever automaticamente quem me subscreva (óptimo para seres não-humanos)"
#: actions/profilesettings.php:221 actions/register.php:223
#, php-format
msgid "Bio is too long (max %d chars)."
-msgstr "Biografia demasiada extensa (máx. %d caracteres)."
+msgstr "Biografia demasiado extensa (máx. %d caracteres)."
#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
@@ -2365,11 +2393,11 @@ msgstr "Língua é demasiado extensa (máx. 50 caracteres)."
#: actions/profilesettings.php:246 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
-msgstr ""
+msgstr "Categoria inválida: \"%s\""
#: actions/profilesettings.php:295
msgid "Couldn't update user for autosubscribe."
-msgstr "Não foi possível actualizar o utilizador para auto-subscrição."
+msgstr "Não foi possível actualizar o utilizador para subscrição automática."
#: actions/profilesettings.php:328
msgid "Couldn't save profile."
@@ -2377,7 +2405,7 @@ msgstr "Não foi possível gravar o perfil."
#: actions/profilesettings.php:336
msgid "Couldn't save tags."
-msgstr ""
+msgstr "Não foi possível gravar as categorias."
#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
@@ -2386,33 +2414,32 @@ msgstr "Configurações gravadas."
#: actions/public.php:83
#, php-format
msgid "Beyond the page limit (%s)"
-msgstr ""
+msgstr "Além do limite de página (%s)"
#: actions/public.php:92
msgid "Could not retrieve public stream."
-msgstr ""
+msgstr "Não foi possível importar as notas públicas."
#: actions/public.php:129
-#, fuzzy, php-format
+#, php-format
msgid "Public timeline, page %d"
-msgstr "Mensagens públicas de %s"
+msgstr "Cronolinha pública, página %d"
#: actions/public.php:131 lib/publicgroupnav.php:79
msgid "Public timeline"
-msgstr ""
+msgstr "Cronolinha pública"
#: actions/public.php:151
msgid "Public Stream Feed (RSS 1.0)"
-msgstr ""
+msgstr "Feed de Notas Públicas (RSS 1.0)"
#: actions/public.php:155
msgid "Public Stream Feed (RSS 2.0)"
-msgstr ""
+msgstr "Feed de Notas Públicas (RSS 2.0)"
#: actions/public.php:159
-#, fuzzy
msgid "Public Stream Feed (Atom)"
-msgstr "Fluxo Público de %s"
+msgstr "Feed de Notas Públicas (Atom)"
#: actions/public.php:179
#, php-format
@@ -2420,16 +2447,20 @@ msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
+"Esta é a cronolinha pública do site %%site.name%% mas ainda ninguém publicou "
+"nada."
#: actions/public.php:182
msgid "Be the first to post!"
-msgstr ""
+msgstr "Seja a primeira pessoa a publicar!"
#: actions/public.php:186
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
+"Podia [registar uma conta](%%action.register%%) e ser a primeira pessoa a "
+"publicar!"
#: actions/public.php:233
#, php-format
@@ -2439,6 +2470,11 @@ msgid ""
"tool. [Join now](%%action.register%%) to share notices about yourself with "
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
+"Este é o site %%%%site.name%%%%, um serviço de [microblogues](http://en."
+"wikipedia.org/wiki/Micro-blogging) baseado na aplicação de Software Livre "
+"[StatusNet](http://status.net/). [Registe-se agora](%%%%action.register%%%%) "
+"para partilhar notas sobre si, família e amigos! ([Saber mais](%%%%doc.help%%"
+"%%))"
#: actions/public.php:238
#, php-format
@@ -2447,24 +2483,29 @@ msgid ""
"blogging) service based on the Free Software [StatusNet](http://status.net/) "
"tool."
msgstr ""
+"Este é o site %%%%site.name%%%%, um serviço de [microblogues](http://en."
+"wikipedia.org/wiki/Micro-blogging) baseado na aplicação de Software Livre "
+"[StatusNet](http://status.net/)."
#: actions/publictagcloud.php:57
msgid "Public tag cloud"
-msgstr "Nuvem de etiquetas ''(tag cloud)'' pública"
+msgstr "Catenuvem pública"
#: actions/publictagcloud.php:63
#, php-format
msgid "These are most popular recent tags on %s "
-msgstr ""
+msgstr "Estas são as categorias recentes mais populares em %s "
#: actions/publictagcloud.php:69
#, php-format
msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
msgstr ""
+"Ainda ninguém publicou uma nota com uma categoria de resumo [hashtag](%%doc."
+"tags%%)."
#: actions/publictagcloud.php:72
msgid "Be the first to post one!"
-msgstr ""
+msgstr "Seja a primeira pessoa a publicar uma!"
#: actions/publictagcloud.php:75
#, php-format
@@ -2472,26 +2513,28 @@ msgid ""
"Why not [register an account](%%action.register%%) and be the first to post "
"one!"
msgstr ""
+"Podia [registar uma conta](%%action.register%%) e ser a primeira pessoa a "
+"publicar uma!"
#: actions/publictagcloud.php:135
msgid "Tag cloud"
-msgstr "Nuvem de etiquetas ''(tag cloud)''"
+msgstr "Catenuvem"
#: actions/recoverpassword.php:36
msgid "You are already logged in!"
-msgstr ""
+msgstr "Já tem uma sessão iniciada!"
#: actions/recoverpassword.php:62
msgid "No such recovery code."
-msgstr ""
+msgstr "Esse código de recuperação não existe."
#: actions/recoverpassword.php:66
msgid "Not a recovery code."
-msgstr ""
+msgstr "Não é um código de recuperação."
#: actions/recoverpassword.php:73
msgid "Recovery code for unknown user."
-msgstr ""
+msgstr "Código de recuperação para um utilizador desconhecido."
#: actions/recoverpassword.php:86
msgid "Error with confirmation code."
@@ -2499,54 +2542,57 @@ msgstr "Erro no código de confirmação."
#: actions/recoverpassword.php:97
msgid "This confirmation code is too old. Please start again."
-msgstr ""
+msgstr "Este código de confirmação é demasiado antigo. Por favor, recomece."
#: actions/recoverpassword.php:111
msgid "Could not update user with confirmed email address."
msgstr ""
-"Não foi possivel actualizar utilizador com endereço de email confirmado."
+"Não foi possivel actualizar o utilizador com um correio electrónico "
+"confirmado."
#: 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 ""
+"Se perdeu ou se esqueceu da sua palavra-chave, podemos enviar-lhe uma nova "
+"para o correio electrónico registado na sua conta."
#: actions/recoverpassword.php:158
msgid "You have been identified. Enter a new password below. "
-msgstr ""
+msgstr "Identificação positiva. Introduza abaixo uma palavra-chave nova. "
#: actions/recoverpassword.php:188
msgid "Password recovery"
-msgstr ""
+msgstr "Recuperação da palavra-chave"
#: actions/recoverpassword.php:191
msgid "Nickname or email address"
-msgstr ""
+msgstr "Alcunha ou endereço de correio electrónico"
#: actions/recoverpassword.php:193
msgid "Your nickname on this server, or your registered email address."
-msgstr ""
+msgstr "A sua alcunha neste servidor, ou o seu correio electrónico registado."
#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
msgid "Recover"
-msgstr ""
+msgstr "Recuperar"
#: actions/recoverpassword.php:208
msgid "Reset password"
-msgstr ""
+msgstr "Reiniciar palavra-chave"
#: actions/recoverpassword.php:209
msgid "Recover password"
-msgstr ""
+msgstr "Recuperar palavra-chave"
#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
msgid "Password recovery requested"
-msgstr ""
+msgstr "Solicitada recuperação da palavra-chave"
#: actions/recoverpassword.php:213
msgid "Unknown action"
-msgstr ""
+msgstr "Acção desconhecida"
#: actions/recoverpassword.php:236
msgid "6 or more characters, and don't forget it!"
@@ -2554,15 +2600,16 @@ msgstr "6 ou mais caracteres, e não a esqueça!"
#: actions/recoverpassword.php:243
msgid "Reset"
-msgstr ""
+msgstr "Reiniciar"
#: actions/recoverpassword.php:252
msgid "Enter a nickname or email address."
-msgstr "Introduza uma alcunha ou um endereço de email"
+msgstr "Introduza uma alcunha ou um endereço de correio electrónico."
#: actions/recoverpassword.php:272
msgid "No user with that email address or username."
msgstr ""
+"Não existe nenhum utilizador com esse correio electrónico nem com esse nome."
#: actions/recoverpassword.php:287
msgid "No registered email address for that user."
@@ -2577,20 +2624,20 @@ msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
msgstr ""
-"As instruções para a recuperação da palavra-passe foram enviadas para o "
-"endereço de email registado na sua conta."
+"Instruções para recuperação da sua palavra-chave foram enviadas para o "
+"correio electrónico registado na sua conta."
#: actions/recoverpassword.php:344
msgid "Unexpected password reset."
-msgstr ""
+msgstr "Reinício inesperado da palavra-chave."
#: actions/recoverpassword.php:352
msgid "Password must be 6 chars or more."
-msgstr ""
+msgstr "Palavra-chave tem de ter 6 ou mais caracteres."
#: actions/recoverpassword.php:356
msgid "Password and confirmation do not match."
-msgstr ""
+msgstr "A palavra-chave e a confirmação não coincidem."
#: actions/recoverpassword.php:375 actions/register.php:248
msgid "Error setting user."
@@ -2602,51 +2649,53 @@ msgstr "Nova palavra-passe foi guardada com sucesso. Está agora conectado."
#: actions/register.php:85 actions/register.php:189 actions/register.php:404
msgid "Sorry, only invited people can register."
-msgstr ""
+msgstr "Desculpe, só pessoas convidadas se podem registar."
#: actions/register.php:92
-#, fuzzy
msgid "Sorry, invalid invitation code."
-msgstr "Erro no código de confirmação."
+msgstr "Desculpe, código de convite inválido."
#: actions/register.php:112
msgid "Registration successful"
-msgstr ""
+msgstr "Registo efectuado"
#: actions/register.php:114 actions/register.php:502 lib/action.php:455
#: lib/logingroupnav.php:85
msgid "Register"
-msgstr ""
+msgstr "Registar"
#: actions/register.php:135
msgid "Registration not allowed."
-msgstr ""
+msgstr "Registo não é permitido."
#: actions/register.php:198
msgid "You can't register if you don't agree to the license."
-msgstr ""
+msgstr "Não se pode registar se não aceita a licença."
#: actions/register.php:201
msgid "Not a valid email address."
-msgstr ""
+msgstr "Correio electrónico é inválido."
#: actions/register.php:212
msgid "Email address already exists."
-msgstr "Endereço de Email já existe."
+msgstr "Correio electrónico já existe."
#: actions/register.php:243 actions/register.php:264
msgid "Invalid username or password."
-msgstr "Nome de utilizador ou palavra-passe inválido."
+msgstr "Nome de utilizador ou palavra-chave inválidos."
#: 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 ""
+"Com este formulário pode criar uma conta nova. Poderá então publicar notas e "
+"ligar-se a amigos e colegas. "
#: actions/register.php:424
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64 letras ou números, sem pontuação ou espaços. Obrigatório."
+msgstr ""
+"1-64 letras minúsculas ou números, sem pontuação ou espaços. Obrigatório."
#: actions/register.php:429
msgid "6 or more characters. Required."
@@ -2654,37 +2703,37 @@ msgstr "6 ou mais caracteres. Obrigatório."
#: actions/register.php:433
msgid "Same as password above. Required."
-msgstr ""
+msgstr "Repita a palavra-chave acima. Obrigatório."
#: actions/register.php:437 actions/register.php:441
#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
msgid "Email"
-msgstr "Email"
+msgstr "Correio electrónico"
#: actions/register.php:438 actions/register.php:442
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
+"Usado apenas para actualizações, anúncios e recuperação da palavra-chave"
#: actions/register.php:449
msgid "Longer name, preferably your \"real\" name"
-msgstr ""
+msgstr "Nome mais longo, de preferência o seu nome \"verdadeiro\""
#: actions/register.php:493
msgid "My text and files are available under "
-msgstr ""
+msgstr "Os meus textos e ficheiros são disponibilizados nos termos da "
#: actions/register.php:495
msgid "Creative Commons Attribution 3.0"
-msgstr ""
+msgstr "Creative Commons Atribuição 3.0"
#: actions/register.php:496
-#, fuzzy
msgid ""
" except this private data: password, email address, IM address, and phone "
"number."
msgstr ""
-"excepto estes dados privados: palavra chave, endereço de email, endereço de "
-"mensageiro instantâneo, número de telefone."
+" excepto estes dados privados: palavra-chave, endereço de correio "
+"electrónico, endereço de mensageiro instantâneo, número de telefone."
#: actions/register.php:537
#, php-format
@@ -2704,27 +2753,27 @@ msgid ""
"\n"
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-"Parabéns, %s! Bemvindo ao %%%%site.name%%%%. A partir de agora deverá...\n"
+"Parabéns, %s! Bem-vindo(a) ao %%%%site.name%%%%. A partir daqui, pode...\n"
"\n"
-"* Ir ao [seu perfil](%s) e enviar a primeira mensagem.\n"
-"* Adicionar uma [Endereço Jabber/GTalk](%%%%action.imsettings%%%%) de forma "
-"a poder enviar notações através de mensagens instantâneas.\n"
-"* [Procurar por pessoas](%%%%action.peoplesearch%%%%) que conheça ou "
+"* Visitar o [seu perfil](%s) e enviar a primeira mensagem.\n"
+"* Adicionar um [endereço Jabber/GTalk](%%%%action.imsettings%%%%) de forma a "
+"poder enviar notas por mensagens instantâneas.\n"
+"* [Procurar pessoas](%%%%action.peoplesearch%%%%) que conheça ou que "
"partilhem os seus interesses. \n"
-"* Actualizar o seu perfil [Opções de perfil](%%%%action.profilesettings%%%%) "
-"para contar mais acerca de si aos outros. \n"
-"* Ler os [documentos online](%%%%doc.help%%%%) para conhecer todas as "
-"funcionalidades que tenha perdido. \n"
+"* Actualizar as suas [configurações de perfil](%%%%action.profilesettings%%%"
+"%) para contar mais acerca de si aos outros.\n"
+"* Ler a [documentação em linha](%%%%doc.help%%%%) para conhecer "
+"funcionalidades que lhe tenham escapado. \n"
"\n"
-"Obrigado por se registar e esperamos que se divirta usando este serviço."
+"Obrigado por se ter registado e esperamos que se divirta usando este serviço."
#: actions/register.php:561
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
msgstr ""
-"(Deverá receber uma mensagem por email dentro de momentos, com instrucções "
-"sobre como confirmar o seu endereço de email.)"
+"(Deverá receber uma mensagem electrónica dentro de momentos, com instruções "
+"para confirmar o seu endereço de correio electrónico.)"
#: actions/remotesubscribe.php:98
#, php-format
@@ -2733,19 +2782,22 @@ msgid ""
"register%%) a new account. If you already have an account on a [compatible "
"microblogging site](%%doc.openmublog%%), enter your profile URL below."
msgstr ""
+"Para subscrever, pode [iniciar sessão](%%action.login%%), ou [registar](%%"
+"action.register%%) uma conta nova. Se já tem conta num [serviço de "
+"microblogues compatível](%%doc.openmublog%%), introduza abaixo a URL do seu "
+"perfil lá."
#: actions/remotesubscribe.php:112
msgid "Remote subscribe"
-msgstr ""
+msgstr "Subscrição remota"
#: actions/remotesubscribe.php:124
-#, fuzzy
msgid "Subscribe to a remote user"
-msgstr "Subscrever este utilizador"
+msgstr "Subscrever um utilizador remoto"
#: actions/remotesubscribe.php:129
msgid "User nickname"
-msgstr ""
+msgstr "Alcunha do utilizador"
#: actions/remotesubscribe.php:130
msgid "Nickname of the user you want to follow"
@@ -2753,60 +2805,61 @@ msgstr "Alcunha do utilizador que pretende seguir"
#: actions/remotesubscribe.php:133
msgid "Profile URL"
-msgstr ""
+msgstr "URL do perfil"
#: actions/remotesubscribe.php:134
msgid "URL of your profile on another compatible microblogging service"
-msgstr ""
+msgstr "URL do seu perfil noutro serviço de microblogues compatível"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:356
+#: lib/userprofile.php:365
msgid "Subscribe"
-msgstr ""
+msgstr "Subscrever"
#: actions/remotesubscribe.php:159
msgid "Invalid profile URL (bad format)"
msgstr "URL de perfil inválido (formato incorrecto)"
#: actions/remotesubscribe.php:168
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+#, fuzzy
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr ""
+"URL de perfil não é válida (nenhum documento Yadis ou nenhum XRDS inválido "
+"definidos)."
#: actions/remotesubscribe.php:176
msgid "That’s a local profile! Login to subscribe."
-msgstr ""
+msgstr "Esse perfil é local! Inicie uma sessão para o subscrever."
#: actions/remotesubscribe.php:183
-#, fuzzy
msgid "Couldn’t get a request token."
-msgstr "Não foi possível obter um token de requisição."
+msgstr "Não foi possível obter uma chave de pedido."
#: actions/replies.php:125 actions/repliesrss.php:68
#: lib/personalgroupnav.php:105
#, php-format
msgid "Replies to %s"
-msgstr ""
+msgstr "Respostas a %s"
#: actions/replies.php:127
#, php-format
msgid "Replies to %s, page %d"
-msgstr ""
+msgstr "Respostas a %s, página %d"
#: actions/replies.php:144
-#, fuzzy, php-format
+#, php-format
msgid "Replies feed for %s (RSS 1.0)"
-msgstr "Feed para os amigos de %s"
+msgstr "Feed de respostas de %s (RSS 1.0)"
#: actions/replies.php:151
-#, fuzzy, php-format
+#, php-format
msgid "Replies feed for %s (RSS 2.0)"
-msgstr "Feed para os amigos de %s"
+msgstr "Feed de respostas de %s (RSS 2.0)"
#: actions/replies.php:158
-#, fuzzy, php-format
+#, php-format
msgid "Replies feed for %s (Atom)"
-msgstr "Feed para a tag %s"
+msgstr "Feed de respostas de %s (Atom)"
#: actions/replies.php:198
#, php-format
@@ -2814,6 +2867,8 @@ msgid ""
"This is the timeline showing replies to %s but %s hasn't received a notice "
"to his attention yet."
msgstr ""
+"Esta é a cronolinha com respostas a %s, mas %s ainda não recebeu nenhuma "
+"nota à sua atenção."
#: actions/replies.php:203
#, php-format
@@ -2821,6 +2876,8 @@ msgid ""
"You can engage other users in a conversation, subscribe to more people or "
"[join groups](%%action.groups%%)."
msgstr ""
+"Pode encetar conversa com outros utilizadores, subscrever mais pessoas ou "
+"[juntar-se a grupos](%%action.groups%%)."
#: actions/replies.php:205
#, php-format
@@ -2828,50 +2885,54 @@ msgid ""
"You can try to [nudge %s](../%s) or [post something to his or her attention]"
"(%%%%action.newnotice%%%%?status_textarea=%s)."
msgstr ""
+"Pode tentar [acotovelar %s](../%s) ou [publicar algo à atenção dele(a)](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
#: actions/repliesrss.php:72
#, php-format
msgid "Replies to %1$s on %2$s!"
-msgstr ""
+msgstr "Respostas a %1$s em %2$s!"
#: actions/sandbox.php:65 actions/unsandbox.php:65
msgid "You cannot sandbox users on this site."
-msgstr ""
+msgstr "Não pode descronolinhar utilizadores neste site."
#: actions/sandbox.php:72
-#, fuzzy
msgid "User is already sandboxed."
-msgstr "O utilizador bloqueou-o."
+msgstr "Utilizador já está descronolinhado."
#: actions/showfavorites.php:79
-#, fuzzy, php-format
+#, php-format
msgid "%s's favorite notices, page %d"
-msgstr "%s e amigos"
+msgstr "Notas favoritas de %s, página %d"
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
-msgstr ""
+msgstr "Não foi possível importar notas favoritas."
#: actions/showfavorites.php:170
-#, fuzzy, php-format
+#, php-format
msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr "Feed para os amigos de %s"
+msgstr "Feed das favoritas de %s (RSS 1.0)"
#: actions/showfavorites.php:177
-#, fuzzy, php-format
+#, php-format
msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr "Feed para os amigos de %s"
+msgstr "Feed das favoritas de %s (RSS 2.0)"
#: actions/showfavorites.php:184
-#, fuzzy, php-format
+#, php-format
msgid "Feed for favorites of %s (Atom)"
-msgstr "Feed para os amigos de %s"
+msgstr "Feed das favoritas de %s (Atom)"
#: actions/showfavorites.php:205
msgid ""
"You haven't chosen any favorite notices yet. Click the fave button on "
"notices you like to bookmark them for later or shed a spotlight on them."
msgstr ""
+"Ainda não escolheu nenhuma nota favorita. Clique o botão de favorecimento "
+"nas notas de que goste, para marcá-las para mais tarde ou para lhes dar "
+"relevância."
#: actions/showfavorites.php:207
#, php-format
@@ -2879,6 +2940,8 @@ msgid ""
"%s hasn't added any notices to his favorites yet. Post something interesting "
"they would add to their favorites :)"
msgstr ""
+"%s ainda não adicionou nenhuma nota às favoritas. Publique algo interessante "
+"que mude este estado de coisas :)"
#: actions/showfavorites.php:211
#, php-format
@@ -2887,85 +2950,87 @@ msgid ""
"account](%%%%action.register%%%%) and then post something interesting they "
"would add to their favorites :)"
msgstr ""
+"%s ainda não adicionou nenhuma nota às favoritas. Que tal [registar uma "
+"conta](%%%%action.register%%%%) e publicar algo interessante que mude este "
+"estado de coisas :)"
#: actions/showfavorites.php:242
msgid "This is a way to share what you like."
-msgstr ""
+msgstr "Esta é uma forma de partilhar aquilo de que gosta."
#: actions/showgroup.php:82 lib/groupnav.php:86
#, php-format
msgid "%s group"
-msgstr ""
+msgstr "Grupo %s"
#: actions/showgroup.php:84
#, php-format
msgid "%s group, page %d"
-msgstr ""
+msgstr "Grupo %s, página %d"
#: actions/showgroup.php:218
msgid "Group profile"
-msgstr ""
+msgstr "Perfil do grupo"
#: actions/showgroup.php:263 actions/tagother.php:118
#: actions/userauthorization.php:167 lib/userprofile.php:177
msgid "URL"
-msgstr ""
+msgstr "URL"
#: actions/showgroup.php:274 actions/tagother.php:128
#: actions/userauthorization.php:179 lib/userprofile.php:194
msgid "Note"
-msgstr ""
+msgstr "Anotação"
#: actions/showgroup.php:284 lib/groupeditform.php:184
msgid "Aliases"
-msgstr ""
+msgstr "Cognomes"
#: actions/showgroup.php:293
msgid "Group actions"
-msgstr ""
+msgstr "Acções do grupo"
#: actions/showgroup.php:328
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
-msgstr ""
+msgstr "Feed de notas do grupo %s (RSS 1.0)"
#: actions/showgroup.php:334
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
-msgstr ""
+msgstr "Feed de notas do grupo %s (RSS 2.0)"
#: actions/showgroup.php:340
#, php-format
msgid "Notice feed for %s group (Atom)"
-msgstr ""
+msgstr "Feed de notas do grupo %s (Atom)"
#: actions/showgroup.php:345
-#, fuzzy, php-format
+#, php-format
msgid "FOAF for %s group"
-msgstr "Feed para a tag %s"
+msgstr "FOAF do grupo %s"
#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
msgid "Members"
-msgstr ""
+msgstr "Membros"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
-msgstr ""
+msgstr "(Nenhum)"
#: actions/showgroup.php:392
msgid "All members"
-msgstr ""
+msgstr "Todos os membros"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
-msgstr ""
+msgstr "Estatísticas"
#: actions/showgroup.php:432
-#, fuzzy
msgid "Created"
-msgstr "Criar"
+msgstr "Criado"
#: actions/showgroup.php:448
#, php-format
@@ -2976,6 +3041,12 @@ msgid ""
"their life and interests. [Join now](%%%%action.register%%%%) to become part "
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
+"**%s** é um grupo de utilizadores em %%%%site.name%%%%, um serviço de "
+"[microblogues](http://en.wikipedia.org/wiki/Micro-blogging) baseado na "
+"aplicação de Software Livre [StatusNet](http://status.net/). Os membros "
+"deste grupo partilham mensagens curtas acerca das suas vidas e interesses. "
+"[Registe-se agora](%%%%action.register%%%%) para se juntar a este grupo e a "
+"muitos mais! ([Saber mais](%%%%doc.help%%%%))"
#: actions/showgroup.php:454
#, php-format
@@ -2985,28 +3056,32 @@ msgid ""
"[StatusNet](http://status.net/) tool. Its members share short messages about "
"their life and interests. "
msgstr ""
+"**%s** é um grupo de utilizadores em %%%%site.name%%%%, um serviço de "
+"[microblogues](http://en.wikipedia.org/wiki/Micro-blogging) baseado na "
+"aplicação de Software Livre [StatusNet](http://status.net/). Os membros "
+"deste grupo partilham mensagens curtas acerca das suas vidas e interesses. "
#: actions/showgroup.php:482
msgid "Admins"
-msgstr ""
+msgstr "Administradores"
#: actions/showmessage.php:81
msgid "No such message."
-msgstr ""
+msgstr "Mensagem não foi encontrada."
#: actions/showmessage.php:98
msgid "Only the sender and recipient may read this message."
-msgstr ""
+msgstr "Só o remetente e o destinatário podem ler esta mensagem."
#: actions/showmessage.php:108
#, php-format
msgid "Message to %1$s on %2$s"
-msgstr ""
+msgstr "Mensagem para %1$s a %2$s"
#: actions/showmessage.php:113
#, php-format
msgid "Message from %1$s on %2$s"
-msgstr ""
+msgstr "Mensagem de %1$s a %2$s"
#: actions/shownotice.php:90
msgid "Notice deleted."
@@ -3015,48 +3090,50 @@ msgstr "Avatar actualizado."
#: actions/showstream.php:73
#, php-format
msgid " tagged %s"
-msgstr ""
+msgstr " categorizou %s"
#: actions/showstream.php:79
#, php-format
msgid "%s, page %d"
-msgstr ""
+msgstr "%s, página %d"
#: actions/showstream.php:122
#, php-format
msgid "Notice feed for %s tagged %s (RSS 1.0)"
-msgstr ""
+msgstr "Feed de notas para %s categorizado %s (RSS 1.0)"
#: actions/showstream.php:129
#, php-format
msgid "Notice feed for %s (RSS 1.0)"
-msgstr ""
+msgstr "Feed de notas para %s (RSS 1.0)"
#: actions/showstream.php:136
#, php-format
msgid "Notice feed for %s (RSS 2.0)"
-msgstr ""
+msgstr "Feed de notas para %s (RSS 2.0)"
#: actions/showstream.php:143
#, php-format
msgid "Notice feed for %s (Atom)"
-msgstr ""
+msgstr "Feed de notas para %s (Atom)"
#: actions/showstream.php:148
-#, fuzzy, php-format
+#, php-format
msgid "FOAF for %s"
-msgstr "Feed para a tag %s"
+msgstr "FOAF para %s"
#: actions/showstream.php:191
#, php-format
msgid "This is the timeline for %s but %s hasn't posted anything yet."
-msgstr ""
+msgstr "Esta é a cronolinha de %s, mas %s ainda não publicou nada."
#: 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 ""
+"Viu algo de interessante ultimamente? Como ainda não publicou nenhuma nota, "
+"esta seria uma óptima altura para começar :)"
#: actions/showstream.php:198
#, php-format
@@ -3064,6 +3141,8 @@ msgid ""
"You can try to nudge %s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%s)."
msgstr ""
+"Pode tentar acotovelar %s ou [publicar algo que lhe chame a atenção](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
#: actions/showstream.php:234
#, php-format
@@ -3073,6 +3152,11 @@ msgid ""
"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
+"**%s** tem uma conta em %%%%site.name%%%%, um serviço de [microblogues]"
+"(http://en.wikipedia.org/wiki/Micro-blogging) baseado na aplicação de "
+"Software Livre [StatusNet](http://status.net/). [Registe-se agora](%%%%"
+"action.register%%%%) para seguir as notas de **%s** e de muitos mais! "
+"([Saber mais](%%%%doc.help%%%%))"
#: actions/showstream.php:239
#, php-format
@@ -3081,268 +3165,265 @@ msgid ""
"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
"[StatusNet](http://status.net/) tool. "
msgstr ""
+"**%s** tem uma conta em %%%%site.name%%%%, um serviço de [microblogues]"
+"(http://en.wikipedia.org/wiki/Micro-blogging) baseado na aplicação de "
+"Software Livre [StatusNet](http://status.net/). "
#: actions/silence.php:65 actions/unsilence.php:65
msgid "You cannot silence users on this site."
-msgstr ""
+msgstr "Não pode silenciar utilizadores neste site."
#: actions/silence.php:72
-#, fuzzy
msgid "User is already silenced."
-msgstr "O utilizador bloqueou-o."
+msgstr "O utilizador já está silenciado."
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
-msgstr ""
+msgstr "Configurações básicas para este site StatusNet."
#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
-msgstr ""
+msgstr "Nome do site não pode ter comprimento zero."
#: actions/siteadminpanel.php:155
-#, fuzzy
msgid "You must have a valid contact email address"
-msgstr "Não é possível normalizar esse endereço de email"
+msgstr "Tem de ter um endereço válido para o correio electrónico de contacto"
#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
-msgstr ""
+msgstr "Língua desconhecida \"%s\""
#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
-msgstr ""
+msgstr "URL para onde enviar instantâneos é inválida"
#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
-msgstr ""
+msgstr "Valor de criação do instantâneo é inválido."
#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
-msgstr ""
+msgstr "Frequência dos instantâneos estatísticos tem de ser um número."
#: actions/siteadminpanel.php:199
msgid "You must set an SSL server when enabling SSL."
-msgstr ""
+msgstr "Tem de configurar um servidor SSL quando activa o SSL."
#: actions/siteadminpanel.php:204
msgid "Invalid SSL server. The maximum length is 255 characters."
-msgstr ""
+msgstr "Servidor SSL inválido. O tamanho máximo é 255 caracteres."
#: actions/siteadminpanel.php:210
msgid "Minimum text limit is 140 characters."
-msgstr ""
+msgstr "O valor mínimo de limite para o texto é 140 caracteres."
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
-msgstr ""
+msgstr "O limite de dupes tem de ser 1 ou mais segundos."
#: actions/siteadminpanel.php:266
msgid "General"
-msgstr ""
+msgstr "Geral"
#: actions/siteadminpanel.php:269
msgid "Site name"
-msgstr ""
+msgstr "Nome do site"
#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
-msgstr ""
+msgstr "O nome do seu site, por exemplo \"Microblogue NomeDaEmpresa\""
#: actions/siteadminpanel.php:274
msgid "Brought by"
-msgstr ""
+msgstr "Disponibilizado por"
#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
-msgstr ""
+msgstr "Texto usado para a ligação de atribuição no rodapé de cada página"
#: actions/siteadminpanel.php:279
msgid "Brought by URL"
-msgstr ""
+msgstr "URL da atribuição"
#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
-msgstr ""
+msgstr "URL usada para a ligação de atribuição no rodapé de cada página"
#: actions/siteadminpanel.php:284
-#, fuzzy
msgid "Contact email address for your site"
-msgstr "O endereço de email de recepção removido."
+msgstr "Endereço de correio electrónico de contacto para o site"
#: actions/siteadminpanel.php:290
-#, fuzzy
msgid "Local"
-msgstr "Localidade"
+msgstr "Local"
#: actions/siteadminpanel.php:301
msgid "Default timezone"
-msgstr ""
+msgstr "Fuso horário, por omissão"
#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
-msgstr ""
+msgstr "Fuso horário por omissão, para o site; normalmente, UTC."
#: actions/siteadminpanel.php:308
msgid "Default site language"
-msgstr ""
+msgstr "Língua do site, por omissão"
#: actions/siteadminpanel.php:316
msgid "URLs"
-msgstr ""
+msgstr "URLs"
#: actions/siteadminpanel.php:319
msgid "Server"
-msgstr ""
+msgstr "Servidor"
#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
-msgstr ""
+msgstr "Hostname do servidor do site."
#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
-msgstr ""
+msgstr "URLs caprichosas"
#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
+msgstr "Usar URLs caprichosas (fancy URLs) mais legíveis e memoráveis"
#: actions/siteadminpanel.php:331
-#, fuzzy
msgid "Access"
-msgstr "Aceitar"
+msgstr "Acesso"
#: actions/siteadminpanel.php:334
msgid "Private"
-msgstr ""
+msgstr "Privado"
#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
+msgstr "Proibir utilizadores anónimos (sem sessão iniciada) de ver o site?"
#: actions/siteadminpanel.php:340
-#, fuzzy
msgid "Invite only"
-msgstr "Convidar"
+msgstr "Só por convite"
#: actions/siteadminpanel.php:342
msgid "Make registration invitation only."
-msgstr ""
+msgstr "Permitir o registo só a convidados."
#: actions/siteadminpanel.php:346
-#, fuzzy
msgid "Closed"
-msgstr "Bloquear"
+msgstr "Fechado"
#: actions/siteadminpanel.php:348
msgid "Disable new registrations."
-msgstr ""
+msgstr "Impossibilitar registos novos."
#: actions/siteadminpanel.php:354
msgid "Snapshots"
-msgstr ""
+msgstr "Instantâneos"
#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
-msgstr ""
+msgstr "Aleatoriamente, durante o acesso pela internet"
#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
-msgstr ""
+msgstr "Num processo agendado"
#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
msgid "Never"
-msgstr ""
+msgstr "Nunca"
#: actions/siteadminpanel.php:360
msgid "Data snapshots"
-msgstr ""
+msgstr "Instantâneos dos dados"
#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
-msgstr ""
+msgstr "Quando enviar dados estatísticos para os servidores do status.net"
#: actions/siteadminpanel.php:366
msgid "Frequency"
-msgstr ""
+msgstr "Frequência"
#: actions/siteadminpanel.php:367
msgid "Snapshots will be sent once every N web hits"
-msgstr ""
+msgstr "Instantâneos serão enviados uma vez a cada N acessos da internet"
#: actions/siteadminpanel.php:372
msgid "Report URL"
-msgstr ""
+msgstr "URL para relatórios"
#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
-msgstr ""
+msgstr "Instantâneos serão enviados para esta URL"
#: actions/siteadminpanel.php:380
msgid "SSL"
-msgstr ""
+msgstr "SSL"
#: actions/siteadminpanel.php:384
msgid "Sometimes"
-msgstr ""
+msgstr "Às vezes"
#: actions/siteadminpanel.php:385
msgid "Always"
-msgstr ""
+msgstr "Sempre"
#: actions/siteadminpanel.php:387
msgid "Use SSL"
-msgstr ""
+msgstr "Usar SSL"
#: actions/siteadminpanel.php:388
msgid "When to use SSL"
-msgstr ""
+msgstr "Quando usar SSL"
#: actions/siteadminpanel.php:393
msgid "SSL Server"
-msgstr ""
+msgstr "Servidor SSL"
#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
-msgstr ""
+msgstr "Servidor para onde encaminhar pedidos SSL"
#: actions/siteadminpanel.php:400
msgid "Limits"
-msgstr ""
+msgstr "Limites"
#: actions/siteadminpanel.php:403
msgid "Text limit"
-msgstr ""
+msgstr "Limite de texto"
#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
-msgstr ""
+msgstr "Número máximo de caracteres nas notas."
#: actions/siteadminpanel.php:407
msgid "Dupe limit"
-msgstr ""
+msgstr "Limite de dupes (duplicações)"
#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
+"Quanto tempo os utilizadores terão de esperar (em segundos) para publicar a "
+"mesma coisa outra vez."
#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
-#, fuzzy
msgid "Save site settings"
-msgstr "Definições do Email"
+msgstr "Gravar configurações do site"
#: actions/smssettings.php:58
msgid "SMS Settings"
-msgstr ""
+msgstr "Configurações de SMS"
#: actions/smssettings.php:69
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
+msgstr "Pode receber SMSs do site %%site.name%% por correio electrónico."
#: actions/smssettings.php:91
msgid "SMS is not available."
-msgstr ""
+msgstr "SMS não está disponível."
#: actions/smssettings.php:112
msgid "Current confirmed SMS-enabled phone number."
@@ -3362,59 +3443,60 @@ msgstr "Introduza o código que recebeu no seu telefone."
#: actions/smssettings.php:138
msgid "SMS Phone number"
-msgstr ""
+msgstr "Número de telefone para SMS"
#: actions/smssettings.php:140
msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
+msgstr "Número de telefone, sem pontuação ou espaços, com código de área"
#: actions/smssettings.php:174
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
msgstr ""
+"Enviem-me notas por SMS; compreendo que o meu operador poderá vir a facturar-"
+"me montantes exorbitantes."
#: actions/smssettings.php:306
msgid "No phone number."
-msgstr "Nenhum numero de telefone."
+msgstr "Nenhum número de telefone."
#: actions/smssettings.php:311
msgid "No carrier selected."
-msgstr ""
+msgstr "Operador não foi seleccionado."
#: actions/smssettings.php:318
msgid "That is already your phone number."
-msgstr ""
+msgstr "Esse já é o seu número de telefone."
#: actions/smssettings.php:321
msgid "That phone number already belongs to another user."
-msgstr ""
+msgstr "Esse número de telefone já pertence a outro utilizador."
#: actions/smssettings.php:347
-#, fuzzy
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
msgstr ""
-"Um código de confirmação foi enviado para o número de telefone fornecido. "
-"Procure na sua 'Caixa de Entrada' (e caixa de spam) pelo email com o código "
-"e instrucções de utilização."
+"Foi enviado um código de confirmação para o telefone que forneceu. Verifique "
+"no seu telefone se recebeu o código e as respectivas instruções de "
+"utilização."
#: actions/smssettings.php:374
msgid "That is the wrong confirmation number."
-msgstr ""
+msgstr "Esse número de confirmação está errado."
#: actions/smssettings.php:405
msgid "That is not your phone number."
-msgstr ""
+msgstr "Esse número de telefone não é o seu."
#: actions/smssettings.php:465
msgid "Mobile carrier"
-msgstr ""
+msgstr "Operador móvel"
#: actions/smssettings.php:469
msgid "Select a carrier"
-msgstr ""
+msgstr "Seleccione um operador"
#: actions/smssettings.php:476
#, php-format
@@ -3422,6 +3504,9 @@ 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 ""
+"O seu operador móvel. Se conhece um operador que aceita SMSs sobre corrreio "
+"electrónico mas não está listado, diga-nos enviando um correio electrónico "
+"para %s."
#: actions/smssettings.php:498
msgid "No code entered"
@@ -3429,49 +3514,51 @@ msgstr "Nenhum código introduzido"
#: actions/subedit.php:70
msgid "You are not subscribed to that profile."
-msgstr ""
+msgstr "Não subscreveu esse perfil."
#: actions/subedit.php:83
msgid "Could not save subscription."
-msgstr ""
+msgstr "Não foi possível gravar a subscrição."
#: actions/subscribe.php:55
msgid "Not a local user."
-msgstr ""
+msgstr "O utilizador não é local."
#: actions/subscribe.php:69
msgid "Subscribed"
-msgstr ""
+msgstr "Subscrito"
#: actions/subscribers.php:50
#, php-format
msgid "%s subscribers"
-msgstr ""
+msgstr "Subscritores de %s"
#: actions/subscribers.php:52
#, php-format
msgid "%s subscribers, page %d"
-msgstr ""
+msgstr "Subscritores de %s, página %d"
#: actions/subscribers.php:63
msgid "These are the people who listen to your notices."
-msgstr ""
+msgstr "Estas são as pessoas que escutam as suas notas."
#: actions/subscribers.php:67
#, php-format
msgid "These are the people who listen to %s's notices."
-msgstr ""
+msgstr "Estas são as pessoas que escutam as notas de %s."
#: actions/subscribers.php:108
msgid ""
"You have no subscribers. Try subscribing to people you know and they might "
"return the favor"
msgstr ""
+"Não tem subscritores. Tente subscrever pessoas que conhece e talvez elas lhe "
+"façam o mesmo favor"
#: actions/subscribers.php:110
#, php-format
msgid "%s has no subscribers. Want to be the first?"
-msgstr ""
+msgstr "%s não tem subscritores. Quer ser o primeiro?"
#: actions/subscribers.php:114
#, php-format
@@ -3479,25 +3566,27 @@ msgid ""
"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
"%) and be the first?"
msgstr ""
+"%s não tem subscritores. Quer [registar uma conta](%%%%action.register%%%%) "
+"e ser o primeiro?"
#: actions/subscriptions.php:52
-#, fuzzy, php-format
+#, php-format
msgid "%s subscriptions"
-msgstr "Todas as subscrições"
+msgstr "Subscrições de %s"
#: actions/subscriptions.php:54
-#, fuzzy, php-format
+#, php-format
msgid "%s subscriptions, page %d"
-msgstr "Todas as subscrições"
+msgstr "Subscrições de %s, página %d"
#: actions/subscriptions.php:65
msgid "These are the people whose notices you listen to."
-msgstr ""
+msgstr "Estas são as pessoas cujas notas está a escutar."
#: actions/subscriptions.php:69
#, php-format
msgid "These are the people whose notices %s listens to."
-msgstr ""
+msgstr "Estas são as pessoas cujas notas %s está a escutar."
#: actions/subscriptions.php:121
#, php-format
@@ -3508,217 +3597,218 @@ msgid ""
"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
"automatically subscribe to people you already follow there."
msgstr ""
+"Neste momento, não está a escutar as notas de ninguém. Tente subscrever "
+"pessoas que conhece. Tente a [pesquisa de pessoas](%%action.peoplesearch%%), "
+"procure membros nos grupos do seu interesse e nos nossos [utilizadores em "
+"destaque](%%action.featured%%). Se é [utilizador do Twitter](%%action."
+"twittersettings%%) pode subscrever automaticamente as pessoas que já segue "
+"lá."
#: actions/subscriptions.php:123 actions/subscriptions.php:127
-#, fuzzy, php-format
+#, php-format
msgid "%s is not listening to anyone."
-msgstr "%1$s está agora a ouvir os seus comunicados em %2$s."
+msgstr "%s não está a ouvir ninguém."
#: actions/subscriptions.php:194
msgid "Jabber"
-msgstr ""
+msgstr "Jabber"
#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
msgid "SMS"
-msgstr ""
+msgstr "SMS"
#: actions/tagother.php:33
msgid "Not logged in"
-msgstr ""
+msgstr "Não iniciou sessão."
#: actions/tagother.php:39
msgid "No id argument."
-msgstr ""
+msgstr "Argumento de identificação em falta."
#: actions/tagother.php:65
#, php-format
msgid "Tag %s"
-msgstr ""
+msgstr "Categoria %s"
#: actions/tagother.php:77 lib/userprofile.php:75
msgid "User profile"
-msgstr ""
+msgstr "Perfil"
#: actions/tagother.php:81 lib/userprofile.php:102
msgid "Photo"
-msgstr ""
+msgstr "Foto"
#: actions/tagother.php:141
msgid "Tag user"
-msgstr ""
+msgstr "Categorizar utilizador"
#: actions/tagother.php:151
msgid ""
"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
"separated"
msgstr ""
+"Categorias para este utilizador (letras, números, ., _), separadas por "
+"vírgulas ou espaços"
#: actions/tagother.php:193
msgid ""
"You can only tag people you are subscribed to or who are subscribed to you."
-msgstr ""
+msgstr "Só pode categorizar pessoas que subscreve ou os seus subscritores."
#: actions/tagother.php:200
msgid "Could not save tags."
-msgstr ""
+msgstr "Não foi possível gravar as categorias."
#: actions/tagother.php:236
msgid "Use this form to add tags to your subscribers or subscriptions."
msgstr ""
+"Use este formulário para categorizar os seus subscritores ou os que "
+"subscreve."
#: actions/tag.php:68
#, php-format
msgid "Notices tagged with %s, page %d"
-msgstr ""
+msgstr "Notas categorizadas com %s, página %d"
#: actions/tag.php:86
#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr ""
+msgstr "Feed de notas para a categoria %s (RSS 1.0)"
#: actions/tag.php:92
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Feed para a tag %s"
+msgstr "Feed de notas para a categoria %s (RSS 2.0)"
#: actions/tag.php:98
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for tag %s (Atom)"
-msgstr "Feed para a tag %s"
+msgstr "Feed de notas para a categoria %s (Atom)"
#: actions/tagrss.php:35
msgid "No such tag."
-msgstr ""
+msgstr "Categoria não existe."
#: actions/twitapitrends.php:87
msgid "API method under construction."
-msgstr "Método da API em construcção."
+msgstr "Método da API está em construção."
#: actions/unblock.php:59
-#, fuzzy
msgid "You haven't blocked that user."
-msgstr "Desbloquear este utilizador"
+msgstr "Não bloqueou esse utilizador."
#: actions/unsandbox.php:72
-#, fuzzy
msgid "User is not sandboxed."
-msgstr "O utilizador bloqueou-o."
+msgstr "Utilizador não está descronolinhado."
#: actions/unsilence.php:72
-#, fuzzy
msgid "User is not silenced."
-msgstr "O utilizador bloqueou-o."
+msgstr "Utilizador não está silenciado."
#: actions/unsubscribe.php:77
msgid "No profile id in request."
-msgstr ""
+msgstr "O pedido não tem a identificação do perfil."
#: actions/unsubscribe.php:84
msgid "No profile with that id."
-msgstr ""
+msgstr "Não existe um perfil com essa identificação."
#: actions/unsubscribe.php:98
msgid "Unsubscribed"
-msgstr ""
+msgstr "Subscrição cancelada"
#: actions/updateprofile.php:62 actions/userauthorization.php:330
#, php-format
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
+"Licença ‘%s’ da listenee stream não é compatível com a licença ‘%s’ do site."
#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
#: lib/personalgroupnav.php:115
msgid "User"
-msgstr ""
+msgstr "Utilizador"
#: actions/useradminpanel.php:69
msgid "User settings for this StatusNet site."
-msgstr ""
+msgstr "Configurações do utilizador para este site StatusNet."
#: actions/useradminpanel.php:149
msgid "Invalid bio limit. Must be numeric."
-msgstr ""
+msgstr "Limite da biografia inválido. Tem de ser numérico."
#: actions/useradminpanel.php:155
msgid "Invalid welcome text. Max length is 255 characters."
-msgstr ""
+msgstr "Texto de boas-vindas inválido. Tamanho máx. é 255 caracteres."
#: actions/useradminpanel.php:165
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
-msgstr ""
+msgstr "Subscrição predefinida é inválida: '%1$s' não é utilizador."
#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
-msgstr ""
+msgstr "Perfil"
#: actions/useradminpanel.php:222
msgid "Bio Limit"
-msgstr ""
+msgstr "Limite da Bio"
#: actions/useradminpanel.php:223
msgid "Maximum length of a profile bio in characters."
-msgstr ""
+msgstr "Tamanho máximo de uma biografia em caracteres."
#: actions/useradminpanel.php:231
-#, fuzzy
msgid "New users"
-msgstr "Convidar novos utilizadores"
+msgstr "Utilizadores novos"
#: actions/useradminpanel.php:235
msgid "New user welcome"
-msgstr ""
+msgstr "Boas-vindas a utilizadores novos"
#: actions/useradminpanel.php:236
msgid "Welcome text for new users (Max 255 chars)."
-msgstr ""
+msgstr "Texto de boas-vindas a utilizadores novos (máx. 255 caracteres)."
#: actions/useradminpanel.php:241
-#, fuzzy
msgid "Default subscription"
-msgstr "Todas as subscrições"
+msgstr "Subscrição predefinida"
#: actions/useradminpanel.php:242
-#, fuzzy
msgid "Automatically subscribe new users to this user."
-msgstr ""
-"Subscrever automaticamente a quem se subscrever a mim (recomendado para não-"
-"humanos)"
+msgstr "Novos utilizadores subscrevem automaticamente este utilizador."
#: actions/useradminpanel.php:251
-#, fuzzy
msgid "Invitations"
-msgstr "Contive(s) enviado(s)"
+msgstr "Convites"
#: actions/useradminpanel.php:256
-#, fuzzy
msgid "Invitations enabled"
-msgstr "Contive(s) enviado(s)"
+msgstr "Convites possibilitados"
#: actions/useradminpanel.php:258
msgid "Whether to allow users to invite new users."
-msgstr ""
+msgstr "Permitir, ou não, que utilizadores convidem utilizadores novos."
#: actions/useradminpanel.php:265
msgid "Sessions"
-msgstr ""
+msgstr "Sessões"
#: actions/useradminpanel.php:270
msgid "Handle sessions"
-msgstr ""
+msgstr "Gerir sessões"
#: actions/useradminpanel.php:272
msgid "Whether to handle sessions ourselves."
-msgstr ""
+msgstr "Se devemos gerir sessões nós próprios."
#: actions/useradminpanel.php:276
msgid "Session debugging"
-msgstr ""
+msgstr "Depuração de sessões"
#: actions/useradminpanel.php:278
msgid "Turn on debugging output for sessions."
-msgstr ""
+msgstr "Ligar a impressão de dados de depuração, para sessões."
#: actions/userauthorization.php:105
msgid "Authorize subscription"
@@ -3730,10 +3820,13 @@ msgid ""
"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
"click “Reject”."
msgstr ""
+"Por favor, verifique estes detalhes para se certificar de que deseja "
+"subscrever as notas deste utilizador. Se não fez um pedido para subscrever "
+"as notas de alguém, simplesmente clique \"Rejeitar\"."
#: actions/userauthorization.php:188
msgid "License"
-msgstr ""
+msgstr "Licença"
#: actions/userauthorization.php:209
msgid "Accept"
@@ -3746,20 +3839,19 @@ msgstr "Subscrever este utilizador"
#: actions/userauthorization.php:211
msgid "Reject"
-msgstr ""
+msgstr "Rejeitar"
#: actions/userauthorization.php:212
-#, fuzzy
msgid "Reject this subscription"
-msgstr "Todas as subscrições"
+msgstr "Rejeitar esta subscrição"
#: actions/userauthorization.php:225
msgid "No authorization request!"
-msgstr ""
+msgstr "Não há pedido de autorização!"
#: actions/userauthorization.php:247
msgid "Subscription authorized"
-msgstr ""
+msgstr "Subscrição autorizada"
#: actions/userauthorization.php:249
msgid ""
@@ -3767,10 +3859,13 @@ msgid ""
"with the site’s instructions for details on how to authorize the "
"subscription. Your subscription token is:"
msgstr ""
+"A subscrição foi autorizada, mas não foi enviada nenhuma URL de retorno. "
+"Verifique as instruções do site para saber como autorizar a subscrição. A "
+"sua chave de subscrição é:"
#: actions/userauthorization.php:259
msgid "Subscription rejected"
-msgstr ""
+msgstr "Subscrição rejeitada"
#: actions/userauthorization.php:261
msgid ""
@@ -3778,41 +3873,44 @@ msgid ""
"with the site’s instructions for details on how to fully reject the "
"subscription."
msgstr ""
+"A subscrição foi rejeitada, mas não foi enviada nenhuma URL de retorno. "
+"Verifique as instruções do site para saber como rejeitar completamente a "
+"subscrição."
#: actions/userauthorization.php:296
#, php-format
msgid "Listener URI ‘%s’ not found here"
-msgstr ""
+msgstr "Listener URI ‘%s’ não foi encontrado aqui"
#: actions/userauthorization.php:301
#, php-format
msgid "Listenee URI ‘%s’ is too long."
-msgstr ""
+msgstr "Listenee URI ‘%s’ é demasiado longo."
#: actions/userauthorization.php:307
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
-msgstr ""
+msgstr "Listenee URI ‘%s’ é um utilizador local."
#: actions/userauthorization.php:322
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
-msgstr ""
+msgstr "A URL ‘%s’ do perfil é de um utilizador local."
#: actions/userauthorization.php:338
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
-msgstr ""
+msgstr "A URL ‘%s’ do avatar é inválida."
#: actions/userauthorization.php:343
-#, fuzzy, php-format
+#, php-format
msgid "Can’t read avatar URL ‘%s’."
-msgstr "Não é possível ler o URL do avatar '%s'"
+msgstr "Não é possível ler a URL do avatar ‘%s’."
#: actions/userauthorization.php:348
#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
-msgstr ""
+msgstr "Tipo de imagem incorrecto para o avatar da URL ‘%s’."
#: actions/userbyid.php:70
msgid "No id."
@@ -3820,36 +3918,38 @@ msgstr ""
#: actions/userdesignsettings.php:76 lib/designsettings.php:65
msgid "Profile design"
-msgstr ""
+msgstr "Design do perfil"
#: 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 ""
+"Personalize o aspecto do seu perfil com uma imagem de fundo e uma paleta de "
+"cores à sua escolha."
#: actions/userdesignsettings.php:282
msgid "Enjoy your hotdog!"
-msgstr ""
+msgstr "Disfrute do seu cachorro-quente!"
#: actions/usergroups.php:64
#, php-format
msgid "%s groups, page %d"
-msgstr ""
+msgstr "Grupos de %s, página %d"
#: actions/usergroups.php:130
msgid "Search for more groups"
-msgstr ""
+msgstr "Procurar mais grupos"
#: actions/usergroups.php:153
#, php-format
msgid "%s is not a member of any group."
-msgstr ""
+msgstr "%s não é membro de nenhum grupo."
#: actions/usergroups.php:158
#, php-format
msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
-msgstr ""
+msgstr "Tente [pesquisar grupos](%%action.groupsearch%%) e juntar-se a eles."
#: classes/File.php:137
#, php-format
@@ -3857,78 +3957,85 @@ msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
"to upload a smaller version."
msgstr ""
+"Nenhum ficheiro pode ter mais de %d bytes e o que enviou tinha %d bytes. "
+"Tente carregar uma versão menor."
#: classes/File.php:147
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
+"Um ficheiro desta dimensão excederia a sua quota de utilizador de %d bytes."
#: classes/File.php:154
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
-msgstr ""
+msgstr "Um ficheiro desta dimensão excederia a sua quota mensal de %d bytes."
#: classes/Message.php:45
msgid "You are banned from sending direct messages."
-msgstr ""
+msgstr "Está proibido de enviar mensagens directas."
#: classes/Message.php:61
msgid "Could not insert message."
-msgstr ""
+msgstr "Não foi possível inserir a mensagem."
#: classes/Message.php:71
msgid "Could not update message with new URI."
-msgstr ""
+msgstr "Não foi possível actualizar a mensagem com a nova URI."
#: classes/Notice.php:164
#, php-format
msgid "DB error inserting hashtag: %s"
-msgstr "Ocorreu um erro na base de dados ao inserir a hashtag: %s"
+msgstr "Erro na base de dados ao inserir a hashtag: %s"
#: classes/Notice.php:179
msgid "Problem saving notice. Too long."
-msgstr ""
+msgstr "Problema na gravação da nota. Demasiado longa."
#: classes/Notice.php:183
msgid "Problem saving notice. Unknown user."
-msgstr ""
+msgstr "Problema na gravação da nota. Utilizador desconhecido."
#: classes/Notice.php:188
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
+"Demasiadas notas, demasiado rápido; descanse e volte a publicar daqui a "
+"alguns minutos."
#: classes/Notice.php:194
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
+"Demasiadas mensagens duplicadas, demasiado rápido; descanse e volte a "
+"publicar daqui a alguns minutos."
#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
-msgstr ""
+msgstr "Está proibido de publicar notas neste site."
#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
-msgstr ""
+msgstr "Problema na gravação da nota."
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Ocorreu um erro na base de dados ao inserir a resposta: %s"
#: classes/User_group.php:380
msgid "Could not create group."
-msgstr ""
+msgstr "Não foi possível criar o grupo."
#: classes/User_group.php:409
msgid "Could not set group membership."
-msgstr ""
+msgstr "Não foi possível configurar membros do grupo."
#: classes/User.php:347
#, php-format
msgid "Welcome to %1$s, @%2$s!"
-msgstr ""
+msgstr "%1$s dá-lhe as boas-vindas, @%2$s!"
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
@@ -3936,7 +4043,7 @@ msgstr "Modificar as suas definições de perfil"
#: lib/accountsettingsaction.php:112
msgid "Upload an avatar"
-msgstr ""
+msgstr "Carregar um avatar"
#: lib/accountsettingsaction.php:116
msgid "Change your password"
@@ -3948,28 +4055,28 @@ msgstr "Alterar email handling"
#: lib/accountsettingsaction.php:124
msgid "Design your profile"
-msgstr ""
+msgstr "Altere o design do seu perfil"
#: lib/accountsettingsaction.php:128
msgid "Other"
-msgstr ""
+msgstr "Outras"
#: lib/accountsettingsaction.php:128
msgid "Other options"
-msgstr ""
+msgstr "Outras opções"
#: lib/action.php:144
-#, fuzzy, php-format
+#, php-format
msgid "%s - %s"
-msgstr "%s (%s)"
+msgstr "%s - %s"
#: lib/action.php:159
msgid "Untitled page"
-msgstr ""
+msgstr "Página sem título"
#: lib/action.php:425
msgid "Primary site navigation"
-msgstr ""
+msgstr "Navegação primária deste site"
#: lib/action.php:431
msgid "Home"
@@ -3977,30 +4084,27 @@ msgstr "Início"
#: lib/action.php:431
msgid "Personal profile and friends timeline"
-msgstr ""
+msgstr "Perfil pessoal e cronolinha dos amigos"
#: lib/action.php:433
-#, fuzzy
msgid "Account"
-msgstr "Sobre"
+msgstr "Conta"
#: lib/action.php:433
-#, fuzzy
msgid "Change your email, avatar, password, profile"
-msgstr "Modificar a sua palavra-passe"
+msgstr "Altere o seu endereço electrónico, avatar, palavra-chave, perfil"
#: lib/action.php:436
msgid "Connect"
msgstr "Ligar"
#: lib/action.php:436
-#, fuzzy
msgid "Connect to services"
-msgstr "Não foi possível redireccionar para o servidor: %s"
+msgstr "Ligar aos serviços"
#: lib/action.php:440
msgid "Change site configuration"
-msgstr ""
+msgstr "Alterar a configuração do site"
#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
@@ -4009,7 +4113,7 @@ msgstr "Convidar"
#: lib/action.php:445 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
+msgstr "Convidar amigos e colegas para se juntarem a si em %s"
#: lib/action.php:450
msgid "Logout"
@@ -4017,16 +4121,15 @@ msgstr "Sair"
#: lib/action.php:450
msgid "Logout from the site"
-msgstr ""
+msgstr "Terminar esta sessão"
#: lib/action.php:455
-#, fuzzy
msgid "Create an account"
-msgstr "Ligar conta existente"
+msgstr "Criar uma conta"
#: lib/action.php:458
msgid "Login to the site"
-msgstr ""
+msgstr "Iniciar uma sessão"
#: lib/action.php:461 lib/action.php:724
msgid "Help"
@@ -4034,31 +4137,31 @@ msgstr "Ajuda"
#: lib/action.php:461
msgid "Help me!"
-msgstr ""
+msgstr "Ajudem-me!"
#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
-msgstr ""
+msgstr "Pesquisar"
#: lib/action.php:464
msgid "Search for people or text"
-msgstr ""
+msgstr "Procurar pessoas ou pesquisar texto"
#: lib/action.php:485
msgid "Site notice"
-msgstr ""
+msgstr "Aviso do site"
#: lib/action.php:551
msgid "Local views"
-msgstr ""
+msgstr "Vistas locais"
#: lib/action.php:617
msgid "Page notice"
-msgstr ""
+msgstr "Aviso da página"
#: lib/action.php:719
msgid "Secondary site navigation"
-msgstr ""
+msgstr "Navegação secundária deste site"
#: lib/action.php:726
msgid "About"
@@ -4070,15 +4173,15 @@ msgstr "FAQ"
#: lib/action.php:732
msgid "TOS"
-msgstr ""
+msgstr "Condições do Serviço"
#: lib/action.php:735
msgid "Privacy"
-msgstr ""
+msgstr "Privacidade"
#: lib/action.php:737
msgid "Source"
-msgstr ""
+msgstr "Fonte"
#: lib/action.php:739
msgid "Contact"
@@ -4086,11 +4189,11 @@ msgstr "Contacto"
#: lib/action.php:741
msgid "Badge"
-msgstr ""
+msgstr "Emblema"
#: lib/action.php:769
msgid "StatusNet software license"
-msgstr ""
+msgstr "Licença de software do StatusNet"
#: lib/action.php:772
#, php-format
@@ -4098,13 +4201,13 @@ msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
msgstr ""
-"**%%site.name%%*** é um serviço de microblogging trazido até sí por [%%site."
+"**%%site.name%%*** é um serviço de microblogues disponibilizado por [%%site."
"broughtby%%](%%site.broughtbyurl%%)."
#: lib/action.php:774
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** é um serviço de microblogging. "
+msgstr "**%%site.name%%** é um serviço de microblogues. "
#: lib/action.php:776
#, php-format
@@ -4113,11 +4216,13 @@ msgid ""
"s, available under the [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
+"Usa o software de microblogues [StatusNet](http://status.net/), versão %s, "
+"disponibilizado nos termos da [GNU Affero General Public License](http://www."
+"fsf.org/licensing/licenses/agpl-3.0.html)."
#: lib/action.php:790
-#, fuzzy
msgid "Site content license"
-msgstr "Encontrar conteúdo dos mensagens"
+msgstr "Licença de conteúdos do site"
#: lib/action.php:799
msgid "All "
@@ -4125,106 +4230,101 @@ msgstr ""
#: lib/action.php:804
msgid "license."
-msgstr ""
+msgstr "licença."
#: lib/action.php:1068
msgid "Pagination"
-msgstr ""
+msgstr "Paginação"
#: lib/action.php:1077
msgid "After"
-msgstr ""
+msgstr "Depois"
#: lib/action.php:1085
-#, fuzzy
msgid "Before"
-msgstr "Antes »"
+msgstr "Antes"
#: lib/action.php:1133
msgid "There was a problem with your session token."
-msgstr ""
+msgstr "Ocorreu um problema com a sua chave de sessão."
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
-msgstr ""
+msgstr "Não pode fazer alterações a este site."
#: lib/adminpanelaction.php:195
msgid "showForm() not implemented."
-msgstr ""
+msgstr "showForm() não implementado."
#: lib/adminpanelaction.php:224
msgid "saveSettings() not implemented."
-msgstr ""
+msgstr "saveSettings() não implementado."
#: lib/adminpanelaction.php:247
msgid "Unable to delete design setting."
-msgstr ""
+msgstr "Não foi possível apagar a configuração do design."
#: lib/adminpanelaction.php:300
-#, fuzzy
msgid "Basic site configuration"
-msgstr "Confirmação do Endereço de Email"
+msgstr "Configuração básica do site"
#: lib/adminpanelaction.php:303
-#, fuzzy
msgid "Design configuration"
-msgstr "Confirmação do Endereço de Email"
+msgstr "Configuração do design"
#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
-#, fuzzy
msgid "Paths configuration"
-msgstr "Confirmação do Endereço de Email"
+msgstr "Configuração dos directórios"
#: lib/attachmentlist.php:87
msgid "Attachments"
-msgstr ""
+msgstr "Anexos"
#: lib/attachmentlist.php:265
msgid "Author"
-msgstr ""
+msgstr "Autor"
#: lib/attachmentlist.php:278
msgid "Provider"
-msgstr ""
+msgstr "Fornecedor"
#: lib/attachmentnoticesection.php:67
msgid "Notices where this attachment appears"
-msgstr ""
+msgstr "Notas em que este anexo aparece"
#: lib/attachmenttagcloudsection.php:48
msgid "Tags for this attachment"
-msgstr ""
+msgstr "Categorias para este anexo"
#: lib/channel.php:138 lib/channel.php:158
msgid "Command results"
-msgstr ""
+msgstr "Resultados do comando"
#: lib/channel.php:210
msgid "Command complete"
-msgstr ""
+msgstr "Comando terminado"
#: lib/channel.php:221
msgid "Command failed"
-msgstr ""
+msgstr "Comando falhou"
#: lib/command.php:44
msgid "Sorry, this command is not yet implemented."
-msgstr ""
+msgstr "Desculpe, este comando ainda não foi implementado."
#: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a user with nickname %s"
-msgstr ""
-"Não foi possivel actualizar utilizador com endereço de email confirmado."
+msgstr "Não foi encontrado um utilizador com a alcunha %s"
#: lib/command.php:92
msgid "It does not make a lot of sense to nudge yourself!"
-msgstr ""
+msgstr "Não faz muito sentido acotovelar-nos a nós mesmos!"
#: lib/command.php:99
#, php-format
msgid "Nudge sent to %s"
-msgstr ""
+msgstr "Cotovelada enviada a %s"
#: lib/command.php:126
#, php-format
@@ -4233,151 +4333,140 @@ msgid ""
"Subscribers: %2$s\n"
"Notices: %3$s"
msgstr ""
+"Subscrições: %1$s\n"
+"Subscritores: %2$s\n"
+"Notas: %3$s"
#: lib/command.php:152 lib/command.php:400
msgid "Notice with that id does not exist"
-msgstr ""
+msgstr "Não existe nenhuma nota com essa identificação"
#: lib/command.php:168 lib/command.php:416 lib/command.php:471
msgid "User has no last notice"
-msgstr ""
+msgstr "Utilizador não tem nenhuma última nota"
#: lib/command.php:190
msgid "Notice marked as fave."
-msgstr ""
+msgstr "Nota marcada como favorita."
#: lib/command.php:315
#, php-format
msgid "%1$s (%2$s)"
-msgstr ""
+msgstr "%1$s (%2$s)"
#: lib/command.php:318
#, php-format
msgid "Fullname: %s"
-msgstr ""
+msgstr "Nome completo: %s"
#: lib/command.php:321
#, php-format
msgid "Location: %s"
-msgstr ""
+msgstr "Localidade: %s"
#: lib/command.php:324
#, php-format
msgid "Homepage: %s"
-msgstr ""
+msgstr "Página de acolhimento: %s"
#: lib/command.php:327
#, php-format
msgid "About: %s"
-msgstr ""
+msgstr "Sobre: %s"
#: lib/command.php:358 scripts/xmppdaemon.php:321
#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr ""
+msgstr "Mensagem demasiado extensa - máx. %d caracteres, enviou %d"
#: lib/command.php:377
msgid "Error sending direct message."
-msgstr ""
+msgstr "Erro no envio da mensagem directa."
#: lib/command.php:431
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr ""
+msgstr "Nota demasiado extensa - máx. %d caracteres, enviou %d"
#: lib/command.php:439
-#, fuzzy, php-format
+#, php-format
msgid "Reply to %s sent"
-msgstr "Não é possível remover a mensagem."
+msgstr "Resposta a %s enviada"
#: lib/command.php:441
-#, fuzzy
msgid "Error saving notice."
-msgstr "Erro ao guardar o utilizador."
+msgstr "Erro ao gravar nota."
#: lib/command.php:495
msgid "Specify the name of the user to subscribe to"
-msgstr ""
+msgstr "Introduza o nome do utilizador para subscrever"
#: lib/command.php:502
#, php-format
msgid "Subscribed to %s"
-msgstr ""
+msgstr "Subscreveu o(a) %s"
#: lib/command.php:523
msgid "Specify the name of the user to unsubscribe from"
-msgstr ""
+msgstr "Introduza o nome do utilizador para deixar de subscrever"
#: lib/command.php:530
#, php-format
msgid "Unsubscribed from %s"
-msgstr ""
+msgstr "Deixou de subscrever o(a) %s"
#: lib/command.php:548 lib/command.php:571
msgid "Command not yet implemented."
-msgstr ""
+msgstr "Comando ainda não implementado."
#: lib/command.php:551
msgid "Notification off."
-msgstr ""
+msgstr "Notificação desligada."
#: lib/command.php:553
msgid "Can't turn off notification."
-msgstr ""
+msgstr "Não foi possível desligar a notificação."
#: lib/command.php:574
msgid "Notification on."
-msgstr ""
+msgstr "Notificação ligada."
#: lib/command.php:576
msgid "Can't turn on notification."
-msgstr ""
-
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Não foi possível criar o formulário de OpenID: %s"
+msgstr "Não foi possível ligar a notificação."
-#: 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:618
-#, fuzzy
+#: lib/command.php:592
msgid "You are not subscribed to anyone."
-msgstr "Não foi possível subscrever outros a si."
+msgstr "Não subscreveu ninguém."
-#: lib/command.php:620
-#, fuzzy
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
-msgstr[0] "Não foi possível subscrever outros a si."
-msgstr[1] "Não foi possível subscrever outros a si."
+msgstr[0] "Subscreve esta pessoa:"
+msgstr[1] "Subscreve estas pessoas:"
-#: lib/command.php:640
-#, fuzzy
+#: lib/command.php:614
msgid "No one is subscribed to you."
-msgstr "Não foi possível subscrever outros a si."
+msgstr "Ninguém subscreve as suas notas."
-#: lib/command.php:642
-#, fuzzy
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
-msgstr[0] "Não foi possível subscrever outros a si."
-msgstr[1] "Não foi possível subscrever outros a si."
+msgstr[0] "Esta pessoa subscreve as suas notas:"
+msgstr[1] "Estas pessoas subscrevem as suas notas:"
-#: lib/command.php:662
+#: lib/command.php:636
msgid "You are not a member of any groups."
-msgstr ""
+msgstr "Não está em nenhum grupo."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Está no grupo:"
+msgstr[1] "Está nos grupos:"
-#: lib/command.php:678
+#: lib/command.php:652
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4396,7 +4485,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4415,23 +4503,57 @@ msgid ""
"tracks - not yet implemented.\n"
"tracking - not yet implemented.\n"
msgstr ""
+"Comandos:\n"
+"on - ligar notificações\n"
+"off - desligar notificações\n"
+"help - mostrar esta ajuda\n"
+"follow <alcunha> - subscrever este utilizador\n"
+"groups - lista os grupos a que se juntou\n"
+"subscriptions - lista as pessoas que está a seguir\n"
+"subscribers - lista as pessoas que estão a segui-lo(a)\n"
+"leave <alcunha> - deixar de subscrever este utilizador\n"
+"d <alcunha> <texto> - mensagem directa para o utilizador\n"
+"get <alcunha> - receber última nota do utilizador\n"
+"whois <alcunha> - receber perfil do utilizador\n"
+"fav <alcunha> - adicionar última nota do utilizador às favoritas\n"
+"fav #<id_da_nota> - adicionar nota com esta identificação às favoritas\n"
+"reply #<id_da_nota> - responder à nota com esta identificação\n"
+"reply <alcunha> - responder à última nota do utilizador\n"
+"join <grupo> - juntar-se ao grupo\n"
+"login - Receber uma ligação para iniciar sessão na interface web\n"
+"drop <grupo> - afastar-se do grupo\n"
+"stats - receber as suas estatísticas\n"
+"stop - o mesmo que 'off'\n"
+"quit - o mesmo que 'off'\n"
+"sub <alcunha> - o mesmo que 'follow'\n"
+"unsub <alcunha> - o mesmo que 'leave'\n"
+"last <alcunha> - o mesmo que 'get'\n"
+"on <alcunha> - ainda não implementado.\n"
+"off <alcunha> - ainda não implementado.\n"
+"nudge <alcunha> - relembrar um utilizador para actualizar.\n"
+"invite <número de telefone> - ainda não implementado.\n"
+"track <palavra> - ainda não implementado.\n"
+"untrack <palavra> - ainda não implementado.\n"
+"track off - ainda não implementado.\n"
+"untrack all - ainda não implementado.\n"
+"tracks - ainda não implementado.\n"
+"tracking - ainda não implementado.\n"
#: lib/common.php:199
-#, fuzzy
msgid "No configuration file found. "
-msgstr "Código de confirmação não encontrado"
+msgstr "Ficheiro de configuração não encontrado. "
#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
-msgstr ""
+msgstr "Procurei ficheiros de configuração nos seguintes: "
#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
-msgstr ""
+msgstr "Talvez queira correr o instalador para resolver esta questão."
#: lib/common.php:202
msgid "Go to the installer."
-msgstr ""
+msgstr "Ir para o instalador."
#: lib/connectsettingsaction.php:110
msgid "IM"
@@ -4439,236 +4561,247 @@ msgstr "IM"
#: lib/connectsettingsaction.php:111
msgid "Updates by instant messenger (IM)"
-msgstr ""
+msgstr "Actualizações por mensagem instantânea (IM)"
#: lib/connectsettingsaction.php:116
msgid "Updates by SMS"
-msgstr ""
+msgstr "Actualizações por SMS"
#: lib/dberroraction.php:60
msgid "Database error"
-msgstr ""
+msgstr "Erro de base de dados"
#: lib/designsettings.php:105
msgid "Upload file"
-msgstr ""
+msgstr "Carregar ficheiro"
#: lib/designsettings.php:109
msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
+"You can upload your personal background image. The maximum file size is 2MB."
msgstr ""
+"Pode carregar uma imagem de fundo pessoal. O tamanho máximo do ficheiro é "
+"2MB."
#: lib/designsettings.php:372
msgid "Bad default color settings: "
-msgstr ""
+msgstr "Configurações inadequadas das cores por omissão: "
#: lib/designsettings.php:468
msgid "Design defaults restored."
-msgstr ""
+msgstr "Predefinições do design repostas"
#: lib/disfavorform.php:114 lib/disfavorform.php:140
msgid "Disfavor this notice"
-msgstr ""
+msgstr "Desfavorecer esta nota"
#: lib/favorform.php:114 lib/favorform.php:140
-#, fuzzy
msgid "Favor this notice"
-msgstr "Não é possível remover a mensagem."
+msgstr "Favorecer esta nota"
#: lib/favorform.php:140
msgid "Favor"
-msgstr ""
+msgstr "Favorecer"
#: lib/feedlist.php:64
msgid "Export data"
-msgstr ""
+msgstr "Exportar dados"
#: lib/feed.php:85
msgid "RSS 1.0"
-msgstr ""
+msgstr "RSS 1.0"
#: lib/feed.php:87
msgid "RSS 2.0"
-msgstr ""
+msgstr "RSS 2.0"
#: lib/feed.php:89
msgid "Atom"
-msgstr ""
+msgstr "Atom"
#: lib/feed.php:91
msgid "FOAF"
-msgstr ""
+msgstr "FOAF"
#: lib/galleryaction.php:121
msgid "Filter tags"
-msgstr ""
+msgstr "Filtrar categorias"
#: lib/galleryaction.php:131
msgid "All"
-msgstr ""
+msgstr "Todas"
#: lib/galleryaction.php:139
msgid "Select tag to filter"
-msgstr ""
+msgstr "Seleccione uma categoria para filtrar"
#: lib/galleryaction.php:140
msgid "Tag"
-msgstr ""
+msgstr "Categoria"
#: lib/galleryaction.php:141
msgid "Choose a tag to narrow list"
-msgstr ""
+msgstr "Escolha uma categoria para reduzir a lista"
#: lib/galleryaction.php:143
msgid "Go"
-msgstr ""
+msgstr "Prosseguir"
#: lib/groupeditform.php:163
msgid "URL of the homepage or blog of the group or topic"
msgstr ""
+"URL da página de acolhimento ou blogue, pertencentes ao grupo ou tópico"
#: lib/groupeditform.php:168
msgid "Describe the group or topic"
-msgstr ""
+msgstr "Descreva o grupo ou tópico"
#: lib/groupeditform.php:170
#, php-format
msgid "Describe the group or topic in %d characters"
-msgstr ""
+msgstr "Descreva o grupo ou tópico em %d caracteres"
#: lib/groupeditform.php:172
-#, fuzzy
msgid "Description"
-msgstr "Todas as subscrições"
+msgstr "Descrição"
#: lib/groupeditform.php:179
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr ""
+msgstr "Localidade do grupo, se aplicável, por ex. \"Cidade, Região, País\""
#: lib/groupeditform.php:187
#, php-format
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
+"Alcunhas extra para o grupo, separadas por vírgulas ou espaços, máx. %d"
-#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85
msgid "Group"
-msgstr ""
+msgstr "Grupo"
#: lib/groupnav.php:101
-#, fuzzy
msgid "Blocked"
-msgstr "Bloquear"
+msgstr "Bloqueado"
#: lib/groupnav.php:102
-#, fuzzy, php-format
+#, php-format
msgid "%s blocked users"
-msgstr "Desbloquear este utilizador"
+msgstr "%s utilizadores bloqueados"
#: lib/groupnav.php:108
#, php-format
msgid "Edit %s group properties"
-msgstr ""
+msgstr "Editar propriedades do grupo %s"
#: lib/groupnav.php:113
msgid "Logo"
-msgstr ""
+msgstr "Logótipo"
#: lib/groupnav.php:114
#, php-format
msgid "Add or edit %s logo"
-msgstr ""
+msgstr "Adicionar ou editar o logótipo de %s"
#: lib/groupnav.php:120
#, php-format
msgid "Add or edit %s design"
-msgstr ""
+msgstr "Adicionar ou editar o design de %s"
#: lib/groupsbymemberssection.php:71
msgid "Groups with most members"
-msgstr ""
+msgstr "Grupos com mais membros"
#: lib/groupsbypostssection.php:71
msgid "Groups with most posts"
-msgstr ""
+msgstr "Grupos com mais notas"
#: lib/grouptagcloudsection.php:56
#, php-format
msgid "Tags in %s group's notices"
-msgstr ""
+msgstr "Categorias nas notas do grupo %s"
#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
-msgstr ""
+msgstr "Esta página não está disponível num formato que você aceite"
#: lib/imagefile.php:75
#, php-format
msgid "That file is too big. The maximum file size is %s."
-msgstr ""
+msgstr "Esse ficheiro é demasiado grande. O tamanho máximo de ficheiro é %s."
#: lib/imagefile.php:80
msgid "Partial upload."
-msgstr ""
+msgstr "Transferência parcial."
#: lib/imagefile.php:88 lib/mediafile.php:170
msgid "System error uploading file."
-msgstr ""
+msgstr "Ocorreu um erro de sistema ao transferir o ficheiro."
#: lib/imagefile.php:96
msgid "Not an image or corrupt file."
-msgstr ""
+msgstr "Ficheiro não é uma imagem ou está corrompido."
#: lib/imagefile.php:105
msgid "Unsupported image file format."
-msgstr ""
+msgstr "Formato do ficheiro da imagem não é suportado."
#: lib/imagefile.php:118
msgid "Lost our file."
-msgstr ""
+msgstr "Perdi o nosso ficheiro."
#: lib/imagefile.php:150 lib/imagefile.php:197
msgid "Unknown file type"
-msgstr ""
+msgstr "Tipo do ficheiro é desconhecido"
+
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr "MB"
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr "kB"
-#: lib/jabber.php:192
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
-msgstr ""
+msgstr "[%s]"
#: lib/joinform.php:114
msgid "Join"
-msgstr ""
+msgstr "Juntar-me"
#: lib/leaveform.php:114
msgid "Leave"
-msgstr ""
+msgstr "Afastar-me"
#: lib/logingroupnav.php:80
msgid "Login with a username and password"
-msgstr ""
+msgstr "Iniciar sessão com um nome de utilizador e palavra-chave"
#: lib/logingroupnav.php:86
msgid "Sign up for a new account"
-msgstr ""
+msgstr "Registar uma conta nova"
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
-msgstr ""
+msgstr "Só o próprio utilizador pode ler a sua caixa de correio."
#: lib/mailbox.php:139
msgid ""
"You have no private messages. You can send private message to engage other "
"users in conversation. People can send you messages for your eyes only."
msgstr ""
+"Não tem messagens privadas. Pode enviar mensagens privadas para encetar "
+"conversas com outros utilizadores. Outros podem enviar-lhe mensagens, a que "
+"só você terá acesso."
#: lib/mailbox.php:227 lib/noticelist.php:452
-#, fuzzy
msgid "from"
msgstr "de"
#: lib/mail.php:172
msgid "Email address confirmation"
-msgstr "Confirmação do Endereço de Email"
+msgstr "Confirmação do endereço electrónico"
#: lib/mail.php:174
#, php-format
@@ -4686,14 +4819,26 @@ msgid ""
"Thanks for your time, \n"
"%s\n"
msgstr ""
+"Olá, %s.\n"
+"\n"
+"Alguém acaba de introduzir este endereço de correio electrónico em %s.\n"
+"\n"
+"Se foi você e deseja confirmar o endereço, use a URL abaixo:\n"
+"\n"
+"%s\n"
+"\n"
+"Se não foi, simplesmente ignore esta mensagem.\n"
+"\n"
+"Obrigado pelo tempo que dedicou, \n"
+"%s\n"
#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s está agora a ouvir os seus comunicados em %2$s."
+msgstr "%1$s está agora a ouvir as suas notas em %2$s."
#: lib/mail.php:241
-#, fuzzy, php-format
+#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
"\n"
@@ -4706,22 +4851,27 @@ msgid ""
"----\n"
"Change your email address or notification options at %8$s\n"
msgstr ""
-"%1$s está agora a ouvir os seus comunicados em %2$s.\n"
+"%1$s está agora a ouvir as suas notas em %2$s.\n"
"\n"
-"\t%3$s\n"
+"%3$s\n"
"\n"
+"%4$s%5$s%6$s\n"
"Sinceramente,\n"
-"%4$s.\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Altere o seu endereço de correio electrónico ou as opções de notificação em %"
+"8$s\n"
#: lib/mail.php:254
#, php-format
msgid "Location: %s\n"
-msgstr ""
+msgstr "Localidade: %s\n"
#: lib/mail.php:256
#, php-format
msgid "Homepage: %s\n"
-msgstr ""
+msgstr "Página de acolhimento: %s\n"
#: lib/mail.php:258
#, php-format
@@ -4729,11 +4879,13 @@ msgid ""
"Bio: %s\n"
"\n"
msgstr ""
+"Bio: %s\n"
+"\n"
#: lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
-msgstr ""
+msgstr "Endereço electrónico novo para publicar no site %s"
#: lib/mail.php:289
#, php-format
@@ -4747,6 +4899,14 @@ msgid ""
"Faithfully yours,\n"
"%4$s"
msgstr ""
+"Tem um endereço electrónico novo para fazer publicações no site %1$s.\n"
+"\n"
+"Envie correio para o endereço %2$s para publicar novas mensagens.\n"
+"\n"
+"Mais instruções em %3$s.\n"
+"\n"
+"Melhores cumprimentos,\n"
+"%4$s"
#: lib/mail.php:413
#, php-format
@@ -4755,12 +4915,12 @@ msgstr "Estado de %s"
#: lib/mail.php:439
msgid "SMS confirmation"
-msgstr ""
+msgstr "Confirmação SMS"
#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
-msgstr ""
+msgstr "%s envia-lhe uma cotovelada"
#: lib/mail.php:467
#, php-format
@@ -4777,11 +4937,22 @@ msgid ""
"With kind regards,\n"
"%4$s\n"
msgstr ""
+"%1$s (%2$s) está a perguntar-se o que anda você a fazer e convida-o a "
+"publicar as novidades.\n"
+"\n"
+"Por isso, venha lá contar coisas :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Não responda a esta mensagem; o remetente não a receberá.\n"
+"\n"
+"Graciosamente,\n"
+"%4$s\n"
#: lib/mail.php:510
#, php-format
msgid "New private message from %s"
-msgstr ""
+msgstr "Mensagem privada nova de %s"
#: lib/mail.php:514
#, php-format
@@ -4801,11 +4972,25 @@ msgid ""
"With kind regards,\n"
"%5$s\n"
msgstr ""
+"%1$s (%2$s) enviou-lhe uma mensagem privada:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"Pode responder à mensagem privada aqui:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Não responda a esta mensagem; o remetente não a receberá.\n"
+"\n"
+"Profusos cumprimentos,\n"
+"%5$s\n"
#: lib/mail.php:559
-#, fuzzy, php-format
+#, php-format
msgid "%s (@%s) added your notice as a favorite"
-msgstr "%1$s está agora a ouvir os seus comunicados em %2$s."
+msgstr "%s (@%s) adicionou a sua nota às favoritas."
#: lib/mail.php:561
#, php-format
@@ -4827,11 +5012,27 @@ msgid ""
"Faithfully yours,\n"
"%6$s\n"
msgstr ""
+"%1$s (@%7$s) acaba de adicionar a sua nota de %2$s às favoritas.\n"
+"\n"
+"A URL da sua nota é:\n"
+"\n"
+"%3$s\n"
+"\n"
+"O texto da sua nota é:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Pode ver a lista das notas favoritas de %1$s aqui:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Sinceramente,\n"
+"%6$s\n"
#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
-msgstr ""
+msgstr "%s (@%s) enviou uma nota à sua atenção"
#: lib/mail.php:622
#, php-format
@@ -4847,144 +5048,155 @@ msgid ""
"\t%4$s\n"
"\n"
msgstr ""
+"%1$s (@%9$s) acaba de enviar uma nota à sua atenção (uma '@-resposta') em %2"
+"$s.\n"
+"\n"
+"a nota está aqui:\n"
+"\n"
+"%3$s\n"
+"\n"
+"E diz:\n"
+"\n"
+"%4$s\n"
+"\n"
#: lib/mediafile.php:98 lib/mediafile.php:123
msgid "There was a database error while saving your file. Please try again."
msgstr ""
+"Ocorreu um erro na base de dados ao gravar o seu ficheiro. Por favor, tente "
+"novamente."
#: lib/mediafile.php:142
msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
-msgstr ""
+msgstr "Ficheiro carregado excede a directiva upload_max_filesize no php.ini."
#: lib/mediafile.php:147
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form."
msgstr ""
+"Ficheiro carregado excede a directiva MAX_FILE_SIZE especificada no "
+"formulário HTML."
#: lib/mediafile.php:152
msgid "The uploaded file was only partially uploaded."
-msgstr ""
+msgstr "Ficheiro só foi parcialmente carregado."
#: lib/mediafile.php:159
msgid "Missing a temporary folder."
-msgstr ""
+msgstr "Falta um directório temporário."
#: lib/mediafile.php:162
msgid "Failed to write file to disk."
-msgstr ""
+msgstr "Não foi possível gravar o ficheiro no disco."
#: lib/mediafile.php:165
msgid "File upload stopped by extension."
-msgstr ""
+msgstr "Transferência do ficheiro interrompida pela extensão."
#: lib/mediafile.php:179 lib/mediafile.php:216
msgid "File exceeds user's quota!"
-msgstr ""
+msgstr "Ficheiro excede quota do utilizador!"
#: lib/mediafile.php:196 lib/mediafile.php:233
msgid "File could not be moved to destination directory."
-msgstr ""
+msgstr "Não foi possível mover o ficheiro para o directório de destino."
#: lib/mediafile.php:201 lib/mediafile.php:237
-#, fuzzy
msgid "Could not determine file's mime-type!"
-msgstr "Não foi possível actualizar o utilizador."
+msgstr "Não foi possível determinar o tipo MIME do ficheiro."
#: lib/mediafile.php:270
#, php-format
msgid " Try using another %s format."
-msgstr ""
+msgstr " Tente usar outro tipo de %s."
#: lib/mediafile.php:275
#, php-format
msgid "%s is not a supported filetype on this server."
-msgstr ""
+msgstr "%s não é um tipo de ficheiro suportado neste servidor."
#: lib/messageform.php:120
msgid "Send a direct notice"
-msgstr ""
+msgstr "Enviar uma nota directa"
#: lib/messageform.php:146
msgid "To"
-msgstr ""
+msgstr "Para"
#: lib/messageform.php:162 lib/noticeform.php:186
-#, fuzzy
msgid "Available characters"
-msgstr "6 ou mais caracteres"
+msgstr "Caracteres disponíveis"
#: lib/noticeform.php:158
msgid "Send a notice"
-msgstr ""
+msgstr "Enviar uma nota"
#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
-msgstr ""
+msgstr "Novidades, %s?"
#: lib/noticeform.php:193
msgid "Attach"
-msgstr ""
+msgstr "Anexar"
#: lib/noticeform.php:197
msgid "Attach a file"
-msgstr ""
+msgstr "Anexar um ficheiro"
#: lib/noticelist.php:403
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-msgstr ""
+msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
#: lib/noticelist.php:404
-#, fuzzy
msgid "N"
-msgstr "Não"
+msgstr "N"
#: lib/noticelist.php:404
msgid "S"
-msgstr ""
+msgstr "S"
#: lib/noticelist.php:405
msgid "E"
-msgstr ""
+msgstr "E"
#: lib/noticelist.php:405
msgid "W"
-msgstr ""
+msgstr "O"
#: lib/noticelist.php:411
msgid "at"
-msgstr ""
+msgstr "coords."
#: lib/noticelist.php:506
msgid "in context"
-msgstr ""
+msgstr "em contexto"
#: lib/noticelist.php:526
-#, fuzzy
msgid "Reply to this notice"
-msgstr "Não é possível remover a mensagem."
+msgstr "Responder a esta nota"
#: lib/noticelist.php:527
msgid "Reply"
-msgstr ""
+msgstr "Responder"
#: lib/nudgeform.php:116
msgid "Nudge this user"
-msgstr ""
+msgstr "Acotovelar este utilizador"
#: lib/nudgeform.php:128
msgid "Nudge"
-msgstr ""
+msgstr "Acotovelar"
#: lib/nudgeform.php:128
msgid "Send a nudge to this user"
-msgstr ""
+msgstr "Enviar cotovelada a este utilizador"
#: lib/oauthstore.php:283
msgid "Error inserting new profile"
-msgstr "Erro ao inserir novo perfil"
+msgstr "Erro ao inserir perfil novo"
#: lib/oauthstore.php:291
msgid "Error inserting avatar"
@@ -4995,198 +5207,190 @@ msgid "Error inserting remote profile"
msgstr "Erro ao inserir perfil remoto"
#: lib/oauthstore.php:345
-#, fuzzy
msgid "Duplicate notice"
-msgstr "Apagar mensagem"
+msgstr "Nota duplicada"
-#: lib/oauthstore.php:466 lib/subs.php:48
+#: lib/oauthstore.php:467 lib/subs.php:48
msgid "You have been banned from subscribing."
-msgstr ""
+msgstr "Foi bloqueado de fazer subscrições"
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr "Não foi possível inserir nova subscrição."
#: lib/personalgroupnav.php:99
msgid "Personal"
-msgstr ""
+msgstr "Pessoal"
#: lib/personalgroupnav.php:104
msgid "Replies"
-msgstr ""
+msgstr "Respostas"
#: lib/personalgroupnav.php:114
msgid "Favorites"
-msgstr ""
+msgstr "Favoritas"
#: lib/personalgroupnav.php:124
msgid "Inbox"
-msgstr ""
+msgstr "Recebidas"
#: lib/personalgroupnav.php:125
msgid "Your incoming messages"
-msgstr ""
+msgstr "Mensagens recebidas"
#: lib/personalgroupnav.php:129
msgid "Outbox"
-msgstr ""
+msgstr "Enviadas"
#: lib/personalgroupnav.php:130
msgid "Your sent messages"
-msgstr ""
+msgstr "Mensagens enviadas"
#: lib/personaltagcloudsection.php:56
#, php-format
msgid "Tags in %s's notices"
-msgstr ""
+msgstr "Categorias nas notas de %s"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
-msgstr ""
+msgstr "Subscrições"
#: lib/profileaction.php:126
msgid "All subscriptions"
msgstr "Todas as subscrições"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
-msgstr ""
+msgstr "Subscritores"
#: lib/profileaction.php:157
-#, fuzzy
msgid "All subscribers"
-msgstr "Todas as subscrições"
+msgstr "Todos os subscritores"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
-msgstr ""
+msgstr "ID de utilizador"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Membro desde"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
-msgstr ""
+msgstr "Todos os grupos"
#: lib/profileformaction.php:123
msgid "No return-to arguments"
-msgstr ""
+msgstr "Sem argumentos return-to"
#: lib/profileformaction.php:137
msgid "unimplemented method"
-msgstr ""
+msgstr "método não implementado"
#: lib/publicgroupnav.php:78
msgid "Public"
-msgstr ""
+msgstr "Público"
#: lib/publicgroupnav.php:82
msgid "User groups"
-msgstr ""
+msgstr "Grupos"
#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
msgid "Recent tags"
-msgstr ""
+msgstr "Categorias recentes"
#: lib/publicgroupnav.php:88
msgid "Featured"
-msgstr ""
+msgstr "Destaques"
#: lib/publicgroupnav.php:92
msgid "Popular"
-msgstr ""
+msgstr "Populares"
#: lib/sandboxform.php:67
msgid "Sandbox"
-msgstr ""
+msgstr "Descronolinhar"
#: lib/sandboxform.php:78
-#, fuzzy
msgid "Sandbox this user"
-msgstr "Desbloquear este utilizador"
+msgstr "Impedir que notas deste utilizador apareçam na cronolinha"
#: lib/searchaction.php:120
msgid "Search site"
-msgstr ""
+msgstr "Pesquisar site"
#: lib/searchaction.php:126
msgid "Keyword(s)"
-msgstr ""
+msgstr "Categorias"
#: lib/searchaction.php:162
msgid "Search help"
-msgstr ""
+msgstr "Pesquisar ajuda"
#: lib/searchgroupnav.php:80
msgid "People"
-msgstr ""
+msgstr "Pessoas"
#: lib/searchgroupnav.php:81
msgid "Find people on this site"
-msgstr "Encontrar pessoas neste site"
-
-#: lib/searchgroupnav.php:82
-msgid "Notice"
-msgstr ""
+msgstr "Procurar pessoas neste site"
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
-msgstr "Encontrar conteúdo dos mensagens"
+msgstr "Procurar no conteúdo das notas"
#: lib/searchgroupnav.php:85
msgid "Find groups on this site"
-msgstr ""
+msgstr "Procurar grupos neste site"
#: lib/section.php:89
msgid "Untitled section"
-msgstr ""
+msgstr "Secção sem título"
#: lib/section.php:106
msgid "More..."
-msgstr ""
+msgstr "Mais..."
#: lib/silenceform.php:67
msgid "Silence"
-msgstr ""
+msgstr "Silenciar"
#: lib/silenceform.php:78
-#, fuzzy
msgid "Silence this user"
-msgstr "Desbloquear este utilizador"
+msgstr "Impedir este utilizador de publicar notas"
#: lib/subgroupnav.php:83
#, php-format
msgid "People %s subscribes to"
-msgstr ""
+msgstr "Pessoas que %s subscreve"
#: lib/subgroupnav.php:91
-#, fuzzy, php-format
+#, php-format
msgid "People subscribed to %s"
-msgstr "Já subscrito!."
+msgstr "Pessoas que subscrevem %s"
#: lib/subgroupnav.php:99
#, php-format
msgid "Groups %s is a member of"
-msgstr ""
+msgstr "Grupos de que %s é membro"
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
-msgstr ""
+msgstr "Catenuvem de Pessoas tal como elas se categorizam"
#: lib/subscriberspeopletagcloudsection.php:48
#: lib/subscriptionspeopletagcloudsection.php:48
msgid "People Tagcloud as tagged"
-msgstr ""
+msgstr "Catenuvem de Pessoas tal como as categoriza"
#: lib/subscriptionlist.php:126
msgid "(none)"
-msgstr ""
+msgstr "(nenhum)"
#: lib/subs.php:52
msgid "Already subscribed!"
-msgstr ""
+msgstr "Já subscrito!"
#: lib/subs.php:56
msgid "User has blocked you."
@@ -5194,16 +5398,15 @@ msgstr "O utilizador bloqueou-o."
#: lib/subs.php:60
msgid "Could not subscribe."
-msgstr "Não foi possível subscrever. "
+msgstr "Não foi possível subscrever."
#: lib/subs.php:79
msgid "Could not subscribe other to you."
-msgstr "Não foi possível subscrever outros a si."
+msgstr "Não foi possível que outro o subscrevesse."
#: lib/subs.php:128
-#, fuzzy
msgid "Not subscribed!"
-msgstr "Não foi possível subscrever. "
+msgstr "Não subscrito!"
#: lib/subs.php:140
msgid "Couldn't delete subscription."
@@ -5215,126 +5418,126 @@ msgstr "Nenhum"
#: lib/topposterssection.php:74
msgid "Top posters"
-msgstr "Top posters"
+msgstr "Quem mais publica"
#: lib/unsandboxform.php:69
msgid "Unsandbox"
-msgstr ""
+msgstr "Cronolinhar"
#: lib/unsandboxform.php:80
-#, fuzzy
msgid "Unsandbox this user"
-msgstr "Desbloquear este utilizador"
+msgstr "Permitir que notas deste utilizador apareçam na cronolinha"
#: lib/unsilenceform.php:67
msgid "Unsilence"
-msgstr ""
+msgstr "Dar-lhe voz"
#: lib/unsilenceform.php:78
-#, fuzzy
msgid "Unsilence this user"
-msgstr "Desbloquear este utilizador"
+msgstr "Permitir que este utilizador publique notas"
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
-msgstr "Des-Subscrever deste utilizador"
+msgstr "Deixar de subscrever este utilizador"
#: lib/unsubscribeform.php:137
msgid "Unsubscribe"
-msgstr ""
+msgstr "Abandonar"
#: lib/userprofile.php:116
-#, fuzzy
msgid "Edit Avatar"
-msgstr "Avatar"
+msgstr "Editar Avatar"
#: lib/userprofile.php:236
msgid "User actions"
-msgstr ""
+msgstr "Acções do utilizador"
#: lib/userprofile.php:248
-#, fuzzy
msgid "Edit profile settings"
-msgstr "Modificar as suas definições de perfil"
+msgstr "Editar configurações do perfil"
#: lib/userprofile.php:249
msgid "Edit"
-msgstr ""
+msgstr "Editar"
#: lib/userprofile.php:272
msgid "Send a direct message to this user"
-msgstr ""
+msgstr "Enviar mensagem directa a este utilizador"
#: lib/userprofile.php:273
msgid "Message"
-msgstr ""
+msgstr "Mensagem"
+
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr "Moderar"
-#: lib/util.php:826
+#: lib/util.php:825
msgid "a few seconds ago"
-msgstr ""
+msgstr "há alguns segundos"
-#: lib/util.php:828
+#: lib/util.php:827
msgid "about a minute ago"
-msgstr ""
+msgstr "há cerca de um minuto"
-#: lib/util.php:830
+#: lib/util.php:829
#, php-format
msgid "about %d minutes ago"
-msgstr ""
+msgstr "há cerca de %d minutos"
-#: lib/util.php:832
+#: lib/util.php:831
msgid "about an hour ago"
-msgstr ""
+msgstr "há cerca de uma hora"
-#: lib/util.php:834
+#: lib/util.php:833
#, php-format
msgid "about %d hours ago"
-msgstr ""
+msgstr "há cerca de %d horas"
-#: lib/util.php:836
+#: lib/util.php:835
msgid "about a day ago"
-msgstr ""
+msgstr "há cerca de um dia"
-#: lib/util.php:838
+#: lib/util.php:837
#, php-format
msgid "about %d days ago"
-msgstr ""
+msgstr "há cerca de %d dias"
-#: lib/util.php:840
+#: lib/util.php:839
msgid "about a month ago"
-msgstr ""
+msgstr "há cerca de um mês"
-#: lib/util.php:842
+#: lib/util.php:841
#, php-format
msgid "about %d months ago"
-msgstr ""
+msgstr "há cerca de %d meses"
-#: lib/util.php:844
+#: lib/util.php:843
msgid "about a year ago"
-msgstr ""
+msgstr "há cerca de um ano"
#: lib/webcolor.php:82
-#, fuzzy, php-format
+#, php-format
msgid "%s is not a valid color!"
-msgstr "A Homepage inserida não é um URL válido."
+msgstr "%s não é uma cor válida!"
#: lib/webcolor.php:123
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
-msgstr ""
+msgstr "%s não é uma cor válida! Use 3 ou 6 caracteres hexadecimais."
#: scripts/maildaemon.php:48
msgid "Could not parse message."
-msgstr ""
+msgstr "Não foi possível fazer a análise sintáctica da mensagem."
#: scripts/maildaemon.php:53
msgid "Not a registered user."
-msgstr ""
+msgstr "Não é um utilizador registado."
#: scripts/maildaemon.php:57
msgid "Sorry, that is not your incoming email address."
-msgstr ""
+msgstr "Desculpe, esse não é o seu endereço para receber correio electrónico."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
-msgstr ""
+msgstr "Desculpe, não lhe é permitido receber correio electrónico."
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.mo b/locale/pt_BR/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index d0ad4ab4b..000000000
--- a/locale/pt_BR/LC_MESSAGES/statusnet.mo
+++ /dev/null
Binary files differ
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index 5b1d62251..31068710e 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-23 21:46+0000\n"
-"PO-Revision-Date: 2009-11-23 21:48:02+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:20:38+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(r59365); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt-br\n"
"X-Message-Group: out-statusnet\n"
@@ -104,9 +104,8 @@ msgid ""
msgstr ""
#: actions/all.php:165
-#, fuzzy
msgid "You and friends"
-msgstr "%s e amigos"
+msgstr "Você e amigos"
#: actions/allrss.php:119 actions/apitimelinefriends.php:121
#, php-format
@@ -574,7 +573,7 @@ msgstr "Cortar"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -746,7 +745,7 @@ msgid "Conversation"
msgstr "Código de confirmação"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Mensagens"
@@ -1182,7 +1181,7 @@ msgid "New incoming email address added."
msgstr ""
"Foi adicionado um novo endereço de e-mail para recebimento de mensagens."
-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Mensagens populares"
@@ -1278,26 +1277,26 @@ msgstr "O usuário que está está sendo acompanhado não existe."
msgid "You can use the local subscription!"
msgstr "Você pode usar a assinatura local!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "Esse usuário bloqueou o seu pedido de assinatura."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
msgstr "Não autorizado."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr ""
"Não foi possível converter os tokens de requisição para tokens de acesso."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Versão desconhecida do protocolo OMB."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Erro na atualização do perfil remoto"
@@ -1513,8 +1512,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1852,55 +1851,55 @@ msgstr ""
msgid "Already logged in."
msgstr "Já está logado."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "O conteúdo da mensagem é inválido"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Nome de usuário e/ou senha incorreto(s)."
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Não autorizado."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Logar"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr ""
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Apelido"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Senha"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Lembrar neste computador"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Entrar automaticamente sem pedir a senha. Não use em computadores "
"compartilhados!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Perdeu ou esqueceu sua senha?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1908,7 +1907,7 @@ msgstr ""
"Por razões de segurança, por favor, digite novamente seu nome de usuário e "
"senha antes de alterar suas configurações."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2855,7 +2854,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL do seu perfil em outro serviço de microblogagem compatível"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:356
+#: lib/userprofile.php:365
msgid "Subscribe"
msgstr "Assinar"
@@ -2865,8 +2864,7 @@ msgstr "A URL do perfil é inválida (formato inválido)"
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "Não é uma URL de perfil válida (nenhum documento YADIS)."
#: actions/remotesubscribe.php:176
@@ -3051,7 +3049,7 @@ msgid "Members"
msgstr "Membro desde"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
#, fuzzy
msgid "(None)"
@@ -3061,7 +3059,7 @@ msgstr "(nenhum)"
msgid "All members"
msgstr ""
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Estatísticas"
@@ -4061,7 +4059,7 @@ msgstr "Você foi banido de publicar mensagens nesse site."
msgid "Problem saving notice."
msgstr "Problema ao salvar a mensagem."
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Erro no banco de dados na inserção da reposta: %s"
@@ -4497,50 +4495,40 @@ msgstr "Notificação ligada."
msgid "Can't turn on notification."
msgstr "Não é possível ligar a notificação."
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Não foi possível criar o formulário OpenID: %s"
-
-#: 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:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Você não está assinando esse perfil."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Você já está assinando esses usuários:"
msgstr[1] "Você já está assinando esses usuários:"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Não foi possível fazer com que o outros o sigam."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Não foi possível fazer com que o outros o sigam."
msgstr[1] "Não foi possível fazer com que o outros o sigam."
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Você não está assinando esse perfil."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Você não é membro deste grupo."
msgstr[1] "Você não é membro deste grupo."
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4559,7 +4547,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4619,9 +4606,10 @@ msgid "Upload file"
msgstr "Enviar"
#: lib/designsettings.php:109
+#, fuzzy
msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
-msgstr ""
+"You can upload your personal background image. The maximum file size is 2MB."
+msgstr "Você pode enviar seu avatar pessoal. O tamanho máximo do arquivo é %s"
#: lib/designsettings.php:372
msgid "Bad default color settings: "
@@ -4795,7 +4783,15 @@ msgstr "Nosso arquivo foi perdido."
msgid "Unknown file type"
msgstr "Tipo de arquivo desconhecido"
-#: lib/jabber.php:192
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5173,12 +5169,12 @@ msgstr "Erro na inserção do perfil remoto"
msgid "Duplicate notice"
msgstr "Excluir a mensagem"
-#: lib/oauthstore.php:466 lib/subs.php:48
+#: lib/oauthstore.php:467 lib/subs.php:48
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "Esse usuário bloqueou o seu pedido de assinatura."
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr "Não foi possível inserir a nova assinatura."
@@ -5215,7 +5211,7 @@ msgstr "Suas mensagens enviadas"
msgid "Tags in %s's notices"
msgstr "Etiquetas nas mensagens de %s"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Assinaturas"
@@ -5223,7 +5219,7 @@ msgstr "Assinaturas"
msgid "All subscriptions"
msgstr "Todas as assinaturas"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Assinantes"
@@ -5232,16 +5228,16 @@ msgstr "Assinantes"
msgid "All subscribers"
msgstr "Assinantes"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
#, fuzzy
msgid "User ID"
msgstr "Usuário"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Membro desde"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr ""
@@ -5449,47 +5445,51 @@ msgstr "Você não pode enviar uma mensagem para esse usuário."
msgid "Message"
msgstr "Nova mensagem"
-#: lib/util.php:826
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr ""
+
+#: lib/util.php:825
msgid "a few seconds ago"
msgstr "segundos atrás"
-#: lib/util.php:828
+#: lib/util.php:827
msgid "about a minute ago"
msgstr "1 min atrás"
-#: lib/util.php:830
+#: lib/util.php:829
#, php-format
msgid "about %d minutes ago"
msgstr "%d mins atrás"
-#: lib/util.php:832
+#: lib/util.php:831
msgid "about an hour ago"
msgstr "1 hora atrás"
-#: lib/util.php:834
+#: lib/util.php:833
#, php-format
msgid "about %d hours ago"
msgstr "%d horas atrás"
-#: lib/util.php:836
+#: lib/util.php:835
msgid "about a day ago"
msgstr "1 dia atrás"
-#: lib/util.php:838
+#: lib/util.php:837
#, php-format
msgid "about %d days ago"
msgstr "%d dias atrás"
-#: lib/util.php:840
+#: lib/util.php:839
msgid "about a month ago"
msgstr "1 mês atrás"
-#: lib/util.php:842
+#: lib/util.php:841
#, php-format
msgid "about %d months ago"
msgstr "%d meses atrás"
-#: lib/util.php:844
+#: lib/util.php:843
msgid "about a year ago"
msgstr "1 ano atrás"
@@ -5518,6 +5518,3 @@ msgstr "Desculpe-me, mas este não é seu endereço de e-mail para recebimento."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Desculpe-me, mas não é permitido o recebimento de emails."
-
-#~ msgid "Notice"
-#~ msgstr "Mensagem"
diff --git a/locale/ru/LC_MESSAGES/statusnet.mo b/locale/ru/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 04c4ac010..000000000
--- a/locale/ru/LC_MESSAGES/statusnet.mo
+++ /dev/null
Binary files differ
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 89c6d3784..25e8d8e7c 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -1,5 +1,6 @@
# Translation of StatusNet to Russian
#
+# Author@translatewiki.net: Brion
# Author@translatewiki.net: Lockal
# Author@translatewiki.net: Александр Сигачёв
# --
@@ -9,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-23 21:46+0000\n"
-"PO-Revision-Date: 2009-11-23 21:48:05+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:20: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(r59365); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ru\n"
"X-Message-Group: out-statusnet\n"
@@ -480,12 +481,12 @@ msgstr "Обновлено от %1$s на %2$s!"
#: actions/apitimelinementions.php:116
#, php-format
msgid "%1$s / Updates mentioning %2$s"
-msgstr ""
+msgstr "%1$s / Обновления, упоминающие %2$s"
#: actions/apitimelinementions.php:126
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
+msgstr "%1$s обновил этот ответ на сообщение: %2$s / %3$s."
#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
#, php-format
@@ -495,12 +496,12 @@ msgstr "Общая лента %s"
#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
-msgstr "%s обновлен для всех!"
+msgstr "Обновления %s от всех!"
#: actions/apitimelinetag.php:101 actions/tag.php:66
#, php-format
msgid "Notices tagged with %s"
-msgstr "Записи, помеченные %s"
+msgstr "Записи с тегом %s"
#: actions/apitimelinetag.php:107 actions/tagrss.php:64
#, php-format
@@ -576,7 +577,7 @@ msgstr "Обрезать"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -746,7 +747,7 @@ msgid "Conversation"
msgstr "Дискуссия"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Записи"
@@ -1045,11 +1046,12 @@ 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 "Новое"
+msgstr "Новый"
#: actions/emailsettings.php:153 actions/imsettings.php:139
#: actions/smssettings.php:169
@@ -1170,7 +1172,7 @@ msgstr "Входящий электронный адрес удалён."
msgid "New incoming email address added."
msgstr "Новый входящий электронный адрес добавлен."
-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Популярные записи"
@@ -1182,7 +1184,7 @@ msgstr "Популярные записи, страница %d"
#: actions/favorited.php:79
msgid "The most popular notices on the site right now."
-msgstr "Самые популярные записи на %%site.name%% на текущий момент."
+msgstr "Самые популярные записи на сайте на данный момент."
#: actions/favorited.php:150
msgid "Favorite notices appear on this page but no one has favorited one yet."
@@ -1269,23 +1271,23 @@ msgstr "Указанный пользователь не существует."
msgid "You can use the local subscription!"
msgstr "Вы можете использовать локальную подписку!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "Этот пользователь заблокировал вас на его подписку."
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
msgstr "Вы не авторизованы."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
msgid "Could not convert request token to access token."
msgstr "Не удаётся преобразовать ключ запроса в ключ доступа."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Удалённый сервис использует неизвестную версию протокола OMB."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Ошибка обновления удалённого профиля"
@@ -1481,6 +1483,8 @@ msgid ""
"If you can't find the group you're looking for, you can [create it](%%action."
"newgroup%%) yourself."
msgstr ""
+"Если вы не можете найти группу, которая вас интересует, [создайте её](%% "
+"action.newgroup%%) сами."
#: actions/groupsearch.php:85
#, php-format
@@ -1488,9 +1492,11 @@ msgid ""
"Why not [register an account](%%action.register%%) and [create the group](%%"
"action.newgroup%%) yourself!"
msgstr ""
+"Почему бы не [зарегистрироваться](%%action.register%%), чтобы [создать "
+"группу](%%action.newgroup%%) самому?"
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Группы"
@@ -1508,6 +1514,11 @@ msgid ""
"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
"%%%%)"
msgstr ""
+"Группы на сайте %%%%site.name%%%% позволяют искать и общаться с людьми с "
+"общими интересами. После присоединения к группе и вы сможете отправлять "
+"сообщения до всех её участников, используя команду «!имягруппы». Не видите "
+"группу, которая вас интересует? Попробуйте [найти её](%%%%action.groupsearch%"
+"%%%) или [создайте собственную!](%%%%action.newgroup%%%%)"
#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
msgid "Create a new group"
@@ -1818,51 +1829,51 @@ msgstr "%s покинул группу %s"
msgid "Already logged in."
msgstr "Вы уже авторизовались."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
msgid "Invalid or expired token."
msgstr "Неверный или устаревший ключ."
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Некорректное имя или пароль."
-#: actions/login.php:149
+#: actions/login.php:152
msgid "Error setting user. You are probably not authorized."
msgstr "Ошибка установки пользователя. Вы, вероятно, не авторизованы."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Вход"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "Авторизоваться"
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Имя"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Пароль"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Запомнить меня"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "Автоматическии входить в дальнейшем. Не для общедоступных компьютеров!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Потеряли или забыли пароль?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1870,7 +1881,7 @@ msgstr ""
"По причинам сохранения безопасности введите имя и пароль ещё раз, прежде чем "
"изменять Ваши установки."
-#: actions/login.php:286
+#: actions/login.php:289
#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -1978,6 +1989,8 @@ msgid ""
"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
"status_textarea=%s)!"
msgstr ""
+"Станьте первыми, кто [напишет на эту тему](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
#: actions/noticesearch.php:124
#, php-format
@@ -1985,6 +1998,8 @@ msgid ""
"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
+"Почему бы не [зарегистрироваться](%%%%action.register%%%%) и не отправить "
+"первое [сообщение на эту тему](%%%%action.newnotice%%%%?status_textarea=%s)?"
#: actions/noticesearchrss.php:96
#, php-format
@@ -2086,8 +2101,8 @@ msgstr "Исходящие для %s"
#: actions/outbox.php:116
msgid "This is your outbox, which lists private messages you have sent."
msgstr ""
-"Это ящик Ваших исходящих писем, здесь приватные сообщения, которые отосланы "
-"Вами."
+"Это список исходящих писем, в котором перечислены отправленные вами личные "
+"сообщения."
#: actions/passwordsettings.php:58
msgid "Change password"
@@ -2490,7 +2505,7 @@ msgstr "Общее облако тегов"
#: actions/publictagcloud.php:63
#, php-format
msgid "These are most popular recent tags on %s "
-msgstr "Самые популярные теги на %s на текущий момент"
+msgstr "Самые популярные теги на %s на данный момент "
#: actions/publictagcloud.php:69
#, php-format
@@ -2806,7 +2821,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Адрес URL твоего профиля на другом подходящем сервисе микроблогинга"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:356
+#: lib/userprofile.php:365
msgid "Subscribe"
msgstr "Подписаться"
@@ -2815,8 +2830,8 @@ msgid "Invalid profile URL (bad format)"
msgstr "Неверный URL профиля (плохой формат)"
#: actions/remotesubscribe.php:168
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+#, fuzzy
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr ""
"Неверный URL профиля (не YADIS-документ либо не указан или указан неверный "
"XRDS)."
@@ -2943,6 +2958,9 @@ msgid ""
"account](%%%%action.register%%%%) and then post something interesting they "
"would add to their favorites :)"
msgstr ""
+"%s пока не добавил ни одноз записи в любимые. Почему бы не "
+"[зарегистрироваться](%%%%action.register%%%%) и не написать что-нибудь "
+"интересное, что понравилось бы этому пользователю? :)"
#: actions/showfavorites.php:242
msgid "This is a way to share what you like."
@@ -3005,7 +3023,7 @@ msgid "Members"
msgstr "Участники"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(пока ничего нет)"
@@ -3014,7 +3032,7 @@ msgstr "(пока ничего нет)"
msgid "All members"
msgstr "Все участники"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Статистика"
@@ -3189,15 +3207,15 @@ msgstr "Неизвестный язык «%s»"
#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
-msgstr ""
+msgstr "Неверный URL отчёта снимка."
#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
-msgstr ""
+msgstr "Неверное значение запуска снимка."
#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
-msgstr ""
+msgstr "Частота снимков должна быть числом."
#: actions/siteadminpanel.php:199
msgid "You must set an SSL server when enabling SSL."
@@ -3229,19 +3247,21 @@ msgstr "Имя вашего сайта, например, «Yourcompany Microblo
#: actions/siteadminpanel.php:274
msgid "Brought by"
-msgstr ""
+msgstr "Предоставлено"
#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
msgstr ""
+"Текст, используемый для указания авторов в нижнем колонтитуле каждой страницы"
#: actions/siteadminpanel.php:279
msgid "Brought by URL"
-msgstr ""
+msgstr "URL-адрес поставщика услуг"
#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
msgstr ""
+"URL, используемый для ссылки на авторов в нижнем колонтитуле каждой страницы"
#: actions/siteadminpanel.php:284
msgid "Contact email address for your site"
@@ -3330,7 +3350,7 @@ msgstr "Никогда"
#: actions/siteadminpanel.php:360
msgid "Data snapshots"
-msgstr ""
+msgstr "Снимки данных"
#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
@@ -3342,7 +3362,7 @@ msgstr "Частота"
#: actions/siteadminpanel.php:367
msgid "Snapshots will be sent once every N web hits"
-msgstr ""
+msgstr "Снимки будут отправляться каждые N посещений"
#: actions/siteadminpanel.php:372
msgid "Report URL"
@@ -3350,7 +3370,7 @@ msgstr "URL отчёта"
#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
-msgstr ""
+msgstr "Снимки будут отправляться по этому URL-адресу"
#: actions/siteadminpanel.php:380
msgid "SSL"
@@ -3591,6 +3611,12 @@ msgid ""
"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
"automatically subscribe to people you already follow there."
msgstr ""
+"Вы сейчас не следите ни за чьими-либо записями; попробуйте подписаться на "
+"знакомых вам людей. Попробуйте использовать [поиск людей](%%action."
+"peoplesearch%%), посмотрите среди учасников групп, которые вас интересуют "
+"или просмотрите список [особых пользователей](%%action.featured%%). Если Вы "
+"пользуетесь [Твиттером](%%action.twittersettings%%), то можете автоматически "
+"подписаться на тех людей, за которыми уже следите там."
#: actions/subscriptions.php:123 actions/subscriptions.php:127
#, php-format
@@ -3657,7 +3683,7 @@ msgstr ""
#: actions/tag.php:68
#, php-format
msgid "Notices tagged with %s, page %d"
-msgstr "Записи, помеченные %s, страница %d"
+msgstr "Записи с тегом %s, страница %d"
#: actions/tag.php:86
#, php-format
@@ -3710,6 +3736,7 @@ msgstr "Отписано"
#, php-format
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
+"Лицензия просматриваемого потока «%s» несовместима с лицензией сайта «%s»."
#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
#: lib/personalgroupnav.php:115
@@ -3856,29 +3883,28 @@ msgid "Subscription rejected"
msgstr "Подписка отменена"
#: actions/userauthorization.php:261
-#, fuzzy
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
"with the site’s instructions for details on how to fully reject the "
"subscription."
msgstr ""
-"Подписка отвергнута, но нет обратного URL. Проверьте инструкции на сайте, "
-"чтобы полностью отказаться от подписки."
+"Подписка отвергнута, но не бы передан URL обратного вызова. Проверьте "
+"инструкции на сайте, чтобы полностью отказаться от подписки."
#: actions/userauthorization.php:296
#, php-format
msgid "Listener URI ‘%s’ not found here"
-msgstr ""
+msgstr "Смотрящий URI «%s» здесь не найден"
#: actions/userauthorization.php:301
#, php-format
msgid "Listenee URI ‘%s’ is too long."
-msgstr ""
+msgstr "Просматриваемый URI «%s» слишком длинный."
#: actions/userauthorization.php:307
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
-msgstr ""
+msgstr "Просматриваемый URI «%s» — локальный пользователь."
#: actions/userauthorization.php:322
#, php-format
@@ -4007,7 +4033,7 @@ msgstr "Вам запрещено поститься на этом сайте (
msgid "Problem saving notice."
msgstr "Проблемы с сохранением записи."
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Ошибка баз данных при вставке ответа для %s"
@@ -4023,7 +4049,7 @@ msgstr "Не удаётся назначить членство в группе.
#: classes/User.php:347
#, php-format
msgid "Welcome to %1$s, @%2$s!"
-msgstr "Добро пожаловать на %1$s, %2$s!"
+msgstr "Добро пожаловать на %1$s, @%2$s!"
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
@@ -4275,7 +4301,7 @@ msgstr "Автор"
#: lib/attachmentlist.php:278
msgid "Provider"
-msgstr "Поставщик услуг"
+msgstr "Сервис"
#: lib/attachmentnoticesection.php:67
msgid "Notices where this attachment appears"
@@ -4424,50 +4450,41 @@ msgstr "Есть оповещение."
msgid "Can't turn on notification."
msgstr "Есть оповещение."
-#: lib/command.php:597
-#, php-format
-msgid "Could not create login token for %s"
-msgstr "Не удаётся создать ключ входа для %s"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr "Эта ссылка действительна только один раз в течение 2 минут: %s"
-
-#: lib/command.php:618
+#: lib/command.php:592
msgid "You are not subscribed to anyone."
msgstr "Вы ни на кого не подписаны."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Вы подписаны на этих людей:"
-msgstr[1] ""
-msgstr[2] ""
+msgstr[1] "Вы подписаны на этих людей:"
+msgstr[2] "Вы подписаны на этих людей:"
-#: lib/command.php:640
+#: lib/command.php:614
msgid "No one is subscribed to you."
msgstr "Никто не подписан на вас."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Эти люди подписались на вас:"
-msgstr[1] ""
-msgstr[2] ""
+msgstr[1] "Эти люди подписались на вас:"
+msgstr[2] "Эти люди подписались на вас:"
-#: lib/command.php:662
+#: lib/command.php:636
msgid "You are not a member of any groups."
msgstr "Вы не состоите ни в одной группе."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Вы являетесь участником следующих групп:"
-msgstr[1] ""
-msgstr[2] ""
+msgstr[1] "Вы являетесь участником следующих групп:"
+msgstr[2] "Вы являетесь участником следующих групп:"
-#: lib/command.php:678
+#: lib/command.php:652
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4486,7 +4503,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4579,10 +4595,10 @@ msgstr "Загрузить файл"
#: lib/designsettings.php:109
msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
+"You can upload your personal background image. The maximum file size is 2MB."
msgstr ""
"Вы можете загрузить собственное фоновое изображение. Максимальный размер "
-"файла составляет 2Mb."
+"файла составляет 2МБ."
#: lib/designsettings.php:372
msgid "Bad default color settings: "
@@ -4755,7 +4771,15 @@ msgstr "Потерян файл."
msgid "Unknown file type"
msgstr "Неподдерживаемый тип файла"
-#: lib/jabber.php:192
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr "МБ"
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr "КБ"
+
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr "[%s]"
@@ -5203,11 +5227,11 @@ msgstr "Ошибка вставки удалённого профиля"
msgid "Duplicate notice"
msgstr "Дублировать запись"
-#: lib/oauthstore.php:466 lib/subs.php:48
+#: lib/oauthstore.php:467 lib/subs.php:48
msgid "You have been banned from subscribing."
msgstr "Вы заблокированы от подписки."
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr "Не удаётся вставить новую подписку."
@@ -5244,7 +5268,7 @@ msgstr "Ваши исходящие сообщения"
msgid "Tags in %s's notices"
msgstr "Теги записей пользователя %s"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Подписки"
@@ -5252,7 +5276,7 @@ msgstr "Подписки"
msgid "All subscriptions"
msgstr "Все подписки."
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Подписчики"
@@ -5260,15 +5284,15 @@ msgstr "Подписчики"
msgid "All subscribers"
msgstr "Все подписчики"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr "ID пользователя"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Регистрация"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "Все группы"
@@ -5461,47 +5485,51 @@ msgstr "Послать приватное сообщение этому поль
msgid "Message"
msgstr "Сообщение"
-#: lib/util.php:826
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr "Модерировать"
+
+#: lib/util.php:825
msgid "a few seconds ago"
msgstr "пару секунд назад"
-#: lib/util.php:828
+#: lib/util.php:827
msgid "about a minute ago"
msgstr "около минуты назад"
-#: lib/util.php:830
+#: lib/util.php:829
#, php-format
msgid "about %d minutes ago"
msgstr "около %d минут(ы) назад"
-#: lib/util.php:832
+#: lib/util.php:831
msgid "about an hour ago"
msgstr "около часа назад"
-#: lib/util.php:834
+#: lib/util.php:833
#, php-format
msgid "about %d hours ago"
msgstr "около %d часа(ов) назад"
-#: lib/util.php:836
+#: lib/util.php:835
msgid "about a day ago"
msgstr "около дня назад"
-#: lib/util.php:838
+#: lib/util.php:837
#, php-format
msgid "about %d days ago"
msgstr "около %d дня(ей) назад"
-#: lib/util.php:840
+#: lib/util.php:839
msgid "about a month ago"
msgstr "около месяца назад"
-#: lib/util.php:842
+#: lib/util.php:841
#, php-format
msgid "about %d months ago"
msgstr "около %d месяца(ев) назад"
-#: lib/util.php:844
+#: lib/util.php:843
msgid "about a year ago"
msgstr "около года назад"
@@ -5532,6 +5560,3 @@ msgstr "Простите, это не Ваш входящий электронн
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Простите, входящих писем нет."
-
-#~ msgid "Notice"
-#~ msgstr "Запись"
diff --git a/locale/statusnet.po b/locale/statusnet.po
index 6f934d48e..0ab702ae5 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-23 21:46+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -555,7 +555,7 @@ msgstr ""
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -722,7 +722,7 @@ msgid "Conversation"
msgstr ""
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr ""
@@ -1127,7 +1127,7 @@ msgstr ""
msgid "New incoming email address added."
msgstr ""
-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr ""
@@ -1220,23 +1220,23 @@ msgstr ""
msgid "You can use the local subscription!"
msgstr ""
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr ""
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
msgstr ""
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
msgid "Could not convert request token to access token."
msgstr ""
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
msgid "Remote service uses unknown version of OMB protocol."
msgstr ""
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr ""
@@ -1431,8 +1431,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1716,57 +1716,57 @@ msgstr ""
msgid "Already logged in."
msgstr ""
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
msgid "Invalid or expired token."
msgstr ""
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr ""
-#: actions/login.php:149
+#: actions/login.php:152
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr ""
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr ""
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr ""
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr ""
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr ""
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr ""
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
-#: actions/login.php:286
+#: actions/login.php:289
#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2643,7 +2643,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:356
+#: lib/userprofile.php:365
msgid "Subscribe"
msgstr ""
@@ -2652,8 +2652,7 @@ 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)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr ""
#: actions/remotesubscribe.php:176
@@ -2830,7 +2829,7 @@ msgid "Members"
msgstr ""
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
@@ -2839,7 +2838,7 @@ msgstr ""
msgid "All members"
msgstr ""
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr ""
@@ -3769,7 +3768,7 @@ msgstr ""
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
@@ -4177,47 +4176,37 @@ msgstr ""
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:618
+#: lib/command.php:592
msgid "You are not subscribed to anyone."
msgstr ""
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] ""
msgstr[1] ""
-#: lib/command.php:640
+#: lib/command.php:614
msgid "No one is subscribed to you."
msgstr ""
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] ""
msgstr[1] ""
-#: lib/command.php:662
+#: lib/command.php:636
msgid "You are not a member of any groups."
msgstr ""
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] ""
msgstr[1] ""
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4236,7 +4225,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4294,7 +4282,7 @@ msgstr ""
#: lib/designsettings.php:109
msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
+"You can upload your personal background image. The maximum file size is 2MB."
msgstr ""
#: lib/designsettings.php:372
@@ -4466,7 +4454,15 @@ msgstr ""
msgid "Unknown file type"
msgstr ""
-#: lib/jabber.php:192
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -4823,11 +4819,11 @@ msgstr ""
msgid "Duplicate notice"
msgstr ""
-#: lib/oauthstore.php:466 lib/subs.php:48
+#: lib/oauthstore.php:467 lib/subs.php:48
msgid "You have been banned from subscribing."
msgstr ""
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr ""
@@ -4864,7 +4860,7 @@ msgstr ""
msgid "Tags in %s's notices"
msgstr ""
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr ""
@@ -4872,7 +4868,7 @@ msgstr ""
msgid "All subscriptions"
msgstr ""
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr ""
@@ -4880,15 +4876,15 @@ msgstr ""
msgid "All subscribers"
msgstr ""
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr ""
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr ""
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr ""
@@ -5081,47 +5077,51 @@ msgstr ""
msgid "Message"
msgstr ""
-#: lib/util.php:826
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr ""
+
+#: lib/util.php:825
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:828
+#: lib/util.php:827
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:830
+#: lib/util.php:829
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:832
+#: lib/util.php:831
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:834
+#: lib/util.php:833
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:836
+#: lib/util.php:835
msgid "about a day ago"
msgstr ""
-#: lib/util.php:838
+#: lib/util.php:837
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:840
+#: lib/util.php:839
msgid "about a month ago"
msgstr ""
-#: lib/util.php:842
+#: lib/util.php:841
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:844
+#: lib/util.php:843
msgid "about a year ago"
msgstr ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.mo b/locale/sv/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 5a23f84a0..000000000
--- a/locale/sv/LC_MESSAGES/statusnet.mo
+++ /dev/null
Binary files differ
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index 03379860a..8421ccdb0 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-23 21:46+0000\n"
-"PO-Revision-Date: 2009-11-23 21:48:09+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:20:46+0000\n"
"Language-Team: Swedish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59365); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: sv\n"
"X-Message-Group: out-statusnet\n"
@@ -580,7 +580,7 @@ msgstr ""
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -757,7 +757,7 @@ msgid "Conversation"
msgstr "Bekräftelsekod"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Inlägg"
@@ -1193,7 +1193,7 @@ msgstr "Inkommande emailadress borttagen."
msgid "New incoming email address added."
msgstr "Ny inkommande emailadress inlagd."
-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
#: lib/publicgroupnav.php:93
#, fuzzy
msgid "Popular notices"
@@ -1292,26 +1292,26 @@ msgstr "Användaren som avlyssnas existerar inte."
msgid "You can use the local subscription!"
msgstr "Du kan använda lokala prenumerationer!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr ""
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "Inte tillstånd ännu."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "Kunde inte konvertera förfrågan tokens till Access tokens."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Okänd version av OMB protokollet."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Fel uppstog under uppdatering av fjärranvändare"
@@ -1528,8 +1528,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1861,53 +1861,53 @@ msgstr ""
msgid "Already logged in."
msgstr "Redan inloggad."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "Ogiltig innehåll i inlägget "
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Felaktigt användarnamn eller lösenord."
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Inte tillstånd ännu."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Logga in"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr ""
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Smeknamn"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Lösenord"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Kom ihåg mig"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "Logga in automatiskt i framtiden; Ej för publika datorer!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Glömt bort lösenord?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1915,7 +1915,7 @@ msgstr ""
"Av säkerhetsskäl, var vänlig skriv in ditt användarnamn och lösenord innan "
"du ändrar dina inställningar."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2855,7 +2855,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL till din profil på en annan kompatibel mikroblogg"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:356
+#: lib/userprofile.php:365
msgid "Subscribe"
msgstr "Prenumerera"
@@ -2865,8 +2865,7 @@ msgstr "Nåt är fel med profil URL (Format fel)"
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "Det är ingen giltig profil URL (ingen YADIS angiven)."
#: actions/remotesubscribe.php:176
@@ -3049,7 +3048,7 @@ msgid "Members"
msgstr "Medlem sedan"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
@@ -3058,7 +3057,7 @@ msgstr ""
msgid "All members"
msgstr ""
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Statistik"
@@ -4057,7 +4056,7 @@ msgstr ""
msgid "Problem saving notice."
msgstr "Det var ett problem när inlägget sparades."
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Databasfel för svar: %s"
@@ -4496,50 +4495,40 @@ msgstr ""
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Kan inte skapa OpenID formulär: %s"
-
-#: 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:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Du skickade inte oss den profilen"
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Du prenumererar redan på dessa användare:"
msgstr[1] "Du prenumererar redan på dessa användare:"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Kunde inte prenumerera på annat åt dig."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Kunde inte prenumerera på annat åt dig."
msgstr[1] "Kunde inte prenumerera på annat åt dig."
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Du skickade inte oss den profilen"
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Du skickade inte oss den profilen"
msgstr[1] "Du skickade inte oss den profilen"
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4558,7 +4547,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4617,9 +4605,10 @@ msgid "Upload file"
msgstr "Ladda upp"
#: lib/designsettings.php:109
+#, fuzzy
msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
-msgstr ""
+"You can upload your personal background image. The maximum file size is 2MB."
+msgstr "Du kan uppdatera din personliga profil här"
#: lib/designsettings.php:372
msgid "Bad default color settings: "
@@ -4803,7 +4792,15 @@ msgstr "Inget sådant inlägg."
msgid "Unknown file type"
msgstr "okänd fil typ"
-#: lib/jabber.php:192
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5186,11 +5183,11 @@ msgstr "Fel uppstog när fjärrprofilen skulle läggas till"
msgid "Duplicate notice"
msgstr "Tabort inlägg"
-#: lib/oauthstore.php:466 lib/subs.php:48
+#: lib/oauthstore.php:467 lib/subs.php:48
msgid "You have been banned from subscribing."
msgstr ""
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr "Kunde inte lägga till ny prenumeration."
@@ -5227,7 +5224,7 @@ msgstr ""
msgid "Tags in %s's notices"
msgstr ""
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Prenumerationer"
@@ -5235,7 +5232,7 @@ msgstr "Prenumerationer"
msgid "All subscriptions"
msgstr "Alla prenumerationer"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Prenumerant"
@@ -5244,15 +5241,15 @@ msgstr "Prenumerant"
msgid "All subscribers"
msgstr "Prenumerant"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr ""
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Medlem sedan"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr ""
@@ -5464,47 +5461,51 @@ msgstr "Du kan inte skicka meddelande till den användaren."
msgid "Message"
msgstr "Nytt meddelande"
-#: lib/util.php:826
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr ""
+
+#: lib/util.php:825
msgid "a few seconds ago"
msgstr "ett par sekunder sedan"
-#: lib/util.php:828
+#: lib/util.php:827
msgid "about a minute ago"
msgstr "för nån minut sedan"
-#: lib/util.php:830
+#: lib/util.php:829
#, php-format
msgid "about %d minutes ago"
msgstr "för %d minuter sedan"
-#: lib/util.php:832
+#: lib/util.php:831
msgid "about an hour ago"
msgstr "för en timma sedan"
-#: lib/util.php:834
+#: lib/util.php:833
#, php-format
msgid "about %d hours ago"
msgstr "för %d timmar sedan"
-#: lib/util.php:836
+#: lib/util.php:835
msgid "about a day ago"
msgstr "för en dag sedan"
-#: lib/util.php:838
+#: lib/util.php:837
#, php-format
msgid "about %d days ago"
msgstr "för %d dagar sedan"
-#: lib/util.php:840
+#: lib/util.php:839
msgid "about a month ago"
msgstr "för en månad sedan"
-#: lib/util.php:842
+#: lib/util.php:841
#, php-format
msgid "about %d months ago"
msgstr "för %d månader sedan"
-#: lib/util.php:844
+#: lib/util.php:843
msgid "about a year ago"
msgstr "för ett år sedan"
@@ -5533,7 +5534,3 @@ msgstr "Ledsen, men det är inte din inkommande emailadress."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Ledsen, men inga inkommande email är tillåtna."
-
-#, fuzzy
-#~ msgid "Notice"
-#~ msgstr "Inlägg"
diff --git a/locale/te/LC_MESSAGES/statusnet.mo b/locale/te/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 438b8885f..000000000
--- a/locale/te/LC_MESSAGES/statusnet.mo
+++ /dev/null
Binary files differ
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index 2449a7967..fd3695343 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-23 21:46+0000\n"
-"PO-Revision-Date: 2009-11-23 21:48:12+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:20:50+0000\n"
"Language-Team: Telugu\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59365); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: te\n"
"X-Message-Group: out-statusnet\n"
@@ -566,7 +566,7 @@ msgstr "కత్తిరించు"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -737,7 +737,7 @@ msgid "Conversation"
msgstr "సంభాషణ"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "సందేశాలు"
@@ -796,9 +796,8 @@ msgid "You can only delete local users."
msgstr "ఇతర వాడుకరుల స్థితిని మీరు తొలగించలేరు."
#: actions/deleteuser.php:110 actions/deleteuser.php:133
-#, fuzzy
msgid "Delete user"
-msgstr "తొలగించు"
+msgstr "వాడుకరిని తొలగించు"
#: actions/deleteuser.php:135
msgid ""
@@ -807,9 +806,8 @@ msgid ""
msgstr ""
#: actions/deleteuser.php:148 lib/deleteuserform.php:77
-#, fuzzy
msgid "Delete this user"
-msgstr "ఈ నోటీసుని తొలగించు"
+msgstr "ఈ వాడుకరిని తొలగించు"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
#: lib/adminpanelaction.php:302 lib/groupnav.php:119
@@ -826,33 +824,29 @@ msgid "Invalid logo URL."
msgstr "తప్పుడు పరిమాణం."
#: actions/designadminpanel.php:274
-#, fuzzy, php-format
+#, php-format
msgid "Theme not available: %s"
-msgstr "హోమ్ పేజీ URL సరైనది కాదు."
+msgstr "అలంకారం అందుబాటులో లేదు: %s"
#: actions/designadminpanel.php:370
-#, fuzzy
msgid "Change logo"
-msgstr "రంగులను మార్చు"
+msgstr "చిహ్నాన్ని మార్చు"
#: actions/designadminpanel.php:375
-#, fuzzy
msgid "Site logo"
-msgstr "ఆహ్వానించు"
+msgstr "సైటు చిహ్నం"
#: actions/designadminpanel.php:382
-#, fuzzy
msgid "Change theme"
-msgstr "మార్చు"
+msgstr "అలంకారాన్ని మార్చు"
#: actions/designadminpanel.php:399
-#, fuzzy
msgid "Site theme"
-msgstr "కొత్త సందేశం"
+msgstr "సైటు అలంకారం"
#: actions/designadminpanel.php:400
msgid "Theme for the site."
-msgstr ""
+msgstr "సైటుకి అలంకారం."
#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
@@ -891,9 +885,8 @@ msgid "Change colours"
msgstr "రంగులను మార్చు"
#: actions/designadminpanel.php:505 lib/designsettings.php:191
-#, fuzzy
msgid "Content"
-msgstr "అనుసంధానించు"
+msgstr "విషయం"
#: actions/designadminpanel.php:518 lib/designsettings.php:204
msgid "Sidebar"
@@ -1154,7 +1147,7 @@ msgstr ""
msgid "New incoming email address added."
msgstr ""
-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "ప్రాచుర్య నోటీసులు"
@@ -1248,23 +1241,23 @@ msgstr ""
msgid "You can use the local subscription!"
msgstr ""
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr ""
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
msgstr ""
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
msgid "Could not convert request token to access token."
msgstr ""
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
msgid "Remote service uses unknown version of OMB protocol."
msgstr ""
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "దూరపు ప్రొపైలుని తాజాకరించటంలో పొరపాటు"
@@ -1328,9 +1321,8 @@ msgid "Do not block this user from this group"
msgstr ""
#: actions/groupblock.php:179
-#, fuzzy
msgid "Block this user from this group"
-msgstr "అటువంటి వాడుకరి లేరు."
+msgstr "ఈ గుంపునుండి ఈ వాడుకరిని నిరోధించు"
#: actions/groupblock.php:196
msgid "Database error blocking user from group."
@@ -1386,9 +1378,8 @@ msgid "Pick a square area of the image to be the logo."
msgstr ""
#: actions/grouplogo.php:396
-#, fuzzy
msgid "Logo updated."
-msgstr "అవతారాన్ని తాజాకరించాం."
+msgstr "చిహ్నాన్ని తాజాకరించాం."
#: actions/grouplogo.php:398
#, fuzzy
@@ -1466,8 +1457,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "గుంపులు"
@@ -1495,14 +1486,12 @@ msgid "Only an admin can unblock group members."
msgstr ""
#: actions/groupunblock.php:95
-#, fuzzy
msgid "User is not blocked from group."
-msgstr "వాడుకరికి ప్రొఫైలు లేదు."
+msgstr "వాడుకరిని గుంపు నుండి నిరోధించలేదు."
#: actions/groupunblock.php:128 actions/unblock.php:77
-#, fuzzy
msgid "Error removing the block."
-msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు."
+msgstr "నిరోధాన్ని తొలగించడంలో పొరపాటు."
#: actions/imsettings.php:59
msgid "IM Settings"
@@ -1615,7 +1604,7 @@ msgstr ""
#: actions/invite.php:72
#, php-format
msgid "Invalid email address: %s"
-msgstr ""
+msgstr "తప్పుడు ఈమెయిలు చిరునామా: %s"
#: actions/invite.php:110
msgid "Invitation(s) sent"
@@ -1641,7 +1630,7 @@ msgstr ""
#: actions/invite.php:144
msgid "Invitation(s) sent to the following people:"
-msgstr ""
+msgstr "క్రింది ప్రజలకి ఆహ్వానము(ల)ని పంపించాం:"
#: actions/invite.php:150
msgid ""
@@ -1660,7 +1649,7 @@ msgstr "ఈమెయిలు చిరునామాలు"
#: actions/invite.php:189
msgid "Addresses of friends to invite (one per line)"
-msgstr ""
+msgstr "ఆహ్వానించాల్సిన మిత్రుల చిరునామాలు (లైనుకి ఒకటి చొప్పున)"
#: actions/invite.php:192
msgid "Personal message"
@@ -1668,7 +1657,7 @@ msgstr "వ్యక్తిగత సందేశం"
#: actions/invite.php:194
msgid "Optionally add a personal message to the invitation."
-msgstr ""
+msgstr "ఐచ్ఛికంగా ఆహ్వానానికి వ్యక్తిగత సందేశం చేర్చండి."
#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
@@ -1754,59 +1743,59 @@ msgstr "%2$s గుంపు నుండి %1$s వైదొలిగారు
msgid "Already logged in."
msgstr "ఇప్పటికే లోనికి ప్రవేశించారు."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "సందేశపు విషయం సరైనది కాదు"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "వాడుకరిపేరు లేదా సంకేతపదం తప్పు."
-#: actions/login.php:149
+#: actions/login.php:152
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "ప్రవేశించండి"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr ""
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "పేరు"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "సంకేతపదం"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "నన్ను గుర్తుంచుకో"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "భవిష్యత్తులో ఆటోమెటిగ్గా లోనికి ప్రవేశించు; బయటి కంప్యూర్ల కొరకు కాదు!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "మీ సంకేతపదం మర్చిపోయారా?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
"భద్రతా కారణాల దృష్ట్యా, అమరికలు మార్చే ముందు మీ వాడుకరి పేరుని మరియు సంకేతపదాన్ని మరోసారి ఇవ్వండి."
-#: actions/login.php:286
+#: actions/login.php:289
#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -1953,9 +1942,8 @@ msgid "%1$s's status on %2$s"
msgstr ""
#: actions/oembed.php:157
-#, fuzzy
msgid "content type "
-msgstr "అనుసంధానించు"
+msgstr "విషయ రకం "
#: actions/oembed.php:160
msgid "Only "
@@ -2030,9 +2018,8 @@ msgid "Change your password."
msgstr "మీ సంకేతపదం మార్చుకోండి."
#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
-#, fuzzy
msgid "Password change"
-msgstr "సంకేతపదం భద్రమయ్యింది."
+msgstr "సంకేతపదం మార్పు"
#: actions/passwordsettings.php:104
msgid "Old password"
@@ -2113,9 +2100,8 @@ msgstr ""
#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:299
-#, fuzzy
msgid "Site"
-msgstr "ఆహ్వానించు"
+msgstr "సైటు"
#: actions/pathsadminpanel.php:216
msgid "Path"
@@ -2170,9 +2156,8 @@ msgid "Avatar directory"
msgstr "అవతారాన్ని తొలగించాం."
#: actions/pathsadminpanel.php:269
-#, fuzzy
msgid "Backgrounds"
-msgstr "నేపథ్యం"
+msgstr "నేపథ్యాలు"
#: actions/pathsadminpanel.php:273
#, fuzzy
@@ -2529,7 +2514,7 @@ msgstr "పేరు లేదా ఈమెయిల్ చిరునామా
#: actions/recoverpassword.php:272
msgid "No user with that email address or username."
-msgstr ""
+msgstr "ఆ ఈమెయిలు చిరునామా లేదా వాడుకరిపేరుతో వాడుకరులెవరూ లేరు."
#: actions/recoverpassword.php:287
msgid "No registered email address for that user."
@@ -2708,7 +2693,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:356
+#: lib/userprofile.php:365
msgid "Subscribe"
msgstr "చందాచేరు"
@@ -2717,8 +2702,7 @@ msgid "Invalid profile URL (bad format)"
msgstr "ప్రొపైల్ URL తప్పు (చెడు ఫార్మాట్)"
#: actions/remotesubscribe.php:168
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr ""
#: actions/remotesubscribe.php:176
@@ -2811,9 +2795,9 @@ msgid "Feed for favorites of %s (RSS 2.0)"
msgstr "%s యొక్క మిత్రుల ఫీడు"
#: actions/showfavorites.php:184
-#, fuzzy, php-format
+#, php-format
msgid "Feed for favorites of %s (Atom)"
-msgstr "%s యొక్క మిత్రుల ఫీడు"
+msgstr "%s యొక్క ఇష్టాంశాల ఫీడు (ఆటమ్)"
#: actions/showfavorites.php:205
msgid ""
@@ -2897,7 +2881,7 @@ msgid "Members"
msgstr "సభ్యులు"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(ఏమీలేదు)"
@@ -2906,14 +2890,13 @@ msgstr "(ఏమీలేదు)"
msgid "All members"
msgstr "అందరు సభ్యులూ"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "గణాంకాలు"
#: actions/showgroup.php:432
-#, fuzzy
msgid "Created"
-msgstr "సృష్టించు"
+msgstr "సృష్టితం"
#: actions/showgroup.php:448
#, php-format
@@ -3055,7 +3038,7 @@ msgstr "సరైన ఈమెయిలు చిరునామా కాదు
#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
-msgstr ""
+msgstr "గుర్తు తెలియని భాష \"%s\""
#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
@@ -3235,14 +3218,12 @@ msgid "SSL"
msgstr ""
#: actions/siteadminpanel.php:384
-#, fuzzy
msgid "Sometimes"
-msgstr "సందేశాలు"
+msgstr "కొన్నిసార్లు"
#: actions/siteadminpanel.php:385
-#, fuzzy
msgid "Always"
-msgstr "మారుపేర్లు"
+msgstr "ఎల్లప్పుడూ"
#: actions/siteadminpanel.php:387
msgid "Use SSL"
@@ -3266,11 +3247,11 @@ msgstr "పరిమితులు"
#: actions/siteadminpanel.php:403
msgid "Text limit"
-msgstr ""
+msgstr "పాఠ్యపు పరిమితి"
#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
-msgstr ""
+msgstr "సందేశాలలోని అక్షరాల గరిష్ఠ సంఖ్య."
#: actions/siteadminpanel.php:407
msgid "Dupe limit"
@@ -3281,9 +3262,8 @@ msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
-#, fuzzy
msgid "Save site settings"
-msgstr "అవతారపు అమరికలు"
+msgstr "సైటు అమరికలను భద్రపరచు"
#: actions/smssettings.php:58
msgid "SMS Settings"
@@ -3626,11 +3606,11 @@ msgstr "కొత్త వాడుకరులు"
#: actions/useradminpanel.php:235
msgid "New user welcome"
-msgstr ""
+msgstr "కొత్త వాడుకరి స్వాగతం"
#: actions/useradminpanel.php:236
msgid "Welcome text for new users (Max 255 chars)."
-msgstr ""
+msgstr "కొత్త వాడుకరులకై స్వాగత సందేశం (255 అక్షరాలు గరిష్ఠం)."
#: actions/useradminpanel.php:241
#, fuzzy
@@ -3791,7 +3771,7 @@ msgstr ""
#: actions/usergroups.php:64
#, php-format
msgid "%s groups, page %d"
-msgstr ""
+msgstr "%s గుంపులు, పేజీ %d"
#: actions/usergroups.php:130
msgid "Search for more groups"
@@ -3871,7 +3851,7 @@ msgstr ""
msgid "Problem saving notice."
msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
@@ -4048,7 +4028,7 @@ msgstr "సంప్రదించు"
#: lib/action.php:741
msgid "Badge"
-msgstr ""
+msgstr "బాడ్జి"
#: lib/action.php:769
msgid "StatusNet software license"
@@ -4125,9 +4105,8 @@ msgid "Unable to delete design setting."
msgstr ""
#: lib/adminpanelaction.php:300
-#, fuzzy
msgid "Basic site configuration"
-msgstr "ఈమెయిల్ చిరునామా నిర్ధారణ"
+msgstr "ప్రాథమిక సైటు స్వరూపణం"
#: lib/adminpanelaction.php:303
#, fuzzy
@@ -4300,50 +4279,40 @@ msgstr ""
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "ఓపెన్ఐడీ ఫారమును సృష్టించలేకపోయాం: %s"
-
-#: 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:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "%sకి స్పందనలు"
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "%sకి స్పందనలు"
msgstr[1] "%sకి స్పందనలు"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "%sకి స్పందనలు"
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "%sకి స్పందనలు"
msgstr[1] "%sకి స్పందనలు"
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
msgstr[1] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4362,7 +4331,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4421,8 +4389,9 @@ msgid "Upload file"
msgstr "ఎగుమతించు"
#: lib/designsettings.php:109
+#, fuzzy
msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
+"You can upload your personal background image. The maximum file size is 2MB."
msgstr "మీ స్వంత నేపథ్యపు చిత్రాన్ని మీరు ఎక్కించవచ్చు. గరిష్ఠ ఫైలు పరిమాణం 2మెబై."
#: lib/designsettings.php:372
@@ -4600,7 +4569,15 @@ msgstr "అటువంటి సందేశమేమీ లేదు."
msgid "Unknown file type"
msgstr "తెలియని ఫైలు రకం"
-#: lib/jabber.php:192
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr "మెబై"
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr "కిబై"
+
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr "[%s]"
@@ -4922,9 +4899,8 @@ msgid "at"
msgstr ""
#: lib/noticelist.php:506
-#, fuzzy
msgid "in context"
-msgstr "విషయం లేదు!"
+msgstr "సందర్భంలో"
#: lib/noticelist.php:526
msgid "Reply to this notice"
@@ -4964,11 +4940,11 @@ msgstr "దూరపు ప్రొపైలుని చేర్చటంల
msgid "Duplicate notice"
msgstr "కొత్త సందేశం"
-#: lib/oauthstore.php:466 lib/subs.php:48
+#: lib/oauthstore.php:467 lib/subs.php:48
msgid "You have been banned from subscribing."
msgstr ""
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr ""
@@ -5005,7 +4981,7 @@ msgstr "మీరు పంపిన సందేశాలు"
msgid "Tags in %s's notices"
msgstr ""
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "చందాలు"
@@ -5013,7 +4989,7 @@ msgstr "చందాలు"
msgid "All subscriptions"
msgstr "అన్ని చందాలు"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "చందాదార్లు"
@@ -5021,15 +4997,15 @@ msgstr "చందాదార్లు"
msgid "All subscribers"
msgstr "అందరు చందాదార్లు"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr "వాడుకరి ID"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "సభ్యులైన తేదీ"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "అన్ని గుంపులు"
@@ -5232,47 +5208,51 @@ msgstr ""
msgid "Message"
msgstr "సందేశం"
-#: lib/util.php:826
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr ""
+
+#: lib/util.php:825
msgid "a few seconds ago"
msgstr "కొన్ని క్షణాల క్రితం"
-#: lib/util.php:828
+#: lib/util.php:827
msgid "about a minute ago"
msgstr "ఓ నిమిషం క్రితం"
-#: lib/util.php:830
+#: lib/util.php:829
#, php-format
msgid "about %d minutes ago"
msgstr "%d నిమిషాల క్రితం"
-#: lib/util.php:832
+#: lib/util.php:831
msgid "about an hour ago"
msgstr "ఒక గంట క్రితం"
-#: lib/util.php:834
+#: lib/util.php:833
#, php-format
msgid "about %d hours ago"
msgstr "%d గంటల క్రితం"
-#: lib/util.php:836
+#: lib/util.php:835
msgid "about a day ago"
msgstr "ఓ రోజు క్రితం"
-#: lib/util.php:838
+#: lib/util.php:837
#, php-format
msgid "about %d days ago"
msgstr "%d రోజుల క్రితం"
-#: lib/util.php:840
+#: lib/util.php:839
msgid "about a month ago"
msgstr "ఓ నెల క్రితం"
-#: lib/util.php:842
+#: lib/util.php:841
#, php-format
msgid "about %d months ago"
msgstr "%d నెలల క్రితం"
-#: lib/util.php:844
+#: lib/util.php:843
msgid "about a year ago"
msgstr "ఒక సంవత్సరం క్రితం"
@@ -5301,7 +5281,3 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
-
-#, fuzzy
-#~ msgid "Notice"
-#~ msgstr "సందేశాలు"
diff --git a/locale/tr/LC_MESSAGES/statusnet.mo b/locale/tr/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 02303b93d..000000000
--- a/locale/tr/LC_MESSAGES/statusnet.mo
+++ /dev/null
Binary files differ
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index f2b8c15bc..bbb9c2df9 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-23 21:46+0000\n"
-"PO-Revision-Date: 2009-11-23 21:48:15+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:20:53+0000\n"
"Language-Team: Turkish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59365); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: tr\n"
"X-Message-Group: out-statusnet\n"
@@ -577,7 +577,7 @@ msgstr ""
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -754,7 +754,7 @@ msgid "Conversation"
msgstr "Yer"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Durum mesajları"
@@ -1176,7 +1176,7 @@ msgstr ""
msgid "New incoming email address added."
msgstr ""
-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
#: lib/publicgroupnav.php:93
#, fuzzy
msgid "Popular notices"
@@ -1272,25 +1272,25 @@ msgstr ""
msgid "You can use the local subscription!"
msgstr "Yerel aboneliği kullanabilirsiniz!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr ""
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "Yetkilendirilmemiş."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
msgid "Could not convert request token to access token."
msgstr ""
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "OMB protokolünün bilinmeğen sürümü."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Uzaktaki profili güncellemede hata oluştu"
@@ -1502,8 +1502,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1802,54 +1802,54 @@ msgstr ""
msgid "Already logged in."
msgstr "Zaten giriş yapılmış."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "Geçersiz durum mesajı"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Yanlış kullanıcı adı veya parola."
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Yetkilendirilmemiş."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Giriş"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr ""
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Takma ad"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Parola"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Beni hatırla"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Gelecekte kendiliğinden giriş yap, paylaşılan bilgisayarlar için değildir!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Parolamı unuttum veya kaybettim"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1857,7 +1857,7 @@ msgstr ""
"Güvenliğiniz için, ayarlarınızı değiştirmeden önce lütfen kullanıcı adınızı "
"ve parolanızı tekrar giriniz."
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2775,7 +2775,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:356
+#: lib/userprofile.php:365
msgid "Subscribe"
msgstr "Abone ol"
@@ -2785,8 +2785,7 @@ msgstr ""
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "Geçersiz profil adresi (YADIS belgesi yok)."
#: actions/remotesubscribe.php:176
@@ -2968,7 +2967,7 @@ msgid "Members"
msgstr "Üyelik başlangıcı"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
@@ -2977,7 +2976,7 @@ msgstr ""
msgid "All members"
msgstr ""
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "İstatistikler"
@@ -3950,7 +3949,7 @@ msgstr ""
msgid "Problem saving notice."
msgstr "Durum mesajını kaydederken hata oluştu."
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Cevap eklenirken veritabanı hatası: %s"
@@ -4383,47 +4382,37 @@ msgstr ""
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "OpenID formu yaratılamadı: %s"
-
-#: 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:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Bize o profili yollamadınız"
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Bize o profili yollamadınız"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Uzaktan abonelik"
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Uzaktan abonelik"
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Bize o profili yollamadınız"
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Bize o profili yollamadınız"
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4442,7 +4431,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4501,9 +4489,11 @@ msgid "Upload file"
msgstr "Yükle"
#: lib/designsettings.php:109
+#, fuzzy
msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
+"You can upload your personal background image. The maximum file size is 2MB."
msgstr ""
+"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
#: lib/designsettings.php:372
msgid "Bad default color settings: "
@@ -4684,7 +4674,15 @@ msgstr "Böyle bir durum mesajı yok."
msgid "Unknown file type"
msgstr ""
-#: lib/jabber.php:192
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5057,11 +5055,11 @@ msgstr "Uzak profil eklemede hata oluştu"
msgid "Duplicate notice"
msgstr "Yeni durum mesajı"
-#: lib/oauthstore.php:466 lib/subs.php:48
+#: lib/oauthstore.php:467 lib/subs.php:48
msgid "You have been banned from subscribing."
msgstr ""
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr "Yeni abonelik eklenemedi."
@@ -5098,7 +5096,7 @@ msgstr ""
msgid "Tags in %s's notices"
msgstr ""
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Abonelikler"
@@ -5106,7 +5104,7 @@ msgstr "Abonelikler"
msgid "All subscriptions"
msgstr "Bütün abonelikler"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Abone olanlar"
@@ -5115,15 +5113,15 @@ msgstr "Abone olanlar"
msgid "All subscribers"
msgstr "Abone olanlar"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr ""
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Üyelik başlangıcı"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr ""
@@ -5329,47 +5327,51 @@ msgstr ""
msgid "Message"
msgstr ""
-#: lib/util.php:826
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr ""
+
+#: lib/util.php:825
msgid "a few seconds ago"
msgstr "birkaç saniye önce"
-#: lib/util.php:828
+#: lib/util.php:827
msgid "about a minute ago"
msgstr "yaklaşık bir dakika önce"
-#: lib/util.php:830
+#: lib/util.php:829
#, php-format
msgid "about %d minutes ago"
msgstr "yaklaşık %d dakika önce"
-#: lib/util.php:832
+#: lib/util.php:831
msgid "about an hour ago"
msgstr "yaklaşık bir saat önce"
-#: lib/util.php:834
+#: lib/util.php:833
#, php-format
msgid "about %d hours ago"
msgstr "yaklaşık %d saat önce"
-#: lib/util.php:836
+#: lib/util.php:835
msgid "about a day ago"
msgstr "yaklaşık bir gün önce"
-#: lib/util.php:838
+#: lib/util.php:837
#, php-format
msgid "about %d days ago"
msgstr "yaklaşık %d gün önce"
-#: lib/util.php:840
+#: lib/util.php:839
msgid "about a month ago"
msgstr "yaklaşık bir ay önce"
-#: lib/util.php:842
+#: lib/util.php:841
#, php-format
msgid "about %d months ago"
msgstr "yaklaşık %d ay önce"
-#: lib/util.php:844
+#: lib/util.php:843
msgid "about a year ago"
msgstr "yaklaşık bir yıl önce"
@@ -5398,7 +5400,3 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
-
-#, fuzzy
-#~ msgid "Notice"
-#~ msgstr "Durum mesajları"
diff --git a/locale/uk/LC_MESSAGES/statusnet.mo b/locale/uk/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 5f6d5d78d..000000000
--- a/locale/uk/LC_MESSAGES/statusnet.mo
+++ /dev/null
Binary files differ
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index e2a2aaae6..b3fb43465 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -1,5 +1,7 @@
# Translation of StatusNet to Ukrainian
#
+# Author@translatewiki.net: AS
+# Author@translatewiki.net: Boogie
# --
# This file is distributed under the same license as the StatusNet package.
#
@@ -7,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-23 21:46+0000\n"
-"PO-Revision-Date: 2009-11-23 21:48:18+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:20:56+0000\n"
"Language-Team: Ukrainian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59365); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: out-statusnet\n"
@@ -21,9 +23,8 @@ msgstr ""
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
-#, fuzzy
msgid "No such page"
-msgstr "Такого тегу немає."
+msgstr "Немає такої сторінки"
#: actions/all.php:74 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
@@ -62,25 +63,25 @@ msgid "%s and friends"
msgstr "%s з друзями"
#: actions/all.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
-msgstr "Живлення для друзів %s"
+msgstr "Стрічка дописів для друзів %s (RSS 1.0)"
#: actions/all.php:107
-#, fuzzy, php-format
+#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
-msgstr "Живлення для друзів %s"
+msgstr "Стрічка дописів для друзів %s (RSS 2.0)"
#: actions/all.php:115
-#, fuzzy, php-format
+#, php-format
msgid "Feed for friends of %s (Atom)"
-msgstr "Живлення для друзів %s"
+msgstr "Стрічка дописів для друзів %s (Atom)"
#: actions/all.php:127
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
-msgstr ""
+msgstr "Це стрічка дописів %s і друзів, але вона поки що порожня."
#: actions/all.php:132
#, php-format
@@ -88,6 +89,8 @@ msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
"something yourself."
msgstr ""
+"Спробуйте до когось підписатись, [приєднатись до групи](%%action.groups%%) "
+"або напишіть щось самі."
#: actions/all.php:134
#, php-format
@@ -95,6 +98,8 @@ msgid ""
"You can try to [nudge %s](../%s) from his profile or [post something to his "
"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
msgstr ""
+"Ви можете [«розштовхати» %s](../%s) зі сторінки його профілю або [щось йому "
+"написати](%%%%action.newnotice%%%%?status_textarea=%s)."
#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
#, php-format
@@ -102,11 +107,12 @@ msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
"post a notice to his or her attention."
msgstr ""
+"Чому б не [зареєструватись](%%%%action.register%%%%) і не спробувати "
+"«розштовхати» %s або щось йому написати."
#: actions/all.php:165
-#, fuzzy
msgid "You and friends"
-msgstr "%s з друзями"
+msgstr "Ви з друзями"
#: actions/allrss.php:119 actions/apitimelinefriends.php:121
#, php-format
@@ -118,9 +124,8 @@ msgstr "Оновлення від %1$s та друзів на %2$s!"
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
#: actions/apiaccountupdateprofile.php:97
-#, fuzzy
msgid "API method not found."
-msgstr "API метод не знайдено!"
+msgstr "API метод не знайдено."
#: actions/apiaccountupdatedeliverydevice.php:85
#: actions/apiaccountupdateprofilebackgroundimage.php:86
@@ -133,16 +138,16 @@ msgstr "API метод не знайдено!"
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
-msgstr "Цей метод потребує НАПИСАТИ."
+msgstr "Цей метод потребує POST."
#: actions/apiaccountupdatedeliverydevice.php:105
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none"
msgstr ""
+"Ви мусите встановити параметр «девайс» з одним зі значень: СМС, ІМ, жоден"
#: actions/apiaccountupdatedeliverydevice.php:132
-#, fuzzy
msgid "Could not update user."
msgstr "Не вдалося оновити користувача."
@@ -156,20 +161,20 @@ msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
"current configuration."
msgstr ""
+"Сервер нездатен обробити таку кількість даних (%s байтів) за поточної "
+"конфігурації."
#: actions/apiaccountupdateprofilebackgroundimage.php:136
#: actions/apiaccountupdateprofilebackgroundimage.php:146
#: actions/apiaccountupdateprofilecolors.php:164
#: actions/apiaccountupdateprofilecolors.php:174
-#, fuzzy
msgid "Unable to save your design settings."
-msgstr "Не маю можливості зберегти ваші налаштування Твіттера!"
+msgstr "Не маю можливості зберегти налаштування дизайну."
#: actions/apiaccountupdateprofilebackgroundimage.php:187
#: actions/apiaccountupdateprofilecolors.php:142
-#, fuzzy
msgid "Could not update your design."
-msgstr "Не вдалося оновити користувача."
+msgstr "Не вдалося оновити Ваш дизайн."
#: actions/apiaccountupdateprofilebackgroundimage.php:194
#: actions/apiaccountupdateprofilecolors.php:185
@@ -181,7 +186,6 @@ msgid "User has no profile."
msgstr "Користувач не має профілю."
#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
msgid "Could not save profile."
msgstr "Не вдалося зберегти профіль."
@@ -198,9 +202,9 @@ msgid "No message text!"
msgstr "Повідомлення без тексту!"
#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, fuzzy, php-format
+#, php-format
msgid "That's too long. Max message size is %d chars."
-msgstr "Надто довго. Максимальний розмір 140 знаків."
+msgstr "Надто довго. Максимальний розмір %d знаків."
#: actions/apidirectmessagenew.php:146
msgid "Recipient user not found."
@@ -209,12 +213,12 @@ msgstr "Отримувача не знайдено."
#: actions/apidirectmessagenew.php:150
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
-"Не можна надіслати пряме повідомлення користувачеві, який не є вашим другом."
+"Не можна надіслати пряме повідомлення користувачеві, який не є Вашим другом."
#: actions/apidirectmessage.php:89
-#, fuzzy, php-format
+#, php-format
msgid "Direct messages from %s"
-msgstr "Пряме повідомлення до %s"
+msgstr "Прямі повідомлення від %s"
#: actions/apidirectmessage.php:93
#, php-format
@@ -254,18 +258,16 @@ msgid "No status found with that ID."
msgstr "Жодних статусів з таким ID."
#: actions/apifavoritecreate.php:119
-#, fuzzy
msgid "This status is already a favorite!"
-msgstr "Це повідомлення вже є обраним!"
+msgstr "Цей допис вже є обраним!"
#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
msgid "Could not create favorite."
msgstr "Не можна позначити як обране."
#: actions/apifavoritedestroy.php:122
-#, fuzzy
msgid "That status is not a favorite!"
-msgstr "Це повідомлення не є обраним!"
+msgstr "Цей допис не є обраним!"
#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
msgid "Could not delete favorite."
@@ -278,50 +280,47 @@ msgstr "Не вдалося додати користувача: користу
#: actions/apifriendshipscreate.php:118
#, php-format
msgid "Could not follow user: %s is already on your list."
-msgstr "Не вдалося додати користувача: %s вже присутній у вашому списку."
+msgstr "Не вдалося додати користувача: %s вже присутній у Вашому списку."
#: actions/apifriendshipsdestroy.php:109
-#, fuzzy
msgid "Could not unfollow user: User not found."
-msgstr "Не вдалося додати користувача: користувача не знайдено."
+msgstr "Не вдалося відмінити підписку: користувача не знайдено."
#: actions/apifriendshipsdestroy.php:120
msgid "You cannot unfollow yourself!"
-msgstr ""
+msgstr "Не можна відписатись від самого себе!"
#: actions/apifriendshipsexists.php:94
msgid "Two user ids or screen_names must be supplied."
msgstr "Два ID або імені_у_мережі повинні підтримуватись."
#: actions/apifriendshipsshow.php:135
-#, fuzzy
msgid "Could not determine source user."
-msgstr "Не вдається відновити загальний потік."
+msgstr "Не вдалось встановити джерело користувача."
#: actions/apifriendshipsshow.php:143
-#, fuzzy
msgid "Could not find target user."
-msgstr "Жодних статусів не виявлено."
+msgstr "Не вдалося знайти цільового користувача."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
-"Ім'я користувача повинно складатись з літер нижнього регістру і цифр, ніяких "
+"Ім’я користувача повинно складатись з літер нижнього регістру і цифр, ніяких "
"інтервалів."
#: actions/apigroupcreate.php:173 actions/editgroup.php:186
#: actions/newgroup.php:130 actions/profilesettings.php:231
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
-msgstr "Це ім'я вже використовується. Спробуйте інше."
+msgstr "Це ім’я вже використовується. Спробуйте інше."
#: actions/apigroupcreate.php:180 actions/editgroup.php:189
#: actions/newgroup.php:133 actions/profilesettings.php:211
#: actions/register.php:210
msgid "Not a valid nickname."
-msgstr "Це недійсне ім'я користувача."
+msgstr "Це недійсне ім’я користувача."
#: actions/apigroupcreate.php:196 actions/editgroup.php:195
#: actions/newgroup.php:139 actions/profilesettings.php:215
@@ -333,92 +332,89 @@ msgstr "Веб-сторінка має недійсну URL-адресу."
#: actions/newgroup.php:142 actions/profilesettings.php:218
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
-msgstr "Повне ім'я задовге (255 знаків максимум)"
+msgstr "Повне ім’я задовге (255 знаків максимум)"
#: actions/apigroupcreate.php:213
-#, fuzzy, php-format
+#, php-format
msgid "Description is too long (max %d chars)."
-msgstr "опис надто довгий (140 знаків максимум)"
+msgstr "Опис надто довгий (%d знаків максимум)."
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
#: actions/newgroup.php:148 actions/profilesettings.php:225
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
-msgstr "Локація надто довга (255 знаків максимум)"
+msgstr "Локація надто довга (255 знаків максимум)."
#: actions/apigroupcreate.php:243 actions/editgroup.php:215
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
-msgstr ""
+msgstr "Забагато додаткових імен! Максимум становить %d."
#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
-#, fuzzy, php-format
+#, php-format
msgid "Invalid alias: \"%s\""
-msgstr "Недійсний тег: \"%s\""
+msgstr "Помилкове додаткове ім’я: \"%s\""
#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
-#, fuzzy, php-format
+#, php-format
msgid "Alias \"%s\" already in use. Try another one."
-msgstr "Це ім'я вже використовується. Спробуйте інше."
+msgstr "Додаткове ім’я \"%s\" вже використовується. Спробуйте інше."
#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
-msgstr ""
+msgstr "Додаткове ім’я не може бути таким самим що й основне."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
-#, fuzzy
msgid "Group not found!"
-msgstr "API метод не знайдено!"
+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."
-msgstr ""
+msgstr "Адмін цієї групи заблокував Вашу присутність в ній."
#: actions/apigroupjoin.php:138
-#, fuzzy, php-format
+#, php-format
msgid "Could not join user %s to group %s."
-msgstr "Користувачеві %s не вдалось приєднатись до групи %s"
+msgstr "Не вдалось долучити користувача %s до групи %s."
#: actions/apigroupleave.php:114
-#, fuzzy
msgid "You are not a member of this group."
msgstr "Ви не є учасником цієї групи."
#: actions/apigroupleave.php:124
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %s to group %s."
-msgstr "Не вдалося видалити користувача %s з групи %s"
+msgstr "Не вдалося видалити користувача %s з групи %s."
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
msgid "%s groups"
-msgstr "Групи %s"
+msgstr "%s групи"
#: actions/apigrouplistall.php:94
-#, fuzzy, php-format
+#, 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
+#, php-format
msgid "Groups %s is a member of on %s."
-msgstr "%s бере участь в цих групах"
+msgstr "Групи, в яких %s бере участь на %s."
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
@@ -429,9 +425,8 @@ msgid "You may not delete another user's status."
msgstr "Ви не можете видалити статус іншого користувача."
#: actions/apistatusesshow.php:138
-#, fuzzy
msgid "Status deleted."
-msgstr "Аватару оновлено."
+msgstr "Статус видалено."
#: actions/apistatusesshow.php:144
msgid "No status with that ID found."
@@ -439,9 +434,9 @@ msgstr "Не знайдено жодних статусів з таким ID."
#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
-#, fuzzy, php-format
+#, php-format
msgid "That's too long. Max notice size is %d chars."
-msgstr "Надто довго. Максимальний розмір повідомлення 140 знаків."
+msgstr "Надто довго. Максимальний розмір допису — %d знаків."
#: actions/apistatusesupdate.php:198
msgid "Not found"
@@ -451,11 +446,12 @@ msgstr "Не знайдено"
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
+"Максимальна довжина допису становить %d знаків, включно з URL-адресою "
+"вкладення."
#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
-#, fuzzy
msgid "Unsupported format."
-msgstr "Формат зображення не підтримується."
+msgstr "Формат не підтримується."
#: actions/apitimelinefavorites.php:107
#, php-format
@@ -471,7 +467,7 @@ msgstr "%s оновлення обраних від %s / %s."
#: actions/grouprss.php:131 actions/userrss.php:90
#, php-format
msgid "%s timeline"
-msgstr "%s хронологія"
+msgstr "%s стрічка"
#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
#: actions/userrss.php:92
@@ -480,43 +476,42 @@ msgid "Updates from %1$s on %2$s!"
msgstr "Оновлення від %1$s на %2$s!"
#: actions/apitimelinementions.php:116
-#, fuzzy, php-format
+#, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / Оновленні відповіді %2$s"
#: actions/apitimelinementions.php:126
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "%1$s оновив(ла) цю відповідь на оновлення від %2$s / %3$s."
+msgstr "%1$s оновив цю відповідь на допис від %2$s / %3$s."
#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
-msgstr "%s загальна хронологія"
+msgstr "%s загальна стрічка"
#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
-msgstr "%s оновлення від всіх!"
+msgstr "%s оновлення від усіх!"
#: actions/apitimelinetag.php:101 actions/tag.php:66
#, php-format
msgid "Notices tagged with %s"
-msgstr "Повідомлення позначені з %s"
+msgstr "Дописи позначені з %s"
#: actions/apitimelinetag.php:107 actions/tagrss.php:64
-#, fuzzy, php-format
+#, php-format
msgid "Updates tagged with %1$s on %2$s!"
-msgstr "Оновлення від %1$s на %2$s!"
+msgstr "Оновлення позначені з %1$s на %2$s!"
#: actions/apiusershow.php:96
msgid "Not found."
msgstr "Не знайдено."
#: actions/attachment.php:73
-#, fuzzy
msgid "No such attachment."
-msgstr "Такого документа немає."
+msgstr "Такого вкладення немає."
#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
msgid "No nickname."
@@ -536,9 +531,9 @@ msgid "Avatar"
msgstr "Аватара"
#: actions/avatarsettings.php:78
-#, fuzzy, php-format
+#, php-format
msgid "You can upload your personal avatar. The maximum file size is %s."
-msgstr "Ви можете завантажити вашу персональну аватару."
+msgstr "Ви можете завантажити аватару. Максимальний розмір %s."
#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
@@ -578,7 +573,7 @@ msgstr "Втяти"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -599,11 +594,11 @@ msgstr "Несподіване представлення форми."
#: actions/avatarsettings.php:322
msgid "Pick a square area of the image to be your avatar"
-msgstr "Оберіть квадратну ділянку зображення, яка й буде вашою автарою."
+msgstr "Оберіть квадратну ділянку зображення, яка й буде Вашою автарою."
#: actions/avatarsettings.php:337 actions/grouplogo.php:377
msgid "Lost our file data."
-msgstr "Дані вашого файлу десь загубились."
+msgstr "Дані Вашого файлу десь загубились."
#: actions/avatarsettings.php:360
msgid "Avatar updated."
@@ -614,9 +609,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
@@ -633,24 +627,22 @@ msgid "No such group"
msgstr "Такої групи немає"
#: actions/blockedfromgroup.php:90
-#, fuzzy, php-format
+#, php-format
msgid "%s blocked profiles"
-msgstr "Профіль користувача."
+msgstr "Заблоковані профілі %s"
#: actions/blockedfromgroup.php:93
-#, fuzzy, php-format
+#, php-format
msgid "%s blocked profiles, page %d"
-msgstr "%s з друзями, сторінка %d"
+msgstr "Заблоковані профілі %s, сторінка %d"
#: actions/blockedfromgroup.php:108
-#, fuzzy
msgid "A list of the users blocked from joining this group."
-msgstr "Список учасників цієї групи."
+msgstr "Список користувачів блокованих в цій групі."
#: actions/blockedfromgroup.php:281
-#, fuzzy
msgid "Unblock user from group"
-msgstr "Спроба розблокувати користувача невдала."
+msgstr "Розблокувати користувача"
#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
@@ -661,13 +653,12 @@ msgid "Unblock this user"
msgstr "Розблокувати цього користувача"
#: actions/block.php:69
-#, fuzzy
msgid "You already blocked that user."
msgstr "Цього користувача вже заблоковано."
#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
msgid "Block user"
-msgstr "Блокувати користувача."
+msgstr "Блокувати користувача"
#: actions/block.php:130
msgid ""
@@ -675,6 +666,9 @@ msgid ""
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
+"Впевнені, що бажаєте блокувати цього користувача? Позаяк, його буде "
+"відписано від Вас, він не зможе підписитасть до Вас у майбутньому і Ви "
+"більше не отримуватимете жодних дописів від нього."
#: actions/block.php:143 actions/deletenotice.php:145
#: actions/deleteuser.php:147 actions/groupblock.php:178
@@ -682,9 +676,8 @@ msgid "No"
msgstr "Ні"
#: actions/block.php:143 actions/deleteuser.php:147
-#, fuzzy
msgid "Do not block this user"
-msgstr "Розблокувати цього користувача"
+msgstr "Не блокувати цього користувача"
#: actions/block.php:144 actions/deletenotice.php:146
#: actions/deleteuser.php:148 actions/groupblock.php:179
@@ -700,9 +693,8 @@ msgid "Failed to save block information."
msgstr "Збереження інформації про блокування завершилось невдачею."
#: actions/bookmarklet.php:50
-#, fuzzy
msgid "Post to "
-msgstr "Фото"
+msgstr "Написати "
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -714,12 +706,12 @@ msgstr "Код підтвердження не знайдено."
#: actions/confirmaddress.php:85
msgid "That confirmation code is not for you!"
-msgstr "Цей код підтвердження не для вас!"
+msgstr "Цей код підтвердження не для Вас!"
#: actions/confirmaddress.php:90
#, php-format
msgid "Unrecognized address type %s"
-msgstr "Невизнаний тип адреси %s"
+msgstr "Невизначений тип адреси %s"
#: actions/confirmaddress.php:94
msgid "That address has already been confirmed."
@@ -745,21 +737,20 @@ msgstr "Підтвердити адресу"
#: actions/confirmaddress.php:159
#, php-format
msgid "The address \"%s\" has been confirmed for your account."
-msgstr "Адресу \"%s\" було підтверджено для вашого рахунку."
+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 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
-msgstr "Повідомлення"
+msgstr "Дописи"
#: actions/deletenotice.php:52 actions/shownotice.php:92
msgid "No such notice."
-msgstr "Такого повідомлення немає."
+msgstr "Такого допису немає."
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -772,177 +763,162 @@ msgstr "Не увійшли."
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
-msgstr "Не можна видалити це повідомлення."
+msgstr "Не можна видалити цей допис."
#: actions/deletenotice.php:103
-#, fuzzy
msgid ""
"You are about to permanently delete a notice. Once this is done, it cannot "
"be undone."
-msgstr ""
-"Ви видаляєте повідомлення назавжди. Якщо ви це зробите, то пам'ятайте, що "
-"зворотня дія неможлива."
+msgstr "Ви видаляєте допис назавжди. Ця дія є незворотною."
#: actions/deletenotice.php:109 actions/deletenotice.php:141
msgid "Delete notice"
-msgstr "Видалити повідомлення"
+msgstr "Видалити допис"
#: actions/deletenotice.php:144
msgid "Are you sure you want to delete this notice?"
-msgstr "Ви впевненні, що бажаєте видалити це повідомлення?"
+msgstr "Ви впевненні, що бажаєте видалити цей допис?"
#: actions/deletenotice.php:145
-#, fuzzy
msgid "Do not delete this notice"
-msgstr "Не можна видалити це повідомлення."
+msgstr "Не видаляти цей допис"
#: actions/deletenotice.php:146 lib/noticelist.php:550
msgid "Delete this notice"
-msgstr "Видалити повідомлення"
+msgstr "Видалити допис"
#: actions/deletenotice.php:157
-#, fuzzy
msgid "There was a problem with your session token. Try again, please."
msgstr ""
"Виникли певні проблеми з токеном поточної сесії. Спробуйте знов, будь ласка."
#: actions/deleteuser.php:67
-#, fuzzy
msgid "You cannot delete users."
-msgstr "Не вдалося оновити користувача."
+msgstr "Ви не можете видаляти користувачів."
#: actions/deleteuser.php:74
-#, fuzzy
msgid "You can only delete local users."
-msgstr "Ви не можете видалити статус іншого користувача."
+msgstr "Ви можете видаляти лише локальних користувачів."
#: actions/deleteuser.php:110 actions/deleteuser.php:133
-#, fuzzy
msgid "Delete user"
-msgstr "Видалити"
+msgstr "Видалити користувача"
#: actions/deleteuser.php:135
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
msgstr ""
+"Впевнені, що бажаєте видалити цього користувача? Усі дані буде знищено без "
+"можливості відновлення."
#: actions/deleteuser.php:148 lib/deleteuserform.php:77
-#, fuzzy
msgid "Delete this user"
-msgstr "Видалити повідомлення"
+msgstr "Видалити цього користувача"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
#: lib/adminpanelaction.php:302 lib/groupnav.php:119
msgid "Design"
-msgstr ""
+msgstr "Дизайн"
#: actions/designadminpanel.php:73
msgid "Design settings for this StatusNet site."
-msgstr ""
+msgstr "Налаштування дизайну для цього сайту StatusNet."
#: actions/designadminpanel.php:270
-#, fuzzy
msgid "Invalid logo URL."
-msgstr "Недійсний розмір."
+msgstr "Помилкова URL-адреса логотипу."
#: actions/designadminpanel.php:274
-#, fuzzy, php-format
+#, php-format
msgid "Theme not available: %s"
-msgstr "Ця сторінка не доступна в "
+msgstr "Тема не доступна: %s"
#: actions/designadminpanel.php:370
-#, fuzzy
msgid "Change logo"
-msgstr "Змінити ваш пароль"
+msgstr "Змінити логотип"
#: actions/designadminpanel.php:375
-#, fuzzy
msgid "Site logo"
-msgstr "Запросити"
+msgstr "Логотип сайту"
#: actions/designadminpanel.php:382
-#, fuzzy
msgid "Change theme"
-msgstr "Змінити"
+msgstr "Змінити тему"
#: actions/designadminpanel.php:399
-#, fuzzy
msgid "Site theme"
-msgstr "Зауваження сайту"
+msgstr "Тема сайту"
#: actions/designadminpanel.php:400
-#, fuzzy
msgid "Theme for the site."
-msgstr "Вийти з сайту"
+msgstr "Тема для цього сайту."
#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
-msgstr ""
+msgstr "Змінити фонове зображення"
#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
-msgstr ""
+msgstr "Фон"
#: actions/designadminpanel.php:422
-#, fuzzy, php-format
+#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
-msgstr "Ви маєте можливість завантажити логотип для вашої группи."
+msgstr ""
+"Ви можете завантажити фонове зображення для сайту. Максимальний розмір файлу "
+"%1$s."
#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
-msgstr ""
+msgstr "Увімк."
#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
-msgstr ""
+msgstr "Вимк."
#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
-msgstr ""
+msgstr "Увімкнути або вимкнути фонове зображення."
#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
-msgstr ""
+msgstr "Замостити фон"
#: actions/designadminpanel.php:483 lib/designsettings.php:170
-#, fuzzy
msgid "Change colours"
-msgstr "Змінити ваш пароль"
+msgstr "Змінити кольори"
#: actions/designadminpanel.php:505 lib/designsettings.php:191
-#, fuzzy
msgid "Content"
-msgstr "З'єднання"
+msgstr "Зміст"
#: actions/designadminpanel.php:518 lib/designsettings.php:204
-#, fuzzy
msgid "Sidebar"
-msgstr "Пошук"
+msgstr "Бічна панель"
#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
msgstr "Текст"
#: actions/designadminpanel.php:544 lib/designsettings.php:230
-#, fuzzy
msgid "Links"
-msgstr "Увійти"
+msgstr "Посилання"
#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
-msgstr ""
+msgstr "За замовч."
#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
-msgstr ""
+msgstr "Оновити налаштування за замовчуванням"
#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
-msgstr ""
+msgstr "Повернутись до початкових налаштувань"
#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
@@ -956,11 +932,11 @@ msgstr "Зберегти"
#: actions/designadminpanel.php:582 lib/designsettings.php:257
msgid "Save design"
-msgstr ""
+msgstr "Зберегти дизайн"
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
-msgstr "Це повідомлення не є обраним!"
+msgstr "Цей допис не є обраним!"
#: actions/disfavor.php:94
msgid "Add to favorites"
@@ -989,18 +965,17 @@ msgid "Use this form to edit the group."
msgstr "Скористайтесь цією формою, щоб відредагувати групу."
#: actions/editgroup.php:201 actions/newgroup.php:145
-#, fuzzy, php-format
+#, php-format
msgid "description is too long (max %d chars)."
-msgstr "опис надто довгий (140 знаків максимум)"
+msgstr "опис надто довгий (%d знаків максимум)."
#: actions/editgroup.php:253
msgid "Could not update group."
msgstr "Не вдалося оновити групу."
#: actions/editgroup.php:259 classes/User_group.php:390
-#, fuzzy
msgid "Could not create aliases."
-msgstr "Не можна позначити як обране."
+msgstr "Неможна призначити додаткові імена."
#: actions/editgroup.php:269
msgid "Options saved."
@@ -1013,7 +988,7 @@ msgstr "Налаштування пошти"
#: actions/emailsettings.php:71
#, php-format
msgid "Manage how you get email from %%site.name%%."
-msgstr "Зазначте, як само ви бажаєте отримувати листи з %%site.name%%."
+msgstr "Зазначте, як саме Ви бажаєте отримувати листи з %%site.name%%."
#: actions/emailsettings.php:100 actions/imsettings.php:100
#: actions/smssettings.php:104
@@ -1062,7 +1037,7 @@ msgstr "Вхідна пошта"
#: actions/emailsettings.php:138 actions/smssettings.php:157
msgid "Send email to this address to post new notices."
-msgstr "Надсилайте листи на цю адресу і їх буде опубліковано на сайті."
+msgstr "Надсилайте дописи на цю адресу і їх буде опубліковано на сайті."
#: actions/emailsettings.php:145 actions/smssettings.php:162
msgid "Make a new email address for posting to; cancels the old one."
@@ -1083,25 +1058,23 @@ msgstr "Поівдомляти мене поштою про нові підпи
#: actions/emailsettings.php:163
msgid "Send me email when someone adds my notice as a favorite."
-msgstr ""
-"Надсилати мені листа, коли хтось додає моє повідомлення до списку обраних."
+msgstr "Надсилати мені листа, коли хтось додає мій допис до списку обраних."
#: actions/emailsettings.php:169
msgid "Send me email when someone sends me a private message."
-msgstr "Надсилати мені листа, коли хтось шле приватне повідомлення для мене."
+msgstr "Надсилати мені листа, коли хтось має приватне повідомлення для мене."
#: actions/emailsettings.php:174
-#, fuzzy
msgid "Send me email when someone sends me an \"@-reply\"."
-msgstr "Надсилати мені листа, коли хтось шле приватне повідомлення для мене."
+msgstr "Надсилати мені листа, коли на мій допис з’являється \"@-відповідь\"."
#: actions/emailsettings.php:179
msgid "Allow friends to nudge me and send me an email."
-msgstr "Дозволити друзям \"розштовхати\" мене, надіславши мені листа."
+msgstr "Дозволити друзям «розштовхати» мене, надіславши мені листа."
#: actions/emailsettings.php:185
msgid "I want to post notices by email."
-msgstr "Я хочу надсилати повідомлення поштою."
+msgstr "Я хочу надсилати дописи поштою."
#: actions/emailsettings.php:191
msgid "Publish a MicroID for my email address."
@@ -1126,7 +1099,7 @@ msgstr "Це недійсна електронна адреса"
#: actions/emailsettings.php:334
msgid "That is already your email address."
-msgstr "Це і так вже ваша адреса."
+msgstr "Це і є Вашою адресою."
#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
@@ -1142,7 +1115,7 @@ 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 ""
-"Код підтвердження був відправлений на електронну адресу, яку ви додали. "
+"Код підтвердження був відправлений на електронну адресу, яку Ви додали. "
"Перевірте вхідну пошту (і теку зі спамом також!), там має бути код та "
"подальші інструкції."
@@ -1162,7 +1135,7 @@ msgstr "Підтвердження скасовано."
#: actions/emailsettings.php:413
msgid "That is not your email address."
-msgstr "Це не ваша адреса."
+msgstr "Це не є Вашою адресою."
#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
@@ -1186,7 +1159,7 @@ msgstr "Адресу вхідної пошти видалено."
msgid "New incoming email address added."
msgstr "Нову адресу для вхідних повідомлень додано."
-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Популярні дописи"
@@ -1202,13 +1175,15 @@ msgstr "Представлено найбільш популярні допис
#: actions/favorited.php:150
msgid "Favorite notices appear on this page but no one has favorited one yet."
-msgstr ""
+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
@@ -1216,6 +1191,8 @@ msgid ""
"Why not [register an account](%%action.register%%) and be the first to add a "
"notice to your favorites!"
msgstr ""
+"Чому б не [зареєструватись](%%action.register%%) і не почати додавати цікаві "
+"дописи до улюблених!"
#: actions/favoritesrss.php:111 actions/showfavorites.php:77
#: lib/personalgroupnav.php:115
@@ -1224,13 +1201,13 @@ msgid "%s's favorite notices"
msgstr "Обрані дописи %s"
#: actions/favoritesrss.php:115
-#, fuzzy, php-format
+#, php-format
msgid "Updates favored by %1$s on %2$s!"
-msgstr "Оновлення від %1$s на %2$s!"
+msgstr "Оновлення обраних дописів %1$s на %2$s!"
#: actions/favor.php:79
msgid "This notice is already a favorite!"
-msgstr "Це повідомлення вже є обраним!"
+msgstr "Цей допис вже є обраним!"
#: actions/favor.php:92 lib/disfavorform.php:140
msgid "Disfavor favorite"
@@ -1252,56 +1229,50 @@ msgid "A selection of some of the great users on %s"
msgstr "Вибірка з деяких видатних користувачів на %s"
#: actions/file.php:34
-#, fuzzy
msgid "No notice id"
-msgstr "Нове повідомлення"
+msgstr "Відсутній номер допису"
#: actions/file.php:38
-#, fuzzy
msgid "No notice"
-msgstr "Нове повідомлення"
+msgstr "Немає допису"
#: actions/file.php:42
msgid "No attachments"
-msgstr ""
+msgstr "Немає вкладень"
#: actions/file.php:51
msgid "No uploaded attachments"
-msgstr ""
+msgstr "Немає завантажених вкладень"
#: actions/finishremotesubscribe.php:69
msgid "Not expecting this response!"
msgstr "Ця відповідь не очікується!"
#: actions/finishremotesubscribe.php:80
-#, fuzzy
msgid "User being listened to does not exist."
-msgstr "Користувача, який слідкував за вашими повідомленнями, більше не існує."
+msgstr "Користувача, який слідкував за Вашими повідомленнями, більше не існує."
#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
msgid "You can use the local subscription!"
msgstr "Ви можете користуватись локальними підписками!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
-msgstr "Цей користувач заблокував вашу можливість підписатись."
+msgstr "Цей користувач заблокував Вашу можливість підписатись."
-#: actions/finishremotesubscribe.php:106
-#, fuzzy
+#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
msgstr "Не авторизовано."
-#: actions/finishremotesubscribe.php:109
-#, fuzzy
+#: actions/finishremotesubscribe.php:113
msgid "Could not convert request token to access token."
msgstr "Не вдалося перетворити токени запиту на токени звернення."
-#: actions/finishremotesubscribe.php:114
-#, fuzzy
+#: actions/finishremotesubscribe.php:118
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Невідома версія протоколу OMB."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Помилка при оновленні віддаленого профілю"
@@ -1312,14 +1283,12 @@ msgid "No such group."
msgstr "Такої групи немає."
#: actions/getfile.php:75
-#, fuzzy
msgid "No such file."
-msgstr "Такого повідомлення немає."
+msgstr "Такого файлу немає."
#: actions/getfile.php:79
-#, fuzzy
msgid "Cannot read file."
-msgstr "Файл втрачено."
+msgstr "Не можу прочитати файл."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
@@ -1335,28 +1304,24 @@ msgstr "Не визначено профілю з таким ID."
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
-#, fuzzy
msgid "No group specified."
-msgstr "Не визначено жодного профілю."
+msgstr "Групу не визначено."
#: actions/groupblock.php:91
msgid "Only an admin can block group members."
-msgstr ""
+msgstr "Лише адмін групи має змогу блокувати користувачів."
#: actions/groupblock.php:95
-#, fuzzy
msgid "User is already blocked from group."
-msgstr "Користувач заблокував вас."
+msgstr "Користувача заблоковано в цій групі."
#: actions/groupblock.php:100
-#, fuzzy
msgid "User is not a member of group."
-msgstr "Ви не є учасником цієї групи."
+msgstr "Користувач не є учасником групи."
#: actions/groupblock.php:136 actions/groupmembers.php:314
-#, fuzzy
msgid "Block user from group"
-msgstr "Блокувати користувача."
+msgstr "Блокувати користувача в групі"
#: actions/groupblock.php:162
#, php-format
@@ -1365,73 +1330,72 @@ msgid ""
"be removed from the group, unable to post, and unable to subscribe to the "
"group in the future."
msgstr ""
+"Впевнені, що бажаєте блокувати користувача \"%s\" у групі \"%s\"? Його буде "
+"позбавлено членства у групі, він не зможе сюди писати, а також не зможе "
+"знову вступити до групи."
#: actions/groupblock.php:178
-#, fuzzy
msgid "Do not block this user from this group"
-msgstr "Список учасників цієї групи."
+msgstr "Не блокувати користувача в групі"
#: actions/groupblock.php:179
-#, fuzzy
msgid "Block this user from this group"
-msgstr "Список учасників цієї групи."
+msgstr "Блокувати користувача цієї групи"
#: actions/groupblock.php:196
msgid "Database error blocking user from group."
-msgstr ""
+msgstr "Виникла помилка при блокуванні користувача в цій групі."
#: actions/groupbyid.php:74
msgid "No ID"
msgstr "Немає ID"
#: actions/groupdesignsettings.php:68
-#, fuzzy
msgid "You must be logged in to edit a group."
-msgstr "Ви маєте спочатку увійти, аби мати змогу створити групу."
+msgstr "Ви маєте спочатку увійти, аби мати змогу редагувати групу."
#: actions/groupdesignsettings.php:141
-#, fuzzy
msgid "Group design"
-msgstr "Групи"
+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
-#, fuzzy
msgid "Couldn't update your design."
-msgstr "Не вдалося оновити користувача."
+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
-#, fuzzy
msgid "Unable to save your design settings!"
-msgstr "Не маю можливості зберегти ваші налаштування Твіттера!"
+msgstr "Не маю можливості зберегти Ваші налаштування дизайну!"
#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
-#, fuzzy
msgid "Design preferences saved."
-msgstr "Преференції синхронізації збережно."
+msgstr "Преференції дизайну збережно."
#: actions/grouplogo.php:139 actions/grouplogo.php:192
msgid "Group logo"
msgstr "Логотип групи"
#: actions/grouplogo.php:150
-#, fuzzy, php-format
+#, php-format
msgid ""
"You can upload a logo image for your group. The maximum file size is %s."
-msgstr "Ви маєте можливість завантажити логотип для вашої группи."
+msgstr ""
+"Ви маєте можливість завантажити логотип для Вашої группи. Максимальний "
+"розмір файлу %s."
#: actions/grouplogo.php:362
-#, fuzzy
msgid "Pick a square area of the image to be the logo."
-msgstr "Оберіть квадратну ділянку зображення, яка й буде вашою автарою."
+msgstr "Оберіть квадратну ділянку зображення, яка й буде логотипом групи."
#: actions/grouplogo.php:396
msgid "Logo updated."
@@ -1464,31 +1428,29 @@ msgid "Block"
msgstr "Блок"
#: actions/groupmembers.php:441
-#, fuzzy
msgid "Make user an admin of the group"
-msgstr "Ви маєте бути наділені правами адмінистратора, аби редагувати групу"
+msgstr "Надати користувачеві права адміністратора"
#: actions/groupmembers.php:473
-#, fuzzy
msgid "Make Admin"
-msgstr "Адмін"
+msgstr "Зробити адміном"
#: actions/groupmembers.php:473
msgid "Make this user an admin"
-msgstr ""
+msgstr "Надати цьому користувачеві права адміністратора"
#: actions/grouprss.php:133
-#, fuzzy, php-format
+#, php-format
msgid "Updates from members of %1$s on %2$s!"
-msgstr "Оновлення від %1$s на %2$s!"
+msgstr "Оновлення членів %1$s на %2$s!"
#: actions/groupsearch.php:52
-#, fuzzy, php-format
+#, php-format
msgid ""
"Search for groups on %%site.name%% by their name, location, or description. "
"Separate the terms by spaces; they must be 3 characters or more."
msgstr ""
-"Пошук людей на %%site.name%% за їх ім'ям, локацією або інтересами. "
+"Пошук груп на %%site.name%% за їхньою назвою, локацією або описом. "
"Відокремлюйте пошукові умови інтервалами; вони повинні складатись з 3 знаків "
"або більше."
@@ -1498,9 +1460,8 @@ msgstr "Пошук груп"
#: actions/groupsearch.php:79 actions/noticesearch.php:117
#: actions/peoplesearch.php:83
-#, fuzzy
msgid "No results."
-msgstr "Немає результатів"
+msgstr "Немає результатів."
#: actions/groupsearch.php:82
#, php-format
@@ -1508,6 +1469,8 @@ msgid ""
"If you can't find the group you're looking for, you can [create it](%%action."
"newgroup%%) yourself."
msgstr ""
+"Якщо не можете відшукати групу, яка Вас цікавить, то [створіть](%%action."
+"newgroup%%) власну."
#: actions/groupsearch.php:85
#, php-format
@@ -1515,9 +1478,11 @@ msgid ""
"Why not [register an account](%%action.register%%) and [create the group](%%"
"action.newgroup%%) yourself!"
msgstr ""
+"Чому б не [зареєструватись](%%action.register%%) і не [створити](%%action."
+"newgroup%%) свою власну групу!"
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Групи"
@@ -1535,6 +1500,11 @@ msgid ""
"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
"%%%%)"
msgstr ""
+"Групи на сайті %%%%site.name%%%% дозволять Вам відшукати людей зі спільними "
+"інтересами. Лише приєднайтеся до групи і надсилайте повідомлення до усіх її "
+"учасників використовуючи просту команду \"!groupname\" у тексті "
+"повідомлення. Не бачите групу, яка Вас цікавить? Спробуйте її [знайти](%%%%"
+"action.groupsearch%%%%) або [створіть власну!](%%%%action.newgroup%%%%)"
#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
msgid "Create a new group"
@@ -1542,12 +1512,11 @@ msgstr "Створити нову групу"
#: actions/groupunblock.php:91
msgid "Only an admin can unblock group members."
-msgstr ""
+msgstr "Лише адміни можуть розблокувати членів групи."
#: actions/groupunblock.php:95
-#, fuzzy
msgid "User is not blocked from group."
-msgstr "Користувач заблокував вас."
+msgstr "Користувача не блоковано."
#: actions/groupunblock.php:128 actions/unblock.php:77
msgid "Error removing the block."
@@ -1563,14 +1532,12 @@ msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
"doc.im%%). Configure your address and settings below."
msgstr ""
-"Ви можете надсилати та отримувати повідомлення через Jabber/GTalk [службу "
-"миттєвих повідомлень](%%doc.im%%). Вкажить свою адресу і налаштуйте опції "
-"нижче."
+"Ви можете надсилати та отримувати дописи через Jabber/GTalk [службу миттєвих "
+"повідомлень](%%doc.im%%). Вкажить свою адресу і налаштуйте опції нижче."
#: actions/imsettings.php:89
-#, fuzzy
msgid "IM is not available."
-msgstr "Ця сторінка не доступна в "
+msgstr "ІМ недоступний"
#: actions/imsettings.php:106
msgid "Current confirmed Jabber/GTalk address."
@@ -1582,9 +1549,9 @@ 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 ""
-"Очікування підтвердження цієї адреси. Перевірте свій Jabber/GTalk рахунок, "
-"там має бути повідомлення з подальшими інструкціями. (Ви додали %s до вашого "
-"списку контактів?)"
+"Очікування підтвердження цієї адреси. Перевірте свій Jabber/GTalk акаунт, "
+"туди має надійти повідомлення з подальшими інструкціями. (Ви додали %s до "
+"Вашого списку контактів?)"
#: actions/imsettings.php:124
msgid "IM Address"
@@ -1606,8 +1573,7 @@ msgstr "Повідомляти мене через Jabber/GTalk."
#: actions/imsettings.php:148
msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr ""
-"Надсилати повідомлення на сайт, коли мій статус Jabber/GTalk змінюється."
+msgstr "Надсилати дописи на сайт, коли мій статус Jabber/GTalk змінюється."
#: actions/imsettings.php:153
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
@@ -1633,7 +1599,7 @@ msgstr "Це недійсний Jabber ID"
#: actions/imsettings.php:299
msgid "That is already your Jabber ID."
-msgstr "Це і так вже ваш Jabber ID."
+msgstr "Це і є Ваш Jabber ID."
#: actions/imsettings.php:302
msgid "Jabber ID already belongs to another user."
@@ -1645,17 +1611,17 @@ msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
"s for sending messages to you."
msgstr ""
-"Код підтвердження був відправлений на адресу IM, яку ви додали. Ви повинні "
+"Код підтвердження був відправлений на адресу IM, яку Ви додали. Ви повинні "
"затведити %s для відправлення вам повідомлень."
#: actions/imsettings.php:387
msgid "That is not your Jabber ID."
-msgstr "Це не ваш Jabber ID."
+msgstr "Це не Ваш Jabber ID."
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %s - page %d"
-msgstr "Вхідні для %s - сторінка %d"
+msgstr "Вхідні для %s — сторінка %d"
#: actions/inbox.php:62
#, php-format
@@ -1665,11 +1631,11 @@ msgstr "Вхідні для %s"
#: 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 ""
+msgstr "Запрошення були скасовані."
#: actions/invite.php:41
#, php-format
@@ -1683,7 +1649,7 @@ msgstr "Недійсна електронна адреса: %s"
#: actions/invite.php:110
msgid "Invitation(s) sent"
-msgstr "Запрошення відіслано"
+msgstr "Запрошення надіслано"
#: actions/invite.php:112
msgid "Invite new users"
@@ -1701,7 +1667,7 @@ msgstr "%s (%s)"
#: actions/invite.php:136
msgid ""
"These people are already users and you were automatically subscribed to them:"
-msgstr "Ці люди вже є користувачами і вас було автоматично підписано до них:"
+msgstr "Ці люди вже є користувачами і Вас було автоматично підписано до них:"
#: actions/invite.php:144
msgid "Invitation(s) sent to the following people:"
@@ -1712,14 +1678,14 @@ 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
@@ -1746,7 +1712,7 @@ msgstr "Так!"
#: actions/invite.php:226
#, php-format
msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s запросив(ла) вас приєднатися до нього(неї) на %2$s"
+msgstr "%1$s запросив(ла) Вас приєднатися до нього(неї) на %2$s"
#: actions/invite.php:228
#, php-format
@@ -1778,13 +1744,13 @@ msgid ""
"\n"
"Sincerely, %2$s\n"
msgstr ""
-"%1$s запросив(ла) вас приєднатися до нього(неї) на %2$s (%3$s).\n"
+"%1$s запросив(ла) Вас приєднатися до нього(неї) на %2$s (%3$s).\n"
"\n"
-"%2$s це сервіс мікроблогів що дозволяє вам знаходитись у курсі подій, які "
-"відбуваються з вашими знайомими і тими особами, якими ви цікавитесь.\n"
+"%2$s — це сервіс мікроблоґів що дозволяє Вам знаходитись у курсі подій, які "
+"відбуваються з Вашими знайомими і тими особами, якими Ви цікавитесь.\n"
"\n"
-"Також ви маєте можливість ділитись новинами про себе, своїми думками, "
-"подіями у житті, розміщуючи все це у режимі \"онлайн\" для своїх знайомих та "
+"Також Ви маєте можливість ділитись новинами про себе, своїми думками, "
+"подіями у житті, розміщуючи все це у режимі «онлайн» для своїх знайомих та "
"друзів. А ще це чудовий спосіб зустріти нових друзів зі спільними "
"інтересами.\n"
"\n"
@@ -1796,7 +1762,7 @@ msgstr ""
"\n"
"%5$s\n"
"\n"
-"Якщо ви виявили бажання спробувати користуватись даним сервісом, то "
+"Якщо Ви виявили бажання спробувати користуватись даним сервісом, то "
"перейдіть за посиланням внизу, аби погодитись із запрошенням.\n"
"\n"
"%6$s\n"
@@ -1804,7 +1770,7 @@ msgstr ""
"Якщо ж ні, то просто проігноруйте це повідомлення. Дякуємо за розуміння та "
"витрачений час.\n"
"\n"
-"Щиро ваші, %2$s\n"
+"Щиро Ваші, %2$s\n"
#: actions/joingroup.php:60
msgid "You must be logged in to join a group."
@@ -1848,92 +1814,90 @@ msgstr "%s залишив групу %s"
#: actions/login.php:79 actions/register.php:137
msgid "Already logged in."
-msgstr "Тепер ви увійшли."
+msgstr "Тепер Ви увійшли."
-#: actions/login.php:110 actions/login.php:120
-#, fuzzy
+#: actions/login.php:108 actions/login.php:118
msgid "Invalid or expired token."
-msgstr "Недійсний зміст повідомлення"
+msgstr "Недійсний або неправильний токен."
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
-msgstr "Неточне ім'я або пароль."
+msgstr "Неточне ім’я або пароль."
-#: actions/login.php:149
-#, fuzzy
+#: actions/login.php:152
msgid "Error setting user. You are probably not authorized."
-msgstr "Не авторизовано."
+msgstr "Помилка. Можливо, Ви не авторизовані."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Увійти"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "Вхід на сайт"
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
-msgstr "Ім'я користувача"
+msgstr "Ім’я користувача"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Пароль"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
-msgstr "Пам'ятати мене"
+msgstr "Пам’ятати мене"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
-"Автоматично входити у майбутньому; не для комп'ютерів загального "
+"Автоматично входити у майбутньому; не для комп’ютерів загального "
"користування!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Загубили або забули пароль?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
-"З міркувань безпеки, будь ласка, введіть ще раз ім'я та пароль, перед тим як "
+"З міркувань безпеки, будь ласка, введіть ще раз ім’я та пароль, перед тим як "
"змінювати налаштування."
-#: actions/login.php:286
-#, fuzzy, php-format
+#: actions/login.php:289
+#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
"(%%action.register%%) a new account."
msgstr ""
-"Увійти викристовуючи ім'я та пароль. Ще не маєте імені користувача? "
-"[Зареєструвати](%%action.register%%) новий акаунт, або спробувати [OpenID](%%"
-"action.openidlogin%%). "
+"Увійти викристовуючи ім’я та пароль. Ще не маєте імені користувача? "
+"[Зареєструвати](%%action.register%%) новий акаунт."
#: 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 ""
+msgstr "%s вже є адміном у групі \"%s\"."
#: actions/makeadmin.php:132
#, php-format
msgid "Can't get membership record for %s in group %s"
-msgstr ""
+msgstr "Неможна отримати запис для %s щодо членства у групі %s"
#: actions/makeadmin.php:145
#, php-format
msgid "Can't make %s an admin for group %s"
-msgstr ""
+msgstr "Неможна %s надати права адміна у групі %s"
#: actions/microsummary.php:69
msgid "No current status"
@@ -1968,13 +1932,11 @@ msgstr "Жодного отримувача не визначено."
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
-"Не надсилайте повідомлень самому собі; краще поговоріть з собою тихенько "
-"вголос."
+"Не надсилайте повідомлень самому собі; краще поговоріть із собою вголос."
#: actions/newmessage.php:181
-#, fuzzy
msgid "Message sent"
-msgstr "Повідомлення"
+msgstr "Повідомлення надіслано"
#: actions/newmessage.php:185 lib/command.php:375
#, php-format
@@ -1987,11 +1949,11 @@ msgstr "Помилка в Ajax"
#: actions/newnotice.php:69
msgid "New notice"
-msgstr "Нове повідомлення"
+msgstr "Новий допис"
#: actions/newnotice.php:206
msgid "Notice posted"
-msgstr "Повідомлення відправлено"
+msgstr "Допис надіслано"
#: actions/noticesearch.php:68
#, php-format
@@ -1999,17 +1961,17 @@ msgid ""
"Search for notices on %%site.name%% by their contents. Separate search terms "
"by spaces; they must be 3 characters or more."
msgstr ""
-"Пошук повідомлень на %%site.name%% за їх змістом. Відокремлюйте пошукові "
-"умови інтервалами; вони повинні складатись з 3 знаків або більше."
+"Пошук дописів на %%site.name%% за їх змістом. Відокремлюйте пошукові умови "
+"інтервалами; вони повинні складатись з 3 знаків або більше."
#: actions/noticesearch.php:78
msgid "Text search"
-msgstr "Пошук тексту"
+msgstr "Пошук текстів"
#: actions/noticesearch.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Search results for \"%s\" on %s"
-msgstr " Потік пошуку для \"%s\""
+msgstr "Результати пошуку для \"%s\" на %s"
#: actions/noticesearch.php:121
#, php-format
@@ -2017,6 +1979,8 @@ msgid ""
"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
"status_textarea=%s)!"
msgstr ""
+"Станьте тим, хто напише перший [допис до цього топіку](%%%%action.newnotice%%"
+"%%?status_textarea=%s)!"
#: actions/noticesearch.php:124
#, php-format
@@ -2024,35 +1988,37 @@ msgid ""
"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
+"Чому б не [зареєструватись](%%%%action.register%%%%) і не написати перший "
+"[допис до цього топіку](%%%%action.newnotice%%%%?status_textarea=%s)!"
#: actions/noticesearchrss.php:96
-#, fuzzy, php-format
+#, php-format
msgid "Updates with \"%s\""
-msgstr "Оновлення від %1$s на %2$s!"
+msgstr "Оновлення з \"%s\""
#: actions/noticesearchrss.php:98
-#, fuzzy, php-format
+#, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr "Всі оновлення за збігом з \"%s\""
+msgstr "Всі оновлення за збігом з \"%s\" на %2$s!"
#: 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 "Спробу \"розштовхати\" зараховано"
+msgstr "Спробу «розштовхати» зараховано"
#: actions/nudge.php:97
msgid "Nudge sent!"
-msgstr "Спробу \"розштовхати\" зараховано!"
+msgstr "Спробу «розштовхати» зараховано!"
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
-msgstr "Повідомлення не має профілю"
+msgstr "Допис не має профілю"
#: actions/oembed.php:86 actions/shownotice.php:180
#, php-format
@@ -2060,13 +2026,12 @@ msgid "%1$s's status on %2$s"
msgstr "%1$s має статус на %2$s"
#: actions/oembed.php:157
-#, fuzzy
msgid "content type "
-msgstr "З'єднання"
+msgstr "тип змісту "
#: actions/oembed.php:160
msgid "Only "
-msgstr ""
+msgstr "Лише "
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
#: lib/api.php:1027 lib/api.php:1137
@@ -2079,7 +2044,7 @@ msgstr "Пошук людей"
#: actions/opensearch.php:67
msgid "Notice Search"
-msgstr "Пошук повідомлень"
+msgstr "Пошук дописів"
#: actions/othersettings.php:60
msgid "Other Settings"
@@ -2087,28 +2052,27 @@ msgstr "Інші опції"
#: actions/othersettings.php:71
msgid "Manage various other options."
-msgstr "Керування деякими іншими опціями"
+msgstr "Керування деякими іншими опціями."
#: actions/othersettings.php:108
msgid " (free service)"
-msgstr ""
+msgstr " (безкоштовно)"
#: actions/othersettings.php:116
msgid "Shorten URLs with"
-msgstr ""
+msgstr "Зручні URL"
#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
-msgstr "Сервіси доступні для використання"
+msgstr "Доступні сервіси."
#: actions/othersettings.php:122
-#, fuzzy
msgid "View profile designs"
-msgstr "Налаштування профілю"
+msgstr "Переглядати дизайн користувачів"
#: actions/othersettings.php:123
msgid "Show or hide profile designs."
-msgstr ""
+msgstr "Показувати або приховувати дизайни сторінок окремих користувачів."
#: actions/othersettings.php:153
msgid "URL shortening service is too long (max 50 chars)."
@@ -2117,7 +2081,7 @@ msgstr "Сервіс скорочення URL-адрес надто довгий
#: actions/outbox.php:58
#, php-format
msgid "Outbox for %s - page %d"
-msgstr "Вихідні для %s - сторінка %d"
+msgstr "Вихідні для %s — сторінка %d"
#: actions/outbox.php:61
#, php-format
@@ -2127,7 +2091,7 @@ msgstr "Вихідні для %s"
#: actions/outbox.php:116
msgid "This is your outbox, which lists private messages you have sent."
msgstr ""
-"Це ваші вихідні повідомлення, тут містяться повідомлення, які ви надіслали "
+"Це Ваші вихідні повідомлення, тут містяться повідомлення, які Ви надіслали "
"приватно."
#: actions/passwordsettings.php:58
@@ -2177,7 +2141,7 @@ msgstr "Паролі не співпадають."
#: actions/passwordsettings.php:165
msgid "Incorrect old password"
-msgstr "Старий пароль неточний"
+msgstr "Старий пароль є неточним"
#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
@@ -2185,7 +2149,7 @@ msgstr "Помилка при збереженні користувача; не
#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
-msgstr "Не можна зберегти новий пароль."
+msgstr "Неможна зберегти новий пароль."
#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
@@ -2193,111 +2157,104 @@ msgstr "Пароль збережено."
#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
msgid "Paths"
-msgstr ""
+msgstr "Шлях"
#: actions/pathsadminpanel.php:70
msgid "Path and server settings for this StatusNet site."
-msgstr ""
+msgstr "Шлях та налаштування серверу для цього сайту StatusNet."
#: actions/pathsadminpanel.php:140
-#, fuzzy, php-format
+#, php-format
msgid "Theme directory not readable: %s"
-msgstr "Ця сторінка не доступна в "
+msgstr "Дирикторію теми неможна прочитати: %s"
#: actions/pathsadminpanel.php:146
#, php-format
msgid "Avatar directory not writable: %s"
-msgstr ""
+msgstr "Щось не так із написанням директорії аватари: %s"
#: actions/pathsadminpanel.php:152
#, php-format
msgid "Background directory not writable: %s"
-msgstr ""
+msgstr "Щось не так із написанням директорії фону: %s"
#: actions/pathsadminpanel.php:160
#, php-format
msgid "Locales directory not readable: %s"
-msgstr ""
+msgstr "Не можу прочитати директорію локалі: %s"
#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
#: lib/adminpanelaction.php:299
-#, fuzzy
msgid "Site"
-msgstr "Запросити"
+msgstr "Сайт"
#: actions/pathsadminpanel.php:216
msgid "Path"
-msgstr ""
+msgstr "Шлях"
#: actions/pathsadminpanel.php:216
-#, fuzzy
msgid "Site path"
-msgstr "Зауваження сайту"
+msgstr "Шлях до сайту"
#: actions/pathsadminpanel.php:220
msgid "Path to locales"
-msgstr ""
+msgstr "Шлях до локалей"
#: actions/pathsadminpanel.php:220
msgid "Directory path to locales"
-msgstr ""
+msgstr "Директорія шляху до локалей"
#: actions/pathsadminpanel.php:227
msgid "Theme"
-msgstr ""
+msgstr "Тема"
#: actions/pathsadminpanel.php:232
msgid "Theme server"
-msgstr ""
+msgstr "Сервер теми"
#: actions/pathsadminpanel.php:236
msgid "Theme path"
-msgstr ""
+msgstr "Шлях до теми"
#: actions/pathsadminpanel.php:240
msgid "Theme directory"
-msgstr ""
+msgstr "Директорія теми"
#: actions/pathsadminpanel.php:247
-#, fuzzy
msgid "Avatars"
-msgstr "Аватара"
+msgstr "Аватари"
#: actions/pathsadminpanel.php:252
-#, fuzzy
msgid "Avatar server"
-msgstr "Налаштування аватари"
+msgstr "Сервер аватари"
#: actions/pathsadminpanel.php:256
-#, fuzzy
msgid "Avatar path"
-msgstr "Аватару оновлено."
+msgstr "Шлях до аватари"
#: actions/pathsadminpanel.php:260
-#, fuzzy
msgid "Avatar directory"
-msgstr "Аватару оновлено."
+msgstr "Директорія аватари"
#: actions/pathsadminpanel.php:269
msgid "Backgrounds"
-msgstr ""
+msgstr "Фони"
#: actions/pathsadminpanel.php:273
msgid "Background server"
-msgstr ""
+msgstr "Сервер фонів"
#: actions/pathsadminpanel.php:277
msgid "Background path"
-msgstr ""
+msgstr "Шлях до фонів"
#: actions/pathsadminpanel.php:281
msgid "Background directory"
-msgstr ""
+msgstr "Директорія фонів"
#: actions/pathsadminpanel.php:297
-#, fuzzy
msgid "Save paths"
-msgstr "Зауваження сайту"
+msgstr "Зберегти шляхи"
#: actions/peoplesearch.php:52
#, php-format
@@ -2305,7 +2262,7 @@ msgid ""
"Search for people on %%site.name%% by their name, location, or interests. "
"Separate the terms by spaces; they must be 3 characters or more."
msgstr ""
-"Пошук людей на %%site.name%% за їх ім'ям, локацією або інтересами. "
+"Пошук людей на %%site.name%% за їх ім’ям, локацією або інтересами. "
"Відокремлюйте пошукові умови інтервалами; вони повинні складатись з 3 знаків "
"або більше."
@@ -2316,21 +2273,21 @@ msgstr "Пошук людей"
#: actions/peopletag.php:70
#, php-format
msgid "Not a valid people tag: %s"
-msgstr "Це недійсний особистий тег: %s"
+msgstr "Це недійсний особистий теґ: %s"
#: actions/peopletag.php:144
#, php-format
msgid "Users self-tagged with %s - page %d"
-msgstr "Користувачі з особистим тегом %s - сторінка %d"
+msgstr "Користувачі з особистим теґом %s — сторінка %d"
#: actions/postnotice.php:84
msgid "Invalid notice content"
-msgstr "Недійсний зміст повідомлення"
+msgstr "Недійсний зміст допису"
#: actions/postnotice.php:90
#, php-format
msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
-msgstr ""
+msgstr "Ліцензія допису ‘%s’ є несумісною з ліцензією сайту ‘%s’."
#: actions/profilesettings.php:60
msgid "Profile settings"
@@ -2340,8 +2297,7 @@ msgstr "Налаштування профілю"
msgid ""
"You can update your personal profile info here so people know more about you."
msgstr ""
-"Ви можете доповнити свій особистий профіль, так що люди знатимуть про вас "
-"більше."
+"Ви можете заповнити свій особистий профіль і люди знатимуть про Вас більше."
#: actions/profilesettings.php:99
msgid "Profile information"
@@ -2350,13 +2306,13 @@ msgstr "Інформація профілю"
#: actions/profilesettings.php:108 lib/groupeditform.php:154
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
-"1-64 літери нижнього регістра і цифри, ніякої пунктуації або інтервалів"
+"1-64 літери нижнього регістру і цифри, ніякої пунктуації або інтервалів"
#: actions/profilesettings.php:111 actions/register.php:447
#: actions/showgroup.php:247 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:149
msgid "Full name"
-msgstr "Повне ім'я"
+msgstr "Повне ім’я"
#: actions/profilesettings.php:115 actions/register.php:452
#: lib/groupeditform.php:161
@@ -2365,17 +2321,16 @@ msgstr "Веб-сторінка"
#: actions/profilesettings.php:117 actions/register.php:454
msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL-адреса вашої веб-сторінки, блогу, або профілю на іншому сайті"
+msgstr "URL-адреса Вашої веб-сторінки, блоґу, або профілю на іншому сайті"
#: actions/profilesettings.php:122 actions/register.php:460
-#, fuzzy, php-format
+#, php-format
msgid "Describe yourself and your interests in %d chars"
-msgstr "Опишіть себе та свої інтереси (140 знаків)"
+msgstr "Опишіть себе та свої інтереси (%d знаків)"
#: actions/profilesettings.php:125 actions/register.php:463
-#, fuzzy
msgid "Describe yourself and your interests"
-msgstr "Опишіть себе та свої "
+msgstr "Опишіть себе та свої інтереси"
#: actions/profilesettings.php:127 actions/register.php:465
msgid "Bio"
@@ -2390,19 +2345,19 @@ msgstr "Локація"
#: actions/profilesettings.php:134 actions/register.php:472
msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Де ви живете, на зразок \"Місто, область (регіон), країна\""
+msgstr "Де Ви живете, штибу \"Місто, область (регіон), країна\""
#: actions/profilesettings.php:138 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
#: lib/subscriptionlist.php:108 lib/userprofile.php:209
msgid "Tags"
-msgstr "Теги"
+msgstr "Теґи"
#: actions/profilesettings.php:140
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-"Позначте себе тегами (літери, цифри, -, . та _), відокремлюючи кожен комою "
+"Позначте себе теґами (літери, цифри, -, . та _), відокремлюючи кожен комою "
"або пробілом"
#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
@@ -2411,7 +2366,7 @@ msgstr "Мова"
#: actions/profilesettings.php:145
msgid "Preferred language"
-msgstr "Мова, якій надаєте перевагу"
+msgstr "Мова, котрій надаєте перевагу"
#: actions/profilesettings.php:154
msgid "Timezone"
@@ -2419,19 +2374,18 @@ msgstr "Часовий пояс"
#: actions/profilesettings.php:155
msgid "What timezone are you normally in?"
-msgstr "За яким часовим поясом ви живете?"
+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
-#, fuzzy, php-format
+#, php-format
msgid "Bio is too long (max %d chars)."
-msgstr "Ви перевищили ліміт (140 знаків це максимум)"
+msgstr "Ви перевищили ліміт (%d знаків максимум)."
#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
@@ -2439,12 +2393,12 @@ msgstr "Часовий пояс не обрано."
#: actions/profilesettings.php:234
msgid "Language is too long (max 50 chars)."
-msgstr "Мова задовга (50 знаків максимум)"
+msgstr "Мова задовга (50 знаків максимум)."
#: actions/profilesettings.php:246 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
-msgstr "Недійсний тег: \"%s\""
+msgstr "Недійсний теґ: \"%s\""
#: actions/profilesettings.php:295
msgid "Couldn't update user for autosubscribe."
@@ -2456,7 +2410,7 @@ msgstr "Не вдалося зберегти профіль."
#: actions/profilesettings.php:336
msgid "Couldn't save tags."
-msgstr "Не вдалося зберегти теги."
+msgstr "Не вдалося зберегти теґи."
#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
@@ -2465,35 +2419,32 @@ msgstr "Налаштування збережено."
#: actions/public.php:83
#, php-format
msgid "Beyond the page limit (%s)"
-msgstr ""
+msgstr "Досягнуто ліміту сторінки (%s)"
#: actions/public.php:92
msgid "Could not retrieve public stream."
-msgstr "Не вдається відновити загальний потік."
+msgstr "Не вдається відновити загальну стрічку."
#: actions/public.php:129
#, php-format
msgid "Public timeline, page %d"
-msgstr "Загальний потік, сторінка %d"
+msgstr "Загальний стрічка, сторінка %d"
#: actions/public.php:131 lib/publicgroupnav.php:79
msgid "Public timeline"
-msgstr "Загальна хронологія"
+msgstr "Загальна стрічка"
#: actions/public.php:151
-#, fuzzy
msgid "Public Stream Feed (RSS 1.0)"
-msgstr "Живлення загального потоку"
+msgstr "Стрічка публічних дописів (RSS 1.0)"
#: actions/public.php:155
-#, fuzzy
msgid "Public Stream Feed (RSS 2.0)"
-msgstr "Живлення загального потоку"
+msgstr "Стрічка публічних дописів (RSS 2.0)"
#: actions/public.php:159
-#, fuzzy
msgid "Public Stream Feed (Atom)"
-msgstr "Живлення загального потоку"
+msgstr "Стрічка публічних дописів (Atom)"
#: actions/public.php:179
#, php-format
@@ -2501,16 +2452,19 @@ msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
+"Це публічна стрічка дописів сайту %%site.name%%, але вона поки що порожня."
#: actions/public.php:182
msgid "Be the first to post!"
-msgstr ""
+msgstr "Станьте першим! Напишіть щось!"
#: actions/public.php:186
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
+"Чому б не [зареєструватись](%%action.register%%) і не зробити свій перший "
+"допис!"
#: actions/public.php:233
#, php-format
@@ -2520,34 +2474,40 @@ msgid ""
"tool. [Join now](%%action.register%%) to share notices about yourself with "
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
+"Це %%site.name%% — сервіс [мікроблоґів](http://uk.wikipedia.org/wiki/"
+"Мікроблоґ), який працює на вільному програмному забезпеченні [StatusNet]"
+"(http://status.net/). [Приєднуйтесь](%%action.register%%) зараз і зможете "
+"розділити своє життя з друзями, родиною і колегами! ([Дізнатися більше](%%"
+"doc.help%%))"
#: actions/public.php:238
-#, fuzzy, php-format
+#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
"blogging) service based on the Free Software [StatusNet](http://status.net/) "
"tool."
msgstr ""
-"Цей сайт %%site.name%%, є сервісом [мікроблогів] (http://en.wikipedia.org/"
-"wiki/Micro-blogging) "
+"Це %%site.name%% — сервіс [мікроблоґів](http://uk.wikipedia.org/wiki/"
+"Мікроблоґ), який працює на вільному програмному забезпеченні [StatusNet]"
+"(http://status.net/)."
#: actions/publictagcloud.php:57
msgid "Public tag cloud"
-msgstr "Загальна хмарка тегів"
+msgstr "Загальна хмарка теґів"
#: actions/publictagcloud.php:63
#, php-format
msgid "These are most popular recent tags on %s "
-msgstr "Це найбільш популярні нові теги на %s "
+msgstr "Це найбільш популярні нові теґи на %s "
#: actions/publictagcloud.php:69
#, php-format
msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
-msgstr ""
+msgstr "Поки що ніхто не використовував теґ [hashtag](%%doc.tags%%)."
#: actions/publictagcloud.php:72
msgid "Be the first to post one!"
-msgstr ""
+msgstr "Станьте першим! Напишіть щось!"
#: actions/publictagcloud.php:75
#, php-format
@@ -2555,10 +2515,12 @@ msgid ""
"Why not [register an account](%%action.register%%) and be the first to post "
"one!"
msgstr ""
+"Чому б не [зареєструватись](%%%%action.register%%%%) і не написати щось "
+"цікаве!"
#: actions/publictagcloud.php:135
msgid "Tag cloud"
-msgstr "Хмарка тегів"
+msgstr "Хмарка теґів"
#: actions/recoverpassword.php:36
msgid "You are already logged in!"
@@ -2570,7 +2532,7 @@ msgstr "Немає такого коду відновлення."
#: actions/recoverpassword.php:66
msgid "Not a recovery code."
-msgstr "Це не код оновлення."
+msgstr "Це не код відновлення."
#: actions/recoverpassword.php:73
msgid "Recovery code for unknown user."
@@ -2593,23 +2555,25 @@ msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
msgstr ""
+"Якщо загубите або втратите свій пароль, його буде легко відновити за "
+"допомогою електронної адреси, яку Ви вказали у власному профілі."
#: actions/recoverpassword.php:158
msgid "You have been identified. Enter a new password below. "
-msgstr ""
+msgstr "Ідентифікація успішна. Введіть новий пароль. "
#: actions/recoverpassword.php:188
msgid "Password recovery"
-msgstr ""
+msgstr "Відновлення паролю"
#: actions/recoverpassword.php:191
msgid "Nickname or email address"
-msgstr ""
+msgstr "Ім’я користувача або поштова адреса"
#: actions/recoverpassword.php:193
msgid "Your nickname on this server, or your registered email address."
msgstr ""
-"Ваше ім'я користувача на цьому сервері, або зареєстрована електронна адреса."
+"Ваше ім’я користувача на цьому сервері, або зареєстрована електронна адреса."
#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
msgid "Recover"
@@ -2625,7 +2589,7 @@ msgstr "Відновити пароль"
#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
msgid "Password recovery requested"
-msgstr "Запит на відновлення паролю відправлено."
+msgstr "Запит на відновлення паролю відправлено"
#: actions/recoverpassword.php:213
msgid "Unknown action"
@@ -2641,11 +2605,11 @@ msgstr "Скинути"
#: actions/recoverpassword.php:252
msgid "Enter a nickname or email address."
-msgstr "Введіть ім'я або електронну адресу."
+msgstr "Введіть ім’я або електронну адресу."
#: actions/recoverpassword.php:272
msgid "No user with that email address or username."
-msgstr "Користувача з такою електронною адресою або ім'ям немає."
+msgstr "Користувача з такою електронною адресою або ім’ям немає."
#: actions/recoverpassword.php:287
msgid "No registered email address for that user."
@@ -2660,8 +2624,8 @@ 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."
@@ -2681,7 +2645,7 @@ msgstr "Помилка в налаштуваннях користувача."
#: actions/recoverpassword.php:382
msgid "New password successfully saved. You are now logged in."
-msgstr "Новий пароль успішно збережено. Тепер ви увійшли."
+msgstr "Новий пароль успішно збережено. Тепер Ви увійшли."
#: actions/register.php:85 actions/register.php:189 actions/register.php:404
msgid "Sorry, only invited people can register."
@@ -2689,9 +2653,8 @@ msgstr ""
"Пробачте, але лише ті, кого було запрошено, мають змогу зареєструватись тут."
#: actions/register.php:92
-#, fuzzy
msgid "Sorry, invalid invitation code."
-msgstr "Помилка з кодом підтвердження."
+msgstr "Даруйте, помилка у коді запрошення."
#: actions/register.php:112
msgid "Registration successful"
@@ -2720,13 +2683,15 @@ msgstr "Ця адреса вже використовується."
#: actions/register.php:243 actions/register.php:264
msgid "Invalid username or password."
-msgstr "Недійсне ім'я або пароль."
+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."
@@ -2753,7 +2718,7 @@ msgstr "Використовується лише для оновлень, ог
#: actions/register.php:449
msgid "Longer name, preferably your \"real\" name"
-msgstr "Довше ім'я, переважно ваше \"справжнє\" ім'я"
+msgstr "Повне ім’я, звісно ж Ваше справжнє ім’я :)"
#: actions/register.php:493
msgid "My text and files are available under "
@@ -2761,10 +2726,9 @@ msgstr "Мої повідомлення та файли доступні під
#: actions/register.php:495
msgid "Creative Commons Attribution 3.0"
-msgstr ""
+msgstr "Кріейтів Комонс Авторство 3.0"
#: actions/register.php:496
-#, fuzzy
msgid ""
" except this private data: password, email address, IM address, and phone "
"number."
@@ -2790,20 +2754,20 @@ msgid ""
"\n"
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-"Вітаємо, %s! І ласкаво просимо до %%%%site.name%%%%. Звідси ви, можливо, "
+"Вітаємо, %s! І ласкаво просимо до %%%%site.name%%%%. Звідси Ви, можливо, "
"схочете...\n"
"\n"
-"*Подивитись [ваш профіль](%s) та написати своє перше повідомлення.\n"
-"*Додати [адресу Jabber/GTalk](%%%%action.imsettings%%%%), так щоб мати змогу "
-"надсилати повідомлення через службу миттєвих повідомлень.\n"
-"*[Розшукати людей](%%%%action.peoplesearch%%%%), які мають спільні з вами "
+"*Подивитись [Ваш профіль](%s) та зробити свій перший допис.\n"
+"*Додати [адресу Jabber/GTalk](%%%%action.imsettings%%%%), аби мати змогу "
+"надсилати дописи через службу миттєвих повідомлень.\n"
+"*[Розшукати людей](%%%%action.peoplesearch%%%%), які мають спільні з Вами "
"інтереси.\n"
-"*Оновити [налаштування профілю](%%%%action.profilesettings%%%%) аби інші "
-"дізнались більше про вас.\n"
-"*Прочитати [додаткову інформацію](%%%%doc.help%%%%), аби переконатись, що ви "
+"*Оновити [налаштування профілю](%%%%action.profilesettings%%%%), щоб інші "
+"могли знати про Вас більше.\n"
+"*Прочитати [додаткову інформацію](%%%%doc.help%%%%), аби переконатись, що Ви "
"нічого не пропустили. \n"
"\n"
-"Дякуємо, що зареєструвались у нас, і, сподіваємось, вам сподобається наш "
+"Дякуємо, що зареєструвались у нас, і, сподіваємось, Вам сподобається наш "
"сервіс."
#: actions/register.php:561
@@ -2812,7 +2776,7 @@ msgid ""
"to confirm your email address.)"
msgstr ""
"(Ви маєте негайно отримати листа електронною поштою, в якому знаходитимуться "
-"інструкції щодо підтвердження вашої електронної адреси.)"
+"інструкції щодо підтвердження Вашої електронної адреси.)"
#: actions/remotesubscribe.php:98
#, php-format
@@ -2821,26 +2785,25 @@ msgid ""
"register%%) a new account. If you already have an account on a [compatible "
"microblogging site](%%doc.openmublog%%), enter your profile URL below."
msgstr ""
-"Щоб підписатись, ви можете [увійти](%%action.login%%), або [зареєструвати](%%"
-"action.register%%) новий рахунок. Якщо ви вже маєте рахунок на [сумісному "
-"сайті](%%doc.openmublog%%), введіть URL-адресу вашого профілю нижче."
+"Щоб підписатись, Ви можете [увійти](%%action.login%%), або [зареєструвати](%%"
+"action.register%%) новий акаунт. Якщо Ви вже маєте акаунт на [сумісному "
+"сайті](%%doc.openmublog%%), введіть URL-адресу Вашого профілю нижче."
#: actions/remotesubscribe.php:112
msgid "Remote subscribe"
msgstr "Віддалена підписка"
#: actions/remotesubscribe.php:124
-#, fuzzy
msgid "Subscribe to a remote user"
-msgstr "Підписатись до цього користувача"
+msgstr "Підписатись до віддаленого користувача"
#: actions/remotesubscribe.php:129
msgid "User nickname"
-msgstr "Ім'я користувача"
+msgstr "Ім’я користувача"
#: actions/remotesubscribe.php:130
msgid "Nickname of the user you want to follow"
-msgstr "Ім'я користувача, за яким ви бажаєте слідувати"
+msgstr "Ім’я користувача за яким Ви бажаєте слідувати"
#: actions/remotesubscribe.php:133
msgid "Profile URL"
@@ -2848,10 +2811,10 @@ msgstr "URL-адреса профілю"
#: actions/remotesubscribe.php:134
msgid "URL of your profile on another compatible microblogging service"
-msgstr "URL-адреса вашого профілю на іншому сумісному сервісі"
+msgstr "URL-адреса Вашого профілю на іншому сумісному сервісі"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:356
+#: lib/userprofile.php:365
msgid "Subscribe"
msgstr "Підписатись"
@@ -2861,17 +2824,16 @@ msgstr "Недійсна URL-адреса профілю (неправильни
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
-msgstr "Це недійсна URL-адреса профілю (немає документа YADIS)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
+msgstr ""
+"Це недійсна URL-адреса профілю (немає документа YADIS; немає або помилкове "
+"визначення XRDS)."
#: actions/remotesubscribe.php:176
-#, fuzzy
msgid "That’s a local profile! Login to subscribe."
msgstr "Це локальний профіль! Увійдіть аби підписатись."
#: actions/remotesubscribe.php:183
-#, fuzzy
msgid "Couldn’t get a request token."
msgstr "Не вдалося отримати токен запиту."
@@ -2887,19 +2849,19 @@ msgid "Replies to %s, page %d"
msgstr "Відповіді %s, сторінка %d"
#: actions/replies.php:144
-#, fuzzy, php-format
+#, php-format
msgid "Replies feed for %s (RSS 1.0)"
-msgstr "Живлення повідомлень для %s"
+msgstr "Стрічка відповідей до %s (RSS 1.0)"
#: actions/replies.php:151
-#, fuzzy, php-format
+#, php-format
msgid "Replies feed for %s (RSS 2.0)"
-msgstr "Живлення повідомлень для %s"
+msgstr "Стрічка відповідей до %s (RSS 2.0)"
#: actions/replies.php:158
#, php-format
msgid "Replies feed for %s (Atom)"
-msgstr "Живлення повідомлень для %s"
+msgstr "Стрічка відповідей до %s (Atom)"
#: actions/replies.php:198
#, php-format
@@ -2907,6 +2869,8 @@ msgid ""
"This is the timeline showing replies to %s but %s hasn't received a notice "
"to his attention yet."
msgstr ""
+"Ця стрічка дописів містить відповіді %s, але %s ще нічого не отримав у "
+"відповідь."
#: actions/replies.php:203
#, php-format
@@ -2914,6 +2878,8 @@ msgid ""
"You can engage other users in a conversation, subscribe to more people or "
"[join groups](%%action.groups%%)."
msgstr ""
+"Ви можете долучити інших користувачів до спілкування, підписавшись до "
+"більшої кількості людей або [приєднавшись до груп](%%action.groups%%)."
#: actions/replies.php:205
#, php-format
@@ -2921,51 +2887,54 @@ msgid ""
"You can try to [nudge %s](../%s) or [post something to his or her attention]"
"(%%%%action.newnotice%%%%?status_textarea=%s)."
msgstr ""
+"Ви можете [«розштовхати» %s](../%s) або [написати дещо варте його уваги](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
#: actions/repliesrss.php:72
-#, fuzzy, php-format
+#, php-format
msgid "Replies to %1$s on %2$s!"
-msgstr "Повідомлення до %1$s на %2$s"
+msgstr "Відповіді до %1$s на %2$s!"
#: actions/sandbox.php:65 actions/unsandbox.php:65
-#, fuzzy
msgid "You cannot sandbox users on this site."
-msgstr "Ви не можете надіслати повідомлення цьому користувачеві."
+msgstr "Ви не можете нікого ізолювати на цьому сайті."
#: actions/sandbox.php:72
-#, fuzzy
msgid "User is already sandboxed."
-msgstr "Користувач заблокував вас."
+msgstr "Користувача ізольовано доки набереться уму-розуму."
#: actions/showfavorites.php:79
-#, fuzzy, php-format
+#, php-format
msgid "%s's favorite notices, page %d"
-msgstr "Обрані повідомлення %s, сторінка %d"
+msgstr "Обрані дописи %s, сторінка %d"
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
-msgstr "Не можна відновити обрані повідомлення."
+msgstr "Не можна відновити обрані дописи."
#: actions/showfavorites.php:170
#, php-format
msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr "Живлення для друзів %s"
+msgstr "Стрічка обраних дописів %s (RSS 1.0)"
#: actions/showfavorites.php:177
#, php-format
msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr "Живлення для друзів %s"
+msgstr "Стрічка обраних дописів %s (RSS 2.0)"
#: actions/showfavorites.php:184
#, php-format
msgid "Feed for favorites of %s (Atom)"
-msgstr "Живлення для друзів %s"
+msgstr "Стрічка обраних дописів %s (Atom)"
#: actions/showfavorites.php:205
msgid ""
"You haven't chosen any favorite notices yet. Click the fave button on "
"notices you like to bookmark them for later or shed a spotlight on them."
msgstr ""
+"Ви поки що не відмітили жодних дописів. Натисніть на відповідну кнопку у "
+"дописі який Ви вподобали, аби повернутись до нього пізніше, або звернути на "
+"нього увагу інших."
#: actions/showfavorites.php:207
#, php-format
@@ -2973,6 +2942,8 @@ msgid ""
"%s hasn't added any notices to his favorites yet. Post something interesting "
"they would add to their favorites :)"
msgstr ""
+"%s поки що не вподобав жодних дописів. Може Ви б написали йому щось "
+"цікаве? :)"
#: actions/showfavorites.php:211
#, php-format
@@ -2981,10 +2952,13 @@ msgid ""
"account](%%%%action.register%%%%) and then post something interesting they "
"would add to their favorites :)"
msgstr ""
+"%s поки що не вподобав жодних дописів. Чому б не [зареєструватись](%%%%"
+"action.register%%%%) і не написати щось цікаве, що мало б сподобатись цьому "
+"користувачеві :)"
#: actions/showfavorites.php:242
msgid "This is a way to share what you like."
-msgstr ""
+msgstr "Це спосіб поділитись з усіма тим, що вам подобається."
#: actions/showgroup.php:82 lib/groupnav.php:86
#, php-format
@@ -3012,38 +2986,38 @@ msgstr "Зауваження"
#: actions/showgroup.php:284 lib/groupeditform.php:184
msgid "Aliases"
-msgstr ""
+msgstr "Додаткові імена"
#: actions/showgroup.php:293
msgid "Group actions"
msgstr "Діяльність групи"
#: actions/showgroup.php:328
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
-msgstr "Живлення повідомлень для групи %s"
+msgstr "Стрічка дописів групи %s (RSS 1.0)"
#: actions/showgroup.php:334
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
-msgstr "Живлення повідомлень для групи %s"
+msgstr "Стрічка дописів групи %s (RSS 2.0)"
#: actions/showgroup.php:340
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s group (Atom)"
-msgstr "Живлення повідомлень для групи %s"
+msgstr "Стрічка дописів групи %s (Atom)"
#: actions/showgroup.php:345
#, php-format
msgid "FOAF for %s group"
-msgstr "Вихідні для %s"
+msgstr "FOAF для групи %s"
#: 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/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(Пусто)"
@@ -3052,14 +3026,13 @@ msgstr "(Пусто)"
msgid "All members"
msgstr "Всі учасники"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Статистика"
#: actions/showgroup.php:432
-#, fuzzy
msgid "Created"
-msgstr "Створити"
+msgstr "Створено"
#: actions/showgroup.php:448
#, php-format
@@ -3070,22 +3043,28 @@ msgid ""
"their life and interests. [Join now](%%%%action.register%%%%) to become part "
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
+"**%s** це група на %%%%site.name%%%% — сервісі [мікроблоґів](http://uk."
+"wikipedia.org/wiki/Мікроблоґ), який працює на вільному програмному "
+"забезпеченні [StatusNet](http://status.net/). Члени цієї групи роблять "
+"короткі дописи про своє життя та інтереси. [Приєднуйтесь](%%action.register%"
+"%) зараз і долучіться до спілкування! ([Дізнатися більше](%%doc.help%%))"
#: actions/showgroup.php:454
-#, fuzzy, php-format
+#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
"[StatusNet](http://status.net/) tool. Its members share short messages about "
"their life and interests. "
msgstr ""
-"**%s** це група користувачів на сайті %%%%site.name%%%%, який є сервісом "
-"[мікроблогів] (http://en.wikipedia.org/wiki/Micro-blogging) "
+"**%s** це група користувачів на %%site.name%% — сервісі [мікроблоґів](http://"
+"uk.wikipedia.org/wiki/Мікроблоґ), який працює на вільному програмному "
+"забезпеченні [StatusNet](http://status.net/). Члени цієї групи роблять "
+"короткі дописи про своє життя та інтереси. "
#: actions/showgroup.php:482
-#, fuzzy
msgid "Admins"
-msgstr "Адмін"
+msgstr "Адміни"
#: actions/showmessage.php:81
msgid "No such message."
@@ -3106,14 +3085,13 @@ msgid "Message from %1$s on %2$s"
msgstr "Повідомлення від %1$s на %2$s"
#: actions/shownotice.php:90
-#, fuzzy
msgid "Notice deleted."
-msgstr "Повідомлення відправлено"
+msgstr "Допис видалено."
#: actions/showstream.php:73
-#, fuzzy, php-format
+#, php-format
msgid " tagged %s"
-msgstr "Повідомлення позначені з %s"
+msgstr " позначено з %s"
#: actions/showstream.php:79
#, php-format
@@ -3121,40 +3099,42 @@ msgid "%s, page %d"
msgstr "%s, сторінка %d"
#: actions/showstream.php:122
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s tagged %s (RSS 1.0)"
-msgstr "Живлення повідомлень для групи %s"
+msgstr "Стрічка дописів для %s з теґом %s (RSS 1.0)"
#: actions/showstream.php:129
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s (RSS 1.0)"
-msgstr "Живлення повідомлень для %s"
+msgstr "Стрічка дописів для %s (RSS 1.0)"
#: actions/showstream.php:136
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s (RSS 2.0)"
-msgstr "Живлення повідомлень для %s"
+msgstr "Стрічка дописів для %s (RSS 2.0)"
#: actions/showstream.php:143
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s (Atom)"
-msgstr "Живлення повідомлень для %s"
+msgstr "Стрічка дописів для %s (Atom)"
#: actions/showstream.php:148
-#, fuzzy, php-format
+#, php-format
msgid "FOAF for %s"
-msgstr "Вихідні для %s"
+msgstr "FOAF для %s"
#: actions/showstream.php:191
#, php-format
msgid "This is the timeline for %s but %s hasn't posted anything yet."
-msgstr ""
+msgstr "Це стрічка дописів %s, але %s ще нічого не написав."
#: 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
@@ -3162,6 +3142,8 @@ msgid ""
"You can try to nudge %s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%s)."
msgstr ""
+"Ви можете «розштовхати» %s або [щось йому написати](%%%%action.newnotice%%%%?"
+"status_textarea=%s)."
#: actions/showstream.php:234
#, php-format
@@ -3171,274 +3153,269 @@ msgid ""
"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
+"**%s** користується %%%%site.name%%%% — сервісом [мікроблоґів](http://uk."
+"wikipedia.org/wiki/Мікроблоґ), який працює на вільному програмному "
+"забезпеченні [StatusNet](http://status.net/). [Приєднуйтесь](%%action."
+"register%%) зараз і слідкуйте за дописами **%s**, також на Вас чекає багато "
+"іншого! ([Дізнатися більше](%%doc.help%%))"
#: actions/showstream.php:239
-#, fuzzy, php-format
+#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
"[StatusNet](http://status.net/) tool. "
msgstr ""
-"**%s** є власником рахунку на сайті %%%%site.name%%%% - сервісі "
-"[мікроблогів] (http://en.wikipedia.org/wiki/Micro-blogging) "
+"**%s** є власником акаунту на сайті %%%%site.name%%%% — сервісі [мікроблоґів]"
+"(http://uk.wikipedia.org/wiki/Мікроблоґ), який працює на вільному "
+"програмному забезпеченні [StatusNet](http://status.net/). "
#: actions/silence.php:65 actions/unsilence.php:65
-#, fuzzy
msgid "You cannot silence users on this site."
-msgstr "Ви не можете надіслати повідомлення цьому користувачеві."
+msgstr "Ви не можете позбавляти користувачів права голосу на цьому сайті."
#: actions/silence.php:72
-#, fuzzy
msgid "User is already silenced."
-msgstr "Користувач заблокував вас."
+msgstr "Користувачу наразі заклеїли рота скотчем."
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
-msgstr ""
+msgstr "Загальні налаштування цього сайту StatusNet."
#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
-msgstr ""
+msgstr "Ім’я сайту не може бути порожнім."
#: actions/siteadminpanel.php:155
-#, fuzzy
msgid "You must have a valid contact email address"
-msgstr "Це недійсна електронна адреса"
+msgstr "Електронна адреса має бути дійсною"
#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
-msgstr ""
+msgstr "Мову не визначено \"%s\""
#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
-msgstr ""
+msgstr "Помилковий снепшот URL."
#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
-msgstr ""
+msgstr "Помилкове значення снепшоту."
#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
-msgstr ""
+msgstr "Частота повторення снепшотів має містити цифру."
#: actions/siteadminpanel.php:199
msgid "You must set an SSL server when enabling SSL."
-msgstr ""
+msgstr "Ви маєте встановити SSL-сервер, коли використовуєте SSL."
#: actions/siteadminpanel.php:204
msgid "Invalid SSL server. The maximum length is 255 characters."
-msgstr ""
+msgstr "Помилковий SSL-сервер. Максимальна довжина 255 знаків."
#: actions/siteadminpanel.php:210
msgid "Minimum text limit is 140 characters."
-msgstr ""
+msgstr "Ліміт текстових повідомлень становить 140 знаків."
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
msgstr ""
+"Часове обмеження при надсиланні дублікату повідомлення має становити від 1 і "
+"більше секунд."
#: actions/siteadminpanel.php:266
msgid "General"
-msgstr ""
+msgstr "Основні"
#: actions/siteadminpanel.php:269
-#, fuzzy
msgid "Site name"
-msgstr "Зауваження сайту"
+msgstr "Назва сайту"
#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
-msgstr ""
+msgstr "Назва Вашого сайту, штибу \"Мікроблоґи компанії ...\""
#: actions/siteadminpanel.php:274
msgid "Brought by"
-msgstr ""
+msgstr "Надано"
#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
-msgstr ""
+msgstr "Текст використаний для посілань кредитів унизу кожної сторінки"
#: actions/siteadminpanel.php:279
msgid "Brought by URL"
-msgstr ""
+msgstr "Наданий URL"
#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
-msgstr ""
+msgstr "URL використаний для посілань кредитів унизу кожної сторінки"
#: actions/siteadminpanel.php:284
-#, fuzzy
msgid "Contact email address for your site"
-msgstr "Нова електронна адреса для надсилання повідомлень на %s"
+msgstr "Контактна електронна адреса для Вашого сайту"
#: actions/siteadminpanel.php:290
-#, fuzzy
msgid "Local"
-msgstr "Огляд"
+msgstr "Локаль"
#: actions/siteadminpanel.php:301
msgid "Default timezone"
-msgstr ""
+msgstr "Часовий пояс за замовчуванням"
#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
-msgstr ""
+msgstr "Часовий пояс за замовчуванням для сайту; зазвичай UTC."
#: actions/siteadminpanel.php:308
-#, fuzzy
msgid "Default site language"
-msgstr "Мова, якій надаєте перевагу"
+msgstr "Мова сайту за замовчуванням"
#: actions/siteadminpanel.php:316
-#, fuzzy
msgid "URLs"
-msgstr "URL"
+msgstr "URL-адреси"
#: actions/siteadminpanel.php:319
-#, fuzzy
msgid "Server"
-msgstr "Відновити"
+msgstr "Сервер"
#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
-msgstr ""
+msgstr "Ім’я хосту сервера на якому знаходиться сайт."
#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
-msgstr ""
+msgstr "Надзвичайні URL-адреси"
#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
+msgstr "Використовувати надзвичайні (найбільш пам’ятні і визначні) URL-адреси?"
#: actions/siteadminpanel.php:331
-#, fuzzy
msgid "Access"
msgstr "Погодитись"
#: actions/siteadminpanel.php:334
-#, fuzzy
msgid "Private"
-msgstr "Конфіденційність"
+msgstr "Приватно"
#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
+"Заборонити анонімним відвідувачам (ті, що не увійшли до системи) переглядати "
+"сайт?"
#: actions/siteadminpanel.php:340
-#, fuzzy
msgid "Invite only"
-msgstr "Запросити"
+msgstr "Лише за запрошеннями"
#: actions/siteadminpanel.php:342
msgid "Make registration invitation only."
-msgstr ""
+msgstr "Зробити регістрацію лише за запрошеннями."
#: actions/siteadminpanel.php:346
-#, fuzzy
msgid "Closed"
-msgstr "Блок"
+msgstr "Закрито"
#: actions/siteadminpanel.php:348
msgid "Disable new registrations."
-msgstr ""
+msgstr "Скасувати подальшу регістрацію."
#: actions/siteadminpanel.php:354
msgid "Snapshots"
-msgstr ""
+msgstr "Снепшоти"
#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
-msgstr ""
+msgstr "Випадково під час веб-хіта"
#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
-msgstr ""
+msgstr "Згідно плану робіт"
#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
-#, fuzzy
msgid "Never"
-msgstr "Відновити"
+msgstr "Ніколи"
#: actions/siteadminpanel.php:360
msgid "Data snapshots"
-msgstr ""
+msgstr "Снепшоти даних"
#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
-msgstr ""
+msgstr "Коли надсилати статистичні дані до серверів status.net"
#: actions/siteadminpanel.php:366
msgid "Frequency"
-msgstr ""
+msgstr "Частота"
#: actions/siteadminpanel.php:367
msgid "Snapshots will be sent once every N web hits"
-msgstr ""
+msgstr "Снепшоти надсилатимуться раз на N веб-хітів"
#: actions/siteadminpanel.php:372
msgid "Report URL"
-msgstr ""
+msgstr "Звітня URL-адреса"
#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
-msgstr ""
+msgstr "Снепшоти надсилатимуться на цю URL-адресу"
#: actions/siteadminpanel.php:380
-#, fuzzy
msgid "SSL"
-msgstr "СМС"
+msgstr "SSL-шифрування"
#: actions/siteadminpanel.php:384
-#, fuzzy
msgid "Sometimes"
-msgstr "Повідомлення"
+msgstr "Іноді"
#: actions/siteadminpanel.php:385
msgid "Always"
-msgstr ""
+msgstr "Завжди"
#: actions/siteadminpanel.php:387
msgid "Use SSL"
-msgstr ""
+msgstr "Використовувати SSL"
#: actions/siteadminpanel.php:388
msgid "When to use SSL"
-msgstr ""
+msgstr "Тоді використовувати SSL"
#: actions/siteadminpanel.php:393
msgid "SSL Server"
-msgstr ""
+msgstr "SSL-сервер"
#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
-msgstr ""
+msgstr "Сервер на який направляти SSL-запити"
#: actions/siteadminpanel.php:400
msgid "Limits"
-msgstr ""
+msgstr "Обмеження"
#: actions/siteadminpanel.php:403
msgid "Text limit"
-msgstr ""
+msgstr "Текстові обмеження"
#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
-msgstr ""
+msgstr "Максимальна кількість знаків у дописі."
#: actions/siteadminpanel.php:407
msgid "Dupe limit"
-msgstr ""
+msgstr "Часове обмеження"
#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
+"Як довго користувачі мають зачекати (в секундах) аби надіслати той самий "
+"допис ще раз."
#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
-#, fuzzy
msgid "Save site settings"
-msgstr "Налаштування аватари"
+msgstr "Зберегти налаштування сайту"
#: actions/smssettings.php:58
msgid "SMS Settings"
@@ -3450,9 +3427,8 @@ msgid "You can receive SMS messages through email from %%site.name%%."
msgstr "Ви можете отримувати СМС через електронну пошту від %%site.name%%."
#: actions/smssettings.php:91
-#, fuzzy
msgid "SMS is not available."
-msgstr "Ця сторінка не доступна в "
+msgstr "СМС недоступно."
#: actions/smssettings.php:112
msgid "Current confirmed SMS-enabled phone number."
@@ -3468,7 +3444,7 @@ msgstr "Код підтвердження"
#: actions/smssettings.php:131
msgid "Enter the code you received on your phone."
-msgstr "Введіть код, який ви отримали телефоном."
+msgstr "Введіть код, який Ви отримали телефоном."
#: actions/smssettings.php:138
msgid "SMS Phone number"
@@ -3496,19 +3472,18 @@ msgstr "Оператора не обрано."
#: actions/smssettings.php:318
msgid "That is already your phone number."
-msgstr "Це і так вже ваш телефонний номер."
+msgstr "Це і є Ваш телефонний номер."
#: actions/smssettings.php:321
msgid "That phone number already belongs to another user."
msgstr "Цей телефонний номер належить іншому користувачу."
#: actions/smssettings.php:347
-#, fuzzy
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
msgstr ""
-"Код підтвердження був відправлений на телефонний номер, який ви додали. "
+"Код підтвердження був відправлений на телефонний номер, який Ви додали. "
"Перевірте вхідні повідомлення, там має бути код та подальші інструкції."
#: actions/smssettings.php:374
@@ -3517,7 +3492,7 @@ msgstr "Це помилковий код підтвердження."
#: actions/smssettings.php:405
msgid "That is not your phone number."
-msgstr "Це не ваш телефонний номер."
+msgstr "Це не Ваш телефонний номер."
#: actions/smssettings.php:465
msgid "Mobile carrier"
@@ -3533,8 +3508,8 @@ 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 ""
-"Оператор мобільного зв'язку. Якщо вам відомий оператор, що підтримує "
-"надсилання SMS через електронну пошту, але він тут не вказаний, напишіть нам "
+"Оператор мобільного зв’язку. Якщо Вам відомий оператор, що підтримує "
+"надсилання СМС через електронну пошту, але він тут не вказаний, напишіть нам "
"і ми внесемо його до списку."
#: actions/smssettings.php:498
@@ -3569,23 +3544,25 @@ msgstr "Підписані до %s, сторінка %d"
#: actions/subscribers.php:63
msgid "These are the people who listen to your notices."
-msgstr "Тут представлені ті, хто слідкує за вашими повідомленнями."
+msgstr "Тут представлені ті, хто слідкує за Вашими дописами."
#: actions/subscribers.php:67
#, php-format
msgid "These are the people who listen to %s's notices."
-msgstr "Тут представлені ті, хто слідкує за повідомленнями від %s."
+msgstr "Тут представлені ті, хто слідкує за дописами від %s."
#: 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 ""
+msgstr "%s ще не має підписчиків. Будете першим?"
#: actions/subscribers.php:114
#, php-format
@@ -3593,6 +3570,8 @@ msgid ""
"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
"%) and be the first?"
msgstr ""
+"%s ще не має підписчиків. Чому б не [зареєструватись](%%%%action.register%%%"
+"%) і не стати першим?"
#: actions/subscriptions.php:52
#, php-format
@@ -3606,12 +3585,12 @@ msgstr "Підписки %s, сторінка %d"
#: actions/subscriptions.php:65
msgid "These are the people whose notices you listen to."
-msgstr "Тут представлені ті, за чиїми повідомленнями ви слідкуєте."
+msgstr "Тут представлені ті, за чиїми дописами Ви слідкуєте."
#: actions/subscriptions.php:69
#, php-format
msgid "These are the people whose notices %s listens to."
-msgstr "Тут представлені ті, за чиїми повідомленнями слідкує %s."
+msgstr "Тут представлені ті, за чиїми дописами слідкує %s."
#: actions/subscriptions.php:121
#, php-format
@@ -3622,11 +3601,17 @@ msgid ""
"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
"automatically subscribe to people you already follow there."
msgstr ""
+"Ви не слідкуєте за жодним з дописувачів, спробуйте підписатись до тих, кого "
+"Ви знаєте. Спробуйте [розшукати людей](%%action.peoplesearch%%), роздивіться "
+"серед членів груп, які Вас цікавлять, або прогляньте список [користувачів "
+"вартих уваги](%%action.featured%%). Якщо Ви користуєтесь [Твіттером](%%"
+"action.twittersettings%%), то можете автоматично підписатись до людей, за "
+"якими слідкуєте там."
#: actions/subscriptions.php:123 actions/subscriptions.php:127
-#, fuzzy, php-format
+#, php-format
msgid "%s is not listening to anyone."
-msgstr "%1$s тепер слідкує за повідомленями "
+msgstr "%s не відслідковує нічого"
#: actions/subscriptions.php:194
msgid "Jabber"
@@ -3666,66 +3651,63 @@ 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 "Не вдалося зберегти теги."
+msgstr "Не вдалося зберегти теґи."
#: actions/tagother.php:236
msgid "Use this form to add tags to your subscribers or subscriptions."
-msgstr "Скористайтесь цією формою, щоб додати теги підпискам та підписчикам."
+msgstr "Скористайтесь цією формою, щоб додати теґи підпискам та підписчикам."
#: actions/tag.php:68
#, php-format
msgid "Notices tagged with %s, page %d"
-msgstr "Повідомлення позначені %s, сторінка %d"
+msgstr "Дописи позначені %s, сторінка %d"
#: actions/tag.php:86
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Живлення повідомлень для %s"
+msgstr "Стрічка дописів для теґу %s (RSS 1.0)"
#: actions/tag.php:92
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Живлення повідомлень для %s"
+msgstr "Стрічка дописів для теґу %s (RSS 2.0)"
#: actions/tag.php:98
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for tag %s (Atom)"
-msgstr "Живлення повідомлень для %s"
+msgstr "Стрічка дописів для теґу %s (Atom)"
#: actions/tagrss.php:35
msgid "No such tag."
-msgstr "Такого тегу немає."
+msgstr "Такого теґу немає."
#: actions/twitapitrends.php:87
msgid "API method under construction."
msgstr "API метод наразі знаходиться у розробці."
#: actions/unblock.php:59
-#, fuzzy
msgid "You haven't blocked that user."
-msgstr "Цього користувача вже заблоковано."
+msgstr "Цього користувача блокувати неможливо."
#: actions/unsandbox.php:72
-#, fuzzy
msgid "User is not sandboxed."
-msgstr "Користувач заблокував вас."
+msgstr "Користувач не у пісочниці."
#: actions/unsilence.php:72
-#, fuzzy
msgid "User is not silenced."
-msgstr "Користувач не має профілю."
+msgstr "Користувач поки що має право голосу."
#: actions/unsubscribe.php:77
msgid "No profile id in request."
@@ -3742,7 +3724,7 @@ msgstr "Відписано"
#: actions/updateprofile.php:62 actions/userauthorization.php:330
#, php-format
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
-msgstr ""
+msgstr "Ліцензія ‘%s’ не відповідає ліцензії сайту ‘%s’."
#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
#: lib/personalgroupnav.php:115
@@ -3751,20 +3733,20 @@ msgstr "Користувач"
#: actions/useradminpanel.php:69
msgid "User settings for this StatusNet site."
-msgstr ""
+msgstr "Власні налаштування користувача для цього сайту StatusNet."
#: actions/useradminpanel.php:149
msgid "Invalid bio limit. Must be numeric."
-msgstr ""
+msgstr "Помилкове обмеження біо. Це мають бути цифри."
#: actions/useradminpanel.php:155
msgid "Invalid welcome text. Max length is 255 characters."
-msgstr ""
+msgstr "Помилковий текст привітання. Максимальна довжина 255 знаків."
#: actions/useradminpanel.php:165
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
-msgstr ""
+msgstr "Помилкова підписка за замовчуванням: '%1$s' не є користувачем."
#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
@@ -3773,90 +3755,82 @@ msgstr "Профіль"
#: actions/useradminpanel.php:222
msgid "Bio Limit"
-msgstr ""
+msgstr "Обмеження біо"
#: actions/useradminpanel.php:223
msgid "Maximum length of a profile bio in characters."
-msgstr ""
+msgstr "Максимальна довжина біо користувача в знаках."
#: actions/useradminpanel.php:231
-#, fuzzy
msgid "New users"
-msgstr "Запросити нових користувачів"
+msgstr "Нові користувачі"
#: actions/useradminpanel.php:235
msgid "New user welcome"
-msgstr ""
+msgstr "Привітання нового користувача"
#: actions/useradminpanel.php:236
msgid "Welcome text for new users (Max 255 chars)."
-msgstr ""
+msgstr "Текст привітання нових користувачів (255 знаків)."
#: actions/useradminpanel.php:241
-#, fuzzy
msgid "Default subscription"
-msgstr "Всі підписки"
+msgstr "Підписка за замовчуванням"
#: actions/useradminpanel.php:242
-#, fuzzy
msgid "Automatically subscribe new users to this user."
-msgstr ""
-"Автоматично підписуватись до тих, хто підписався до мене (якщо ви бот, то це "
-"саме для вас)"
+msgstr "Автоматично підписувати нових користувачів до цього користувача."
#: actions/useradminpanel.php:251
-#, fuzzy
msgid "Invitations"
-msgstr "Запрошення відіслано"
+msgstr "Запрошення"
#: actions/useradminpanel.php:256
-#, fuzzy
msgid "Invitations enabled"
-msgstr "Запрошення відіслано"
+msgstr "Запрошення скасовано"
#: actions/useradminpanel.php:258
msgid "Whether to allow users to invite new users."
msgstr ""
+"В той чи інший спосіб дозволити користувачам вітати нових користувачів."
#: actions/useradminpanel.php:265
msgid "Sessions"
-msgstr ""
+msgstr "Сесії"
#: actions/useradminpanel.php:270
msgid "Handle sessions"
-msgstr ""
+msgstr "Сесії обробки даних"
#: actions/useradminpanel.php:272
msgid "Whether to handle sessions ourselves."
-msgstr ""
+msgstr "Обробка даних сесій самостійно."
#: actions/useradminpanel.php:276
msgid "Session debugging"
-msgstr ""
+msgstr "Сесія наладки"
#: actions/useradminpanel.php:278
msgid "Turn on debugging output for sessions."
-msgstr ""
+msgstr "Виводити дані сесії наладки."
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Авторизувати підписку"
#: actions/userauthorization.php:110
-#, fuzzy
msgid ""
"Please check these details to make sure that you want to subscribe to this "
"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
"click “Reject”."
msgstr ""
-"Будь ласка, перевірте всі деталі, щоб упевнитись, що ви дійсно бажаєте "
-"підписатись на повідомлення даного користувача. Якщо ви не збирались "
-"підписуватись ні на чиї повідомлення, просто натисніть \"Відмінити\"."
+"Будь ласка, перевірте всі деталі, щоб упевнитись, що Ви дійсно бажаєте "
+"підписатись на дописи цього користувача. Якщо Ви не збирались підписуватись "
+"ні на чиї дописи, просто натисніть «Відмінити»."
#: actions/userauthorization.php:188
-#, fuzzy
msgid "License"
-msgstr "ліцензія."
+msgstr "Ліцензія"
#: actions/userauthorization.php:209
msgid "Accept"
@@ -3872,9 +3846,8 @@ msgid "Reject"
msgstr "Забраковано"
#: actions/userauthorization.php:212
-#, fuzzy
msgid "Reject this subscription"
-msgstr "Підписки %s"
+msgstr "Відмінити цю підписку"
#: actions/userauthorization.php:225
msgid "No authorization request!"
@@ -3885,7 +3858,6 @@ msgid "Subscription authorized"
msgstr "Підписку авторизовано"
#: actions/userauthorization.php:249
-#, fuzzy
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
"with the site’s instructions for details on how to authorize the "
@@ -3900,7 +3872,6 @@ msgid "Subscription rejected"
msgstr "Підписку скинуто"
#: actions/userauthorization.php:261
-#, fuzzy
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
"with the site’s instructions for details on how to fully reject the "
@@ -3913,56 +3884,57 @@ msgstr ""
#: actions/userauthorization.php:296
#, php-format
msgid "Listener URI ‘%s’ not found here"
-msgstr ""
+msgstr "URI слухача ‘%s’ тут не знайдено"
#: actions/userauthorization.php:301
#, php-format
msgid "Listenee URI ‘%s’ is too long."
-msgstr ""
+msgstr "URI слухача ‘%s’ задовге."
#: actions/userauthorization.php:307
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
-msgstr ""
+msgstr "URI слухача ‘%s’ це локальний користувач"
#: actions/userauthorization.php:322
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
-msgstr ""
+msgstr "URL-адреса профілю ‘%s’ для локального користувача."
#: actions/userauthorization.php:338
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
-msgstr ""
+msgstr "URL-адреса автари ‘%s’ помилкова."
#: actions/userauthorization.php:343
-#, fuzzy, php-format
+#, php-format
msgid "Can’t read avatar URL ‘%s’."
-msgstr "Не можна прочитати URL аватари '%s'"
+msgstr "Не можна прочитати URL аватари ‘%s’."
#: actions/userauthorization.php:348
-#, fuzzy, php-format
+#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
-msgstr "Неправильний тип зображення для '%s'"
+msgstr "Неправильний тип зображення для URL-адреси аватари ‘%s’."
#: actions/userbyid.php:70
msgid "No id."
msgstr "Немає ID."
#: actions/userdesignsettings.php:76 lib/designsettings.php:65
-#, fuzzy
msgid "Profile design"
-msgstr "Налаштування профілю"
+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 ""
+msgstr "Поласуйте бутербродом!"
#: actions/usergroups.php:64
#, php-format
@@ -3970,19 +3942,19 @@ msgid "%s groups, page %d"
msgstr "Групи %s, сторінка %d"
#: actions/usergroups.php:130
-#, fuzzy
msgid "Search for more groups"
-msgstr "Пошук людей або текстів"
+msgstr "Шукати групи ще"
#: actions/usergroups.php:153
-#, fuzzy, php-format
+#, php-format
msgid "%s is not a member of any group."
-msgstr "Ви не є учасником цієї групи."
+msgstr "%s не є учасником жодної групи."
#: actions/usergroups.php:158
#, php-format
msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
msgstr ""
+"Спробуйте [знайти якісь групи](%%action.groupsearch%%) і приєднайтеся до них."
#: classes/File.php:137
#, php-format
@@ -3990,21 +3962,22 @@ msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
"to upload a smaller version."
msgstr ""
+"Ні, файл не може бути більшим за %d байтів, а те, що Ви хочете надіслати, "
+"важить %d байтів. Спробуйте меншу версію."
#: classes/File.php:147
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
-msgstr ""
+msgstr "Розміри цього файлу перевищують Вашу квоту на %d байтів."
#: classes/File.php:154
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
-msgstr ""
+msgstr "Розміри цього файлу перевищують Вашу місячну квоту на %d байтів."
#: classes/Message.php:45
-#, fuzzy
msgid "You are banned from sending direct messages."
-msgstr "Помилка при відправці прямого повідомлення."
+msgstr "Вам заборонено надсилати прямі повідомлення."
#: classes/Message.php:61
msgid "Could not insert message."
@@ -4017,31 +3990,29 @@ msgstr "Не можна оновити повідомлення з новим UR
#: classes/Notice.php:164
#, php-format
msgid "DB error inserting hashtag: %s"
-msgstr "Помилка бази даних при додаванні тегу: %s"
+msgstr "Помилка бази даних при додаванні теґу: %s"
#: classes/Notice.php:179
-#, fuzzy
msgid "Problem saving notice. Too long."
-msgstr "Проблема при збереженні повідомлення."
+msgstr "Проблема при збереженні допису. Надто довге."
#: classes/Notice.php:183
msgid "Problem saving notice. Unknown user."
-msgstr "Проблема при збереженні повідомлення. Невідомий користувач."
+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
-#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-"Дуже багато повідомлень за короткий термін; відпочиньте трошки і "
+"Дуже багато повідомлень за короткий термін; ходіть подихайте повітрям і "
"повертайтесь за кілька хвилин."
#: classes/Notice.php:200
@@ -4050,25 +4021,25 @@ msgstr "Вам заборонено надсилати дописи до цьо
#: classes/Notice.php:265 classes/Notice.php:290
msgid "Problem saving notice."
-msgstr "Проблема при збереженні повідомлення."
+msgstr "Проблема при збереженні допису."
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Помилка бази даних при додаванні відповіді: %s"
#: classes/User_group.php:380
msgid "Could not create group."
-msgstr "Не вдалося створити нову групу"
+msgstr "Не вдалося створити нову групу."
#: classes/User_group.php:409
msgid "Could not set group membership."
msgstr "Не вдалося встановити членство."
#: classes/User.php:347
-#, fuzzy, php-format
+#, php-format
msgid "Welcome to %1$s, @%2$s!"
-msgstr "Повідомлення до %1$s на %2$s"
+msgstr "Вітаємо на %1$s, @%2$s!"
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
@@ -4080,16 +4051,15 @@ msgstr "Завантаження аватари"
#: lib/accountsettingsaction.php:116
msgid "Change your password"
-msgstr "Змінити ваш пароль"
+msgstr "Змінити Ваш пароль"
#: lib/accountsettingsaction.php:120
msgid "Change email handling"
-msgstr "Змінити електронну адресу вручну"
+msgstr "Змінити електронну адресу"
#: lib/accountsettingsaction.php:124
-#, fuzzy
msgid "Design your profile"
-msgstr "Профіль користувача."
+msgstr "Дизайн Вашого профілю"
#: lib/accountsettingsaction.php:128
msgid "Other"
@@ -4102,7 +4072,7 @@ msgstr "Інші опції"
#: lib/action.php:144
#, php-format
msgid "%s - %s"
-msgstr "%s - %s"
+msgstr "%s — %s"
#: lib/action.php:159
msgid "Untitled page"
@@ -4118,11 +4088,11 @@ msgstr "Дім"
#: lib/action.php:431
msgid "Personal profile and friends timeline"
-msgstr "Персональний профіль і потік друзів"
+msgstr "Персональний профіль і стрічка друзів"
#: lib/action.php:433
msgid "Account"
-msgstr "Рахунок"
+msgstr "Акаунт"
#: lib/action.php:433
msgid "Change your email, avatar, password, profile"
@@ -4130,17 +4100,15 @@ msgstr "Змінити електронну адресу, аватару, пар
#: lib/action.php:436
msgid "Connect"
-msgstr "З'єднання"
+msgstr "З’єднання"
#: lib/action.php:436
-#, fuzzy
msgid "Connect to services"
-msgstr "Невдале перенаправлення на сервер: %s"
+msgstr "З’єднання з сервісами"
#: lib/action.php:440
-#, fuzzy
msgid "Change site configuration"
-msgstr "Відправна навігація по сайту"
+msgstr "Змінити конфігурацію сайту"
#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
@@ -4149,7 +4117,7 @@ msgstr "Запросити"
#: lib/action.php:445 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
-msgstr "Запросіть друзів та колег приєднатись до вас на %s"
+msgstr "Запросіть друзів та колег приєднатись до Вас на %s"
#: lib/action.php:450
msgid "Logout"
@@ -4161,7 +4129,7 @@ msgstr "Вийти з сайту"
#: lib/action.php:455
msgid "Create an account"
-msgstr "Створити новий рахунок"
+msgstr "Створити новий акаунт"
#: lib/action.php:458
msgid "Login to the site"
@@ -4209,7 +4177,7 @@ msgstr "ЧаПи"
#: lib/action.php:732
msgid "TOS"
-msgstr ""
+msgstr "Умови"
#: lib/action.php:735
msgid "Privacy"
@@ -4224,13 +4192,12 @@ msgid "Contact"
msgstr "Контакт"
#: lib/action.php:741
-#, fuzzy
msgid "Badge"
-msgstr "\"Розштовхати\""
+msgstr "Бедж"
#: lib/action.php:769
msgid "StatusNet software license"
-msgstr "Ліцензія StatusNet software"
+msgstr "Ліцензія програмного забезпечення StatusNet"
#: lib/action.php:772
#, php-format
@@ -4238,13 +4205,13 @@ msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
msgstr ""
-"**%%site.name%%** це сервіс мікроблогів наданий вам [%%site.broughtby%%](%%"
+"**%%site.name%%** — це сервіс мікроблоґів наданий вам [%%site.broughtby%%](%%"
"site.broughtbyurl%%). "
#: lib/action.php:774
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** це сервіс мікроблогів. "
+msgstr "**%%site.name%%** — це сервіс мікроблоґів. "
#: lib/action.php:776
#, php-format
@@ -4253,14 +4220,13 @@ msgid ""
"s, available under the [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-"Сервіс працює на [StatusNet](http://status.net/) - програмному забезпеченні "
-"для мікроблогів, версія %s, доступному під [GNU Affero General Public "
+"Сервіс працює на [StatusNet](http://status.net/) — програмному забезпеченні "
+"для мікроблоґів, версія %s, доступному під [GNU Affero General Public "
"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
#: lib/action.php:790
-#, fuzzy
msgid "Site content license"
-msgstr "Ліцензія StatusNet software"
+msgstr "Ліцензія змісту сайту"
#: lib/action.php:799
msgid "All "
@@ -4287,60 +4253,52 @@ msgid "There was a problem with your session token."
msgstr "Виникли певні проблеми з токеном поточної сесії."
#: lib/adminpanelaction.php:96
-#, fuzzy
msgid "You cannot make changes to this site."
-msgstr "Ви не можете надіслати повідомлення цьому користувачеві."
+msgstr "Ви не можете щось змінювати на цьому сайті."
#: lib/adminpanelaction.php:195
-#, fuzzy
msgid "showForm() not implemented."
-msgstr "Виконання команди ще не завершено."
+msgstr "showForm() не виконано."
#: lib/adminpanelaction.php:224
-#, fuzzy
msgid "saveSettings() not implemented."
-msgstr "Виконання команди ще не завершено."
+msgstr "saveSettings() не виконано."
#: lib/adminpanelaction.php:247
-#, fuzzy
msgid "Unable to delete design setting."
-msgstr "Не маю можливості зберегти ваші налаштування Твіттера!"
+msgstr "Немає можливості видалити налаштування дизайну."
#: lib/adminpanelaction.php:300
-#, fuzzy
msgid "Basic site configuration"
-msgstr "Підтвердження електронної адреси"
+msgstr "Основна конфігурація сайту"
#: lib/adminpanelaction.php:303
-#, fuzzy
msgid "Design configuration"
-msgstr "Підтвердження СМС"
+msgstr "Конфігурація дизайну"
#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
-#, fuzzy
msgid "Paths configuration"
-msgstr "Підтвердження СМС"
+msgstr "Конфігурація шляху"
#: lib/attachmentlist.php:87
msgid "Attachments"
-msgstr ""
+msgstr "Вкладення"
#: lib/attachmentlist.php:265
msgid "Author"
-msgstr ""
+msgstr "Автор"
#: lib/attachmentlist.php:278
-#, fuzzy
msgid "Provider"
-msgstr "Профіль"
+msgstr "Провайдер"
#: lib/attachmentnoticesection.php:67
msgid "Notices where this attachment appears"
-msgstr ""
+msgstr "Дописи, до яких прикріплено це вкладення"
#: lib/attachmenttagcloudsection.php:48
msgid "Tags for this attachment"
-msgstr ""
+msgstr "Теґи для цього вкладення"
#: lib/channel.php:138 lib/channel.php:158
msgid "Command results"
@@ -4359,18 +4317,18 @@ msgid "Sorry, this command is not yet implemented."
msgstr "Даруйте, але виконання команди ще не завершено."
#: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a user with nickname %s"
-msgstr "Не вдалося оновити користувача з підтвердженною електронною адресою."
+msgstr "Не вдалося знайти користувача з іменем %s"
#: lib/command.php:92
msgid "It does not make a lot of sense to nudge yourself!"
-msgstr ""
+msgstr "Гадаємо, користі від «розштовхування» самого себе небагато, чи не так?!"
#: lib/command.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Nudge sent to %s"
-msgstr "Спробу \"розштовхати\" зараховано"
+msgstr "Спробу «розштовхати» %s зараховано"
#: lib/command.php:126
#, php-format
@@ -4379,18 +4337,21 @@ msgid ""
"Subscribers: %2$s\n"
"Notices: %3$s"
msgstr ""
+"Підписки: %1$s\n"
+"Підписчики: %2$s\n"
+"Дописи: %3$s"
#: lib/command.php:152 lib/command.php:400
msgid "Notice with that id does not exist"
-msgstr ""
+msgstr "Такого допису не існує"
#: lib/command.php:168 lib/command.php:416 lib/command.php:471
msgid "User has no last notice"
-msgstr "Користувач має останнє повідомлення"
+msgstr "Користувач не має останнього допису"
#: lib/command.php:190
msgid "Notice marked as fave."
-msgstr "Повідомлення позначено як обране."
+msgstr "Допис позначено як обраний."
#: lib/command.php:315
#, php-format
@@ -4400,7 +4361,7 @@ msgstr "%1$s (%2$s)"
#: lib/command.php:318
#, php-format
msgid "Fullname: %s"
-msgstr "Повне ім'я: %s"
+msgstr "Повне ім’я: %s"
#: lib/command.php:321
#, php-format
@@ -4418,32 +4379,31 @@ msgid "About: %s"
msgstr "Про мене: %s"
#: lib/command.php:358 scripts/xmppdaemon.php:321
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "Повідомлення надто довге - максимум 140 знаків, а ви надрукували %d"
+msgstr "Повідомлення надто довге — максимум %d знаків, а ви надсилаєте %d"
#: lib/command.php:377
msgid "Error sending direct message."
msgstr "Помилка при відправці прямого повідомлення."
#: lib/command.php:431
-#, fuzzy, php-format
+#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr "Повідомлення надто довге - максимум 140 знаків, а ви надрукували %d"
+msgstr "Допис надто довгий — максимум %d знаків, а ви надсилаєте %d"
#: lib/command.php:439
-#, fuzzy, php-format
+#, php-format
msgid "Reply to %s sent"
-msgstr "Відповісти на це повідомлення"
+msgstr "Відповідь до %s надіслано"
#: lib/command.php:441
-#, fuzzy
msgid "Error saving notice."
-msgstr "Проблема при збереженні повідомлення."
+msgstr "Проблема при збереженні допису."
#: lib/command.php:495
msgid "Specify the name of the user to subscribe to"
-msgstr "Зазначте ім'я користувача, до якого бажаєте підписатись"
+msgstr "Зазначте ім’я користувача, до якого бажаєте підписатись"
#: lib/command.php:502
#, php-format
@@ -4452,7 +4412,7 @@ msgstr "Підписано до %s"
#: lib/command.php:523
msgid "Specify the name of the user to unsubscribe from"
-msgstr "Зазначте ім'я користувача, від якого бажаєте відписатись"
+msgstr "Зазначте ім’я користувача, від якого бажаєте відписатись"
#: lib/command.php:530
#, php-format
@@ -4479,53 +4439,41 @@ msgstr "Сповіщення увімкнуто."
msgid "Can't turn on notification."
msgstr "Не можна увімкнути сповіщення."
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Не вдалося створити форму OpenID: %s"
-
-#: 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:618
-#, fuzzy
+#: lib/command.php:592
msgid "You are not subscribed to anyone."
-msgstr "Ви не підписані до цього профілю."
+msgstr "Ви не маєте жодних підписок."
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
-msgstr[0] "Ви вже підписані до цих користувачів:"
-msgstr[1] "Ви вже підписані до цих користувачів:"
-msgstr[2] ""
+msgstr[0] "Ви підписані до цієї особи:"
+msgstr[1] "Ви підписані до цих людей:"
+msgstr[2] "Ви підписані до цих людей:"
-#: lib/command.php:640
-#, fuzzy
+#: lib/command.php:614
msgid "No one is subscribed to you."
-msgstr "Не вдалося підписати іншого до вас."
+msgstr "До Вас ніхто не підписаний."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
-msgstr[0] "Не вдалося підписати іншого до вас."
-msgstr[1] "Не вдалося підписати іншого до вас."
-msgstr[2] ""
+msgstr[0] "Ця особа є підписаною до Вас:"
+msgstr[1] "Ці люди підписані до Вас:"
+msgstr[2] "Ці люди підписані до Вас:"
-#: lib/command.php:662
-#, fuzzy
+#: lib/command.php:636
msgid "You are not a member of any groups."
-msgstr "Ви не є учасником цієї групи."
+msgstr "Ви не є учасником жодної групи."
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
-msgstr[0] "Ви не є учасником цієї групи."
-msgstr[1] "Ви не є учасником цієї групи."
-msgstr[2] ""
+msgstr[0] "Ви є учасником групи:"
+msgstr[1] "Ви є учасником таких груп:"
+msgstr[2] "Ви є учасником таких груп:"
-#: lib/command.php:678
+#: lib/command.php:652
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4544,7 +4492,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4563,24 +4510,57 @@ msgid ""
"tracks - not yet implemented.\n"
"tracking - not yet implemented.\n"
msgstr ""
+"Команди:\n"
+"on - увімкнути сповіщення\n"
+"off - вимкнути сповіщення\n"
+"help - список команд\n"
+"follow <nickname> - підписатись до користувача\n"
+"groups - групи, до яких Ви входите\n"
+"subscriptions - користувачі, до яких Ви підписані\n"
+"subscribers - користувачі, які підписані до Вас\n"
+"leave <nickname> - відписатись від користувача\n"
+"d <nickname> <text> - надіслати особисте повідомлення\n"
+"get <nickname> - отримати останній допис користувача\n"
+"whois <nickname> - інфо про користувача\n"
+"fav <nickname> - додати останній допис користувача до обраних\n"
+"fav #<notice_id> - додати допис #номер до обраних\n"
+"reply #<notice_id> - відповісти на допис #номер\n"
+"reply <nickname> - відповісти на останній допис користувача\n"
+"join <group> - приєднатися до групи\n"
+"login - отримати посилання для входу у веб-інтерфейс\n"
+"drop <group> - залишити групу\n"
+"stats - отримати статистику\n"
+"stop - те саме що і 'off'\n"
+"quit - те саме що і 'off'\n"
+"sub <nickname> - те саме що і 'follow'\n"
+"unsub <nickname> - те саме що і 'leave'\n"
+"last <nickname> - те саме що і 'get'\n"
+"on <nickname> - наразі не виконується\n"
+"off <nickname> - наразі не виконується\n"
+"nudge <nickname> - «розштовхати»\n"
+"invite <phone number> - наразі не виконується\n"
+"track <word> - наразі не виконується\n"
+"untrack <word> - наразі не виконується\n"
+"track off - наразі не виконується\n"
+"untrack all - наразі не виконується\n"
+"tracks - наразі не виконується\n"
+"tracking - наразі не виконується\n"
#: lib/common.php:199
-#, fuzzy
msgid "No configuration file found. "
-msgstr "Немає коду підтвердження."
+msgstr "Файлу конфігурації не знайдено. "
#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
-msgstr ""
+msgstr "Шукав файли конфігурації в цих місцях: "
#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
-msgstr ""
+msgstr "Запустіть файл інсталяції, аби полагодити це."
#: lib/common.php:202
-#, fuzzy
msgid "Go to the installer."
-msgstr "Увійти на сайт"
+msgstr "Іти до файлу інсталяції."
#: lib/connectsettingsaction.php:110
msgid "IM"
@@ -4592,29 +4572,30 @@ msgstr "Оновлення за допомогою служби миттєвих
#: lib/connectsettingsaction.php:116
msgid "Updates by SMS"
-msgstr "Оновлення через SMS"
+msgstr "Оновлення через СМС"
#: lib/dberroraction.php:60
msgid "Database error"
-msgstr ""
+msgstr "Помилка бази даних"
#: lib/designsettings.php:105
-#, fuzzy
msgid "Upload file"
-msgstr "Завантажити"
+msgstr "Завантажити файл"
#: lib/designsettings.php:109
msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
+"You can upload your personal background image. The maximum file size is 2MB."
msgstr ""
+"Ви можете завантажити власне фонове зображення. Максимальний розмір файлу "
+"становить 2Мб."
#: lib/designsettings.php:372
msgid "Bad default color settings: "
-msgstr ""
+msgstr "Помилка кольорів за замовчуванням: "
#: lib/designsettings.php:468
msgid "Design defaults restored."
-msgstr ""
+msgstr "Дизайн за замовчуванням відновлено."
#: lib/disfavorform.php:114 lib/disfavorform.php:140
msgid "Disfavor this notice"
@@ -4634,40 +4615,39 @@ msgstr "Експорт даних"
#: lib/feed.php:85
msgid "RSS 1.0"
-msgstr ""
+msgstr "RSS 1.0"
#: lib/feed.php:87
msgid "RSS 2.0"
-msgstr ""
+msgstr "RSS 2.0"
#: lib/feed.php:89
msgid "Atom"
-msgstr ""
+msgstr "Atom"
#: lib/feed.php:91
msgid "FOAF"
-msgstr ""
+msgstr "FOAF"
#: lib/galleryaction.php:121
msgid "Filter tags"
-msgstr "Фільтр для тегів"
+msgstr "Фільтр для теґів"
#: lib/galleryaction.php:131
msgid "All"
msgstr "Всі"
#: lib/galleryaction.php:139
-#, fuzzy
msgid "Select tag to filter"
-msgstr "Оберіть оператора"
+msgstr "Оберіть фільтр теґів"
#: lib/galleryaction.php:140
msgid "Tag"
-msgstr "Тег"
+msgstr "Теґ"
#: lib/galleryaction.php:141
msgid "Choose a tag to narrow list"
-msgstr "Оберіть тег до звуженого списку"
+msgstr "Оберіть теґ до звуженого списку"
#: lib/galleryaction.php:143
msgid "Go"
@@ -4675,17 +4655,16 @@ msgstr "Вперед"
#: lib/groupeditform.php:163
msgid "URL of the homepage or blog of the group or topic"
-msgstr "URL-адреса веб-сторінки, блогу групи, або тематичного блогу"
+msgstr "URL-адреса веб-сторінки, блоґу групи, або тематичного блоґу"
#: lib/groupeditform.php:168
-#, fuzzy
msgid "Describe the group or topic"
-msgstr "Опишіть групу або тему, вкладаючись у 140 знаків"
+msgstr "Опишіть групу або тему"
#: lib/groupeditform.php:170
-#, fuzzy, php-format
+#, php-format
msgid "Describe the group or topic in %d characters"
-msgstr "Опишіть групу або тему, вкладаючись у 140 знаків"
+msgstr "Опишіть групу або тему, вкладаючись у %d знаків"
#: lib/groupeditform.php:172
msgid "Description"
@@ -4694,26 +4673,26 @@ msgstr "Опис"
#: lib/groupeditform.php:179
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr "Локація групи, на зразок \"Місто, область (або регіон), країна\""
+msgstr "Локація групи, штибу \"Місто, область (або регіон), країна\""
#: lib/groupeditform.php:187
#, php-format
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
+"Додаткові імена для групи, відокремлювати комами або пробілами, максимум %d"
#: lib/groupnav.php:85
msgid "Group"
msgstr "Група"
#: lib/groupnav.php:101
-#, fuzzy
msgid "Blocked"
msgstr "Блок"
#: lib/groupnav.php:102
-#, fuzzy, php-format
+#, php-format
msgid "%s blocked users"
-msgstr "Блокувати користувача."
+msgstr "%s заблокувані користувачі"
#: lib/groupnav.php:108
#, php-format
@@ -4730,9 +4709,9 @@ msgid "Add or edit %s logo"
msgstr "Додати або редагувати логотип %s"
#: lib/groupnav.php:120
-#, fuzzy, php-format
+#, php-format
msgid "Add or edit %s design"
-msgstr "Додати або редагувати логотип %s"
+msgstr "Додати або редагувати дизайн %s"
#: lib/groupsbymemberssection.php:71
msgid "Groups with most members"
@@ -4745,16 +4724,16 @@ msgstr "Групи з найбільшою кількістю дописів"
#: lib/grouptagcloudsection.php:56
#, php-format
msgid "Tags in %s group's notices"
-msgstr "Теги у повідомленнях групи %s"
+msgstr "Теґи у дописах групи %s"
#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
msgstr "Ця сторінка не доступна для того типу медіа, з яким ви погодились"
#: lib/imagefile.php:75
-#, fuzzy, php-format
+#, php-format
msgid "That file is too big. The maximum file size is %s."
-msgstr "Ви маєте можливість завантажити логотип для вашої группи."
+msgstr "Цей файл завеликий. Максимальний розмір %s."
#: lib/imagefile.php:80
msgid "Partial upload."
@@ -4780,10 +4759,18 @@ msgstr "Файл втрачено."
msgid "Unknown file type"
msgstr "Тип файлу не підтримується"
-#: lib/jabber.php:192
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr "Мб"
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr "кб"
+
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
-msgstr ""
+msgstr "[%s]"
#: lib/joinform.php:114
msgid "Join"
@@ -4795,11 +4782,11 @@ msgstr "Залишити"
#: lib/logingroupnav.php:80
msgid "Login with a username and password"
-msgstr "Увійти використовуючи ім'я та пароль"
+msgstr "Увійти використовуючи ім’я та пароль"
#: lib/logingroupnav.php:86
msgid "Sign up for a new account"
-msgstr "Зареєструвати новий рахунок"
+msgstr "Зареєструвати новий акаунт"
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -4811,11 +4798,13 @@ msgid ""
"You have no private messages. You can send private message to engage other "
"users in conversation. People can send you messages for your eyes only."
msgstr ""
+"У Вас немає приватних повідомлень. Зокрема, Ви можете надсилати приватні "
+"повідомлення аби долучити користувачів до розмови. Такі повідомлення бачите "
+"лише Ви."
#: lib/mailbox.php:227 lib/noticelist.php:452
-#, fuzzy
msgid "from"
-msgstr " від "
+msgstr "від"
#: lib/mail.php:172
msgid "Email address confirmation"
@@ -4837,14 +4826,26 @@ msgid ""
"Thanks for your time, \n"
"%s\n"
msgstr ""
+"Агов, %s.\n"
+"\n"
+"Хтось щойно ввів цю електронну адресу на %s.\n"
+"\n"
+"Якщо то були Ви, мусите це підтвердити використовуючи посилання:\n"
+"\n"
+"\t%s\n"
+"\n"
+"А якщо ні, то просто проігноруйте це повідомлення.\n"
+"\n"
+"Дякуємо за Ваш час \n"
+"%s\n"
#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s тепер слідкує за вашими повідомленями на %2$s."
+msgstr "%1$s тепер слідкує за Вашими дописами на %2$s."
#: lib/mail.php:241
-#, fuzzy, php-format
+#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
"\n"
@@ -4857,12 +4858,16 @@ msgid ""
"----\n"
"Change your email address or notification options at %8$s\n"
msgstr ""
-"%1$s тепер слідкує за вашими повідомленями на %2$s.\n"
+"%1$s тепер слідкує за Вашими дописами на %2$s.\n"
"\n"
"\t%3$s\n"
"\n"
-"Щиро ваші,\n"
-"%4$s.\n"
+"%4$s%5$s%6$s\n"
+"Щиро Ваші,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Змінити електронну адресу або умови сповіщення — %8$s\n"
#: lib/mail.php:254
#, php-format
@@ -4900,13 +4905,13 @@ msgid ""
"Faithfully yours,\n"
"%4$s"
msgstr ""
-"Ви маєте нову поштову адресу на %1$s.\n"
+"Ви маєте нову адресу на %1$s.\n"
"\n"
"Надсилайте листи на %2$s, щоб друкувати нові повідомлення.\n"
"\n"
"Більше інформації про використання електронної пошти на %3$s.\n"
"\n"
-"Щиро ваші,\n"
+"Щиро Ваші,\n"
"%4$s"
#: lib/mail.php:413
@@ -4921,7 +4926,7 @@ msgstr "Підтвердження СМС"
#: lib/mail.php:463
#, php-format
msgid "You've been nudged by %s"
-msgstr "Вас спробував \"розштовхати\" %s"
+msgstr "Вас спробував «розштовхати» %s"
#: lib/mail.php:467
#, php-format
@@ -4938,6 +4943,17 @@ msgid ""
"With kind regards,\n"
"%4$s\n"
msgstr ""
+"%1$s (%2$s) цікавиться як Ваші справи останнім часом і пропонує про це "
+"написати.\n"
+"\n"
+"Може розповісте, що в Вас нового? Задовольніть цікавість друзів! :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Не відповідайте на цей лист; відповідь ніхто не отримає.\n"
+"\n"
+"З найкращими побажаннями,\n"
+"%4$s\n"
#: lib/mail.php:510
#, php-format
@@ -4962,11 +4978,25 @@ msgid ""
"With kind regards,\n"
"%5$s\n"
msgstr ""
+"%1$s (%2$s) надіслав(ла) Вам приватне повідомлення:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"Можете відповісти тут:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Не відповідайте на цей лист; відповідь ніхто не отримає.\n"
+"\n"
+"З найкращими побажаннями,\n"
+"%5$s\n"
#: lib/mail.php:559
-#, fuzzy, php-format
+#, php-format
msgid "%s (@%s) added your notice as a favorite"
-msgstr "%s додав(ла) ваше повідомлення до обраних"
+msgstr "%s (@%s) додав(ла) Ваш допис обраних"
#: lib/mail.php:561
#, php-format
@@ -4988,11 +5018,27 @@ msgid ""
"Faithfully yours,\n"
"%6$s\n"
msgstr ""
+"%1$s (@%7$s) щойно додав(ла) Ваш допис %2$s до обраних.\n"
+"\n"
+"URL-адреса Вашого допису:\n"
+"\n"
+"%3$s\n"
+"\n"
+"Текст Вашого допису:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Ви можете переглянути список улюблених дописів %1$s тут:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Щиро Ваші,\n"
+"%6$s\n"
#: lib/mail.php:620
#, php-format
msgid "%s (@%s) sent a notice to your attention"
-msgstr ""
+msgstr "%s (@%s) пропонує до Вашої уваги наступний допис"
#: lib/mail.php:622
#, php-format
@@ -5008,62 +5054,75 @@ msgid ""
"\t%4$s\n"
"\n"
msgstr ""
+"%1$s (@%9$s) пропонує до Вашої уваги наступний допис (це '@-відповідь') %2"
+"$s.\n"
+"\n"
+"Допис тут:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Текст:\n"
+"\n"
+"\t%4$s\n"
+"\n"
#: lib/mediafile.php:98 lib/mediafile.php:123
msgid "There was a database error while saving your file. Please try again."
-msgstr ""
+msgstr "Виникла помилка під час завантаження Вашого файлу. Спробуйте ще."
#: lib/mediafile.php:142
msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
-msgstr ""
+msgstr "Завантажений файл перевищив UPLOAD_MAX_FILESIZE вказаний у php.ini."
#: lib/mediafile.php:147
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form."
msgstr ""
+"Завантажений файл перевищив MAX_FILE_SIZE котрий було встановлено для форми "
+"HTML."
#: lib/mediafile.php:152
msgid "The uploaded file was only partially uploaded."
-msgstr ""
+msgstr "Файл було завантажено частково."
#: lib/mediafile.php:159
msgid "Missing a temporary folder."
-msgstr ""
+msgstr "Загублено тимчасову теку."
#: lib/mediafile.php:162
msgid "Failed to write file to disk."
-msgstr ""
+msgstr "Запис файлу на диск скасовано."
#: lib/mediafile.php:165
msgid "File upload stopped by extension."
-msgstr ""
+msgstr "Завантаження файлу зупинено розширенням."
#: lib/mediafile.php:179 lib/mediafile.php:216
msgid "File exceeds user's quota!"
-msgstr ""
+msgstr "Файл перевищив квоту користувача!"
#: lib/mediafile.php:196 lib/mediafile.php:233
msgid "File could not be moved to destination directory."
-msgstr ""
+msgstr "Файл не може бути переміщений у директорію призначення."
#: lib/mediafile.php:201 lib/mediafile.php:237
msgid "Could not determine file's mime-type!"
-msgstr "Не вдається відновити загальний потік."
+msgstr "Не вдається визначити мімічний тип файлу."
#: lib/mediafile.php:270
#, php-format
msgid " Try using another %s format."
-msgstr ""
+msgstr " Спробуйте використати інший %s формат."
#: lib/mediafile.php:275
#, php-format
msgid "%s is not a supported filetype on this server."
-msgstr ""
+msgstr "%s не підтримується як тип файлу на цьому сервері."
#: lib/messageform.php:120
msgid "Send a direct notice"
-msgstr "Надіслати пряме повідомлення"
+msgstr "Надіслати прямий допис"
#: lib/messageform.php:146
msgid "To"
@@ -5075,7 +5134,7 @@ msgstr "Лишилось знаків"
#: lib/noticeform.php:158
msgid "Send a notice"
-msgstr "Надіслати повідомлення"
+msgstr "Надіслати допис"
#: lib/noticeform.php:171
#, php-format
@@ -5084,46 +5143,44 @@ msgstr "Що нового, %s?"
#: lib/noticeform.php:193
msgid "Attach"
-msgstr ""
+msgstr "Вкласти"
#: lib/noticeform.php:197
msgid "Attach a file"
-msgstr ""
+msgstr "Вкласти файл"
#: lib/noticelist.php:403
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-msgstr ""
+msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
#: lib/noticelist.php:404
-#, fuzzy
msgid "N"
-msgstr "Ні"
+msgstr "Півн."
#: lib/noticelist.php:404
msgid "S"
-msgstr ""
+msgstr "Півд."
#: lib/noticelist.php:405
msgid "E"
-msgstr ""
+msgstr "Сх."
#: lib/noticelist.php:405
msgid "W"
-msgstr ""
+msgstr "Зах."
#: lib/noticelist.php:411
msgid "at"
-msgstr ""
+msgstr "в"
#: lib/noticelist.php:506
-#, fuzzy
msgid "in context"
-msgstr "Немає змісту!"
+msgstr "в контексті"
#: lib/noticelist.php:526
msgid "Reply to this notice"
-msgstr "Відповісти на це повідомлення"
+msgstr "Відповісти на цей допис"
#: lib/noticelist.php:527
msgid "Reply"
@@ -5131,15 +5188,15 @@ msgstr "Відповісти"
#: lib/nudgeform.php:116
msgid "Nudge this user"
-msgstr "\"Розштовхати\" користувача"
+msgstr "«Розштовхати» користувача"
#: lib/nudgeform.php:128
msgid "Nudge"
-msgstr "\"Розштовхати\""
+msgstr "«Розштовхати»"
#: lib/nudgeform.php:128
msgid "Send a nudge to this user"
-msgstr "Спробувати \"розштовхати\" цього користувача"
+msgstr "Спробувати «розштовхати» цього користувача"
#: lib/oauthstore.php:283
msgid "Error inserting new profile"
@@ -5154,16 +5211,14 @@ msgid "Error inserting remote profile"
msgstr "Помилка при додаванні віддаленого профілю"
#: lib/oauthstore.php:345
-#, fuzzy
msgid "Duplicate notice"
-msgstr "Видалити повідомлення"
+msgstr "Дублікат допису"
-#: lib/oauthstore.php:466 lib/subs.php:48
-#, fuzzy
+#: lib/oauthstore.php:467 lib/subs.php:48
msgid "You have been banned from subscribing."
-msgstr "Цей користувач заблокував вашу можливість підписатись."
+msgstr "Вас позбавлено можливості підписатись."
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr "Не вдалося додати нову підписку."
@@ -5198,9 +5253,9 @@ msgstr "Надіслані вами повідомлення"
#: lib/personaltagcloudsection.php:56
#, php-format
msgid "Tags in %s's notices"
-msgstr "Теги у повідомленнях %s"
+msgstr "Теґи у дописах %s"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Підписки"
@@ -5208,7 +5263,7 @@ msgstr "Підписки"
msgid "All subscriptions"
msgstr "Всі підписки"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Підписчики"
@@ -5216,27 +5271,25 @@ msgstr "Підписчики"
msgid "All subscribers"
msgstr "Всі підписчики"
-#: lib/profileaction.php:177
-#, fuzzy
+#: lib/profileaction.php:178
msgid "User ID"
-msgstr "Користувач"
+msgstr "ІД"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "З нами від"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "Всі групи"
#: lib/profileformaction.php:123
-#, fuzzy
msgid "No return-to arguments"
-msgstr "Немає аргументу ID."
+msgstr "Немає аргументів повернення."
#: lib/profileformaction.php:137
msgid "unimplemented method"
-msgstr ""
+msgstr "неприпустимий метод"
#: lib/publicgroupnav.php:78
msgid "Public"
@@ -5248,7 +5301,7 @@ msgstr "Групи користувачів"
#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
msgid "Recent tags"
-msgstr "Нові теги"
+msgstr "Нові теґи"
#: lib/publicgroupnav.php:88
msgid "Featured"
@@ -5259,26 +5312,22 @@ msgid "Popular"
msgstr "Популярне"
#: lib/sandboxform.php:67
-#, fuzzy
msgid "Sandbox"
-msgstr "Вхідні"
+msgstr "Пісочниця"
#: lib/sandboxform.php:78
-#, fuzzy
msgid "Sandbox this user"
-msgstr "Розблокувати цього користувача"
+msgstr "Ізолювати, відіслати користувача гратися у пісочниці"
#: lib/searchaction.php:120
-#, fuzzy
msgid "Search site"
msgstr "Пошук"
#: lib/searchaction.php:126
msgid "Keyword(s)"
-msgstr ""
+msgstr "Ключові слова"
#: lib/searchaction.php:162
-#, fuzzy
msgid "Search help"
msgstr "Пошук"
@@ -5292,7 +5341,7 @@ msgstr "Знайти людей на цьому сайті"
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
-msgstr "Знайти за змістом повідомлень"
+msgstr "Знайти за змістом дописів"
#: lib/searchgroupnav.php:85
msgid "Find groups on this site"
@@ -5304,17 +5353,15 @@ msgstr "Розділ без заголовку"
#: lib/section.php:106
msgid "More..."
-msgstr ""
+msgstr "Ще..."
#: lib/silenceform.php:67
-#, fuzzy
msgid "Silence"
-msgstr "Зауваження сайту"
+msgstr "Нічичирк!"
#: lib/silenceform.php:78
-#, fuzzy
msgid "Silence this user"
-msgstr "Блокувати користувача"
+msgstr "Змусити користувача замовкнути, відправити у забуття"
#: lib/subgroupnav.php:83
#, php-format
@@ -5334,12 +5381,12 @@ msgstr "%s бере участь в цих групах"
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
-msgstr ""
+msgstr "Хмарка теґів (позначки самих користувачів)"
#: lib/subscriberspeopletagcloudsection.php:48
#: lib/subscriptionspeopletagcloudsection.php:48
msgid "People Tagcloud as tagged"
-msgstr ""
+msgstr "Хмарка теґів (позначки, якими Ви позначили користувачів)"
#: lib/subscriptionlist.php:126
msgid "(none)"
@@ -5347,11 +5394,11 @@ msgstr "(пусто)"
#: lib/subs.php:52
msgid "Already subscribed!"
-msgstr ""
+msgstr "Вже підписаний!"
#: lib/subs.php:56
msgid "User has blocked you."
-msgstr "Користувач заблокував вас."
+msgstr "Користувач заблокував Вас."
#: lib/subs.php:60
msgid "Could not subscribe."
@@ -5359,12 +5406,11 @@ msgstr "Невдала підписка."
#: lib/subs.php:79
msgid "Could not subscribe other to you."
-msgstr "Не вдалося підписати іншого до вас."
+msgstr "Не вдалося підписати інших до Вас."
#: lib/subs.php:128
-#, fuzzy
msgid "Not subscribed!"
-msgstr "Не підписано!."
+msgstr "Не підписано!"
#: lib/subs.php:140
msgid "Couldn't delete subscription."
@@ -5376,25 +5422,23 @@ msgstr "Пусто"
#: lib/topposterssection.php:74
msgid "Top posters"
-msgstr "Топ дописувачів"
+msgstr "Топ-дописувачі"
#: lib/unsandboxform.php:69
msgid "Unsandbox"
-msgstr ""
+msgstr "Витягти з пісочниці"
#: lib/unsandboxform.php:80
-#, fuzzy
msgid "Unsandbox this user"
-msgstr "Розблокувати цього користувача"
+msgstr "Повернути користувача з пісочниці"
#: lib/unsilenceform.php:67
msgid "Unsilence"
-msgstr ""
+msgstr "Витягти кляп"
#: lib/unsilenceform.php:78
-#, fuzzy
msgid "Unsilence this user"
-msgstr "Розблокувати цього користувача"
+msgstr "Витягти кляп, дозволити базікати знов"
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
@@ -5405,7 +5449,6 @@ msgid "Unsubscribe"
msgstr "Відписатись"
#: lib/userprofile.php:116
-#, fuzzy
msgid "Edit Avatar"
msgstr "Аватара"
@@ -5414,13 +5457,12 @@ msgid "User actions"
msgstr "Діяльність користувача"
#: lib/userprofile.php:248
-#, fuzzy
msgid "Edit profile settings"
msgstr "Налаштування профілю"
#: lib/userprofile.php:249
msgid "Edit"
-msgstr ""
+msgstr "Правка"
#: lib/userprofile.php:272
msgid "Send a direct message to this user"
@@ -5430,59 +5472,63 @@ msgstr "Надіслати пряме повідомлення цьому кор
msgid "Message"
msgstr "Повідомлення"
-#: lib/util.php:826
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr "Модерувати"
+
+#: lib/util.php:825
msgid "a few seconds ago"
msgstr "мить тому"
-#: lib/util.php:828
+#: lib/util.php:827
msgid "about a minute ago"
msgstr "хвилину тому"
-#: lib/util.php:830
+#: lib/util.php:829
#, php-format
msgid "about %d minutes ago"
msgstr "близько %d хвилин тому"
-#: lib/util.php:832
+#: lib/util.php:831
msgid "about an hour ago"
msgstr "годину тому"
-#: lib/util.php:834
+#: lib/util.php:833
#, php-format
msgid "about %d hours ago"
msgstr "близько %d годин тому"
-#: lib/util.php:836
+#: lib/util.php:835
msgid "about a day ago"
msgstr "день тому"
-#: lib/util.php:838
+#: lib/util.php:837
#, php-format
msgid "about %d days ago"
msgstr "близько %d днів тому"
-#: lib/util.php:840
+#: lib/util.php:839
msgid "about a month ago"
msgstr "місяць тому"
-#: lib/util.php:842
+#: lib/util.php:841
#, php-format
msgid "about %d months ago"
msgstr "близько %d місяців тому"
-#: lib/util.php:844
+#: lib/util.php:843
msgid "about a year ago"
msgstr "рік тому"
#: lib/webcolor.php:82
-#, fuzzy, php-format
+#, php-format
msgid "%s is not a valid color!"
-msgstr "Веб-сторінка має недійсну URL-адресу."
+msgstr "%s є неприпустимим кольором!"
#: lib/webcolor.php:123
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
-msgstr ""
+msgstr "%s неприпустимий колір! Використайте 3 або 6 знаків (HEX-формат)"
#: scripts/maildaemon.php:48
msgid "Could not parse message."
@@ -5490,16 +5536,13 @@ msgstr "Не можна розібрати повідомлення."
#: scripts/maildaemon.php:53
msgid "Not a registered user."
-msgstr "Це не зареєстрований користувач."
+msgstr "Це незареєстрований користувач."
#: scripts/maildaemon.php:57
msgid "Sorry, that is not your incoming email address."
-msgstr "Вибачте, але це не є вашою електронною адресою для входної пошти."
+msgstr "Вибачте, але це не є Вашою електронною адресою для вхідної пошти."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
"Вибачте, але не затверджено жодної електронної адреси для вхідної пошти."
-
-#~ msgid "Notice"
-#~ msgstr "Повідомлення"
diff --git a/locale/vi/LC_MESSAGES/statusnet.mo b/locale/vi/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index d81241ab3..000000000
--- a/locale/vi/LC_MESSAGES/statusnet.mo
+++ /dev/null
Binary files differ
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
index bcdd13f2e..b77e2e8fc 100644
--- a/locale/vi/LC_MESSAGES/statusnet.po
+++ b/locale/vi/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-23 21:46+0000\n"
-"PO-Revision-Date: 2009-11-23 21:48:21+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:21:00+0000\n"
"Language-Team: Vietnamese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59365); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: vi\n"
"X-Message-Group: out-statusnet\n"
@@ -584,7 +584,7 @@ msgstr "Nhóm"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -760,7 +760,7 @@ msgid "Conversation"
msgstr "Không có mã số xác nhận."
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Tin nhắn"
@@ -1213,7 +1213,7 @@ msgstr "Địa chỉ email hoặc mật khẩu không đúng."
msgid "New incoming email address added."
msgstr "Đã xác nhận địa chỉ này."
-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
#: lib/publicgroupnav.php:93
#, fuzzy
msgid "Popular notices"
@@ -1312,26 +1312,26 @@ msgstr "Người dùng đang lắng nghe để không thoát khỏi."
msgid "You can use the local subscription!"
msgstr "Bạn có thể đăng ký tại nơi bạn ở!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr ""
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "Chưa được phép."
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "Không thể chuyển các token yêu cầu đến token truy cập."
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Không biết phiên bản của giao thức OMB."
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "Lỗi xảy ra khi cập nhật hồ sơ cá nhân"
@@ -1549,8 +1549,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
#, fuzzy
msgid "Groups"
msgstr "Nhóm"
@@ -1887,53 +1887,53 @@ msgstr "%s và nhóm"
msgid "Already logged in."
msgstr "Đã đăng nhập."
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "Nội dung tin nhắn không hợp lệ"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "Sai tên đăng nhập hoặc mật khẩu."
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Chưa được phép."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Đăng nhập"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr ""
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Biệt danh"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Mật khẩu"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "Nhớ tôi"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "Sẽ tự động đăng nhập, không dành cho các máy sử dụng chung!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "Mất hoặc quên mật khẩu?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1941,7 +1941,7 @@ msgstr ""
"Vì lý do bảo mật, bạn hãy nhập lại tên đăng nhập và mật khẩu trước khi thay "
"đổi trong điều chỉnh."
-#: actions/login.php:286
+#: actions/login.php:289
#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2893,7 +2893,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL trong hồ sơ cá nhân của bạn ở trên các trang microblogging khác"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:356
+#: lib/userprofile.php:365
msgid "Subscribe"
msgstr "Theo bạn này"
@@ -2903,8 +2903,7 @@ msgstr "URL hồ sơ cá nhân không đúng định dạng."
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "Không phải là URL về hồ sơ cá nhân hợp lệ (không phải là "
#: actions/remotesubscribe.php:176
@@ -3087,7 +3086,7 @@ msgid "Members"
msgstr "Thành viên"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
@@ -3097,7 +3096,7 @@ msgstr ""
msgid "All members"
msgstr "Thành viên"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "Số liệu thống kê"
@@ -4103,7 +4102,7 @@ msgstr ""
msgid "Problem saving notice."
msgstr "Có lỗi xảy ra khi lưu tin nhắn."
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s"
@@ -4551,47 +4550,37 @@ msgstr "Không có mã số xác nhận."
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Không thể tạo OpenID mẫu: %s"
-
-#: 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:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Bạn chưa cập nhật thông tin riêng"
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Bạn đã theo những người này:"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Không thể tạo favorite."
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Không thể tạo favorite."
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Bạn chưa cập nhật thông tin riêng"
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Bạn chưa cập nhật thông tin riêng"
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4610,7 +4599,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4669,9 +4657,12 @@ msgid "Upload file"
msgstr "Tải file"
#: lib/designsettings.php:109
+#, fuzzy
msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
+"You can upload your personal background image. The maximum file size is 2MB."
msgstr ""
+"Bạn có thể cập nhật hồ sơ cá nhân tại đây để mọi người có thể biết thông tin "
+"về bạn."
#: lib/designsettings.php:372
msgid "Bad default color settings: "
@@ -4857,7 +4848,15 @@ msgstr "Không có tin nhắn nào."
msgid "Unknown file type"
msgstr "Không hỗ trợ kiểu file ảnh này."
-#: lib/jabber.php:192
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5285,11 +5284,11 @@ msgstr "Lỗi xảy ra khi thêm mới hồ sơ cá nhân"
msgid "Duplicate notice"
msgstr "Xóa tin nhắn"
-#: lib/oauthstore.php:466 lib/subs.php:48
+#: lib/oauthstore.php:467 lib/subs.php:48
msgid "You have been banned from subscribing."
msgstr ""
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr "Không thể chèn thêm vào đăng nhận."
@@ -5326,7 +5325,7 @@ msgstr "Thư bạn đã gửi"
msgid "Tags in %s's notices"
msgstr "cảnh báo tin nhắn"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Tôi theo bạn này"
@@ -5334,7 +5333,7 @@ msgstr "Tôi theo bạn này"
msgid "All subscriptions"
msgstr "Tất cả đăng nhận"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "Bạn này theo tôi"
@@ -5343,15 +5342,15 @@ msgstr "Bạn này theo tôi"
msgid "All subscribers"
msgstr "Bạn này theo tôi"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr ""
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "Gia nhập từ"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
#, fuzzy
msgid "All groups"
msgstr "Nhóm"
@@ -5569,47 +5568,51 @@ msgstr "Bạn đã theo những người này:"
msgid "Message"
msgstr "Tin mới nhất"
-#: lib/util.php:826
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr ""
+
+#: lib/util.php:825
msgid "a few seconds ago"
msgstr "vài giây trước"
-#: lib/util.php:828
+#: lib/util.php:827
msgid "about a minute ago"
msgstr "1 phút trước"
-#: lib/util.php:830
+#: lib/util.php:829
#, php-format
msgid "about %d minutes ago"
msgstr "%d phút trước"
-#: lib/util.php:832
+#: lib/util.php:831
msgid "about an hour ago"
msgstr "1 giờ trước"
-#: lib/util.php:834
+#: lib/util.php:833
#, php-format
msgid "about %d hours ago"
msgstr "%d giờ trước"
-#: lib/util.php:836
+#: lib/util.php:835
msgid "about a day ago"
msgstr "1 ngày trước"
-#: lib/util.php:838
+#: lib/util.php:837
#, php-format
msgid "about %d days ago"
msgstr "%d ngày trước"
-#: lib/util.php:840
+#: lib/util.php:839
msgid "about a month ago"
msgstr "1 tháng trước"
-#: lib/util.php:842
+#: lib/util.php:841
#, php-format
msgid "about %d months ago"
msgstr "%d tháng trước"
-#: lib/util.php:844
+#: lib/util.php:843
msgid "about a year ago"
msgstr "1 năm trước"
@@ -5639,7 +5642,3 @@ msgstr "Xin lỗi, đó không phải là địa chỉ email mà bạn nhập v
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Xin lỗi, không có địa chỉ email cho phép."
-
-#, fuzzy
-#~ msgid "Notice"
-#~ msgstr "Tin nhắn"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.mo b/locale/zh_CN/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 2f06e08bd..000000000
--- a/locale/zh_CN/LC_MESSAGES/statusnet.mo
+++ /dev/null
Binary files differ
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 09f8a30f6..2d0853339 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-23 21:46+0000\n"
-"PO-Revision-Date: 2009-11-23 21:48:25+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:21:03+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(r59365); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hans\n"
"X-Message-Group: out-statusnet\n"
@@ -578,7 +578,7 @@ msgstr "剪裁"
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -756,7 +756,7 @@ msgid "Conversation"
msgstr "确认码"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "通告"
@@ -1185,7 +1185,7 @@ msgstr "发布用的电子邮件被移除。"
msgid "New incoming email address added."
msgstr "已添加新的发布用的电子邮件地址。"
-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
#: lib/publicgroupnav.php:93
#, fuzzy
msgid "Popular notices"
@@ -1284,26 +1284,26 @@ msgstr "要查看的用户不存在。"
msgid "You can use the local subscription!"
msgstr "您可以在这里订阅!"
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr "那个用户阻止了你的订阅。"
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
#, fuzzy
msgid "You are not authorized."
msgstr "未认证。"
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "无法将请求标记转换为访问令牌。"
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "此OMB协议版本无效。"
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "更新远程的个人信息时出错"
@@ -1520,8 +1520,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "组"
@@ -1839,59 +1839,59 @@ msgstr "%s 离开群 %s"
msgid "Already logged in."
msgstr "已登录。"
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
#, fuzzy
msgid "Invalid or expired token."
msgstr "通告内容不正确"
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "用户名或密码不正确。"
-#: actions/login.php:149
+#: actions/login.php:152
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "未认证。"
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "登录"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr "登录"
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "昵称"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "密码"
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr "记住登录状态"
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "保持这台机器上的登录状态。不要在共用的机器上保持登录!"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "忘记了密码?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr "由于安全原因,修改设置前需要输入用户名和密码。"
-#: actions/login.php:286
+#: actions/login.php:289
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2816,7 +2816,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "您在其他兼容的微博客服务的个人信息URL"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:356
+#: lib/userprofile.php:365
msgid "Subscribe"
msgstr "订阅"
@@ -2826,8 +2826,7 @@ msgstr "个人信息URL不正确(格式错误)"
#: actions/remotesubscribe.php:168
#, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "不是有效的个人信息URL(没有YADIS数据)。"
#: actions/remotesubscribe.php:176
@@ -3011,7 +3010,7 @@ msgid "Members"
msgstr "注册于"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(没有)"
@@ -3020,7 +3019,7 @@ msgstr "(没有)"
msgid "All members"
msgstr "所有成员"
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr "统计"
@@ -4019,7 +4018,7 @@ msgstr "在这个网站你被禁止发布消息。"
msgid "Problem saving notice."
msgstr "保存通告时出错。"
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr "添加回复时数据库出错:%s"
@@ -4456,47 +4455,37 @@ msgstr "通告开启。"
msgid "Can't turn on notification."
msgstr "无法开启通告。"
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "无法创建 OpenID 表单:%s"
-
-#: 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:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "您未告知此个人信息"
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "您已订阅这些用户:"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "无法订阅他人更新。"
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "无法订阅他人更新。"
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "您未告知此个人信息"
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "您未告知此个人信息"
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4515,7 +4504,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4575,9 +4563,10 @@ msgid "Upload file"
msgstr "上传"
#: lib/designsettings.php:109
+#, fuzzy
msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
-msgstr ""
+"You can upload your personal background image. The maximum file size is 2MB."
+msgstr "您可以在这里上传个人头像。"
#: lib/designsettings.php:372
msgid "Bad default color settings: "
@@ -4760,7 +4749,15 @@ msgstr "没有这份通告。"
msgid "Unknown file type"
msgstr "未知文件类型"
-#: lib/jabber.php:192
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -5145,12 +5142,12 @@ msgstr "添加远程的个人信息出错"
msgid "Duplicate notice"
msgstr "删除通告"
-#: lib/oauthstore.php:466 lib/subs.php:48
+#: lib/oauthstore.php:467 lib/subs.php:48
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "那个用户阻止了你的订阅。"
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr "无法添加新的订阅。"
@@ -5187,7 +5184,7 @@ msgstr "您发送的消息"
msgid "Tags in %s's notices"
msgstr "%s's 的消息的标签"
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "订阅"
@@ -5195,7 +5192,7 @@ msgstr "订阅"
msgid "All subscriptions"
msgstr "所有订阅"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "订阅者"
@@ -5204,16 +5201,16 @@ msgstr "订阅者"
msgid "All subscribers"
msgstr "订阅者"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
#, fuzzy
msgid "User ID"
msgstr "用户"
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "用户始于"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr "所有组"
@@ -5428,47 +5425,51 @@ msgstr "无法向此用户发送消息。"
msgid "Message"
msgstr "新消息"
-#: lib/util.php:826
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr ""
+
+#: lib/util.php:825
msgid "a few seconds ago"
msgstr "几秒前"
-#: lib/util.php:828
+#: lib/util.php:827
msgid "about a minute ago"
msgstr "一分钟前"
-#: lib/util.php:830
+#: lib/util.php:829
#, php-format
msgid "about %d minutes ago"
msgstr "%d 分钟前"
-#: lib/util.php:832
+#: lib/util.php:831
msgid "about an hour ago"
msgstr "一小时前"
-#: lib/util.php:834
+#: lib/util.php:833
#, php-format
msgid "about %d hours ago"
msgstr "%d 小时前"
-#: lib/util.php:836
+#: lib/util.php:835
msgid "about a day ago"
msgstr "一天前"
-#: lib/util.php:838
+#: lib/util.php:837
#, php-format
msgid "about %d days ago"
msgstr "%d 天前"
-#: lib/util.php:840
+#: lib/util.php:839
msgid "about a month ago"
msgstr "一个月前"
-#: lib/util.php:842
+#: lib/util.php:841
#, php-format
msgid "about %d months ago"
msgstr "%d 个月前"
-#: lib/util.php:844
+#: lib/util.php:843
msgid "about a year ago"
msgstr "一年前"
@@ -5497,7 +5498,3 @@ msgstr "对不起,这个发布用的电子邮件属于其他用户。"
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "对不起,发布用的电子邮件无法使用。"
-
-#, fuzzy
-#~ msgid "Notice"
-#~ msgstr "通告"
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.mo b/locale/zh_TW/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 92ef79c48..000000000
--- a/locale/zh_TW/LC_MESSAGES/statusnet.mo
+++ /dev/null
Binary files differ
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po
index 84ce25714..17a54af33 100644
--- a/locale/zh_TW/LC_MESSAGES/statusnet.po
+++ b/locale/zh_TW/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-23 21:46+0000\n"
-"PO-Revision-Date: 2009-11-23 21:48:29+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:21:06+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(r59365); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hant\n"
"X-Message-Group: out-statusnet\n"
@@ -571,7 +571,7 @@ msgstr ""
#: actions/emailsettings.php:238 actions/favor.php:75
#: actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -748,7 +748,7 @@ msgid "Conversation"
msgstr "地點"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
msgid "Notices"
msgstr ""
@@ -1167,7 +1167,7 @@ msgstr ""
msgid "New incoming email address added."
msgstr ""
-#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
#: lib/publicgroupnav.php:93
#, fuzzy
msgid "Popular notices"
@@ -1263,24 +1263,24 @@ msgstr ""
msgid "You can use the local subscription!"
msgstr ""
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
msgstr ""
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
msgstr ""
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
#, fuzzy
msgid "Could not convert request token to access token."
msgstr "無法轉換請求標記以致無法存取標記"
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
msgid "Remote service uses unknown version of OMB protocol."
msgstr ""
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile"
msgstr "更新遠端個人資料發生錯誤"
@@ -1485,8 +1485,8 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1775,57 +1775,57 @@ msgstr ""
msgid "Already logged in."
msgstr "已登入"
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
msgid "Invalid or expired token."
msgstr ""
-#: actions/login.php:143
+#: actions/login.php:146
msgid "Incorrect username or password."
msgstr "使用者名稱或密碼錯誤"
-#: actions/login.php:149
+#: actions/login.php:152
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "登入"
-#: actions/login.php:243
+#: actions/login.php:246
msgid "Login to site"
msgstr ""
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "暱稱"
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr ""
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
msgid "Remember me"
msgstr ""
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "未來在同一部電腦自動登入"
-#: actions/login.php:263
+#: actions/login.php:266
msgid "Lost or forgotten password?"
msgstr "遺失或忘記密碼了嗎?"
-#: actions/login.php:282
+#: actions/login.php:285
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr "為安全起見,請先重新輸入你的使用者名稱與密碼再更改設定。"
-#: actions/login.php:286
+#: actions/login.php:289
#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2717,7 +2717,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:356
+#: lib/userprofile.php:365
msgid "Subscribe"
msgstr ""
@@ -2726,8 +2726,7 @@ 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)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr ""
#: actions/remotesubscribe.php:176
@@ -2908,7 +2907,7 @@ msgid "Members"
msgstr "何時加入會員的呢?"
#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
#: lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
@@ -2917,7 +2916,7 @@ msgstr ""
msgid "All members"
msgstr ""
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
msgid "Statistics"
msgstr ""
@@ -3875,7 +3874,7 @@ msgstr ""
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr "增加回覆時,資料庫發生錯誤: %s"
@@ -4300,47 +4299,37 @@ msgstr ""
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "無法從 %s 建立OpenID"
-
-#: 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:618
+#: lib/command.php:592
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "此帳號已註冊"
-#: lib/command.php:620
+#: lib/command.php:594
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "此帳號已註冊"
-#: lib/command.php:640
+#: lib/command.php:614
#, fuzzy
msgid "No one is subscribed to you."
msgstr "無此訂閱"
-#: lib/command.php:642
+#: lib/command.php:616
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "無此訂閱"
-#: lib/command.php:662
+#: lib/command.php:636
#, fuzzy
msgid "You are not a member of any groups."
msgstr "無法連結到伺服器:%s"
-#: lib/command.php:664
+#: lib/command.php:638
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "無法連結到伺服器:%s"
-#: lib/command.php:678
+#: lib/command.php:652
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4359,7 +4348,6 @@ msgid ""
"reply #<notice_id> - reply to notice with a given id\n"
"reply <nickname> - reply to the last notice from user\n"
"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
"drop <group> - leave group\n"
"stats - get your stats\n"
"stop - same as 'off'\n"
@@ -4419,7 +4407,7 @@ msgstr "無此通知"
#: lib/designsettings.php:109
msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
+"You can upload your personal background image. The maximum file size is 2MB."
msgstr ""
#: lib/designsettings.php:372
@@ -4597,7 +4585,15 @@ msgstr "無此通知"
msgid "Unknown file type"
msgstr ""
-#: lib/jabber.php:192
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
+#: lib/jabber.php:191
#, php-format
msgid "[%s]"
msgstr ""
@@ -4969,11 +4965,11 @@ msgstr "新增外部個人資料發生錯誤(Error inserting remote profile)"
msgid "Duplicate notice"
msgstr "新訊息"
-#: lib/oauthstore.php:466 lib/subs.php:48
+#: lib/oauthstore.php:467 lib/subs.php:48
msgid "You have been banned from subscribing."
msgstr ""
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr "無法新增訂閱"
@@ -5010,7 +5006,7 @@ msgstr ""
msgid "Tags in %s's notices"
msgstr ""
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr ""
@@ -5018,7 +5014,7 @@ msgstr ""
msgid "All subscriptions"
msgstr "所有訂閱"
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr ""
@@ -5027,15 +5023,15 @@ msgstr ""
msgid "All subscribers"
msgstr "所有訂閱"
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
msgid "User ID"
msgstr ""
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
msgid "Member since"
msgstr "何時加入會員的呢?"
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
msgid "All groups"
msgstr ""
@@ -5237,47 +5233,51 @@ msgstr ""
msgid "Message"
msgstr ""
-#: lib/util.php:826
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr ""
+
+#: lib/util.php:825
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:828
+#: lib/util.php:827
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:830
+#: lib/util.php:829
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:832
+#: lib/util.php:831
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:834
+#: lib/util.php:833
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:836
+#: lib/util.php:835
msgid "about a day ago"
msgstr ""
-#: lib/util.php:838
+#: lib/util.php:837
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:840
+#: lib/util.php:839
msgid "about a month ago"
msgstr ""
-#: lib/util.php:842
+#: lib/util.php:841
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:844
+#: lib/util.php:843
msgid "about a year ago"
msgstr ""
@@ -5306,7 +5306,3 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
-
-#, fuzzy
-#~ msgid "Notice"
-#~ msgstr "新訊息"
diff --git a/plugins/InfiniteScroll/infinitescroll.js b/plugins/InfiniteScroll/infinitescroll.js
index 0dafef6d5..0c8edce2b 100644
--- a/plugins/InfiniteScroll/infinitescroll.js
+++ b/plugins/InfiniteScroll/infinitescroll.js
@@ -1,6 +1,6 @@
jQuery(document).ready(function($){
$('notices_primary').infinitescroll({
- debug: true,
+ debug: false,
infiniteScroll : false,
nextSelector : 'body#public li.nav_next a,'+
'body#all li.nav_next a,'+
diff --git a/plugins/LilUrl/LilUrlPlugin.php b/plugins/LilUrl/LilUrlPlugin.php
index e906751e8..4a6f1cdc7 100644
--- a/plugins/LilUrl/LilUrlPlugin.php
+++ b/plugins/LilUrl/LilUrlPlugin.php
@@ -54,7 +54,7 @@ class LilUrlPlugin extends UrlShortenerPlugin
if (!isset($y->body)) return;
$x = $y->body->p[0]->a->attributes();
if (isset($x['href'])) {
- return $x['href'];
+ return strval($x['href']);
}
}
}
diff --git a/plugins/Mapstraction/MapstractionPlugin.php b/plugins/Mapstraction/MapstractionPlugin.php
index 37306a23c..c0c2c5b8e 100644
--- a/plugins/Mapstraction/MapstractionPlugin.php
+++ b/plugins/Mapstraction/MapstractionPlugin.php
@@ -110,6 +110,11 @@ class MapstractionPlugin extends Plugin
function onEndShowScripts($action)
{
$actionName = $action->trimmed('action');
+ // These are the ones that have maps on 'em
+ if (!in_array($actionName,
+ array('showstream', 'all', 'allmap', 'usermap'))) {
+ return true;
+ }
switch ($this->provider)
{
@@ -146,6 +151,39 @@ class MapstractionPlugin extends Plugin
$action->raw(sprintf('var _provider = "%s";', $this->provider));
$action->elementEnd('script');
+ switch ($actionName) {
+ case 'usermap':
+ case 'showstream':
+ $notice = empty($action->tag)
+ ? $action->user->getNotices(($action->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1)
+ : $action->user->getTaggedNotices($action->tag, ($action->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1, 0, 0, null);
+ break;
+ case 'all':
+ case 'allmap':
+ $cur = common_current_user();
+ if (!empty($cur) && $cur->id == $action->user->id) {
+ $notice = $action->user->noticeInbox(($action->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
+ } else {
+ $notice = $action->user->noticesWithFriends(($action->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
+ }
+ break;
+ }
+
+ $jsonArray = array();
+
+ while ($notice->fetch()) {
+ if (!empty($notice->lat) && !empty($notice->lon)) {
+ $jsonNotice = $this->noticeAsJson($notice);
+ $jsonArray[] = $jsonNotice;
+ }
+ }
+
+ $action->elementStart('script', array('type' => 'text/javascript'));
+ $action->raw('/*<![CDATA[*/'); // XHTML compat for Safari
+ $action->raw('var _notices = ' . json_encode($jsonArray));
+ $action->raw('/*]]>*/'); // XHTML compat for Safari
+ $action->elementEnd('script');
+
return true;
}
@@ -176,4 +214,34 @@ class MapstractionPlugin extends Plugin
$action->elementEnd('div');
}
+
+ function noticeAsJson($notice)
+ {
+ // FIXME: this code should be abstracted to a neutral third
+ // party, like Notice::asJson(). I'm not sure of the ethics
+ // of refactoring from within a plugin, so I'm just abusing
+ // the ApiAction method. Don't do this unless you're me!
+
+ require_once(INSTALLDIR.'/lib/api.php');
+
+ $act = new ApiAction('/dev/null');
+
+ $arr = $act->twitterStatusArray($notice, true);
+ $arr['url'] = $notice->bestUrl();
+ $arr['html'] = $notice->rendered;
+ $arr['source'] = $arr['source'];
+
+ if (!empty($notice->reply_to)) {
+ $reply_to = Notice::staticGet('id', $notice->reply_to);
+ if (!empty($reply_to)) {
+ $arr['in_reply_to_status_url'] = $reply_to->bestUrl();
+ }
+ $reply_to = null;
+ }
+
+ $profile = $notice->getProfile();
+ $arr['user']['profile_url'] = $profile->profileurl;
+
+ return $arr;
+ }
}
diff --git a/plugins/Meteor/meteorupdater.js b/plugins/Meteor/meteorupdater.js
index 9ce68775b..cdd1d63fa 100644
--- a/plugins/Meteor/meteorupdater.js
+++ b/plugins/Meteor/meteorupdater.js
@@ -1,6 +1,4 @@
// Update the local timeline from a Meteor server
-// XXX: If @a is subscribed to @b, @a should get @b's notices in @a's Personal timeline.
-// Do Replies timeline.
var MeteorUpdater = function()
{
diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php
index 9f8923396..0b1e4de28 100644
--- a/plugins/MobileProfile/MobileProfilePlugin.php
+++ b/plugins/MobileProfile/MobileProfilePlugin.php
@@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1);
}
-define('PAGE_TYPE_PREFS',
+define('PAGE_TYPE_PREFS_MOBILEPROFILE',
'application/vnd.wap.xhtml+xml, application/xhtml+xml, text/html;q=0.9');
require_once INSTALLDIR.'/plugins/Mobile/WAP20Plugin.php';
@@ -63,9 +63,6 @@ class MobileProfilePlugin extends WAP20Plugin
function onStartShowHTML($action)
{
-
-
-
// XXX: This should probably graduate to WAP20Plugin
// If they are on the mobile site, serve them MP
@@ -162,8 +159,7 @@ class MobileProfilePlugin extends WAP20Plugin
common_config('site', 'server'))) {
// FIXME: Redirect to equivalent page on mobile site instead
- header("Location: ".$this->_common_path(''));
- exit();
+ common_redirect($this->_common_path(''), 302);
}
}
@@ -176,7 +172,7 @@ class MobileProfilePlugin extends WAP20Plugin
$_SERVER['HTTP_ACCEPT'] : null;
$cp = common_accept_to_prefs($httpaccept);
- $sp = common_accept_to_prefs(PAGE_TYPE_PREFS);
+ $sp = common_accept_to_prefs(PAGE_TYPE_PREFS_MOBILEPROFILE);
$type = common_negotiate_type($cp, $sp);
diff --git a/plugins/MobileProfile/mp-screen.css b/plugins/MobileProfile/mp-screen.css
index 1bb0248ec..e05adeb83 100644
--- a/plugins/MobileProfile/mp-screen.css
+++ b/plugins/MobileProfile/mp-screen.css
@@ -1,3 +1,12 @@
+/** theme: mobile profile screen
+ *
+ * @package StatusNet
+ * @author Sarven Capadisli <csarven@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
@import url(../../theme/base/css/display.css);
@import url(../../theme/identica/css/display.css);
@@ -64,8 +73,6 @@ width:auto;
margin-left:0;
}
-
-
#site_nav_global_primary {
margin:0;
width:100%;
@@ -81,7 +88,6 @@ float:left;
font-size:0.9em;
}
-
#form_notice {
width:100%;
}
@@ -106,13 +112,16 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
display:none;
}
#form_notice #notice_data-attach {
-top:auto;
-bottom:0;
-left:0;
-right:auto;
-opacity:1;
-z-index:9;
+position:static;
+clear:both;
width:65%;
+height:auto;
+display:block;
+z-index:9;
+padding:0;
+margin:0;
+background:none;
+opacity:1;
}
#form_notice #notice_action-submit {
@@ -168,9 +177,6 @@ margin-bottom:0;
padding-top:4px;
padding-bottom:4px;
}
-.notice .entry-title {
-
-}
.notice div.entry-content {
margin-left:0;
width:65%;
@@ -180,14 +186,21 @@ width:30%;
margin-right:2%;
}
-
+.notice-options form {
+width:16px;
+height:16px;
+}
+.notice-options a,
+.notice-options input {
+box-shadow:none;
+-moz-box-shadow:none;
+-webkit-box-shadow:none;
+}
.entity_profile {
width:auto;
}
-
-
.entity_actions {
margin-right:0;
margin-left:0;
@@ -239,8 +252,6 @@ height:auto;
margin-right:5%;
}
-
-
#footer {
width:96%;
padding:2%;
diff --git a/plugins/PtitUrl/PtitUrlPlugin.php b/plugins/PtitUrl/PtitUrlPlugin.php
index ef453e96d..76a438dd5 100644
--- a/plugins/PtitUrl/PtitUrlPlugin.php
+++ b/plugins/PtitUrl/PtitUrlPlugin.php
@@ -47,11 +47,14 @@ class PtitUrlPlugin extends UrlShortenerPlugin
{
$response = $this->http_get(sprintf($this->serviceUrl,urlencode($url)));
if (!$response) return;
- $response = $this->tidy($response);
- $y = @simplexml_load_string($response);
+ $dom = new DOMDocument();
+ @$dom->loadHTML($response);
+ $y = @simplexml_import_dom($dom);
if (!isset($y->body)) return;
$xml = $y->body->center->table->tr->td->pre->a->attributes();
- if (isset($xml['href'])) return $xml['href'];
+ if (isset($xml['href'])) {
+ return strval($xml['href']);
+ }
}
}
diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index 4ed95ff26..ce0297339 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -87,19 +87,19 @@ RealtimeUpdate = {
}
var noticeItem = RealtimeUpdate.makeNoticeItem(data);
+ var noticeItemID = $(noticeItem).attr('id');
+
$("#notices_primary .notices").prepend(noticeItem);
$("#notices_primary .notice:first").css({display:"none"});
$("#notices_primary .notice:first").fadeIn(1000);
- SN.U.NoticeReply();
- SN.U.NoticeFavor();
+ SN.U.FormXHR($('#'+noticeItemID+' .form_favor'));
+ SN.U.NoticeReplyTo($('#'+noticeItemID));
+ SN.U.NoticeWithAttachment($('#'+noticeItemID));
},
purgeLastNoticeItem: function() {
if ($('#notices_primary .notice').length > RealtimeUpdate._maxnotices) {
- $("#notices_primary .notice:last .form_disfavor").unbind('submit');
- $("#notices_primary .notice:last .form_favor").unbind('submit');
- $("#notices_primary .notice:last .notice_reply").unbind('click');
$("#notices_primary .notice:last").remove();
}
},
@@ -281,6 +281,8 @@ RealtimeUpdate = {
return false;
});
+
+ $('#showstream .entity_profile').css({'width':'69%'});
}
}
diff --git a/plugins/TightUrl/TightUrlPlugin.php b/plugins/TightUrl/TightUrlPlugin.php
index 56414c8c8..6ced9afdc 100644
--- a/plugins/TightUrl/TightUrlPlugin.php
+++ b/plugins/TightUrl/TightUrlPlugin.php
@@ -48,10 +48,13 @@ class TightUrlPlugin extends UrlShortenerPlugin
{
$response = $this->http_get(sprintf($this->serviceUrl,urlencode($url)));
if (!$response) return;
- $response = $this->tidy($response);
- $y = @simplexml_load_string($response);
+ $dom = new DOMDocument();
+ @$dom->loadHTML($response);
+ $y = @simplexml_import_dom($dom);
if (!isset($y->body)) return;
$xml = $y->body->p[0]->code[0]->a->attributes();
- if (isset($xml['href'])) return $xml['href'];
+ if (isset($xml['href'])) {
+ return strval($xml['href']);
+ }
}
}
diff --git a/plugins/UrlShortener/UrlShortenerPlugin.php b/plugins/UrlShortener/UrlShortenerPlugin.php
index 37206aa89..027624b7a 100644
--- a/plugins/UrlShortener/UrlShortenerPlugin.php
+++ b/plugins/UrlShortener/UrlShortenerPlugin.php
@@ -68,14 +68,6 @@ abstract class UrlShortenerPlugin extends Plugin
return $response->getBody();
}
- protected function tidy($response) {
- $response = str_replace('&nbsp;', ' ', $response);
- $config = array('output-xhtml' => true);
- $tidy = new tidy;
- $tidy->parseString($response, $config, 'utf8');
- $tidy->cleanRepair();
- return (string)$tidy;
- }
//------------Below are the methods that connect StatusNet to the implementing Url Shortener plugin------------\\
function onInitializePlugin(){
diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php
index 1a3ef3777..60c0c2c0a 100644
--- a/plugins/UserFlag/UserFlagPlugin.php
+++ b/plugins/UserFlag/UserFlagPlugin.php
@@ -97,7 +97,7 @@ class UserFlagPlugin extends Plugin
{
$user = common_current_user();
- if (!empty($user)) {
+ if (!empty($user) && ($user->id != $profile->id)) {
$action->elementStart('li', 'entity_flag');
@@ -138,19 +138,15 @@ class UserFlagPlugin extends Plugin
function onEndShowStatusNetStyles($action)
{
- $action->elementStart('style', array('type' => 'text/css'));
- $action->raw('.entity_flag input, .entity_flag p {'.
- ' background:url('.common_path('plugins/UserFlag/flag.gif').') 5px 5px no-repeat;'.
- ' }');
- $action->elementEnd('style');
-
+ $action->cssLink(common_path('plugins/UserFlag/userflag.css'),
+ null, 'screen, projection, tv');
return true;
}
function onEndShowScripts($action)
{
$action->elementStart('script', array('type' => 'text/javascript'));
- $action->raw('/*<![CDATA[*/ SN.U.FormXHR($(".form_entity_flag")); /*]]>*/');
+ $action->raw('/*<![CDATA[*/ if ($(".form_entity_flag").length > 0) { SN.U.FormXHR($(".form_entity_flag")); } /*]]>*/');
$action->elementEnd('script');
return true;
}
diff --git a/plugins/UserFlag/adminprofileflag.php b/plugins/UserFlag/adminprofileflag.php
index 1ac76b506..20b808637 100644
--- a/plugins/UserFlag/adminprofileflag.php
+++ b/plugins/UserFlag/adminprofileflag.php
@@ -145,10 +145,15 @@ class FlaggedProfileListItem extends ProfileListItem
$this->startActions();
if (Event::handle('StartProfileListItemActionElements', array($this))) {
+ $this->out->elementStart('li', 'entity_moderation');
+ $this->out->element('p', null, _('Moderate'));
+ $this->out->elementStart('ul');
$this->showSandboxButton();
$this->showSilenceButton();
$this->showDeleteButton();
$this->showClearButton();
+ $this->out->elementEnd('ul');
+ $this->out->elementEnd('li');
Event::handle('EndProfileListItemActionElements', array($this));
}
$this->endActions();
diff --git a/plugins/UserFlag/flagprofile.php b/plugins/UserFlag/flagprofile.php
index 8ff2f1f72..9bce7865b 100644
--- a/plugins/UserFlag/flagprofile.php
+++ b/plugins/UserFlag/flagprofile.php
@@ -72,6 +72,28 @@ class FlagprofileAction extends ProfileFormAction
return true;
}
+
+ /**
+ * Handle request
+ *
+ * Overriding the base Action's handle() here to deal check
+ * for Ajax and return an HXR response if necessary
+ *
+ * @param array $args $_REQUEST args; handled in prepare()
+ *
+ * @return void
+ */
+
+ function handle($args)
+ {
+ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+ $this->handlePost();
+ if (!$this->boolean('ajax')) {
+ $this->returnToArgs();
+ }
+ }
+ }
+
/**
* Handle POST
*
@@ -97,6 +119,10 @@ class FlagprofileAction extends ProfileFormAction
}
$ufp->free();
+
+ if ($this->boolean('ajax')) {
+ $this->ajaxResults();
+ }
}
function ajaxResults() {
diff --git a/plugins/UserFlag/flagprofileform.php b/plugins/UserFlag/flagprofileform.php
index 262dad4a7..c20929a20 100644
--- a/plugins/UserFlag/flagprofileform.php
+++ b/plugins/UserFlag/flagprofileform.php
@@ -48,6 +48,18 @@ require_once INSTALLDIR.'/lib/form.php';
class FlagProfileForm extends ProfileActionForm
{
/**
+ * class of the form
+ * Action this form provides
+ *
+ * @return string class of the form
+ */
+
+ function formClass()
+ {
+ return 'form_entity_flag';
+ }
+
+ /**
* Action this form provides
*
* @return string Name of the action, lowercased.
diff --git a/plugins/UserFlag/flag.gif b/plugins/UserFlag/icon_flag.gif
index 68c8aee25..68c8aee25 100644
--- a/plugins/UserFlag/flag.gif
+++ b/plugins/UserFlag/icon_flag.gif
Binary files differ
diff --git a/plugins/UserFlag/userflag.css b/plugins/UserFlag/userflag.css
new file mode 100644
index 000000000..98da24cc9
--- /dev/null
+++ b/plugins/UserFlag/userflag.css
@@ -0,0 +1,4 @@
+.entity_flag input.submit,
+.entity_flag p {
+background:url(icon_flag.gif) 5px 5px no-repeat;
+}
diff --git a/scripts/checkschema.php b/scripts/checkschema.php
index bf52abe15..bf52abe15 100644..100755
--- a/scripts/checkschema.php
+++ b/scripts/checkschema.php
diff --git a/scripts/stopdaemons.sh b/scripts/stopdaemons.sh
index 55b404c1a..90e7331ca 100755
--- a/scripts/stopdaemons.sh
+++ b/scripts/stopdaemons.sh
@@ -25,7 +25,7 @@ DIR=`php $SDIR/getpiddir.php`
for f in jabberhandler ombhandler publichandler smshandler pinghandler \
xmppconfirmhandler xmppdaemon twitterhandler facebookhandler \
- twitterstatusfetcher synctwitterfriends; do
+ twitterstatusfetcher synctwitterfriends pluginhandler; do
FILES="$DIR/$f.*.pid"
for ff in "$FILES" ; do
diff --git a/scripts/update_translations.php b/scripts/update_translations.php
index 73f2a3a7e..45fe460a0 100755
--- a/scripts/update_translations.php
+++ b/scripts/update_translations.php
@@ -109,7 +109,10 @@ foreach ($languages as $language) {
file_put_contents($pofile, $new_file);
// --backup=off is workaround for Mac OS X fail
system(sprintf('msgmerge -U --backup=off %s %s', $pofile, $statusnet_pot));
+ /* Do not rebuild/add .mo files by default
+ * FIXME: should be made a command line parameter.
system(sprintf('msgfmt -o %s %s', $mofile, $pofile));
+ */
} else {
echo "Unchanged - ".$code."\n";
}
diff --git a/scripts/updateavatarurl.php b/scripts/updateavatarurl.php
new file mode 100644
index 000000000..dfcfc118c
--- /dev/null
+++ b/scripts/updateavatarurl.php
@@ -0,0 +1,128 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+
+$shortoptions = 'i:n:a';
+$longoptions = array('id=', 'nickname=', 'all');
+
+$helptext = <<<END_OF_UPDATEAVATARURL_HELP
+updateavatarurl.php [options]
+update the URLs of all avatars in the system
+
+ -i --id ID of user to update
+ -n --nickname nickname of the user to update
+ -a --all update all
+
+END_OF_UPDATEAVATARURL_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+try {
+ $user = null;
+
+ if (have_option('i', 'id')) {
+ $id = get_option_value('i', 'id');
+ $user = User::staticGet('id', $id);
+ if (empty($user)) {
+ throw new Exception("Can't find user with id '$id'.");
+ }
+ updateAvatars($user);
+ } else if (have_option('n', 'nickname')) {
+ $nickname = get_option_value('n', 'nickname');
+ $user = User::staticGet('nickname', $nickname);
+ if (empty($user)) {
+ throw new Exception("Can't find user with nickname '$nickname'");
+ }
+ updateAvatars($user);
+ } else if (have_option('a', 'all')) {
+ $user = new User();
+ if ($user->find()) {
+ while ($user->fetch()) {
+ updateAvatars($user);
+ }
+ }
+ } else {
+ throw new Exception("You have to provide an ID or nickname or 'all'.");
+ }
+} catch (Exception $e) {
+ print $e->getMessage()."\n";
+ exit(1);
+}
+
+function updateAvatars($user)
+{
+ $touched = false;
+
+ if (!have_option('q', 'quiet')) {
+ print "Updating avatars for user '".$user->nickname."' (".$user->id.")...";
+ }
+
+ $avatar = new Avatar();
+
+ $avatar->profile_id = $user->id;
+
+ if (!$avatar->find()) {
+ if (have_option('v', 'verbose')) {
+ print "(none found)...";
+ }
+ } else {
+ while ($avatar->fetch()) {
+ if (have_option('v', 'verbose')) {
+ if ($avatar->original) {
+ print "original...";
+ } else {
+ print $avatar->width."...";
+ }
+ }
+
+ $orig = clone($avatar);
+
+ $avatar->url = Avatar::url($avatar->filename);
+
+ if ($avatar->url != $orig->url) {
+ $sql =
+ "UPDATE avatar SET url = '" . $avatar->url . "' ".
+ "WHERE profile_id = " . $avatar->profile_id . " ".
+ "AND width = " . $avatar->width . " " .
+ "AND height = " . $avatar->height . " ";
+
+ if ($avatar->original) {
+ $sql .= "AND original = 1 ";
+ }
+
+ if (!$avatar->query($sql)) {
+ throw new Exception("Can't update avatar for user " . $user->nickname . ".");
+ } else {
+ $touched = true;
+ }
+ }
+ }
+ }
+
+ if ($touched) {
+ $profile = $user->getProfile();
+ common_broadcast_profile($profile);
+ }
+
+ if (have_option('v', 'verbose')) {
+ print "DONE.\n";
+ }
+}
diff --git a/theme/readme.txt b/theme/README
index d030f2db4..266a89fdf 100644
--- a/theme/readme.txt
+++ b/theme/README
@@ -1,10 +1,10 @@
-/** Howto: create a statusnet theme
+/** Howto: create a StatusNet theme
*
* @package StatusNet
- * @author Sarven Capadisli <csarven@status.net>
- * @copyright 2009 Control Yourself, Inc.
+ * @author Sarven Capadisli <csarven@status.net>
+ * @copyright 2009 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link http://laconi.ca/
+ * @link http://status.net/
*/
Location of key paths and files under theme/:
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index f1bc9c8ac..44d1d0300 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -48,14 +48,6 @@ padding:4px;
font-family:sans-serif;
font-size:1em;
}
-input, textarea, select {
-border-width:2px;
-border-style: solid;
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
-}
-
input.submit {
font-weight:bold;
cursor:pointer;
@@ -574,6 +566,7 @@ padding:0;
border:0;
text-align:center;
font-weight:bold;
+cursor:pointer;
}
/* entity_profile */
@@ -701,7 +694,7 @@ padding-left:23px;
.entity_actions a,
.entity_actions p {
-padding:1px 4px 1px 26px;
+padding:2px 4px 1px 26px;
}
.entity_remote_subscribe {
@@ -749,6 +742,35 @@ display:none;
text-align:center;
}
+.entity_moderation {
+position:relative;
+}
+.entity_moderation p {
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+font-weight:bold;
+padding-bottom:2px;
+margin-bottom:7px;
+}
+.entity_moderation ul {
+display:none;
+}
+.entity_moderation:hover ul {
+display:block;
+min-width:21%;
+width:100%;
+padding:11px;
+position:absolute;
+top:-1px;
+right:-1px;
+z-index:1;
+border-width:1px;
+border-style:solid;
+border-radius:7px;
+-moz-border-radius:7px;
+-webkit-border-radius:7px;
+}
.entity_tags ul {
list-style-type:none;
@@ -986,7 +1008,7 @@ float:left;
.notice-options .form_favor,
.notice-options .form_disfavor {
float:left;
-margin-left:18px;
+margin-left:20%;
}
.notice-options .form_favor,
.notice-options .form_disfavor {
diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif
index f19d6a3f6..e910c86c0 100644
--- a/theme/base/images/icons/icons-01.gif
+++ b/theme/base/images/icons/icons-01.gif
Binary files differ
diff --git a/theme/base/images/icons/twotone/green/badge.gif b/theme/base/images/icons/twotone/green/badge.gif
new file mode 100644
index 000000000..2dca5b99f
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/badge.gif
Binary files differ
diff --git a/theme/base/images/icons/twotone/green/sandbox.gif b/theme/base/images/icons/twotone/green/sandbox.gif
new file mode 100644
index 000000000..17031962a
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/sandbox.gif
Binary files differ
diff --git a/theme/base/images/icons/twotone/green/silence.gif b/theme/base/images/icons/twotone/green/silence.gif
new file mode 100644
index 000000000..8c624acdd
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/silence.gif
Binary files differ
diff --git a/theme/base/images/icons/twotone/green/skull.gif b/theme/base/images/icons/twotone/green/skull.gif
new file mode 100644
index 000000000..033506732
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/skull.gif
Binary files differ
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 00cac0ea3..ad64b4198 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -20,7 +20,13 @@ font-size:1em;
address {
margin-right:5.7%;
}
-
+input, textarea, select {
+border-width:2px;
+border-style: solid;
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+}
input, textarea, select, option {
font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
}
@@ -40,7 +46,8 @@ box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3);
.entity_send-a-message .form_notice,
.pagination .nav_prev a,
.pagination .nav_next a,
-.form_settings fieldset fieldset {
+.form_settings fieldset fieldset,
+.entity_moderation:hover ul {
border-color:#DDDDDD;
}
@@ -61,6 +68,7 @@ input.submit,
.entity_remote_subscribe,
.entity_actions a,
.entity_actions input,
+.entity_moderation p,
button {
box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
@@ -89,7 +97,8 @@ a,
.form_settings input.form_action-primary,
.notice-options input,
.entity_actions a,
-.entity_actions input {
+.entity_actions input,
+.entity_moderation p {
color:#002FA7;
}
@@ -144,13 +153,18 @@ button.close,
.form_user_unsubscribe input.submit,
.form_group_join input.submit,
.form_user_subscribe input.submit,
-.entity_subscribe a {
+.entity_subscribe a,
+.entity_moderation p,
+.entity_sandbox input.submit,
+.entity_silence input.submit,
+.entity_delete input.submit {
background-image:url(../../base/images/icons/icons-01.gif);
background-repeat:no-repeat;
background-color:transparent;
}
-#wrap form.processing input.submit {
+#wrap form.processing input.submit,
+.entity_actions a.processing {
background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
cursor:wait;
text-indent:-9999px;
@@ -169,11 +183,12 @@ border-color:transparent;
}
#content,
#site_nav_local_views .current a,
-.entity_send-a-message .form_notice {
+.entity_send-a-message .form_notice,
+.entity_moderation:hover ul {
background-color:#FFFFFF;
}
-#site_nav_local_views li {
+#site_nav_local_views li.current {
box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
-webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
@@ -252,7 +267,8 @@ background-position: 5px -718px;
.entity_send-a-message a {
background-position: 5px -852px;
}
-.entity_send-a-message .form_notice {
+.entity_send-a-message .form_notice,
+.entity_moderation:hover ul {
box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
-webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
@@ -271,6 +287,18 @@ background-position: 5px -918px;
.form_make_admin input.submit {
background-position: 5px -983px;
}
+.entity_moderation p {
+background-position: 5px -1313px;
+}
+.entity_sandbox input.submit {
+background-position: 5px -1380px;
+}
+.entity_silence input.submit {
+background-position: 5px -1445px;
+}
+.entity_delete input.submit {
+background-position: 5px -1511px;
+}
/* NOTICES */
.notice .attachment {
diff --git a/theme/default/css/ie.css b/theme/default/css/ie.css
index a0d3cd682..228347166 100644
--- a/theme/default/css/ie.css
+++ b/theme/default/css/ie.css
@@ -7,8 +7,14 @@ color:#FFFFFF;
background-color:#C8D1D5;
}
.form_notice .form_note + label {
-background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
+background:transparent url(../../base/images/icons/icons-01.gif) no-repeat 0 -328px;
}
.form_notice #notice_data-attach {
filter: alpha(opacity=0);
}
+.notice-options form.form_favor input.submit {
+background-position:0 -460px;
+}
+.notice-options form.form_disfavor input.submit {
+background-position:0 -526px;
+}
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 12541341d..d5a5d38de 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -20,7 +20,13 @@ font-size:1em;
address {
margin-right:7.2%;
}
-
+input, textarea, select {
+border-width:2px;
+border-style: solid;
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+}
input, textarea, select, option {
font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
}
@@ -40,7 +46,8 @@ box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3);
.entity_send-a-message .form_notice,
.pagination .nav_prev a,
.pagination .nav_next a,
-.form_settings fieldset fieldset {
+.form_settings fieldset fieldset,
+.entity_moderation:hover ul {
border-color:#DDDDDD;
}
@@ -61,6 +68,7 @@ input.submit,
.entity_remote_subscribe,
.entity_actions a,
.entity_actions input,
+.entity_moderation p,
button {
box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
@@ -89,7 +97,8 @@ a,
.form_settings input.form_action-primary,
.notice-options input,
.entity_actions a,
-.entity_actions input {
+.entity_actions input,
+.entity_moderation p {
color:#002FA7;
}
@@ -144,13 +153,18 @@ button.close,
.form_user_unsubscribe input.submit,
.form_group_join input.submit,
.form_user_subscribe input.submit,
-.entity_subscribe a {
+.entity_subscribe a,
+.entity_moderation p,
+.entity_sandbox input.submit,
+.entity_silence input.submit,
+.entity_delete input.submit {
background-image:url(../../base/images/icons/icons-01.gif);
background-repeat:no-repeat;
background-color:transparent;
}
-#wrap form.processing input.submit {
+#wrap form.processing input.submit,
+.entity_actions a.processing {
background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
cursor:wait;
text-indent:-9999px;
@@ -169,11 +183,12 @@ border-color:transparent;
}
#content,
#site_nav_local_views .current a,
-.entity_send-a-message .form_notice {
+.entity_send-a-message .form_notice,
+.entity_moderation:hover ul {
background-color:#FFFFFF;
}
-#site_nav_local_views li {
+#site_nav_local_views li.current {
box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
-webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
@@ -251,7 +266,8 @@ background-position: 5px -718px;
.entity_send-a-message a {
background-position: 5px -852px;
}
-.entity_send-a-message .form_notice {
+.entity_send-a-message .form_notice,
+.entity_moderation:hover ul {
box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
-webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
@@ -270,6 +286,18 @@ background-position: 5px -918px;
.form_make_admin input.submit {
background-position: 5px -983px;
}
+.entity_moderation p {
+background-position: 5px -1313px;
+}
+.entity_sandbox input.submit {
+background-position: 5px -1380px;
+}
+.entity_silence input.submit {
+background-position: 5px -1445px;
+}
+.entity_delete input.submit {
+background-position: 5px -1511px;
+}
/* NOTICES */
.notice .attachment {
diff --git a/theme/identica/css/ie.css b/theme/identica/css/ie.css
index 9ede1e324..f69c13ae7 100644
--- a/theme/identica/css/ie.css
+++ b/theme/identica/css/ie.css
@@ -7,7 +7,7 @@ color:#FFFFFF;
background-color:#D9DADB;
}
.form_notice .form_note + label {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -328px;
+background:transparent url(../../base/images/icons/icons-01.gif) no-repeat 0 -328px;
}
.form_notice #notice_data-attach {
filter: alpha(opacity=0);