summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-12-01 12:11:05 -0500
committerEvan Prodromou <evan@status.net>2009-12-01 12:11:05 -0500
commit42da45d3bc3cd0caa34f8d9f34c5617fedbb755e (patch)
tree4bb8483ad921fd1c03b0f4043d541dff1a812d50
parent11d9c1955c9a7d65cb3dc76098abd3e4350d2685 (diff)
parent234e6a10b1b95b271bacd11687e1dcb168712147 (diff)
Merge branch 'master' of git@gitorious.org:statusnet/mainline
-rw-r--r--actions/finishremotesubscribe.php13
-rw-r--r--actions/noticesearchrss.php7
-rw-r--r--classes/Avatar.php2
-rw-r--r--classes/Notice.php13
-rw-r--r--classes/Plugin_DataObject.php195
-rw-r--r--classes/Remote_profile.php10
-rw-r--r--classes/statusnet.ini24
-rw-r--r--classes/statusnet.links.ini3
-rw-r--r--doc-src/faq2
-rw-r--r--lib/api.php15
-rw-r--r--lib/columndef.php169
-rw-r--r--lib/htmloutputter.php5
-rw-r--r--lib/oauthclient.php1
-rw-r--r--lib/oauthstore.php1
-rw-r--r--lib/omb.php11
-rw-r--r--lib/schema.php188
-rw-r--r--lib/tabledef.php63
-rw-r--r--lib/util.php26
-rw-r--r--locale/Makefile11
-rw-r--r--locale/README9
-rw-r--r--locale/ar/LC_MESSAGES/statusnet.mobin36593 -> 0 bytes
-rw-r--r--locale/ar/LC_MESSAGES/statusnet.po1009
-rw-r--r--locale/bg/LC_MESSAGES/statusnet.mobin88688 -> 0 bytes
-rw-r--r--locale/bg/LC_MESSAGES/statusnet.po964
-rw-r--r--locale/ca/LC_MESSAGES/statusnet.mobin75686 -> 0 bytes
-rw-r--r--locale/ca/LC_MESSAGES/statusnet.po915
-rw-r--r--locale/cs/LC_MESSAGES/statusnet.mobin37974 -> 0 bytes
-rw-r--r--locale/cs/LC_MESSAGES/statusnet.po732
-rw-r--r--locale/de/LC_MESSAGES/statusnet.mobin75715 -> 0 bytes
-rw-r--r--locale/de/LC_MESSAGES/statusnet.po1077
-rw-r--r--locale/el/LC_MESSAGES/statusnet.mobin32801 -> 0 bytes
-rw-r--r--locale/el/LC_MESSAGES/statusnet.po719
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.mobin70745 -> 0 bytes
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.po1036
-rw-r--r--locale/es/LC_MESSAGES/statusnet.mobin74756 -> 0 bytes
-rw-r--r--locale/es/LC_MESSAGES/statusnet.po748
-rw-r--r--locale/fi/LC_MESSAGES/statusnet.mobin80746 -> 0 bytes
-rw-r--r--locale/fi/LC_MESSAGES/statusnet.po780
-rw-r--r--locale/fr/LC_MESSAGES/statusnet.mobin98865 -> 0 bytes
-rw-r--r--locale/fr/LC_MESSAGES/statusnet.po1132
-rw-r--r--locale/ga/LC_MESSAGES/statusnet.mobin78412 -> 0 bytes
-rw-r--r--locale/ga/LC_MESSAGES/statusnet.po752
-rw-r--r--locale/he/LC_MESSAGES/statusnet.mobin41479 -> 0 bytes
-rw-r--r--locale/he/LC_MESSAGES/statusnet.po730
-rw-r--r--locale/is/LC_MESSAGES/statusnet.mobin66563 -> 0 bytes
-rw-r--r--locale/is/LC_MESSAGES/statusnet.po744
-rw-r--r--locale/it/LC_MESSAGES/statusnet.mobin74607 -> 0 bytes
-rw-r--r--locale/it/LC_MESSAGES/statusnet.po744
-rw-r--r--locale/ja/LC_MESSAGES/statusnet.mobin51365 -> 0 bytes
-rw-r--r--locale/ja/LC_MESSAGES/statusnet.po763
-rw-r--r--locale/ko/LC_MESSAGES/statusnet.mobin79573 -> 0 bytes
-rw-r--r--locale/ko/LC_MESSAGES/statusnet.po743
-rw-r--r--locale/mk/LC_MESSAGES/statusnet.mobin48861 -> 0 bytes
-rw-r--r--locale/mk/LC_MESSAGES/statusnet.po729
-rw-r--r--locale/nb/LC_MESSAGES/statusnet.mobin25159 -> 0 bytes
-rw-r--r--locale/nb/LC_MESSAGES/statusnet.po724
-rw-r--r--locale/nl/LC_MESSAGES/statusnet.mobin104559 -> 0 bytes
-rw-r--r--locale/nl/LC_MESSAGES/statusnet.po1088
-rw-r--r--locale/nn/LC_MESSAGES/statusnet.mobin71756 -> 0 bytes
-rw-r--r--locale/nn/LC_MESSAGES/statusnet.po743
-rw-r--r--locale/pl/LC_MESSAGES/statusnet.mobin100184 -> 0 bytes
-rw-r--r--locale/pl/LC_MESSAGES/statusnet.po1752
-rw-r--r--locale/pt/LC_MESSAGES/statusnet.mobin27718 -> 0 bytes
-rw-r--r--locale/pt/LC_MESSAGES/statusnet.po2826
-rw-r--r--locale/pt_BR/LC_MESSAGES/statusnet.mobin50577 -> 0 bytes
-rw-r--r--locale/pt_BR/LC_MESSAGES/statusnet.po827
-rw-r--r--locale/ru/LC_MESSAGES/statusnet.mobin100725 -> 0 bytes
-rw-r--r--locale/ru/LC_MESSAGES/statusnet.po1822
-rw-r--r--locale/statusnet.po689
-rw-r--r--locale/sv/LC_MESSAGES/statusnet.mobin62253 -> 0 bytes
-rw-r--r--locale/sv/LC_MESSAGES/statusnet.po745
-rw-r--r--locale/te/LC_MESSAGES/statusnet.mobin59709 -> 0 bytes
-rw-r--r--locale/te/LC_MESSAGES/statusnet.po762
-rw-r--r--locale/tr/LC_MESSAGES/statusnet.mobin37480 -> 0 bytes
-rw-r--r--locale/tr/LC_MESSAGES/statusnet.po731
-rw-r--r--locale/uk/LC_MESSAGES/statusnet.mobin97470 -> 0 bytes
-rw-r--r--locale/uk/LC_MESSAGES/statusnet.po2372
-rw-r--r--locale/vi/LC_MESSAGES/statusnet.mobin71795 -> 0 bytes
-rw-r--r--locale/vi/LC_MESSAGES/statusnet.po748
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.mobin68386 -> 0 bytes
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.po744
-rw-r--r--locale/zh_TW/LC_MESSAGES/statusnet.mobin20853 -> 0 bytes
-rw-r--r--locale/zh_TW/LC_MESSAGES/statusnet.po726
-rw-r--r--plugins/Authentication/AuthenticationPlugin.php13
-rw-r--r--plugins/Authentication/User_username.php22
-rw-r--r--plugins/Facebook/FBCLoginGroupNav.php114
-rw-r--r--plugins/Facebook/FBCSettingsNav.php115
-rw-r--r--plugins/Facebook/FBConnectLogin.php6
-rw-r--r--plugins/Facebook/FacebookPlugin.php48
-rw-r--r--plugins/Facebook/facebooksettings.php18
-rw-r--r--plugins/FeedSub/FeedSubPlugin.php117
-rw-r--r--plugins/FeedSub/README24
-rw-r--r--plugins/FeedSub/actions/feedsubcallback.php100
-rw-r--r--plugins/FeedSub/actions/feedsubsettings.php257
-rw-r--r--plugins/FeedSub/extlib/README9
-rwxr-xr-xplugins/FeedSub/extlib/XML/Feed/Parser.php351
-rw-r--r--plugins/FeedSub/extlib/XML/Feed/Parser/Atom.php365
-rwxr-xr-xplugins/FeedSub/extlib/XML/Feed/Parser/AtomElement.php261
-rwxr-xr-xplugins/FeedSub/extlib/XML/Feed/Parser/Exception.php42
-rwxr-xr-xplugins/FeedSub/extlib/XML/Feed/Parser/RSS09.php214
-rwxr-xr-xplugins/FeedSub/extlib/XML/Feed/Parser/RSS09Element.php62
-rwxr-xr-xplugins/FeedSub/extlib/XML/Feed/Parser/RSS1.php277
-rwxr-xr-xplugins/FeedSub/extlib/XML/Feed/Parser/RSS11.php276
-rwxr-xr-xplugins/FeedSub/extlib/XML/Feed/Parser/RSS11Element.php151
-rwxr-xr-xplugins/FeedSub/extlib/XML/Feed/Parser/RSS1Element.php116
-rw-r--r--plugins/FeedSub/extlib/XML/Feed/Parser/RSS2.php335
-rwxr-xr-xplugins/FeedSub/extlib/XML/Feed/Parser/RSS2Element.php171
-rw-r--r--plugins/FeedSub/extlib/XML/Feed/Parser/Type.php467
-rwxr-xr-xplugins/FeedSub/extlib/XML/Feed/samples/atom10-entryonly.xml28
-rwxr-xr-xplugins/FeedSub/extlib/XML/Feed/samples/atom10-example1.xml20
-rwxr-xr-xplugins/FeedSub/extlib/XML/Feed/samples/atom10-example2.xml45
-rwxr-xr-xplugins/FeedSub/extlib/XML/Feed/samples/delicious.feed177
-rwxr-xr-xplugins/FeedSub/extlib/XML/Feed/samples/flickr.feed184
-rwxr-xr-xplugins/FeedSub/extlib/XML/Feed/samples/grwifi-atom.xml7
-rwxr-xr-xplugins/FeedSub/extlib/XML/Feed/samples/hoder.xml102
-rwxr-xr-xplugins/FeedSub/extlib/XML/Feed/samples/illformed_atom10.xml13
-rwxr-xr-xplugins/FeedSub/extlib/XML/Feed/samples/rss091-complete.xml47
-rwxr-xr-xplugins/FeedSub/extlib/XML/Feed/samples/rss091-international.xml30
-rwxr-xr-xplugins/FeedSub/extlib/XML/Feed/samples/rss091-simple.xml15
-rwxr-xr-xplugins/FeedSub/extlib/XML/Feed/samples/rss092-sample.xml103
-rwxr-xr-xplugins/FeedSub/extlib/XML/Feed/samples/rss10-example1.xml62
-rwxr-xr-xplugins/FeedSub/extlib/XML/Feed/samples/rss10-example2.xml67
-rwxr-xr-xplugins/FeedSub/extlib/XML/Feed/samples/rss2sample.xml42
-rwxr-xr-xplugins/FeedSub/extlib/XML/Feed/samples/sixapart-jp.xml226
-rwxr-xr-xplugins/FeedSub/extlib/XML/Feed/samples/technorati.feed54
-rwxr-xr-xplugins/FeedSub/extlib/XML/Feed/schemas/atom.rnc338
-rwxr-xr-xplugins/FeedSub/extlib/XML/Feed/schemas/rss10.rnc113
-rwxr-xr-xplugins/FeedSub/extlib/XML/Feed/schemas/rss11.rnc218
-rw-r--r--plugins/FeedSub/extlib/xml-feed-parser-bug-16416.patch14
-rw-r--r--plugins/FeedSub/feeddiscovery.php209
-rw-r--r--plugins/FeedSub/feedinfo.php212
-rw-r--r--plugins/FeedSub/feedinfo.sql14
-rw-r--r--plugins/FeedSub/feedmunger.php238
-rw-r--r--plugins/FeedSub/images/24px-Feed-icon.svg.pngbin0 -> 1204 bytes
-rw-r--r--plugins/FeedSub/images/48px-Feed-icon.svg.pngbin0 -> 2434 bytes
-rw-r--r--plugins/FeedSub/images/96px-Feed-icon.svg.pngbin0 -> 5440 bytes
-rw-r--r--plugins/FeedSub/images/README5
-rw-r--r--plugins/FeedSub/tests/FeedDiscoveryTest.php111
-rw-r--r--plugins/FeedSub/tests/FeedMungerTest.php147
-rw-r--r--plugins/Mapstraction/MapstractionPlugin.php10
-rw-r--r--plugins/OpenID/OpenIDPlugin.php20
-rw-r--r--plugins/OpenID/User_openid.php45
-rw-r--r--plugins/OpenID/User_openid_trustroot.php36
-rw-r--r--plugins/Realtime/RealtimePlugin.php4
-rw-r--r--plugins/TwitterBridge/twitter.php2
-rw-r--r--plugins/TwitterBridge/twitterbasicauthclient.php3
-rw-r--r--plugins/UserFlag/UserFlagPlugin.php11
-rw-r--r--plugins/UserFlag/User_flag_profile.php21
-rwxr-xr-xscripts/pluginqueuehandler.php6
-rw-r--r--theme/base/css/display.css1
150 files changed, 25033 insertions, 14282 deletions
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/noticesearchrss.php b/actions/noticesearchrss.php
index 18f07f855..a59e7b99b 100644
--- a/actions/noticesearchrss.php
+++ b/actions/noticesearchrss.php
@@ -53,6 +53,13 @@ class NoticesearchrssAction extends Rss10Action
{
return true;
}
+
+ function prepare($args)
+ {
+ parent::prepare($args);
+ $this->notices = $this->getNotices();
+ return true;
+ }
function getNotices($limit=0)
{
diff --git a/classes/Avatar.php b/classes/Avatar.php
index cc7a6b647..8d6424e8b 100644
--- a/classes/Avatar.php
+++ b/classes/Avatar.php
@@ -81,7 +81,7 @@ class Avatar extends Memcached_DataObject
if (empty($server)) {
$server = common_config('site', 'server');
}
- common_debug('path = ' . $path);
+
// XXX: protocol
return 'http://'.$server.$path.$filename;
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/Plugin_DataObject.php b/classes/Plugin_DataObject.php
deleted file mode 100644
index d5cecf0f7..000000000
--- a/classes/Plugin_DataObject.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-/*
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
-
-require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
-
-abstract class Plugin_DataObject extends Memcached_DataObject
-{
- function table() {
- static $table = null;
- if($table == null) {
- $table = array();
- $DB = $this->getDatabaseConnection();
- $dbtype = $DB->phptype;
- $tableDef = $this->tableDef();
- foreach($tableDef->columns as $columnDef){
- switch(strtoupper($columnDef->type)) {
- /*shamelessly copied from DB_DataObject_Generator*/
- case 'INT':
- case 'INT2': // postgres
- case 'INT4': // postgres
- case 'INT8': // postgres
- case 'SERIAL4': // postgres
- case 'SERIAL8': // postgres
- case 'INTEGER':
- case 'TINYINT':
- case 'SMALLINT':
- case 'MEDIUMINT':
- case 'BIGINT':
- $type = DB_DATAOBJECT_INT;
- if ($columnDef->size == 1) {
- $type += DB_DATAOBJECT_BOOL;
- }
- break;
-
- case 'REAL':
- case 'DOUBLE':
- case 'DOUBLE PRECISION': // double precision (firebird)
- case 'FLOAT':
- case 'FLOAT4': // real (postgres)
- case 'FLOAT8': // double precision (postgres)
- case 'DECIMAL':
- case 'MONEY': // mssql and maybe others
- case 'NUMERIC':
- case 'NUMBER': // oci8
- $type = DB_DATAOBJECT_INT; // should really by FLOAT!!! / MONEY...
- break;
-
- case 'YEAR':
- $type = DB_DATAOBJECT_INT;
- break;
-
- case 'BIT':
- case 'BOOL':
- case 'BOOLEAN':
-
- $type = DB_DATAOBJECT_BOOL;
- // postgres needs to quote '0'
- if ($dbtype == 'pgsql') {
- $type += DB_DATAOBJECT_STR;
- }
- break;
-
- case 'STRING':
- case 'CHAR':
- case 'VARCHAR':
- case 'VARCHAR2':
- case 'TINYTEXT':
-
- case 'ENUM':
- case 'SET': // not really but oh well
-
- case 'POINT': // mysql geometry stuff - not really string - but will do..
-
- case 'TIMESTAMPTZ': // postgres
- case 'BPCHAR': // postgres
- case 'INTERVAL': // postgres (eg. '12 days')
-
- case 'CIDR': // postgres IP net spec
- case 'INET': // postgres IP
- case 'MACADDR': // postgress network Mac address.
-
- case 'INTEGER[]': // postgres type
- case 'BOOLEAN[]': // postgres type
-
- $type = DB_DATAOBJECT_STR;
- break;
-
- case 'TEXT':
- case 'MEDIUMTEXT':
- case 'LONGTEXT':
-
- $type = DB_DATAOBJECT_STR + DB_DATAOBJECT_TXT;
- break;
-
-
- case 'DATE':
- $type = DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE;
- break;
-
- case 'TIME':
- $type = DB_DATAOBJECT_STR + DB_DATAOBJECT_TIME;
- break;
-
-
- case 'DATETIME':
-
- $type = DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME;
- break;
-
- case 'TIMESTAMP': // do other databases use this???
-
- $type = ($dbtype == 'mysql') ?
- DB_DATAOBJECT_MYSQLTIMESTAMP :
- DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME;
- break;
-
-
- case 'BLOB': /// these should really be ignored!!!???
- case 'TINYBLOB':
- case 'MEDIUMBLOB':
- case 'LONGBLOB':
-
- case 'CLOB': // oracle character lob support
-
- case 'BYTEA': // postgres blob support..
- $type = DB_DATAOBJECT_STR + DB_DATAOBJECT_BLOB;
- break;
-
- default:
- throw new Exception("Cannot handle datatype: $columnDef->type");
- }
- if(! $columnDef->nullable) {
- $type+=DB_DATAOBJECT_NOTNULL;
- }
- $table[$columnDef->name]=$type;
- }
- }
- return $table;
- }
-
- function keys() {
- static $keys = null;
- if($keys == null) {
- $keys = array();
- $tableDef = $this->tableDef();
- foreach($tableDef->columns as $columnDef){
- if($columnDef->key != null){
- $keys[] = $columnDef->name;
- }
- }
- }
- return $keys;
- }
-
- function sequenceKey() {
- static $sequenceKey = null;
- if($sequenceKey == null) {
- $sequenceKey = array(false,false);
- $tableDef = $this->tableDef();
- foreach($tableDef->columns as $columnDef){
- if($columnDef->key == 'PRI' && $columnDef->auto_increment){
- $sequenceKey=array($columnDef->name,true);
- }
- }
- }
- return $sequenceKey;
- }
-
- /**
- * Get the TableDef object that represents the table backing this class
- * Ideally, this function would a static function, but PHP doesn't allow
- * abstract static functions
- * @return TableDef TableDef instance
- */
- abstract function tableDef();
-}
-
diff --git a/classes/Remote_profile.php b/classes/Remote_profile.php
index 9f7bfeadc..0a1676a6a 100644
--- a/classes/Remote_profile.php
+++ b/classes/Remote_profile.php
@@ -43,4 +43,14 @@ class Remote_profile extends Memcached_DataObject
/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE
+
+ function hasRight($right)
+ {
+ $profile = Profile::staticGet($this->id);
+ if ($profile) {
+ return $profile->hasright($right);
+ } else {
+ throw new Exception("Missing profile");
+ }
+ }
}
diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index b2509dac5..f12707ba1 100644
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -1,4 +1,3 @@
-
[avatar]
profile_id = 129
original = 17
@@ -542,4 +541,25 @@ created = 142
modified = 384
[user_group__keys]
-id = N \ No newline at end of file
+id = N
+
+[user_openid]
+canonical = 130
+display = 130
+user_id = 129
+created = 142
+modified = 384
+
+[user_openid__keys]
+canonical = K
+display = U
+
+[user_openid_trustroot]
+trustroot = 130
+user_id = 129
+created = 142
+modified = 384
+
+[user_openid__keys]
+trustroot = K
+user_id = K \ No newline at end of file
diff --git a/classes/statusnet.links.ini b/classes/statusnet.links.ini
index 95c63f3c0..7f233e676 100644
--- a/classes/statusnet.links.ini
+++ b/classes/statusnet.links.ini
@@ -22,9 +22,6 @@ consumer_key = consumer:consumer_key
[nonce]
consumer_key,token = token:consumer_key,token
-[user_openid]
-user_id = user:id
-
[confirm_address]
user_id = user:id
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/lib/api.php b/lib/api.php
index e2ea87b43..539aac4af 100644
--- a/lib/api.php
+++ b/lib/api.php
@@ -1142,15 +1142,10 @@ class ApiAction extends Action
function getTargetUser($id)
{
- if (empty($id)) {
+ if (!preg_match('/^[a-zA-Z0-9]+$/', $id)) {
// Twitter supports these other ways of passing the user ID
- if (is_numeric($this->arg('id'))) {
- return User::staticGet($this->arg('id'));
- } else if ($this->arg('id')) {
- $nickname = common_canonical_nickname($this->arg('id'));
- return User::staticGet('nickname', $nickname);
- } else if ($this->arg('user_id')) {
+ if ($this->arg('user_id')) {
// This is to ensure that a non-numeric user_id still
// overrides screen_name even if it doesn't get used
if (is_numeric($this->arg('user_id'))) {
@@ -1159,6 +1154,12 @@ class ApiAction extends Action
} else if ($this->arg('screen_name')) {
$nickname = common_canonical_nickname($this->arg('screen_name'));
return User::staticGet('nickname', $nickname);
+
+ } else if (is_numeric($this->arg('id'))) {
+ return User::staticGet($this->arg('id'));
+ } else if ($this->arg('id')) {
+ $nickname = common_canonical_nickname($this->arg('id'));
+ return User::staticGet('nickname', $nickname);
} else {
// Fall back to trying the currently authenticated user
return $this->auth_user;
diff --git a/lib/columndef.php b/lib/columndef.php
new file mode 100644
index 000000000..1bae6b33b
--- /dev/null
+++ b/lib/columndef.php
@@ -0,0 +1,169 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Database schema utilities
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Database
+ * @package StatusNet
+ * @author Evan Prodromou <evan@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/
+ */
+
+if (!defined('STATUSNET')) {
+ exit(1);
+}
+
+/**
+ * A class encapsulating the structure of a column in a table.
+ *
+ * @category Database
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+class ColumnDef
+{
+ /** name of the column. */
+ public $name;
+ /** type of column, e.g. 'int', 'varchar' */
+ public $type;
+ /** size of the column. */
+ public $size;
+ /** boolean flag; can it be null? */
+ public $nullable;
+ /**
+ * type of key: null = no key; 'PRI' => primary;
+ * 'UNI' => unique key; 'MUL' => multiple values.
+ */
+ public $key;
+ /** default value if any. */
+ public $default;
+ /** 'extra' stuff. Returned by MySQL, largely
+ * unused. */
+ public $extra;
+ /** auto increment this field if no value is specific for it during an insert **/
+ public $auto_increment;
+
+ /**
+ * Constructor.
+ *
+ * @param string $name name of the column
+ * @param string $type type of the column
+ * @param int $size size of the column
+ * @param boolean $nullable can this be null?
+ * @param string $key type of key
+ * @param value $default default value
+ * @param value $extra unused
+ */
+
+ function __construct($name=null, $type=null, $size=null,
+ $nullable=true, $key=null, $default=null,
+ $extra=null, $auto_increment=false)
+ {
+ $this->name = strtolower($name);
+ $this->type = strtolower($type);
+ $this->size = $size+0;
+ $this->nullable = $nullable;
+ $this->key = $key;
+ $this->default = $default;
+ $this->extra = $extra;
+ $this->auto_increment = $auto_increment;
+ }
+
+ /**
+ * Compares this columndef with another to see
+ * if they're functionally equivalent.
+ *
+ * @param ColumnDef $other column to compare
+ *
+ * @return boolean true if equivalent, otherwise false.
+ */
+
+ function equals($other)
+ {
+ return ($this->name == $other->name &&
+ $this->_typeMatch($other) &&
+ $this->_defaultMatch($other) &&
+ $this->_nullMatch($other) &&
+ $this->key == $other->key &&
+ $this->auto_increment == $other->auto_increment);
+ }
+
+ /**
+ * Does the type of this column match the
+ * type of the other column?
+ *
+ * Checks the type and size of a column. Tries
+ * to ignore differences between synonymous
+ * data types, like 'integer' and 'int'.
+ *
+ * @param ColumnDef $other other column to check
+ *
+ * @return boolean true if they're about equivalent
+ */
+
+ private function _typeMatch($other)
+ {
+ switch ($this->type) {
+ case 'integer':
+ case 'int':
+ return ($other->type == 'integer' ||
+ $other->type == 'int');
+ break;
+ default:
+ return ($this->type == $other->type &&
+ $this->size == $other->size);
+ }
+ }
+
+ /**
+ * Does the default behaviour of this column match
+ * the other?
+ *
+ * @param ColumnDef $other other column to check
+ *
+ * @return boolean true if defaults are effectively the same.
+ */
+
+ private function _defaultMatch($other)
+ {
+ return ((is_null($this->default) && is_null($other->default)) ||
+ ($this->default == $other->default));
+ }
+
+ /**
+ * Does the null behaviour of this column match
+ * the other?
+ *
+ * @param ColumnDef $other other column to check
+ *
+ * @return boolean true if these columns 'null' the same.
+ */
+
+ private function _nullMatch($other)
+ {
+ return ((!is_null($this->default) && !is_null($other->default) &&
+ $this->default == $other->default) ||
+ ($this->nullable == $other->nullable));
+ }
+}
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index c2ec83c28..d267526c8 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -34,9 +34,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
require_once INSTALLDIR.'/lib/xmloutputter.php';
-define('PAGE_TYPE_PREFS',
- 'text/html,application/xhtml+xml,'.
- 'application/xml;q=0.3,text/xml;q=0.2');
+// Can include XHTML options but these are too fragile in practice.
+define('PAGE_TYPE_PREFS', 'text/html');
/**
* Low-level generator for HTML
diff --git a/lib/oauthclient.php b/lib/oauthclient.php
index 1a86e2460..b22fd7897 100644
--- a/lib/oauthclient.php
+++ b/lib/oauthclient.php
@@ -197,6 +197,7 @@ class OAuthClient
'timeout' => 120,
'follow_redirects' => true,
'ssl_verify_peer' => false,
+ 'ssl_verify_host' => false
));
// Twitter is strict about accepting invalid "Expect" headers
diff --git a/lib/oauthstore.php b/lib/oauthstore.php
index b04bcbb8b..e34bf8a5e 100644
--- a/lib/oauthstore.php
+++ b/lib/oauthstore.php
@@ -463,6 +463,7 @@ class StatusNetOAuthDataStore extends OAuthDataStore
$subscriber = $this->_getAnyProfile($subscriber_uri);
if (!$subscriber->hasRight(Right::SUBSCRIBE)) {
+ common_log(LOG_INFO, __METHOD__ . ": remote subscriber banned ($subscriber_uri subbing to $subscribed_user_uri)");
return _('You have been banned from subscribing.');
}
diff --git a/lib/omb.php b/lib/omb.php
index cd6d6e1b2..e2a6d9f3f 100644
--- a/lib/omb.php
+++ b/lib/omb.php
@@ -67,7 +67,14 @@ function omb_hmac_sha1()
function omb_broadcast_notice($notice)
{
- $omb_notice = notice_to_omb_notice($notice);
+ try {
+ $omb_notice = notice_to_omb_notice($notice);
+ } catch (Exception $e) {
+ // @fixme we should clean up or highlight the problem item
+ common_log(LOG_ERR, 'Invalid OMB outgoing notice for notice ' . $notice->id);
+ common_log(LOG_ERR, 'Error status '.$e);
+ return true;
+ }
/* Get remote users subscribed to this profile. */
$rp = new Remote_profile();
@@ -102,7 +109,7 @@ function omb_broadcast_notice($notice)
common_debug('Finished to ' . $rp->postnoticeurl, __FILE__);
}
- return;
+ return true;
}
function omb_broadcast_profile($profile)
diff --git a/lib/schema.php b/lib/schema.php
index 560884d9f..df7cb65f5 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -373,26 +373,6 @@ class Schema
}
/**
- * Ensures that the table that backs a given
- * Plugin_DataObject class exists.
- *
- * If the table does not yet exist, it will
- * create the table. If it does exist, it will
- * alter the table to match the column definitions.
- *
- * @param Plugin_DataObject $dataObjectClass
- *
- * @return boolean success flag
- */
-
- public function ensureDataObject($dataObjectClass)
- {
- $obj = new $dataObjectClass();
- $tableDef = $obj->tableDef();
- return $this->ensureTable($tableDef->name,$tableDef->columns);
- }
-
- /**
* Ensures that a table exists with the given
* name and the given column definitions.
*
@@ -547,171 +527,3 @@ class Schema
return $sql;
}
}
-
-/**
- * A class encapsulating the structure of a table.
- *
- * @category Database
- * @package StatusNet
- * @author Evan Prodromou <evan@status.net>
- * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link http://status.net/
- */
-
-class TableDef
-{
- /** name of the table */
- public $name;
- /** array of ColumnDef objects for the columns. */
- public $columns;
-
- /**
- * Constructor.
- *
- * @param string $name name of the table
- * @param array $columns columns in the table
- */
-
- function __construct($name=null,$columns=null)
- {
- $this->name = $name;
- $this->columns = $columns;
- }
-}
-
-/**
- * A class encapsulating the structure of a column in a table.
- *
- * @category Database
- * @package StatusNet
- * @author Evan Prodromou <evan@status.net>
- * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link http://status.net/
- */
-
-class ColumnDef
-{
- /** name of the column. */
- public $name;
- /** type of column, e.g. 'int', 'varchar' */
- public $type;
- /** size of the column. */
- public $size;
- /** boolean flag; can it be null? */
- public $nullable;
- /**
- * type of key: null = no key; 'PRI' => primary;
- * 'UNI' => unique key; 'MUL' => multiple values.
- */
- public $key;
- /** default value if any. */
- public $default;
- /** 'extra' stuff. Returned by MySQL, largely
- * unused. */
- public $extra;
- /** auto increment this field if no value is specific for it during an insert **/
- public $auto_increment;
-
- /**
- * Constructor.
- *
- * @param string $name name of the column
- * @param string $type type of the column
- * @param int $size size of the column
- * @param boolean $nullable can this be null?
- * @param string $key type of key
- * @param value $default default value
- * @param value $extra unused
- */
-
- function __construct($name=null, $type=null, $size=null,
- $nullable=true, $key=null, $default=null,
- $extra=null, $auto_increment=false)
- {
- $this->name = strtolower($name);
- $this->type = strtolower($type);
- $this->size = $size+0;
- $this->nullable = $nullable;
- $this->key = $key;
- $this->default = $default;
- $this->extra = $extra;
- $this->auto_increment = $auto_increment;
- }
-
- /**
- * Compares this columndef with another to see
- * if they're functionally equivalent.
- *
- * @param ColumnDef $other column to compare
- *
- * @return boolean true if equivalent, otherwise false.
- */
-
- function equals($other)
- {
- return ($this->name == $other->name &&
- $this->_typeMatch($other) &&
- $this->_defaultMatch($other) &&
- $this->_nullMatch($other) &&
- $this->key == $other->key &&
- $this->auto_increment == $other->auto_increment);
- }
-
- /**
- * Does the type of this column match the
- * type of the other column?
- *
- * Checks the type and size of a column. Tries
- * to ignore differences between synonymous
- * data types, like 'integer' and 'int'.
- *
- * @param ColumnDef $other other column to check
- *
- * @return boolean true if they're about equivalent
- */
-
- private function _typeMatch($other)
- {
- switch ($this->type) {
- case 'integer':
- case 'int':
- return ($other->type == 'integer' ||
- $other->type == 'int');
- break;
- default:
- return ($this->type == $other->type &&
- $this->size == $other->size);
- }
- }
-
- /**
- * Does the default behaviour of this column match
- * the other?
- *
- * @param ColumnDef $other other column to check
- *
- * @return boolean true if defaults are effectively the same.
- */
-
- private function _defaultMatch($other)
- {
- return ((is_null($this->default) && is_null($other->default)) ||
- ($this->default == $other->default));
- }
-
- /**
- * Does the null behaviour of this column match
- * the other?
- *
- * @param ColumnDef $other other column to check
- *
- * @return boolean true if these columns 'null' the same.
- */
-
- private function _nullMatch($other)
- {
- return ((!is_null($this->default) && !is_null($other->default) &&
- $this->default == $other->default) ||
- ($this->nullable == $other->nullable));
- }
-}
diff --git a/lib/tabledef.php b/lib/tabledef.php
new file mode 100644
index 000000000..3aace123b
--- /dev/null
+++ b/lib/tabledef.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Database schema utilities
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Database
+ * @package StatusNet
+ * @author Evan Prodromou <evan@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/
+ */
+
+if (!defined('STATUSNET')) {
+ exit(1);
+}
+
+/**
+ * A class encapsulating the structure of a table.
+ *
+ * @category Database
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+class TableDef
+{
+ /** name of the table */
+ public $name;
+ /** array of ColumnDef objects for the columns. */
+ public $columns;
+
+ /**
+ * Constructor.
+ *
+ * @param string $name name of the table
+ * @param array $columns columns in the table
+ */
+
+ function __construct($name=null,$columns=null)
+ {
+ $this->name = $name;
+ $this->columns = $columns;
+ }
+}
diff --git a/lib/util.php b/lib/util.php
index 5bf4f6091..99a0a1db3 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -58,18 +58,17 @@ function common_init_language()
// (say, ga_ES for Galego/Galician) it seems to take it.
common_init_locale("en_US");
+ // Note that this setlocale() call may "fail" but this is harmless;
+ // gettext will still select the right language.
$language = common_language();
$locale_set = common_init_locale($language);
+
setlocale(LC_CTYPE, 'C');
// So we do not have to make people install the gettext locales
$path = common_config('site','locale_path');
bindtextdomain("statusnet", $path);
bind_textdomain_codeset("statusnet", "UTF-8");
textdomain("statusnet");
-
- if(!$locale_set) {
- common_log(LOG_INFO, 'Language requested:' . $language . ' - locale could not be set. Perhaps that system locale is not installed.', __FILE__);
- }
}
function common_timezone()
@@ -1051,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..4f17f683f
--- /dev/null
+++ b/locale/Makefile
@@ -0,0 +1,11 @@
+# Warning: do not transform tabs to spaces in this file.
+
+all : translations
+
+translations : */LC_MESSAGES/statusnet.mo
+
+clean :
+ rm -f */LC_MESSAGES/statusnet.mo
+
+%.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 45861299a..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 5b4aa5770..ce25dcdb9 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -8,16 +8,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 10:43+0000\n"
-"PO-Revision-Date: 2009-11-18 19:31:23+0000\n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-11-28 19:49:49+0000\n"
"Language-Team: Arabic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ar\n"
"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
@@ -131,7 +132,7 @@ msgstr "لم يوجد رمز التأكيد."
#: 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 ""
@@ -186,7 +187,7 @@ msgstr "فشل منع المستخدم."
#: actions/apiblockdestroy.php:107
msgid "Unblock user failed."
-msgstr ""
+msgstr "فشل إلغاء منع المستخدم."
#: actions/apidirectmessagenew.php:126
msgid "No message text!"
@@ -359,9 +360,8 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
-#, fuzzy
msgid "Group not found!"
-msgstr "لم يوجد"
+msgstr "لم توجد المجموعة!"
#: actions/apigroupjoin.php:110
msgid "You are already a member of that group."
@@ -431,7 +431,7 @@ msgstr ""
msgid "Not found"
msgstr "لم يوجد"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -494,7 +494,7 @@ msgstr ""
#: actions/apiusershow.php:96
msgid "Not found."
-msgstr ""
+msgstr "لم يوجد."
#: actions/attachment.php:73
msgid "No such attachment."
@@ -544,7 +544,7 @@ msgid "Preview"
msgstr "عاين"
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
+#: lib/noticelist.php:550
msgid "Delete"
msgstr "احذف"
@@ -557,7 +557,7 @@ msgid "Crop"
msgstr ""
#: actions/avatarsettings.php:265 actions/disfavor.php:74
-#: actions/emailsettings.php:237 actions/favor.php:75
+#: 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
@@ -572,7 +572,7 @@ msgid "There was a problem with your session token. Try again, please."
msgstr ""
#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
-#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: 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."
@@ -592,7 +592,7 @@ msgstr "رُفع الأفتار."
#: actions/avatarsettings.php:363
msgid "Failed updating avatar."
-msgstr ""
+msgstr "فشل تحديث الأفتار."
#: actions/avatarsettings.php:387
msgid "Avatar deleted."
@@ -628,7 +628,7 @@ msgstr ""
#: actions/blockedfromgroup.php:281
msgid "Unblock user from group"
-msgstr ""
+msgstr "ألغ منع المستخدم من المجموعة"
#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
@@ -639,9 +639,8 @@ msgid "Unblock this user"
msgstr "ألغِ منع هذا المستخدم"
#: actions/block.php:69
-#, fuzzy
msgid "You already blocked that user."
-msgstr "لا تمنع هذا المستخدم"
+msgstr "لقد منعت مسبقا هذا المستخدم."
#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
msgid "Block user"
@@ -674,7 +673,7 @@ msgstr "امنع هذا المستخدم"
#: actions/block.php:162
msgid "Failed to save block information."
-msgstr ""
+msgstr "فشل حفظ معلومات المنع."
#: actions/bookmarklet.php:50
msgid "Post to "
@@ -701,15 +700,15 @@ msgstr ""
msgid "That address has already been confirmed."
msgstr ""
-#: actions/confirmaddress.php:114 actions/emailsettings.php:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
#: actions/profilesettings.php:276 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "تعذّر تحديث المستخدم."
-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
msgstr "تعذّر حذف تأكيد البريد الإلكتروني."
@@ -728,7 +727,7 @@ msgid "Conversation"
msgstr "محادثة"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206
+#: lib/profileaction.php:206 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "الإشعارات"
@@ -767,7 +766,7 @@ msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟"
msgid "Do not delete this notice"
msgstr "لا تحذف هذا الإشعار"
-#: actions/deletenotice.php:146 lib/noticelist.php:522
+#: actions/deletenotice.php:146 lib/noticelist.php:550
msgid "Delete this notice"
msgstr "احذف هذا الإشعار"
@@ -776,19 +775,16 @@ 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 ""
@@ -797,9 +793,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
@@ -810,181 +805,110 @@ msgstr "التصميم"
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:278
-#, fuzzy
+#: actions/designadminpanel.php:270
msgid "Invalid logo URL."
-msgstr "حجم غير صالح."
-
-#: actions/designadminpanel.php:282
-#, fuzzy, php-format
-msgid "Theme not available: %s"
-msgstr "المراسلة الفورية غير متوفرة."
+msgstr "مسار شعار غير صالح."
-#: actions/designadminpanel.php:288
-#, fuzzy, php-format
-msgid "Theme directory not readable: %s"
-msgstr "المراسلة الفورية غير متوفرة."
-
-#: actions/designadminpanel.php:292
-#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:296
-#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:312
+#: actions/designadminpanel.php:274
#, php-format
-msgid "Max length for %s %s is 255 characters."
-msgstr ""
+msgid "Theme not available: %s"
+msgstr "السمة غير متوفرة: %s"
-#: actions/designadminpanel.php:412
-#, fuzzy
+#: actions/designadminpanel.php:370
msgid "Change logo"
-msgstr "غيّر الألوان"
+msgstr "غيّر الشعار"
-#: actions/designadminpanel.php:417
-#, fuzzy
+#: actions/designadminpanel.php:375
msgid "Site logo"
-msgstr "ادعُ"
+msgstr "شعار الموقع"
-#: actions/designadminpanel.php:424
-#, fuzzy
+#: actions/designadminpanel.php:382
msgid "Change theme"
-msgstr "غيّر"
+msgstr "غيّر السمة"
-#: actions/designadminpanel.php:441
-#, fuzzy
+#: actions/designadminpanel.php:399
msgid "Site theme"
-msgstr "إشعار الموقع"
+msgstr "سمة الموقع"
-#: actions/designadminpanel.php:442
+#: actions/designadminpanel.php:400
msgid "Theme for the site."
-msgstr ""
+msgstr "سمة الموقع."
-#: actions/designadminpanel.php:447
-msgid "Theme server"
-msgstr ""
-
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
-
-#: actions/designadminpanel.php:455
-msgid "Theme directory"
-msgstr ""
-
-#: actions/designadminpanel.php:462
-#, fuzzy
-msgid "Avatar Settings"
-msgstr "إعدادات الأفتار"
-
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Avatar server"
-msgstr "إعدادات الأفتار"
-
-#: actions/designadminpanel.php:471
-#, fuzzy
-msgid "Avatar path"
-msgstr "رُفع الأفتار."
-
-#: actions/designadminpanel.php:475
-#, fuzzy
-msgid "Avatar directory"
-msgstr "حُذف الأفتار."
-
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
msgstr "غيّر صورة الخلفية"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
msgstr "الخلفية"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:422
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr ""
-#: actions/designadminpanel.php:526 lib/designsettings.php:139
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
msgstr "مكّن"
-#: actions/designadminpanel.php:542 lib/designsettings.php:155
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
msgstr "عطّل"
-#: actions/designadminpanel.php:543 lib/designsettings.php:156
+#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "مكّن صورة الخلفية أو عطّلها."
-#: actions/designadminpanel.php:548 lib/designsettings.php:161
+#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:554
-#, fuzzy
-msgid "Background server"
-msgstr "الخلفية"
-
-#: actions/designadminpanel.php:558
-#, fuzzy
-msgid "Background path"
-msgstr "الخلفية"
-
-#: actions/designadminpanel.php:562
-#, fuzzy
-msgid "Background directory"
-msgstr "الخلفية"
-
-#: actions/designadminpanel.php:569 lib/designsettings.php:170
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
msgid "Change colours"
msgstr "غيّر الألوان"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
msgid "Content"
msgstr "المحتوى"
-#: actions/designadminpanel.php:604 lib/designsettings.php:204
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
msgid "Sidebar"
msgstr "الشريط الجانبي"
-#: actions/designadminpanel.php:617 lib/designsettings.php:217
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
msgstr "النص"
-#: actions/designadminpanel.php:630 lib/designsettings.php:230
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
msgid "Links"
msgstr "وصلات"
-#: actions/designadminpanel.php:658 lib/designsettings.php:247
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
msgstr "استخدم المبدئيات"
-#: actions/designadminpanel.php:659 lib/designsettings.php:248
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "استعد التصميمات المبدئية"
-#: actions/designadminpanel.php:665 lib/designsettings.php:254
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "ارجع إلى المبدئي"
-#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 actions/useradminpanel.php:226
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/pathsadminpanel.php:296 actions/profilesettings.php:167
+#: actions/siteadminpanel.php:421 actions/smssettings.php:181
+#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/useradminpanel.php:313 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "أرسل"
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: actions/designadminpanel.php:582 lib/designsettings.php:257
msgid "Save design"
msgstr "احفظ التصميم"
@@ -1007,7 +931,7 @@ msgstr "عدّل مجموعة %s"
#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
msgid "You must be logged in to create a group."
-msgstr ""
+msgstr "يجب أن تكون والجًا لتنشئ مجموعة."
#: actions/editgroup.php:103 actions/editgroup.php:168
#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
@@ -1042,7 +966,7 @@ msgstr "إعدادات البريد الإلكتروني"
#: actions/emailsettings.php:71
#, php-format
msgid "Manage how you get email from %%site.name%%."
-msgstr ""
+msgstr "أدر كيف تستلم البريد الإلكتروني من %%site.name%%."
#: actions/emailsettings.php:100 actions/imsettings.php:100
#: actions/smssettings.php:104
@@ -1051,7 +975,7 @@ msgstr "العنوان"
#: actions/emailsettings.php:105
msgid "Current confirmed email address."
-msgstr ""
+msgstr "عنوان البريد الإلكتروني المُؤكد الحالي."
#: actions/emailsettings.php:107 actions/emailsettings.php:140
#: actions/imsettings.php:108 actions/smssettings.php:115
@@ -1093,7 +1017,7 @@ msgstr "أرسل بريدًا إلكترونيًا إلى هذا العنوان
#: actions/emailsettings.php:145 actions/smssettings.php:162
msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
+msgstr "أنشئ عنوان بريد إلكتروني لترسل إليه؛ ألغِ القديم."
#: actions/emailsettings.php:148 actions/smssettings.php:164
msgid "New"
@@ -1106,11 +1030,11 @@ msgstr "التفضيلات"
#: actions/emailsettings.php:158
msgid "Send me notices of new subscriptions through email."
-msgstr ""
+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."
@@ -1118,7 +1042,7 @@ msgstr ""
#: actions/emailsettings.php:174
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."
@@ -1132,83 +1056,83 @@ msgstr "أريد أن أرسل الملاحظات عبر البريد الإلك
msgid "Publish a MicroID for my email address."
msgstr ""
-#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/emailsettings.php:302 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
msgstr "حُفِظت التفضيلات."
-#: actions/emailsettings.php:319
+#: actions/emailsettings.php:320
msgid "No email address."
msgstr "لا عنوان بريد إلكتروني."
-#: actions/emailsettings.php:326
+#: actions/emailsettings.php:327
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "ليس عنوان بريد صالح"
-#: actions/emailsettings.php:333
+#: actions/emailsettings.php:334
msgid "That is already your email address."
-msgstr ""
+msgstr "هذا هو عنوان بريدك الإكتروني سابقًا."
-#: actions/emailsettings.php:336
+#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
-msgstr ""
+msgstr "هذا البريد الإلكتروني ملك مستخدم آخر بالفعل."
-#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
-msgstr ""
+msgstr "تعذّر إدراج رمز التأكيد."
-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
msgstr ""
-#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
msgstr ""
-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
msgstr "هذا عنوان محادثة فورية خاطئ."
-#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
msgstr "أُلغي التأكيد."
-#: actions/emailsettings.php:412
+#: actions/emailsettings.php:413
msgid "That is not your email address."
msgstr "هذا ليس عنوان بريدك الإلكتروني."
-#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
msgstr "أزيل هذا العنوان."
-#: actions/emailsettings.php:445 actions/smssettings.php:518
+#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
msgstr ""
-#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
msgid "Couldn't update user record."
msgstr ""
-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
msgstr ""
-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555
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 ""
@@ -1243,7 +1167,7 @@ msgstr ""
#: lib/personalgroupnav.php:115
#, php-format
msgid "%s's favorite notices"
-msgstr ""
+msgstr "إشعارات %s المُفضلة"
#: actions/favoritesrss.php:115
#, php-format
@@ -1252,7 +1176,7 @@ msgstr ""
#: actions/favor.php:79
msgid "This notice is already a favorite!"
-msgstr ""
+msgstr "هذا الإشعار مفضلة مسبقًا!"
#: actions/favor.php:92 lib/disfavorform.php:140
msgid "Disfavor favorite"
@@ -1266,12 +1190,12 @@ msgstr "مستخدمون مختارون"
#: actions/featured.php:71
#, php-format
msgid "Featured users, page %d"
-msgstr ""
+msgstr "مستخدمون مختارون، صفحة %d"
#: actions/featured.php:99
#, php-format
msgid "A selection of some of the great users on %s"
-msgstr ""
+msgstr "قسم للمستخدمين المتميزين على %s"
#: actions/file.php:34
msgid "No notice id"
@@ -1378,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"
@@ -1457,7 +1381,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr "قائمة بمستخدمي هذه المجموعة."
-#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
msgid "Admin"
msgstr "إداري"
@@ -1513,7 +1437,7 @@ msgid ""
msgstr ""
#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/subgroupnav.php:98
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "مجموعات"
@@ -1542,7 +1466,7 @@ msgstr ""
#: actions/groupunblock.php:95
msgid "User is not blocked from group."
-msgstr ""
+msgstr "المستخدم ليس ممنوعًا من المجموعة."
#: actions/groupunblock.php:128 actions/unblock.php:77
msgid "Error removing the block."
@@ -1713,7 +1637,7 @@ msgstr "رسالة شخصية"
msgid "Optionally add a personal message to the invitation."
msgstr ""
-#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
msgstr "أرسل"
@@ -1806,11 +1730,10 @@ msgid "Incorrect username or password."
msgstr "اسم المستخدم أو كلمة السر غير صحيحان."
#: actions/login.php:149
-#, fuzzy
msgid "Error setting user. You are probably not authorized."
-msgstr "لا تملك تصريحًا."
+msgstr "خطأ أثناء ضبط المستخدم. لست مُصرحًا على الأرجح."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:457
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "لُج"
@@ -1901,7 +1824,7 @@ msgstr "لا محتوى!"
#: actions/newmessage.php:158
msgid "No recipient specified."
-msgstr ""
+msgstr "لا مستلم حُدّد."
#: actions/newmessage.php:164 lib/command.php:370
msgid ""
@@ -1917,7 +1840,7 @@ msgstr "أُرسلت الرسالة"
msgid "Direct message to %s sent"
msgstr ""
-#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
msgid "Ajax Error"
msgstr "خطأ أجاكس"
@@ -1925,9 +1848,9 @@ msgstr "خطأ أجاكس"
msgid "New notice"
msgstr "إشعار جديد"
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
msgid "Notice posted"
-msgstr ""
+msgstr "أُرسل الإشعار"
#: actions/noticesearch.php:68
#, php-format
@@ -1943,7 +1866,7 @@ msgstr "بحث في النصوص"
#: actions/noticesearch.php:91
#, php-format
msgid "Search results for \"%s\" on %s"
-msgstr ""
+msgstr "نتائج البحث عن \"%s\" في %s"
#: actions/noticesearch.php:121
#, php-format
@@ -1959,12 +1882,12 @@ msgid ""
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
-#: actions/noticesearchrss.php:89
+#: actions/noticesearchrss.php:96
#, php-format
msgid "Updates with \"%s\""
msgstr ""
-#: actions/noticesearchrss.php:91
+#: actions/noticesearchrss.php:98
#, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
msgstr ""
@@ -2002,7 +1925,7 @@ 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 "ليس نسق بيانات مدعوم."
#: actions/opensearch.php:64
msgid "People Search"
@@ -2018,7 +1941,7 @@ msgstr "إعدادات أخرى"
#: actions/othersettings.php:71
msgid "Manage various other options."
-msgstr ""
+msgstr "أدر خيارات أخرى عديدة."
#: actions/othersettings.php:108
msgid " (free service)"
@@ -2038,7 +1961,7 @@ 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)."
@@ -2087,8 +2010,8 @@ msgstr ""
msgid "Confirm"
msgstr "أكّد"
-#: actions/passwordsettings.php:113
-msgid "same as password above"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
msgstr "نفس كلمة السر أعلاه"
#: actions/passwordsettings.php:117
@@ -2097,7 +2020,7 @@ msgstr "غيّر"
#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
-msgstr ""
+msgstr "يجب أن تكون كلمة السر 6 حروف أو أكثر."
#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
@@ -2119,6 +2042,107 @@ msgstr "تعذّر حفظ كلمة السر الجديدة."
msgid "Password saved."
msgstr "حُفظت كلمة السر."
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr "المسارات"
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr ""
+
+#: actions/pathsadminpanel.php:140
+#, php-format
+msgid "Theme directory not readable: %s"
+msgstr "لا يمكن قراءة دليل السمات: %s"
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr "لا يمكن الكتابة في دليل الأفتارات: %s"
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr "لا يمكن الكتابة في دليل الخلفيات: %s"
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr "لا يمكن قراءة دليل المحليات: %s"
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+msgid "Site"
+msgstr "الموقع"
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr "المسار"
+
+#: actions/pathsadminpanel.php:216
+msgid "Site path"
+msgstr "مسار الموقع"
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr "مسار المحليات"
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr "مسار دليل المحليات"
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr "السمة"
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr "خادوم السمات"
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr "مسار السمات"
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr "دليل السمات"
+
+#: actions/pathsadminpanel.php:247
+msgid "Avatars"
+msgstr "أفتارات"
+
+#: actions/pathsadminpanel.php:252
+msgid "Avatar server"
+msgstr "خادوم الأفتارات"
+
+#: actions/pathsadminpanel.php:256
+msgid "Avatar path"
+msgstr "مسار الأفتارات"
+
+#: actions/pathsadminpanel.php:260
+msgid "Avatar directory"
+msgstr "دليل الأفتار."
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr "خلفيات"
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr "خادوم الخلفيات"
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr "مسار الخلفيات"
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr "دليل الخلفيات"
+
+#: actions/pathsadminpanel.php:297
+msgid "Save paths"
+msgstr "احفظ المسارات"
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -2133,7 +2157,7 @@ msgstr "بحث في الأشخاص"
#: actions/peopletag.php:70
#, php-format
msgid "Not a valid people tag: %s"
-msgstr ""
+msgstr "ليس وسم أشخاص صالح: %s"
#: actions/peopletag.php:144
#, php-format
@@ -2216,7 +2240,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr "اللغة"
@@ -2348,7 +2372,7 @@ msgstr "سحابة الوسوم العمومية"
#: actions/publictagcloud.php:63
#, php-format
msgid "These are most popular recent tags on %s "
-msgstr ""
+msgstr "هذه هي أكثر الوسوم شهرة على %s "
#: actions/publictagcloud.php:69
#, php-format
@@ -2444,10 +2468,6 @@ msgstr "إجراء غير معروف"
msgid "6 or more characters, and don't forget it!"
msgstr ""
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "نفس كلمة السر أعلاه"
-
#: actions/recoverpassword.php:243
msgid "Reset"
msgstr "أعد الضبط"
@@ -2506,7 +2526,7 @@ msgstr "عذرا، رمز دعوة غير صالح."
msgid "Registration successful"
msgstr "نجح التسجيل"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "سجّل"
@@ -2529,7 +2549,7 @@ msgstr "عنوان البريد الإلكتروني موجود مسبقًا."
#: actions/register.php:243 actions/register.php:264
msgid "Invalid username or password."
-msgstr ""
+msgstr "اسم مستخدم أو كلمة سر غير صالحة."
#: actions/register.php:342
msgid ""
@@ -2543,14 +2563,14 @@ msgstr ""
#: actions/register.php:429
msgid "6 or more characters. Required."
-msgstr ""
+msgstr "6 حروف أو أكثر. مطلوب."
#: actions/register.php:433
msgid "Same as password above. Required."
-msgstr ""
+msgstr "نفس كلمة السر أعلاه. مطلوب."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "البريد الإلكتروني"
@@ -2564,7 +2584,7 @@ msgstr ""
#: actions/register.php:493
msgid "My text and files are available under "
-msgstr ""
+msgstr "نصوصي وملفاتي متاحة تحت رخصة "
#: actions/register.php:495
msgid "Creative Commons Attribution 3.0"
@@ -2634,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 "اشترك"
@@ -2751,6 +2771,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
@@ -2759,6 +2781,8 @@ 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."
@@ -2955,34 +2979,28 @@ msgstr ""
#: actions/silence.php:65 actions/unsilence.php:65
msgid "You cannot silence users on this site."
-msgstr ""
+msgstr "لا يمكنك إسكات المستخدمين على هذا الموقع."
#: actions/silence.php:72
msgid "User is already silenced."
-msgstr ""
-
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
-#, fuzzy
-msgid "Site"
-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."
@@ -2997,102 +3015,93 @@ msgid "Snapshot frequency must be a number."
msgstr ""
#: actions/siteadminpanel.php:199
-msgid "You must set an SSL sever when enabling SSL."
+msgid "You must set an SSL server when enabling SSL."
msgstr ""
#: actions/siteadminpanel.php:204
-msgid "Invalid SSL server. Max length is 255 characters."
+msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
#: actions/siteadminpanel.php:210
-msgid "Minimum text limit is 140c."
-msgstr ""
+msgid "Minimum text limit is 140 characters."
+msgstr "حد النص الأدنى هو 140 حرفًا."
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:224
-#, php-format
-msgid "Locales directory not readable: %s"
-msgstr ""
+#: actions/siteadminpanel.php:266
+msgid "General"
+msgstr "عام"
-#: actions/siteadminpanel.php:275
-#, fuzzy
+#: actions/siteadminpanel.php:269
msgid "Site name"
-msgstr "إشعار الموقع"
+msgstr "اسم الموقع"
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
-msgstr ""
+msgstr "اسم موقعك، \"التدوين المصغر لشركتك\" مثلا"
-#: actions/siteadminpanel.php:279
+#: actions/siteadminpanel.php:274
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:280
+#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:283
+#: actions/siteadminpanel.php:279
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:284
+msgid "Contact email address for your site"
+msgstr "عنوان البريد الإلكتروني للاتصال بموقعك"
+
+#: actions/siteadminpanel.php:290
#, fuzzy
-msgid "contact email address for your site"
-msgstr "عنوان بريد إلكتروني غير صالح: %s"
+msgid "Local"
+msgstr "الموقع"
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:301
msgid "Default timezone"
-msgstr ""
+msgstr "المنطقة الزمنية المبدئية"
-#: actions/siteadminpanel.php:303
+#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
-msgstr ""
+msgstr "المنطقة الزمنية المبدئية للموقع؛ ت‌ع‌م عادة."
-#: actions/siteadminpanel.php:310
-#, fuzzy
+#: actions/siteadminpanel.php:308
msgid "Default site language"
-msgstr "اللغة المفضلة"
+msgstr "لغة الموقع المبدئية"
#: actions/siteadminpanel.php:316
-msgid "Path to locales"
-msgstr ""
+msgid "URLs"
+msgstr "مسارات"
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
-msgstr ""
-
-#: actions/siteadminpanel.php:320
-#, fuzzy
+#: actions/siteadminpanel.php:319
msgid "Server"
-msgstr "استرجع"
+msgstr "خادوم"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-#, fuzzy
-msgid "Site path"
-msgstr "إشعار الموقع"
+msgstr "اسم مضيف خادوم الموقع."
-#: actions/siteadminpanel.php:328
+#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
-msgstr ""
+msgstr "مسارات فاخرة"
-#: actions/siteadminpanel.php:330
+#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
+msgstr "أأستخدم مسارات فاخرة (يمكن قراءتها وتذكرها بسهولة أكبر)؟"
+
+#: actions/siteadminpanel.php:331
+msgid "Access"
+msgstr "نفاذ"
#: actions/siteadminpanel.php:334
#, fuzzy
@@ -3112,111 +3121,118 @@ msgstr "ادعُ"
msgid "Make registration invitation only."
msgstr ""
-#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
-#, fuzzy
+#: actions/siteadminpanel.php:346
msgid "Closed"
-msgstr "ممنوع"
+msgstr "مُغلق"
#: actions/siteadminpanel.php:348
msgid "Disable new registrations."
+msgstr "عطّل التسجيل الجديد."
+
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
-msgstr ""
+msgstr "في مهمة مُجدولة"
-#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
-#, fuzzy
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
msgid "Never"
-msgstr "استرجع"
+msgstr "مطلقا"
-#: actions/siteadminpanel.php:357
+#: actions/siteadminpanel.php:360
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:358
+#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:364
+#: actions/siteadminpanel.php:366
msgid "Frequency"
-msgstr ""
+msgstr "التكرار"
-#: actions/siteadminpanel.php:365
-msgid "Snapshots will be sent once every N Web hits"
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
msgstr ""
#: actions/siteadminpanel.php:372
msgid "Report URL"
-msgstr ""
+msgstr "بلّغ عن المسار"
#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:381
-#, fuzzy
+#: actions/siteadminpanel.php:380
+msgid "SSL"
+msgstr "SSL"
+
+#: actions/siteadminpanel.php:384
msgid "Sometimes"
-msgstr "الإشعارات"
+msgstr "أحيانًا"
-#: actions/siteadminpanel.php:382
-#, fuzzy
+#: actions/siteadminpanel.php:385
msgid "Always"
-msgstr "الكنى"
+msgstr "دائمًا"
-#: actions/siteadminpanel.php:384
+#: actions/siteadminpanel.php:387
msgid "Use SSL"
-msgstr ""
+msgstr "استخدم SSL"
-#: actions/siteadminpanel.php:385
+#: actions/siteadminpanel.php:388
msgid "When to use SSL"
msgstr ""
-#: actions/siteadminpanel.php:391
+#: actions/siteadminpanel.php:393
msgid "SSL Server"
-msgstr ""
+msgstr "خادوم SSL"
-#: actions/siteadminpanel.php:392
+#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr "الحدود"
+
+#: actions/siteadminpanel.php:403
msgid "Text limit"
-msgstr ""
+msgstr "حد النص"
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
-msgstr ""
+msgstr "أقصى عدد للحروف في الإشعارات."
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
-#, fuzzy
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
msgid "Save site settings"
-msgstr "إعدادات الأفتار"
+msgstr "اذف إعدادت الموقع"
#: actions/smssettings.php:58
msgid "SMS Settings"
-msgstr ""
+msgstr "إعدادات الرسائل القصيرة"
#: actions/smssettings.php:69
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
+msgstr "لا يمكنك استلام رسائل قصيرة عبر البريد الإلكرتوني من %%site.name%%."
#: actions/smssettings.php:91
msgid "SMS is not available."
-msgstr ""
+msgstr "الرسائل القصيرة غير متوفرة."
#: actions/smssettings.php:112
msgid "Current confirmed SMS-enabled phone number."
@@ -3325,7 +3341,7 @@ 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
@@ -3390,7 +3406,7 @@ msgstr "جابر"
#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
msgid "SMS"
-msgstr ""
+msgstr "رسائل قصيرة"
#: actions/tagother.php:33
msgid "Not logged in"
@@ -3430,7 +3446,7 @@ 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."
@@ -3465,9 +3481,8 @@ msgid "API method under construction."
msgstr ""
#: actions/unblock.php:59
-#, fuzzy
msgid "You haven't blocked that user."
-msgstr "لا تمنع هذا المستخدم"
+msgstr "لم تمنع هذا المستخدم."
#: actions/unsandbox.php:72
#, fuzzy
@@ -3475,9 +3490,8 @@ msgid "User is not sandboxed."
msgstr "ليس للمستخدم إشعار أخير"
#: actions/unsilence.php:72
-#, fuzzy
msgid "User is not silenced."
-msgstr "ليس للمستخدم ملف شخصي."
+msgstr "المستخدم ليس مُسكتًا."
#: actions/unsubscribe.php:77
msgid "No profile id in request."
@@ -3496,7 +3510,8 @@ msgstr ""
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
-#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
msgid "User"
msgstr "المستخدم"
@@ -3504,19 +3519,84 @@ msgstr "المستخدم"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:178
-#, fuzzy
-msgid "Invite-only"
-msgstr "ادعُ"
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
+msgstr "رسالة ترحيب غير صالحة. أقصى طول هو 255 حرف."
+
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr ""
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "الملف الشخصي"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr "حد السيرة"
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
+msgstr ""
+
+#: actions/useradminpanel.php:231
+msgid "New users"
+msgstr "مستخدمون جدد"
+
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr "ترحيب المستخدمين الجدد"
+
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr "نص الترحيب بالمستخدمين الجدد (255 حرفًا كحد أقصى)."
+
+#: actions/useradminpanel.php:241
+msgid "Default subscription"
+msgstr "الاشتراك المبدئي"
+
+#: actions/useradminpanel.php:242
+msgid "Automatically subscribe new users to this user."
+msgstr "أشرك المستخدمين الجدد بهذا المستخدم تلقائيًا."
+
+#: actions/useradminpanel.php:251
+msgid "Invitations"
+msgstr "الدعوات"
+
+#: actions/useradminpanel.php:256
+msgid "Invitations enabled"
+msgstr "الدعوات مُفعلة"
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr ""
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr "الجلسات"
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr ""
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
msgstr ""
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr "تنقيح الجلسة"
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
+msgstr "مكّن تنقيح مُخرجات الجلسة."
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr ""
@@ -3631,7 +3711,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"
@@ -3665,9 +3745,8 @@ msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
#: classes/Message.php:45
-#, fuzzy
msgid "You are banned from sending direct messages."
-msgstr "رسائلك الواردة"
+msgstr "أنت ممنوع من إرسال رسائل مباشرة."
#: classes/Message.php:61
msgid "Could not insert message."
@@ -3684,11 +3763,11 @@ msgstr ""
#: classes/Notice.php:179
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 ""
@@ -3709,14 +3788,14 @@ msgstr ""
msgid "Problem saving notice."
msgstr "مشكلة أثناء حفظ الإشعار."
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
#: classes/User_group.php:380
msgid "Could not create group."
-msgstr ""
+msgstr "تعذّر إنشاء المجموعة."
#: classes/User_group.php:409
msgid "Could not set group membership."
@@ -3727,17 +3806,13 @@ msgstr "تعذّر ضبط عضوية المجموعة."
msgid "Welcome to %1$s, @%2$s!"
msgstr "أهلا بكم في %1$s يا @%2$s!"
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr "الملف الشخصي"
-
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "غيّر إعدادات ملفك الشخصي"
#: lib/accountsettingsaction.php:112
msgid "Upload an avatar"
-msgstr ""
+msgstr "ارفع أفتارًا"
#: lib/accountsettingsaction.php:116
msgid "Change your password"
@@ -3768,140 +3843,142 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "صفحة غير مُعنونة"
-#: lib/action.php:424
+#: lib/action.php:425
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Home"
msgstr "الرئيسية"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Personal profile and friends timeline"
msgstr "الملف الشخصي ومسار الأصدقاء الزمني"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Account"
msgstr "الحساب"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect"
msgstr "اتصل"
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect to services"
msgstr ""
-#: lib/action.php:439
+#: lib/action.php:440
msgid "Change site configuration"
-msgstr ""
+msgstr "غيّر ضبط الموقع"
-#: lib/action.php:443 lib/subgroupnav.php:105
+#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
msgstr "ادعُ"
-#: lib/action.php:444 lib/subgroupnav.php:106
+#: lib/action.php:445 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout"
msgstr "اخرج"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout from the site"
-msgstr ""
+msgstr "اخرج من الموقع"
-#: lib/action.php:454
+#: lib/action.php:455
msgid "Create an account"
msgstr "أنشئ حسابًا"
-#: lib/action.php:457
+#: lib/action.php:458
msgid "Login to the site"
-msgstr ""
+msgstr "لُج إلى الموقع"
-#: lib/action.php:460 lib/action.php:723
+#: lib/action.php:461 lib/action.php:724
msgid "Help"
msgstr "مساعدة"
-#: lib/action.php:460
+#: lib/action.php:461
msgid "Help me!"
msgstr "ساعدني!"
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
msgstr "ابحث"
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
-msgstr ""
+msgstr "ابحث عن أشخاص أو نص"
-#: lib/action.php:484
+#: lib/action.php:485
msgid "Site notice"
msgstr "إشعار الموقع"
-#: lib/action.php:550
+#: lib/action.php:551
msgid "Local views"
-msgstr ""
+msgstr "المشاهدات المحلية"
-#: lib/action.php:616
+#: lib/action.php:617
msgid "Page notice"
msgstr "إشعار الصفحة"
-#: lib/action.php:718
+#: lib/action.php:719
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:725
+#: lib/action.php:726
msgid "About"
msgstr "عن"
-#: lib/action.php:727
+#: lib/action.php:728
msgid "FAQ"
msgstr "الأسئلة المكررة"
-#: lib/action.php:731
+#: lib/action.php:732
msgid "TOS"
msgstr "الشروط"
-#: lib/action.php:734
+#: lib/action.php:735
msgid "Privacy"
msgstr "خصوصية"
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
msgstr "المصدر"
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Contact"
msgstr "اتصل"
-#: lib/action.php:740
+#: lib/action.php:741
msgid "Badge"
msgstr ""
-#: lib/action.php:768
+#: lib/action.php:769
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:771
+#: lib/action.php:772
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
msgstr ""
+"**%%site.name%%** خدمة تدوين مصغر يقدمها لك [%%site.broughtby%%](%%site."
+"broughtbyurl%%). "
-#: lib/action.php:773
+#: lib/action.php:774
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
-#: lib/action.php:775
+#: lib/action.php:776
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3912,31 +3989,31 @@ msgstr ""
"المتوفر تحت [رخصة غنو أفيرو العمومية](http://www.fsf.org/licensing/licenses/"
"agpl-3.0.html)."
-#: lib/action.php:789
+#: lib/action.php:790
msgid "Site content license"
msgstr "رخصة محتوى الموقع"
-#: lib/action.php:798
+#: lib/action.php:799
msgid "All "
msgstr ""
-#: lib/action.php:803
+#: lib/action.php:804
msgid "license."
msgstr "الرخصة."
-#: lib/action.php:1067
+#: lib/action.php:1068
msgid "Pagination"
msgstr ""
-#: lib/action.php:1076
+#: lib/action.php:1077
msgid "After"
msgstr "بعد"
-#: lib/action.php:1084
+#: lib/action.php:1085
msgid "Before"
msgstr "قبل"
-#: lib/action.php:1132
+#: lib/action.php:1133
msgid "There was a problem with your session token."
msgstr ""
@@ -3954,17 +4031,19 @@ msgstr ""
#: lib/adminpanelaction.php:247
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
+msgid "Paths configuration"
+msgstr "ضبط المسارات"
#: lib/attachmentlist.php:87
msgid "Attachments"
@@ -4140,33 +4219,42 @@ msgid "You are not subscribed to anyone."
msgstr "لست مُشتركًا بأي أحد."
#: lib/command.php:620
-#, fuzzy
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
-msgstr[0] "أنت مشترك بهؤلاء الأِشخاص: "
-msgstr[1] "أنت مشترك بهؤلاء الأِشخاص: "
+msgstr[0] "لست مشتركًا بأحد."
+msgstr[1] "أنت مشترك بهذا الشخص:"
+msgstr[2] "أنت مشترك بهذين الشخصين:"
+msgstr[3] "أنت مشترك بهؤلاء الأشخاص:"
+msgstr[4] ""
+msgstr[5] ""
#: lib/command.php:640
msgid "No one is subscribed to you."
msgstr "لا أحد مشترك بك."
#: lib/command.php:642
-#, fuzzy
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "لا أحد مشترك بك."
-msgstr[1] "لا أحد مشترك بك."
+msgstr[1] "هذا الشخص مشترك بك:"
+msgstr[2] "هذان الشخصان مشتركان بك:"
+msgstr[3] "هؤلاء الأشخاص مشتركون بك:"
+msgstr[4] ""
+msgstr[5] ""
#: lib/command.php:662
msgid "You are not a member of any groups."
msgstr "لست عضوًا في أي مجموعة."
#: lib/command.php:664
-#, fuzzy
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
-msgstr[0] "أنت عضو في هذه المجموعات: "
-msgstr[1] "أنت عضو في هذه المجموعات: "
+msgstr[0] "لست عضوًا في أي مجموعة."
+msgstr[1] "أنت عضو في هذه المجموعة:"
+msgstr[2] "أنت عضو في هذين المجموعتين:"
+msgstr[3] "أنت عضو في هذه المجموعات:"
+msgstr[4] ""
+msgstr[5] ""
#: lib/command.php:678
msgid ""
@@ -4244,9 +4332,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: "
@@ -4270,7 +4359,7 @@ msgstr "فضّل"
#: lib/feedlist.php:64
msgid "Export data"
-msgstr "صدّر البيانات"
+msgstr "تصدير البيانات"
#: lib/feed.php:85
msgid "RSS 1.0"
@@ -4339,7 +4428,7 @@ msgstr ""
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
-#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85
msgid "Group"
msgstr "مجموعات"
@@ -4384,14 +4473,14 @@ msgstr "المجموعات الأكثر مرسلات"
msgid "Tags in %s group's notices"
msgstr ""
-#: lib/htmloutputter.php:104
+#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
msgstr ""
#: lib/imagefile.php:75
#, php-format
msgid "That file is too big. The maximum file size is %s."
-msgstr ""
+msgstr "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %s."
#: lib/imagefile.php:80
msgid "Partial upload."
@@ -4417,6 +4506,14 @@ msgstr ""
msgid "Unknown file type"
msgstr "نوع ملف غير معروف"
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
@@ -4448,7 +4545,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:424
+#: lib/mailbox.php:227 lib/noticelist.php:452
msgid "from"
msgstr "من"
@@ -4652,7 +4749,7 @@ msgstr ""
#: lib/mediafile.php:162
msgid "Failed to write file to disk."
-msgstr ""
+msgstr "فشل في كتابة الملف إلى القرص."
#: lib/mediafile.php:165
msgid "File upload stopped by extension."
@@ -4688,36 +4785,61 @@ msgstr "أرسل إشعارًا مباشرًا"
msgid "To"
msgstr "إلى"
-#: lib/messageform.php:162 lib/noticeform.php:173
+#: lib/messageform.php:162 lib/noticeform.php:186
msgid "Available characters"
msgstr "المحارف المتوفرة"
-#: lib/noticeform.php:145
+#: lib/noticeform.php:158
msgid "Send a notice"
msgstr "أرسل إشعارًا"
-#: lib/noticeform.php:158
+#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
msgstr "ما الأخبار يا %s؟"
-#: lib/noticeform.php:180
+#: lib/noticeform.php:193
msgid "Attach"
msgstr "أرفق"
-#: lib/noticeform.php:184
+#: lib/noticeform.php:197
msgid "Attach a file"
msgstr "أرفق ملفًا"
-#: lib/noticelist.php:478
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "N"
+msgstr "ش"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr "ج"
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr "ر"
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr "غ"
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr "في"
+
+#: lib/noticelist.php:506
msgid "in context"
msgstr "في السياق"
-#: lib/noticelist.php:498
+#: lib/noticelist.php:526
msgid "Reply to this notice"
msgstr "رُد على هذا الإشعار"
-#: lib/noticelist.php:499
+#: lib/noticelist.php:527
msgid "Reply"
msgstr "رُد"
@@ -4739,7 +4861,7 @@ msgstr "خطأ أثناء إدراج الملف الشخصي الجديد"
#: lib/oauthstore.php:291
msgid "Error inserting avatar"
-msgstr ""
+msgstr "خطأ في إدراج الأفتار"
#: lib/oauthstore.php:311
msgid "Error inserting remote profile"
@@ -4749,11 +4871,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 "تعذّر إدراج اشتراك جديد."
@@ -4848,9 +4970,8 @@ msgid "Popular"
msgstr ""
#: lib/sandboxform.php:67
-#, fuzzy
msgid "Sandbox"
-msgstr "صندوق الوارد"
+msgstr ""
#: lib/sandboxform.php:78
#, fuzzy
@@ -4861,6 +4982,10 @@ msgstr "ألغِ منع هذا المستخدم"
msgid "Search site"
msgstr "ابحث في الموقع"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr "الكلمات المفتاحية"
+
#: lib/searchaction.php:162
msgid "Search help"
msgstr "ابحث في المساعدة"
@@ -4873,17 +4998,13 @@ msgstr "أشخاص"
msgid "Find people on this site"
msgstr "ابحث عن أشخاص على هذا الموقع"
-#: lib/searchgroupnav.php:82
-msgid "Notice"
-msgstr "إشعارات"
-
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
-msgstr ""
+msgstr "ابحث عن محتويات في الإشعارات"
#: lib/searchgroupnav.php:85
msgid "Find groups on this site"
-msgstr ""
+msgstr "ابحث عن مجموعات على هذا الموقع"
#: lib/section.php:89
msgid "Untitled section"
@@ -4894,14 +5015,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
@@ -4976,12 +5095,11 @@ 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"
@@ -5015,47 +5133,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 "قبل سنة تقريبًا"
@@ -5075,7 +5197,7 @@ msgstr "تعذّر تحليل الرسالة."
#: scripts/maildaemon.php:53
msgid "Not a registered user."
-msgstr ""
+msgstr "ليس مستخدمًا مسجلًا."
#: scripts/maildaemon.php:57
msgid "Sorry, that is not your incoming email address."
@@ -5084,10 +5206,3 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
-
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "ألغِ منع هذا المستخدم"
-
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "هؤلاء الأشخاص مشتركون بك: "
diff --git a/locale/bg/LC_MESSAGES/statusnet.mo b/locale/bg/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index b86a8042e..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 70937c64a..f4a52d114 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -1,5 +1,6 @@
# Translation of StatusNet to Bulgarian
#
+# Author@translatewiki.net: Turin
# --
# This file is distributed under the same license as the StatusNet package.
#
@@ -7,22 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 10:43+0000\n"
-"PO-Revision-Date: 2009-11-18 19:31:26+0000\n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-11-28 19:49:52+0000\n"
"Language-Team: Bulgarian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: bg\n"
"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
-#, fuzzy
msgid "No such page"
-msgstr "Няма такъв етикет."
+msgstr "Няма такака страница."
#: actions/all.php:74 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
@@ -61,19 +61,19 @@ msgid "%s and friends"
msgstr "%s и приятели"
#: actions/all.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
-msgstr "Емисия с приятелите на %s"
+msgstr "Емисия с приятелите на %s (RSS 1.0)"
#: actions/all.php:107
-#, fuzzy, php-format
+#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
-msgstr "Емисия с приятелите на %s"
+msgstr "Емисия с приятелите на %s (RSS 2.0)"
#: actions/all.php:115
-#, fuzzy, php-format
+#, php-format
msgid "Feed for friends of %s (Atom)"
-msgstr "Емисия с приятелите на %s"
+msgstr "Емисия с приятелите на %s (Atom)"
#: actions/all.php:127
#, php-format
@@ -103,9 +103,8 @@ msgid ""
msgstr ""
#: actions/all.php:165
-#, fuzzy
msgid "You and friends"
-msgstr "%s и приятели"
+msgstr "Вие и приятелите"
#: actions/allrss.php:119 actions/apitimelinefriends.php:121
#, php-format
@@ -117,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."
@@ -141,7 +139,6 @@ msgid ""
msgstr ""
#: actions/apiaccountupdatedeliverydevice.php:132
-#, fuzzy
msgid "Could not update user."
msgstr "Грешка при обновяване на потребителя."
@@ -180,7 +177,6 @@ msgid "User has no profile."
msgstr "Потребителят няма профил."
#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
msgid "Could not save profile."
msgstr "Грешка при запазване на профила."
@@ -197,9 +193,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."
@@ -212,9 +208,9 @@ 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,7 +250,6 @@ msgid "No status found with that ID."
msgstr "Не е открита бележка с такъв идентификатор."
#: actions/apifavoritecreate.php:119
-#, fuzzy
msgid "This status is already a favorite!"
msgstr "Тази бележка вече е отбелязана като любима!"
@@ -263,7 +258,6 @@ msgid "Could not create favorite."
msgstr "Грешка при отбелязване като любима."
#: actions/apifavoritedestroy.php:122
-#, fuzzy
msgid "That status is not a favorite!"
msgstr "Тази бележка не е отбелязана като любима!"
@@ -336,9 +330,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
@@ -354,9 +348,9 @@ msgstr ""
#: 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
@@ -372,12 +366,10 @@ 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 "Вече членувате в тази група."
@@ -391,7 +383,6 @@ msgid "Could not join user %s to group %s."
msgstr "Грешка при проследяване — потребителят не е намерен."
#: actions/apigroupleave.php:114
-#, fuzzy
msgid "You are not a member of this group."
msgstr "Не членувате в тази група."
@@ -411,7 +402,7 @@ msgid "groups on %s"
msgstr "Търсене на групи в сайта"
#: actions/apigrouplist.php:95
-#, fuzzy, php-format
+#, php-format
msgid "%s's groups"
msgstr "Групи на %s"
@@ -429,9 +420,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."
@@ -447,15 +437,14 @@ msgstr "Твърде дълга бележка. Трябва да е най-мн
msgid "Not found"
msgstr "Не е открито."
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
-#, fuzzy
msgid "Unsupported format."
-msgstr "Форматът на файла с изображението не се поддържа."
+msgstr "Неподдържан формат."
#: actions/apitimelinefavorites.php:107
#, php-format
@@ -562,7 +551,7 @@ msgid "Preview"
msgstr "Преглед"
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
+#: lib/noticelist.php:550
msgid "Delete"
msgstr "Изтриване"
@@ -575,7 +564,7 @@ msgid "Crop"
msgstr "Изрязване"
#: actions/avatarsettings.php:265 actions/disfavor.php:74
-#: actions/emailsettings.php:237 actions/favor.php:75
+#: 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
@@ -590,7 +579,7 @@ msgid "There was a problem with your session token. Try again, please."
msgstr "Имаше проблем със сесията ви в сайта. Моля, опитайте отново!"
#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
-#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: 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."
@@ -613,9 +602,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
@@ -724,15 +712,15 @@ msgstr "Неразпознат вид адрес %s"
msgid "That address has already been confirmed."
msgstr "Този адрес е вече потвърден."
-#: actions/confirmaddress.php:114 actions/emailsettings.php:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
#: actions/profilesettings.php:276 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Грешка при обновяване на потребителя."
-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
msgstr "Грешка при изтриване потвърждението по е-поща."
@@ -747,12 +735,11 @@ msgid "The address \"%s\" has been confirmed for your account."
msgstr "Адресът \"%s\" е потвърден за сметката ви."
#: actions/conversation.php:99
-#, fuzzy
msgid "Conversation"
-msgstr "Код за потвърждение"
+msgstr "Разговор"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206
+#: lib/profileaction.php:206 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Бележки"
@@ -789,11 +776,10 @@ msgid "Are you sure you want to delete this notice?"
msgstr "Наистина ли искате да изтриете тази бележка?"
#: actions/deletenotice.php:145
-#, fuzzy
msgid "Do not delete this notice"
-msgstr "Грешка при изтриване на бележката."
+msgstr "Да не се изтрива бележката"
-#: actions/deletenotice.php:146 lib/noticelist.php:522
+#: actions/deletenotice.php:146 lib/noticelist.php:550
msgid "Delete this notice"
msgstr "Изтриване на бележката"
@@ -803,19 +789,16 @@ 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 ""
@@ -824,9 +807,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
@@ -837,183 +819,116 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:278
+#: actions/designadminpanel.php:270
#, fuzzy
msgid "Invalid logo URL."
msgstr "Неправилен размер."
-#: actions/designadminpanel.php:282
+#: actions/designadminpanel.php:274
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Страницата не е достъпна във вида медия, който приемате"
-#: actions/designadminpanel.php:288
-#, fuzzy, php-format
-msgid "Theme directory not readable: %s"
-msgstr "Страницата не е достъпна във вида медия, който приемате"
-
-#: actions/designadminpanel.php:292
-#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:296
-#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:312
-#, php-format
-msgid "Max length for %s %s is 255 characters."
-msgstr ""
-
-#: actions/designadminpanel.php:412
-#, fuzzy
+#: actions/designadminpanel.php:370
msgid "Change logo"
-msgstr "Смяна на паролата"
+msgstr "Смяна на логото"
-#: actions/designadminpanel.php:417
+#: actions/designadminpanel.php:375
#, fuzzy
msgid "Site logo"
msgstr "Покани"
-#: actions/designadminpanel.php:424
+#: actions/designadminpanel.php:382
#, fuzzy
msgid "Change theme"
msgstr "Промяна"
-#: actions/designadminpanel.php:441
+#: actions/designadminpanel.php:399
#, fuzzy
msgid "Site theme"
msgstr "Нова бележка"
-#: actions/designadminpanel.php:442
+#: actions/designadminpanel.php:400
#, fuzzy
msgid "Theme for the site."
msgstr "Излизане от сайта"
-#: actions/designadminpanel.php:447
-msgid "Theme server"
-msgstr ""
-
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
-
-#: actions/designadminpanel.php:455
-msgid "Theme directory"
-msgstr ""
-
-#: actions/designadminpanel.php:462
-#, fuzzy
-msgid "Avatar Settings"
-msgstr "Настройки за аватар"
-
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Avatar server"
-msgstr "Настройки за аватар"
-
-#: actions/designadminpanel.php:471
-#, fuzzy
-msgid "Avatar path"
-msgstr "Аватарът е обновен."
-
-#: actions/designadminpanel.php:475
-#, fuzzy
-msgid "Avatar directory"
-msgstr "Аватарът е обновен."
-
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
-msgstr ""
+msgstr "Смяна на изображението за фон"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
-msgstr ""
+msgstr "Фон"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:422
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "Може да качите лого за групата ви."
-#: actions/designadminpanel.php:526 lib/designsettings.php:139
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
-msgstr ""
+msgstr "Вкл."
-#: actions/designadminpanel.php:542 lib/designsettings.php:155
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
-msgstr ""
+msgstr "Изкл."
-#: actions/designadminpanel.php:543 lib/designsettings.php:156
+#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:548 lib/designsettings.php:161
+#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:554
-msgid "Background server"
-msgstr ""
-
-#: actions/designadminpanel.php:558
-msgid "Background path"
-msgstr ""
-
-#: actions/designadminpanel.php:562
-msgid "Background directory"
-msgstr ""
-
-#: actions/designadminpanel.php:569 lib/designsettings.php:170
-#, fuzzy
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
msgid "Change colours"
-msgstr "Смяна на паролата"
+msgstr "Смяна на цветовете"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
-#, fuzzy
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
msgid "Content"
-msgstr "Свързване"
+msgstr "Съдържание"
-#: actions/designadminpanel.php:604 lib/designsettings.php:204
-#, fuzzy
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
msgid "Sidebar"
-msgstr "Търсене"
+msgstr "Страничен панел"
-#: actions/designadminpanel.php:617 lib/designsettings.php:217
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
msgstr "Текст"
-#: actions/designadminpanel.php:630 lib/designsettings.php:230
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Списък"
-#: actions/designadminpanel.php:658 lib/designsettings.php:247
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:659 lib/designsettings.php:248
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:665 lib/designsettings.php:254
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 actions/useradminpanel.php:226
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/pathsadminpanel.php:296 actions/profilesettings.php:167
+#: actions/siteadminpanel.php:421 actions/smssettings.php:181
+#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/useradminpanel.php:313 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Запазване"
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: actions/designadminpanel.php:582 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1165,37 +1080,37 @@ msgstr "Искам да изпращам бележки по пощата."
msgid "Publish a MicroID for my email address."
msgstr "Публикуване на MicroID за адреса на е-пощата."
-#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/emailsettings.php:302 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
msgstr "Настройките са запазени."
-#: actions/emailsettings.php:319
+#: actions/emailsettings.php:320
msgid "No email address."
msgstr "Не е въведена е-поща."
-#: actions/emailsettings.php:326
+#: actions/emailsettings.php:327
msgid "Cannot normalize that email address"
msgstr "Грешка при нормализиране адреса на е-пощата"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "Това не е правилен адрес на е-поща."
-#: actions/emailsettings.php:333
+#: actions/emailsettings.php:334
msgid "That is already your email address."
msgstr "Това и сега е адресът на е-пощата ви."
-#: actions/emailsettings.php:336
+#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
msgstr "Тази е-поща вече се използва от друг потребител."
-#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Не може да се вмъкне код за потвърждение."
-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1204,47 +1119,47 @@ msgstr ""
"Проверете кутията (или папката за спам) за кода и указанията за използването "
"му."
-#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
msgstr "Няма потвърждения, очакващи да бъдат отказани."
-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
msgstr "Грешен IM адрес."
-#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
msgstr "Потвърждаването е прекъснато."
-#: actions/emailsettings.php:412
+#: actions/emailsettings.php:413
msgid "That is not your email address."
msgstr "Това не е вашият адрес на е-поща."
-#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
msgstr "Адресът е премахнат."
-#: actions/emailsettings.php:445 actions/smssettings.php:518
+#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
msgstr "Няма входящ адрес на е-поща."
-#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
msgid "Couldn't update user record."
msgstr "Грешка при обновяване записа на потребител."
-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
msgstr "Входящият адрес на е-поща е премахнат."
-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555
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 "Популярни бележки"
@@ -1371,9 +1286,8 @@ msgid "No such group."
msgstr "Няма такава група"
#: actions/getfile.php:75
-#, fuzzy
msgid "No such file."
-msgstr "Няма такава бележка."
+msgstr "Няма такъв файл."
#: actions/getfile.php:79
#, fuzzy
@@ -1394,9 +1308,8 @@ msgstr "Не е открит профил с такъв идентификато
#: 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."
@@ -1444,9 +1357,8 @@ 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
@@ -1514,9 +1426,9 @@ msgstr ""
msgid "A list of the users in this group."
msgstr "Списък с потребителите в тази група."
-#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
+#: 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"
@@ -1555,9 +1467,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
@@ -1574,7 +1485,7 @@ msgid ""
msgstr ""
#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/subgroupnav.php:98
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Групи"
@@ -1720,7 +1631,7 @@ msgstr "Това е входящата ви кутия с лични съобщ
#: actions/invite.php:39
msgid "Invites have been disabled."
-msgstr ""
+msgstr "Поканите са изключени."
#: actions/invite.php:41
#, php-format
@@ -1789,7 +1700,7 @@ msgstr "Лично съобщение"
msgid "Optionally add a personal message to the invitation."
msgstr "Може да добавите и лично съобщение към поканата."
-#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
msgstr "Прати"
@@ -1894,7 +1805,7 @@ 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."
@@ -1914,7 +1825,7 @@ msgstr "Грешно име или парола."
msgid "Error setting user. You are probably not authorized."
msgstr "Забранено."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:457
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Вход"
@@ -2019,16 +1930,15 @@ msgstr ""
"тихичко."
#: actions/newmessage.php:181
-#, fuzzy
msgid "Message sent"
-msgstr "Съобщение"
+msgstr "Съобщението е изпратено"
#: actions/newmessage.php:185 lib/command.php:375
#, php-format
msgid "Direct message to %s sent"
msgstr "Прякото съобщение до %s е изпратено."
-#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
msgid "Ajax Error"
msgstr "Грешка в Ajax"
@@ -2036,10 +1946,9 @@ msgstr "Грешка в Ajax"
msgid "New notice"
msgstr "Нова бележка"
-#: actions/newnotice.php:199
-#, fuzzy
+#: actions/newnotice.php:206
msgid "Notice posted"
-msgstr "Бележки"
+msgstr "Бележката е публикувана"
#: actions/noticesearch.php:68
#, php-format
@@ -2073,12 +1982,12 @@ msgid ""
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
-#: actions/noticesearchrss.php:89
+#: actions/noticesearchrss.php:96
#, fuzzy, php-format
msgid "Updates with \"%s\""
msgstr "Бележки от %1$s в %2$s."
-#: actions/noticesearchrss.php:91
+#: actions/noticesearchrss.php:98
#, fuzzy, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
msgstr "Всички бележки, намерени с \"%s\""
@@ -2204,9 +2113,9 @@ msgstr "6 или повече знака"
msgid "Confirm"
msgstr "Потвърждаване"
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "също като паролата по-горе"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Също като паролата по-горе"
#: actions/passwordsettings.php:117
msgid "Change"
@@ -2236,6 +2145,113 @@ msgstr "Грешка при запазване на новата парола."
msgid "Password saved."
msgstr "Паролата е записана."
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr ""
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr ""
+
+#: actions/pathsadminpanel.php:140
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Страницата не е достъпна във вида медия, който приемате"
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+#, fuzzy
+msgid "Site"
+msgstr "Покани"
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+#, fuzzy
+msgid "Site path"
+msgstr "Нова бележка"
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr ""
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:247
+msgid "Avatars"
+msgstr "Аватари"
+
+#: actions/pathsadminpanel.php:252
+#, fuzzy
+msgid "Avatar server"
+msgstr "Настройки за аватар"
+
+#: actions/pathsadminpanel.php:256
+#, fuzzy
+msgid "Avatar path"
+msgstr "Аватарът е обновен."
+
+#: actions/pathsadminpanel.php:260
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Аватарът е обновен."
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:297
+#, fuzzy
+msgid "Save paths"
+msgstr "Нова бележка"
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -2301,14 +2317,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"
@@ -2336,7 +2351,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr "Език"
@@ -2360,9 +2375,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."
@@ -2412,19 +2427,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
@@ -2530,11 +2542,11 @@ 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."
@@ -2564,10 +2576,6 @@ msgstr "Непознато действие"
msgid "6 or more characters, and don't forget it!"
msgstr "6 или повече знака. И не ги забравяйте!"
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Също като паролата по-горе"
-
#: actions/recoverpassword.php:243
msgid "Reset"
msgstr "Обновяване"
@@ -2629,7 +2637,7 @@ msgstr "Грешка в кода за потвърждение."
msgid "Registration successful"
msgstr "Записването е успешно."
-#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Регистриране"
@@ -2675,7 +2683,7 @@ msgid "Same as password above. Required."
msgstr "Същото като паролата по-горе. Задължително поле."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Е-поща"
@@ -2781,7 +2789,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 "Абониране"
@@ -2936,9 +2944,8 @@ msgstr ""
#: actions/showgroup.php:274 actions/tagother.php:128
#: actions/userauthorization.php:179 lib/userprofile.php:194
-#, fuzzy
msgid "Note"
-msgstr "Бележки"
+msgstr "Бележка"
#: actions/showgroup.php:284 lib/groupeditform.php:184
msgid "Aliases"
@@ -3012,7 +3019,7 @@ msgstr ""
#: actions/showgroup.php:482
msgid "Admins"
-msgstr ""
+msgstr "Администратори"
#: actions/showmessage.php:81
msgid "No such message."
@@ -3033,9 +3040,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
@@ -3113,14 +3119,8 @@ msgid "You cannot silence users on this site."
msgstr "Не може да изпращате съобщения до този потребител."
#: actions/silence.php:72
-#, fuzzy
msgid "User is already silenced."
-msgstr "Потребителят ви е блокирал."
-
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
-#, fuzzy
-msgid "Site"
-msgstr "Покани"
+msgstr "Потребителят вече е заглушен."
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
@@ -3153,157 +3153,151 @@ msgid "Snapshot frequency must be a number."
msgstr ""
#: actions/siteadminpanel.php:199
-msgid "You must set an SSL sever when enabling SSL."
+msgid "You must set an SSL server when enabling SSL."
msgstr ""
#: actions/siteadminpanel.php:204
-msgid "Invalid SSL server. Max length is 255 characters."
+msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
#: actions/siteadminpanel.php:210
-msgid "Minimum text limit is 140c."
+msgid "Minimum text limit is 140 characters."
msgstr ""
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:224
-#, php-format
-msgid "Locales directory not readable: %s"
+#: actions/siteadminpanel.php:266
+msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:275
+#: actions/siteadminpanel.php:269
#, fuzzy
msgid "Site name"
msgstr "Нова бележка"
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:279
+#: actions/siteadminpanel.php:274
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:280
+#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:283
+#: actions/siteadminpanel.php:279
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:284
#, fuzzy
-msgid "contact email address for your site"
+msgid "Contact email address for your site"
msgstr "Нов адрес на е-поща за публикщуване в %s"
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:290
+#, fuzzy
+msgid "Local"
+msgstr "Местоположение"
+
+#: actions/siteadminpanel.php:301
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:303
+#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:308
#, fuzzy
msgid "Default site language"
msgstr "Предпочитан език"
#: actions/siteadminpanel.php:316
-msgid "Path to locales"
+msgid "URLs"
msgstr ""
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
-msgstr ""
-
-#: actions/siteadminpanel.php:320
-#, fuzzy
+#: actions/siteadminpanel.php:319
msgid "Server"
-msgstr "Възстановяване"
+msgstr "Сървър"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
msgstr ""
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-#, fuzzy
-msgid "Site path"
-msgstr "Нова бележка"
-
-#: actions/siteadminpanel.php:328
+#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
msgstr ""
-#: actions/siteadminpanel.php:330
+#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
+#: actions/siteadminpanel.php:331
+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 actions/useradminpanel.php:171
-#, fuzzy
+#: actions/siteadminpanel.php:346
msgid "Closed"
-msgstr "Блокиране"
+msgstr "Затворен"
#: actions/siteadminpanel.php:348
msgid "Disable new registrations."
+msgstr "Изключване на новите регистрации."
+
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
-#, fuzzy
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
msgid "Never"
-msgstr "Възстановяване"
+msgstr "Никога"
-#: actions/siteadminpanel.php:357
+#: actions/siteadminpanel.php:360
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:358
+#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:364
+#: actions/siteadminpanel.php:366
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:365
-msgid "Snapshots will be sent once every N Web hits"
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
msgstr ""
#: actions/siteadminpanel.php:372
@@ -3314,48 +3308,55 @@ msgstr ""
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:381
-#, fuzzy
+#: actions/siteadminpanel.php:380
+msgid "SSL"
+msgstr "SSL"
+
+#: actions/siteadminpanel.php:384
msgid "Sometimes"
-msgstr "Бележки"
+msgstr "Понякога"
-#: actions/siteadminpanel.php:382
+#: actions/siteadminpanel.php:385
msgid "Always"
-msgstr ""
+msgstr "Винаги"
-#: actions/siteadminpanel.php:384
+#: actions/siteadminpanel.php:387
msgid "Use SSL"
-msgstr ""
+msgstr "Използване на SSL"
-#: actions/siteadminpanel.php:385
+#: actions/siteadminpanel.php:388
msgid "When to use SSL"
-msgstr ""
+msgstr "Кога да се използва SSL"
-#: actions/siteadminpanel.php:391
+#: actions/siteadminpanel.php:393
msgid "SSL Server"
-msgstr ""
+msgstr "SSL-сървър"
-#: actions/siteadminpanel.php:392
+#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr "Ограничения"
+
+#: actions/siteadminpanel.php:403
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
#, fuzzy
msgid "Save site settings"
msgstr "Настройки за аватар"
@@ -3481,9 +3482,9 @@ msgid "Subscribed"
msgstr "Абониране"
#: actions/subscribers.php:50
-#, fuzzy, php-format
+#, php-format
msgid "%s subscribers"
-msgstr "Абонати"
+msgstr "%s абоната"
#: actions/subscribers.php:52
#, php-format
@@ -3669,7 +3670,8 @@ msgstr "Отписване"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
-#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
msgid "User"
msgstr "Потребител"
@@ -3677,17 +3679,87 @@ msgstr "Потребител"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:178
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
+msgstr ""
+
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr ""
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Профил"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr ""
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
+msgstr ""
+
+#: actions/useradminpanel.php:231
+msgid "New users"
+msgstr "Нови потребители"
+
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr ""
+
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr ""
+
+#: actions/useradminpanel.php:241
+#, fuzzy
+msgid "Default subscription"
+msgstr "Всички абонаменти"
+
+#: actions/useradminpanel.php:242
#, fuzzy
-msgid "Invite-only"
+msgid "Automatically subscribe new users to this user."
+msgstr ""
+"Автоматично абониране за всеки, който се абонира за мен (подходящо за "
+"ботове)."
+
+#: actions/useradminpanel.php:251
+msgid "Invitations"
msgstr "Покани"
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: actions/useradminpanel.php:256
+#, fuzzy
+msgid "Invitations enabled"
+msgstr "Поканите са изпратени."
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr ""
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr "Сесии"
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr "Управление на сесии"
+
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr ""
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/userauthorization.php:105
@@ -3705,9 +3777,8 @@ msgstr ""
"на този потребител. Ако не искате абонамента, натиснете \"Cancel\" (Отказ)."
#: actions/userauthorization.php:188
-#, fuzzy
msgid "License"
-msgstr "лиценз."
+msgstr "Лиценз"
#: actions/userauthorization.php:209
msgid "Accept"
@@ -3901,7 +3972,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"
@@ -3920,10 +3991,6 @@ msgstr "Грешка при създаване на нов абонамент."
msgid "Welcome to %1$s, @%2$s!"
msgstr "Съобщение до %1$s в %2$s"
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr "Профил"
-
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Промяна настройките на профила"
@@ -3954,143 +4021,142 @@ msgid "Other options"
msgstr "Други настройки"
#: 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 "Неозаглавена страница"
-#: lib/action.php:424
+#: lib/action.php:425
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Home"
msgstr "Начало"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Account"
msgstr "Сметка"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Change your email, avatar, password, profile"
msgstr "Промяна на поща, аватар, парола, профил"
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect"
msgstr "Свързване"
-#: lib/action.php:435
+#: lib/action.php:436
#, fuzzy
msgid "Connect to services"
msgstr "Грешка при пренасочване към сървър: %s"
-#: lib/action.php:439
+#: lib/action.php:440
#, fuzzy
msgid "Change site configuration"
msgstr "Абонаменти"
-#: lib/action.php:443 lib/subgroupnav.php:105
+#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Покани"
-#: lib/action.php:444 lib/subgroupnav.php:106
+#: lib/action.php:445 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Поканете приятели и колеги да се присъединят към вас в %s"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout"
msgstr "Изход"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout from the site"
msgstr "Излизане от сайта"
-#: lib/action.php:454
+#: lib/action.php:455
msgid "Create an account"
msgstr "Създаване на нова сметка"
-#: lib/action.php:457
+#: lib/action.php:458
msgid "Login to the site"
msgstr "Влизане в сайта"
-#: lib/action.php:460 lib/action.php:723
+#: lib/action.php:461 lib/action.php:724
msgid "Help"
msgstr "Помощ"
-#: lib/action.php:460
+#: lib/action.php:461
#, fuzzy
msgid "Help me!"
msgstr "Помощ"
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
msgstr "Търсене"
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
msgstr "Търсене за хора или бележки"
-#: lib/action.php:484
+#: lib/action.php:485
#, fuzzy
msgid "Site notice"
msgstr "Нова бележка"
-#: lib/action.php:550
+#: lib/action.php:551
msgid "Local views"
msgstr ""
-#: lib/action.php:616
+#: lib/action.php:617
#, fuzzy
msgid "Page notice"
msgstr "Нова бележка"
-#: lib/action.php:718
+#: lib/action.php:719
#, fuzzy
msgid "Secondary site navigation"
msgstr "Абонаменти"
-#: lib/action.php:725
+#: lib/action.php:726
msgid "About"
msgstr "Относно"
-#: lib/action.php:727
+#: lib/action.php:728
msgid "FAQ"
msgstr "Въпроси"
-#: lib/action.php:731
+#: lib/action.php:732
msgid "TOS"
msgstr ""
-#: lib/action.php:734
+#: lib/action.php:735
msgid "Privacy"
msgstr "Поверителност"
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
msgstr "Изходен код"
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Contact"
msgstr "Контакт"
-#: lib/action.php:740
-#, fuzzy
+#: lib/action.php:741
msgid "Badge"
-msgstr "Побутване"
+msgstr "Табелка"
-#: lib/action.php:768
+#: lib/action.php:769
msgid "StatusNet software license"
msgstr "Лиценз на програмата StatusNet"
-#: lib/action.php:771
+#: lib/action.php:772
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4099,12 +4165,12 @@ msgstr ""
"**%%site.name%%** е услуга за микроблогване, предоставена ви от [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:773
+#: lib/action.php:774
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** е услуга за микроблогване. "
-#: lib/action.php:775
+#: lib/action.php:776
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4115,32 +4181,32 @@ msgstr ""
"достъпна под [GNU Affero General Public License](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:789
+#: lib/action.php:790
#, fuzzy
msgid "Site content license"
msgstr "Лиценз на програмата StatusNet"
-#: lib/action.php:798
+#: lib/action.php:799
msgid "All "
msgstr "Всички "
-#: lib/action.php:803
+#: lib/action.php:804
msgid "license."
msgstr "лиценз."
-#: lib/action.php:1067
+#: lib/action.php:1068
msgid "Pagination"
msgstr "Страниране"
-#: lib/action.php:1076
+#: lib/action.php:1077
msgid "After"
msgstr "След"
-#: lib/action.php:1084
+#: lib/action.php:1085
msgid "Before"
msgstr "Преди"
-#: lib/action.php:1132
+#: lib/action.php:1133
msgid "There was a problem with your session token."
msgstr "Имаше проблем със сесията ви в сайта."
@@ -4174,6 +4240,11 @@ msgstr "Потвърждаване адреса на е-поща"
msgid "Design configuration"
msgstr "Потвърждение за SMS"
+#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+#, fuzzy
+msgid "Paths configuration"
+msgstr "Потвърждение за SMS"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4350,11 +4421,10 @@ msgid "You are not subscribed to anyone."
msgstr "Не сте абонирани за този профил"
#: lib/command.php:620
-#, fuzzy
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
-msgstr[0] "Не сте абонирани за този профил"
-msgstr[1] "Не сте абонирани за този профил"
+msgstr[0] "Вече сте абонирани за следните потребители:"
+msgstr[1] "Вече сте абонирани за следните потребители:"
#: lib/command.php:640
#, fuzzy
@@ -4362,19 +4432,16 @@ msgid "No one is subscribed to you."
msgstr "Грешка при абониране на друг потребител за вас."
#: lib/command.php:642
-#, fuzzy
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Грешка при абониране на друг потребител за вас."
msgstr[1] "Грешка при абониране на друг потребител за вас."
#: lib/command.php:662
-#, fuzzy
msgid "You are not a member of any groups."
-msgstr "Не членувате в тази група."
+msgstr "Не членувате в нито една група."
#: lib/command.php:664
-#, fuzzy
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Не членувате в тази група."
@@ -4420,9 +4487,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: "
@@ -4451,17 +4517,17 @@ msgstr "Бележки през SMS"
#: lib/dberroraction.php:60
msgid "Database error"
-msgstr ""
+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: "
@@ -4490,19 +4556,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"
@@ -4558,7 +4624,7 @@ msgstr ""
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
-#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85
msgid "Group"
msgstr "Група"
@@ -4604,7 +4670,7 @@ msgstr "Групи с най-много бележки"
msgid "Tags in %s group's notices"
msgstr "Етикети в бележките към групата %s"
-#: lib/htmloutputter.php:104
+#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
msgstr "Страницата не е достъпна във вида медия, който приемате"
@@ -4638,6 +4704,14 @@ msgstr "Няма такава бележка."
msgid "Unknown file type"
msgstr "Неподдържан вид файл"
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
@@ -4669,10 +4743,9 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:424
-#, fuzzy
+#: lib/mailbox.php:227 lib/noticelist.php:452
msgid "from"
-msgstr " от "
+msgstr "от"
#: lib/mail.php:172
msgid "Email address confirmation"
@@ -4813,9 +4886,9 @@ msgid ""
msgstr ""
#: 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
@@ -4918,37 +4991,62 @@ msgstr "Изпращане на пряко съобщеие"
msgid "To"
msgstr "До"
-#: lib/messageform.php:162 lib/noticeform.php:173
+#: lib/messageform.php:162 lib/noticeform.php:186
msgid "Available characters"
msgstr "Налични знаци"
-#: lib/noticeform.php:145
+#: lib/noticeform.php:158
msgid "Send a notice"
msgstr "Изпращане на бележка"
-#: lib/noticeform.php:158
+#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
msgstr "Какво става, %s?"
-#: lib/noticeform.php:180
+#: lib/noticeform.php:193
msgid "Attach"
msgstr ""
-#: lib/noticeform.php:184
+#: lib/noticeform.php:197
msgid "Attach a file"
msgstr ""
-#: lib/noticelist.php:478
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
#, fuzzy
+msgid "N"
+msgstr "Не"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr ""
+
+#: lib/noticelist.php:506
msgid "in context"
-msgstr "Няма съдържание!"
+msgstr "в контекст"
-#: lib/noticelist.php:498
+#: lib/noticelist.php:526
msgid "Reply to this notice"
msgstr "Отговаряне на тази бележка"
-#: lib/noticelist.php:499
+#: lib/noticelist.php:527
msgid "Reply"
msgstr "Отговор"
@@ -4981,12 +5079,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 "Грешка при добавяне на нов абонамент."
@@ -5096,6 +5194,10 @@ msgstr "Разблокиране на този потребител"
msgid "Search site"
msgstr "Търсене"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
#, fuzzy
msgid "Search help"
@@ -5109,10 +5211,6 @@ msgstr "Хора"
msgid "Find people on this site"
msgstr "Търсене на хора в сайта"
-#: lib/searchgroupnav.php:82
-msgid "Notice"
-msgstr "Бележки"
-
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
msgstr "Търсене в съдържанието на бележките"
@@ -5130,14 +5228,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
@@ -5243,7 +5339,7 @@ msgstr "Настройки на профила"
#: lib/userprofile.php:249
msgid "Edit"
-msgstr ""
+msgstr "Редактиране"
#: lib/userprofile.php:272
msgid "Send a direct message to this user"
@@ -5253,47 +5349,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 "преди около година"
@@ -5322,11 +5422,3 @@ msgstr "Това не е вашият входящ адрес."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Входящата поща не е разрешена."
-
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "Разблокиране на този потребител"
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "Абонирани за %s"
diff --git a/locale/ca/LC_MESSAGES/statusnet.mo b/locale/ca/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index b1682d409..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 b62c35c19..8f517c055 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -8,16 +8,16 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 10:43+0000\n"
-"PO-Revision-Date: 2009-11-18 19:31:29+0000\n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-11-28 19:49:54+0000\n"
"Language-Team: Catalan\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ca\n"
"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
@@ -209,9 +209,9 @@ msgid "Can't send direct messages to users who aren't your friend."
msgstr "No pots enviar missatges directes a usuaris que no siguin amics teus."
#: actions/apidirectmessage.php:89
-#, fuzzy, php-format
+#, php-format
msgid "Direct messages from %s"
-msgstr "Missatges directes a %s"
+msgstr "Missatges directes de %s"
#: actions/apidirectmessage.php:93
#, php-format
@@ -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
@@ -408,9 +407,9 @@ msgid "groups on %s"
msgstr "Accions del grup"
#: actions/apigrouplist.php:95
-#, fuzzy, php-format
+#, php-format
msgid "%s's groups"
-msgstr "%s grups"
+msgstr "Grups de %s"
#: actions/apigrouplist.php:103
#, fuzzy, php-format
@@ -426,9 +425,8 @@ msgid "You may not delete another user's status."
msgstr "No pots eliminar l'estatus d'un altre usuari."
#: actions/apistatusesshow.php:138
-#, fuzzy
msgid "Status deleted."
-msgstr "Avatar actualitzat."
+msgstr "S'ha suprimit l'estat."
#: actions/apistatusesshow.php:144
msgid "No status with that ID found."
@@ -444,7 +442,7 @@ msgstr "Massa llarg. La longitud màxima és de 140 caràcters."
msgid "Not found"
msgstr "No s'ha trobat"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -559,7 +557,7 @@ msgid "Preview"
msgstr "Previsualitzar"
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
+#: lib/noticelist.php:550
msgid "Delete"
msgstr "Eliminar"
@@ -572,7 +570,7 @@ msgid "Crop"
msgstr "Crop"
#: actions/avatarsettings.php:265 actions/disfavor.php:74
-#: actions/emailsettings.php:237 actions/favor.php:75
+#: 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
@@ -589,7 +587,7 @@ msgstr ""
"us plau."
#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
-#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: 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."
@@ -614,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
@@ -682,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
@@ -725,15 +721,15 @@ msgstr "Tipus d'adreça %s desconeguda"
msgid "That address has already been confirmed."
msgstr "Aquesta adreça ja ha estat confirmada."
-#: actions/confirmaddress.php:114 actions/emailsettings.php:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
#: actions/profilesettings.php:276 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "No s'ha pogut actualitzar l'usuari."
-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
msgstr "No s'ha pogut eliminar la confirmació de correu electrònic."
@@ -752,7 +748,7 @@ msgid "Conversation"
msgstr "Conversa"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206
+#: lib/profileaction.php:206 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Avisos"
@@ -795,7 +791,7 @@ msgstr "N'estàs segur que vols eliminar aquesta notificació?"
msgid "Do not delete this notice"
msgstr "No es pot esborrar la notificació."
-#: actions/deletenotice.php:146 lib/noticelist.php:522
+#: actions/deletenotice.php:146 lib/noticelist.php:550
msgid "Delete this notice"
msgstr "Eliminar aquesta nota"
@@ -807,9 +803,8 @@ msgstr ""
"us plau."
#: actions/deleteuser.php:67
-#, fuzzy
msgid "You cannot delete users."
-msgstr "No s'ha pogut actualitzar l'usuari."
+msgstr "No podeu suprimir els usuaris."
#: actions/deleteuser.php:74
#, fuzzy
@@ -817,9 +812,8 @@ msgid "You can only delete local users."
msgstr "No pots eliminar l'estatus d'un altre usuari."
#: actions/deleteuser.php:110 actions/deleteuser.php:133
-#, fuzzy
msgid "Delete user"
-msgstr "Eliminar"
+msgstr "Suprimeix l'usuari"
#: actions/deleteuser.php:135
msgid ""
@@ -828,198 +822,126 @@ 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:278
+#: actions/designadminpanel.php:270
#, fuzzy
msgid "Invalid logo URL."
msgstr "Mida invàlida."
-#: actions/designadminpanel.php:282
+#: actions/designadminpanel.php:274
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Aquesta pàgina no està disponible en "
-#: actions/designadminpanel.php:288
-#, fuzzy, php-format
-msgid "Theme directory not readable: %s"
-msgstr "Aquesta pàgina no està disponible en "
-
-#: actions/designadminpanel.php:292
-#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:296
-#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:312
-#, php-format
-msgid "Max length for %s %s is 255 characters."
-msgstr ""
-
-#: actions/designadminpanel.php:412
-#, fuzzy
+#: actions/designadminpanel.php:370
msgid "Change logo"
-msgstr "Canviar la teva contrasenya"
+msgstr "Canvia el logotip"
-#: actions/designadminpanel.php:417
-#, fuzzy
+#: actions/designadminpanel.php:375
msgid "Site logo"
-msgstr "Invitar"
+msgstr "Logotip del lloc"
-#: actions/designadminpanel.php:424
-#, fuzzy
+#: actions/designadminpanel.php:382
msgid "Change theme"
-msgstr "Canviar"
+msgstr "Canvia el tema"
-#: actions/designadminpanel.php:441
+#: actions/designadminpanel.php:399
#, fuzzy
msgid "Site theme"
msgstr "Avís del lloc"
-#: actions/designadminpanel.php:442
-#, fuzzy
+#: actions/designadminpanel.php:400
msgid "Theme for the site."
-msgstr "Sortir d'aquest lloc"
-
-#: actions/designadminpanel.php:447
-msgid "Theme server"
-msgstr ""
-
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
-
-#: actions/designadminpanel.php:455
-msgid "Theme directory"
-msgstr ""
-
-#: actions/designadminpanel.php:462
-#, fuzzy
-msgid "Avatar Settings"
-msgstr "Configuració de l'avatar"
-
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Avatar server"
-msgstr "Configuració de l'avatar"
-
-#: actions/designadminpanel.php:471
-#, fuzzy
-msgid "Avatar path"
-msgstr "Avatar actualitzat."
-
-#: actions/designadminpanel.php:475
-#, fuzzy
-msgid "Avatar directory"
-msgstr "Avatar actualitzat."
+msgstr "Tema del lloc."
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
-msgstr ""
+msgstr "Canvia la imatge de fons"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
-msgstr ""
+msgstr "Fons"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:422
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "Pots pujar una imatge de logo per al grup."
-#: actions/designadminpanel.php:526 lib/designsettings.php:139
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:542 lib/designsettings.php:155
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:543 lib/designsettings.php:156
+#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:548 lib/designsettings.php:161
+#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:554
-msgid "Background server"
-msgstr ""
-
-#: actions/designadminpanel.php:558
-msgid "Background path"
-msgstr ""
-
-#: actions/designadminpanel.php:562
-msgid "Background directory"
-msgstr ""
-
-#: actions/designadminpanel.php:569 lib/designsettings.php:170
-#, fuzzy
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
msgid "Change colours"
-msgstr "Canviar la teva contrasenya"
+msgstr "Canvia els colors"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
-#, fuzzy
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
msgid "Content"
-msgstr "Connectar-se"
+msgstr "Contingut"
-#: actions/designadminpanel.php:604 lib/designsettings.php:204
-#, fuzzy
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
msgid "Sidebar"
-msgstr "Cercar"
+msgstr "Barra lateral"
-#: actions/designadminpanel.php:617 lib/designsettings.php:217
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
msgstr "Text"
-#: actions/designadminpanel.php:630 lib/designsettings.php:230
-#, fuzzy
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
msgid "Links"
-msgstr "Inici de sessió"
+msgstr "Enllaços"
-#: actions/designadminpanel.php:658 lib/designsettings.php:247
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:659 lib/designsettings.php:248
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:665 lib/designsettings.php:254
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 actions/useradminpanel.php:226
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: 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 "Guardar"
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: 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!"
@@ -1173,37 +1095,37 @@ msgstr "Vull publicar notificacions per correu electrònic."
msgid "Publish a MicroID for my email address."
msgstr "Publica una MicroID per al meu correu electrònic."
-#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/emailsettings.php:302 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
msgstr "Preferències guardades."
-#: actions/emailsettings.php:319
+#: actions/emailsettings.php:320
msgid "No email address."
msgstr "No hi ha cap direcció de correu electrònic."
-#: actions/emailsettings.php:326
+#: actions/emailsettings.php:327
msgid "Cannot normalize that email address"
msgstr "No es pot normalitzar aquesta direcció de correu electrònic"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "No és una direcció de correu electrònic vàlida."
-#: actions/emailsettings.php:333
+#: actions/emailsettings.php:334
msgid "That is already your email address."
msgstr "Aquest ja és el teu correu electrònic."
-#: actions/emailsettings.php:336
+#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
msgstr "Aquest correu electrònic pertany a un altre usuari."
-#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "No s'ha pogut inserir el codi de confirmació."
-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1212,47 +1134,47 @@ msgstr ""
"Revisa la teva safata d'entrada (i la carpeta de spam!) per veure aquest "
"codi i les instruccions per utilitzar-lo."
-#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
msgstr "Cap confirmació pendent per a cancel·lar."
-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
msgstr "Aquesta adreça de missatgeria instantània és incorrecta."
-#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
msgstr "Confirmació cancel·lada."
-#: actions/emailsettings.php:412
+#: actions/emailsettings.php:413
msgid "That is not your email address."
msgstr "Aquest no és el teu correu electrònic"
-#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
msgstr "L'adreça ha estat eliminada."
-#: actions/emailsettings.php:445 actions/smssettings.php:518
+#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
msgstr "No hi ha cap direcció de correu electrònic entrant."
-#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
msgid "Couldn't update user record."
msgstr "No s'ha pogut actualitzar el registre de l'usuari."
-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
msgstr "Eliminat el correu electrònic entrant."
-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555
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"
@@ -1329,7 +1251,7 @@ msgstr "Nou avís"
#: actions/file.php:42
msgid "No attachments"
-msgstr ""
+msgstr "Sense adjuncions"
#: actions/file.php:51
msgid "No uploaded attachments"
@@ -1353,9 +1275,8 @@ msgid "That user has blocked you from subscribing."
msgstr "Aquest usuari t'ha bloquejat com a subscriptor."
#: actions/finishremotesubscribe.php:106
-#, fuzzy
msgid "You are not authorized."
-msgstr "No autoritzat."
+msgstr "No esteu autoritzat."
#: actions/finishremotesubscribe.php:109
#, fuzzy
@@ -1383,9 +1304,8 @@ msgid "No such file."
msgstr "No existeix aquest avís."
#: actions/getfile.php:79
-#, fuzzy
msgid "Cannot read file."
-msgstr "Hem perdut el nostre arxiu."
+msgstr "No es pot llegir el fitxer."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
@@ -1401,9 +1321,8 @@ msgstr "No hi ha cap perfil amb aquesta ID."
#: actions/groupblock.php:81 actions/groupunblock.php:81
#: actions/makeadmin.php:81
-#, fuzzy
msgid "No group specified."
-msgstr "No s'ha especificat perfil."
+msgstr "No s'ha especificat cap grup."
#: actions/groupblock.php:91
msgid "Only an admin can block group members."
@@ -1522,7 +1441,7 @@ msgstr "%s membre/s en el grup, pàgina %d"
msgid "A list of the users in this group."
msgstr "La llista dels usuaris d'aquest grup."
-#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
msgid "Admin"
msgstr "Admin"
@@ -1560,7 +1479,7 @@ msgstr ""
#: actions/groupsearch.php:58
msgid "Group search"
-msgstr "Cercar grup"
+msgstr "Cerca de grups"
#: actions/groupsearch.php:79 actions/noticesearch.php:117
#: actions/peoplesearch.php:83
@@ -1582,7 +1501,7 @@ msgid ""
msgstr ""
#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/subgroupnav.php:98
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Grups"
@@ -1805,7 +1724,7 @@ msgstr "Missatge personal"
msgid "Optionally add a personal message to the invitation."
msgstr "Opcionalment pots afegir un missatge a la invitació."
-#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
msgstr "Enviar"
@@ -1929,7 +1848,7 @@ msgstr "Nom d'usuari o contrasenya incorrectes."
msgid "Error setting user. You are probably not authorized."
msgstr "No autoritzat."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:457
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Inici de sessió"
@@ -1983,7 +1902,7 @@ msgstr ""
#: actions/makeadmin.php:91
msgid "Only an admin can make another user an admin."
-msgstr ""
+msgstr "Només un administrador poc fer a un altre usuari administrador."
#: actions/makeadmin.php:95
#, php-format
@@ -2043,7 +1962,7 @@ msgstr "S'ha enviat el missatge"
msgid "Direct message to %s sent"
msgstr "Missatge directe per a %s enviat"
-#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
msgid "Ajax Error"
msgstr "Ajax Error"
@@ -2051,7 +1970,7 @@ msgstr "Ajax Error"
msgid "New notice"
msgstr "Nou avís"
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
msgid "Notice posted"
msgstr "Notificació publicada"
@@ -2087,12 +2006,12 @@ msgid ""
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
-#: actions/noticesearchrss.php:89
+#: actions/noticesearchrss.php:96
#, fuzzy, php-format
msgid "Updates with \"%s\""
msgstr "Actualitzacions de %1$s a %2$s!"
-#: actions/noticesearchrss.php:91
+#: actions/noticesearchrss.php:98
#, fuzzy, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
msgstr "Totes les actualitzacions que corresponen a la frase a cercar \"%s\" "
@@ -2122,9 +2041,8 @@ msgid "%1$s's status on %2$s"
msgstr "estat de %1$s a %2$s"
#: actions/oembed.php:157
-#, fuzzy
msgid "content type "
-msgstr "Connectar-se"
+msgstr "tipus de contingut "
#: actions/oembed.php:160
msgid "Only "
@@ -2137,7 +2055,7 @@ msgstr "Format de data no suportat."
#: actions/opensearch.php:64
msgid "People Search"
-msgstr "Cercar gent"
+msgstr "Cerca de gent"
#: actions/opensearch.php:67
msgid "Notice Search"
@@ -2222,9 +2140,9 @@ msgstr "6 o més caràcters"
msgid "Confirm"
msgstr "Confirmar"
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "repeteix la contrasenya anterior"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Igual a la contrasenya de dalt"
#: actions/passwordsettings.php:117
msgid "Change"
@@ -2254,6 +2172,113 @@ msgstr "No es pot guardar la nova contrasenya."
msgid "Password saved."
msgstr "Contrasenya guardada."
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr "Camins"
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr ""
+
+#: actions/pathsadminpanel.php:140
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Aquesta pàgina no està disponible en "
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+msgid "Site"
+msgstr "Lloc"
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr "Camí"
+
+#: actions/pathsadminpanel.php:216
+#, fuzzy
+msgid "Site path"
+msgstr "Avís del lloc"
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr "Tema"
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Avatars"
+msgstr "Avatar"
+
+#: actions/pathsadminpanel.php:252
+#, fuzzy
+msgid "Avatar server"
+msgstr "Configuració de l'avatar"
+
+#: actions/pathsadminpanel.php:256
+#, fuzzy
+msgid "Avatar path"
+msgstr "Avatar actualitzat."
+
+#: actions/pathsadminpanel.php:260
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Avatar actualitzat."
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:297
+#, fuzzy
+msgid "Save paths"
+msgstr "Avís del lloc"
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -2359,7 +2384,7 @@ msgstr ""
"Etiquetes per a tu mateix (lletres, números, -, ., i _), per comes o separat "
"por espais"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr "Idioma"
@@ -2590,10 +2615,6 @@ msgstr "Acció desconeguda"
msgid "6 or more characters, and don't forget it!"
msgstr "6 o més caràcters, i no te n'oblidis!"
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Igual a la contrasenya de dalt"
-
#: actions/recoverpassword.php:243
msgid "Reset"
msgstr "Restablir"
@@ -2655,7 +2676,7 @@ msgstr "Error amb el codi de confirmació."
msgid "Registration successful"
msgstr "Registre satisfactori"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrar-se"
@@ -2700,7 +2721,7 @@ msgid "Same as password above. Required."
msgstr "Igual a la contrasenya de dalt. Requerit."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Correu electrònic"
@@ -2807,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"
@@ -3013,9 +3034,8 @@ msgid "Statistics"
msgstr "Estadístiques"
#: actions/showgroup.php:432
-#, fuzzy
msgid "Created"
-msgstr "Crear"
+msgstr "S'ha creat"
#: actions/showgroup.php:448
#, php-format
@@ -3039,9 +3059,8 @@ msgstr ""
"(http://ca.wikipedia.org/wiki/Microblogging)"
#: actions/showgroup.php:482
-#, fuzzy
msgid "Admins"
-msgstr "Admin"
+msgstr "Administradors"
#: actions/showmessage.php:81
msgid "No such message."
@@ -3148,11 +3167,6 @@ msgstr "No pots enviar un missatge a aquest usuari."
msgid "User is already silenced."
msgstr "Un usuari t'ha bloquejat."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
-#, fuzzy
-msgid "Site"
-msgstr "Invitar"
-
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
msgstr ""
@@ -3162,9 +3176,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
@@ -3184,107 +3197,101 @@ msgid "Snapshot frequency must be a number."
msgstr ""
#: actions/siteadminpanel.php:199
-msgid "You must set an SSL sever when enabling SSL."
+msgid "You must set an SSL server when enabling SSL."
msgstr ""
#: actions/siteadminpanel.php:204
-msgid "Invalid SSL server. Max length is 255 characters."
+msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
#: actions/siteadminpanel.php:210
-msgid "Minimum text limit is 140c."
+msgid "Minimum text limit is 140 characters."
msgstr ""
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:224
-#, php-format
-msgid "Locales directory not readable: %s"
-msgstr ""
+#: actions/siteadminpanel.php:266
+msgid "General"
+msgstr "General"
-#: actions/siteadminpanel.php:275
-#, fuzzy
+#: actions/siteadminpanel.php:269
msgid "Site name"
-msgstr "Avís del lloc"
+msgstr "Nom del lloc"
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:279
+#: actions/siteadminpanel.php:274
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:280
+#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:283
+#: actions/siteadminpanel.php:279
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:284
#, fuzzy
-msgid "contact email address for your site"
+msgid "Contact email address for your site"
msgstr "Nou correu electrònic per publicar a %s"
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:290
+#, fuzzy
+msgid "Local"
+msgstr "Vistes locals"
+
+#: actions/siteadminpanel.php:301
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:303
+#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:308
#, fuzzy
msgid "Default site language"
msgstr "Preferència d'idioma"
#: actions/siteadminpanel.php:316
-msgid "Path to locales"
-msgstr ""
-
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
-msgstr ""
+#, fuzzy
+msgid "URLs"
+msgstr "URL"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
#, fuzzy
msgid "Server"
msgstr "Recuperar"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
msgstr ""
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-#, fuzzy
-msgid "Site path"
-msgstr "Avís del lloc"
-
-#: actions/siteadminpanel.php:328
+#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
msgstr ""
-#: actions/siteadminpanel.php:330
+#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
+#: actions/siteadminpanel.php:331
+msgid "Access"
+msgstr "Accés"
+
#: actions/siteadminpanel.php:334
-#, fuzzy
msgid "Private"
-msgstr "Privacitat"
+msgstr "Privat"
#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
@@ -3299,7 +3306,7 @@ msgstr "Invitar"
msgid "Make registration invitation only."
msgstr ""
-#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#: actions/siteadminpanel.php:346
#, fuzzy
msgid "Closed"
msgstr "Bloquejar"
@@ -3308,33 +3315,37 @@ msgstr "Bloquejar"
msgid "Disable new registrations."
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
#, fuzzy
msgid "Never"
msgstr "Recuperar"
-#: actions/siteadminpanel.php:357
+#: actions/siteadminpanel.php:360
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:358
+#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:364
+#: actions/siteadminpanel.php:366
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:365
-msgid "Snapshots will be sent once every N Web hits"
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
msgstr ""
#: actions/siteadminpanel.php:372
@@ -3345,48 +3356,57 @@ msgstr ""
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:381
+#: actions/siteadminpanel.php:380
+#, fuzzy
+msgid "SSL"
+msgstr "SMS"
+
+#: actions/siteadminpanel.php:384
#, fuzzy
msgid "Sometimes"
msgstr "Avisos"
-#: actions/siteadminpanel.php:382
+#: actions/siteadminpanel.php:385
msgid "Always"
msgstr ""
-#: actions/siteadminpanel.php:384
+#: actions/siteadminpanel.php:387
msgid "Use SSL"
msgstr ""
-#: actions/siteadminpanel.php:385
+#: actions/siteadminpanel.php:388
msgid "When to use SSL"
msgstr ""
-#: actions/siteadminpanel.php:391
+#: actions/siteadminpanel.php:393
msgid "SSL Server"
msgstr ""
-#: actions/siteadminpanel.php:392
+#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr ""
+
+#: actions/siteadminpanel.php:403
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
#, fuzzy
msgid "Save site settings"
msgstr "Configuració de l'avatar"
@@ -3700,7 +3720,8 @@ msgstr "No subscrit"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
-#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
msgid "User"
msgstr "Usuari"
@@ -3708,17 +3729,88 @@ msgstr "Usuari"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr ""
+
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
+msgstr ""
+
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr ""
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Perfil"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr ""
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
+msgstr ""
+
+#: actions/useradminpanel.php:231
+msgid "New users"
+msgstr "Usuaris nous"
+
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr "Benvinguda als usuaris nous"
+
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr ""
+
+#: actions/useradminpanel.php:241
+#, fuzzy
+msgid "Default subscription"
+msgstr "Totes les subscripcions"
+
+#: actions/useradminpanel.php:242
+#, fuzzy
+msgid "Automatically subscribe new users to this user."
msgstr ""
+"Automàticament subscriure's a qualsevol que ho estigui a tu mateix (ideal "
+"per no-humans)"
-#: actions/useradminpanel.php:178
+#: actions/useradminpanel.php:251
#, fuzzy
-msgid "Invite-only"
-msgstr "Invitar"
+msgid "Invitations"
+msgstr "Invitació(ons) enviada(des)"
+
+#: actions/useradminpanel.php:256
+#, fuzzy
+msgid "Invitations enabled"
+msgstr "Invitació(ons) enviada(des)"
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr ""
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
+msgstr ""
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr ""
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/userauthorization.php:105
@@ -3743,7 +3835,7 @@ msgstr "llicència."
#: actions/userauthorization.php:209
msgid "Accept"
-msgstr "Acceptar"
+msgstr "Accepta"
#: actions/userauthorization.php:210 lib/subscribeform.php:115
#: lib/subscribeform.php:139
@@ -3752,7 +3844,7 @@ msgstr "Subscriure's a aquest usuari"
#: actions/userauthorization.php:211
msgid "Reject"
-msgstr "Rebutjar"
+msgstr "Rebutja"
#: actions/userauthorization.php:212
#, fuzzy
@@ -3933,7 +4025,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"
@@ -3951,25 +4043,21 @@ msgstr "No s'ha pogut establir la pertinença d'aquest grup."
msgid "Welcome to %1$s, @%2$s!"
msgstr "Missatge per a %1$s a %2$s"
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr "Perfil"
-
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
-msgstr "Canviar les preferències del teu perfil"
+msgstr "Canvieu els paràmetres del vostre perfil"
#: lib/accountsettingsaction.php:112
msgid "Upload an avatar"
-msgstr "Pujar un avatar"
+msgstr "Puja un avatar"
#: lib/accountsettingsaction.php:116
msgid "Change your password"
-msgstr "Canviar la teva contrasenya"
+msgstr "Canvieu la vostra contrasenya"
#: lib/accountsettingsaction.php:120
msgid "Change email handling"
-msgstr "Canviar correu electrònic"
+msgstr "Canvieu la gestió del correu"
#: lib/accountsettingsaction.php:124
#, fuzzy
@@ -3993,131 +4081,130 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "Pàgina sense titol"
-#: lib/action.php:424
+#: lib/action.php:425
msgid "Primary site navigation"
msgstr "Navegació primària del lloc"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Home"
msgstr "Inici"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Personal profile and friends timeline"
msgstr "Perfil personal i línia temporal dels amics"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Account"
msgstr "Compte"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Change your email, avatar, password, profile"
msgstr "Canviar correu electrònic, avatar, contrasenya, perfil"
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect"
-msgstr "Connectar-se"
+msgstr "Connexió"
-#: lib/action.php:435
+#: lib/action.php:436
#, fuzzy
msgid "Connect to services"
msgstr "No s'ha pogut redirigir al servidor: %s"
-#: lib/action.php:439
+#: lib/action.php:440
#, fuzzy
msgid "Change site configuration"
msgstr "Navegació primària del lloc"
-#: lib/action.php:443 lib/subgroupnav.php:105
+#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
-msgstr "Invitar"
+msgstr "Convida"
-#: lib/action.php:444 lib/subgroupnav.php:106
+#: lib/action.php:445 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Convidar amics i companys perquè participin a %s"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout"
-msgstr "Sortir"
+msgstr "Finalitza la sessió"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout from the site"
-msgstr "Sortir d'aquest lloc"
+msgstr "Finalitza la sessió del lloc"
-#: lib/action.php:454
+#: lib/action.php:455
msgid "Create an account"
-msgstr "Crear nou compte"
+msgstr "Crea un compte"
-#: lib/action.php:457
+#: lib/action.php:458
msgid "Login to the site"
-msgstr "Accedir a aquest lloc"
+msgstr "Inicia una sessió al lloc"
-#: lib/action.php:460 lib/action.php:723
+#: lib/action.php:461 lib/action.php:724
msgid "Help"
msgstr "Ajuda"
-#: lib/action.php:460
+#: lib/action.php:461
msgid "Help me!"
msgstr "Ajuda'm"
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
-msgstr "Cercar"
+msgstr "Cerca"
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
-msgstr "Cercar gent o text"
+msgstr "Cerca gent o text"
-#: lib/action.php:484
+#: lib/action.php:485
msgid "Site notice"
msgstr "Avís del lloc"
-#: lib/action.php:550
+#: lib/action.php:551
msgid "Local views"
msgstr "Vistes locals"
-#: lib/action.php:616
+#: lib/action.php:617
msgid "Page notice"
msgstr "Notificació pàgina"
-#: lib/action.php:718
+#: lib/action.php:719
msgid "Secondary site navigation"
msgstr "Navegació del lloc secundària"
-#: lib/action.php:725
+#: lib/action.php:726
msgid "About"
-msgstr "Sobre"
+msgstr "Quant a"
-#: lib/action.php:727
+#: lib/action.php:728
msgid "FAQ"
-msgstr "Preguntes freqüents"
+msgstr "Preguntes més freqüents"
-#: lib/action.php:731
+#: lib/action.php:732
msgid "TOS"
msgstr ""
-#: lib/action.php:734
+#: lib/action.php:735
msgid "Privacy"
-msgstr "Privacitat"
+msgstr "Privadesa"
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
msgstr "Font"
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Contact"
-msgstr "Posar-se en contacte"
+msgstr "Contacte"
-#: lib/action.php:740
-#, fuzzy
+#: lib/action.php:741
msgid "Badge"
-msgstr "Reclamar"
+msgstr "Insígnia"
-#: lib/action.php:768
+#: lib/action.php:769
msgid "StatusNet software license"
msgstr "Llicència del programari StatusNet"
-#: lib/action.php:771
+#: lib/action.php:772
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4126,12 +4213,12 @@ msgstr ""
"**%%site.name%%** és un servei de microblogging de [%%site.broughtby%%**](%%"
"site.broughtbyurl%%)."
-#: lib/action.php:773
+#: lib/action.php:774
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** és un servei de microblogging."
-#: lib/action.php:775
+#: lib/action.php:776
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4142,32 +4229,32 @@ msgstr ""
"%s, disponible sota la [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:789
+#: lib/action.php:790
#, fuzzy
msgid "Site content license"
msgstr "Llicència del programari StatusNet"
-#: lib/action.php:798
+#: lib/action.php:799
msgid "All "
msgstr "Tot "
-#: lib/action.php:803
+#: lib/action.php:804
msgid "license."
msgstr "llicència."
-#: lib/action.php:1067
+#: lib/action.php:1068
msgid "Pagination"
msgstr "Paginació"
-#: lib/action.php:1076
+#: lib/action.php:1077
msgid "After"
msgstr "Posteriors"
-#: lib/action.php:1084
+#: lib/action.php:1085
msgid "Before"
msgstr "Anteriors"
-#: lib/action.php:1132
+#: lib/action.php:1133
msgid "There was a problem with your session token."
msgstr "Ha ocorregut algun problema amb la teva sessió."
@@ -4201,9 +4288,14 @@ msgstr "Confirmació de l'adreça de correu electrònic"
msgid "Design configuration"
msgstr "Confirmació SMS"
+#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+#, fuzzy
+msgid "Paths configuration"
+msgstr "Confirmació SMS"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
-msgstr ""
+msgstr "Adjuncions"
#: lib/attachmentlist.php:265
msgid "Author"
@@ -4220,7 +4312,7 @@ msgstr ""
#: lib/attachmenttagcloudsection.php:48
msgid "Tags for this attachment"
-msgstr ""
+msgstr "Etiquetes de l'adjunció"
#: lib/channel.php:138 lib/channel.php:158
msgid "Command results"
@@ -4375,11 +4467,10 @@ msgid "You are not subscribed to anyone."
msgstr "No estàs subscrit a aquest perfil."
#: lib/command.php:620
-#, fuzzy
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
-msgstr[0] "No estàs subscrit a aquest perfil."
-msgstr[1] "No estàs subscrit a aquest perfil."
+msgstr[0] "Ja estàs subscrit a aquests usuaris:"
+msgstr[1] "Ja estàs subscrit a aquests usuaris:"
#: lib/command.php:640
#, fuzzy
@@ -4387,7 +4478,6 @@ msgid "No one is subscribed to you."
msgstr "No pots subscriure a un altre a tu mateix."
#: lib/command.php:642
-#, fuzzy
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."
@@ -4399,11 +4489,10 @@ msgid "You are not a member of any groups."
msgstr "No ets membre d'aquest grup."
#: lib/command.php:664
-#, fuzzy
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
-msgstr[0] "No ets membre d'aquest grup."
-msgstr[1] "No ets membre d'aquest grup."
+msgstr[0] "No sou un membre del grup."
+msgstr[1] "No sou un membre del grup."
#: lib/command.php:678
msgid ""
@@ -4476,7 +4565,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
@@ -4484,9 +4573,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: "
@@ -4551,7 +4641,7 @@ msgstr "Elegeix una etiqueta para reduir la llista"
#: lib/galleryaction.php:143
msgid "Go"
-msgstr "Anar"
+msgstr "Vés-hi"
#: lib/groupeditform.php:163
msgid "URL of the homepage or blog of the group or topic"
@@ -4582,7 +4672,7 @@ msgstr ""
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
-#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85
msgid "Group"
msgstr "Grup"
@@ -4628,7 +4718,7 @@ msgstr "Grups amb més entrades"
msgid "Tags in %s group's notices"
msgstr "Etiquetes en les notificacions del grup %s"
-#: lib/htmloutputter.php:104
+#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
msgstr "Aquesta pàgina no està disponible en un tipus de mèdia que acceptis."
@@ -4661,6 +4751,14 @@ msgstr "Hem perdut el nostre arxiu."
msgid "Unknown file type"
msgstr "Tipus de fitxer desconegut"
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
@@ -4692,7 +4790,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:424
+#: lib/mailbox.php:227 lib/noticelist.php:452
#, fuzzy
msgid "from"
msgstr " de "
@@ -4949,39 +5047,65 @@ msgstr "Enviar notificació directa"
msgid "To"
msgstr "A"
-#: lib/messageform.php:162 lib/noticeform.php:173
+#: lib/messageform.php:162 lib/noticeform.php:186
msgid "Available characters"
msgstr "Caràcters disponibles"
-#: lib/noticeform.php:145
+#: lib/noticeform.php:158
msgid "Send a notice"
msgstr "Enviar notificació"
-#: lib/noticeform.php:158
+#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
msgstr "Què tal, %s?"
-#: lib/noticeform.php:180
+#: lib/noticeform.php:193
msgid "Attach"
msgstr ""
-#: lib/noticeform.php:184
+#: lib/noticeform.php:197
msgid "Attach a file"
msgstr ""
-#: lib/noticelist.php:478
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "No"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr ""
+
+#: lib/noticelist.php:506
#, fuzzy
msgid "in context"
msgstr "Cap contingut!"
-#: lib/noticelist.php:498
+#: lib/noticelist.php:526
msgid "Reply to this notice"
msgstr "respondre a aquesta nota"
-#: lib/noticelist.php:499
+#: lib/noticelist.php:527
msgid "Reply"
-msgstr "Respondre"
+msgstr "Respon"
#: lib/nudgeform.php:116
msgid "Nudge this user"
@@ -5012,12 +5136,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ó."
@@ -5090,7 +5214,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"
@@ -5123,9 +5247,12 @@ msgid "Sandbox this user"
msgstr "Desbloquejar aquest usuari"
#: lib/searchaction.php:120
-#, fuzzy
msgid "Search site"
-msgstr "Cercar"
+msgstr "Cerca al lloc"
+
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr "Paraules clau"
#: lib/searchaction.php:162
#, fuzzy
@@ -5140,10 +5267,6 @@ msgstr "Gent"
msgid "Find people on this site"
msgstr "Trobar gent en aquest lloc"
-#: lib/searchgroupnav.php:82
-msgid "Notice"
-msgstr "Avisos"
-
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
msgstr "Trobar contingut de les notes"
@@ -5158,7 +5281,7 @@ msgstr "Secció sense títol"
#: lib/section.php:106
msgid "More..."
-msgstr ""
+msgstr "Més…"
#: lib/silenceform.php:67
#, fuzzy
@@ -5259,22 +5382,20 @@ msgid "Unsubscribe"
msgstr "Cancel·lar subscripció"
#: lib/userprofile.php:116
-#, fuzzy
msgid "Edit Avatar"
-msgstr "Avatar"
+msgstr "Edita l'avatar"
#: lib/userprofile.php:236
msgid "User actions"
msgstr "Accions de l'usuari"
#: lib/userprofile.php:248
-#, fuzzy
msgid "Edit profile settings"
-msgstr "Configuració del perfil"
+msgstr "Edita la configuració del perfil"
#: lib/userprofile.php:249
msgid "Edit"
-msgstr ""
+msgstr "Edita"
#: lib/userprofile.php:272
msgid "Send a direct message to this user"
@@ -5284,54 +5405,58 @@ 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"
#: lib/webcolor.php:82
-#, fuzzy, php-format
+#, php-format
msgid "%s is not a valid color!"
-msgstr "La pàgina personal no és un URL vàlid."
+msgstr "%s no és un color vàlid!"
#: lib/webcolor.php:123
#, php-format
@@ -5353,11 +5478,3 @@ msgstr "Perdó, aquest no és el teu correu electrònic entrant permès."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Perdó, no hi ha un correu electrònic entrant permès."
-
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "Desbloquejar aquest usuari"
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "Persones subscrites a %s"
diff --git a/locale/cs/LC_MESSAGES/statusnet.mo b/locale/cs/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index e901c2e64..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 a16f2aa14..674761170 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 10:43+0000\n"
-"PO-Revision-Date: 2009-11-18 19:31:32+0000\n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-11-28 19:49:57+0000\n"
"Language-Team: Czech\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n< =4) ? 1 : 2 ;\n"
-"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: cs\n"
"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n< =4) ? 1 : 2 ;\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
@@ -440,7 +440,7 @@ msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků"
msgid "Not found"
msgstr ""
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -557,7 +557,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
+#: lib/noticelist.php:550
msgid "Delete"
msgstr ""
@@ -570,7 +570,7 @@ msgid "Crop"
msgstr ""
#: actions/avatarsettings.php:265 actions/disfavor.php:74
-#: actions/emailsettings.php:237 actions/favor.php:75
+#: 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
@@ -585,7 +585,7 @@ msgid "There was a problem with your session token. Try again, please."
msgstr ""
#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
-#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: 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."
@@ -722,15 +722,15 @@ msgstr "Neznámý typ adresy %s"
msgid "That address has already been confirmed."
msgstr "Adresa již byla potvrzena"
-#: actions/confirmaddress.php:114 actions/emailsettings.php:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
#: actions/profilesettings.php:276 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Nelze aktualizovat uživatele"
-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
msgstr "Nelze smazat potvrzení emailu"
@@ -750,7 +750,7 @@ msgid "Conversation"
msgstr "Umístění"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206
+#: lib/profileaction.php:206 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Sdělení"
@@ -790,7 +790,7 @@ msgstr ""
msgid "Do not delete this notice"
msgstr "Žádné takové oznámení."
-#: actions/deletenotice.php:146 lib/noticelist.php:522
+#: actions/deletenotice.php:146 lib/noticelist.php:550
msgid "Delete this notice"
msgstr ""
@@ -832,182 +832,119 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:278
+#: actions/designadminpanel.php:270
#, fuzzy
msgid "Invalid logo URL."
msgstr "Neplatná velikost"
-#: actions/designadminpanel.php:282
+#: actions/designadminpanel.php:274
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Tato stránka není k dispozici v typu média která přijímáte."
-#: actions/designadminpanel.php:288
-#, fuzzy, php-format
-msgid "Theme directory not readable: %s"
-msgstr "Tato stránka není k dispozici v typu média která přijímáte."
-
-#: actions/designadminpanel.php:292
-#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:296
-#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:312
-#, php-format
-msgid "Max length for %s %s is 255 characters."
-msgstr ""
-
-#: actions/designadminpanel.php:412
+#: actions/designadminpanel.php:370
#, fuzzy
msgid "Change logo"
msgstr "Změnit heslo"
-#: actions/designadminpanel.php:417
+#: actions/designadminpanel.php:375
#, fuzzy
msgid "Site logo"
msgstr "Nové sdělení"
-#: actions/designadminpanel.php:424
+#: actions/designadminpanel.php:382
#, fuzzy
msgid "Change theme"
msgstr "Změnit"
-#: actions/designadminpanel.php:441
+#: actions/designadminpanel.php:399
#, fuzzy
msgid "Site theme"
msgstr "Nové sdělení"
-#: actions/designadminpanel.php:442
+#: actions/designadminpanel.php:400
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:447
-msgid "Theme server"
-msgstr ""
-
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
-
-#: actions/designadminpanel.php:455
-msgid "Theme directory"
-msgstr ""
-
-#: actions/designadminpanel.php:462
-#, fuzzy
-msgid "Avatar Settings"
-msgstr "Nastavení"
-
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Avatar server"
-msgstr "Nastavení"
-
-#: actions/designadminpanel.php:471
-#, fuzzy
-msgid "Avatar path"
-msgstr "Obrázek nahrán"
-
-#: actions/designadminpanel.php:475
-#, fuzzy
-msgid "Avatar directory"
-msgstr "Obrázek nahrán"
-
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:422
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků"
-#: actions/designadminpanel.php:526 lib/designsettings.php:139
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:542 lib/designsettings.php:155
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:543 lib/designsettings.php:156
+#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:548 lib/designsettings.php:161
+#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:554
-msgid "Background server"
-msgstr ""
-
-#: actions/designadminpanel.php:558
-msgid "Background path"
-msgstr ""
-
-#: actions/designadminpanel.php:562
-msgid "Background directory"
-msgstr ""
-
-#: actions/designadminpanel.php:569 lib/designsettings.php:170
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Změnit heslo"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Připojit"
-#: actions/designadminpanel.php:604 lib/designsettings.php:204
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Hledat"
-#: actions/designadminpanel.php:617 lib/designsettings.php:217
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
msgstr ""
-#: actions/designadminpanel.php:630 lib/designsettings.php:230
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Přihlásit"
-#: actions/designadminpanel.php:658 lib/designsettings.php:247
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:659 lib/designsettings.php:248
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:665 lib/designsettings.php:254
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 actions/useradminpanel.php:226
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: 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 "Uložit"
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: actions/designadminpanel.php:582 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1158,83 +1095,83 @@ msgstr ""
msgid "Publish a MicroID for my email address."
msgstr ""
-#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/emailsettings.php:302 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
msgstr "Nastavení uloženo"
-#: actions/emailsettings.php:319
+#: actions/emailsettings.php:320
msgid "No email address."
msgstr ""
-#: actions/emailsettings.php:326
+#: actions/emailsettings.php:327
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr ""
-#: actions/emailsettings.php:333
+#: actions/emailsettings.php:334
msgid "That is already your email address."
msgstr ""
-#: actions/emailsettings.php:336
+#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
msgstr ""
-#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Nelze vložit potvrzující kód"
-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
msgstr ""
-#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
msgstr "Nečeká žádné potvrzení na zrušení."
-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
msgstr "Toto je špatná IM adresa"
-#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
msgstr "Potvrď zrušení"
-#: actions/emailsettings.php:412
+#: actions/emailsettings.php:413
msgid "That is not your email address."
msgstr ""
-#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
msgstr "Adresa byla odstraněna"
-#: actions/emailsettings.php:445 actions/smssettings.php:518
+#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
msgstr ""
-#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
msgid "Couldn't update user record."
msgstr ""
-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
msgstr ""
-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555
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"
@@ -1502,7 +1439,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
msgid "Admin"
msgstr ""
@@ -1562,7 +1499,7 @@ msgid ""
msgstr ""
#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/subgroupnav.php:98
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1774,7 +1711,7 @@ msgstr ""
msgid "Optionally add a personal message to the invitation."
msgstr ""
-#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
msgstr "Odeslat"
@@ -1874,7 +1811,7 @@ msgstr "Neplatné jméno nebo heslo"
msgid "Error setting user. You are probably not authorized."
msgstr "Neautorizován."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:457
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Přihlásit"
@@ -1984,7 +1921,7 @@ msgstr ""
msgid "Direct message to %s sent"
msgstr ""
-#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
msgid "Ajax Error"
msgstr ""
@@ -1992,7 +1929,7 @@ msgstr ""
msgid "New notice"
msgstr "Nové sdělení"
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
#, fuzzy
msgid "Notice posted"
msgstr "Sdělení"
@@ -2029,12 +1966,12 @@ msgid ""
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
-#: actions/noticesearchrss.php:89
+#: actions/noticesearchrss.php:96
#, fuzzy, php-format
msgid "Updates with \"%s\""
msgstr "Mikroblog od %s"
-#: actions/noticesearchrss.php:91
+#: actions/noticesearchrss.php:98
#, fuzzy, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
msgstr "Všechny položky obsahující \"%s\""
@@ -2163,9 +2100,9 @@ msgstr "6 a více znaků"
msgid "Confirm"
msgstr "Heslo znovu"
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "stejné jako heslo výše"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Stejné jako heslo výše"
#: actions/passwordsettings.php:117
msgid "Change"
@@ -2195,6 +2132,113 @@ msgstr "Nelze uložit nové heslo"
msgid "Password saved."
msgstr "Heslo uloženo"
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr ""
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr ""
+
+#: actions/pathsadminpanel.php:140
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Tato stránka není k dispozici v typu média která přijímáte."
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+msgid "Site"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+#, fuzzy
+msgid "Site path"
+msgstr "Nové sdělení"
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr ""
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Avatars"
+msgstr "Obrázek"
+
+#: actions/pathsadminpanel.php:252
+#, fuzzy
+msgid "Avatar server"
+msgstr "Nastavení"
+
+#: actions/pathsadminpanel.php:256
+#, fuzzy
+msgid "Avatar path"
+msgstr "Obrázek nahrán"
+
+#: actions/pathsadminpanel.php:260
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Obrázek nahrán"
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:297
+#, fuzzy
+msgid "Save paths"
+msgstr "Nové sdělení"
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -2298,7 +2342,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr ""
@@ -2525,10 +2569,6 @@ msgstr ""
msgid "6 or more characters, and don't forget it!"
msgstr "6 a více znaků, a nezapomeňte"
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Stejné jako heslo výše"
-
#: actions/recoverpassword.php:243
msgid "Reset"
msgstr "Reset"
@@ -2590,7 +2630,7 @@ msgstr "Chyba v ověřovacím kódu"
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrovat"
@@ -2634,7 +2674,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Email"
@@ -2725,7 +2765,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"
@@ -3062,10 +3102,6 @@ msgstr ""
msgid "User is already silenced."
msgstr "Uživatel nemá profil."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
-msgid "Site"
-msgstr ""
-
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
msgstr ""
@@ -3097,102 +3133,98 @@ msgid "Snapshot frequency must be a number."
msgstr ""
#: actions/siteadminpanel.php:199
-msgid "You must set an SSL sever when enabling SSL."
+msgid "You must set an SSL server when enabling SSL."
msgstr ""
#: actions/siteadminpanel.php:204
-msgid "Invalid SSL server. Max length is 255 characters."
+msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
#: actions/siteadminpanel.php:210
-msgid "Minimum text limit is 140c."
+msgid "Minimum text limit is 140 characters."
msgstr ""
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:224
-#, php-format
-msgid "Locales directory not readable: %s"
+#: actions/siteadminpanel.php:266
+msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:275
+#: actions/siteadminpanel.php:269
#, fuzzy
msgid "Site name"
msgstr "Nové sdělení"
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:279
+#: actions/siteadminpanel.php:274
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:280
+#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:283
+#: actions/siteadminpanel.php:279
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:284
#, fuzzy
-msgid "contact email address for your site"
+msgid "Contact email address for your site"
msgstr "Žádný registrovaný email pro tohoto uživatele."
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:290
+#, fuzzy
+msgid "Local"
+msgstr "Umístění"
+
+#: actions/siteadminpanel.php:301
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:303
+#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:308
msgid "Default site language"
msgstr ""
#: actions/siteadminpanel.php:316
-msgid "Path to locales"
-msgstr ""
-
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
+msgid "URLs"
msgstr ""
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
#, fuzzy
msgid "Server"
msgstr "Obnovit"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
msgstr ""
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-#, fuzzy
-msgid "Site path"
-msgstr "Nové sdělení"
-
-#: actions/siteadminpanel.php:328
+#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
msgstr ""
-#: actions/siteadminpanel.php:330
+#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
+#: actions/siteadminpanel.php:331
+#, fuzzy
+msgid "Access"
+msgstr "Přijmout"
+
#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
@@ -3210,7 +3242,7 @@ msgstr ""
msgid "Make registration invitation only."
msgstr ""
-#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#: actions/siteadminpanel.php:346
#, fuzzy
msgid "Closed"
msgstr "Žádný takový uživatel."
@@ -3219,33 +3251,37 @@ msgstr "Žádný takový uživatel."
msgid "Disable new registrations."
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
#, fuzzy
msgid "Never"
msgstr "Obnovit"
-#: actions/siteadminpanel.php:357
+#: actions/siteadminpanel.php:360
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:358
+#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:364
+#: actions/siteadminpanel.php:366
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:365
-msgid "Snapshots will be sent once every N Web hits"
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
msgstr ""
#: actions/siteadminpanel.php:372
@@ -3256,48 +3292,56 @@ msgstr ""
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:381
+#: actions/siteadminpanel.php:380
+msgid "SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
#, fuzzy
msgid "Sometimes"
msgstr "Sdělení"
-#: actions/siteadminpanel.php:382
+#: actions/siteadminpanel.php:385
msgid "Always"
msgstr ""
-#: actions/siteadminpanel.php:384
+#: actions/siteadminpanel.php:387
msgid "Use SSL"
msgstr ""
-#: actions/siteadminpanel.php:385
+#: actions/siteadminpanel.php:388
msgid "When to use SSL"
msgstr ""
-#: actions/siteadminpanel.php:391
+#: actions/siteadminpanel.php:393
msgid "SSL Server"
msgstr ""
-#: actions/siteadminpanel.php:392
+#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr ""
+
+#: actions/siteadminpanel.php:403
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
#, fuzzy
msgid "Save site settings"
msgstr "Nastavení"
@@ -3608,7 +3652,8 @@ msgstr "Odhlásit"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
-#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
msgid "User"
msgstr ""
@@ -3616,16 +3661,85 @@ msgstr ""
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr ""
+
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
+msgstr ""
+
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr ""
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Profil"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr ""
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
+msgstr ""
+
+#: actions/useradminpanel.php:231
+msgid "New users"
msgstr ""
-#: actions/useradminpanel.php:178
-msgid "Invite-only"
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
msgstr ""
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr ""
+
+#: actions/useradminpanel.php:241
+#, fuzzy
+msgid "Default subscription"
+msgstr "Všechny odběry"
+
+#: actions/useradminpanel.php:242
+#, fuzzy
+msgid "Automatically subscribe new users to this user."
+msgstr "Odběr autorizován"
+
+#: actions/useradminpanel.php:251
+#, fuzzy
+msgid "Invitations"
+msgstr "Umístění"
+
+#: actions/useradminpanel.php:256
+msgid "Invitations enabled"
+msgstr ""
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr ""
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr ""
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/userauthorization.php:105
@@ -3835,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"
@@ -3855,10 +3969,6 @@ msgstr "Nelze vytvořit odebírat"
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr "Profil"
-
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr ""
@@ -3898,136 +4008,136 @@ msgstr ""
msgid "Untitled page"
msgstr ""
-#: lib/action.php:424
+#: lib/action.php:425
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Home"
msgstr "Domů"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:432
+#: lib/action.php:433
#, fuzzy
msgid "Account"
msgstr "O nás"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect"
msgstr "Připojit"
-#: lib/action.php:435
+#: lib/action.php:436
#, fuzzy
msgid "Connect to services"
msgstr "Nelze přesměrovat na server: %s"
-#: lib/action.php:439
+#: lib/action.php:440
#, fuzzy
msgid "Change site configuration"
msgstr "Odběry"
-#: lib/action.php:443 lib/subgroupnav.php:105
+#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:444 lib/subgroupnav.php:106
+#: lib/action.php:445 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout"
msgstr "Odhlásit"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:454
+#: lib/action.php:455
#, fuzzy
msgid "Create an account"
msgstr "Vytvořit nový účet"
-#: lib/action.php:457
+#: lib/action.php:458
msgid "Login to the site"
msgstr ""
-#: lib/action.php:460 lib/action.php:723
+#: lib/action.php:461 lib/action.php:724
msgid "Help"
msgstr "Nápověda"
-#: lib/action.php:460
+#: lib/action.php:461
#, fuzzy
msgid "Help me!"
msgstr "Nápověda"
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
msgstr "Hledat"
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:484
+#: lib/action.php:485
#, fuzzy
msgid "Site notice"
msgstr "Nové sdělení"
-#: lib/action.php:550
+#: lib/action.php:551
msgid "Local views"
msgstr ""
-#: lib/action.php:616
+#: lib/action.php:617
#, fuzzy
msgid "Page notice"
msgstr "Nové sdělení"
-#: lib/action.php:718
+#: lib/action.php:719
#, fuzzy
msgid "Secondary site navigation"
msgstr "Odběry"
-#: lib/action.php:725
+#: lib/action.php:726
msgid "About"
msgstr "O nás"
-#: lib/action.php:727
+#: lib/action.php:728
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:731
+#: lib/action.php:732
msgid "TOS"
msgstr ""
-#: lib/action.php:734
+#: lib/action.php:735
msgid "Privacy"
msgstr "Soukromí"
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
msgstr "Zdroj"
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:740
+#: lib/action.php:741
msgid "Badge"
msgstr ""
-#: lib/action.php:768
+#: lib/action.php:769
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:771
+#: lib/action.php:772
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4036,12 +4146,12 @@ msgstr ""
"**%%site.name%%** je služba microblogů, kterou pro vás poskytuje [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:773
+#: lib/action.php:774
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** je služba mikroblogů."
-#: lib/action.php:775
+#: lib/action.php:776
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4052,34 +4162,34 @@ msgstr ""
"dostupná pod [GNU Affero General Public License](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:789
+#: lib/action.php:790
#, fuzzy
msgid "Site content license"
msgstr "Nové sdělení"
-#: lib/action.php:798
+#: lib/action.php:799
msgid "All "
msgstr ""
-#: lib/action.php:803
+#: lib/action.php:804
msgid "license."
msgstr ""
-#: lib/action.php:1067
+#: lib/action.php:1068
msgid "Pagination"
msgstr ""
-#: lib/action.php:1076
+#: lib/action.php:1077
#, fuzzy
msgid "After"
msgstr "« Novější"
-#: lib/action.php:1084
+#: lib/action.php:1085
#, fuzzy
msgid "Before"
msgstr "Starší »"
-#: lib/action.php:1132
+#: lib/action.php:1133
msgid "There was a problem with your session token."
msgstr ""
@@ -4109,6 +4219,11 @@ msgstr "Potvrzení emailové adresy"
msgid "Design configuration"
msgstr "Potvrzení emailové adresy"
+#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+#, fuzzy
+msgid "Paths configuration"
+msgstr "Potvrzení emailové adresy"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4283,11 +4398,11 @@ msgid "You are not subscribed to anyone."
msgstr "Neodeslal jste nám profil"
#: lib/command.php:620
-#, fuzzy
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
#, fuzzy
@@ -4295,11 +4410,11 @@ msgid "No one is subscribed to you."
msgstr "Vzdálený odběr"
#: lib/command.php:642
-#, fuzzy
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
#, fuzzy
@@ -4307,11 +4422,11 @@ msgid "You are not a member of any groups."
msgstr "Neodeslal jste nám profil"
#: lib/command.php:664
-#, fuzzy
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
msgid ""
@@ -4391,9 +4506,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: "
@@ -4491,7 +4607,7 @@ msgstr "Místo. Město, stát."
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
-#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85
msgid "Group"
msgstr ""
@@ -4538,7 +4654,7 @@ msgstr ""
msgid "Tags in %s group's notices"
msgstr ""
-#: lib/htmloutputter.php:104
+#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
msgstr "Tato stránka není k dispozici v typu média která přijímáte."
@@ -4572,6 +4688,14 @@ msgstr "Žádné takové oznámení."
msgid "Unknown file type"
msgstr ""
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
@@ -4607,7 +4731,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:424
+#: lib/mailbox.php:227 lib/noticelist.php:452
#, fuzzy
msgid "from"
msgstr " od "
@@ -4855,39 +4979,64 @@ msgstr ""
msgid "To"
msgstr ""
-#: lib/messageform.php:162 lib/noticeform.php:173
+#: lib/messageform.php:162 lib/noticeform.php:186
#, fuzzy
msgid "Available characters"
msgstr "6 a více znaků"
-#: lib/noticeform.php:145
+#: lib/noticeform.php:158
#, fuzzy
msgid "Send a notice"
msgstr "Nové sdělení"
-#: lib/noticeform.php:158
+#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
msgstr "Co se děje %s?"
-#: lib/noticeform.php:180
+#: lib/noticeform.php:193
msgid "Attach"
msgstr ""
-#: lib/noticeform.php:184
+#: lib/noticeform.php:197
msgid "Attach a file"
msgstr ""
-#: lib/noticelist.php:478
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "N"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr ""
+
+#: lib/noticelist.php:506
#, fuzzy
msgid "in context"
msgstr "Žádný obsah!"
-#: lib/noticelist.php:498
+#: lib/noticelist.php:526
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:499
+#: lib/noticelist.php:527
#, fuzzy
msgid "Reply"
msgstr "odpověď"
@@ -4921,11 +5070,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í"
@@ -5035,6 +5184,10 @@ msgstr "Žádný takový uživatel."
msgid "Search site"
msgstr "Hledat"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
#, fuzzy
msgid "Search help"
@@ -5048,11 +5201,6 @@ msgstr ""
msgid "Find people on this site"
msgstr ""
-#: lib/searchgroupnav.php:82
-#, fuzzy
-msgid "Notice"
-msgstr "Sdělení"
-
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
msgstr ""
@@ -5194,47 +5342,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"
@@ -5263,11 +5415,3 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
-
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "Žádný takový uživatel."
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "Vzdálený odběr"
diff --git a/locale/de/LC_MESSAGES/statusnet.mo b/locale/de/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index c8d4cc24c..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 e6c0a751f..06b1650ee 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,16 +10,16 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 10:43+0000\n"
-"PO-Revision-Date: 2009-11-18 19:31:34+0000\n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-11-28 19:50:00+0000\n"
"Language-Team: German\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
@@ -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
@@ -436,10 +437,12 @@ msgstr ""
msgid "Not found"
msgstr "Nicht gefunden"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, 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
@@ -550,8 +553,7 @@ msgid "Preview"
msgstr "Vorschau"
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
-#, fuzzy
+#: lib/noticelist.php:550
msgid "Delete"
msgstr "Löschen"
@@ -564,7 +566,7 @@ msgid "Crop"
msgstr "Zuschneiden"
#: actions/avatarsettings.php:265 actions/disfavor.php:74
-#: actions/emailsettings.php:237 actions/favor.php:75
+#: 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
@@ -579,7 +581,7 @@ msgid "There was a problem with your session token. Try again, please."
msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
-#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: 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."
@@ -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."
@@ -716,15 +711,15 @@ msgstr "Nicht erkannter Adresstyp %s"
msgid "That address has already been confirmed."
msgstr "Diese Adresse wurde bereits bestätigt."
-#: actions/confirmaddress.php:114 actions/emailsettings.php:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
#: actions/profilesettings.php:276 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Konnte Benutzerdaten nicht aktualisieren."
-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
msgstr "Konnte E-Mail-Bestätigung nicht löschen."
@@ -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/profileaction.php:206 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:522
-#, fuzzy
+#: actions/deletenotice.php:146 lib/noticelist.php:550
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
@@ -832,185 +818,117 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:278
-#, fuzzy
+#: actions/designadminpanel.php:270
msgid "Invalid logo URL."
-msgstr "Ungültige Größe."
+msgstr "Ungültige URL für das Logo"
-#: actions/designadminpanel.php:282
-#, fuzzy, php-format
-msgid "Theme not available: %s"
-msgstr "Diese Seite liegt in nicht verfügbar in einem "
-
-#: actions/designadminpanel.php:288
-#, fuzzy, php-format
-msgid "Theme directory not readable: %s"
-msgstr "Diese Seite liegt in nicht verfügbar in einem "
-
-#: actions/designadminpanel.php:292
-#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:296
+#: actions/designadminpanel.php:274
#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:312
-#, php-format
-msgid "Max length for %s %s is 255 characters."
-msgstr ""
+msgid "Theme not available: %s"
+msgstr "Theme nicht verfügbar: %s"
-#: actions/designadminpanel.php:412
-#, fuzzy
+#: actions/designadminpanel.php:370
msgid "Change logo"
-msgstr "Ändere dein Passwort"
+msgstr "Logo ändern"
-#: actions/designadminpanel.php:417
+#: actions/designadminpanel.php:375
#, fuzzy
msgid "Site logo"
msgstr "Einladen"
-#: actions/designadminpanel.php:424
+#: actions/designadminpanel.php:382
#, fuzzy
msgid "Change theme"
msgstr "Ändern"
-#: actions/designadminpanel.php:441
+#: actions/designadminpanel.php:399
#, fuzzy
msgid "Site theme"
msgstr "Seitennachricht"
-#: actions/designadminpanel.php:442
+#: actions/designadminpanel.php:400
#, fuzzy
msgid "Theme for the site."
msgstr "Von der Seite abmelden"
-#: actions/designadminpanel.php:447
-msgid "Theme server"
-msgstr ""
-
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
-
-#: actions/designadminpanel.php:455
-msgid "Theme directory"
-msgstr ""
-
-#: actions/designadminpanel.php:462
-#, fuzzy
-msgid "Avatar Settings"
-msgstr "Avatar-Einstellungen"
-
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Avatar server"
-msgstr "Avatar-Einstellungen"
-
-#: actions/designadminpanel.php:471
-#, fuzzy
-msgid "Avatar path"
-msgstr "Avatar aktualisiert."
-
-#: actions/designadminpanel.php:475
-#, fuzzy
-msgid "Avatar directory"
-msgstr "Avatar aktualisiert."
-
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
-msgstr ""
+msgstr "Hintergrundbild ändern"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
-msgstr ""
+msgstr "Hintergrund"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:422
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "Du kannst ein Logo für Deine Gruppe hochladen."
-#: actions/designadminpanel.php:526 lib/designsettings.php:139
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
-msgstr ""
+msgstr "An"
-#: actions/designadminpanel.php:542 lib/designsettings.php:155
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
-msgstr ""
+msgstr "Aus"
-#: actions/designadminpanel.php:543 lib/designsettings.php:156
+#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:548 lib/designsettings.php:161
+#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:554
-msgid "Background server"
-msgstr ""
-
-#: actions/designadminpanel.php:558
-msgid "Background path"
-msgstr ""
-
-#: actions/designadminpanel.php:562
-msgid "Background directory"
-msgstr ""
-
-#: actions/designadminpanel.php:569 lib/designsettings.php:170
-#, fuzzy
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
msgid "Change colours"
-msgstr "Ändere dein Passwort"
+msgstr "Farben ändern"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
-#, fuzzy
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
msgid "Content"
-msgstr "Verbinden"
+msgstr "Inhalt"
-#: actions/designadminpanel.php:604 lib/designsettings.php:204
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Suchen"
-#: actions/designadminpanel.php:617 lib/designsettings.php:217
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
msgstr "Text"
-#: actions/designadminpanel.php:630 lib/designsettings.php:230
-#, fuzzy
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
msgid "Links"
-msgstr "Liste"
+msgstr "Links"
-#: actions/designadminpanel.php:658 lib/designsettings.php:247
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:659 lib/designsettings.php:248
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
-msgstr ""
+msgstr "Standard-Design wiederherstellen"
-#: actions/designadminpanel.php:665 lib/designsettings.php:254
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
-msgstr ""
+msgstr "Standard wiederherstellen"
-#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 actions/useradminpanel.php:226
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: 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 "Speichern"
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: 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!"
@@ -1043,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."
@@ -1147,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."
@@ -1164,37 +1080,37 @@ msgstr "Ich möchte Einträge per E-Mail veröffentlichen."
msgid "Publish a MicroID for my email address."
msgstr "MicroID für meine E-Mail-Adresse veröffentlichen."
-#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/emailsettings.php:302 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
msgstr "Einstellungen gesichert."
-#: actions/emailsettings.php:319
+#: actions/emailsettings.php:320
msgid "No email address."
msgstr "Keine E-Mail-Adresse."
-#: actions/emailsettings.php:326
+#: actions/emailsettings.php:327
msgid "Cannot normalize that email address"
msgstr "Konnte diese E-Mail-Adresse nicht normalisieren"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "Ungültige E-Mail-Adresse"
-#: actions/emailsettings.php:333
+#: actions/emailsettings.php:334
msgid "That is already your email address."
msgstr "Dies ist bereits deine E-Mail-Adresse."
-#: actions/emailsettings.php:336
+#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
msgstr "Diese E-Mail-Adresse gehört einem anderen Nutzer."
-#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Konnte keinen Bestätigungscode einfügen."
-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1203,47 +1119,47 @@ msgstr ""
"Überprüfen Sie Ihren Posteingang (auch den Spamordner!) für den Code und "
"Anweisungen, wie dieser benutzt wird."
-#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
msgstr "Keine ausstehende Bestätigung, die abgebrochen werden kann."
-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
msgstr "Das ist die falsche IM Adresse."
-#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
msgstr "Bestätigung abgebrochen."
-#: actions/emailsettings.php:412
+#: actions/emailsettings.php:413
msgid "That is not your email address."
msgstr "Dies ist nicht deine E-Mail-Adresse."
-#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
msgstr "Die Adresse wurde entfernt."
-#: actions/emailsettings.php:445 actions/smssettings.php:518
+#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
msgstr "Keine Eingangs-E-Mail-Adresse."
-#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
msgid "Couldn't update user record."
msgstr "Konnte Nutzereintrag nicht schreiben"
-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
msgstr "Eingehende E-Mail-Adresse entfernt"
-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555
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"
@@ -1309,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"
@@ -1369,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
@@ -1392,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
@@ -1429,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."
@@ -1442,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 ""
@@ -1471,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"
@@ -1513,8 +1419,7 @@ msgstr "%s Gruppen-Mitglieder, Seite %d"
msgid "A list of the users in this group."
msgstr "Liste der Benutzer in dieser Gruppe."
-#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
-#, fuzzy
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
msgid "Admin"
msgstr "Admin"
@@ -1523,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
@@ -1557,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
@@ -1576,7 +1478,7 @@ msgid ""
msgstr ""
#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/subgroupnav.php:98
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Gruppen"
@@ -1601,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."
@@ -1727,7 +1628,7 @@ msgstr ""
#: actions/invite.php:39
msgid "Invites have been disabled."
-msgstr ""
+msgstr "Einladungen wurden deaktiviert."
#: actions/invite.php:41
#, php-format
@@ -1801,7 +1702,7 @@ msgstr ""
"Wenn du möchtest kannst du zu der Einladung eine persönliche Nachricht "
"anfügen."
-#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
msgstr "Senden"
@@ -1924,7 +1825,7 @@ msgstr "Falscher Benutzername oder Passwort."
msgid "Error setting user. You are probably not authorized."
msgstr "Nicht autorisiert."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:457
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Einloggen"
@@ -1976,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
@@ -2029,16 +1930,15 @@ 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
msgid "Direct message to %s sent"
msgstr "Direkte Nachricht an %s abgeschickt"
-#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
msgid "Ajax Error"
msgstr "Ajax-Fehler"
@@ -2046,7 +1946,7 @@ msgstr "Ajax-Fehler"
msgid "New notice"
msgstr "Neue Nachricht"
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
msgid "Notice posted"
msgstr "Nachricht hinzugefügt"
@@ -2083,12 +1983,12 @@ msgid ""
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
-#: actions/noticesearchrss.php:89
+#: actions/noticesearchrss.php:96
#, fuzzy, php-format
msgid "Updates with \"%s\""
msgstr "Updates von %1$s auf %2$s!"
-#: actions/noticesearchrss.php:91
+#: actions/noticesearchrss.php:98
#, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
msgstr "Alle Aktualisierungen, die den Suchbegriff „%s“ enthalten"
@@ -2153,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."
@@ -2216,9 +2116,9 @@ msgstr "6 oder mehr Zeichen"
msgid "Confirm"
msgstr "Bestätigen"
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "Gleiches Passwort wie oben"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Gleiches Passwort wie zuvor"
#: actions/passwordsettings.php:117
msgid "Change"
@@ -2248,6 +2148,114 @@ msgstr "Konnte neues Passwort nicht speichern"
msgid "Password saved."
msgstr "Passwort gespeichert."
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr ""
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr ""
+
+#: actions/pathsadminpanel.php:140
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Diese Seite liegt in nicht verfügbar in einem "
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+#, fuzzy
+msgid "Site"
+msgstr "Einladen"
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+#, fuzzy
+msgid "Site path"
+msgstr "Seitennachricht"
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr ""
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Avatars"
+msgstr "Avatar"
+
+#: actions/pathsadminpanel.php:252
+#, fuzzy
+msgid "Avatar server"
+msgstr "Avatar-Einstellungen"
+
+#: actions/pathsadminpanel.php:256
+#, fuzzy
+msgid "Avatar path"
+msgstr "Avatar aktualisiert."
+
+#: actions/pathsadminpanel.php:260
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Avatar aktualisiert."
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:297
+#, fuzzy
+msgid "Save paths"
+msgstr "Seitennachricht"
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -2317,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"
@@ -2354,7 +2361,7 @@ msgstr ""
"Tags über dich selbst (Buchstaben, Zahlen, -, ., und _) durch Kommas oder "
"Leerzeichen getrennt"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr "Sprache"
@@ -2378,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."
@@ -2583,10 +2590,6 @@ msgstr "Unbekannter Befehl"
msgid "6 or more characters, and don't forget it!"
msgstr "6 oder mehr Zeichen, und nicht vergessen!"
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Gleiches Passwort wie zuvor"
-
#: actions/recoverpassword.php:243
msgid "Reset"
msgstr "Zurücksetzen"
@@ -2648,7 +2651,7 @@ msgstr "Fehler beim Bestätigungscode."
msgid "Registration successful"
msgstr "Registrierung erfolgreich"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrieren"
@@ -2695,7 +2698,7 @@ msgid "Same as password above. Required."
msgstr "Gleiches Passwort wie zuvor. Pflichteingabe."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-Mail"
@@ -2806,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"
@@ -2821,7 +2824,6 @@ msgid ""
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."
@@ -2842,14 +2844,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
@@ -2893,9 +2895,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."
@@ -2974,19 +2976,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
@@ -3038,9 +3040,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."
@@ -3061,9 +3062,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
@@ -3081,24 +3081,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
@@ -3147,11 +3147,6 @@ msgstr "Du kannst diesem Benutzer keine Nachricht schicken."
msgid "User is already silenced."
msgstr "Dieser Benutzer hat dich blockiert."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
-#, fuzzy
-msgid "Site"
-msgstr "Einladen"
-
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
msgstr ""
@@ -3168,7 +3163,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."
@@ -3183,103 +3178,100 @@ msgid "Snapshot frequency must be a number."
msgstr ""
#: actions/siteadminpanel.php:199
-msgid "You must set an SSL sever when enabling SSL."
+msgid "You must set an SSL server when enabling SSL."
msgstr ""
#: actions/siteadminpanel.php:204
-msgid "Invalid SSL server. Max length is 255 characters."
+msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
#: actions/siteadminpanel.php:210
-msgid "Minimum text limit is 140c."
+msgid "Minimum text limit is 140 characters."
msgstr ""
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:224
-#, php-format
-msgid "Locales directory not readable: %s"
+#: actions/siteadminpanel.php:266
+msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:275
+#: actions/siteadminpanel.php:269
#, fuzzy
msgid "Site name"
msgstr "Seitennachricht"
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:279
+#: actions/siteadminpanel.php:274
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:280
+#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:283
+#: actions/siteadminpanel.php:279
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:284
#, fuzzy
-msgid "contact email address for your site"
+msgid "Contact email address for your site"
msgstr "Neue E-Mail-Adresse um auf %s zu schreiben"
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:290
+#, fuzzy
+msgid "Local"
+msgstr "Lokale Ansichten"
+
+#: actions/siteadminpanel.php:301
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:303
+#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:308
#, fuzzy
msgid "Default site language"
msgstr "Bevorzugte Sprache"
#: actions/siteadminpanel.php:316
-msgid "Path to locales"
-msgstr ""
-
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
-msgstr ""
+#, fuzzy
+msgid "URLs"
+msgstr "URL"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
#, fuzzy
msgid "Server"
msgstr "Wiederherstellung"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
msgstr ""
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-#, fuzzy
-msgid "Site path"
-msgstr "Seitennachricht"
-
-#: actions/siteadminpanel.php:328
+#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
msgstr ""
-#: actions/siteadminpanel.php:330
+#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
+#: actions/siteadminpanel.php:331
+#, fuzzy
+msgid "Access"
+msgstr "Akzeptieren"
+
#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
@@ -3298,7 +3290,7 @@ msgstr "Einladen"
msgid "Make registration invitation only."
msgstr ""
-#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#: actions/siteadminpanel.php:346
#, fuzzy
msgid "Closed"
msgstr "Blockieren"
@@ -3307,33 +3299,37 @@ msgstr "Blockieren"
msgid "Disable new registrations."
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
#, fuzzy
msgid "Never"
msgstr "Wiederherstellung"
-#: actions/siteadminpanel.php:357
+#: actions/siteadminpanel.php:360
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:358
+#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:364
+#: actions/siteadminpanel.php:366
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:365
-msgid "Snapshots will be sent once every N Web hits"
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
msgstr ""
#: actions/siteadminpanel.php:372
@@ -3344,48 +3340,57 @@ msgstr ""
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:381
+#: actions/siteadminpanel.php:380
+#, fuzzy
+msgid "SSL"
+msgstr "SMS"
+
+#: actions/siteadminpanel.php:384
#, fuzzy
msgid "Sometimes"
msgstr "Nachrichten"
-#: actions/siteadminpanel.php:382
+#: actions/siteadminpanel.php:385
msgid "Always"
msgstr ""
-#: actions/siteadminpanel.php:384
+#: actions/siteadminpanel.php:387
msgid "Use SSL"
msgstr ""
-#: actions/siteadminpanel.php:385
+#: actions/siteadminpanel.php:388
msgid "When to use SSL"
msgstr ""
-#: actions/siteadminpanel.php:391
+#: actions/siteadminpanel.php:393
msgid "SSL Server"
msgstr ""
-#: actions/siteadminpanel.php:392
+#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr ""
+
+#: actions/siteadminpanel.php:403
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
#, fuzzy
msgid "Save site settings"
msgstr "Avatar-Einstellungen"
@@ -3400,9 +3405,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."
@@ -3536,7 +3540,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
@@ -3697,7 +3701,8 @@ msgstr "Abbestellt"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
-#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
msgid "User"
msgstr "Benutzer"
@@ -3705,17 +3710,88 @@ msgstr "Benutzer"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr ""
+
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
+msgstr ""
+
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr ""
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Profil"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr ""
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
+msgstr ""
+
+#: actions/useradminpanel.php:231
+msgid "New users"
+msgstr "Neue Nutzer"
+
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr ""
+
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
msgstr ""
-#: actions/useradminpanel.php:178
+#: actions/useradminpanel.php:241
#, fuzzy
-msgid "Invite-only"
-msgstr "Einladen"
+msgid "Default subscription"
+msgstr "Alle Abonnements"
+
+#: actions/useradminpanel.php:242
+#, fuzzy
+msgid "Automatically subscribe new users to this user."
+msgstr ""
+"Abonniere automatisch alle Kontakte, die mich abonnieren (sinnvoll für Nicht-"
+"Menschen)"
+
+#: actions/useradminpanel.php:251
+#, fuzzy
+msgid "Invitations"
+msgstr "Einladung(en) verschickt"
+
+#: actions/useradminpanel.php:256
+#, fuzzy
+msgid "Invitations enabled"
+msgstr "Einladung(en) verschickt"
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr ""
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr ""
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/userauthorization.php:105
@@ -3734,9 +3810,8 @@ msgstr ""
"\"Abbrechen\"."
#: actions/userauthorization.php:188
-#, fuzzy
msgid "License"
-msgstr "Lizenz."
+msgstr "Lizenz"
#: actions/userauthorization.php:209
msgid "Accept"
@@ -3831,9 +3906,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 ""
@@ -3851,14 +3925,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
@@ -3901,9 +3974,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."
@@ -3934,7 +4006,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"
@@ -3948,13 +4020,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"
-
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr "Profil"
+msgstr "Herzlich willkommen bei %1$s, @%2$s!"
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
@@ -3994,131 +4062,131 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "Seite ohne Titel"
-#: lib/action.php:424
+#: lib/action.php:425
msgid "Primary site navigation"
msgstr "Hauptnavigation"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Home"
msgstr "Startseite"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Personal profile and friends timeline"
msgstr "Persönliches Profil und Freundes-Zeitleiste"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Account"
msgstr "Konto"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Change your email, avatar, password, profile"
msgstr "Ändere deine E-Mail, dein Avatar, Passwort, Profil"
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect"
msgstr "Verbinden"
-#: lib/action.php:435
+#: lib/action.php:436
#, fuzzy
msgid "Connect to services"
msgstr "Konnte nicht zum Server umleiten: %s"
-#: lib/action.php:439
+#: lib/action.php:440
#, fuzzy
msgid "Change site configuration"
msgstr "Hauptnavigation"
-#: lib/action.php:443 lib/subgroupnav.php:105
+#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Einladen"
-#: lib/action.php:444 lib/subgroupnav.php:106
-#, fuzzy, php-format
+#: lib/action.php:445 lib/subgroupnav.php:106
+#, 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:449
+#: lib/action.php:450
msgid "Logout"
msgstr "Abmelden"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout from the site"
msgstr "Von der Seite abmelden"
-#: lib/action.php:454
+#: lib/action.php:455
msgid "Create an account"
msgstr "Neues Konto erstellen"
-#: lib/action.php:457
+#: lib/action.php:458
msgid "Login to the site"
msgstr "Auf der Seite anmelden"
-#: lib/action.php:460 lib/action.php:723
+#: lib/action.php:461 lib/action.php:724
msgid "Help"
msgstr "Hilfe"
-#: lib/action.php:460
+#: lib/action.php:461
msgid "Help me!"
msgstr "Hilf mir!"
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
msgstr "Suchen"
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
msgstr "Suche nach Leuten oder Text"
-#: lib/action.php:484
+#: lib/action.php:485
msgid "Site notice"
msgstr "Seitennachricht"
-#: lib/action.php:550
+#: lib/action.php:551
msgid "Local views"
msgstr "Lokale Ansichten"
-#: lib/action.php:616
+#: lib/action.php:617
msgid "Page notice"
msgstr "Neue Nachricht"
-#: lib/action.php:718
+#: lib/action.php:719
msgid "Secondary site navigation"
msgstr "Unternavigation"
-#: lib/action.php:725
+#: lib/action.php:726
msgid "About"
msgstr "Über"
-#: lib/action.php:727
+#: lib/action.php:728
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:731
+#: lib/action.php:732
msgid "TOS"
msgstr ""
-#: lib/action.php:734
+#: lib/action.php:735
msgid "Privacy"
msgstr "Privatsphäre"
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
msgstr "Quellcode"
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:740
+#: lib/action.php:741
#, fuzzy
msgid "Badge"
msgstr "Stups"
-#: lib/action.php:768
+#: lib/action.php:769
msgid "StatusNet software license"
msgstr "StatusNet-Software-Lizenz"
-#: lib/action.php:771
+#: lib/action.php:772
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4127,12 +4195,12 @@ msgstr ""
"**%%site.name%%** ist ein Microbloggingdienst von [%%site.broughtby%%](%%"
"site.broughtbyurl%%)."
-#: lib/action.php:773
+#: lib/action.php:774
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** ist ein Microbloggingdienst."
-#: lib/action.php:775
+#: lib/action.php:776
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4143,33 +4211,33 @@ msgstr ""
"(Version %s) betrieben, die unter der [GNU Affero General Public License]"
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html) erhältlich ist."
-#: lib/action.php:789
+#: lib/action.php:790
msgid "Site content license"
msgstr "StatusNet-Software-Lizenz"
-#: lib/action.php:798
+#: lib/action.php:799
#, fuzzy
msgid "All "
msgstr "Alle "
-#: lib/action.php:803
+#: lib/action.php:804
#, fuzzy
msgid "license."
msgstr "Lizenz."
-#: lib/action.php:1067
+#: lib/action.php:1068
msgid "Pagination"
msgstr "Seitenerstellung"
-#: lib/action.php:1076
+#: lib/action.php:1077
msgid "After"
msgstr "Später"
-#: lib/action.php:1084
+#: lib/action.php:1085
msgid "Before"
msgstr "Vorher"
-#: lib/action.php:1132
+#: lib/action.php:1133
msgid "There was a problem with your session token."
msgstr "Es gab ein Problem mit deinem Sessiontoken."
@@ -4179,19 +4247,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
@@ -4203,26 +4268,30 @@ msgstr "Bestätigung der E-Mail-Adresse"
msgid "Design configuration"
msgstr "SMS-Konfiguration"
+#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+#, fuzzy
+msgid "Paths configuration"
+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"
@@ -4264,7 +4333,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"
@@ -4300,9 +4369,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."
@@ -4314,14 +4383,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"
@@ -4377,11 +4445,10 @@ msgid "You are not subscribed to anyone."
msgstr "Du hast dieses Profil nicht abonniert."
#: lib/command.php:620
-#, fuzzy
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
-msgstr[0] "Du hast dieses Profil nicht abonniert."
-msgstr[1] "Du hast dieses Profil nicht abonniert."
+msgstr[0] "Du hast diese Benutzer bereits abonniert:"
+msgstr[1] "Du hast diese Benutzer bereits abonniert:"
#: lib/command.php:640
#, fuzzy
@@ -4389,7 +4456,6 @@ msgid "No one is subscribed to you."
msgstr "Die Gegenseite konnte Dich nicht abonnieren."
#: lib/command.php:642
-#, fuzzy
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Die Gegenseite konnte Dich nicht abonnieren."
@@ -4401,7 +4467,6 @@ msgid "You are not a member of any groups."
msgstr "Du bist kein Mitglied dieser Gruppe."
#: lib/command.php:664
-#, fuzzy
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."
@@ -4486,9 +4551,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: "
@@ -4590,7 +4657,7 @@ msgstr "Ort der Gruppe, optional, z.B. \"Stadt, Gebiet (oder Region), Land\""
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
-#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85
msgid "Group"
msgstr "Gruppe"
@@ -4637,7 +4704,7 @@ msgstr "Gruppen mit den meisten Beiträgen"
msgid "Tags in %s group's notices"
msgstr "Tags in den Nachrichten der Gruppe %s"
-#: lib/htmloutputter.php:104
+#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
msgstr "Dies Seite liegt in keinem von dir akzeptierten Mediatype vor."
@@ -4670,6 +4737,14 @@ msgstr "Daten verloren."
msgid "Unknown file type"
msgstr "Unbekannter Dateityp"
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
@@ -4705,7 +4780,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:424
+#: lib/mailbox.php:227 lib/noticelist.php:452
#, fuzzy
msgid "from"
msgstr "von"
@@ -4963,41 +5038,64 @@ msgstr "Versende eine direkte Nachricht"
msgid "To"
msgstr "An"
-#: lib/messageform.php:162 lib/noticeform.php:173
+#: lib/messageform.php:162 lib/noticeform.php:186
#, fuzzy
msgid "Available characters"
msgstr "Verfügbare Zeichen"
-#: lib/noticeform.php:145
+#: lib/noticeform.php:158
#, fuzzy
msgid "Send a notice"
msgstr "Nachricht versenden"
-#: lib/noticeform.php:158
+#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
msgstr "Was ist los, %s?"
-#: lib/noticeform.php:180
+#: lib/noticeform.php:193
msgid "Attach"
msgstr ""
-#: lib/noticeform.php:184
+#: lib/noticeform.php:197
msgid "Attach a file"
msgstr ""
-#: lib/noticelist.php:478
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
#, fuzzy
+msgid "N"
+msgstr "Nein"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr ""
+
+#: lib/noticelist.php:506
msgid "in context"
-msgstr "Kein Inhalt!"
+msgstr "im Zusammenhang"
-#: lib/noticelist.php:498
-#, fuzzy
+#: lib/noticelist.php:526
msgid "Reply to this notice"
msgstr "Auf diese Nachricht antworten"
-#: lib/noticelist.php:499
-#, fuzzy
+#: lib/noticelist.php:527
msgid "Reply"
msgstr "Antworten"
@@ -5033,12 +5131,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."
@@ -5092,9 +5190,8 @@ msgid "All subscribers"
msgstr "Alle Abonnenten"
#: lib/profileaction.php:177
-#, fuzzy
msgid "User ID"
-msgstr "Benutzer"
+msgstr "Nutzer ID"
#: lib/profileaction.php:182
msgid "Member since"
@@ -5148,6 +5245,10 @@ msgstr "Benutzer freigeben"
msgid "Search site"
msgstr "Suchen"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
#, fuzzy
msgid "Search help"
@@ -5161,11 +5262,6 @@ msgstr "Leute"
msgid "Find people on this site"
msgstr "Finde Leute auf dieser Seite"
-#: lib/searchgroupnav.php:82
-#, fuzzy
-msgid "Notice"
-msgstr "Nachricht"
-
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
msgstr "Durchsuche den Inhalt der Notices"
@@ -5193,19 +5289,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
@@ -5282,18 +5378,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"
@@ -5307,60 +5401,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."
@@ -5377,11 +5474,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 "Unlock this user"
-#~ msgstr "Benutzer freigeben"
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "Leute, die %s abonniert haben"
diff --git a/locale/el/LC_MESSAGES/statusnet.mo b/locale/el/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 714f1f7c4..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 d684dd7b4..2ab5cf7d1 100644
--- a/locale/el/LC_MESSAGES/statusnet.po
+++ b/locale/el/LC_MESSAGES/statusnet.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 10:43+0000\n"
-"PO-Revision-Date: 2009-11-18 19:31:37+0000\n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-11-28 19:50:04+0000\n"
"Language-Team: Greek\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: el\n"
"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
@@ -439,7 +439,7 @@ msgstr ""
msgid "Not found"
msgstr ""
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -553,7 +553,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
+#: lib/noticelist.php:550
msgid "Delete"
msgstr ""
@@ -566,7 +566,7 @@ msgid "Crop"
msgstr ""
#: actions/avatarsettings.php:265 actions/disfavor.php:74
-#: actions/emailsettings.php:237 actions/favor.php:75
+#: 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
@@ -581,7 +581,7 @@ msgid "There was a problem with your session token. Try again, please."
msgstr ""
#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
-#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: 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."
@@ -714,15 +714,15 @@ msgstr ""
msgid "That address has already been confirmed."
msgstr ""
-#: actions/confirmaddress.php:114 actions/emailsettings.php:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
#: actions/profilesettings.php:276 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Απέτυχε η ενημέρωση του χρήστη."
-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
msgstr "Απέτυχε η διαγραφή email επιβεβαίωσης."
@@ -742,7 +742,7 @@ msgid "Conversation"
msgstr "Τοποθεσία"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206
+#: lib/profileaction.php:206 lib/searchgroupnav.php:82
msgid "Notices"
msgstr ""
@@ -783,7 +783,7 @@ msgstr "Είσαι σίγουρος ότι θες να διαγράψεις αυ
msgid "Do not delete this notice"
msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
-#: actions/deletenotice.php:146 lib/noticelist.php:522
+#: actions/deletenotice.php:146 lib/noticelist.php:550
msgid "Delete this notice"
msgstr ""
@@ -825,179 +825,116 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:278
+#: actions/designadminpanel.php:270
msgid "Invalid logo URL."
msgstr ""
-#: actions/designadminpanel.php:282
+#: actions/designadminpanel.php:274
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL."
-#: actions/designadminpanel.php:288
-#, fuzzy, php-format
-msgid "Theme directory not readable: %s"
-msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL."
-
-#: actions/designadminpanel.php:292
-#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:296
-#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:312
-#, php-format
-msgid "Max length for %s %s is 255 characters."
-msgstr ""
-
-#: actions/designadminpanel.php:412
+#: actions/designadminpanel.php:370
#, fuzzy
msgid "Change logo"
msgstr "Αλλάξτε τον κωδικό σας"
-#: actions/designadminpanel.php:417
+#: actions/designadminpanel.php:375
msgid "Site logo"
msgstr ""
-#: actions/designadminpanel.php:424
+#: actions/designadminpanel.php:382
#, fuzzy
msgid "Change theme"
msgstr "Αλλαγή"
-#: actions/designadminpanel.php:441
+#: actions/designadminpanel.php:399
#, fuzzy
msgid "Site theme"
msgstr "Αλλαγή"
-#: actions/designadminpanel.php:442
+#: actions/designadminpanel.php:400
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:447
-msgid "Theme server"
-msgstr ""
-
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
-
-#: actions/designadminpanel.php:455
-msgid "Theme directory"
-msgstr ""
-
-#: actions/designadminpanel.php:462
-#, fuzzy
-msgid "Avatar Settings"
-msgstr "Ρυθμίσεις OpenID"
-
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Avatar server"
-msgstr "Ρυθμίσεις OpenID"
-
-#: actions/designadminpanel.php:471
-#, fuzzy
-msgid "Avatar path"
-msgstr "Ρυθμίσεις OpenID"
-
-#: actions/designadminpanel.php:475
-#, fuzzy
-msgid "Avatar directory"
-msgstr "Ρυθμίσεις OpenID"
-
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:422
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr ""
-#: actions/designadminpanel.php:526 lib/designsettings.php:139
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:542 lib/designsettings.php:155
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:543 lib/designsettings.php:156
+#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:548 lib/designsettings.php:161
+#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:554
-msgid "Background server"
-msgstr ""
-
-#: actions/designadminpanel.php:558
-msgid "Background path"
-msgstr ""
-
-#: actions/designadminpanel.php:562
-msgid "Background directory"
-msgstr ""
-
-#: actions/designadminpanel.php:569 lib/designsettings.php:170
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Αλλάξτε τον κωδικό σας"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Σύνδεση"
-#: actions/designadminpanel.php:604 lib/designsettings.php:204
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
msgid "Sidebar"
msgstr ""
-#: actions/designadminpanel.php:617 lib/designsettings.php:217
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
msgstr ""
-#: actions/designadminpanel.php:630 lib/designsettings.php:230
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Σύνδεση"
-#: actions/designadminpanel.php:658 lib/designsettings.php:247
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:659 lib/designsettings.php:248
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:665 lib/designsettings.php:254
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 actions/useradminpanel.php:226
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/pathsadminpanel.php:296 actions/profilesettings.php:167
+#: actions/siteadminpanel.php:421 actions/smssettings.php:181
+#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/useradminpanel.php:313 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr ""
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: actions/designadminpanel.php:582 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1150,37 +1087,37 @@ msgstr "Θέλω να δημοσιεύω ενημερώσεις μέσω email"
msgid "Publish a MicroID for my email address."
msgstr ""
-#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/emailsettings.php:302 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
msgstr "Οι προτιμήσεις αποθηκεύτηκαν"
-#: actions/emailsettings.php:319
+#: actions/emailsettings.php:320
msgid "No email address."
msgstr ""
-#: actions/emailsettings.php:326
+#: actions/emailsettings.php:327
msgid "Cannot normalize that email address"
msgstr "Αδυναμία κανονικοποίησης αυτής της email διεύθυνσης"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr ""
-#: actions/emailsettings.php:333
+#: actions/emailsettings.php:334
msgid "That is already your email address."
msgstr ""
-#: actions/emailsettings.php:336
+#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
msgstr ""
-#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Απέτυχε η εισαγωγή κωδικού επιβεβαίωσης."
-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1189,47 +1126,47 @@ msgstr ""
"προσθέσατε. Ελέγξτε τα εισερχόμενα (και τον φάκελο ανεπιθύμητης "
"αλληλογραφίας) για τον κωδικό και για το πως να τον χρησιμοποιήσετε."
-#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
msgstr ""
-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
msgstr ""
-#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
msgstr "Η επιβεβαίωση ακυρώθηκε."
-#: actions/emailsettings.php:412
+#: actions/emailsettings.php:413
msgid "That is not your email address."
msgstr ""
-#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
msgstr ""
-#: actions/emailsettings.php:445 actions/smssettings.php:518
+#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
msgstr ""
-#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
msgid "Couldn't update user record."
msgstr "Απέτυχε η ενημέρωση εγγραφής του χρήστη."
-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
msgstr "Η διεύθυνση του εισερχόμενου email αφαιρέθηκε."
-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555
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 ""
@@ -1487,7 +1424,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
msgid "Admin"
msgstr "Διαχειριστής"
@@ -1544,7 +1481,7 @@ msgid ""
msgstr ""
#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/subgroupnav.php:98
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1751,7 +1688,7 @@ msgstr ""
msgid "Optionally add a personal message to the invitation."
msgstr ""
-#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
msgstr ""
@@ -1847,7 +1784,7 @@ msgstr "Λάθος όνομα χρήστη ή κωδικός"
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:204 actions/login.php:257 lib/action.php:457
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Σύνδεση"
@@ -1959,7 +1896,7 @@ msgstr ""
msgid "Direct message to %s sent"
msgstr ""
-#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
msgid "Ajax Error"
msgstr ""
@@ -1967,7 +1904,7 @@ msgstr ""
msgid "New notice"
msgstr ""
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
msgid "Notice posted"
msgstr ""
@@ -2001,12 +1938,12 @@ msgid ""
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
-#: actions/noticesearchrss.php:89
+#: actions/noticesearchrss.php:96
#, php-format
msgid "Updates with \"%s\""
msgstr ""
-#: actions/noticesearchrss.php:91
+#: actions/noticesearchrss.php:98
#, fuzzy, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
msgstr "Όλες οι ενημερώσεις που ταιριάζουν με τον όρο αναζήτησης \"%s\""
@@ -2134,8 +2071,8 @@ msgstr "6 ή περισσότεροι χαρακτήρες"
msgid "Confirm"
msgstr "Επιβεβαίωση"
-#: actions/passwordsettings.php:113
-msgid "same as password above"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
msgstr ""
#: actions/passwordsettings.php:117
@@ -2166,6 +2103,111 @@ msgstr "Αδύνατη η αποθήκευση του νέου κωδικού"
msgid "Password saved."
msgstr "Ο κωδικός αποθηκεύτηκε."
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr ""
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr ""
+
+#: actions/pathsadminpanel.php:140
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL."
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+msgid "Site"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+msgid "Site path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr ""
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Avatars"
+msgstr "Ρυθμίσεις OpenID"
+
+#: actions/pathsadminpanel.php:252
+#, fuzzy
+msgid "Avatar server"
+msgstr "Ρυθμίσεις OpenID"
+
+#: actions/pathsadminpanel.php:256
+#, fuzzy
+msgid "Avatar path"
+msgstr "Ρυθμίσεις OpenID"
+
+#: actions/pathsadminpanel.php:260
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Ρυθμίσεις OpenID"
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:297
+msgid "Save paths"
+msgstr ""
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -2264,7 +2306,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr ""
@@ -2491,10 +2533,6 @@ msgstr ""
msgid "6 or more characters, and don't forget it!"
msgstr "6 ή περισσότεροι χαρακτήρες και μην το ξεχάσετε!"
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr ""
-
#: actions/recoverpassword.php:243
msgid "Reset"
msgstr ""
@@ -2555,7 +2593,7 @@ msgstr ""
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
#: lib/logingroupnav.php:85
msgid "Register"
msgstr ""
@@ -2599,7 +2637,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Email"
@@ -2704,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 ""
@@ -3037,10 +3075,6 @@ msgstr ""
msgid "User is already silenced."
msgstr ""
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
-msgid "Site"
-msgstr ""
-
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
msgstr ""
@@ -3072,100 +3106,97 @@ msgid "Snapshot frequency must be a number."
msgstr ""
#: actions/siteadminpanel.php:199
-msgid "You must set an SSL sever when enabling SSL."
+msgid "You must set an SSL server when enabling SSL."
msgstr ""
#: actions/siteadminpanel.php:204
-msgid "Invalid SSL server. Max length is 255 characters."
+msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
#: actions/siteadminpanel.php:210
-msgid "Minimum text limit is 140c."
+msgid "Minimum text limit is 140 characters."
msgstr ""
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:224
-#, php-format
-msgid "Locales directory not readable: %s"
+#: actions/siteadminpanel.php:266
+msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:275
+#: actions/siteadminpanel.php:269
msgid "Site name"
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:279
+#: actions/siteadminpanel.php:274
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:280
+#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:283
+#: actions/siteadminpanel.php:279
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:284
#, fuzzy
-msgid "contact email address for your site"
+msgid "Contact email address for your site"
msgstr "Η διεύθυνση του εισερχόμενου email αφαιρέθηκε."
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:290
+#, fuzzy
+msgid "Local"
+msgstr "Τοποθεσία"
+
+#: actions/siteadminpanel.php:301
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:303
+#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:308
msgid "Default site language"
msgstr ""
#: actions/siteadminpanel.php:316
-msgid "Path to locales"
-msgstr ""
-
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
+msgid "URLs"
msgstr ""
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
#, fuzzy
msgid "Server"
msgstr "Αποχώρηση"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
msgstr ""
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-msgid "Site path"
-msgstr ""
-
-#: actions/siteadminpanel.php:328
+#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
msgstr ""
-#: actions/siteadminpanel.php:330
+#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
+#: actions/siteadminpanel.php:331
+#, fuzzy
+msgid "Access"
+msgstr "Αποδοχή"
+
#: actions/siteadminpanel.php:334
msgid "Private"
msgstr ""
@@ -3182,7 +3213,7 @@ msgstr ""
msgid "Make registration invitation only."
msgstr ""
-#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#: actions/siteadminpanel.php:346
msgid "Closed"
msgstr ""
@@ -3190,33 +3221,37 @@ msgstr ""
msgid "Disable new registrations."
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
#, fuzzy
msgid "Never"
msgstr "Αποχώρηση"
-#: actions/siteadminpanel.php:357
+#: actions/siteadminpanel.php:360
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:358
+#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:364
+#: actions/siteadminpanel.php:366
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:365
-msgid "Snapshots will be sent once every N Web hits"
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
msgstr ""
#: actions/siteadminpanel.php:372
@@ -3227,47 +3262,55 @@ msgstr ""
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:381
+#: actions/siteadminpanel.php:380
+msgid "SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
msgid "Sometimes"
msgstr ""
-#: actions/siteadminpanel.php:382
+#: actions/siteadminpanel.php:385
msgid "Always"
msgstr ""
-#: actions/siteadminpanel.php:384
+#: actions/siteadminpanel.php:387
msgid "Use SSL"
msgstr ""
-#: actions/siteadminpanel.php:385
+#: actions/siteadminpanel.php:388
msgid "When to use SSL"
msgstr ""
-#: actions/siteadminpanel.php:391
+#: actions/siteadminpanel.php:393
msgid "SSL Server"
msgstr ""
-#: actions/siteadminpanel.php:392
+#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr ""
+
+#: actions/siteadminpanel.php:403
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
#, fuzzy
msgid "Save site settings"
msgstr "Ρυθμίσεις OpenID"
@@ -3569,7 +3612,8 @@ msgstr ""
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
-#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
msgid "User"
msgstr ""
@@ -3577,16 +3621,88 @@ msgstr ""
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr ""
+
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
+msgstr ""
+
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr ""
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr ""
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr ""
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:178
-msgid "Invite-only"
+#: actions/useradminpanel.php:231
+#, fuzzy
+msgid "New users"
+msgstr "Διαγραφή μηνύματος"
+
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr ""
+
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr ""
+
+#: actions/useradminpanel.php:241
+#, fuzzy
+msgid "Default subscription"
+msgstr "Όλες οι συνδρομές"
+
+#: actions/useradminpanel.php:242
+#, fuzzy
+msgid "Automatically subscribe new users to this user."
+msgstr ""
+"Αυτόματα γίνε συνδρομητής σε όσους γίνονται συνδρομητές σε μένα (χρήση "
+"κυρίως από λογισμικό και όχι ανθρώπους)"
+
+#: actions/useradminpanel.php:251
+#, fuzzy
+msgid "Invitations"
+msgstr "Τοποθεσία"
+
+#: actions/useradminpanel.php:256
+msgid "Invitations enabled"
+msgstr ""
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr ""
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
msgstr ""
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr ""
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/userauthorization.php:105
@@ -3781,7 +3897,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"
@@ -3801,10 +3917,6 @@ msgstr "Αδύνατη η αποθήκευση των νέων πληροφορ
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr ""
-
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Αλλάξτε τις ρυθμίσεις του προφίλ σας"
@@ -3843,132 +3955,132 @@ msgstr ""
msgid "Untitled page"
msgstr ""
-#: lib/action.php:424
+#: lib/action.php:425
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Home"
msgstr "Αρχή"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:432
+#: lib/action.php:433
#, fuzzy
msgid "Account"
msgstr "Περί"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect"
msgstr "Σύνδεση"
-#: lib/action.php:435
+#: lib/action.php:436
#, fuzzy
msgid "Connect to services"
msgstr "Αδυναμία ανακατεύθηνσης στο διακομιστή: %s"
-#: lib/action.php:439
+#: lib/action.php:440
msgid "Change site configuration"
msgstr ""
-#: lib/action.php:443 lib/subgroupnav.php:105
+#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:444 lib/subgroupnav.php:106
+#: lib/action.php:445 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Προσκάλεσε φίλους και συναδέλφους σου να γίνουν μέλη στο %s"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout"
msgstr "Αποσύνδεση"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:454
+#: lib/action.php:455
#, fuzzy
msgid "Create an account"
msgstr "Δημιουργία νέου λογαριασμού"
-#: lib/action.php:457
+#: lib/action.php:458
msgid "Login to the site"
msgstr ""
-#: lib/action.php:460 lib/action.php:723
+#: lib/action.php:461 lib/action.php:724
msgid "Help"
msgstr "Βοήθεια"
-#: lib/action.php:460
+#: lib/action.php:461
#, fuzzy
msgid "Help me!"
msgstr "Βοήθεια"
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
msgstr ""
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:484
+#: lib/action.php:485
msgid "Site notice"
msgstr ""
-#: lib/action.php:550
+#: lib/action.php:551
msgid "Local views"
msgstr ""
-#: lib/action.php:616
+#: lib/action.php:617
msgid "Page notice"
msgstr ""
-#: lib/action.php:718
+#: lib/action.php:719
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:725
+#: lib/action.php:726
msgid "About"
msgstr "Περί"
-#: lib/action.php:727
+#: lib/action.php:728
msgid "FAQ"
msgstr "Συχνές ερωτήσεις"
-#: lib/action.php:731
+#: lib/action.php:732
msgid "TOS"
msgstr ""
-#: lib/action.php:734
+#: lib/action.php:735
msgid "Privacy"
msgstr ""
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
msgstr ""
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Contact"
msgstr "Επικοινωνία"
-#: lib/action.php:740
+#: lib/action.php:741
msgid "Badge"
msgstr ""
-#: lib/action.php:768
+#: lib/action.php:769
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:771
+#: lib/action.php:772
#, fuzzy, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3977,13 +4089,13 @@ msgstr ""
"To **%%site.name%%** είναι μία υπηρεσία microblogging (μικρο-ιστολογίου) που "
"έφερε κοντά σας το [%%site.broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:773
+#: lib/action.php:774
#, fuzzy, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
"Το **%%site.name%%** είναι μία υπηρεσία microblogging (μικρο-ιστολογίου). "
-#: lib/action.php:775
+#: lib/action.php:776
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3991,31 +4103,31 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:789
+#: lib/action.php:790
msgid "Site content license"
msgstr ""
-#: lib/action.php:798
+#: lib/action.php:799
msgid "All "
msgstr ""
-#: lib/action.php:803
+#: lib/action.php:804
msgid "license."
msgstr ""
-#: lib/action.php:1067
+#: lib/action.php:1068
msgid "Pagination"
msgstr ""
-#: lib/action.php:1076
+#: lib/action.php:1077
msgid "After"
msgstr ""
-#: lib/action.php:1084
+#: lib/action.php:1085
msgid "Before"
msgstr ""
-#: lib/action.php:1132
+#: lib/action.php:1133
msgid "There was a problem with your session token."
msgstr ""
@@ -4045,6 +4157,11 @@ msgstr "Επιβεβαίωση διεύθυνσης email"
msgid "Design configuration"
msgstr "Επιβεβαίωση διεύθυνσης email"
+#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+#, fuzzy
+msgid "Paths configuration"
+msgstr "Επιβεβαίωση διεύθυνσης email"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4217,7 +4334,6 @@ msgid "You are not subscribed to anyone."
msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
#: lib/command.php:620
-#, fuzzy
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
@@ -4229,7 +4345,6 @@ msgid "No one is subscribed to you."
msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
#: lib/command.php:642
-#, fuzzy
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
@@ -4241,7 +4356,6 @@ msgid "You are not a member of any groups."
msgstr "Ομάδες με τα περισσότερα μέλη"
#: lib/command.php:664
-#, fuzzy
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Ομάδες με τα περισσότερα μέλη"
@@ -4326,7 +4440,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
@@ -4421,7 +4535,7 @@ msgstr "Τοποθεσία της ομάδας (εάν υπάρχει), πχ: \"
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
-#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85
msgid "Group"
msgstr "Ομάδα"
@@ -4466,7 +4580,7 @@ msgstr "Ομάδες με τις περισσότερες δημοσιεύσει
msgid "Tags in %s group's notices"
msgstr ""
-#: lib/htmloutputter.php:104
+#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
msgstr ""
@@ -4500,6 +4614,14 @@ msgstr "Αδύνατη η αποθήκευση του προφίλ."
msgid "Unknown file type"
msgstr ""
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
@@ -4533,7 +4655,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:424
+#: lib/mailbox.php:227 lib/noticelist.php:452
#, fuzzy
msgid "from"
msgstr "από"
@@ -4777,37 +4899,62 @@ msgstr ""
msgid "To"
msgstr ""
-#: lib/messageform.php:162 lib/noticeform.php:173
+#: lib/messageform.php:162 lib/noticeform.php:186
#, fuzzy
msgid "Available characters"
msgstr "6 ή περισσότεροι χαρακτήρες"
-#: lib/noticeform.php:145
+#: lib/noticeform.php:158
msgid "Send a notice"
msgstr ""
-#: lib/noticeform.php:158
+#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
msgstr ""
-#: lib/noticeform.php:180
+#: lib/noticeform.php:193
msgid "Attach"
msgstr ""
-#: lib/noticeform.php:184
+#: lib/noticeform.php:197
msgid "Attach a file"
msgstr ""
-#: lib/noticelist.php:478
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "N"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr ""
+
+#: lib/noticelist.php:506
msgid "in context"
msgstr ""
-#: lib/noticelist.php:498
+#: lib/noticelist.php:526
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:499
+#: lib/noticelist.php:527
msgid "Reply"
msgstr ""
@@ -4840,11 +4987,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 "Απέτυχε η εισαγωγή νέας συνδρομής."
@@ -4950,6 +5097,10 @@ msgstr "Αδυναμία διαγραφής αυτού του μηνύματος
msgid "Search site"
msgstr ""
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
msgid "Search help"
msgstr ""
@@ -4962,10 +5113,6 @@ msgstr ""
msgid "Find people on this site"
msgstr ""
-#: lib/searchgroupnav.php:82
-msgid "Notice"
-msgstr "Μήνυμα"
-
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
msgstr ""
@@ -5105,47 +5252,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 ""
@@ -5174,7 +5325,3 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
-
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.mo b/locale/en_GB/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 694b1eb90..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 628da61d8..ba1d10345 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -1,6 +1,7 @@
# Translation of StatusNet to British English
#
# Author@translatewiki.net: CiaranG
+# Author@translatewiki.net: Lockal
# --
# This file is distributed under the same license as the StatusNet package.
#
@@ -8,16 +9,16 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 10:43+0000\n"
-"PO-Revision-Date: 2009-11-18 19:31:40+0000\n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-11-28 19:50:06+0000\n"
"Language-Team: British English\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: en-gb\n"
"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
@@ -285,14 +286,12 @@ msgid "Two user ids or screen_names must be supplied."
msgstr "Two user ids or screen_names must be supplied."
#: actions/apifriendshipsshow.php:135
-#, fuzzy
msgid "Could not determine source user."
-msgstr "Could not retrieve public stream."
+msgstr "Could not determine source user."
#: actions/apifriendshipsshow.php:143
-#, fuzzy
msgid "Could not find target user."
-msgstr "Couldn't find any statuses."
+msgstr "Could not find target user."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
@@ -325,9 +324,9 @@ msgid "Full name is too long (max 255 chars)."
msgstr "Full name is too long (max 255 chars)."
#: actions/apigroupcreate.php:213
-#, fuzzy, php-format
+#, php-format
msgid "Description is too long (max %d chars)."
-msgstr "description is too long (max 140 chars)."
+msgstr "Description is too long (max %d chars)"
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
#: actions/newgroup.php:148 actions/profilesettings.php:225
@@ -343,15 +342,15 @@ msgstr ""
#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
-#, fuzzy, php-format
+#, php-format
msgid "Invalid alias: \"%s\""
-msgstr "Invalid tag: \"%s\""
+msgstr "Invalid alias: \"%s\""
#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
-#, fuzzy, php-format
+#, php-format
msgid "Alias \"%s\" already in use. Try another one."
-msgstr "Nickname already in use. Try another one."
+msgstr "Alias \"%s\" already in use. Try another one."
#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
@@ -361,9 +360,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 method not found!"
+msgstr "Group not found!"
#: actions/apigroupjoin.php:110
msgid "You are already a member of that group."
@@ -394,19 +392,19 @@ msgid "%s groups"
msgstr "%s groups"
#: actions/apigrouplistall.php:94
-#, fuzzy, php-format
+#, php-format
msgid "groups on %s"
-msgstr "Group actions"
+msgstr "groups on %s"
#: actions/apigrouplist.php:95
-#, fuzzy, php-format
+#, php-format
msgid "%s's groups"
-msgstr "%s groups"
+msgstr "%s's groups"
#: actions/apigrouplist.php:103
-#, fuzzy, php-format
+#, php-format
msgid "Groups %s is a member of on %s."
-msgstr "Groups %s is a member of"
+msgstr "Groups %s is a member of on %s."
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
@@ -417,9 +415,8 @@ msgid "You may not delete another user's status."
msgstr "You may not delete another user's status."
#: actions/apistatusesshow.php:138
-#, fuzzy
msgid "Status deleted."
-msgstr "Avatar updated."
+msgstr "Status deleted."
#: actions/apistatusesshow.php:144
msgid "No status with that ID found."
@@ -435,7 +432,7 @@ msgstr "That's too long. Max notice size is %d chars."
msgid "Not found"
msgstr "Not found"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -468,9 +465,9 @@ msgid "Updates from %1$s on %2$s!"
msgstr "Updates from %1$s on %2$s!"
#: actions/apitimelinementions.php:116
-#, fuzzy, php-format
+#, php-format
msgid "%1$s / Updates mentioning %2$s"
-msgstr "%1$s / Updates replying to %2$s"
+msgstr "%1$s / Updates mentioning %2$s"
#: actions/apitimelinementions.php:126
#, php-format
@@ -493,9 +490,9 @@ msgid "Notices tagged with %s"
msgstr "Notices tagged with %s"
#: actions/apitimelinetag.php:107 actions/tagrss.php:64
-#, fuzzy, php-format
+#, php-format
msgid "Updates tagged with %1$s on %2$s!"
-msgstr "Updates from %1$s on %2$s!"
+msgstr "Updates tagged with %1$s on %2$s!"
#: actions/apiusershow.php:96
msgid "Not found."
@@ -524,9 +521,9 @@ 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 "You can upload your personal avatar."
+msgstr "You can upload your personal avatar. The maximum file size is %s."
#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
@@ -550,7 +547,7 @@ msgid "Preview"
msgstr "Preview"
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
+#: lib/noticelist.php:550
msgid "Delete"
msgstr "Delete"
@@ -563,7 +560,7 @@ msgid "Crop"
msgstr "Crop"
#: actions/avatarsettings.php:265 actions/disfavor.php:74
-#: actions/emailsettings.php:237 actions/favor.php:75
+#: 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
@@ -578,7 +575,7 @@ msgid "There was a problem with your session token. Try again, please."
msgstr "There was a problem with your session token. Try again, please."
#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
-#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: 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."
@@ -620,24 +617,22 @@ msgid "No such group"
msgstr "No such group"
#: actions/blockedfromgroup.php:90
-#, fuzzy, php-format
+#, php-format
msgid "%s blocked profiles"
-msgstr "User profile"
+msgstr "%s blocked profiles"
#: actions/blockedfromgroup.php:93
-#, fuzzy, php-format
+#, php-format
msgid "%s blocked profiles, page %d"
-msgstr "%s and friends, page %d"
+msgstr "%s blocked profiles, page %d"
#: actions/blockedfromgroup.php:108
-#, fuzzy
msgid "A list of the users blocked from joining this group."
-msgstr "A list of the users in this group."
+msgstr "A list of the users blocked from joining this group."
#: actions/blockedfromgroup.php:281
-#, fuzzy
msgid "Unblock user from group"
-msgstr "Unblock user failed."
+msgstr "Unblock user from group"
#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
msgid "Unblock"
@@ -711,15 +706,15 @@ msgstr "Unrecognised address type %s"
msgid "That address has already been confirmed."
msgstr "That address has already been confirmed."
-#: actions/confirmaddress.php:114 actions/emailsettings.php:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
#: actions/profilesettings.php:276 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Couldn't update user."
-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
msgstr "Couldn't delete e-mail confirmation."
@@ -738,7 +733,7 @@ msgid "Conversation"
msgstr "Conversation"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206
+#: lib/profileaction.php:206 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Notices"
@@ -780,7 +775,7 @@ msgstr "Are you sure you want to delete this notice?"
msgid "Do not delete this notice"
msgstr "Do not delete this notice"
-#: actions/deletenotice.php:146 lib/noticelist.php:522
+#: actions/deletenotice.php:146 lib/noticelist.php:550
msgid "Delete this notice"
msgstr "Delete this notice"
@@ -811,9 +806,8 @@ msgid ""
msgstr ""
#: actions/deleteuser.php:148 lib/deleteuserform.php:77
-#, fuzzy
msgid "Delete this user"
-msgstr "Delete this notice"
+msgstr "Delete this user"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
#: lib/adminpanelaction.php:302 lib/groupnav.php:119
@@ -824,182 +818,116 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:278
+#: actions/designadminpanel.php:270
#, fuzzy
msgid "Invalid logo URL."
msgstr "Invalid size."
-#: actions/designadminpanel.php:282
+#: actions/designadminpanel.php:274
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "This page is not available in a "
-#: actions/designadminpanel.php:288
-#, fuzzy, php-format
-msgid "Theme directory not readable: %s"
-msgstr "This page is not available in a "
-
-#: actions/designadminpanel.php:292
-#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:296
-#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:312
-#, php-format
-msgid "Max length for %s %s is 255 characters."
-msgstr ""
-
-#: actions/designadminpanel.php:412
-#, fuzzy
+#: actions/designadminpanel.php:370
msgid "Change logo"
-msgstr "Change colours"
+msgstr "Change logo"
-#: actions/designadminpanel.php:417
+#: actions/designadminpanel.php:375
#, fuzzy
msgid "Site logo"
msgstr "Invite"
-#: actions/designadminpanel.php:424
+#: actions/designadminpanel.php:382
#, fuzzy
msgid "Change theme"
msgstr "Change"
-#: actions/designadminpanel.php:441
-#, fuzzy
+#: actions/designadminpanel.php:399
msgid "Site theme"
-msgstr "Site notice"
+msgstr "Site theme"
-#: actions/designadminpanel.php:442
+#: actions/designadminpanel.php:400
#, fuzzy
msgid "Theme for the site."
msgstr "Logout from the site"
-#: actions/designadminpanel.php:447
-msgid "Theme server"
-msgstr ""
-
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
-
-#: actions/designadminpanel.php:455
-msgid "Theme directory"
-msgstr ""
-
-#: actions/designadminpanel.php:462
-#, fuzzy
-msgid "Avatar Settings"
-msgstr "Avatar settings"
-
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Avatar server"
-msgstr "Avatar settings"
-
-#: actions/designadminpanel.php:471
-#, fuzzy
-msgid "Avatar path"
-msgstr "Avatar updated."
-
-#: actions/designadminpanel.php:475
-#, fuzzy
-msgid "Avatar directory"
-msgstr "Avatar updated."
-
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:422
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "You can upload a logo image for your group."
-#: actions/designadminpanel.php:526 lib/designsettings.php:139
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:542 lib/designsettings.php:155
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:543 lib/designsettings.php:156
+#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:548 lib/designsettings.php:161
+#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:554
-msgid "Background server"
-msgstr ""
-
-#: actions/designadminpanel.php:558
-msgid "Background path"
-msgstr ""
-
-#: actions/designadminpanel.php:562
-msgid "Background directory"
-msgstr ""
-
-#: actions/designadminpanel.php:569 lib/designsettings.php:170
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
msgid "Change colours"
msgstr "Change colours"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Connect"
-#: actions/designadminpanel.php:604 lib/designsettings.php:204
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Search"
-#: actions/designadminpanel.php:617 lib/designsettings.php:217
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
msgstr "Text"
-#: actions/designadminpanel.php:630 lib/designsettings.php:230
-#, fuzzy
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
msgid "Links"
-msgstr "Login"
+msgstr "Links"
-#: actions/designadminpanel.php:658 lib/designsettings.php:247
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:659 lib/designsettings.php:248
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:665 lib/designsettings.php:254
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 actions/useradminpanel.php:226
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: 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 "Save"
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: actions/designadminpanel.php:582 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1034,9 +962,9 @@ msgid "Use this form to edit the group."
msgstr "Use this form to edit the group."
#: actions/editgroup.php:201 actions/newgroup.php:145
-#, fuzzy, php-format
+#, php-format
msgid "description is too long (max %d chars)."
-msgstr "description is too long (max 140 chars)."
+msgstr "description is too long (max %d chars)."
#: actions/editgroup.php:253
msgid "Could not update group."
@@ -1149,37 +1077,37 @@ msgstr "I want to post notices by e-mail."
msgid "Publish a MicroID for my email address."
msgstr "Publish a MicroID for my e-mail address."
-#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/emailsettings.php:302 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
msgstr "Preferences saved."
-#: actions/emailsettings.php:319
+#: actions/emailsettings.php:320
msgid "No email address."
msgstr "No e-mail address."
-#: actions/emailsettings.php:326
+#: actions/emailsettings.php:327
msgid "Cannot normalize that email address"
msgstr "Cannot normalise that e-mail address"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "Not a valid e-mail address."
-#: actions/emailsettings.php:333
+#: actions/emailsettings.php:334
msgid "That is already your email address."
msgstr "That is already your e-mail address."
-#: actions/emailsettings.php:336
+#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
msgstr "That e-mail address already belongs to another user."
-#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Couldn't insert confirmation code."
-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1187,47 +1115,47 @@ msgstr ""
"A confirmation code was sent to the e-mail address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
-#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
msgstr "No pending confirmation to cancel."
-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
msgstr "That is the wrong IM address."
-#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
msgstr "Confirmation cancelled."
-#: actions/emailsettings.php:412
+#: actions/emailsettings.php:413
msgid "That is not your email address."
msgstr "That is not your e-mail address."
-#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
msgstr "The address was removed."
-#: actions/emailsettings.php:445 actions/smssettings.php:518
+#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
msgstr "No incoming e-mail address."
-#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
msgid "Couldn't update user record."
msgstr "Couldn't update user record."
-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
msgstr "Incoming e-mail address removed."
-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555
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"
@@ -1318,7 +1246,6 @@ msgid "Not expecting this response!"
msgstr "Not expecting this response!"
#: actions/finishremotesubscribe.php:80
-#, fuzzy
msgid "User being listened to does not exist."
msgstr "User being listened to doesn't exist."
@@ -1335,7 +1262,6 @@ msgid "You are not authorized."
msgstr "You are not authorised."
#: actions/finishremotesubscribe.php:109
-#, fuzzy
msgid "Could not convert request token to access token."
msgstr "Couldn't convert request tokens to access tokens."
@@ -1412,9 +1338,8 @@ msgid "Do not block this user from this group"
msgstr "Do not block this user from this group"
#: actions/groupblock.php:179
-#, fuzzy
msgid "Block this user from this group"
-msgstr "A list of the users in this group."
+msgstr "Block this user from this group"
#: actions/groupblock.php:196
msgid "Database error blocking user from group."
@@ -1495,7 +1420,7 @@ msgstr "%s group members, page %d"
msgid "A list of the users in this group."
msgstr "A list of the users in this group."
-#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
msgid "Admin"
msgstr "Admin"
@@ -1556,7 +1481,7 @@ msgid ""
msgstr ""
#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/subgroupnav.php:98
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Groups"
@@ -1584,9 +1509,8 @@ msgid "Only an admin can unblock group members."
msgstr ""
#: actions/groupunblock.php:95
-#, fuzzy
msgid "User is not blocked from group."
-msgstr "User has blocked you."
+msgstr "User is not blocked from group."
#: actions/groupunblock.php:128 actions/unblock.php:77
msgid "Error removing the block."
@@ -1606,9 +1530,8 @@ msgstr ""
"doc.im%%). Configure your address and settings below."
#: actions/imsettings.php:89
-#, fuzzy
msgid "IM is not available."
-msgstr "This page is not available in a "
+msgstr "IM is not available."
#: actions/imsettings.php:106
msgid "Current confirmed Jabber/GTalk address."
@@ -1771,7 +1694,7 @@ msgstr "Personal message"
msgid "Optionally add a personal message to the invitation."
msgstr "Optionally add a personal message to the invitation."
-#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
msgstr "Send"
@@ -1895,7 +1818,7 @@ msgstr "Incorrect username or password."
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:457
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Login"
@@ -1999,16 +1922,15 @@ msgstr ""
"Don't send a message to yourself; just say it to yourself quietly instead."
#: actions/newmessage.php:181
-#, fuzzy
msgid "Message sent"
-msgstr "Message"
+msgstr "Message sent"
#: actions/newmessage.php:185 lib/command.php:375
#, php-format
msgid "Direct message to %s sent"
msgstr "Direct message to %s sent"
-#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
msgid "Ajax Error"
msgstr "Ajax Error"
@@ -2016,7 +1938,7 @@ msgstr "Ajax Error"
msgid "New notice"
msgstr "New notice"
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
msgid "Notice posted"
msgstr "Notice posted"
@@ -2034,9 +1956,9 @@ msgid "Text search"
msgstr "Text search"
#: actions/noticesearch.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Search results for \"%s\" on %s"
-msgstr " Search Stream for \"%s\""
+msgstr "Search results for \"%s\" on %s"
#: actions/noticesearch.php:121
#, php-format
@@ -2052,15 +1974,15 @@ msgid ""
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
-#: actions/noticesearchrss.php:89
-#, fuzzy, php-format
+#: actions/noticesearchrss.php:96
+#, php-format
msgid "Updates with \"%s\""
-msgstr "Updates from %1$s on %2$s!"
+msgstr "Updates with \"%s\""
-#: actions/noticesearchrss.php:91
-#, fuzzy, php-format
+#: actions/noticesearchrss.php:98
+#, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr "All updates matching search term \"%s\""
+msgstr "Updates matching search term \"%1$s\" on %2$s!"
#: actions/nudge.php:85
msgid ""
@@ -2183,9 +2105,9 @@ msgstr "6 or more characters"
msgid "Confirm"
msgstr "Confirm"
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "same as password above"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Same as password above"
#: actions/passwordsettings.php:117
msgid "Change"
@@ -2215,6 +2137,112 @@ msgstr "Can't save new password."
msgid "Password saved."
msgstr "Password saved."
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr ""
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr ""
+
+#: actions/pathsadminpanel.php:140
+#, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Theme directory not readable: %s"
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+#, fuzzy
+msgid "Site"
+msgstr "Invite"
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+msgid "Site path"
+msgstr "Site path"
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr ""
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Avatars"
+msgstr "Avatar"
+
+#: actions/pathsadminpanel.php:252
+#, fuzzy
+msgid "Avatar server"
+msgstr "Avatar settings"
+
+#: actions/pathsadminpanel.php:256
+#, fuzzy
+msgid "Avatar path"
+msgstr "Avatar updated."
+
+#: actions/pathsadminpanel.php:260
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Avatar updated."
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:297
+msgid "Save paths"
+msgstr "Save paths"
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -2281,14 +2309,13 @@ msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL of your homepage, blog, or profile on another site"
#: actions/profilesettings.php:122 actions/register.php:460
-#, fuzzy, php-format
+#, php-format
msgid "Describe yourself and your interests in %d chars"
-msgstr "Describe yourself and your interests in 140 chars"
+msgstr "Describe yourself and your interests in %d chars"
#: actions/profilesettings.php:125 actions/register.php:463
-#, fuzzy
msgid "Describe yourself and your interests"
-msgstr "Describe yourself and your "
+msgstr "Describe yourself and your interests"
#: actions/profilesettings.php:127 actions/register.php:465
msgid "Bio"
@@ -2317,7 +2344,7 @@ msgid ""
msgstr ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr "Language"
@@ -2340,9 +2367,9 @@ msgstr ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
#: actions/profilesettings.php:221 actions/register.php:223
-#, fuzzy, php-format
+#, php-format
msgid "Bio is too long (max %d chars)."
-msgstr "Bio is too long (max 140 chars)."
+msgstr "Bio is too long (max %d chars)."
#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
@@ -2433,14 +2460,15 @@ msgid ""
msgstr ""
#: actions/public.php:238
-#, fuzzy, php-format
+#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
"blogging) service based on the Free Software [StatusNet](http://status.net/) "
"tool."
msgstr ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
#: actions/publictagcloud.php:57
msgid "Public tag cloud"
@@ -2545,10 +2573,6 @@ msgstr "Unknown action"
msgid "6 or more characters, and don't forget it!"
msgstr "6 or more characters, and don't forget it!"
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Same as password above"
-
#: actions/recoverpassword.php:243
msgid "Reset"
msgstr "Reset"
@@ -2610,7 +2634,7 @@ msgstr "Error with confirmation code."
msgid "Registration successful"
msgstr "Registration successful"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Register"
@@ -2654,7 +2678,7 @@ msgid "Same as password above. Required."
msgstr "Same as password above. Required."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-mail"
@@ -2761,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"
@@ -2797,14 +2821,14 @@ msgid "Replies to %s, page %d"
msgstr "Replies to %s, page %d"
#: actions/replies.php:144
-#, fuzzy, php-format
+#, php-format
msgid "Replies feed for %s (RSS 1.0)"
-msgstr "Notice feed for %s"
+msgstr "Replies feed for %s (RSS 1.0)"
#: actions/replies.php:151
-#, fuzzy, php-format
+#, php-format
msgid "Replies feed for %s (RSS 2.0)"
-msgstr "Notice feed for %s"
+msgstr "Replies feed for %s (RSS 2.0)"
#: actions/replies.php:158
#, php-format
@@ -2833,24 +2857,22 @@ msgid ""
msgstr ""
#: actions/repliesrss.php:72
-#, fuzzy, php-format
+#, php-format
msgid "Replies to %1$s on %2$s!"
-msgstr "Message to %1$s on %2$s"
+msgstr "Replies to %1$s on %2$s!"
#: actions/sandbox.php:65 actions/unsandbox.php:65
-#, fuzzy
msgid "You cannot sandbox users on this site."
-msgstr "You can't send a message to this user."
+msgstr "You cannot sandbox users on this site."
#: actions/sandbox.php:72
-#, fuzzy
msgid "User is already sandboxed."
-msgstr "User is already blocked from group."
+msgstr "User is already sandboxed."
#: actions/showfavorites.php:79
-#, fuzzy, php-format
+#, php-format
msgid "%s's favorite notices, page %d"
-msgstr "%s favourite notices, page %d"
+msgstr "%s's favourite notices, page %d"
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
@@ -2967,9 +2989,8 @@ msgid "Statistics"
msgstr "Statistics"
#: actions/showgroup.php:432
-#, fuzzy
msgid "Created"
-msgstr "Create"
+msgstr "Created"
#: actions/showgroup.php:448
#, php-format
@@ -3016,14 +3037,13 @@ msgid "Message from %1$s on %2$s"
msgstr "Message from %1$s on %2$s"
#: actions/shownotice.php:90
-#, fuzzy
msgid "Notice deleted."
-msgstr "Notice posted"
+msgstr "Notice deleted."
#: actions/showstream.php:73
-#, fuzzy, php-format
+#, php-format
msgid " tagged %s"
-msgstr "Notices tagged with %s"
+msgstr " tagged %s"
#: actions/showstream.php:79
#, php-format
@@ -3031,9 +3051,9 @@ msgid "%s, page %d"
msgstr "%s, page %d"
#: actions/showstream.php:122
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s tagged %s (RSS 1.0)"
-msgstr "Notice feed for %s group"
+msgstr "Notice feed for %s tagged %s (RSS 1.0)"
#: actions/showstream.php:129
#, fuzzy, php-format
@@ -3051,9 +3071,9 @@ msgid "Notice feed for %s (Atom)"
msgstr "Notice feed for %s"
#: actions/showstream.php:148
-#, fuzzy, php-format
+#, php-format
msgid "FOAF for %s"
-msgstr "Outbox for %s"
+msgstr "FOAF for %s"
#: actions/showstream.php:191
#, php-format
@@ -3083,14 +3103,15 @@ msgid ""
msgstr ""
#: actions/showstream.php:239
-#, fuzzy, php-format
+#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
"[StatusNet](http://status.net/) tool. "
msgstr ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
#: actions/silence.php:65 actions/unsilence.php:65
#, fuzzy
@@ -3102,11 +3123,6 @@ msgstr "You can't send a message to this user."
msgid "User is already silenced."
msgstr "User is already blocked from group."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
-#, fuzzy
-msgid "Site"
-msgstr "Invite"
-
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
msgstr ""
@@ -3138,157 +3154,149 @@ msgid "Snapshot frequency must be a number."
msgstr ""
#: actions/siteadminpanel.php:199
-msgid "You must set an SSL sever when enabling SSL."
+msgid "You must set an SSL server when enabling SSL."
msgstr ""
#: actions/siteadminpanel.php:204
-msgid "Invalid SSL server. Max length is 255 characters."
+msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
#: actions/siteadminpanel.php:210
-msgid "Minimum text limit is 140c."
+msgid "Minimum text limit is 140 characters."
msgstr ""
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:224
-#, php-format
-msgid "Locales directory not readable: %s"
+#: actions/siteadminpanel.php:266
+msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:275
-#, fuzzy
+#: actions/siteadminpanel.php:269
msgid "Site name"
-msgstr "Site notice"
+msgstr "Site name"
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:279
+#: actions/siteadminpanel.php:274
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:280
+#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:283
+#: actions/siteadminpanel.php:279
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:284
#, fuzzy
-msgid "contact email address for your site"
+msgid "Contact email address for your site"
msgstr "New e-mail address for posting to %s"
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:290
+#, fuzzy
+msgid "Local"
+msgstr "Local views"
+
+#: actions/siteadminpanel.php:301
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:303
+#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:310
-#, fuzzy
+#: actions/siteadminpanel.php:308
msgid "Default site language"
-msgstr "Preferred language"
+msgstr "Default site language"
#: actions/siteadminpanel.php:316
-msgid "Path to locales"
-msgstr ""
-
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
-msgstr ""
+msgid "URLs"
+msgstr "URLs"
-#: actions/siteadminpanel.php:320
-#, fuzzy
+#: actions/siteadminpanel.php:319
msgid "Server"
-msgstr "Recover"
+msgstr "Server"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
msgstr ""
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-#, fuzzy
-msgid "Site path"
-msgstr "Site notice"
-
-#: actions/siteadminpanel.php:328
+#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
msgstr ""
-#: actions/siteadminpanel.php:330
+#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
+#: actions/siteadminpanel.php:331
+msgid "Access"
+msgstr "Access"
+
#: actions/siteadminpanel.php:334
-#, fuzzy
msgid "Private"
-msgstr "Privacy"
+msgstr "Private"
#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
#: actions/siteadminpanel.php:340
-#, fuzzy
msgid "Invite only"
-msgstr "Invite"
+msgstr "Invite only"
#: actions/siteadminpanel.php:342
msgid "Make registration invitation only."
msgstr ""
-#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
-#, fuzzy
+#: actions/siteadminpanel.php:346
msgid "Closed"
-msgstr "Block"
+msgstr "Closed"
#: actions/siteadminpanel.php:348
msgid "Disable new registrations."
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
-#, fuzzy
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
msgid "Never"
-msgstr "Recover"
+msgstr "Never"
-#: actions/siteadminpanel.php:357
+#: actions/siteadminpanel.php:360
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:358
+#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:364
+#: actions/siteadminpanel.php:366
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:365
-msgid "Snapshots will be sent once every N Web hits"
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
msgstr ""
#: actions/siteadminpanel.php:372
@@ -3299,51 +3307,57 @@ msgstr ""
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:381
-#, fuzzy
+#: actions/siteadminpanel.php:380
+msgid "SSL"
+msgstr "SSL"
+
+#: actions/siteadminpanel.php:384
msgid "Sometimes"
-msgstr "Notices"
+msgstr "Sometimes"
-#: actions/siteadminpanel.php:382
+#: actions/siteadminpanel.php:385
msgid "Always"
msgstr ""
-#: actions/siteadminpanel.php:384
+#: actions/siteadminpanel.php:387
msgid "Use SSL"
msgstr ""
-#: actions/siteadminpanel.php:385
+#: actions/siteadminpanel.php:388
msgid "When to use SSL"
msgstr ""
-#: actions/siteadminpanel.php:391
+#: actions/siteadminpanel.php:393
msgid "SSL Server"
msgstr ""
-#: actions/siteadminpanel.php:392
+#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr ""
+
+#: actions/siteadminpanel.php:403
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
-#, fuzzy
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
msgid "Save site settings"
-msgstr "Avatar settings"
+msgstr "Save site settings"
#: actions/smssettings.php:58
msgid "SMS Settings"
@@ -3532,9 +3546,9 @@ msgid ""
msgstr ""
#: actions/subscriptions.php:123 actions/subscriptions.php:127
-#, fuzzy, php-format
+#, php-format
msgid "%s is not listening to anyone."
-msgstr "%1$s is now listening to "
+msgstr "%s is not listening to anyone."
#: actions/subscriptions.php:194
msgid "Jabber"
@@ -3651,7 +3665,8 @@ msgstr "Unsubscribed"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
-#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
msgid "User"
msgstr "User"
@@ -3659,17 +3674,86 @@ msgstr "User"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr ""
+
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:178
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr ""
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Profile"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr ""
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
+msgstr ""
+
+#: actions/useradminpanel.php:231
+msgid "New users"
+msgstr "New users"
+
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr ""
+
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr ""
+
+#: actions/useradminpanel.php:241
+msgid "Default subscription"
+msgstr "Default subscription"
+
+#: actions/useradminpanel.php:242
#, fuzzy
-msgid "Invite-only"
-msgstr "Invite"
+msgid "Automatically subscribe new users to this user."
+msgstr ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+
+#: actions/useradminpanel.php:251
+#, fuzzy
+msgid "Invitations"
+msgstr "Invitation(s) sent"
+
+#: actions/useradminpanel.php:256
+#, fuzzy
+msgid "Invitations enabled"
+msgstr "Invitation(s) sent"
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr ""
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr ""
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/userauthorization.php:105
@@ -3688,9 +3772,8 @@ msgstr ""
"click \"Cancel\"."
#: actions/userauthorization.php:188
-#, fuzzy
msgid "License"
-msgstr "licence."
+msgstr "License"
#: actions/userauthorization.php:209
msgid "Accept"
@@ -3706,9 +3789,8 @@ msgid "Reject"
msgstr "Reject"
#: actions/userauthorization.php:212
-#, fuzzy
msgid "Reject this subscription"
-msgstr "%s subscriptions"
+msgstr "Reject this subscription"
#: actions/userauthorization.php:225
msgid "No authorization request!"
@@ -3884,7 +3966,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"
@@ -3898,13 +3980,9 @@ msgid "Could not set group membership."
msgstr "Could not set group membership."
#: classes/User.php:347
-#, fuzzy, php-format
+#, php-format
msgid "Welcome to %1$s, @%2$s!"
-msgstr "Message to %1$s on %2$s"
-
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr "Profile"
+msgstr "Welcome to %1$s, @%2$s!"
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
@@ -3923,9 +4001,8 @@ msgid "Change email handling"
msgstr "Change e-mail handling"
#: lib/accountsettingsaction.php:124
-#, fuzzy
msgid "Design your profile"
-msgstr "User profile"
+msgstr "Design your profile"
#: lib/accountsettingsaction.php:128
msgid "Other"
@@ -3944,131 +4021,130 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "Untitled page"
-#: lib/action.php:424
+#: lib/action.php:425
msgid "Primary site navigation"
msgstr "Primary site navigation"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Home"
msgstr "Home"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Personal profile and friends timeline"
msgstr "Personal profile and friends timeline"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Account"
msgstr "Account"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Change your email, avatar, password, profile"
msgstr "Change your e-mail, avatar, password, profile"
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect"
msgstr "Connect"
-#: lib/action.php:435
+#: lib/action.php:436
#, fuzzy
msgid "Connect to services"
msgstr "Could not redirect to server: %s"
-#: lib/action.php:439
+#: lib/action.php:440
#, fuzzy
msgid "Change site configuration"
msgstr "Primary site navigation"
-#: lib/action.php:443 lib/subgroupnav.php:105
+#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Invite"
-#: lib/action.php:444 lib/subgroupnav.php:106
+#: lib/action.php:445 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Invite friends and colleagues to join you on %s"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout"
msgstr "Logout"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout from the site"
msgstr "Logout from the site"
-#: lib/action.php:454
+#: lib/action.php:455
msgid "Create an account"
msgstr "Create an account"
-#: lib/action.php:457
+#: lib/action.php:458
msgid "Login to the site"
msgstr "Login to the site"
-#: lib/action.php:460 lib/action.php:723
+#: lib/action.php:461 lib/action.php:724
msgid "Help"
msgstr "Help"
-#: lib/action.php:460
+#: lib/action.php:461
msgid "Help me!"
msgstr "Help me!"
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
msgstr "Search"
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
msgstr "Search for people or text"
-#: lib/action.php:484
+#: lib/action.php:485
msgid "Site notice"
msgstr "Site notice"
-#: lib/action.php:550
+#: lib/action.php:551
msgid "Local views"
msgstr "Local views"
-#: lib/action.php:616
+#: lib/action.php:617
msgid "Page notice"
msgstr "Page notice"
-#: lib/action.php:718
+#: lib/action.php:719
msgid "Secondary site navigation"
msgstr "Secondary site navigation"
-#: lib/action.php:725
+#: lib/action.php:726
msgid "About"
msgstr "About"
-#: lib/action.php:727
+#: lib/action.php:728
msgid "FAQ"
msgstr "F.A.Q."
-#: lib/action.php:731
+#: lib/action.php:732
msgid "TOS"
msgstr ""
-#: lib/action.php:734
+#: lib/action.php:735
msgid "Privacy"
msgstr "Privacy"
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
msgstr "Source"
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Contact"
msgstr "Contact"
-#: lib/action.php:740
-#, fuzzy
+#: lib/action.php:741
msgid "Badge"
-msgstr "Nudge"
+msgstr "Badge"
-#: lib/action.php:768
+#: lib/action.php:769
msgid "StatusNet software license"
msgstr "StatusNet software licence"
-#: lib/action.php:771
+#: lib/action.php:772
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4077,12 +4153,12 @@ msgstr ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%)."
-#: lib/action.php:773
+#: lib/action.php:774
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** is a microblogging service."
-#: lib/action.php:775
+#: lib/action.php:776
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4093,32 +4169,31 @@ msgstr ""
"s, available under the [GNU Affero General Public Licence](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:789
-#, fuzzy
+#: lib/action.php:790
msgid "Site content license"
-msgstr "StatusNet software licence"
+msgstr "Site content license"
-#: lib/action.php:798
+#: lib/action.php:799
msgid "All "
msgstr "All "
-#: lib/action.php:803
+#: lib/action.php:804
msgid "license."
msgstr "licence."
-#: lib/action.php:1067
+#: lib/action.php:1068
msgid "Pagination"
msgstr "Pagination"
-#: lib/action.php:1076
+#: lib/action.php:1077
msgid "After"
msgstr "After"
-#: lib/action.php:1084
+#: lib/action.php:1085
msgid "Before"
msgstr "Before"
-#: lib/action.php:1132
+#: lib/action.php:1133
msgid "There was a problem with your session token."
msgstr "There was a problem with your session token."
@@ -4148,8 +4223,12 @@ msgid "Basic site configuration"
msgstr "E-mail address confirmation"
#: lib/adminpanelaction.php:303
-#, fuzzy
msgid "Design configuration"
+msgstr "Design configuration"
+
+#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+#, fuzzy
+msgid "Paths configuration"
msgstr "SMS confirmation"
#: lib/attachmentlist.php:87
@@ -4190,18 +4269,18 @@ msgid "Sorry, this command is not yet implemented."
msgstr "Sorry, this command is not yet implemented."
#: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a user with nickname %s"
-msgstr "Couldn't update user with confirmed e-mail address."
+msgstr "Could not find a user with nickname %s"
#: lib/command.php:92
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
#: lib/command.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Nudge sent to %s"
-msgstr "Nudge sent"
+msgstr "Nudge sent to %s"
#: lib/command.php:126
#, php-format
@@ -4249,28 +4328,27 @@ msgid "About: %s"
msgstr "About: %s"
#: lib/command.php:358 scripts/xmppdaemon.php:321
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "Message too long - maximum is 140 characters, you sent %d"
+msgstr "Message too long - maximum is %d characters, you sent %d"
#: lib/command.php:377
msgid "Error sending direct message."
msgstr "Error sending direct message."
#: lib/command.php:431
-#, fuzzy, php-format
+#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr "Message too long - maximum is 140 characters, you sent %d"
+msgstr "Notice too long - maximum is %d characters, you sent %d"
#: lib/command.php:439
-#, fuzzy, php-format
+#, php-format
msgid "Reply to %s sent"
-msgstr "Reply to this notice"
+msgstr "Reply to %s sent"
#: lib/command.php:441
-#, fuzzy
msgid "Error saving notice."
-msgstr "Problem saving notice."
+msgstr "Error saving notice."
#: lib/command.php:495
msgid "Specify the name of the user to subscribe to"
@@ -4326,11 +4404,10 @@ msgid "You are not subscribed to anyone."
msgstr "You are not subscribed to that profile."
#: lib/command.php:620
-#, fuzzy
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
-msgstr[0] "You are not subscribed to that profile."
-msgstr[1] "You are not subscribed to that profile."
+msgstr[0] "You are already subscribed to these users:"
+msgstr[1] "You are already subscribed to these users:"
#: lib/command.php:640
#, fuzzy
@@ -4338,7 +4415,6 @@ msgid "No one is subscribed to you."
msgstr "Could not subscribe other to you."
#: lib/command.php:642
-#, fuzzy
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Could not subscribe other to you."
@@ -4350,7 +4426,6 @@ msgid "You are not a member of any groups."
msgstr "You are not a member of that group."
#: lib/command.php:664
-#, fuzzy
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."
@@ -4408,9 +4483,8 @@ msgid "You may wish to run the installer to fix this."
msgstr ""
#: lib/common.php:202
-#, fuzzy
msgid "Go to the installer."
-msgstr "Login to the site"
+msgstr "Go to the installer."
#: lib/connectsettingsaction.php:110
msgid "IM"
@@ -4434,9 +4508,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: "
@@ -4530,19 +4605,18 @@ msgstr ""
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
-#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85
msgid "Group"
msgstr "Group"
#: lib/groupnav.php:101
-#, fuzzy
msgid "Blocked"
-msgstr "Block"
+msgstr "Blocked"
#: lib/groupnav.php:102
-#, fuzzy, php-format
+#, php-format
msgid "%s blocked users"
-msgstr "Block user"
+msgstr "%s blocked users"
#: lib/groupnav.php:108
#, php-format
@@ -4559,9 +4633,9 @@ msgid "Add or edit %s logo"
msgstr "Add or edit %s logo"
#: lib/groupnav.php:120
-#, fuzzy, php-format
+#, php-format
msgid "Add or edit %s design"
-msgstr "Add or edit %s logo"
+msgstr "Add or edit %s design"
#: lib/groupsbymemberssection.php:71
msgid "Groups with most members"
@@ -4576,7 +4650,7 @@ msgstr "Groups with most posts"
msgid "Tags in %s group's notices"
msgstr "Tags in %s group's notices"
-#: lib/htmloutputter.php:104
+#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
msgstr "This page is not available in a media type you accept"
@@ -4609,6 +4683,14 @@ msgstr "Lost our file."
msgid "Unknown file type"
msgstr "Unknown file type"
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
@@ -4640,7 +4722,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:424
+#: lib/mailbox.php:227 lib/noticelist.php:452
#, fuzzy
msgid "from"
msgstr "from"
@@ -4672,7 +4754,7 @@ msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s is now listening to your notices on %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"
@@ -4687,10 +4769,14 @@ msgid ""
msgstr ""
"%1$s is now listening to your notices on %2$s.\n"
"\n"
-"\t%3$s\n"
+"%3$s\n"
"\n"
+"%4$s%5$s%6$s\n"
"Faithfully yours,\n"
-"%4$s.\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
#: lib/mail.php:254
#, php-format
@@ -4792,9 +4878,9 @@ msgid ""
msgstr ""
#: lib/mail.php:559
-#, fuzzy, php-format
+#, php-format
msgid "%s (@%s) added your notice as a favorite"
-msgstr "%s added your notice as a favourite"
+msgstr "%s (@%s) added your notice as a favorite"
#: lib/mail.php:561
#, php-format
@@ -4897,36 +4983,62 @@ msgstr "Send a direct notice"
msgid "To"
msgstr "To"
-#: lib/messageform.php:162 lib/noticeform.php:173
+#: lib/messageform.php:162 lib/noticeform.php:186
msgid "Available characters"
msgstr "Available characters"
-#: lib/noticeform.php:145
+#: lib/noticeform.php:158
msgid "Send a notice"
msgstr "Send a notice"
-#: lib/noticeform.php:158
+#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
msgstr "What's up, %s?"
-#: lib/noticeform.php:180
+#: lib/noticeform.php:193
msgid "Attach"
msgstr ""
-#: lib/noticeform.php:184
+#: lib/noticeform.php:197
msgid "Attach a file"
msgstr ""
-#: lib/noticelist.php:478
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "No"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr ""
+
+#: lib/noticelist.php:506
msgid "in context"
msgstr "in context"
-#: lib/noticelist.php:498
+#: lib/noticelist.php:526
msgid "Reply to this notice"
msgstr "Reply to this notice"
-#: lib/noticelist.php:499
+#: lib/noticelist.php:527
msgid "Reply"
msgstr "Reply"
@@ -4955,16 +5067,14 @@ msgid "Error inserting remote profile"
msgstr "Error inserting remote profile."
#: lib/oauthstore.php:345
-#, fuzzy
msgid "Duplicate notice"
-msgstr "Delete notice"
+msgstr "Duplicate notice"
-#: 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 "That user has blocked you 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."
@@ -5018,9 +5128,8 @@ msgid "All subscribers"
msgstr "All subscribers"
#: lib/profileaction.php:177
-#, fuzzy
msgid "User ID"
-msgstr "User"
+msgstr "User ID"
#: lib/profileaction.php:182
msgid "Member since"
@@ -5060,24 +5169,25 @@ msgid "Popular"
msgstr "Popular"
#: lib/sandboxform.php:67
-#, fuzzy
msgid "Sandbox"
-msgstr "Inbox"
+msgstr "Sandbox"
#: lib/sandboxform.php:78
-#, fuzzy
msgid "Sandbox this user"
-msgstr "Unblock this user"
+msgstr "Sandbox this user"
#: lib/searchaction.php:120
#, fuzzy
msgid "Search site"
msgstr "Search"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
-#, fuzzy
msgid "Search help"
-msgstr "Search"
+msgstr "Search help"
#: lib/searchgroupnav.php:80
msgid "People"
@@ -5087,10 +5197,6 @@ msgstr "People"
msgid "Find people on this site"
msgstr "Find people on this site"
-#: lib/searchgroupnav.php:82
-msgid "Notice"
-msgstr "Notice"
-
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
msgstr "Find content of notices"
@@ -5108,14 +5214,12 @@ msgid "More..."
msgstr ""
#: lib/silenceform.php:67
-#, fuzzy
msgid "Silence"
-msgstr "Site notice"
+msgstr "Silence"
#: lib/silenceform.php:78
-#, fuzzy
msgid "Silence this user"
-msgstr "Block this user"
+msgstr "Silence this user"
#: lib/subgroupnav.php:83
#, php-format
@@ -5184,18 +5288,16 @@ msgid "Unsandbox"
msgstr ""
#: lib/unsandboxform.php:80
-#, fuzzy
msgid "Unsandbox this user"
-msgstr "Unblock this user"
+msgstr "Unsandbox this user"
#: lib/unsilenceform.php:67
msgid "Unsilence"
msgstr ""
#: lib/unsilenceform.php:78
-#, fuzzy
msgid "Unsilence this user"
-msgstr "Unblock this user"
+msgstr "Unsilence this user"
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
@@ -5229,47 +5331,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"
@@ -5281,7 +5387,7 @@ msgstr "%s is not a valid colour!"
#: lib/webcolor.php:123
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
-msgstr ""
+msgstr "%s is not a valid colour! Use 3 or 6 hex chars."
#: scripts/maildaemon.php:48
msgid "Could not parse message."
@@ -5298,11 +5404,3 @@ msgstr "Sorry, that is not your incoming e-mail address."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Sorry, no incoming e-mail allowed."
-
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "Unblock this user"
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "People subscribed to %s"
diff --git a/locale/es/LC_MESSAGES/statusnet.mo b/locale/es/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 4c0463da5..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 b3f2469ad..eeeeeb3d6 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -2,6 +2,7 @@
#
# Author@translatewiki.net: Brion
# Author@translatewiki.net: Crazymadlover
+# Author@translatewiki.net: McDutchie
# Author@translatewiki.net: Translationista
# --
# This file is distributed under the same license as the StatusNet package.
@@ -10,16 +11,16 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 10:43+0000\n"
-"PO-Revision-Date: 2009-11-18 19:31:43+0000\n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-11-28 19:50:09+0000\n"
"Language-Team: Spanish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: es\n"
"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
@@ -133,7 +134,7 @@ msgstr "¡No se encontró el método de la API!"
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
-msgstr "Este método requiere PUBLICAR"
+msgstr "Este método requiere un POST."
#: actions/apiaccountupdatedeliverydevice.php:105
msgid ""
@@ -445,7 +446,7 @@ msgstr "Demasiado largo. La longitud máxima es de 140 caracteres. "
msgid "Not found"
msgstr "No encontrado"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -560,7 +561,7 @@ msgid "Preview"
msgstr "Vista previa"
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
+#: lib/noticelist.php:550
msgid "Delete"
msgstr "Borrar"
@@ -573,7 +574,7 @@ msgid "Crop"
msgstr "Cortar"
#: actions/avatarsettings.php:265 actions/disfavor.php:74
-#: actions/emailsettings.php:237 actions/favor.php:75
+#: 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
@@ -589,7 +590,7 @@ msgstr ""
"Hubo un problema con tu clave de sesión. Por favor, intenta nuevamente."
#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
-#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: 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."
@@ -723,15 +724,15 @@ msgstr "Tipo de dirección %s desconocida"
msgid "That address has already been confirmed."
msgstr "Esa dirección ya fue confirmada."
-#: actions/confirmaddress.php:114 actions/emailsettings.php:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
#: actions/profilesettings.php:276 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "No se pudo actualizar el usuario."
-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
msgstr "No se pudo eliminar la confirmación de correo electrónico."
@@ -751,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/profileaction.php:206 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Avisos"
@@ -794,7 +795,7 @@ msgstr "¿Estás seguro de que quieres eliminar este aviso?"
msgid "Do not delete this notice"
msgstr "No se puede eliminar este aviso."
-#: actions/deletenotice.php:146 lib/noticelist.php:522
+#: actions/deletenotice.php:146 lib/noticelist.php:550
msgid "Delete this notice"
msgstr "Borrar este aviso"
@@ -839,180 +840,117 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:278
+#: actions/designadminpanel.php:270
#, fuzzy
msgid "Invalid logo URL."
msgstr "Tamaño inválido."
-#: actions/designadminpanel.php:282
+#: actions/designadminpanel.php:274
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Esta página no está disponible en un "
-#: actions/designadminpanel.php:288
-#, fuzzy, php-format
-msgid "Theme directory not readable: %s"
-msgstr "Esta página no está disponible en un "
-
-#: actions/designadminpanel.php:292
-#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:296
-#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:312
-#, php-format
-msgid "Max length for %s %s is 255 characters."
-msgstr ""
-
-#: actions/designadminpanel.php:412
+#: actions/designadminpanel.php:370
#, fuzzy
msgid "Change logo"
msgstr "Cambiar colores"
-#: actions/designadminpanel.php:417
+#: actions/designadminpanel.php:375
#, fuzzy
msgid "Site logo"
msgstr "Invitar"
-#: actions/designadminpanel.php:424
+#: actions/designadminpanel.php:382
#, fuzzy
msgid "Change theme"
msgstr "Cambiar"
-#: actions/designadminpanel.php:441
+#: actions/designadminpanel.php:399
#, fuzzy
msgid "Site theme"
msgstr "Aviso de sitio"
-#: actions/designadminpanel.php:442
+#: actions/designadminpanel.php:400
#, fuzzy
msgid "Theme for the site."
msgstr "Salir de sitio"
-#: actions/designadminpanel.php:447
-msgid "Theme server"
-msgstr ""
-
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
-
-#: actions/designadminpanel.php:455
-msgid "Theme directory"
-msgstr ""
-
-#: actions/designadminpanel.php:462
-#, fuzzy
-msgid "Avatar Settings"
-msgstr "Configuración de Avatar"
-
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Avatar server"
-msgstr "Configuración de Avatar"
-
-#: actions/designadminpanel.php:471
-#, fuzzy
-msgid "Avatar path"
-msgstr "Avatar actualizado"
-
-#: actions/designadminpanel.php:475
-#, fuzzy
-msgid "Avatar directory"
-msgstr "Avatar actualizado"
-
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:422
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "Puedes cargar una imagen de logo para tu grupo."
-#: actions/designadminpanel.php:526 lib/designsettings.php:139
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:542 lib/designsettings.php:155
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:543 lib/designsettings.php:156
+#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:548 lib/designsettings.php:161
+#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:554
-msgid "Background server"
-msgstr ""
-
-#: actions/designadminpanel.php:558
-msgid "Background path"
-msgstr ""
-
-#: actions/designadminpanel.php:562
-msgid "Background directory"
-msgstr ""
-
-#: actions/designadminpanel.php:569 lib/designsettings.php:170
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
msgid "Change colours"
msgstr "Cambiar colores"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
msgid "Content"
msgstr "Contenido"
-#: actions/designadminpanel.php:604 lib/designsettings.php:204
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Buscar"
-#: actions/designadminpanel.php:617 lib/designsettings.php:217
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
msgstr "Texto"
-#: actions/designadminpanel.php:630 lib/designsettings.php:230
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
msgid "Links"
msgstr "Vínculos"
-#: actions/designadminpanel.php:658 lib/designsettings.php:247
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:659 lib/designsettings.php:248
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:665 lib/designsettings.php:254
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 actions/useradminpanel.php:226
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: 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 "Guardar"
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: actions/designadminpanel.php:582 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1167,37 +1105,37 @@ msgstr "Deseo enviar estados por email"
msgid "Publish a MicroID for my email address."
msgstr "Publicar un MicroID para mi dirección de correo."
-#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/emailsettings.php:302 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
msgstr "Preferencias guardadas."
-#: actions/emailsettings.php:319
+#: actions/emailsettings.php:320
msgid "No email address."
msgstr "Sin dirección de correo electrónico"
-#: actions/emailsettings.php:326
+#: actions/emailsettings.php:327
msgid "Cannot normalize that email address"
msgstr "No se puede normalizar esta dirección de correo electrónico."
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "No es una dirección de correo electrónico válida"
-#: actions/emailsettings.php:333
+#: actions/emailsettings.php:334
msgid "That is already your email address."
msgstr "Esa ya es tu dirección de correo electrónico"
-#: actions/emailsettings.php:336
+#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
msgstr "Esa dirección de correo pertenece a otro usuario."
-#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "No se pudo insertar el código de confirmación."
-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1206,47 +1144,47 @@ msgstr ""
"Revisa tu bandeja de entrada (¡y la de spam!) para encontrar el código y las "
"instrucciones sobre cómo usarlo."
-#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
msgstr "Ninguna confirmación pendiente para cancelar."
-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
msgstr "Esa dirección de mensajería instantánea es incorrecta."
-#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
msgstr "Confirmación cancelada."
-#: actions/emailsettings.php:412
+#: actions/emailsettings.php:413
msgid "That is not your email address."
msgstr "Esa no es tu dirección de correo electrónico"
-#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
msgstr "La dirección fue eliminada."
-#: actions/emailsettings.php:445 actions/smssettings.php:518
+#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
msgstr "No hay dirección de correo entrante."
-#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
msgid "Couldn't update user record."
msgstr "No se pudo actualizar información de usuario."
-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
msgstr "Dirección de correo entrante removida."
-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555
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"
@@ -1520,7 +1458,7 @@ msgstr "Miembros del grupo %s, página %d"
msgid "A list of the users in this group."
msgstr "Lista de los usuarios en este grupo."
-#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
msgid "Admin"
msgstr "Admin"
@@ -1582,7 +1520,7 @@ msgid ""
msgstr ""
#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/subgroupnav.php:98
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Grupos"
@@ -1802,7 +1740,7 @@ msgstr "Mensaje Personal"
msgid "Optionally add a personal message to the invitation."
msgstr "Opcionalmente añada un mensaje personalizado a su invitación."
-#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
msgstr "Enviar"
@@ -1929,7 +1867,7 @@ msgstr "Nombre de usuario o contraseña incorrectos."
msgid "Error setting user. You are probably not authorized."
msgstr "No autorizado."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:457
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Inicio de sesión"
@@ -2044,7 +1982,7 @@ msgstr "Mensaje"
msgid "Direct message to %s sent"
msgstr "Se envió mensaje directo a %s"
-#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
msgid "Ajax Error"
msgstr "Error de Ajax"
@@ -2052,7 +1990,7 @@ msgstr "Error de Ajax"
msgid "New notice"
msgstr "Nuevo aviso"
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
#, fuzzy
msgid "Notice posted"
msgstr "Aviso publicado"
@@ -2089,12 +2027,12 @@ msgid ""
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
-#: actions/noticesearchrss.php:89
+#: actions/noticesearchrss.php:96
#, fuzzy, php-format
msgid "Updates with \"%s\""
msgstr "¡Actualizaciones de %1$s en %2$s!"
-#: actions/noticesearchrss.php:91
+#: actions/noticesearchrss.php:98
#, fuzzy, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
msgstr "Todas las actualizaciones que corresponden a la frase a buscar \"%s\""
@@ -2227,9 +2165,9 @@ msgstr "6 o más caracteres"
msgid "Confirm"
msgstr "Confirmar"
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "repita la contraseña anterior"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Igual a la contraseña de arriba"
#: actions/passwordsettings.php:117
msgid "Change"
@@ -2259,6 +2197,114 @@ msgstr "No se puede guardar la nueva contraseña."
msgid "Password saved."
msgstr "Se guardó Contraseña."
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr ""
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr ""
+
+#: actions/pathsadminpanel.php:140
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Esta página no está disponible en un "
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+#, fuzzy
+msgid "Site"
+msgstr "Invitar"
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+#, fuzzy
+msgid "Site path"
+msgstr "Aviso de sitio"
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr ""
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Avatars"
+msgstr "Avatar"
+
+#: actions/pathsadminpanel.php:252
+#, fuzzy
+msgid "Avatar server"
+msgstr "Configuración de Avatar"
+
+#: actions/pathsadminpanel.php:256
+#, fuzzy
+msgid "Avatar path"
+msgstr "Avatar actualizado"
+
+#: actions/pathsadminpanel.php:260
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Avatar actualizado"
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:297
+#, fuzzy
+msgid "Save paths"
+msgstr "Aviso de sitio"
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -2363,7 +2409,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr "Tags para ti (letras, números, -, ., y _), coma - o espacio - separado"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr "Idioma"
@@ -2598,10 +2644,6 @@ msgstr "Acción desconocida"
msgid "6 or more characters, and don't forget it!"
msgstr "6 o más caracteres, ¡no te olvides!"
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Igual a la contraseña de arriba"
-
#: actions/recoverpassword.php:243
msgid "Reset"
msgstr "Restablecer"
@@ -2663,7 +2705,7 @@ msgstr "Error con el código de confirmación."
msgid "Registration successful"
msgstr "Registro exitoso."
-#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrarse"
@@ -2709,7 +2751,7 @@ msgid "Same as password above. Required."
msgstr "Igual a la contraseña de arriba. Requerida"
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Correo electrónico"
@@ -2818,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"
@@ -3161,11 +3203,6 @@ msgstr "No puedes enviar mensaje a este usuario."
msgid "User is already silenced."
msgstr "El usuario te ha bloqueado."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
-#, fuzzy
-msgid "Site"
-msgstr "Invitar"
-
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
msgstr ""
@@ -3197,103 +3234,100 @@ msgid "Snapshot frequency must be a number."
msgstr ""
#: actions/siteadminpanel.php:199
-msgid "You must set an SSL sever when enabling SSL."
+msgid "You must set an SSL server when enabling SSL."
msgstr ""
#: actions/siteadminpanel.php:204
-msgid "Invalid SSL server. Max length is 255 characters."
+msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
#: actions/siteadminpanel.php:210
-msgid "Minimum text limit is 140c."
+msgid "Minimum text limit is 140 characters."
msgstr ""
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:224
-#, php-format
-msgid "Locales directory not readable: %s"
+#: actions/siteadminpanel.php:266
+msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:275
+#: actions/siteadminpanel.php:269
#, fuzzy
msgid "Site name"
msgstr "Aviso de sitio"
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:279
+#: actions/siteadminpanel.php:274
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:280
+#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:283
+#: actions/siteadminpanel.php:279
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:284
#, fuzzy
-msgid "contact email address for your site"
+msgid "Contact email address for your site"
msgstr "Nueva dirección de correo para postear a %s"
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:290
+#, fuzzy
+msgid "Local"
+msgstr "Vistas locales"
+
+#: actions/siteadminpanel.php:301
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:303
+#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:308
#, fuzzy
msgid "Default site language"
msgstr "Lenguaje de preferencia"
#: actions/siteadminpanel.php:316
-msgid "Path to locales"
-msgstr ""
-
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
-msgstr ""
+#, fuzzy
+msgid "URLs"
+msgstr "URL"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
#, fuzzy
msgid "Server"
msgstr "Recuperar"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
msgstr ""
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-#, fuzzy
-msgid "Site path"
-msgstr "Aviso de sitio"
-
-#: actions/siteadminpanel.php:328
+#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
msgstr ""
-#: actions/siteadminpanel.php:330
+#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
+#: actions/siteadminpanel.php:331
+#, fuzzy
+msgid "Access"
+msgstr "Aceptar"
+
#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
@@ -3312,7 +3346,7 @@ msgstr "Invitar"
msgid "Make registration invitation only."
msgstr ""
-#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#: actions/siteadminpanel.php:346
#, fuzzy
msgid "Closed"
msgstr "Bloqueado"
@@ -3321,33 +3355,37 @@ msgstr "Bloqueado"
msgid "Disable new registrations."
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
#, fuzzy
msgid "Never"
msgstr "Recuperar"
-#: actions/siteadminpanel.php:357
+#: actions/siteadminpanel.php:360
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:358
+#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:364
+#: actions/siteadminpanel.php:366
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:365
-msgid "Snapshots will be sent once every N Web hits"
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
msgstr ""
#: actions/siteadminpanel.php:372
@@ -3358,48 +3396,57 @@ msgstr ""
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:381
+#: actions/siteadminpanel.php:380
+#, fuzzy
+msgid "SSL"
+msgstr "SMS"
+
+#: actions/siteadminpanel.php:384
#, fuzzy
msgid "Sometimes"
msgstr "Avisos"
-#: actions/siteadminpanel.php:382
+#: actions/siteadminpanel.php:385
msgid "Always"
msgstr ""
-#: actions/siteadminpanel.php:384
+#: actions/siteadminpanel.php:387
msgid "Use SSL"
msgstr ""
-#: actions/siteadminpanel.php:385
+#: actions/siteadminpanel.php:388
msgid "When to use SSL"
msgstr ""
-#: actions/siteadminpanel.php:391
+#: actions/siteadminpanel.php:393
msgid "SSL Server"
msgstr ""
-#: actions/siteadminpanel.php:392
+#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr ""
+
+#: actions/siteadminpanel.php:403
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
#, fuzzy
msgid "Save site settings"
msgstr "Configuración de Avatar"
@@ -3719,7 +3766,8 @@ msgstr "Desuscrito"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
-#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
msgid "User"
msgstr "Usuario"
@@ -3727,17 +3775,89 @@ msgstr "Usuario"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr ""
+
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:178
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr ""
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Perfil"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr ""
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
+msgstr ""
+
+#: actions/useradminpanel.php:231
#, fuzzy
-msgid "Invite-only"
-msgstr "Invitar"
+msgid "New users"
+msgstr "Invitar nuevos usuarios:"
+
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr ""
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr ""
+
+#: actions/useradminpanel.php:241
+#, fuzzy
+msgid "Default subscription"
+msgstr "Todas las suscripciones"
+
+#: actions/useradminpanel.php:242
+#, fuzzy
+msgid "Automatically subscribe new users to this user."
+msgstr ""
+"Suscribirse automáticamente a quien quiera que se suscriba a mí (es mejor "
+"para no-humanos)"
+
+#: actions/useradminpanel.php:251
+#, fuzzy
+msgid "Invitations"
+msgstr "Invitacion(es) enviada(s)"
+
+#: actions/useradminpanel.php:256
+#, fuzzy
+msgid "Invitations enabled"
+msgstr "Invitacion(es) enviada(s)"
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr ""
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr ""
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/userauthorization.php:105
@@ -3956,7 +4076,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"
@@ -3976,10 +4096,6 @@ msgstr "No se pudo configurar miembros de grupo."
msgid "Welcome to %1$s, @%2$s!"
msgstr "Mensaje a %1$s en %2$s"
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr "Perfil"
-
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Cambia tus opciones de perfil"
@@ -4017,135 +4133,135 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "Página sin título"
-#: lib/action.php:424
+#: lib/action.php:425
msgid "Primary site navigation"
msgstr "Navegación de sitio primario"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Home"
msgstr "Inicio"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Personal profile and friends timeline"
msgstr "Perfil personal y línea de tiempo de amigos"
-#: lib/action.php:432
+#: lib/action.php:433
#, fuzzy
msgid "Account"
msgstr "Cuenta"
-#: lib/action.php:432
+#: lib/action.php:433
#, fuzzy
msgid "Change your email, avatar, password, profile"
msgstr "Cambia tu correo electrónico, avatar, contraseña, perfil"
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect"
msgstr "Conectarse"
-#: lib/action.php:435
+#: lib/action.php:436
#, fuzzy
msgid "Connect to services"
msgstr "No se pudo redirigir al servidor: %s"
-#: lib/action.php:439
+#: lib/action.php:440
#, fuzzy
msgid "Change site configuration"
msgstr "Navegación de sitio primario"
-#: lib/action.php:443 lib/subgroupnav.php:105
+#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Invitar"
-#: lib/action.php:444 lib/subgroupnav.php:106
+#: lib/action.php:445 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Invita a amigos y colegas a unirse a %s"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout"
msgstr "Salir"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout from the site"
msgstr "Salir de sitio"
-#: lib/action.php:454
+#: lib/action.php:455
#, fuzzy
msgid "Create an account"
msgstr "Crear una cuenta"
-#: lib/action.php:457
+#: lib/action.php:458
msgid "Login to the site"
msgstr "Ingresar a sitio"
-#: lib/action.php:460 lib/action.php:723
+#: lib/action.php:461 lib/action.php:724
msgid "Help"
msgstr "Ayuda"
-#: lib/action.php:460
+#: lib/action.php:461
msgid "Help me!"
msgstr "Ayúdame!"
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
msgstr "Buscar"
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
msgstr "Buscar personas o texto"
-#: lib/action.php:484
+#: lib/action.php:485
msgid "Site notice"
msgstr "Aviso de sitio"
-#: lib/action.php:550
+#: lib/action.php:551
msgid "Local views"
msgstr "Vistas locales"
-#: lib/action.php:616
+#: lib/action.php:617
#, fuzzy
msgid "Page notice"
msgstr "Aviso de página"
-#: lib/action.php:718
+#: lib/action.php:719
msgid "Secondary site navigation"
msgstr "Navegación de sitio secundario"
-#: lib/action.php:725
+#: lib/action.php:726
msgid "About"
msgstr "Acerca de"
-#: lib/action.php:727
+#: lib/action.php:728
msgid "FAQ"
msgstr "Preguntas Frecuentes"
-#: lib/action.php:731
+#: lib/action.php:732
msgid "TOS"
msgstr ""
-#: lib/action.php:734
+#: lib/action.php:735
msgid "Privacy"
msgstr "Privacidad"
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
msgstr "Fuente"
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Contact"
msgstr "Ponerse en contacto"
-#: lib/action.php:740
+#: lib/action.php:741
#, fuzzy
msgid "Badge"
msgstr "Zumbido "
-#: lib/action.php:768
+#: lib/action.php:769
msgid "StatusNet software license"
msgstr "Licencia de software de StatusNet"
-#: lib/action.php:771
+#: lib/action.php:772
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4154,12 +4270,12 @@ msgstr ""
"**%%site.name%%** es un servicio de microblogueo de [%%site.broughtby%%**](%%"
"site.broughtbyurl%%)."
-#: lib/action.php:773
+#: lib/action.php:774
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** es un servicio de microblogueo."
-#: lib/action.php:775
+#: lib/action.php:776
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4170,32 +4286,32 @@ msgstr ""
"disponible bajo la [GNU Affero General Public License](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:789
+#: lib/action.php:790
#, fuzzy
msgid "Site content license"
msgstr "Licencia de software de StatusNet"
-#: lib/action.php:798
+#: lib/action.php:799
msgid "All "
msgstr "Todo"
-#: lib/action.php:803
+#: lib/action.php:804
msgid "license."
msgstr "Licencia."
-#: lib/action.php:1067
+#: lib/action.php:1068
msgid "Pagination"
msgstr "Paginación"
-#: lib/action.php:1076
+#: lib/action.php:1077
msgid "After"
msgstr "Después"
-#: lib/action.php:1084
+#: lib/action.php:1085
msgid "Before"
msgstr "Antes"
-#: lib/action.php:1132
+#: lib/action.php:1133
msgid "There was a problem with your session token."
msgstr "Hubo problemas con tu clave de sesión."
@@ -4229,6 +4345,11 @@ msgstr "Confirmación de correo electrónico"
msgid "Design configuration"
msgstr "SMS confirmación"
+#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+#, fuzzy
+msgid "Paths configuration"
+msgstr "SMS confirmación"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4403,11 +4524,10 @@ msgid "You are not subscribed to anyone."
msgstr "No estás suscrito a ese perfil."
#: lib/command.php:620
-#, fuzzy
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
-msgstr[0] "No estás suscrito a ese perfil."
-msgstr[1] "No estás suscrito a ese perfil."
+msgstr[0] "Ya estás suscrito a estos usuarios:"
+msgstr[1] "Ya estás suscrito a estos usuarios:"
#: lib/command.php:640
#, fuzzy
@@ -4415,7 +4535,6 @@ msgid "No one is subscribed to you."
msgstr "No se pudo suscribir otro a ti."
#: lib/command.php:642
-#, fuzzy
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "No se pudo suscribir otro a ti."
@@ -4427,7 +4546,6 @@ msgid "You are not a member of any groups."
msgstr "No eres miembro de ese grupo"
#: lib/command.php:664
-#, fuzzy
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."
@@ -4509,9 +4627,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: "
@@ -4608,7 +4727,7 @@ msgstr ""
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
-#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85
msgid "Group"
msgstr "Grupo"
@@ -4653,7 +4772,7 @@ msgstr "Grupos con más publicaciones"
msgid "Tags in %s group's notices"
msgstr "Tags en avisos del grupo %s"
-#: lib/htmloutputter.php:104
+#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
msgstr "Esta página no está disponible en el tipo de medio que aceptas."
@@ -4686,6 +4805,14 @@ msgstr "Se perdió nuestro archivo."
msgid "Unknown file type"
msgstr "Tipo de archivo desconocido"
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
@@ -4721,7 +4848,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:424
+#: lib/mailbox.php:227 lib/noticelist.php:452
msgid "from"
msgstr "desde"
@@ -4977,38 +5104,64 @@ msgstr "Enviar un aviso directo"
msgid "To"
msgstr "Para"
-#: lib/messageform.php:162 lib/noticeform.php:173
+#: lib/messageform.php:162 lib/noticeform.php:186
#, fuzzy
msgid "Available characters"
msgstr "Caracteres disponibles"
-#: lib/noticeform.php:145
+#: lib/noticeform.php:158
#, fuzzy
msgid "Send a notice"
msgstr "Enviar un aviso"
-#: lib/noticeform.php:158
+#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
msgstr "¿Qué tal, %s?"
-#: lib/noticeform.php:180
+#: lib/noticeform.php:193
msgid "Attach"
msgstr ""
-#: lib/noticeform.php:184
+#: lib/noticeform.php:197
msgid "Attach a file"
msgstr ""
-#: lib/noticelist.php:478
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "No"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr ""
+
+#: lib/noticelist.php:506
msgid "in context"
msgstr "en contexto"
-#: lib/noticelist.php:498
+#: lib/noticelist.php:526
msgid "Reply to this notice"
msgstr "Responder este aviso."
-#: lib/noticelist.php:499
+#: lib/noticelist.php:527
msgid "Reply"
msgstr "Responder"
@@ -5040,12 +5193,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."
@@ -5155,6 +5308,10 @@ msgstr "Desbloquear este usuario"
msgid "Search site"
msgstr "Buscar"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
msgid "Search help"
msgstr "Buscar ayuda"
@@ -5167,11 +5324,6 @@ msgstr "Gente"
msgid "Find people on this site"
msgstr "Encontrar gente en este sitio"
-#: lib/searchgroupnav.php:82
-#, fuzzy
-msgid "Notice"
-msgstr "Aviso"
-
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
msgstr "Encontrar el contenido de avisos"
@@ -5313,47 +5465,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"
@@ -5382,11 +5538,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 "Unlock this user"
-#~ msgstr "Desbloquear este usuario"
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "Personas suscritas a %s"
diff --git a/locale/fi/LC_MESSAGES/statusnet.mo b/locale/fi/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 8c3399f71..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 6563dbc5a..9d3833616 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -9,16 +9,16 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 10:43+0000\n"
-"PO-Revision-Date: 2009-11-18 19:31:49+0000\n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-11-28 19:50:12+0000\n"
"Language-Team: Finnish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fi\n"
"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
@@ -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."
@@ -444,7 +443,7 @@ msgstr "Päivitys on liian pitkä. Maksimipituus on %d merkkiä."
msgid "Not found"
msgstr "Ei löytynyt"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Maksimikoko päivitykselle on %d merkkiä, mukaan lukien URL-osoite."
@@ -558,7 +557,7 @@ msgid "Preview"
msgstr "Esikatselu"
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
+#: lib/noticelist.php:550
msgid "Delete"
msgstr "Poista"
@@ -571,7 +570,7 @@ msgid "Crop"
msgstr "Rajaa"
#: actions/avatarsettings.php:265 actions/disfavor.php:74
-#: actions/emailsettings.php:237 actions/favor.php:75
+#: 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
@@ -588,7 +587,7 @@ msgstr ""
"uudelleen."
#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
-#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: 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."
@@ -718,15 +717,15 @@ msgstr "Tuntematon osoitetyyppi %s "
msgid "That address has already been confirmed."
msgstr "Tämä osoite on jo vahvistettu."
-#: actions/confirmaddress.php:114 actions/emailsettings.php:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
#: actions/profilesettings.php:276 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Ei voitu päivittää käyttäjää."
-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
msgstr "Ei voitu poistaa sähköpostivahvistusta."
@@ -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/profileaction.php:206 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Päivitykset"
@@ -786,7 +785,7 @@ msgstr "Oletko varma että haluat poistaa tämän päivityksen?"
msgid "Do not delete this notice"
msgstr "Älä poista tätä päivitystä"
-#: actions/deletenotice.php:146 lib/noticelist.php:522
+#: actions/deletenotice.php:146 lib/noticelist.php:550
msgid "Delete this notice"
msgstr "Poista tämä päivitys"
@@ -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,189 +822,123 @@ 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:278
+#: actions/designadminpanel.php:270
#, fuzzy
msgid "Invalid logo URL."
msgstr "Koko ei kelpaa."
-#: actions/designadminpanel.php:282
+#: actions/designadminpanel.php:274
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Pikaviestin ei ole käytettävissä."
-#: actions/designadminpanel.php:288
-#, fuzzy, php-format
-msgid "Theme directory not readable: %s"
-msgstr "Pikaviestin ei ole käytettävissä."
-
-#: actions/designadminpanel.php:292
-#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:296
-#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:312
-#, php-format
-msgid "Max length for %s %s is 255 characters."
-msgstr ""
-
-#: actions/designadminpanel.php:412
+#: actions/designadminpanel.php:370
#, fuzzy
msgid "Change logo"
msgstr "Vaihda salasanasi"
-#: actions/designadminpanel.php:417
+#: actions/designadminpanel.php:375
#, fuzzy
msgid "Site logo"
msgstr "Kutsu"
-#: actions/designadminpanel.php:424
+#: actions/designadminpanel.php:382
#, fuzzy
msgid "Change theme"
msgstr "Vaihda"
-#: actions/designadminpanel.php:441
+#: actions/designadminpanel.php:399
#, fuzzy
msgid "Site theme"
msgstr "Palvelun ilmoitus"
-#: actions/designadminpanel.php:442
+#: actions/designadminpanel.php:400
#, fuzzy
msgid "Theme for the site."
msgstr "Kirjaudu ulos palvelusta"
-#: actions/designadminpanel.php:447
-msgid "Theme server"
-msgstr ""
-
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
-
-#: actions/designadminpanel.php:455
-msgid "Theme directory"
-msgstr ""
-
-#: actions/designadminpanel.php:462
-#, fuzzy
-msgid "Avatar Settings"
-msgstr "Profiilikuva-asetukset"
-
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Avatar server"
-msgstr "Profiilikuva-asetukset"
-
-#: actions/designadminpanel.php:471
-#, fuzzy
-msgid "Avatar path"
-msgstr "Kuva päivitetty."
-
-#: actions/designadminpanel.php:475
-#, fuzzy
-msgid "Avatar directory"
-msgstr "Kuva poistettu."
-
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
-msgstr ""
+msgstr "Vaihda tautakuva"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
-msgstr ""
+msgstr "Tausta"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:422
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "Voit ladata ryhmälle logokuvan. Maksimikoko on %s."
-#: actions/designadminpanel.php:526 lib/designsettings.php:139
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
-msgstr ""
+msgstr "On"
-#: actions/designadminpanel.php:542 lib/designsettings.php:155
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
-msgstr ""
+msgstr "Off"
-#: actions/designadminpanel.php:543 lib/designsettings.php:156
+#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:548 lib/designsettings.php:161
+#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:554
-msgid "Background server"
-msgstr ""
-
-#: actions/designadminpanel.php:558
-msgid "Background path"
-msgstr ""
-
-#: actions/designadminpanel.php:562
-msgid "Background directory"
-msgstr ""
-
-#: actions/designadminpanel.php:569 lib/designsettings.php:170
-#, fuzzy
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
msgid "Change colours"
-msgstr "Vaihda salasanasi"
+msgstr "Vaihda väriä"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
-#, fuzzy
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
msgid "Content"
-msgstr "Yhdistä"
+msgstr "Sisältö"
-#: actions/designadminpanel.php:604 lib/designsettings.php:204
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Haku"
-#: actions/designadminpanel.php:617 lib/designsettings.php:217
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
msgstr "Teksti"
-#: actions/designadminpanel.php:630 lib/designsettings.php:230
-#, fuzzy
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
msgid "Links"
-msgstr "Kirjaudu sisään"
+msgstr "Linkit"
-#: actions/designadminpanel.php:658 lib/designsettings.php:247
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
-msgstr ""
+msgstr "Käytä oletusasetuksia"
-#: actions/designadminpanel.php:659 lib/designsettings.php:248
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:665 lib/designsettings.php:254
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 actions/useradminpanel.php:226
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: 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 "Tallenna"
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: actions/designadminpanel.php:582 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1160,37 +1091,37 @@ msgstr "Haluan lähettää päivityksiä sähköpostilla."
msgid "Publish a MicroID for my email address."
msgstr "Julkaise MicroID sähköpostiosoitteelleni."
-#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/emailsettings.php:302 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
msgstr "Asetukset tallennettu."
-#: actions/emailsettings.php:319
+#: actions/emailsettings.php:320
msgid "No email address."
msgstr "Sähköpostiosoitetta ei ole."
-#: actions/emailsettings.php:326
+#: actions/emailsettings.php:327
msgid "Cannot normalize that email address"
msgstr "Ei voida normalisoida sähköpostiosoitetta"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "Tuo ei ole kelvollinen sähköpostiosoite"
-#: actions/emailsettings.php:333
+#: actions/emailsettings.php:334
msgid "That is already your email address."
msgstr "Tämä on jo sähköpostiosoitteesi."
-#: actions/emailsettings.php:336
+#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
msgstr "Tämä sähköpostiosoite kuuluu jo toisella käyttäjällä."
-#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Ei voitu asettaa vahvistuskoodia."
-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1199,47 +1130,47 @@ msgstr ""
"sähköpostilaatikostasi (ja roskapostilaatikostasi!) vahvistuskoodisi ja "
"miten sitä käytetään. "
-#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
msgstr "Avoimia vahvistuksia ei ole peruutettavana."
-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
msgstr "Tämä on väärä pikaviestiosoite."
-#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
msgstr "Vahvistus peruttu."
-#: actions/emailsettings.php:412
+#: actions/emailsettings.php:413
msgid "That is not your email address."
msgstr "Tämä ei ole sähköpostiosoitteesi."
-#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
msgstr "Osoite on poistettu."
-#: actions/emailsettings.php:445 actions/smssettings.php:518
+#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
msgstr "Saapuvan sähköpostin osoitetta ei ole."
-#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
msgid "Couldn't update user record."
msgstr "Ei voitu päivittää käyttäjätietoja."
-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
msgstr "Saapuvan sähköpostin osoite poistettu."
-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555
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"
@@ -1493,7 +1424,7 @@ msgstr "Ryhmän %s jäsenet, sivu %d"
msgid "A list of the users in this group."
msgstr "Lista ryhmän käyttäjistä."
-#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
msgid "Admin"
msgstr "Ylläpito"
@@ -1552,7 +1483,7 @@ msgid ""
msgstr ""
#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/subgroupnav.php:98
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Ryhmät"
@@ -1772,7 +1703,7 @@ msgstr "Henkilökohtainen viesti"
msgid "Optionally add a personal message to the invitation."
msgstr "Voit myös lisätä oman viestisi kutsuun"
-#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
msgstr "Lähetä"
@@ -1895,7 +1826,7 @@ msgstr "Väärä käyttäjätunnus tai salasana"
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:457
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Kirjaudu sisään"
@@ -2009,7 +1940,7 @@ msgstr "Viesti lähetetty"
msgid "Direct message to %s sent"
msgstr "Suora viesti käyttäjälle %s lähetetty"
-#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
msgid "Ajax Error"
msgstr "Ajax-virhe"
@@ -2017,7 +1948,7 @@ msgstr "Ajax-virhe"
msgid "New notice"
msgstr "Uusi päivitys"
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
msgid "Notice posted"
msgstr "Päivitys lähetetty"
@@ -2055,12 +1986,12 @@ msgid ""
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
-#: actions/noticesearchrss.php:89
+#: actions/noticesearchrss.php:96
#, fuzzy, php-format
msgid "Updates with \"%s\""
msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
-#: actions/noticesearchrss.php:91
+#: actions/noticesearchrss.php:98
#, fuzzy, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
msgstr "Kaikki päivitykset hakuehdolla \"%s\""
@@ -2187,9 +2118,9 @@ msgstr "6 tai useampia merkkejä"
msgid "Confirm"
msgstr "Vahvista"
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "sama salasana kuin yllä"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Sama kuin ylläoleva salasana"
#: actions/passwordsettings.php:117
msgid "Change"
@@ -2219,6 +2150,114 @@ msgstr "Uutta salasanaa ei voida tallentaa."
msgid "Password saved."
msgstr "Salasana tallennettu."
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr "Polut"
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr "Polut ja palvelin asetukset tälle StatusNet palvelulle."
+
+#: actions/pathsadminpanel.php:140
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Pikaviestin ei ole käytettävissä."
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+#, fuzzy
+msgid "Site"
+msgstr "Kutsu"
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+#, fuzzy
+msgid "Site path"
+msgstr "Palvelun ilmoitus"
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr ""
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Avatars"
+msgstr "Kuva"
+
+#: actions/pathsadminpanel.php:252
+#, fuzzy
+msgid "Avatar server"
+msgstr "Profiilikuva-asetukset"
+
+#: actions/pathsadminpanel.php:256
+#, fuzzy
+msgid "Avatar path"
+msgstr "Kuva päivitetty."
+
+#: actions/pathsadminpanel.php:260
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Kuva poistettu."
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr "Taustakuvat"
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr "Taustakuvapalvelin"
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr "Taustakuvan hakemistopolku"
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr "Taustakuvan hakemisto"
+
+#: actions/pathsadminpanel.php:297
+#, fuzzy
+msgid "Save paths"
+msgstr "Palvelun ilmoitus"
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -2325,7 +2364,7 @@ msgstr ""
"Kuvaa itseäsi henkilötageilla (sanoja joissa voi olla muita kirjaimia kuin "
"ääkköset, numeroita, -, ., ja _), pilkulla tai välilyönnillä erotettuna"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr "Kieli"
@@ -2554,10 +2593,6 @@ msgstr "Tuntematon toiminto"
msgid "6 or more characters, and don't forget it!"
msgstr "6 tai useampia merkkejä äläkä unohda mitä kirjoitit!"
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Sama kuin ylläoleva salasana"
-
#: actions/recoverpassword.php:243
msgid "Reset"
msgstr "Vaihda"
@@ -2619,7 +2654,7 @@ msgstr "Virheellinen kutsukoodin."
msgid "Registration successful"
msgstr "Rekisteröityminen onnistui"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Rekisteröidy"
@@ -2665,7 +2700,7 @@ msgid "Same as password above. Required."
msgstr "Sama kuin ylläoleva salasana. Pakollinen."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Sähköposti"
@@ -2775,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"
@@ -3116,11 +3151,6 @@ msgstr "Et voi lähettää viestiä tälle käyttäjälle."
msgid "User is already silenced."
msgstr "Käyttäjä on asettanut eston sinulle."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
-#, fuzzy
-msgid "Site"
-msgstr "Kutsu"
-
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
msgstr ""
@@ -3152,103 +3182,100 @@ msgid "Snapshot frequency must be a number."
msgstr ""
#: actions/siteadminpanel.php:199
-msgid "You must set an SSL sever when enabling SSL."
+msgid "You must set an SSL server when enabling SSL."
msgstr ""
#: actions/siteadminpanel.php:204
-msgid "Invalid SSL server. Max length is 255 characters."
+msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
#: actions/siteadminpanel.php:210
-msgid "Minimum text limit is 140c."
+msgid "Minimum text limit is 140 characters."
msgstr ""
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:224
-#, php-format
-msgid "Locales directory not readable: %s"
+#: actions/siteadminpanel.php:266
+msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:275
+#: actions/siteadminpanel.php:269
#, fuzzy
msgid "Site name"
msgstr "Palvelun ilmoitus"
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:279
+#: actions/siteadminpanel.php:274
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:280
+#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:283
+#: actions/siteadminpanel.php:279
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:284
#, fuzzy
-msgid "contact email address for your site"
+msgid "Contact email address for your site"
msgstr "Uusi sähköpostiosoite päivityksien lähettämiseen palveluun %s"
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:290
+#, fuzzy
+msgid "Local"
+msgstr "Paikalliset näkymät"
+
+#: actions/siteadminpanel.php:301
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:303
+#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:308
#, fuzzy
msgid "Default site language"
msgstr "Ensisijainen kieli"
#: actions/siteadminpanel.php:316
-msgid "Path to locales"
-msgstr ""
-
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
-msgstr ""
+#, fuzzy
+msgid "URLs"
+msgstr "URL"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
#, fuzzy
msgid "Server"
msgstr "Palauta"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
msgstr ""
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-#, fuzzy
-msgid "Site path"
-msgstr "Palvelun ilmoitus"
-
-#: actions/siteadminpanel.php:328
+#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
msgstr ""
-#: actions/siteadminpanel.php:330
+#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
+#: actions/siteadminpanel.php:331
+#, fuzzy
+msgid "Access"
+msgstr "Hyväksy"
+
#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
@@ -3267,7 +3294,7 @@ msgstr "Kutsu"
msgid "Make registration invitation only."
msgstr ""
-#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#: actions/siteadminpanel.php:346
#, fuzzy
msgid "Closed"
msgstr "Estä"
@@ -3276,33 +3303,37 @@ msgstr "Estä"
msgid "Disable new registrations."
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
#, fuzzy
msgid "Never"
msgstr "Palauta"
-#: actions/siteadminpanel.php:357
+#: actions/siteadminpanel.php:360
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:358
+#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:364
+#: actions/siteadminpanel.php:366
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:365
-msgid "Snapshots will be sent once every N Web hits"
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
msgstr ""
#: actions/siteadminpanel.php:372
@@ -3313,49 +3344,58 @@ msgstr ""
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:381
+#: actions/siteadminpanel.php:380
+#, fuzzy
+msgid "SSL"
+msgstr "SMS"
+
+#: actions/siteadminpanel.php:384
#, fuzzy
msgid "Sometimes"
msgstr "Päivitykset"
-#: actions/siteadminpanel.php:382
+#: actions/siteadminpanel.php:385
#, fuzzy
msgid "Always"
msgstr "Aliakset"
-#: actions/siteadminpanel.php:384
+#: actions/siteadminpanel.php:387
msgid "Use SSL"
msgstr ""
-#: actions/siteadminpanel.php:385
+#: actions/siteadminpanel.php:388
msgid "When to use SSL"
msgstr ""
-#: actions/siteadminpanel.php:391
+#: actions/siteadminpanel.php:393
msgid "SSL Server"
msgstr ""
-#: actions/siteadminpanel.php:392
+#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr ""
+
+#: actions/siteadminpanel.php:403
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
#, fuzzy
msgid "Save site settings"
msgstr "Profiilikuva-asetukset"
@@ -3665,7 +3705,8 @@ msgstr "Tilaus lopetettu"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
-#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
msgid "User"
msgstr "Käyttäjä"
@@ -3673,17 +3714,89 @@ msgstr "Käyttäjä"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr ""
+
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
+msgstr ""
+
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr ""
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Profiili"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr ""
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:178
+#: actions/useradminpanel.php:231
#, fuzzy
-msgid "Invite-only"
-msgstr "Kutsu"
+msgid "New users"
+msgstr "Kutsu uusia käyttäjiä"
+
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr ""
+
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr ""
+
+#: actions/useradminpanel.php:241
+#, fuzzy
+msgid "Default subscription"
+msgstr "Kaikki tilaukset"
+
+#: actions/useradminpanel.php:242
+#, fuzzy
+msgid "Automatically subscribe new users to this user."
+msgstr ""
+"Tilaa automaattisesti kaikki, jotka tilaavat päivitykseni (ei sovi hyvin "
+"ihmiskäyttäjille)"
+
+#: actions/useradminpanel.php:251
+#, fuzzy
+msgid "Invitations"
+msgstr "Kutsu(t) lähetettiin"
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: actions/useradminpanel.php:256
+#, fuzzy
+msgid "Invitations enabled"
+msgstr "Kutsu(t) lähetettiin"
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr ""
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr ""
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/userauthorization.php:105
@@ -3896,7 +4009,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"
@@ -3914,10 +4027,6 @@ msgstr "Ryhmän jäsenyystietoja ei voitu asettaa."
msgid "Welcome to %1$s, @%2$s!"
msgstr "Viesti käyttäjälle %1$s, %2$s"
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr "Profiili"
-
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Vaihda profiiliasetuksesi"
@@ -3956,131 +4065,131 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "Nimetön sivu"
-#: lib/action.php:424
+#: lib/action.php:425
msgid "Primary site navigation"
msgstr "Ensisijainen sivunavigointi"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Home"
msgstr "Koti"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Personal profile and friends timeline"
msgstr "Henkilökohtainen profiili ja kavereiden aikajana"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Account"
msgstr "Käyttäjätili"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Change your email, avatar, password, profile"
msgstr "Muuta sähköpostiosoitettasi, kuvaasi, salasanaasi, profiiliasi"
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect"
msgstr "Yhdistä"
-#: lib/action.php:435
+#: lib/action.php:436
#, fuzzy
msgid "Connect to services"
msgstr "Ei voitu uudelleenohjata palvelimelle: %s"
-#: lib/action.php:439
+#: lib/action.php:440
#, fuzzy
msgid "Change site configuration"
msgstr "Ensisijainen sivunavigointi"
-#: lib/action.php:443 lib/subgroupnav.php:105
+#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Kutsu"
-#: lib/action.php:444 lib/subgroupnav.php:106
+#: lib/action.php:445 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Kutsu kavereita ja työkavereita liittymään palveluun %s"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout"
msgstr "Kirjaudu ulos"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout from the site"
msgstr "Kirjaudu ulos palvelusta"
-#: lib/action.php:454
+#: lib/action.php:455
msgid "Create an account"
msgstr "Luo uusi käyttäjätili"
-#: lib/action.php:457
+#: lib/action.php:458
msgid "Login to the site"
msgstr "Kirjaudu sisään palveluun"
-#: lib/action.php:460 lib/action.php:723
+#: lib/action.php:461 lib/action.php:724
msgid "Help"
msgstr "Ohjeet"
-#: lib/action.php:460
+#: lib/action.php:461
msgid "Help me!"
msgstr "Auta minua!"
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
msgstr "Haku"
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
msgstr "Hae ihmisiä tai tekstiä"
-#: lib/action.php:484
+#: lib/action.php:485
msgid "Site notice"
msgstr "Palvelun ilmoitus"
-#: lib/action.php:550
+#: lib/action.php:551
msgid "Local views"
msgstr "Paikalliset näkymät"
-#: lib/action.php:616
+#: lib/action.php:617
msgid "Page notice"
msgstr "Sivuilmoitus"
-#: lib/action.php:718
+#: lib/action.php:719
msgid "Secondary site navigation"
msgstr "Toissijainen sivunavigointi"
-#: lib/action.php:725
+#: lib/action.php:726
msgid "About"
msgstr "Tietoa"
-#: lib/action.php:727
+#: lib/action.php:728
msgid "FAQ"
msgstr "UKK"
-#: lib/action.php:731
+#: lib/action.php:732
msgid "TOS"
msgstr ""
-#: lib/action.php:734
+#: lib/action.php:735
msgid "Privacy"
msgstr "Yksityisyys"
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
msgstr "Lähdekoodi"
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Contact"
msgstr "Ota yhteyttä"
-#: lib/action.php:740
+#: lib/action.php:741
#, fuzzy
msgid "Badge"
msgstr "Tönäise"
-#: lib/action.php:768
+#: lib/action.php:769
msgid "StatusNet software license"
msgstr "StatusNet-ohjelmiston lisenssi"
-#: lib/action.php:771
+#: lib/action.php:772
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4089,12 +4198,12 @@ msgstr ""
"**%%site.name%%** on mikroblogipalvelu, jonka tarjoaa [%%site.broughtby%%](%%"
"site.broughtbyurl%%). "
-#: lib/action.php:773
+#: lib/action.php:774
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** on mikroblogipalvelu. "
-#: lib/action.php:775
+#: lib/action.php:776
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4105,32 +4214,32 @@ msgstr ""
"versio %s, saatavilla lisenssillä [GNU Affero General Public License](http://"
"www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:789
+#: lib/action.php:790
#, fuzzy
msgid "Site content license"
msgstr "StatusNet-ohjelmiston lisenssi"
-#: lib/action.php:798
+#: lib/action.php:799
msgid "All "
msgstr "Kaikki "
-#: lib/action.php:803
+#: lib/action.php:804
msgid "license."
msgstr "lisenssi."
-#: lib/action.php:1067
+#: lib/action.php:1068
msgid "Pagination"
msgstr "Sivutus"
-#: lib/action.php:1076
+#: lib/action.php:1077
msgid "After"
msgstr "Myöhemmin"
-#: lib/action.php:1084
+#: lib/action.php:1085
msgid "Before"
msgstr "Aiemmin"
-#: lib/action.php:1132
+#: lib/action.php:1133
msgid "There was a problem with your session token."
msgstr "Istuntoavaimesi kanssa oli ongelma."
@@ -4164,6 +4273,11 @@ msgstr "Sähköpostiosoitteen vahvistus"
msgid "Design configuration"
msgstr "SMS vahvistus"
+#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+#, fuzzy
+msgid "Paths configuration"
+msgstr "SMS vahvistus"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4338,11 +4452,10 @@ msgid "You are not subscribed to anyone."
msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
#: lib/command.php:620
-#, fuzzy
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
-msgstr[0] "Et ole tilannut tämän käyttäjän päivityksiä."
-msgstr[1] "Et ole tilannut tämän käyttäjän päivityksiä."
+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
#, fuzzy
@@ -4350,7 +4463,6 @@ msgid "No one is subscribed to you."
msgstr "Toista ei voitu asettaa tilaamaan sinua."
#: lib/command.php:642
-#, fuzzy
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Toista ei voitu asettaa tilaamaan sinua."
@@ -4362,7 +4474,6 @@ msgid "You are not a member of any groups."
msgstr "Sinä et kuulu tähän ryhmään."
#: lib/command.php:664
-#, fuzzy
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."
@@ -4447,9 +4558,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: "
@@ -4546,7 +4658,7 @@ msgstr ""
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
-#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85
msgid "Group"
msgstr "Ryhmä"
@@ -4592,7 +4704,7 @@ msgstr "Ryhmät, joissa eniten päivityksiä"
msgid "Tags in %s group's notices"
msgstr "Tagit ryhmän %s päivityksissä"
-#: lib/htmloutputter.php:104
+#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
msgstr "Tämä sivu ei ole saatavilla sinulle sopivassa mediatyypissä."
@@ -4625,6 +4737,14 @@ msgstr "Tiedosto hävisi."
msgid "Unknown file type"
msgstr "Tunnistamaton tiedoston tyyppi"
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
@@ -4656,7 +4776,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:424
+#: lib/mailbox.php:227 lib/noticelist.php:452
#, fuzzy
msgid "from"
msgstr " lähteestä "
@@ -4917,37 +5037,63 @@ msgstr "Lähetä suora viesti"
msgid "To"
msgstr "Vastaanottaja"
-#: lib/messageform.php:162 lib/noticeform.php:173
+#: lib/messageform.php:162 lib/noticeform.php:186
msgid "Available characters"
msgstr "Sallitut merkit"
-#: lib/noticeform.php:145
+#: lib/noticeform.php:158
msgid "Send a notice"
msgstr "Lähetä päivitys"
-#: lib/noticeform.php:158
+#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
msgstr "Mitä teet juuri nyt, %s?"
-#: lib/noticeform.php:180
+#: lib/noticeform.php:193
msgid "Attach"
msgstr ""
-#: lib/noticeform.php:184
+#: lib/noticeform.php:197
msgid "Attach a file"
msgstr ""
-#: lib/noticelist.php:478
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "Ei"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr ""
+
+#: lib/noticelist.php:506
#, fuzzy
msgid "in context"
msgstr "Ei sisältöä!"
-#: lib/noticelist.php:498
+#: lib/noticelist.php:526
msgid "Reply to this notice"
msgstr "Vastaa tähän päivitykseen"
-#: lib/noticelist.php:499
+#: lib/noticelist.php:527
msgid "Reply"
msgstr "Vastaus"
@@ -4980,12 +5126,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."
@@ -5095,6 +5241,10 @@ msgstr "Poista esto tältä käyttäjältä"
msgid "Search site"
msgstr "Haku"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
#, fuzzy
msgid "Search help"
@@ -5108,10 +5258,6 @@ msgstr "Henkilö"
msgid "Find people on this site"
msgstr "Hae ihmisiä tältä sivustolta"
-#: lib/searchgroupnav.php:82
-msgid "Notice"
-msgstr "Päivitys"
-
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
msgstr "Hae päivityksien sisällöstä"
@@ -5252,47 +5398,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"
@@ -5321,11 +5471,3 @@ msgstr "Valitettavasti tuo ei ole oikea osoite sähköpostipäivityksille."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Valitettavasti päivitysten teko sähköpostilla ei ole sallittua."
-
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "Poista esto tältä käyttäjältä"
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "Ihmiset jotka ovat käyttäjän %s tilaajia"
diff --git a/locale/fr/LC_MESSAGES/statusnet.mo b/locale/fr/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index eb8da8f56..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 8c2afd401..7d9301836 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -3,6 +3,7 @@
# 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,16 +13,16 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 10:43+0000\n"
-"PO-Revision-Date: 2009-11-18 19:31:52+0000\n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-11-28 19:50:14+0000\n"
"Language-Team: French\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
@@ -102,6 +103,9 @@ msgid ""
"You can try to [nudge %s](../%s) from his profile or [post something to his "
"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
msgstr ""
+"Vous pouvez essayer de [donner un coup de coude à %s](../%s) depuis son "
+"profil ou [poster quelque chose à son intention](%%%%action.newnotice%%%%?"
+"status_textarea=%s)."
#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
#, php-format
@@ -109,6 +113,8 @@ msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
"post a notice to his or her attention."
msgstr ""
+"Pourquoi ne pas [créer un compte](%%%%action.register%%%%) et ensuite "
+"envoyer un coup de coude à %s ou poster quelque chose à son intention."
#: actions/all.php:165
msgid "You and friends"
@@ -145,6 +151,8 @@ msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none"
msgstr ""
+"Vous devez spécifier un paramètre « device » avec une des valeurs suivantes : "
+"sms, im, none"
#: actions/apiaccountupdatedeliverydevice.php:132
msgid "Could not update user."
@@ -160,6 +168,8 @@ msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
"current configuration."
msgstr ""
+"Le serveur n'a pas pu gérer autant de données de POST (%s octets) en raison "
+"de sa configuration actuelle."
#: actions/apiaccountupdateprofilebackgroundimage.php:136
#: actions/apiaccountupdateprofilebackgroundimage.php:146
@@ -369,9 +379,8 @@ msgstr "L’alias ne peut pas être le même que le pseudo."
#: 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éthode API non trouvée !"
+msgstr "Groupe non trouvé !"
#: actions/apigroupjoin.php:110
msgid "You are already a member of that group."
@@ -411,9 +420,9 @@ msgid "%s's groups"
msgstr "Groupes de %s"
#: actions/apigrouplist.php:103
-#, fuzzy, php-format
+#, php-format
msgid "Groups %s is a member of on %s."
-msgstr "Groupes de %s"
+msgstr "Les groupes dont %s est membre sur %s."
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
@@ -441,7 +450,7 @@ msgstr "C’est trop long ! La taille maximale de l’avis est de %d caractères
msgid "Not found"
msgstr "Non trouvé"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -558,7 +567,7 @@ msgid "Preview"
msgstr "Aperçu"
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
+#: lib/noticelist.php:550
msgid "Delete"
msgstr "Supprimer"
@@ -571,7 +580,7 @@ msgid "Crop"
msgstr "Recadrer"
#: actions/avatarsettings.php:265 actions/disfavor.php:74
-#: actions/emailsettings.php:237 actions/favor.php:75
+#: 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
@@ -588,7 +597,7 @@ msgstr ""
"nouveau."
#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
-#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: 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."
@@ -655,7 +664,6 @@ msgid "Unblock this user"
msgstr "Débloquer cet utilisateur"
#: actions/block.php:69
-#, fuzzy
msgid "You already blocked that user."
msgstr "Vous avez déjà bloqué cet utilisateur."
@@ -720,15 +728,15 @@ msgstr "Type d’adresse non reconnu : %s"
msgid "That address has already been confirmed."
msgstr "Cette adresse a déjà été confirmée."
-#: actions/confirmaddress.php:114 actions/emailsettings.php:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
#: actions/profilesettings.php:276 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Impossible de mettre à jour l’utilisateur."
-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
msgstr "Impossible de supprimer le courriel de confirmation."
@@ -747,7 +755,7 @@ msgid "Conversation"
msgstr "Conversation"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206
+#: lib/profileaction.php:206 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Statuts"
@@ -788,7 +796,7 @@ msgstr "Êtes-vous sûr(e) de vouloir supprimer ce statut ?"
msgid "Do not delete this notice"
msgstr "Ne pas supprimer cet avis"
-#: actions/deletenotice.php:146 lib/noticelist.php:522
+#: actions/deletenotice.php:146 lib/noticelist.php:550
msgid "Delete this notice"
msgstr "Supprimer ce statut"
@@ -799,30 +807,28 @@ msgstr ""
"nouveau."
#: actions/deleteuser.php:67
-#, fuzzy
msgid "You cannot delete users."
-msgstr "Impossible de mettre à jour l’utilisateur."
+msgstr "Vous ne pouvez pas supprimer des utilisateurs."
#: actions/deleteuser.php:74
-#, fuzzy
msgid "You can only delete local users."
-msgstr "Vous ne pouvez pas supprimer le statut d’un autre utilisateur."
+msgstr "Vous pouvez seulement supprimer les utilisateurs locaux."
#: actions/deleteuser.php:110 actions/deleteuser.php:133
-#, fuzzy
msgid "Delete user"
-msgstr "Supprimer"
+msgstr "Supprimer l'utilsateur"
#: 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 ""
+"Êtes-vous certain de vouloir supprimer cet utilisateur ? Ceci effacera "
+"toutes les données à son propos de la base de données, sans sauvegarde."
#: actions/deleteuser.php:148 lib/deleteuserform.php:77
-#, fuzzy
msgid "Delete this user"
-msgstr "Supprimer ce statut"
+msgstr "Supprimer cet utilisateur"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
#: lib/adminpanelaction.php:302 lib/groupnav.php:119
@@ -831,186 +837,114 @@ msgstr "Conception"
#: actions/designadminpanel.php:73
msgid "Design settings for this StatusNet site."
-msgstr ""
+msgstr "Paramètres de conception pour ce site StatusNet."
-#: actions/designadminpanel.php:278
-#, fuzzy
+#: actions/designadminpanel.php:270
msgid "Invalid logo URL."
-msgstr "Taille incorrecte."
-
-#: actions/designadminpanel.php:282
-#, fuzzy, php-format
-msgid "Theme not available: %s"
-msgstr "La messagerie instantanée n’est pas disponible."
-
-#: actions/designadminpanel.php:288
-#, fuzzy, php-format
-msgid "Theme directory not readable: %s"
-msgstr "La messagerie instantanée n’est pas disponible."
+msgstr "URL du logo invalide."
-#: actions/designadminpanel.php:292
+#: actions/designadminpanel.php:274
#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:296
-#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:312
-#, php-format
-msgid "Max length for %s %s is 255 characters."
-msgstr ""
+msgid "Theme not available: %s"
+msgstr "Le thème n'est pas disponible : %s"
-#: actions/designadminpanel.php:412
-#, fuzzy
+#: actions/designadminpanel.php:370
msgid "Change logo"
-msgstr "Modifier les couleurs"
+msgstr "Modifier le logo"
-#: actions/designadminpanel.php:417
-#, fuzzy
+#: actions/designadminpanel.php:375
msgid "Site logo"
-msgstr "Inviter"
+msgstr "Logo du site"
-#: actions/designadminpanel.php:424
-#, fuzzy
+#: actions/designadminpanel.php:382
msgid "Change theme"
-msgstr "Modifier"
+msgstr "Modifier le thème"
-#: actions/designadminpanel.php:441
-#, fuzzy
+#: actions/designadminpanel.php:399
msgid "Site theme"
-msgstr "Notice du site"
+msgstr "Thème du site"
-#: actions/designadminpanel.php:442
-#, fuzzy
+#: actions/designadminpanel.php:400
msgid "Theme for the site."
-msgstr "Fermer la session"
-
-#: actions/designadminpanel.php:447
-msgid "Theme server"
-msgstr ""
-
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
-
-#: actions/designadminpanel.php:455
-msgid "Theme directory"
-msgstr ""
-
-#: actions/designadminpanel.php:462
-#, fuzzy
-msgid "Avatar Settings"
-msgstr "Paramètres de l’avatar"
-
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Avatar server"
-msgstr "Paramètres de l’avatar"
-
-#: actions/designadminpanel.php:471
-#, fuzzy
-msgid "Avatar path"
-msgstr "Avatar mis à jour."
+msgstr "Thème pour le site."
-#: actions/designadminpanel.php:475
-#, fuzzy
-msgid "Avatar directory"
-msgstr "Avatar supprimé."
-
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
msgstr "Changer l’image d’arrière plan"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
msgstr "Arrière plan"
-#: actions/designadminpanel.php:496
-#, fuzzy, php-format
+#: actions/designadminpanel.php:422
+#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr ""
-"Vous pouvez choisir un logo pour votre groupe. La taille maximale du fichier "
-"est de %s."
+"Vous pouvez importer une image d'arrière plan pour ce site. La taille "
+"maximale du fichier est de %1$s."
-#: actions/designadminpanel.php:526 lib/designsettings.php:139
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
msgstr "Activé"
-#: actions/designadminpanel.php:542 lib/designsettings.php:155
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
msgstr "Désactivé"
-#: actions/designadminpanel.php:543 lib/designsettings.php:156
+#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Activer ou désactiver l’image d’arrière plan."
-#: actions/designadminpanel.php:548 lib/designsettings.php:161
+#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Répéter l’image d’arrière plan"
-#: actions/designadminpanel.php:554
-#, fuzzy
-msgid "Background server"
-msgstr "Arrière plan"
-
-#: actions/designadminpanel.php:558
-#, fuzzy
-msgid "Background path"
-msgstr "Arrière plan"
-
-#: actions/designadminpanel.php:562
-#, fuzzy
-msgid "Background directory"
-msgstr "Arrière plan"
-
-#: actions/designadminpanel.php:569 lib/designsettings.php:170
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
msgid "Change colours"
msgstr "Modifier les couleurs"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
msgid "Content"
msgstr "Contenu"
-#: actions/designadminpanel.php:604 lib/designsettings.php:204
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Barre latérale"
-#: actions/designadminpanel.php:617 lib/designsettings.php:217
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
msgstr "Texte"
-#: actions/designadminpanel.php:630 lib/designsettings.php:230
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
msgid "Links"
msgstr "Liens"
-#: actions/designadminpanel.php:658 lib/designsettings.php:247
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Utiliser les valeurs par défaut"
-#: actions/designadminpanel.php:659 lib/designsettings.php:248
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Restaurer les conceptions par défaut"
-#: actions/designadminpanel.php:665 lib/designsettings.php:254
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Revenir aux valeurs par défaut"
-#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 actions/useradminpanel.php:226
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: 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 "Enregistrer"
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: actions/designadminpanel.php:582 lib/designsettings.php:257
msgid "Save design"
msgstr "Sauvegarder la conception"
@@ -1162,37 +1096,37 @@ msgstr "Je veux envoyer mes statuts par courriel."
msgid "Publish a MicroID for my email address."
msgstr "Publier un MicroID pour mon adresse courriel."
-#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/emailsettings.php:302 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
msgstr "Préférences enregistrées"
-#: actions/emailsettings.php:319
+#: actions/emailsettings.php:320
msgid "No email address."
msgstr "Aucune adresse courriel."
-#: actions/emailsettings.php:326
+#: actions/emailsettings.php:327
msgid "Cannot normalize that email address"
msgstr "Impossible d’utiliser cette adresse courriel"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "Adresse courriel invalide"
-#: actions/emailsettings.php:333
+#: actions/emailsettings.php:334
msgid "That is already your email address."
msgstr "Vous utilisez déjà cette adresse courriel."
-#: actions/emailsettings.php:336
+#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
msgstr "Cette adresse courriel appartient déjà à un autre utilisateur."
-#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Impossible d’insérer le code de confirmation."
-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1200,47 +1134,47 @@ msgstr ""
"Un code de confirmation a été envoyé à l’adresse courriel indiquée. Vérifiez "
"votre boîte de réception pour récupérer le code et les instructions."
-#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
msgstr "Aucune confirmation à annuler."
-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
msgstr "Cette adresse de messagerie instantanée est erronée."
-#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
msgstr "Confirmation annulée."
-#: actions/emailsettings.php:412
+#: actions/emailsettings.php:413
msgid "That is not your email address."
msgstr "Ceci n’est pas votre adresse courriel."
-#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
msgstr "L’adresse a été supprimée."
-#: actions/emailsettings.php:445 actions/smssettings.php:518
+#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
msgstr "Aucune adresse pour le courriel entrant."
-#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
msgid "Couldn't update user record."
msgstr "Impossible de mettre à jour le dossier de l’utilisateur."
-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
msgstr "L’adresse de courriel entrant a été supprimée."
-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555
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"
@@ -1284,9 +1218,9 @@ msgid "%s's favorite notices"
msgstr "Statuts favoris de %s"
#: actions/favoritesrss.php:115
-#, fuzzy, php-format
+#, php-format
msgid "Updates favored by %1$s on %2$s!"
-msgstr "Statuts de %1$s dans %2$s!"
+msgstr "Mises à jour privilégiées par %1$s sur %2$s !"
#: actions/favor.php:79
msgid "This notice is already a favorite!"
@@ -1447,6 +1381,8 @@ msgid ""
"Customize the way your group looks with a background image and a colour "
"palette of your choice."
msgstr ""
+"Personnalisez le style de votre groupe avec une image de fond et une palette "
+"de couleur de votre choix."
#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
#: lib/designsettings.php:434 lib/designsettings.php:464
@@ -1456,14 +1392,12 @@ msgstr "Impossible de mettre à jour votre conception."
#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
-#, fuzzy
msgid "Unable to save your design settings!"
-msgstr "L’enregistrement de votre configuration Twitter a échoué !"
+msgstr "Impossible de sauvegarder les préférences de conception !"
#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
-#, fuzzy
msgid "Design preferences saved."
-msgstr "Préférences de synchronisation enregistrées."
+msgstr "Préférences de conception enregistrées."
#: actions/grouplogo.php:139 actions/grouplogo.php:192
msgid "Group logo"
@@ -1503,7 +1437,7 @@ msgstr "Membres du groupe %s - page %d"
msgid "A list of the users in this group."
msgstr "Liste des utilisateurs inscrits à ce groupe."
-#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
msgid "Admin"
msgstr "Administrer"
@@ -1524,19 +1458,19 @@ msgid "Make this user an admin"
msgstr "Faire de cet utilisateur un administrateur"
#: actions/grouprss.php:133
-#, fuzzy, php-format
+#, php-format
msgid "Updates from members of %1$s on %2$s!"
-msgstr "Statuts de %1$s dans %2$s!"
+msgstr "Mises à jour des membres de %1$s dans %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 ""
-"Recherchez des personnes dans %%site.name%% par leur nom, leur emplacement "
-"ou leurs intérêts. Séparez les termes de recherche par des espaces. Ils "
-"doivent contenir au moins 3 caractères."
+"Recherchez des groupes sur %%site.name%% par leur nom, leur emplacement ou "
+"leurs intérêts. Séparez les termes de recherche par des espaces. Ils doivent "
+"contenir au moins 3 caractères."
#: actions/groupsearch.php:58
msgid "Group search"
@@ -1553,6 +1487,8 @@ msgid ""
"If you can't find the group you're looking for, you can [create it](%%action."
"newgroup%%) yourself."
msgstr ""
+"Si vous ne trouvez pas le groupe que vous recherchez, vous pouvez [le créer]"
+"(%%action.newgroup%%) vous-même."
#: actions/groupsearch.php:85
#, php-format
@@ -1560,9 +1496,11 @@ msgid ""
"Why not [register an account](%%action.register%%) and [create the group](%%"
"action.newgroup%%) yourself!"
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/subgroupnav.php:98
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Groupes"
@@ -1580,6 +1518,12 @@ msgid ""
"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
"%%%%)"
msgstr ""
+"Les groupes de %%%%site.name%%%% permettent de trouver et de parler avec des "
+"personnes qui ont le même intérêt. Après avoir rejoint un groupe vous pouvez "
+"envoyer des messages à tous les autres membres en utilisant la syntaxe « !"
+"nomdugroupe ». Vous ne voyez aucun groupe qui vous intéresse ? Essayer d'en "
+"[rechercher un](%%%%action.groupsearch%%%%) ou [commencez le votre !](%%%%"
+"action.newgroup%%%%)"
#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
msgid "Create a new group"
@@ -1784,7 +1728,7 @@ msgstr "Message personnel"
msgid "Optionally add a personal message to the invitation."
msgstr "Ajouter un message personnel à l’invitation (optionnel)."
-#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
msgstr "Envoyer"
@@ -1905,11 +1849,10 @@ msgid "Incorrect username or password."
msgstr "Identifiant ou mot de passe incorrect."
#: actions/login.php:149
-#, fuzzy
msgid "Error setting user. You are probably not authorized."
-msgstr "Vous n'êtes pas autorisé."
+msgstr "Abonnements par défaut"
-#: actions/login.php:204 actions/login.php:257 lib/action.php:457
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Ouvrir une session"
@@ -1952,14 +1895,14 @@ msgstr ""
"votre mot de passe afin d’enregistrer vos préférences."
#: actions/login.php:286
-#, fuzzy, php-format
+#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
"(%%action.register%%) a new account."
msgstr ""
-"Ouvrez une session avec votre identifiant et votre mot de passe, ou [créez "
-"un compte](%%action.register%%), ou utilisez un identifiant [OpenID](%%"
-"action.openidlogin%%)."
+"Ouvrez une session avec votre identifiant et votre mot de passe. Vous n'avez "
+"pas encore d'identifiant ? [Créez-vous](%%action.register%%) un nouveau "
+"compte."
#: actions/makeadmin.php:91
msgid "Only an admin can make another user an admin."
@@ -1975,6 +1918,8 @@ msgstr "%s est déjà un administrateur du groupe « %s »."
#, php-format
msgid "Can't get membership record for %s in group %s"
msgstr ""
+"Impossible d'avoir les enregistrements d'appartenance pour %s dans le groupe "
+"%s"
#: actions/makeadmin.php:145
#, php-format
@@ -2025,7 +1970,7 @@ msgstr "Message envoyé"
msgid "Direct message to %s sent"
msgstr "Votre message a été envoyé à %s"
-#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
msgid "Ajax Error"
msgstr "Erreur Ajax"
@@ -2033,7 +1978,7 @@ msgstr "Erreur Ajax"
msgid "New notice"
msgstr "Nouveau statut"
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
msgid "Notice posted"
msgstr "Statut publié"
@@ -2061,6 +2006,8 @@ msgid ""
"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
"status_textarea=%s)!"
msgstr ""
+"Soyez le premier à [poster sur ce sujet](%%%%action.newnotice%%%%?"
+"status_textarea=%s) !"
#: actions/noticesearch.php:124
#, php-format
@@ -2068,16 +2015,19 @@ msgid ""
"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
+"Pourquoi ne pas [créer un compte](%%%%action.register%%%%) et être le "
+"premier à [poster sur ce sujet](%%%%action.newnotice%%%%?status_textarea=%"
+"s) !"
-#: actions/noticesearchrss.php:89
+#: actions/noticesearchrss.php:96
#, php-format
msgid "Updates with \"%s\""
msgstr "Mises à jour avec « %s »"
-#: actions/noticesearchrss.php:91
-#, fuzzy, php-format
+#: actions/noticesearchrss.php:98
+#, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr "Statuts correspondant au(x) terme(s) \"%s\""
+msgstr "mises à jour correspondant au(x) terme(s) « %1$s » sur %2$s !"
#: actions/nudge.php:85
msgid ""
@@ -2145,13 +2095,12 @@ msgid "Automatic shortening service to use."
msgstr "Sélectionnez un service de réduction d’URL."
#: actions/othersettings.php:122
-#, fuzzy
msgid "View profile designs"
-msgstr "Paramètres du profil"
+msgstr "Afficher les conceptions de profils"
#: actions/othersettings.php:123
msgid "Show or hide profile designs."
-msgstr ""
+msgstr "Afficher ou masquer les paramètres de conception."
#: actions/othersettings.php:153
msgid "URL shortening service is too long (max 50 chars)."
@@ -2201,9 +2150,9 @@ msgstr "6 caractères ou plus"
msgid "Confirm"
msgstr "Confirmer"
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "identique au mot de passe ci-dessus"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Identique au mot de passe ci-dessus"
#: actions/passwordsettings.php:117
msgid "Change"
@@ -2233,6 +2182,108 @@ msgstr "Impossible de sauvegarder le nouveau mot de passe."
msgid "Password saved."
msgstr "Mot de passe enregistré."
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr "Chemins"
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr "Paramètres de chemin et serveur pour ce site StatusNet."
+
+#: actions/pathsadminpanel.php:140
+#, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Dossier des thème non lisible : %s"
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr "Dossier des avatars non inscriptible : %s"
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr "Dossier des arrière plans non inscriptible : %s"
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr "Dossier des paramètres régionaux non lisible : %s"
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+msgid "Site"
+msgstr "Site"
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr "Chemin"
+
+#: actions/pathsadminpanel.php:216
+msgid "Site path"
+msgstr "Chemin du site"
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr "Chemin vers les paramètres régionaux"
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr "Chemin de dossier vers les paramètres régionaux"
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr "Thème"
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr "Serveur de thèmes"
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr "Chemin des thèmes"
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr "Dossier des thèmes"
+
+#: actions/pathsadminpanel.php:247
+msgid "Avatars"
+msgstr "Avatars"
+
+#: actions/pathsadminpanel.php:252
+msgid "Avatar server"
+msgstr "Serveur d'avatar"
+
+#: actions/pathsadminpanel.php:256
+msgid "Avatar path"
+msgstr "Chemin des avatars"
+
+#: actions/pathsadminpanel.php:260
+msgid "Avatar directory"
+msgstr "Dossier des avatars"
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr "Arrière plans"
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr "Serveur des arrière plans"
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr "Chemin des arrière plans"
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr "Dossier des arrière plans"
+
+#: actions/pathsadminpanel.php:297
+msgid "Save paths"
+msgstr ""
+"Impossible de définir l'utilisateur. Vous n'êtes probablement pas autorisé."
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -2265,6 +2316,8 @@ msgstr "Contenu invalide"
#, php-format
msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
+"La licence des statuts « %s » n'est pas compatible avec la licence du site « %"
+"s »."
#: actions/profilesettings.php:60
msgid "Profile settings"
@@ -2336,7 +2389,7 @@ msgid ""
msgstr ""
"Marquages (tags) pour votre profil, séparés par des virgules ou des espaces"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr "Langue"
@@ -2396,7 +2449,7 @@ msgstr "Préférences enregistrées."
#: actions/public.php:83
#, php-format
msgid "Beyond the page limit (%s)"
-msgstr ""
+msgstr "Au-delà de la limite de page (%s)"
#: actions/public.php:92
msgid "Could not retrieve public stream."
@@ -2429,6 +2482,8 @@ msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
+"Ceci est la chronologie publique de %%site.name%% mais personne n'a encore "
+"rien posté."
#: actions/public.php:182
msgid "Be the first to post!"
@@ -2439,6 +2494,8 @@ msgstr "Soyez le premier à poster !"
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
+"Pourquoi ne pas [créer un compte](%%action.register%%) et être le premier à "
+"poster !"
#: actions/public.php:233
#, php-format
@@ -2455,14 +2512,14 @@ msgstr ""
"%))"
#: actions/public.php:238
-#, fuzzy, php-format
+#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
"blogging) service based on the Free Software [StatusNet](http://status.net/) "
"tool."
msgstr ""
"%%site.name%% est un service de [micro-blogging](http://fr.wikipedia.org/"
-"wiki/Microblog) "
+"wiki/Microblog) basé sur le logiciel libre [StatusNet](http://status.net/)."
#: actions/publictagcloud.php:57
msgid "Public tag cloud"
@@ -2476,7 +2533,7 @@ msgstr "Derniers marquages les plus populaires dans %s "
#: actions/publictagcloud.php:69
#, php-format
msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
-msgstr ""
+msgstr "Personne n'a encore posté un statuts avec une [marque](%%doc.tags%%)."
#: actions/publictagcloud.php:72
msgid "Be the first to post one!"
@@ -2488,6 +2545,8 @@ msgid ""
"Why not [register an account](%%action.register%%) and be the first to post "
"one!"
msgstr ""
+"Pourquoi ne pas [créer un compte](%%action.register%%) et être le premier à "
+"en poster un !"
#: actions/publictagcloud.php:135
msgid "Tag cloud"
@@ -2527,6 +2586,9 @@ msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
msgstr ""
+"Si vous avez oublié ou perdu votre mot de passe, vous pouvez en avoir un "
+"nouveau qui sera envoyé à votre adresse de courriel définie dans votre "
+"compte."
#: actions/recoverpassword.php:158
msgid "You have been identified. Enter a new password below. "
@@ -2569,10 +2631,6 @@ msgstr "Action inconnue"
msgid "6 or more characters, and don't forget it!"
msgstr "6 caractères ou plus, et ne l’oubliez pas !"
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Identique au mot de passe ci-dessus"
-
#: actions/recoverpassword.php:243
msgid "Reset"
msgstr "Réinitialiser"
@@ -2634,7 +2692,7 @@ msgstr "Désolé, code d’invitation invalide."
msgid "Registration successful"
msgstr "Compte créé avec succès"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Créer un compte"
@@ -2664,6 +2722,8 @@ msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
+"Avec ce formulaire vous pouvez créer un nouveau compte. Vous pourrez ensuite "
+"poster des statuts and et vous relier avec des amis et collègues. "
#: actions/register.php:424
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
@@ -2679,7 +2739,7 @@ msgid "Same as password above. Required."
msgstr "Identique au mot de passe ci-dessus. Requis."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Courriel"
@@ -2788,7 +2848,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"
@@ -2842,6 +2902,8 @@ msgid ""
"This is the timeline showing replies to %s but %s hasn't received a notice "
"to his attention yet."
msgstr ""
+"Ceci est la chronologie des réponses à %s mais %s n'a encore reçu aucun "
+"statut à son intention."
#: actions/replies.php:203
#, php-format
@@ -2849,6 +2911,8 @@ msgid ""
"You can engage other users in a conversation, subscribe to more people or "
"[join groups](%%action.groups%%)."
msgstr ""
+"Vous pouvez vous engager dans une conversation avec d'autres personnes, vous "
+"abonner à plus de gens ou [joindre des groupes](%%action.groups%%)."
#: actions/replies.php:205
#, php-format
@@ -2860,19 +2924,18 @@ msgstr ""
"quelque chose à son attention](%%%%action.newnotice%%%%?status_textarea=%s)"
#: actions/repliesrss.php:72
-#, fuzzy, php-format
+#, php-format
msgid "Replies to %1$s on %2$s!"
-msgstr "Message adressé à %1$s le %2$s"
+msgstr "Réponses à %1$s sur %2$s !"
#: actions/sandbox.php:65 actions/unsandbox.php:65
-#, fuzzy
msgid "You cannot sandbox users on this site."
-msgstr "Vous ne pouvez pas envoyer de messages à cet utilisateur."
+msgstr ""
+"Vous ne pouvez pas mettre des utilisateur dans le bac à sable sur ce site."
#: actions/sandbox.php:72
-#, fuzzy
msgid "User is already sandboxed."
-msgstr "Cet utilisateur est déjà bloqué pour le groupe."
+msgstr "L'utilisateur est déjà dans le bac à sable."
#: actions/showfavorites.php:79
#, php-format
@@ -3014,17 +3077,25 @@ msgid ""
"their life and interests. [Join now](%%%%action.register%%%%) to become part "
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
+"**%s** est un groupe d'utilisateurs sur %%%%site.name%%%%, un service de "
+"[microblogging](http://fr.wikipedia.org/wiki/Microblog) basé sur le logiciel "
+"libre [StatusNet](http://status.net/). Ses membres partagent des courts "
+"messages sur leur vie et leurs intérêts. [Inscrivez-vous maintenant](%%%%"
+"action.register%%%%) pour devenir membre de ce groupe et bien plus ! ([En "
+"lire plus](%%%%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** est un groupe d’utilisateurs du service de [micro-blogging](http://fr."
-"wikipedia.org/wiki/Microblog) %%%%site.name%%%%"
+"**%s** est un groupe d’utilisateurs sur %%%%site.name%%%%, un service de "
+"[micro-blogging](http://fr.wikipedia.org/wiki/Microblog) basé sur le "
+"logiciel libre [StatusNet](http://status.net/). Ses membres partagent des "
+"messages courts à propos de leur vie et leurs intérêts. "
#: actions/showgroup.php:482
msgid "Admins"
@@ -3119,270 +3190,265 @@ msgid ""
"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
+"**%s** possède un compte sur %%%%site.name%%%%, un service de [microblogging]"
+"(http://fr.wikipedia.org/wiki/Microblog) basé sur le logiciel libre "
+"[StatusNet](http://status.net/). [Inscrivez-vous maintenant](%%%%action."
+"register%%%%) pour suivre les statuts de **%s** et bien plus ! ([En lire "
+"plus](%%%%doc.help%%%%))"
#: 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** est inscrit au service de [micro-blogging](http://fr.wikipedia.org/"
-"wiki/Microblog) %%%%site.name%%%%"
+"**%s** est inscrit à %%%%site.name%%%%, service de [microblogging](http://fr."
+"wikipedia.org/wiki/Microblog) basé sur le logiciel libre [StatusNet](http://"
+"status.net/). "
#: actions/silence.php:65 actions/unsilence.php:65
-#, fuzzy
msgid "You cannot silence users on this site."
-msgstr "Vous ne pouvez pas envoyer de messages à cet utilisateur."
+msgstr "Vous ne pouvez pas réduire des utilisateurs au silence sur ce site."
#: actions/silence.php:72
-#, fuzzy
msgid "User is already silenced."
-msgstr "Cet utilisateur est déjà bloqué pour le groupe."
-
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
-#, fuzzy
-msgid "Site"
-msgstr "Inviter"
+msgstr "Cet utilisateur est déjà réduit au silence."
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
-msgstr ""
+msgstr "Paramètres basiques pour ce site StatusNet."
#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
-msgstr ""
+msgstr "Le nom du site ne peut pas être vide."
#: actions/siteadminpanel.php:155
-#, fuzzy
msgid "You must have a valid contact email address"
-msgstr "Adresse courriel invalide"
+msgstr "Vous devez avoir une adresse de courriel de contact valide."
#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
-msgstr ""
+msgstr "Langue « %s » inconnue"
#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
-msgstr ""
+msgstr "URL de rapport d'instantanés invalide."
#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
-msgstr ""
+msgstr "Valeur de lancement d'instantanés invalide."
#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
-msgstr ""
+msgstr "La fréquence des instantanés doit être un nombre."
#: actions/siteadminpanel.php:199
-msgid "You must set an SSL sever when enabling SSL."
-msgstr ""
+msgid "You must set an SSL server when enabling SSL."
+msgstr "Vous devez définir un serveur SSL quand vous activez SSL."
#: actions/siteadminpanel.php:204
-msgid "Invalid SSL server. Max length is 255 characters."
-msgstr ""
+msgid "Invalid SSL server. The maximum length is 255 characters."
+msgstr "Serveur SSL invalide. La longueur maximale est de 255 caractères."
#: actions/siteadminpanel.php:210
-msgid "Minimum text limit is 140c."
-msgstr ""
+msgid "Minimum text limit is 140 characters."
+msgstr "La limite minimale de texte est de 140 caractères."
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
-msgstr ""
+msgstr "La limite de doublon doit être d'une seconde ou plus."
-#: actions/siteadminpanel.php:224
-#, php-format
-msgid "Locales directory not readable: %s"
-msgstr ""
+#: actions/siteadminpanel.php:266
+msgid "General"
+msgstr "Général"
-#: actions/siteadminpanel.php:275
-#, fuzzy
+#: actions/siteadminpanel.php:269
msgid "Site name"
-msgstr "Notice du site"
+msgstr "Nom du site"
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
-msgstr ""
+msgstr "Le nom de votre site, comme « Microblog de votre compagnie »"
-#: actions/siteadminpanel.php:279
+#: actions/siteadminpanel.php:274
msgid "Brought by"
-msgstr ""
+msgstr "Apporté par"
-#: actions/siteadminpanel.php:280
+#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
-msgstr ""
+msgstr "Texte utilisé pour le lien de crédits au bas de chaque page"
-#: actions/siteadminpanel.php:283
+#: actions/siteadminpanel.php:279
msgid "Brought by URL"
-msgstr ""
+msgstr "Apporté par URL"
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
-msgstr ""
+msgstr "URL utilisée pour le lien de crédits au bas de chaque page"
-#: actions/siteadminpanel.php:288
-#, fuzzy
-msgid "contact email address for your site"
-msgstr "Nouvelle adresse courriel pour poster dans %s"
+#: actions/siteadminpanel.php:284
+msgid "Contact email address for your site"
+msgstr "adresse de courriel de contact de votre site"
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:290
+msgid "Local"
+msgstr "Local"
+
+#: actions/siteadminpanel.php:301
msgid "Default timezone"
-msgstr ""
+msgstr "Zone horaire par défaut"
-#: actions/siteadminpanel.php:303
+#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
-msgstr ""
+msgstr "Zone horaire par défaut pour ce site ; généralement UTC."
-#: actions/siteadminpanel.php:310
-#, fuzzy
+#: actions/siteadminpanel.php:308
msgid "Default site language"
-msgstr "Langue préférée"
-
-#: actions/siteadminpanel.php:316
-msgid "Path to locales"
-msgstr ""
+msgstr "Langue du site par défaut"
#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
-msgstr ""
+msgid "URLs"
+msgstr "URL"
-#: actions/siteadminpanel.php:320
-#, fuzzy
+#: actions/siteadminpanel.php:319
msgid "Server"
-msgstr "Récupérer"
+msgstr "Serveur"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-#, fuzzy
-msgid "Site path"
-msgstr "Notice du site"
+msgstr "Nom d'hôte du serveur du site."
-#: actions/siteadminpanel.php:328
+#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
-msgstr ""
+msgstr "Jolies URL"
-#: actions/siteadminpanel.php:330
+#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
+msgstr "Utiliser des jolies URL (plus lisibles et mémorable) ?"
+
+#: actions/siteadminpanel.php:331
+msgid "Access"
+msgstr "Accès"
#: actions/siteadminpanel.php:334
-#, fuzzy
msgid "Private"
-msgstr "Confidentialité"
+msgstr "Privé"
#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
+msgstr "Interdire aux utilisateurs anonymes (non connectés) de voir le site ?"
#: actions/siteadminpanel.php:340
-#, fuzzy
msgid "Invite only"
-msgstr "Inviter"
+msgstr "Sur invitation uniquement"
#: actions/siteadminpanel.php:342
msgid "Make registration invitation only."
-msgstr ""
+msgstr "Rendre l'inscription sur invitation seulement."
-#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
-#, fuzzy
+#: actions/siteadminpanel.php:346
msgid "Closed"
-msgstr "Bloqué"
+msgstr "Fermé"
#: actions/siteadminpanel.php:348
msgid "Disable new registrations."
-msgstr ""
+msgstr "Désactiver les nouvelles inscriptions."
+
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
+msgstr "Instantanés"
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
-msgstr ""
+msgstr "Au hasard lors des requêtes web"
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
-msgstr ""
+msgstr "Dans une tâche programée"
-#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
-#, fuzzy
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
msgid "Never"
-msgstr "Récupérer"
+msgstr "Jamais"
-#: actions/siteadminpanel.php:357
+#: actions/siteadminpanel.php:360
msgid "Data snapshots"
-msgstr ""
+msgstr "Instantanés de données"
-#: actions/siteadminpanel.php:358
+#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
-msgstr ""
+msgstr "Quand envoyer des données statistiques aux serveurs status.net"
-#: actions/siteadminpanel.php:364
+#: actions/siteadminpanel.php:366
msgid "Frequency"
-msgstr ""
+msgstr "Fréquence"
-#: actions/siteadminpanel.php:365
-msgid "Snapshots will be sent once every N Web hits"
-msgstr ""
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
+msgstr "Les instantanés seront envoyés une fois tous les N requêtes"
#: actions/siteadminpanel.php:372
msgid "Report URL"
-msgstr ""
+msgstr "URL de rapport"
#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
-msgstr ""
+msgstr "Les instantanés seront envoyés à cette URL"
-#: actions/siteadminpanel.php:381
-#, fuzzy
+#: actions/siteadminpanel.php:380
+msgid "SSL"
+msgstr "SSL"
+
+#: actions/siteadminpanel.php:384
msgid "Sometimes"
-msgstr "Statuts"
+msgstr "Quelquefois"
-#: actions/siteadminpanel.php:382
-#, fuzzy
+#: actions/siteadminpanel.php:385
msgid "Always"
-msgstr "Alias"
+msgstr "Toujours"
-#: actions/siteadminpanel.php:384
+#: actions/siteadminpanel.php:387
msgid "Use SSL"
-msgstr ""
+msgstr "Utiliser SSL"
-#: actions/siteadminpanel.php:385
+#: actions/siteadminpanel.php:388
msgid "When to use SSL"
-msgstr ""
+msgstr "Quand utiliser SSL"
-#: actions/siteadminpanel.php:391
+#: actions/siteadminpanel.php:393
msgid "SSL Server"
-msgstr ""
+msgstr "Serveur SSL"
-#: actions/siteadminpanel.php:392
+#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
-msgstr ""
+msgstr "Serveur vers lequel rediriger les requêtes SSL"
+
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr "Limites"
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Text limit"
-msgstr ""
+msgstr "Limite de texte"
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
-msgstr ""
+msgstr "Nombre maximal de caractères pour les statuts."
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "Dupe limit"
-msgstr ""
+msgstr "Limite de doublons"
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
+"Combien de temps (en secondes) les utilisateurs doivent attendre pour poster "
+"la même chose de nouveau."
-#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
-#, fuzzy
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
msgid "Save site settings"
-msgstr "Paramètres de l’avatar"
+msgstr "Sauvegarder les paramètres du site"
#: actions/smssettings.php:58
msgid "SMS Settings"
@@ -3668,19 +3734,16 @@ msgid "API method under construction."
msgstr "Méthode API en construction."
#: actions/unblock.php:59
-#, fuzzy
msgid "You haven't blocked that user."
-msgstr "Vous avez déjà bloqué cet utilisateur."
+msgstr "Vous n'avez pas bloqué cet utilisateur."
#: actions/unsandbox.php:72
-#, fuzzy
msgid "User is not sandboxed."
-msgstr "Cet utilisateur n’est pas bloqué du groupe."
+msgstr "L'utilisateur ne se trouve pas dans le bac à sable."
#: actions/unsilence.php:72
-#, fuzzy
msgid "User is not silenced."
-msgstr "Aucun profil ne correspond à cet utilisateur."
+msgstr "L'utilisateur n'est pas réduit au silence."
#: actions/unsubscribe.php:77
msgid "No profile id in request."
@@ -3701,26 +3764,94 @@ msgstr ""
"La licence du flux auquel vous avez souscrit ‘%s’ n’est pas compatible avec "
"la licence du site ‘%s’."
-#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
msgid "User"
msgstr "Utilisateur"
#: actions/useradminpanel.php:69
msgid "User settings for this StatusNet site."
-msgstr ""
+msgstr "Paramètres des utilisateurs pour ce site StatusNet."
+
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr "Limite de bio invalide : doit être numérique."
+
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
+msgstr "Texte de bienvenue invalide. La taille maximale est de 255 caractères."
+
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr "Abonnement par défaut invalide : « %1$s » n'est pas un utilisateur."
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Profil"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr "Limite de bio"
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
+msgstr "Longueur maximale de la bio d'un profil en caractères."
+
+#: actions/useradminpanel.php:231
+msgid "New users"
+msgstr "Nouveaux utilisateurs"
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr "Accueil des nouveaux utilisateurs"
+
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
msgstr ""
+"Texte de bienvenue pour les nouveaux utilisateurs (maximum 255 caractères)."
-#: actions/useradminpanel.php:178
-#, fuzzy
-msgid "Invite-only"
-msgstr "Inviter"
+#: actions/useradminpanel.php:241
+msgid "Default subscription"
+msgstr "Abonnements par défaut"
+
+#: actions/useradminpanel.php:242
+msgid "Automatically subscribe new users to this user."
+msgstr "Abonner automatiquement les nouveaux utilisateurs à cet utilisateur."
+
+#: actions/useradminpanel.php:251
+msgid "Invitations"
+msgstr "Invitations"
+
+#: actions/useradminpanel.php:256
+msgid "Invitations enabled"
+msgstr "Invitations activées"
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
msgstr ""
+"S'il faut autoriser les utilisateurs à inviter de nouveaux utilisateurs."
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr "Sessions"
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr "Gérer les sessions"
+
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
+msgstr "S'il faut gérer les sessions nous-même."
+
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr "Déboguage de session"
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
+msgstr "Activer la sortie de déboguage pour les sessions."
#: actions/userauthorization.php:105
msgid "Authorize subscription"
@@ -3885,9 +4016,8 @@ msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr "Un fichier aussi gros dépasserai votre quota mensuel de %d octets."
#: classes/Message.php:45
-#, fuzzy
msgid "You are banned from sending direct messages."
-msgstr "Une erreur est survenue pendant l’envoi de votre message."
+msgstr "Il vous est interdit d'envoyer des messages directs."
#: classes/Message.php:61
msgid "Could not insert message."
@@ -3918,13 +4048,12 @@ msgstr ""
"quelques minutes."
#: classes/Notice.php:194
-#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-"Trop de statuts, trop vite ! Prenez une pause et publiez à nouveau dans "
-"quelques minutes."
+"Trop de messages en double trop vite ! Prenez une pause et publiez à nouveau "
+"dans quelques minutes."
#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
@@ -3934,7 +4063,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"
@@ -3950,11 +4079,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 !"
-
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr "Profil"
+msgstr "Bienvenu à %1$s, @%2$s !"
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
@@ -3993,130 +4118,128 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "Page sans nom"
-#: lib/action.php:424
+#: lib/action.php:425
msgid "Primary site navigation"
msgstr "Navigation primaire du site"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Home"
msgstr "Accueil"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Personal profile and friends timeline"
msgstr "Profil personnel et flux des amis"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Account"
msgstr "Compte"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Change your email, avatar, password, profile"
msgstr "Modifier votre courriel, avatar, mot de passe, profil"
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect"
msgstr "Connecter"
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect to services"
msgstr "Se connecter aux services"
-#: lib/action.php:439
-#, fuzzy
+#: lib/action.php:440
msgid "Change site configuration"
-msgstr "Navigation primaire du site"
+msgstr "Modifier la configuration du site"
-#: lib/action.php:443 lib/subgroupnav.php:105
+#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Inviter"
-#: lib/action.php:444 lib/subgroupnav.php:106
+#: lib/action.php:445 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Inviter des amis et collègues à vous rejoindre dans %s"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout"
msgstr "Fermeture de session"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout from the site"
msgstr "Fermer la session"
-#: lib/action.php:454
+#: lib/action.php:455
msgid "Create an account"
msgstr "Créer un compte"
-#: lib/action.php:457
+#: lib/action.php:458
msgid "Login to the site"
msgstr "Ouvrir une session"
-#: lib/action.php:460 lib/action.php:723
+#: lib/action.php:461 lib/action.php:724
msgid "Help"
msgstr "Aide"
-#: lib/action.php:460
+#: lib/action.php:461
msgid "Help me!"
msgstr "À l’aide !"
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
msgstr "Rechercher"
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
msgstr "Rechercher des personnes ou du texte"
-#: lib/action.php:484
+#: lib/action.php:485
msgid "Site notice"
msgstr "Notice du site"
-#: lib/action.php:550
+#: lib/action.php:551
msgid "Local views"
msgstr "Vues locales"
-#: lib/action.php:616
+#: lib/action.php:617
msgid "Page notice"
msgstr "Avis de la page"
-#: lib/action.php:718
+#: lib/action.php:719
msgid "Secondary site navigation"
msgstr "Navigation secondaire du site"
-#: lib/action.php:725
+#: lib/action.php:726
msgid "About"
msgstr "À propos"
-#: lib/action.php:727
+#: lib/action.php:728
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:731
+#: lib/action.php:732
msgid "TOS"
msgstr "CGU"
-#: lib/action.php:734
+#: lib/action.php:735
msgid "Privacy"
msgstr "Confidentialité"
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
msgstr "Source"
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Contact"
msgstr "Contact"
-#: lib/action.php:740
-#, fuzzy
+#: lib/action.php:741
msgid "Badge"
-msgstr "Clin d’œil"
+msgstr "Insigne"
-#: lib/action.php:768
+#: lib/action.php:769
msgid "StatusNet software license"
msgstr "Licence du logiciel StatusNet"
-#: lib/action.php:771
+#: lib/action.php:772
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4125,12 +4248,12 @@ msgstr ""
"**%%site.name%%** est un service de microblogging qui vous est proposé par "
"[%%site.broughtby%%](%%site.broughtbyurl%%)."
-#: lib/action.php:773
+#: lib/action.php:774
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** est un service de micro-blogging."
-#: lib/action.php:775
+#: lib/action.php:776
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4141,63 +4264,61 @@ msgstr ""
"version %s, disponible sous la licence [GNU Affero General Public License] "
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:789
+#: lib/action.php:790
msgid "Site content license"
msgstr "Licence du contenu du site"
-#: lib/action.php:798
+#: lib/action.php:799
msgid "All "
msgstr "Tous "
-#: lib/action.php:803
+#: lib/action.php:804
msgid "license."
msgstr "licence."
-#: lib/action.php:1067
+#: lib/action.php:1068
msgid "Pagination"
msgstr "Pagination"
-#: lib/action.php:1076
+#: lib/action.php:1077
msgid "After"
msgstr "Après"
-#: lib/action.php:1084
+#: lib/action.php:1085
msgid "Before"
msgstr "Avant"
-#: lib/action.php:1132
+#: lib/action.php:1133
msgid "There was a problem with your session token."
msgstr "Un problème est survenu avec votre jeton de session."
#: lib/adminpanelaction.php:96
-#, fuzzy
msgid "You cannot make changes to this site."
-msgstr "Vous ne pouvez pas envoyer de messages à cet utilisateur."
+msgstr "Vous ne pouvez pas faire de modifications sur ce site."
#: lib/adminpanelaction.php:195
-#, fuzzy
msgid "showForm() not implemented."
-msgstr "Cette commande n’a pas encore été implémentée."
+msgstr "showForm() n’a pas été implémentée."
#: lib/adminpanelaction.php:224
-#, fuzzy
msgid "saveSettings() not implemented."
-msgstr "Cette commande n’a pas encore été implémentée."
+msgstr "saveSettings() n’a pas été implémentée."
#: lib/adminpanelaction.php:247
-#, fuzzy
msgid "Unable to delete design setting."
-msgstr "Impossible de sauvegarder les parmètres de la conception."
+msgstr "Impossible de supprimer les paramètres de conception."
#: lib/adminpanelaction.php:300
-#, fuzzy
msgid "Basic site configuration"
-msgstr "Confirmation de l’adresse courriel"
+msgstr "Configuration basique du site"
#: lib/adminpanelaction.php:303
-#, fuzzy
msgid "Design configuration"
-msgstr "Confirmation SMS"
+msgstr "Configuration de la conception"
+
+#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+msgid "Paths configuration"
+msgstr "Configuration des chemins"
#: lib/attachmentlist.php:87
msgid "Attachments"
@@ -4245,9 +4366,9 @@ msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Ça n’a pas de sens de se faire un clin d’œil à soi-même !"
#: lib/command.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Nudge sent to %s"
-msgstr "Clin d’œil envoyé"
+msgstr "Coup de code envoyé à %s"
#: lib/command.php:126
#, php-format
@@ -4379,33 +4500,30 @@ msgid "You are not subscribed to anyone."
msgstr "Vous n'êtes pas abonné(e) à personne."
#: lib/command.php:620
-#, fuzzy
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
-msgstr[0] "Vous êtes abonné à ces personnes : "
-msgstr[1] "Vous êtes abonné à ces personnes : "
+msgstr[0] "Vous êtes abonné à cette personne :"
+msgstr[1] "Vous êtes abonné à ces personnes :"
#: lib/command.php:640
msgid "No one is subscribed to you."
msgstr "Personne ne s'est abonné à vous."
#: lib/command.php:642
-#, fuzzy
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
-msgstr[0] "Personne ne s'est abonné à vous."
-msgstr[1] "Personne ne s'est abonné à vous."
+msgstr[0] "Cette personne est abonnée à vous :"
+msgstr[1] "Ces personnes sont abonnées à vous :"
#: lib/command.php:662
msgid "You are not a member of any groups."
msgstr "Vous n'êtes pas membre d'aucun groupe."
#: lib/command.php:664
-#, fuzzy
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
-msgstr[0] "Vous êtes membre de ces groupes : "
-msgstr[1] "Vous êtes membre de ces groupes : "
+msgstr[0] "Vous êtes membre de ce groupe :"
+msgstr[1] "Vous êtes membre de ces groupes :"
#: lib/command.php:678
msgid ""
@@ -4520,9 +4638,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
@@ -4620,7 +4738,7 @@ msgstr ""
"Pseudos supplémentaires pour le groupe, séparés par des virgules ou des "
"espaces, %d au maximum"
-#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85
msgid "Group"
msgstr "Groupe"
@@ -4665,15 +4783,15 @@ msgstr "Groupes avec le plus d'éléments publiés"
msgid "Tags in %s group's notices"
msgstr "Marquages des statuts du groupe %s"
-#: lib/htmloutputter.php:104
+#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
msgstr ""
"Cette page n’est pas disponible dans un des formats que vous avez autorisés."
#: lib/imagefile.php:75
-#, fuzzy, php-format
+#, php-format
msgid "That file is too big. The maximum file size is %s."
-msgstr "Ce fichier est trop lourd. La taille maximale est %d."
+msgstr "Ce fichier est trop grand. La taille maximale est %s."
#: lib/imagefile.php:80
msgid "Partial upload."
@@ -4699,6 +4817,14 @@ msgstr "Fichier perdu."
msgid "Unknown file type"
msgstr "Type de fichier inconnu"
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr "Mo"
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr "Ko"
+
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
@@ -4733,7 +4859,7 @@ msgstr ""
"pour démarrer des conversations avec d’autres utilisateurs. Ceux-ci peuvent "
"vous envoyer des messages destinés à vous seul(e)."
-#: lib/mailbox.php:227 lib/noticelist.php:424
+#: lib/mailbox.php:227 lib/noticelist.php:452
msgid "from"
msgstr "de"
@@ -5063,36 +5189,61 @@ msgstr "Envoyer un message direct"
msgid "To"
msgstr "À"
-#: lib/messageform.php:162 lib/noticeform.php:173
+#: lib/messageform.php:162 lib/noticeform.php:186
msgid "Available characters"
msgstr "Caractères restants"
-#: lib/noticeform.php:145
+#: lib/noticeform.php:158
msgid "Send a notice"
msgstr "Envoyer un statut"
-#: lib/noticeform.php:158
+#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
msgstr "Quoi de neuf, %s ?"
-#: lib/noticeform.php:180
+#: lib/noticeform.php:193
msgid "Attach"
msgstr "Attacher"
-#: lib/noticeform.php:184
+#: lib/noticeform.php:197
msgid "Attach a file"
msgstr "Attacher un fichier"
-#: lib/noticelist.php:478
+#: 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 "N"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr "S"
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr "E"
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr "O"
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr "chez"
+
+#: lib/noticelist.php:506
msgid "in context"
msgstr "dans le contexte"
-#: lib/noticelist.php:498
+#: lib/noticelist.php:526
msgid "Reply to this notice"
msgstr "Répondre à ce statut"
-#: lib/noticelist.php:499
+#: lib/noticelist.php:527
msgid "Reply"
msgstr "Répondre"
@@ -5124,12 +5275,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
-#, fuzzy
+#: lib/oauthstore.php:467 lib/subs.php:48
msgid "You have been banned from subscribing."
-msgstr "Cet utilisateur vous a empêché de vous inscrire."
+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."
@@ -5195,13 +5345,12 @@ msgid "All groups"
msgstr "Tous les groupes"
#: lib/profileformaction.php:123
-#, fuzzy
msgid "No return-to arguments"
-msgstr "Aucun argument d’identification."
+msgstr "Aucun argument de retour."
#: lib/profileformaction.php:137
msgid "unimplemented method"
-msgstr ""
+msgstr "méthode non implémentée"
#: lib/publicgroupnav.php:78
msgid "Public"
@@ -5224,19 +5373,21 @@ msgid "Popular"
msgstr "Populaires"
#: lib/sandboxform.php:67
-#, fuzzy
msgid "Sandbox"
-msgstr "Boîte de réception"
+msgstr "Bac à sable"
#: lib/sandboxform.php:78
-#, fuzzy
msgid "Sandbox this user"
-msgstr "Débloquer cet utilisateur"
+msgstr "Mettre cet utilisateur dans un bac à sable"
#: lib/searchaction.php:120
msgid "Search site"
msgstr "Rechercher sur le site"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr "Mot(s) celf(s)"
+
#: lib/searchaction.php:162
msgid "Search help"
msgstr "Aide sur la recherche"
@@ -5249,10 +5400,6 @@ msgstr "Personnes"
msgid "Find people on this site"
msgstr "Chercher des personnes sur ce site"
-#: lib/searchgroupnav.php:82
-msgid "Notice"
-msgstr "Statut"
-
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
msgstr "Chercher dans le contenu des statuts"
@@ -5270,14 +5417,12 @@ msgid "More..."
msgstr "Plus..."
#: lib/silenceform.php:67
-#, fuzzy
msgid "Silence"
-msgstr "Notice du site"
+msgstr "Silence"
#: lib/silenceform.php:78
-#, fuzzy
msgid "Silence this user"
-msgstr "Bloquer cet utilisateur"
+msgstr "Réduire cet utilisateur au silence"
#: lib/subgroupnav.php:83
#, php-format
@@ -5297,12 +5442,12 @@ msgstr "Groupes de %s"
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
-msgstr ""
+msgstr "Nuage de mots clefs des personnes tel que définis par eux-même"
#: lib/subscriberspeopletagcloudsection.php:48
#: lib/subscriptionspeopletagcloudsection.php:48
msgid "People Tagcloud as tagged"
-msgstr ""
+msgstr "Nuage de mots clefs des personnes"
#: lib/subscriptionlist.php:126
msgid "(none)"
@@ -5342,21 +5487,19 @@ msgstr "Utilisateurs les plus actifs"
#: lib/unsandboxform.php:69
msgid "Unsandbox"
-msgstr ""
+msgstr "Sortir du bac à sable"
#: lib/unsandboxform.php:80
-#, fuzzy
msgid "Unsandbox this user"
-msgstr "Débloquer cet utilisateur"
+msgstr "Sortir cet utilisateur du bac à sable"
#: lib/unsilenceform.php:67
msgid "Unsilence"
-msgstr ""
+msgstr "Sortir du silence"
#: lib/unsilenceform.php:78
-#, fuzzy
msgid "Unsilence this user"
-msgstr "Débloquer cet utilisateur"
+msgstr "Sortir cet utilisateur du silence"
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
@@ -5390,47 +5533,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"
@@ -5460,10 +5607,3 @@ msgstr "Désolé, ceci n’est pas votre adresse de courriel entrant."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Désolé, la réception de courriels n’est pas permise."
-
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "Débloquer cet utilisateur"
-
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "Ces personnes sont abonnées à vous : "
diff --git a/locale/ga/LC_MESSAGES/statusnet.mo b/locale/ga/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index c9641c01e..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 8f4de8169..f8e21bfe3 100644
--- a/locale/ga/LC_MESSAGES/statusnet.po
+++ b/locale/ga/LC_MESSAGES/statusnet.po
@@ -7,16 +7,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 10:43+0000\n"
-"PO-Revision-Date: 2009-11-18 19:31:55+0000\n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-11-28 19:50:17+0000\n"
"Language-Team: Irish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4;\n"
-"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ga\n"
"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : "
+"4;\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
@@ -446,7 +447,7 @@ msgstr ""
msgid "Not found"
msgstr "Non atopado"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -562,7 +563,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
+#: lib/noticelist.php:550
#, fuzzy
msgid "Delete"
msgstr "eliminar"
@@ -576,7 +577,7 @@ msgid "Crop"
msgstr ""
#: actions/avatarsettings.php:265 actions/disfavor.php:74
-#: actions/emailsettings.php:237 actions/favor.php:75
+#: 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
@@ -591,7 +592,7 @@ msgid "There was a problem with your session token. Try again, please."
msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
-#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: 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."
@@ -731,15 +732,15 @@ msgstr "Tipo de enderezo %s non recoñecido"
msgid "That address has already been confirmed."
msgstr "Esa dirección xa foi confirmada."
-#: actions/confirmaddress.php:114 actions/emailsettings.php:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
#: actions/profilesettings.php:276 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Non se puido actualizar o usuario."
-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
msgstr "Non se pode eliminar a confirmación de email."
@@ -759,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/profileaction.php:206 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Chíos"
@@ -802,7 +803,7 @@ msgstr "Estas seguro que queres eliminar este chío?"
msgid "Do not delete this notice"
msgstr "Non se pode eliminar este chíos."
-#: actions/deletenotice.php:146 lib/noticelist.php:522
+#: actions/deletenotice.php:146 lib/noticelist.php:550
#, fuzzy
msgid "Delete this notice"
msgstr "Eliminar chío"
@@ -847,182 +848,119 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:278
+#: actions/designadminpanel.php:270
#, fuzzy
msgid "Invalid logo URL."
msgstr "Tamaño inválido."
-#: actions/designadminpanel.php:282
+#: actions/designadminpanel.php:274
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
-#: actions/designadminpanel.php:288
-#, fuzzy, php-format
-msgid "Theme directory not readable: %s"
-msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
-
-#: actions/designadminpanel.php:292
-#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:296
-#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:312
-#, php-format
-msgid "Max length for %s %s is 255 characters."
-msgstr ""
-
-#: actions/designadminpanel.php:412
+#: actions/designadminpanel.php:370
#, fuzzy
msgid "Change logo"
msgstr "Cambiar contrasinal"
-#: actions/designadminpanel.php:417
+#: actions/designadminpanel.php:375
#, fuzzy
msgid "Site logo"
msgstr "Invitar"
-#: actions/designadminpanel.php:424
+#: actions/designadminpanel.php:382
#, fuzzy
msgid "Change theme"
msgstr "Modificado"
-#: actions/designadminpanel.php:441
+#: actions/designadminpanel.php:399
#, fuzzy
msgid "Site theme"
msgstr "Novo chío"
-#: actions/designadminpanel.php:442
+#: actions/designadminpanel.php:400
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:447
-msgid "Theme server"
-msgstr ""
-
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
-
-#: actions/designadminpanel.php:455
-msgid "Theme directory"
-msgstr ""
-
-#: actions/designadminpanel.php:462
-#, fuzzy
-msgid "Avatar Settings"
-msgstr "Configuracións de Twitter"
-
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Avatar server"
-msgstr "Configuracións de Twitter"
-
-#: actions/designadminpanel.php:471
-#, fuzzy
-msgid "Avatar path"
-msgstr "Avatar actualizado."
-
-#: actions/designadminpanel.php:475
-#, fuzzy
-msgid "Avatar directory"
-msgstr "Avatar actualizado."
-
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:422
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "Podes actualizar a túa información do perfil persoal aquí"
-#: actions/designadminpanel.php:526 lib/designsettings.php:139
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:542 lib/designsettings.php:155
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:543 lib/designsettings.php:156
+#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:548 lib/designsettings.php:161
+#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:554
-msgid "Background server"
-msgstr ""
-
-#: actions/designadminpanel.php:558
-msgid "Background path"
-msgstr ""
-
-#: actions/designadminpanel.php:562
-msgid "Background directory"
-msgstr ""
-
-#: actions/designadminpanel.php:569 lib/designsettings.php:170
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Cambiar contrasinal"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Conectar"
-#: actions/designadminpanel.php:604 lib/designsettings.php:204
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Buscar"
-#: actions/designadminpanel.php:617 lib/designsettings.php:217
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
msgstr "Texto"
-#: actions/designadminpanel.php:630 lib/designsettings.php:230
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Lista"
-#: actions/designadminpanel.php:658 lib/designsettings.php:247
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:659 lib/designsettings.php:248
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:665 lib/designsettings.php:254
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 actions/useradminpanel.php:226
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: 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 "Gardar"
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: actions/designadminpanel.php:582 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1179,37 +1117,37 @@ msgstr "Quero enviar chíos dende o mail."
msgid "Publish a MicroID for my email address."
msgstr "Publicar unha MicroID dende a miña dirección de correo."
-#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/emailsettings.php:302 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
msgstr "Preferencias gardadas."
-#: actions/emailsettings.php:319
+#: actions/emailsettings.php:320
msgid "No email address."
msgstr "Non se inseriu unha dirección de correo"
-#: actions/emailsettings.php:326
+#: actions/emailsettings.php:327
msgid "Cannot normalize that email address"
msgstr "Esa dirección de correo non se pode normalizar "
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "Non é unha dirección de correo válida"
-#: actions/emailsettings.php:333
+#: actions/emailsettings.php:334
msgid "That is already your email address."
msgstr "Xa é o teu enderezo de correo."
-#: actions/emailsettings.php:336
+#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
msgstr "Este enderezo de correo xa pertence a outro usuario."
-#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Non se puido inserir o código de confirmación."
-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1218,47 +1156,47 @@ msgstr ""
"Comproba a túa bandexa de entrada (ou spam!) polo código e instrucións que "
"debes seguir."
-#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
msgstr "Non hai ningunha confirmación pendente para cancelar."
-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
msgstr "Esa é unha enderezo IM incorrecto."
-#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
msgstr "Confirmación cancealada."
-#: actions/emailsettings.php:412
+#: actions/emailsettings.php:413
msgid "That is not your email address."
msgstr "Esa non é a túa dirección de correo."
-#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
msgstr "Enderezo eliminado."
-#: actions/emailsettings.php:445 actions/smssettings.php:518
+#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
msgstr "Non hai direccións de correo entrante"
-#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
msgid "Couldn't update user record."
msgstr "Non se puido actualizar o rexistro de usuario."
-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
msgstr "Dirección de correo entrante eliminada."
-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555
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"
@@ -1528,7 +1466,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
msgid "Admin"
msgstr ""
@@ -1588,7 +1526,7 @@ msgid ""
msgstr ""
#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/subgroupnav.php:98
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1805,7 +1743,7 @@ msgstr "Mensaxe persoal"
msgid "Optionally add a personal message to the invitation."
msgstr "Opcionalmente engadir unha mensaxe persoal á invitación."
-#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
msgstr "Enviar"
@@ -1932,7 +1870,7 @@ msgstr "Usuario ou contrasinal incorrectos."
msgid "Error setting user. You are probably not authorized."
msgstr "Non está autorizado."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:457
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Inicio de sesión"
@@ -2047,7 +1985,7 @@ msgstr "Non hai mensaxes de texto!"
msgid "Direct message to %s sent"
msgstr "Mensaxe directo a %s enviado"
-#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
msgid "Ajax Error"
msgstr "Erro de Ajax"
@@ -2055,7 +1993,7 @@ msgstr "Erro de Ajax"
msgid "New notice"
msgstr "Novo chío"
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
msgid "Notice posted"
msgstr "Chío publicado"
@@ -2091,12 +2029,12 @@ msgid ""
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
-#: actions/noticesearchrss.php:89
+#: actions/noticesearchrss.php:96
#, fuzzy, php-format
msgid "Updates with \"%s\""
msgstr "Actualizacións dende %1$s en %2$s!"
-#: actions/noticesearchrss.php:91
+#: actions/noticesearchrss.php:98
#, fuzzy, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
msgstr "Tódalas actualizacións que coinciden co termo de procura \"%s\""
@@ -2226,9 +2164,9 @@ msgstr "6 ou máis caracteres"
msgid "Confirm"
msgstr "Confirmar"
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "igual á contrasinal de enriba"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Igual que a contrasinal de enriba"
#: actions/passwordsettings.php:117
msgid "Change"
@@ -2258,6 +2196,114 @@ msgstr "Non se pode gardar a contrasinal."
msgid "Password saved."
msgstr "Contrasinal gardada."
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr ""
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr ""
+
+#: actions/pathsadminpanel.php:140
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+#, fuzzy
+msgid "Site"
+msgstr "Invitar"
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+#, fuzzy
+msgid "Site path"
+msgstr "Novo chío"
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr ""
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Avatars"
+msgstr "Avatar"
+
+#: actions/pathsadminpanel.php:252
+#, fuzzy
+msgid "Avatar server"
+msgstr "Configuracións de Twitter"
+
+#: actions/pathsadminpanel.php:256
+#, fuzzy
+msgid "Avatar path"
+msgstr "Avatar actualizado."
+
+#: actions/pathsadminpanel.php:260
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Avatar actualizado."
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:297
+#, fuzzy
+msgid "Save paths"
+msgstr "Novo chío"
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -2364,7 +2410,7 @@ msgstr ""
"Etiquetas para o teu usuario (letras, números, -, ., e _), separados por "
"coma ou espazo"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr "Linguaxe"
@@ -2600,10 +2646,6 @@ msgstr "Acción descoñecida"
msgid "6 or more characters, and don't forget it!"
msgstr "6 ou máis caracteres, non o esquenzas!"
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Igual que a contrasinal de enriba"
-
#: actions/recoverpassword.php:243
msgid "Reset"
msgstr "Restaurar"
@@ -2665,7 +2707,7 @@ msgstr "Acounteceu un erro co código de confirmación."
msgid "Registration successful"
msgstr "Xa estas rexistrado!!"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Rexistrar"
@@ -2715,7 +2757,7 @@ msgid "Same as password above. Required."
msgstr "A mesma contrasinal que arriba. Requerido."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Correo Electrónico"
@@ -2823,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"
@@ -3180,11 +3222,6 @@ msgstr "Non podes enviar mensaxes a este usurio."
msgid "User is already silenced."
msgstr "O usuario bloqueoute."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
-#, fuzzy
-msgid "Site"
-msgstr "Invitar"
-
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
msgstr ""
@@ -3216,103 +3253,99 @@ msgid "Snapshot frequency must be a number."
msgstr ""
#: actions/siteadminpanel.php:199
-msgid "You must set an SSL sever when enabling SSL."
+msgid "You must set an SSL server when enabling SSL."
msgstr ""
#: actions/siteadminpanel.php:204
-msgid "Invalid SSL server. Max length is 255 characters."
+msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
#: actions/siteadminpanel.php:210
-msgid "Minimum text limit is 140c."
+msgid "Minimum text limit is 140 characters."
msgstr ""
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:224
-#, php-format
-msgid "Locales directory not readable: %s"
+#: actions/siteadminpanel.php:266
+msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:275
+#: actions/siteadminpanel.php:269
#, fuzzy
msgid "Site name"
msgstr "Novo chío"
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:279
+#: actions/siteadminpanel.php:274
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:280
+#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:283
+#: actions/siteadminpanel.php:279
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:284
#, fuzzy
-msgid "contact email address for your site"
+msgid "Contact email address for your site"
msgstr "Nova dirección de email para posterar en %s"
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:290
+#, fuzzy
+msgid "Local"
+msgstr "Localización"
+
+#: actions/siteadminpanel.php:301
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:303
+#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:308
#, fuzzy
msgid "Default site language"
msgstr "Linguaxe preferida"
#: actions/siteadminpanel.php:316
-msgid "Path to locales"
-msgstr ""
-
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
+msgid "URLs"
msgstr ""
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
#, fuzzy
msgid "Server"
msgstr "Recuperar"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
msgstr ""
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-#, fuzzy
-msgid "Site path"
-msgstr "Novo chío"
-
-#: actions/siteadminpanel.php:328
+#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
msgstr ""
-#: actions/siteadminpanel.php:330
+#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
+#: actions/siteadminpanel.php:331
+#, fuzzy
+msgid "Access"
+msgstr "Aceptar"
+
#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
@@ -3331,7 +3364,7 @@ msgstr "Invitar"
msgid "Make registration invitation only."
msgstr ""
-#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#: actions/siteadminpanel.php:346
#, fuzzy
msgid "Closed"
msgstr "Bloquear"
@@ -3340,33 +3373,37 @@ msgstr "Bloquear"
msgid "Disable new registrations."
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
#, fuzzy
msgid "Never"
msgstr "Recuperar"
-#: actions/siteadminpanel.php:357
+#: actions/siteadminpanel.php:360
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:358
+#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:364
+#: actions/siteadminpanel.php:366
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:365
-msgid "Snapshots will be sent once every N Web hits"
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
msgstr ""
#: actions/siteadminpanel.php:372
@@ -3377,48 +3414,57 @@ msgstr ""
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:381
+#: actions/siteadminpanel.php:380
+#, fuzzy
+msgid "SSL"
+msgstr "SMS"
+
+#: actions/siteadminpanel.php:384
#, fuzzy
msgid "Sometimes"
msgstr "Chíos"
-#: actions/siteadminpanel.php:382
+#: actions/siteadminpanel.php:385
msgid "Always"
msgstr ""
-#: actions/siteadminpanel.php:384
+#: actions/siteadminpanel.php:387
msgid "Use SSL"
msgstr ""
-#: actions/siteadminpanel.php:385
+#: actions/siteadminpanel.php:388
msgid "When to use SSL"
msgstr ""
-#: actions/siteadminpanel.php:391
+#: actions/siteadminpanel.php:393
msgid "SSL Server"
msgstr ""
-#: actions/siteadminpanel.php:392
+#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr ""
+
+#: actions/siteadminpanel.php:403
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
#, fuzzy
msgid "Save site settings"
msgstr "Configuracións de Twitter"
@@ -3731,7 +3777,8 @@ msgstr "De-suscribido"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
-#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
msgid "User"
msgstr "Usuario"
@@ -3739,17 +3786,89 @@ msgstr "Usuario"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr ""
+
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:178
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr ""
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Perfil"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr ""
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
+msgstr ""
+
+#: actions/useradminpanel.php:231
#, fuzzy
-msgid "Invite-only"
-msgstr "Invitar"
+msgid "New users"
+msgstr "Invitar a novos usuarios"
+
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr ""
+
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr ""
+
+#: actions/useradminpanel.php:241
+#, fuzzy
+msgid "Default subscription"
+msgstr "Tódalas subscricións"
+
+#: actions/useradminpanel.php:242
+#, fuzzy
+msgid "Automatically subscribe new users to this user."
+msgstr ""
+"Suscribirse automáticamente a calquera que se suscriba a min (o mellor para "
+"non humáns)"
+
+#: actions/useradminpanel.php:251
+#, fuzzy
+msgid "Invitations"
+msgstr "Invitación(s) enviada(s)."
+
+#: actions/useradminpanel.php:256
+#, fuzzy
+msgid "Invitations enabled"
+msgstr "Invitación(s) enviada(s)."
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr ""
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr ""
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr ""
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/userauthorization.php:105
@@ -3965,7 +4084,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"
@@ -3985,10 +4104,6 @@ msgstr "Non se pode gardar a subscrición."
msgid "Welcome to %1$s, @%2$s!"
msgstr "Mensaxe de %1$s en %2$s"
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr "Perfil"
-
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Configuración de perfil"
@@ -4028,139 +4143,139 @@ msgstr "%s (%s)"
msgid "Untitled page"
msgstr ""
-#: lib/action.php:424
+#: lib/action.php:425
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Home"
msgstr "Persoal"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:432
+#: lib/action.php:433
#, fuzzy
msgid "Account"
msgstr "Sobre"
-#: lib/action.php:432
+#: lib/action.php:433
#, fuzzy
msgid "Change your email, avatar, password, profile"
msgstr "Cambiar contrasinal"
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect"
msgstr "Conectar"
-#: lib/action.php:435
+#: lib/action.php:436
#, fuzzy
msgid "Connect to services"
msgstr "Non se pode redireccionar ao servidor: %s"
-#: lib/action.php:439
+#: lib/action.php:440
#, fuzzy
msgid "Change site configuration"
msgstr "Navegación de subscricións"
-#: lib/action.php:443 lib/subgroupnav.php:105
+#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Invitar"
-#: lib/action.php:444 lib/subgroupnav.php:106
+#: lib/action.php:445 lib/subgroupnav.php:106
#, fuzzy, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
"Emprega este formulario para invitar ós teus amigos e colegas a empregar "
"este servizo."
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout"
msgstr "Sair"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:454
+#: lib/action.php:455
#, fuzzy
msgid "Create an account"
msgstr "Crear nova conta"
-#: lib/action.php:457
+#: lib/action.php:458
msgid "Login to the site"
msgstr ""
-#: lib/action.php:460 lib/action.php:723
+#: lib/action.php:461 lib/action.php:724
msgid "Help"
msgstr "Axuda"
-#: lib/action.php:460
+#: lib/action.php:461
#, fuzzy
msgid "Help me!"
msgstr "Axuda"
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
msgstr "Buscar"
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:484
+#: lib/action.php:485
#, fuzzy
msgid "Site notice"
msgstr "Novo chío"
-#: lib/action.php:550
+#: lib/action.php:551
msgid "Local views"
msgstr ""
-#: lib/action.php:616
+#: lib/action.php:617
#, fuzzy
msgid "Page notice"
msgstr "Novo chío"
-#: lib/action.php:718
+#: lib/action.php:719
#, fuzzy
msgid "Secondary site navigation"
msgstr "Navegación de subscricións"
-#: lib/action.php:725
+#: lib/action.php:726
msgid "About"
msgstr "Sobre"
-#: lib/action.php:727
+#: lib/action.php:728
msgid "FAQ"
msgstr "Preguntas frecuentes"
-#: lib/action.php:731
+#: lib/action.php:732
msgid "TOS"
msgstr ""
-#: lib/action.php:734
+#: lib/action.php:735
msgid "Privacy"
msgstr "Privacidade"
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
msgstr "Fonte"
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Contact"
msgstr "Contacto"
-#: lib/action.php:740
+#: lib/action.php:741
msgid "Badge"
msgstr ""
-#: lib/action.php:768
+#: lib/action.php:769
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:771
+#: lib/action.php:772
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4169,12 +4284,12 @@ msgstr ""
"**%%site.name%%** é un servizo de microbloguexo que che proporciona [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:773
+#: lib/action.php:774
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** é un servizo de microbloguexo."
-#: lib/action.php:775
+#: lib/action.php:776
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4185,35 +4300,35 @@ msgstr ""
"%s, dispoñible baixo licenza [GNU Affero General Public License](http://www."
"fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:789
+#: lib/action.php:790
#, fuzzy
msgid "Site content license"
msgstr "Atopar no contido dos chíos"
-#: lib/action.php:798
+#: lib/action.php:799
#, fuzzy
msgid "All "
msgstr "Todos"
-#: lib/action.php:803
+#: lib/action.php:804
msgid "license."
msgstr ""
-#: lib/action.php:1067
+#: lib/action.php:1068
msgid "Pagination"
msgstr ""
-#: lib/action.php:1076
+#: lib/action.php:1077
#, fuzzy
msgid "After"
msgstr "« Despois"
-#: lib/action.php:1084
+#: lib/action.php:1085
#, fuzzy
msgid "Before"
msgstr "Antes »"
-#: lib/action.php:1132
+#: lib/action.php:1133
#, fuzzy
msgid "There was a problem with your session token."
msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
@@ -4248,6 +4363,11 @@ msgstr "Confirmar correo electrónico"
msgid "Design configuration"
msgstr "Confirmación de SMS"
+#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+#, fuzzy
+msgid "Paths configuration"
+msgstr "Confirmación de SMS"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4425,11 +4545,13 @@ msgid "You are not subscribed to anyone."
msgstr "Non estás suscrito a ese perfil"
#: lib/command.php:620
-#, fuzzy
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
-msgstr[0] "Non estás suscrito a ese perfil"
-msgstr[1] "Non estás suscrito a ese perfil"
+msgstr[0] "Xa estas suscrito a estes usuarios:"
+msgstr[1] "Xa estas suscrito a estes usuarios:"
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
#: lib/command.php:640
#, fuzzy
@@ -4437,11 +4559,13 @@ msgid "No one is subscribed to you."
msgstr "Outro usuario non se puido suscribir a ti."
#: lib/command.php:642
-#, fuzzy
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."
msgstr[1] "Outro usuario non se puido suscribir a ti."
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
#: lib/command.php:662
#, fuzzy
@@ -4449,11 +4573,13 @@ msgid "You are not a member of any groups."
msgstr "Non estás suscrito a ese perfil"
#: lib/command.php:664
-#, fuzzy
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"
msgstr[1] "Non estás suscrito a ese perfil"
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
#: lib/command.php:678
#, fuzzy
@@ -4560,9 +4686,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: "
@@ -4662,7 +4789,7 @@ msgstr "¿Onde estas, coma \"Cidade, Provincia, País\""
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
-#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85
msgid "Group"
msgstr ""
@@ -4709,7 +4836,7 @@ msgstr ""
msgid "Tags in %s group's notices"
msgstr ""
-#: lib/htmloutputter.php:104
+#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
@@ -4744,6 +4871,14 @@ msgstr "Bloqueo de usuario fallido."
msgid "Unknown file type"
msgstr "tipo de ficheiro non soportado"
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
@@ -4779,7 +4914,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:424
+#: lib/mailbox.php:227 lib/noticelist.php:452
#, fuzzy
msgid "from"
msgstr " dende "
@@ -5083,40 +5218,66 @@ msgstr "Eliminar chío"
msgid "To"
msgstr "A"
-#: lib/messageform.php:162 lib/noticeform.php:173
+#: lib/messageform.php:162 lib/noticeform.php:186
#, fuzzy
msgid "Available characters"
msgstr "6 ou máis caracteres"
-#: lib/noticeform.php:145
+#: lib/noticeform.php:158
#, fuzzy
msgid "Send a notice"
msgstr "Dar un toque"
-#: lib/noticeform.php:158
+#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
msgstr "¿Que pasa, %s?"
-#: lib/noticeform.php:180
+#: lib/noticeform.php:193
msgid "Attach"
msgstr ""
-#: lib/noticeform.php:184
+#: lib/noticeform.php:197
msgid "Attach a file"
msgstr ""
-#: lib/noticelist.php:478
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "No"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr ""
+
+#: lib/noticelist.php:506
#, fuzzy
msgid "in context"
msgstr "Sen contido!"
-#: lib/noticelist.php:498
+#: lib/noticelist.php:526
#, fuzzy
msgid "Reply to this notice"
msgstr "Non se pode eliminar este chíos."
-#: lib/noticelist.php:499
+#: lib/noticelist.php:527
#, fuzzy
msgid "Reply"
msgstr "contestar"
@@ -5153,12 +5314,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."
@@ -5271,6 +5432,10 @@ msgstr "Bloquear usuario"
msgid "Search site"
msgstr "Buscar"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
#, fuzzy
msgid "Search help"
@@ -5284,11 +5449,6 @@ msgstr "Xente"
msgid "Find people on this site"
msgstr "Atopar xente neste sitio"
-#: lib/searchgroupnav.php:82
-#, fuzzy
-msgid "Notice"
-msgstr "Chíos"
-
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
msgstr "Atopar no contido dos chíos"
@@ -5435,47 +5595,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"
@@ -5504,11 +5668,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 "Unlock this user"
-#~ msgstr "Bloquear usuario"
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "Suscrito a %s"
diff --git a/locale/he/LC_MESSAGES/statusnet.mo b/locale/he/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 792701599..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 25efb2853..1d5e22a5b 100644
--- a/locale/he/LC_MESSAGES/statusnet.po
+++ b/locale/he/LC_MESSAGES/statusnet.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 10:43+0000\n"
-"PO-Revision-Date: 2009-11-18 19:31:58+0000\n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-11-28 19:50:20+0000\n"
"Language-Team: Hebrew\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: he\n"
"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
@@ -440,7 +440,7 @@ msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 או
msgid "Not found"
msgstr "לא נמצא"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -557,7 +557,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
+#: lib/noticelist.php:550
#, fuzzy
msgid "Delete"
msgstr "מחק"
@@ -571,7 +571,7 @@ msgid "Crop"
msgstr ""
#: actions/avatarsettings.php:265 actions/disfavor.php:74
-#: actions/emailsettings.php:237 actions/favor.php:75
+#: 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
@@ -586,7 +586,7 @@ msgid "There was a problem with your session token. Try again, please."
msgstr ""
#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
-#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: 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."
@@ -723,15 +723,15 @@ msgstr "סוג לא מזוהה של כתובת %s"
msgid "That address has already been confirmed."
msgstr "כתובת זו כבר אושרה."
-#: actions/confirmaddress.php:114 actions/emailsettings.php:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
#: actions/profilesettings.php:276 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "עידכון המשתמש נכשל."
-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
msgstr ""
@@ -751,7 +751,7 @@ msgid "Conversation"
msgstr "מיקום"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206
+#: lib/profileaction.php:206 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "הודעות"
@@ -791,7 +791,7 @@ msgstr ""
msgid "Do not delete this notice"
msgstr "אין הודעה כזו."
-#: actions/deletenotice.php:146 lib/noticelist.php:522
+#: actions/deletenotice.php:146 lib/noticelist.php:550
msgid "Delete this notice"
msgstr ""
@@ -834,182 +834,119 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:278
+#: actions/designadminpanel.php:270
#, fuzzy
msgid "Invalid logo URL."
msgstr "גודל לא חוקי."
-#: actions/designadminpanel.php:282
+#: actions/designadminpanel.php:274
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל"
-#: actions/designadminpanel.php:288
-#, fuzzy, php-format
-msgid "Theme directory not readable: %s"
-msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל"
-
-#: actions/designadminpanel.php:292
-#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:296
-#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:312
-#, php-format
-msgid "Max length for %s %s is 255 characters."
-msgstr ""
-
-#: actions/designadminpanel.php:412
+#: actions/designadminpanel.php:370
#, fuzzy
msgid "Change logo"
msgstr "שנה סיסמה"
-#: actions/designadminpanel.php:417
+#: actions/designadminpanel.php:375
#, fuzzy
msgid "Site logo"
msgstr "הודעה חדשה"
-#: actions/designadminpanel.php:424
+#: actions/designadminpanel.php:382
#, fuzzy
msgid "Change theme"
msgstr "שנה"
-#: actions/designadminpanel.php:441
+#: actions/designadminpanel.php:399
#, fuzzy
msgid "Site theme"
msgstr "הודעה חדשה"
-#: actions/designadminpanel.php:442
+#: actions/designadminpanel.php:400
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:447
-msgid "Theme server"
-msgstr ""
-
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
-
-#: actions/designadminpanel.php:455
-msgid "Theme directory"
-msgstr ""
-
-#: actions/designadminpanel.php:462
-#, fuzzy
-msgid "Avatar Settings"
-msgstr "הגדרות"
-
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Avatar server"
-msgstr "הגדרות"
-
-#: actions/designadminpanel.php:471
-#, fuzzy
-msgid "Avatar path"
-msgstr "התמונה עודכנה."
-
-#: actions/designadminpanel.php:475
-#, fuzzy
-msgid "Avatar directory"
-msgstr "התמונה עודכנה."
-
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:422
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות."
-#: actions/designadminpanel.php:526 lib/designsettings.php:139
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:542 lib/designsettings.php:155
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:543 lib/designsettings.php:156
+#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:548 lib/designsettings.php:161
+#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:554
-msgid "Background server"
-msgstr ""
-
-#: actions/designadminpanel.php:558
-msgid "Background path"
-msgstr ""
-
-#: actions/designadminpanel.php:562
-msgid "Background directory"
-msgstr ""
-
-#: actions/designadminpanel.php:569 lib/designsettings.php:170
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "שנה סיסמה"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "התחבר"
-#: actions/designadminpanel.php:604 lib/designsettings.php:204
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "חיפוש"
-#: actions/designadminpanel.php:617 lib/designsettings.php:217
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
msgstr "טקסט"
-#: actions/designadminpanel.php:630 lib/designsettings.php:230
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "היכנס"
-#: actions/designadminpanel.php:658 lib/designsettings.php:247
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:659 lib/designsettings.php:248
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:665 lib/designsettings.php:254
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 actions/useradminpanel.php:226
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/pathsadminpanel.php:296 actions/profilesettings.php:167
+#: actions/siteadminpanel.php:421 actions/smssettings.php:181
+#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/useradminpanel.php:313 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "שמור"
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: actions/designadminpanel.php:582 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1161,83 +1098,83 @@ msgstr ""
msgid "Publish a MicroID for my email address."
msgstr ""
-#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/emailsettings.php:302 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
msgstr "העדפות נשמרו."
-#: actions/emailsettings.php:319
+#: actions/emailsettings.php:320
msgid "No email address."
msgstr ""
-#: actions/emailsettings.php:326
+#: actions/emailsettings.php:327
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr ""
-#: actions/emailsettings.php:333
+#: actions/emailsettings.php:334
msgid "That is already your email address."
msgstr ""
-#: actions/emailsettings.php:336
+#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
msgstr ""
-#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "הכנסת קוד האישור נכשלה."
-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
msgstr ""
-#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
msgstr "אין אישור ממתין שניתן לבטל."
-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
msgstr "זוהי כתובת מסרים מידיים שגויה."
-#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
msgstr "האישור בוטל."
-#: actions/emailsettings.php:412
+#: actions/emailsettings.php:413
msgid "That is not your email address."
msgstr ""
-#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
msgstr "הכתובת הוסרה."
-#: actions/emailsettings.php:445 actions/smssettings.php:518
+#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
msgstr ""
-#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
msgid "Couldn't update user record."
msgstr ""
-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
msgstr ""
-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555
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"
@@ -1506,7 +1443,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
msgid "Admin"
msgstr ""
@@ -1566,7 +1503,7 @@ msgid ""
msgstr ""
#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/subgroupnav.php:98
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "קבוצות"
@@ -1778,7 +1715,7 @@ msgstr ""
msgid "Optionally add a personal message to the invitation."
msgstr ""
-#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
msgstr "שלח"
@@ -1878,7 +1815,7 @@ msgstr "שם משתמש או סיסמה לא נכונים."
msgid "Error setting user. You are probably not authorized."
msgstr "לא מורשה."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:457
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "היכנס"
@@ -1988,7 +1925,7 @@ msgstr "הודעה חדשה"
msgid "Direct message to %s sent"
msgstr ""
-#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
msgid "Ajax Error"
msgstr ""
@@ -1996,7 +1933,7 @@ msgstr ""
msgid "New notice"
msgstr "הודעה חדשה"
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
#, fuzzy
msgid "Notice posted"
msgstr "הודעות"
@@ -2033,12 +1970,12 @@ msgid ""
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
-#: actions/noticesearchrss.php:89
+#: actions/noticesearchrss.php:96
#, fuzzy, php-format
msgid "Updates with \"%s\""
msgstr "מיקרובלוג מאת %s"
-#: actions/noticesearchrss.php:91
+#: actions/noticesearchrss.php:98
#, fuzzy, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
msgstr "כל העידכונים התואמים את החיפוש אחרי \"%s\""
@@ -2167,8 +2104,8 @@ msgstr "לפחות 6 אותיות"
msgid "Confirm"
msgstr "אשר"
-#: actions/passwordsettings.php:113
-msgid "same as password above"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
msgstr "זהה לסיסמה למעלה"
#: actions/passwordsettings.php:117
@@ -2199,6 +2136,113 @@ msgstr "לא ניתן לשמור את הסיסמה"
msgid "Password saved."
msgstr "הסיסמה נשמרה."
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr ""
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr ""
+
+#: actions/pathsadminpanel.php:140
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל"
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+msgid "Site"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+#, fuzzy
+msgid "Site path"
+msgstr "הודעה חדשה"
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr ""
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Avatars"
+msgstr "תמונה"
+
+#: actions/pathsadminpanel.php:252
+#, fuzzy
+msgid "Avatar server"
+msgstr "הגדרות"
+
+#: actions/pathsadminpanel.php:256
+#, fuzzy
+msgid "Avatar path"
+msgstr "התמונה עודכנה."
+
+#: actions/pathsadminpanel.php:260
+#, fuzzy
+msgid "Avatar directory"
+msgstr "התמונה עודכנה."
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:297
+#, fuzzy
+msgid "Save paths"
+msgstr "הודעה חדשה"
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -2300,7 +2344,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr "שפה"
@@ -2527,10 +2571,6 @@ msgstr ""
msgid "6 or more characters, and don't forget it!"
msgstr "לפחות 6 אותיות, אל תשכח!"
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "זהה לסיסמה למעלה"
-
#: actions/recoverpassword.php:243
msgid "Reset"
msgstr "איפוס"
@@ -2590,7 +2630,7 @@ msgstr "שגיאה באישור הקוד."
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "הירשם"
@@ -2634,7 +2674,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
msgid "Email"
msgstr ""
@@ -2722,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 "הירשם כמנוי"
@@ -3059,10 +3099,6 @@ msgstr ""
msgid "User is already silenced."
msgstr "למשתמש אין פרופיל."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
-msgid "Site"
-msgstr ""
-
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
msgstr ""
@@ -3093,101 +3129,97 @@ msgid "Snapshot frequency must be a number."
msgstr ""
#: actions/siteadminpanel.php:199
-msgid "You must set an SSL sever when enabling SSL."
+msgid "You must set an SSL server when enabling SSL."
msgstr ""
#: actions/siteadminpanel.php:204
-msgid "Invalid SSL server. Max length is 255 characters."
+msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
#: actions/siteadminpanel.php:210
-msgid "Minimum text limit is 140c."
+msgid "Minimum text limit is 140 characters."
msgstr ""
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:224
-#, php-format
-msgid "Locales directory not readable: %s"
+#: actions/siteadminpanel.php:266
+msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:275
+#: actions/siteadminpanel.php:269
#, fuzzy
msgid "Site name"
msgstr "הודעה חדשה"
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:279
+#: actions/siteadminpanel.php:274
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:280
+#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:283
+#: actions/siteadminpanel.php:279
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:288
-msgid "contact email address for your site"
+#: actions/siteadminpanel.php:284
+msgid "Contact email address for your site"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:290
+#, fuzzy
+msgid "Local"
+msgstr "מיקום"
+
+#: actions/siteadminpanel.php:301
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:303
+#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:308
msgid "Default site language"
msgstr ""
#: actions/siteadminpanel.php:316
-msgid "Path to locales"
+msgid "URLs"
msgstr ""
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
-msgstr ""
-
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
#, fuzzy
msgid "Server"
msgstr "שיחזור"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
msgstr ""
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-#, fuzzy
-msgid "Site path"
-msgstr "הודעה חדשה"
-
-#: actions/siteadminpanel.php:328
+#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
msgstr ""
-#: actions/siteadminpanel.php:330
+#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
+#: actions/siteadminpanel.php:331
+#, fuzzy
+msgid "Access"
+msgstr "קבל"
+
#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
@@ -3205,7 +3237,7 @@ msgstr ""
msgid "Make registration invitation only."
msgstr ""
-#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#: actions/siteadminpanel.php:346
#, fuzzy
msgid "Closed"
msgstr "אין משתמש כזה."
@@ -3214,33 +3246,37 @@ msgstr "אין משתמש כזה."
msgid "Disable new registrations."
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
#, fuzzy
msgid "Never"
msgstr "שיחזור"
-#: actions/siteadminpanel.php:357
+#: actions/siteadminpanel.php:360
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:358
+#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:364
+#: actions/siteadminpanel.php:366
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:365
-msgid "Snapshots will be sent once every N Web hits"
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
msgstr ""
#: actions/siteadminpanel.php:372
@@ -3251,48 +3287,57 @@ msgstr ""
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:381
+#: actions/siteadminpanel.php:380
+#, fuzzy
+msgid "SSL"
+msgstr "סמס"
+
+#: actions/siteadminpanel.php:384
#, fuzzy
msgid "Sometimes"
msgstr "הודעות"
-#: actions/siteadminpanel.php:382
+#: actions/siteadminpanel.php:385
msgid "Always"
msgstr ""
-#: actions/siteadminpanel.php:384
+#: actions/siteadminpanel.php:387
msgid "Use SSL"
msgstr ""
-#: actions/siteadminpanel.php:385
+#: actions/siteadminpanel.php:388
msgid "When to use SSL"
msgstr ""
-#: actions/siteadminpanel.php:391
+#: actions/siteadminpanel.php:393
msgid "SSL Server"
msgstr ""
-#: actions/siteadminpanel.php:392
+#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr ""
+
+#: actions/siteadminpanel.php:403
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
#, fuzzy
msgid "Save site settings"
msgstr "הגדרות"
@@ -3603,7 +3648,8 @@ msgstr "בטל מנוי"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
-#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
msgid "User"
msgstr "מתשמש"
@@ -3611,16 +3657,86 @@ msgstr "מתשמש"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr ""
+
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
+msgstr ""
+
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr ""
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "פרופיל"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr ""
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
+msgstr ""
+
+#: actions/useradminpanel.php:231
+#, fuzzy
+msgid "New users"
+msgstr "מחק"
+
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr ""
+
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr ""
+
+#: actions/useradminpanel.php:241
+#, fuzzy
+msgid "Default subscription"
+msgstr "כל המנויים"
+
+#: actions/useradminpanel.php:242
+#, fuzzy
+msgid "Automatically subscribe new users to this user."
+msgstr "ההרשמה אושרה"
+
+#: actions/useradminpanel.php:251
+#, fuzzy
+msgid "Invitations"
+msgstr "מיקום"
+
+#: actions/useradminpanel.php:256
+msgid "Invitations enabled"
+msgstr ""
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
msgstr ""
-#: actions/useradminpanel.php:178
-msgid "Invite-only"
+#: actions/useradminpanel.php:265
+msgid "Sessions"
msgstr ""
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr ""
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/userauthorization.php:105
@@ -3828,7 +3944,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"
@@ -3848,10 +3964,6 @@ msgstr "יצירת המנוי נכשלה."
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr "פרופיל"
-
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr ""
@@ -3891,136 +4003,136 @@ msgstr ""
msgid "Untitled page"
msgstr ""
-#: lib/action.php:424
+#: lib/action.php:425
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Home"
msgstr "בית"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:432
+#: lib/action.php:433
#, fuzzy
msgid "Account"
msgstr "אודות"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect"
msgstr "התחבר"
-#: lib/action.php:435
+#: lib/action.php:436
#, fuzzy
msgid "Connect to services"
msgstr "נכשלה ההפניה לשרת: %s"
-#: lib/action.php:439
+#: lib/action.php:440
#, fuzzy
msgid "Change site configuration"
msgstr "הרשמות"
-#: lib/action.php:443 lib/subgroupnav.php:105
+#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:444 lib/subgroupnav.php:106
+#: lib/action.php:445 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout"
msgstr "צא"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:454
+#: lib/action.php:455
#, fuzzy
msgid "Create an account"
msgstr "צור חשבון חדש"
-#: lib/action.php:457
+#: lib/action.php:458
msgid "Login to the site"
msgstr ""
-#: lib/action.php:460 lib/action.php:723
+#: lib/action.php:461 lib/action.php:724
msgid "Help"
msgstr "עזרה"
-#: lib/action.php:460
+#: lib/action.php:461
#, fuzzy
msgid "Help me!"
msgstr "עזרה"
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
msgstr "חיפוש"
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:484
+#: lib/action.php:485
#, fuzzy
msgid "Site notice"
msgstr "הודעה חדשה"
-#: lib/action.php:550
+#: lib/action.php:551
msgid "Local views"
msgstr ""
-#: lib/action.php:616
+#: lib/action.php:617
#, fuzzy
msgid "Page notice"
msgstr "הודעה חדשה"
-#: lib/action.php:718
+#: lib/action.php:719
#, fuzzy
msgid "Secondary site navigation"
msgstr "הרשמות"
-#: lib/action.php:725
+#: lib/action.php:726
msgid "About"
msgstr "אודות"
-#: lib/action.php:727
+#: lib/action.php:728
msgid "FAQ"
msgstr "רשימת שאלות נפוצות"
-#: lib/action.php:731
+#: lib/action.php:732
msgid "TOS"
msgstr ""
-#: lib/action.php:734
+#: lib/action.php:735
msgid "Privacy"
msgstr "פרטיות"
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
msgstr "מקור"
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Contact"
msgstr "צור קשר"
-#: lib/action.php:740
+#: lib/action.php:741
msgid "Badge"
msgstr ""
-#: lib/action.php:768
+#: lib/action.php:769
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:771
+#: lib/action.php:772
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4029,12 +4141,12 @@ msgstr ""
"**%%site.name%%** הוא שרות ביקרובלוג הניתן על ידי [%%site.broughtby%%](%%"
"site.broughtbyurl%%)."
-#: lib/action.php:773
+#: lib/action.php:774
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** הוא שרות ביקרובלוג."
-#: lib/action.php:775
+#: lib/action.php:776
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4045,34 +4157,34 @@ msgstr ""
"s, המופצת תחת רשיון [GNU Affero General Public License](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)"
-#: lib/action.php:789
+#: lib/action.php:790
#, fuzzy
msgid "Site content license"
msgstr "הודעה חדשה"
-#: lib/action.php:798
+#: lib/action.php:799
msgid "All "
msgstr ""
-#: lib/action.php:803
+#: lib/action.php:804
msgid "license."
msgstr ""
-#: lib/action.php:1067
+#: lib/action.php:1068
msgid "Pagination"
msgstr ""
-#: lib/action.php:1076
+#: lib/action.php:1077
#, fuzzy
msgid "After"
msgstr "<< אחרי"
-#: lib/action.php:1084
+#: lib/action.php:1085
#, fuzzy
msgid "Before"
msgstr "לפני >>"
-#: lib/action.php:1132
+#: lib/action.php:1133
msgid "There was a problem with your session token."
msgstr ""
@@ -4101,6 +4213,11 @@ msgstr "הרשמות"
msgid "Design configuration"
msgstr ""
+#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+#, fuzzy
+msgid "Paths configuration"
+msgstr "הרשמות"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4275,7 +4392,6 @@ msgid "You are not subscribed to anyone."
msgstr "לא שלחנו אלינו את הפרופיל הזה"
#: lib/command.php:620
-#, fuzzy
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "לא שלחנו אלינו את הפרופיל הזה"
@@ -4287,7 +4403,6 @@ msgid "No one is subscribed to you."
msgstr "הרשמה מרוחקת"
#: lib/command.php:642
-#, fuzzy
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "הרשמה מרוחקת"
@@ -4299,7 +4414,6 @@ msgid "You are not a member of any groups."
msgstr "לא שלחנו אלינו את הפרופיל הזה"
#: lib/command.php:664
-#, fuzzy
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "לא שלחנו אלינו את הפרופיל הזה"
@@ -4383,9 +4497,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: "
@@ -4483,7 +4598,7 @@ msgstr "מיקומך, למשל \"עיר, מדינה או מחוז, ארץ\""
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
-#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85
msgid "Group"
msgstr ""
@@ -4530,7 +4645,7 @@ msgstr ""
msgid "Tags in %s group's notices"
msgstr ""
-#: lib/htmloutputter.php:104
+#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל"
@@ -4564,6 +4679,14 @@ msgstr "אין הודעה כזו."
msgid "Unknown file type"
msgstr ""
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
@@ -4599,7 +4722,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:424
+#: lib/mailbox.php:227 lib/noticelist.php:452
msgid "from"
msgstr ""
@@ -4845,39 +4968,65 @@ msgstr ""
msgid "To"
msgstr "אל"
-#: lib/messageform.php:162 lib/noticeform.php:173
+#: lib/messageform.php:162 lib/noticeform.php:186
#, fuzzy
msgid "Available characters"
msgstr "לפחות 6 אותיות"
-#: lib/noticeform.php:145
+#: lib/noticeform.php:158
#, fuzzy
msgid "Send a notice"
msgstr "הודעה חדשה"
-#: lib/noticeform.php:158
+#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
msgstr "מה המצב %s?"
-#: lib/noticeform.php:180
+#: lib/noticeform.php:193
msgid "Attach"
msgstr ""
-#: lib/noticeform.php:184
+#: lib/noticeform.php:197
msgid "Attach a file"
msgstr ""
-#: lib/noticelist.php:478
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "לא"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr ""
+
+#: lib/noticelist.php:506
#, fuzzy
msgid "in context"
msgstr "אין תוכן!"
-#: lib/noticelist.php:498
+#: lib/noticelist.php:526
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:499
+#: lib/noticelist.php:527
#, fuzzy
msgid "Reply"
msgstr "הגב"
@@ -4911,11 +5060,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 "הכנסת מנוי חדש נכשלה."
@@ -5026,6 +5175,10 @@ msgstr "אין משתמש כזה."
msgid "Search site"
msgstr "חיפוש"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
#, fuzzy
msgid "Search help"
@@ -5039,11 +5192,6 @@ msgstr "אנשים"
msgid "Find people on this site"
msgstr ""
-#: lib/searchgroupnav.php:82
-#, fuzzy
-msgid "Notice"
-msgstr "הודעות"
-
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
msgstr ""
@@ -5187,47 +5335,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 "לפני כשנה"
@@ -5256,11 +5408,3 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
-
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "אין משתמש כזה."
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "הרשמה מרוחקת"
diff --git a/locale/is/LC_MESSAGES/statusnet.mo b/locale/is/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 9a9203ec0..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 c5a0216ef..4e5e3292f 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -7,16 +7,18 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 10:43+0000\n"
-"PO-Revision-Date: 2009-11-18 19:32:01+0000\n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-11-28 19:50:23+0000\n"
"Language-Team: Icelandic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n % 100 != 1 && n % 100 != 21 && n % 100 != 31 && n % 100 != 41 && n % 100 != 51 && n % 100 != 61 && n % 100 != 71 && n % 100 != 81 && n % 100 != 91);\n"
-"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: is\n"
"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=2; plural=(n % 100 != 1 && n % 100 != 21 && n % 100 !"
+"= 31 && n % 100 != 41 && n % 100 != 51 && n % 100 != 61 && n % 100 != 71 && "
+"n % 100 != 81 && n % 100 != 91);\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
@@ -437,7 +439,7 @@ msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
msgid "Not found"
msgstr "Fannst ekki"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -551,7 +553,7 @@ msgid "Preview"
msgstr "Forsýn"
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
+#: lib/noticelist.php:550
msgid "Delete"
msgstr "Eyða"
@@ -564,7 +566,7 @@ msgid "Crop"
msgstr "Skera af"
#: actions/avatarsettings.php:265 actions/disfavor.php:74
-#: actions/emailsettings.php:237 actions/favor.php:75
+#: 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
@@ -579,7 +581,7 @@ msgid "There was a problem with your session token. Try again, please."
msgstr "Það kom upp vandamál með setutókann þinn. Vinsamlegast reyndu aftur."
#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
-#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: 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."
@@ -711,15 +713,15 @@ msgstr "Óþekkt gerð tölvupóstfangs %s"
msgid "That address has already been confirmed."
msgstr "Þetta tölvupóstfang hefur nú þegar verið staðfest."
-#: actions/confirmaddress.php:114 actions/emailsettings.php:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
#: actions/profilesettings.php:276 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Gat ekki uppfært notanda."
-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
msgstr "Gat ekki eytt tölvupóstsstaðfestingu."
@@ -739,7 +741,7 @@ msgid "Conversation"
msgstr ""
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206
+#: lib/profileaction.php:206 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Babl"
@@ -778,7 +780,7 @@ msgstr "Ertu viss um að þú viljir eyða þessu babli?"
msgid "Do not delete this notice"
msgstr ""
-#: actions/deletenotice.php:146 lib/noticelist.php:522
+#: actions/deletenotice.php:146 lib/noticelist.php:550
msgid "Delete this notice"
msgstr "Eyða þessu babli"
@@ -821,178 +823,116 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:278
+#: actions/designadminpanel.php:270
#, fuzzy
msgid "Invalid logo URL."
msgstr "Ótæk stærð."
-#: actions/designadminpanel.php:282
+#: actions/designadminpanel.php:274
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Þessi síða er ekki aðgengileg í "
-#: actions/designadminpanel.php:288
-#, fuzzy, php-format
-msgid "Theme directory not readable: %s"
-msgstr "Þessi síða er ekki aðgengileg í "
-
-#: actions/designadminpanel.php:292
-#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:296
-#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:312
-#, php-format
-msgid "Max length for %s %s is 255 characters."
-msgstr ""
-
-#: actions/designadminpanel.php:412
+#: actions/designadminpanel.php:370
#, fuzzy
msgid "Change logo"
msgstr "Breyta"
-#: actions/designadminpanel.php:417
+#: actions/designadminpanel.php:375
#, fuzzy
msgid "Site logo"
msgstr "Bjóða"
-#: actions/designadminpanel.php:424
+#: actions/designadminpanel.php:382
#, fuzzy
msgid "Change theme"
msgstr "Breyta"
-#: actions/designadminpanel.php:441
+#: actions/designadminpanel.php:399
#, fuzzy
msgid "Site theme"
msgstr "Babl vefsíðunnar"
-#: actions/designadminpanel.php:442
+#: actions/designadminpanel.php:400
#, fuzzy
msgid "Theme for the site."
msgstr "Skrá þig út af síðunni"
-#: actions/designadminpanel.php:447
-msgid "Theme server"
-msgstr ""
-
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
-
-#: actions/designadminpanel.php:455
-msgid "Theme directory"
-msgstr ""
-
-#: actions/designadminpanel.php:462
-#, fuzzy
-msgid "Avatar Settings"
-msgstr "Stillingar fyrir mynd"
-
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Avatar server"
-msgstr "Stillingar fyrir mynd"
-
-#: actions/designadminpanel.php:471
-#, fuzzy
-msgid "Avatar path"
-msgstr "Mynd hefur verið uppfærð."
-
-#: actions/designadminpanel.php:475
-msgid "Avatar directory"
-msgstr ""
-
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:422
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
-#: actions/designadminpanel.php:526 lib/designsettings.php:139
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:542 lib/designsettings.php:155
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:543 lib/designsettings.php:156
+#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:548 lib/designsettings.php:161
+#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:554
-msgid "Background server"
-msgstr ""
-
-#: actions/designadminpanel.php:558
-msgid "Background path"
-msgstr ""
-
-#: actions/designadminpanel.php:562
-msgid "Background directory"
-msgstr ""
-
-#: actions/designadminpanel.php:569 lib/designsettings.php:170
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
msgid "Change colours"
msgstr ""
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
msgid "Content"
msgstr ""
-#: actions/designadminpanel.php:604 lib/designsettings.php:204
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
msgid "Sidebar"
msgstr ""
-#: actions/designadminpanel.php:617 lib/designsettings.php:217
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
msgstr "Texti"
-#: actions/designadminpanel.php:630 lib/designsettings.php:230
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
msgid "Links"
msgstr ""
-#: actions/designadminpanel.php:658 lib/designsettings.php:247
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:659 lib/designsettings.php:248
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:665 lib/designsettings.php:254
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 actions/useradminpanel.php:226
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: 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 "Vista"
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: actions/designadminpanel.php:582 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1142,37 +1082,37 @@ msgstr "Ég vil babla í gegnum tölvupóst."
msgid "Publish a MicroID for my email address."
msgstr "Birta MicroID fyrir tölvupóstfangið mitt."
-#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/emailsettings.php:302 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
msgstr "Stillingar vistaðar."
-#: actions/emailsettings.php:319
+#: actions/emailsettings.php:320
msgid "No email address."
msgstr "Ekkert tölvupóstfang."
-#: actions/emailsettings.php:326
+#: actions/emailsettings.php:327
msgid "Cannot normalize that email address"
msgstr "Get ekki staðlað þetta tölvupóstfang"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "Ekki tækt tölvupóstfang"
-#: actions/emailsettings.php:333
+#: actions/emailsettings.php:334
msgid "That is already your email address."
msgstr "Þetta er nú þegar tölvupóstfangið þitt."
-#: actions/emailsettings.php:336
+#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
msgstr "Þetta tölvupóstfang tilheyrir öðrum notanda."
-#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Gat ekki sett inn staðfestingarlykil."
-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1181,47 +1121,47 @@ msgstr ""
"Athugaðu innhólfið þitt (og ruslpóstinn þinn!). Þar ætti "
"staðfestingarlykillinn að vera og leiðbeingar um hvernig eigi að nota hann. "
-#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
msgstr "Engin staðfesting í bið sem þarf að hætta við."
-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
msgstr "Þetta er rangt snarskilaboðafang."
-#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
msgstr "Hætt við staðfestingu."
-#: actions/emailsettings.php:412
+#: actions/emailsettings.php:413
msgid "That is not your email address."
msgstr "Þetta er ekki tölvupóstfangið þitt."
-#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
msgstr "Tölvupóstfangið hefur verið fjarlægt."
-#: actions/emailsettings.php:445 actions/smssettings.php:518
+#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
msgstr "Ekkert móttökutölvupóstfang."
-#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
msgid "Couldn't update user record."
msgstr "Gat ekki uppfært skráarfærslu notanda."
-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
msgstr "Móttökutölvupóstfang fjarlægt."
-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555
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"
@@ -1476,7 +1416,7 @@ msgstr "Hópmeðlimir %s, síða %d"
msgid "A list of the users in this group."
msgstr "Listi yfir notendur í þessum hóp."
-#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
msgid "Admin"
msgstr "Stjórnandi"
@@ -1532,7 +1472,7 @@ msgid ""
msgstr ""
#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/subgroupnav.php:98
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Hópar"
@@ -1751,7 +1691,7 @@ msgstr "Persónuleg skilaboð"
msgid "Optionally add a personal message to the invitation."
msgstr "Bættu persónulegum skilaboðum við boðskortið ef þú vilt."
-#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
msgstr "Senda"
@@ -1875,7 +1815,7 @@ msgstr "Rangt notendanafn eða lykilorð."
msgid "Error setting user. You are probably not authorized."
msgstr "Engin heimild."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:457
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Innskráning"
@@ -1991,7 +1931,7 @@ msgstr ""
msgid "Direct message to %s sent"
msgstr "Bein skilaboð send til %s"
-#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
msgid "Ajax Error"
msgstr "Ajax villa"
@@ -1999,7 +1939,7 @@ msgstr "Ajax villa"
msgid "New notice"
msgstr "Nýtt babl"
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
msgid "Notice posted"
msgstr "Babl sent inn"
@@ -2035,12 +1975,12 @@ msgid ""
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
-#: actions/noticesearchrss.php:89
+#: actions/noticesearchrss.php:96
#, php-format
msgid "Updates with \"%s\""
msgstr ""
-#: actions/noticesearchrss.php:91
+#: actions/noticesearchrss.php:98
#, fuzzy, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
msgstr "Allar færslur sem passa við \"%s\""
@@ -2167,9 +2107,9 @@ msgstr "6 eða fleiri tákn"
msgid "Confirm"
msgstr "Staðfesta"
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "sama og lykilorðið hér fyrir ofan"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Sama og lykilorðið hér fyrir ofan"
#: actions/passwordsettings.php:117
msgid "Change"
@@ -2199,6 +2139,113 @@ msgstr "Get ekki vistað nýja lykilorðið."
msgid "Password saved."
msgstr "Lykilorð vistað."
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr ""
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr ""
+
+#: actions/pathsadminpanel.php:140
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Þessi síða er ekki aðgengileg í "
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+#, fuzzy
+msgid "Site"
+msgstr "Bjóða"
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+#, fuzzy
+msgid "Site path"
+msgstr "Babl vefsíðunnar"
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr ""
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Avatars"
+msgstr "Mynd"
+
+#: actions/pathsadminpanel.php:252
+#, fuzzy
+msgid "Avatar server"
+msgstr "Stillingar fyrir mynd"
+
+#: actions/pathsadminpanel.php:256
+#, fuzzy
+msgid "Avatar path"
+msgstr "Mynd hefur verið uppfærð."
+
+#: actions/pathsadminpanel.php:260
+msgid "Avatar directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:297
+#, fuzzy
+msgid "Save paths"
+msgstr "Babl vefsíðunnar"
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -2305,7 +2352,7 @@ msgstr ""
"Merki fyrir þig (bókstafir, tölustafir, -, ., og _), aðskilin með kommu eða "
"bili"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr "Tungumál"
@@ -2531,10 +2578,6 @@ msgstr "Óþekkt aðgerð"
msgid "6 or more characters, and don't forget it!"
msgstr "6 eða fleiri tákn og ekki gleyma því!"
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Sama og lykilorðið hér fyrir ofan"
-
#: actions/recoverpassword.php:243
msgid "Reset"
msgstr "Endurstilla"
@@ -2595,7 +2638,7 @@ msgstr ""
msgid "Registration successful"
msgstr "Nýskráning tókst"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Nýskrá"
@@ -2640,7 +2683,7 @@ msgid "Same as password above. Required."
msgstr "Sama og lykilorðið hér fyrir ofan. Nauðsynlegt."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Tölvupóstur"
@@ -2745,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"
@@ -3080,11 +3123,6 @@ msgstr "Þú getur ekki sent þessum notanda skilaboð."
msgid "User is already silenced."
msgstr ""
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
-#, fuzzy
-msgid "Site"
-msgstr "Bjóða"
-
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
msgstr ""
@@ -3116,103 +3154,100 @@ msgid "Snapshot frequency must be a number."
msgstr ""
#: actions/siteadminpanel.php:199
-msgid "You must set an SSL sever when enabling SSL."
+msgid "You must set an SSL server when enabling SSL."
msgstr ""
#: actions/siteadminpanel.php:204
-msgid "Invalid SSL server. Max length is 255 characters."
+msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
#: actions/siteadminpanel.php:210
-msgid "Minimum text limit is 140c."
+msgid "Minimum text limit is 140 characters."
msgstr ""
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:224
-#, php-format
-msgid "Locales directory not readable: %s"
+#: actions/siteadminpanel.php:266
+msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:275
+#: actions/siteadminpanel.php:269
#, fuzzy
msgid "Site name"
msgstr "Babl vefsíðunnar"
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:279
+#: actions/siteadminpanel.php:274
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:280
+#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:283
+#: actions/siteadminpanel.php:279
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:284
#, fuzzy
-msgid "contact email address for your site"
+msgid "Contact email address for your site"
msgstr "Nýtt tölvupóstfang til að senda á %s"
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:290
+#, fuzzy
+msgid "Local"
+msgstr "Staðbundin sýn"
+
+#: actions/siteadminpanel.php:301
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:303
+#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:308
#, fuzzy
msgid "Default site language"
msgstr "Tungumál (ákjósanlegt)"
#: actions/siteadminpanel.php:316
-msgid "Path to locales"
-msgstr ""
-
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
-msgstr ""
+#, fuzzy
+msgid "URLs"
+msgstr "Vefslóð"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
#, fuzzy
msgid "Server"
msgstr "Endurheimta"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
msgstr ""
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-#, fuzzy
-msgid "Site path"
-msgstr "Babl vefsíðunnar"
-
-#: actions/siteadminpanel.php:328
+#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
msgstr ""
-#: actions/siteadminpanel.php:330
+#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
+#: actions/siteadminpanel.php:331
+#, fuzzy
+msgid "Access"
+msgstr "Samþykkja"
+
#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
@@ -3231,7 +3266,7 @@ msgstr "Bjóða"
msgid "Make registration invitation only."
msgstr ""
-#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#: actions/siteadminpanel.php:346
msgid "Closed"
msgstr ""
@@ -3239,33 +3274,37 @@ msgstr ""
msgid "Disable new registrations."
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
#, fuzzy
msgid "Never"
msgstr "Endurheimta"
-#: actions/siteadminpanel.php:357
+#: actions/siteadminpanel.php:360
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:358
+#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:364
+#: actions/siteadminpanel.php:366
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:365
-msgid "Snapshots will be sent once every N Web hits"
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
msgstr ""
#: actions/siteadminpanel.php:372
@@ -3276,48 +3315,57 @@ msgstr ""
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:381
+#: actions/siteadminpanel.php:380
+#, fuzzy
+msgid "SSL"
+msgstr "SMS"
+
+#: actions/siteadminpanel.php:384
#, fuzzy
msgid "Sometimes"
msgstr "Babl"
-#: actions/siteadminpanel.php:382
+#: actions/siteadminpanel.php:385
msgid "Always"
msgstr ""
-#: actions/siteadminpanel.php:384
+#: actions/siteadminpanel.php:387
msgid "Use SSL"
msgstr ""
-#: actions/siteadminpanel.php:385
+#: actions/siteadminpanel.php:388
msgid "When to use SSL"
msgstr ""
-#: actions/siteadminpanel.php:391
+#: actions/siteadminpanel.php:393
msgid "SSL Server"
msgstr ""
-#: actions/siteadminpanel.php:392
+#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr ""
+
+#: actions/siteadminpanel.php:403
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
#, fuzzy
msgid "Save site settings"
msgstr "Stillingar fyrir mynd"
@@ -3625,7 +3673,8 @@ msgstr "Ekki lengur áskrifandi"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
-#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
msgid "User"
msgstr "Notandi"
@@ -3633,17 +3682,89 @@ msgstr "Notandi"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:178
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
+msgstr ""
+
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr ""
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Persónuleg síða"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr ""
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
+msgstr ""
+
+#: actions/useradminpanel.php:231
#, fuzzy
-msgid "Invite-only"
-msgstr "Bjóða"
+msgid "New users"
+msgstr "Bjóða nýjum notendum að vera með"
+
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr ""
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr ""
+
+#: actions/useradminpanel.php:241
+#, fuzzy
+msgid "Default subscription"
+msgstr "Allar áskriftir"
+
+#: actions/useradminpanel.php:242
+#, fuzzy
+msgid "Automatically subscribe new users to this user."
+msgstr ""
+"Gerast sjálfkrafa áskrifandi að hverjum þeim sem gerist áskrifandi að þér "
+"(best fyrir ómannlega notendur)"
+
+#: actions/useradminpanel.php:251
+#, fuzzy
+msgid "Invitations"
+msgstr "Boðskort hefur verið sent út"
+
+#: actions/useradminpanel.php:256
+#, fuzzy
+msgid "Invitations enabled"
+msgstr "Boðskort hefur verið sent út"
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr ""
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr ""
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/userauthorization.php:105
@@ -3851,7 +3972,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"
@@ -3869,10 +3990,6 @@ msgstr "Gat ekki skráð hópmeðlimi."
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr "Persónuleg síða"
-
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Breyta persónulegu stillingunum þínum"
@@ -3910,132 +4027,132 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "Ónafngreind síða"
-#: lib/action.php:424
+#: lib/action.php:425
msgid "Primary site navigation"
msgstr "Stikl aðalsíðu"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Home"
msgstr "Heim"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Personal profile and friends timeline"
msgstr "Persónuleg síða og vinarás"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Account"
msgstr "Aðgangur"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Change your email, avatar, password, profile"
msgstr ""
"Breyttu tölvupóstinum þínum, einkennismyndinni þinni, lykilorðinu þínu, "
"persónulegu síðunni þinni"
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect"
msgstr "Tengjast"
-#: lib/action.php:435
+#: lib/action.php:436
#, fuzzy
msgid "Connect to services"
msgstr "Gat ekki framsent til vefþjóns: %s"
-#: lib/action.php:439
+#: lib/action.php:440
#, fuzzy
msgid "Change site configuration"
msgstr "Stikl aðalsíðu"
-#: lib/action.php:443 lib/subgroupnav.php:105
+#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Bjóða"
-#: lib/action.php:444 lib/subgroupnav.php:106
+#: lib/action.php:445 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Bjóða vinum og vandamönnum að slást í hópinn á %s"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout"
msgstr "Útskráning"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout from the site"
msgstr "Skrá þig út af síðunni"
-#: lib/action.php:454
+#: lib/action.php:455
msgid "Create an account"
msgstr "Búa til aðgang"
-#: lib/action.php:457
+#: lib/action.php:458
msgid "Login to the site"
msgstr "Skrá þig inn á síðuna"
-#: lib/action.php:460 lib/action.php:723
+#: lib/action.php:461 lib/action.php:724
msgid "Help"
msgstr "Hjálp"
-#: lib/action.php:460
+#: lib/action.php:461
msgid "Help me!"
msgstr "Hjálp!"
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
msgstr "Leita"
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
msgstr "Leita að fólki eða texta"
-#: lib/action.php:484
+#: lib/action.php:485
msgid "Site notice"
msgstr "Babl vefsíðunnar"
-#: lib/action.php:550
+#: lib/action.php:551
msgid "Local views"
msgstr "Staðbundin sýn"
-#: lib/action.php:616
+#: lib/action.php:617
msgid "Page notice"
msgstr "Babl síðunnar"
-#: lib/action.php:718
+#: lib/action.php:719
msgid "Secondary site navigation"
msgstr "Stikl undirsíðu"
-#: lib/action.php:725
+#: lib/action.php:726
msgid "About"
msgstr "Um"
-#: lib/action.php:727
+#: lib/action.php:728
msgid "FAQ"
msgstr "Spurt og svarað"
-#: lib/action.php:731
+#: lib/action.php:732
msgid "TOS"
msgstr ""
-#: lib/action.php:734
+#: lib/action.php:735
msgid "Privacy"
msgstr "Friðhelgi"
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
msgstr "Frumþula"
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Contact"
msgstr "Tengiliður"
-#: lib/action.php:740
+#: lib/action.php:741
msgid "Badge"
msgstr ""
-#: lib/action.php:768
+#: lib/action.php:769
msgid "StatusNet software license"
msgstr "Hugbúnaðarleyfi StatusNet"
-#: lib/action.php:771
+#: lib/action.php:772
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4044,12 +4161,12 @@ msgstr ""
"**%%site.name%%** er örbloggsþjónusta í boði [%%site.broughtby%%](%%site."
"broughtbyurl%%). "
-#: lib/action.php:773
+#: lib/action.php:774
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** er örbloggsþjónusta."
-#: lib/action.php:775
+#: lib/action.php:776
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4060,32 +4177,32 @@ msgstr ""
"sem er gefinn út undir [GNU Affero almenningsleyfinu](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:789
+#: lib/action.php:790
#, fuzzy
msgid "Site content license"
msgstr "Hugbúnaðarleyfi StatusNet"
-#: lib/action.php:798
+#: lib/action.php:799
msgid "All "
msgstr "Allt "
-#: lib/action.php:803
+#: lib/action.php:804
msgid "license."
msgstr "leyfi."
-#: lib/action.php:1067
+#: lib/action.php:1068
msgid "Pagination"
msgstr "Uppröðun"
-#: lib/action.php:1076
+#: lib/action.php:1077
msgid "After"
msgstr "Eftir"
-#: lib/action.php:1084
+#: lib/action.php:1085
msgid "Before"
msgstr "Áður"
-#: lib/action.php:1132
+#: lib/action.php:1133
msgid "There was a problem with your session token."
msgstr "Það komu upp vandamál varðandi setutókann þinn."
@@ -4118,6 +4235,11 @@ msgstr "Staðfesting tölvupóstfangs"
msgid "Design configuration"
msgstr "SMS staðfesting"
+#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+#, fuzzy
+msgid "Paths configuration"
+msgstr "SMS staðfesting"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4291,11 +4413,10 @@ msgid "You are not subscribed to anyone."
msgstr "Þú ert ekki áskrifandi."
#: lib/command.php:620
-#, fuzzy
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
-msgstr[0] "Þú ert ekki áskrifandi."
-msgstr[1] "Þú ert ekki áskrifandi."
+msgstr[0] "Þú ert nú þegar í áskrift að þessum notendum:"
+msgstr[1] "Þú ert nú þegar í áskrift að þessum notendum:"
#: lib/command.php:640
#, fuzzy
@@ -4303,7 +4424,6 @@ msgid "No one is subscribed to you."
msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér."
#: lib/command.php:642
-#, fuzzy
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."
@@ -4315,7 +4435,6 @@ msgid "You are not a member of any groups."
msgstr "Þú ert ekki meðlimur í þessum hópi."
#: lib/command.php:664
-#, fuzzy
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."
@@ -4399,9 +4518,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: "
@@ -4496,7 +4616,7 @@ msgstr "Staðsetning hópsins, ef einhver, eins og \"Borg, landshluti, land\""
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
-#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85
msgid "Group"
msgstr "Hópur"
@@ -4541,7 +4661,7 @@ msgstr "Hóparnir með mesta bablið"
msgid "Tags in %s group's notices"
msgstr "Merki í babli %s hópsins"
-#: lib/htmloutputter.php:104
+#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
msgstr ""
"Þessi síða er ekki aðgengileg í margmiðlunargerðinni sem þú tekur á móti"
@@ -4575,6 +4695,14 @@ msgstr "Týndum skránni okkar"
msgid "Unknown file type"
msgstr "Óþekkt skráargerð"
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
@@ -4606,7 +4734,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:424
+#: lib/mailbox.php:227 lib/noticelist.php:452
#, fuzzy
msgid "from"
msgstr "frá"
@@ -4858,36 +4986,62 @@ msgstr "Senda bein skilaboð"
msgid "To"
msgstr "Til"
-#: lib/messageform.php:162 lib/noticeform.php:173
+#: lib/messageform.php:162 lib/noticeform.php:186
msgid "Available characters"
msgstr "Leyfileg tákn"
-#: lib/noticeform.php:145
+#: lib/noticeform.php:158
msgid "Send a notice"
msgstr "Senda babl"
-#: lib/noticeform.php:158
+#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
msgstr "Hvað er að frétta %s?"
-#: lib/noticeform.php:180
+#: lib/noticeform.php:193
msgid "Attach"
msgstr ""
-#: lib/noticeform.php:184
+#: lib/noticeform.php:197
msgid "Attach a file"
msgstr ""
-#: lib/noticelist.php:478
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "Nei"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr ""
+
+#: lib/noticelist.php:506
msgid "in context"
msgstr ""
-#: lib/noticelist.php:498
+#: lib/noticelist.php:526
msgid "Reply to this notice"
msgstr "Svara þessu babli"
-#: lib/noticelist.php:499
+#: lib/noticelist.php:527
msgid "Reply"
msgstr "Svara"
@@ -4920,12 +5074,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."
@@ -5033,6 +5187,10 @@ msgstr "Opna á þennan notanda"
msgid "Search site"
msgstr ""
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
msgid "Search help"
msgstr ""
@@ -5045,10 +5203,6 @@ msgstr "Fólk"
msgid "Find people on this site"
msgstr "Finna persónur á þessu vefsvæði"
-#: lib/searchgroupnav.php:82
-msgid "Notice"
-msgstr "Babl"
-
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
msgstr "Finna innihald babls"
@@ -5187,47 +5341,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"
@@ -5256,11 +5414,3 @@ msgstr "Afsakið en þetta er ekki móttökutölvupóstfangið þitt."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Því miður er móttökutölvupóstur ekki leyfður."
-
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "Opna á þennan notanda"
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "Fólk sem eru áskrifendur að %s"
diff --git a/locale/it/LC_MESSAGES/statusnet.mo b/locale/it/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 2dec03ba7..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 874698170..68eb98ebc 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -8,16 +8,16 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 10:43+0000\n"
-"PO-Revision-Date: 2009-11-18 19:32:04+0000\n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-11-28 19:50:26+0000\n"
"Language-Team: Italian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: it\n"
"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
@@ -446,7 +446,7 @@ msgstr "Troppo lungo. Lunghezza massima 140 caratteri."
msgid "Not found"
msgstr "Non trovato"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -561,7 +561,7 @@ msgid "Preview"
msgstr "Anteprima"
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
+#: lib/noticelist.php:550
msgid "Delete"
msgstr "Elimina"
@@ -574,7 +574,7 @@ msgid "Crop"
msgstr "Ritaglia"
#: actions/avatarsettings.php:265 actions/disfavor.php:74
-#: actions/emailsettings.php:237 actions/favor.php:75
+#: 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
@@ -589,7 +589,7 @@ msgid "There was a problem with your session token. Try again, please."
msgstr "C'è stato un problema con il tuo token di sessione. Prova di nuovo."
#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
-#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: 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."
@@ -723,15 +723,15 @@ msgstr "Tipo di indirizzo non riconosciuto %s"
msgid "That address has already been confirmed."
msgstr "Quell'indirizzo è già stato confermato."
-#: actions/confirmaddress.php:114 actions/emailsettings.php:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
#: actions/profilesettings.php:276 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Impossibile aggiornare l'utente."
-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
msgstr "Impossibile eliminare l'email di conferma."
@@ -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/profileaction.php:206 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Messaggi"
@@ -794,7 +794,7 @@ msgstr "Sei sicuro di voler eliminare questo messaggio?"
msgid "Do not delete this notice"
msgstr "Impossibile eliminare questo messaggio."
-#: actions/deletenotice.php:146 lib/noticelist.php:522
+#: actions/deletenotice.php:146 lib/noticelist.php:550
msgid "Delete this notice"
msgstr "Elimina questo messaggio"
@@ -838,183 +838,120 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:278
+#: actions/designadminpanel.php:270
#, fuzzy
msgid "Invalid logo URL."
msgstr "Dimensione non valida."
-#: actions/designadminpanel.php:282
+#: actions/designadminpanel.php:274
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Questa pagina non è disponibile in un "
-#: actions/designadminpanel.php:288
-#, fuzzy, php-format
-msgid "Theme directory not readable: %s"
-msgstr "Questa pagina non è disponibile in un "
-
-#: actions/designadminpanel.php:292
-#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:296
-#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:312
-#, php-format
-msgid "Max length for %s %s is 255 characters."
-msgstr ""
-
-#: actions/designadminpanel.php:412
+#: actions/designadminpanel.php:370
#, fuzzy
msgid "Change logo"
msgstr "Modifica la tua password"
-#: actions/designadminpanel.php:417
+#: actions/designadminpanel.php:375
#, fuzzy
msgid "Site logo"
msgstr "Invita"
-#: actions/designadminpanel.php:424
+#: actions/designadminpanel.php:382
#, fuzzy
msgid "Change theme"
msgstr "Modifica"
-#: actions/designadminpanel.php:441
+#: actions/designadminpanel.php:399
#, fuzzy
msgid "Site theme"
msgstr "Messaggio del sito"
-#: actions/designadminpanel.php:442
+#: actions/designadminpanel.php:400
#, fuzzy
msgid "Theme for the site."
msgstr "Sconnettiti dal sito"
-#: actions/designadminpanel.php:447
-msgid "Theme server"
-msgstr ""
-
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
-
-#: actions/designadminpanel.php:455
-msgid "Theme directory"
-msgstr ""
-
-#: actions/designadminpanel.php:462
-#, fuzzy
-msgid "Avatar Settings"
-msgstr "Impostazioni immagine"
-
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Avatar server"
-msgstr "Impostazioni immagine"
-
-#: actions/designadminpanel.php:471
-#, fuzzy
-msgid "Avatar path"
-msgstr "Immagine aggiornata."
-
-#: actions/designadminpanel.php:475
-#, fuzzy
-msgid "Avatar directory"
-msgstr "Immagine aggiornata."
-
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:422
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "Puoi caricare un'immagine per il logo del tuo gruppo."
-#: actions/designadminpanel.php:526 lib/designsettings.php:139
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:542 lib/designsettings.php:155
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:543 lib/designsettings.php:156
+#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:548 lib/designsettings.php:161
+#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:554
-msgid "Background server"
-msgstr ""
-
-#: actions/designadminpanel.php:558
-msgid "Background path"
-msgstr ""
-
-#: actions/designadminpanel.php:562
-msgid "Background directory"
-msgstr ""
-
-#: actions/designadminpanel.php:569 lib/designsettings.php:170
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Modifica la tua password"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Connetti"
-#: actions/designadminpanel.php:604 lib/designsettings.php:204
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Ricerca"
-#: actions/designadminpanel.php:617 lib/designsettings.php:217
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
msgstr "Testo"
-#: actions/designadminpanel.php:630 lib/designsettings.php:230
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Elenco"
-#: actions/designadminpanel.php:658 lib/designsettings.php:247
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:659 lib/designsettings.php:248
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:665 lib/designsettings.php:254
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 actions/useradminpanel.php:226
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: 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 "Salva"
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: actions/designadminpanel.php:582 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1169,37 +1106,37 @@ msgstr "Voglio inviare i messaggi via email"
msgid "Publish a MicroID for my email address."
msgstr "Pubblica un MicroID per il mio indirizzo email"
-#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/emailsettings.php:302 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
msgstr "Preferenze salvate."
-#: actions/emailsettings.php:319
+#: actions/emailsettings.php:320
msgid "No email address."
msgstr "Nessun indirizzo email."
-#: actions/emailsettings.php:326
+#: actions/emailsettings.php:327
msgid "Cannot normalize that email address"
msgstr "Impossibile normalizzare l'indirizzo email"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "Non è un indirizzo email valido"
-#: actions/emailsettings.php:333
+#: actions/emailsettings.php:334
msgid "That is already your email address."
msgstr "Quello è già il tuo indirizzo email."
-#: actions/emailsettings.php:336
+#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
msgstr "Quell'indirizzo email appartiene già a un altro utente."
-#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Impossibile inserire il codice di conferma."
-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1208,47 +1145,47 @@ msgstr ""
"Controlla la tua casella di posta (e anche la posta indesiderata!) per il "
"codice e le istruzioni su come usarlo."
-#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
msgstr "Nessuna conferma da annullare."
-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
msgstr "Quello è l'indirizzo di messaggistica sbagliato."
-#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
msgstr "Conferma annullata."
-#: actions/emailsettings.php:412
+#: actions/emailsettings.php:413
msgid "That is not your email address."
msgstr "Quello non è il tuo indirizzo email."
-#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
msgstr "L'indirizzo è stato rimosso."
-#: actions/emailsettings.php:445 actions/smssettings.php:518
+#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
msgstr "Nessun indirizzo email di ricezione."
-#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
msgid "Couldn't update user record."
msgstr "Impossibile aggiornare il record dell'utente."
-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
msgstr "Indirizzo email di ricezione rimosso."
-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555
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"
@@ -1518,7 +1455,7 @@ msgstr "Membri del gruppo %s, pagina %d"
msgid "A list of the users in this group."
msgstr "Un elenco degli utenti in questo gruppo."
-#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
msgid "Admin"
msgstr "Amministra"
@@ -1579,7 +1516,7 @@ msgid ""
msgstr ""
#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/subgroupnav.php:98
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Gruppi"
@@ -1799,7 +1736,7 @@ msgstr "Messaggio personale"
msgid "Optionally add a personal message to the invitation."
msgstr "Puoi aggiungere un messaggio personale agli inviti."
-#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
msgstr "Invia"
@@ -1923,7 +1860,7 @@ msgstr "Nome utente o password non corretto."
msgid "Error setting user. You are probably not authorized."
msgstr "Non autorizzato."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:457
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Accedi"
@@ -2036,7 +1973,7 @@ msgstr "Messaggio"
msgid "Direct message to %s sent"
msgstr "Messaggio diretto a %s inviato"
-#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
msgid "Ajax Error"
msgstr "Errore di Ajax"
@@ -2044,7 +1981,7 @@ msgstr "Errore di Ajax"
msgid "New notice"
msgstr "Nuovo messaggio"
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
msgid "Notice posted"
msgstr "Messaggio inviato"
@@ -2080,12 +2017,12 @@ msgid ""
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
-#: actions/noticesearchrss.php:89
+#: actions/noticesearchrss.php:96
#, fuzzy, php-format
msgid "Updates with \"%s\""
msgstr "Aggiornamenti da %1$s su %2$s!"
-#: actions/noticesearchrss.php:91
+#: actions/noticesearchrss.php:98
#, fuzzy, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
msgstr "Tutti gli aggiornamenti corrispondenti al termine di ricerca \"%s\""
@@ -2214,9 +2151,9 @@ msgstr "6 o più caratteri"
msgid "Confirm"
msgstr "Conferma"
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "stessa password di sopra"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Stessa password di sopra"
#: actions/passwordsettings.php:117
msgid "Change"
@@ -2246,6 +2183,114 @@ msgstr "Impossibile salvare la nuova password."
msgid "Password saved."
msgstr "Password salvata."
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr ""
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr ""
+
+#: actions/pathsadminpanel.php:140
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Questa pagina non è disponibile in un "
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+#, fuzzy
+msgid "Site"
+msgstr "Invita"
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+#, fuzzy
+msgid "Site path"
+msgstr "Messaggio del sito"
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr ""
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Avatars"
+msgstr "Immagine"
+
+#: actions/pathsadminpanel.php:252
+#, fuzzy
+msgid "Avatar server"
+msgstr "Impostazioni immagine"
+
+#: actions/pathsadminpanel.php:256
+#, fuzzy
+msgid "Avatar path"
+msgstr "Immagine aggiornata."
+
+#: actions/pathsadminpanel.php:260
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Immagine aggiornata."
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:297
+#, fuzzy
+msgid "Save paths"
+msgstr "Messaggio del sito"
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -2350,7 +2395,7 @@ msgid ""
msgstr ""
"Le tue etichette (lettere, numeri, -, . e _), separate da virgole o spazi"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr "Lingua"
@@ -2580,10 +2625,6 @@ msgstr "Azione sconosciuta"
msgid "6 or more characters, and don't forget it!"
msgstr "6 o più caratteri, e non dimenticarla!"
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Stessa password di sopra"
-
#: actions/recoverpassword.php:243
msgid "Reset"
msgstr "Reimposta"
@@ -2645,7 +2686,7 @@ msgstr "Errore con il codice di conferma."
msgid "Registration successful"
msgstr "Registrazione riuscita"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registra"
@@ -2690,7 +2731,7 @@ msgid "Same as password above. Required."
msgstr "Stessa password di sopra. Richiesta."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Email"
@@ -2798,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"
@@ -3139,11 +3180,6 @@ msgstr "Non puoi inviare un messaggio a questo utente."
msgid "User is already silenced."
msgstr "L'utente ti ha bloccato."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
-#, fuzzy
-msgid "Site"
-msgstr "Invita"
-
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
msgstr ""
@@ -3175,103 +3211,100 @@ msgid "Snapshot frequency must be a number."
msgstr ""
#: actions/siteadminpanel.php:199
-msgid "You must set an SSL sever when enabling SSL."
+msgid "You must set an SSL server when enabling SSL."
msgstr ""
#: actions/siteadminpanel.php:204
-msgid "Invalid SSL server. Max length is 255 characters."
+msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
#: actions/siteadminpanel.php:210
-msgid "Minimum text limit is 140c."
+msgid "Minimum text limit is 140 characters."
msgstr ""
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:224
-#, php-format
-msgid "Locales directory not readable: %s"
+#: actions/siteadminpanel.php:266
+msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:275
+#: actions/siteadminpanel.php:269
#, fuzzy
msgid "Site name"
msgstr "Messaggio del sito"
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:279
+#: actions/siteadminpanel.php:274
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:280
+#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:283
+#: actions/siteadminpanel.php:279
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:284
#, fuzzy
-msgid "contact email address for your site"
+msgid "Contact email address for your site"
msgstr "Nuovo indirizzo email per inviare messaggi a %s"
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:290
+#, fuzzy
+msgid "Local"
+msgstr "Viste locali"
+
+#: actions/siteadminpanel.php:301
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:303
+#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:308
#, fuzzy
msgid "Default site language"
msgstr "Lingua preferita"
#: actions/siteadminpanel.php:316
-msgid "Path to locales"
-msgstr ""
-
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
-msgstr ""
+#, fuzzy
+msgid "URLs"
+msgstr "URL"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
#, fuzzy
msgid "Server"
msgstr "Recupera"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
msgstr ""
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-#, fuzzy
-msgid "Site path"
-msgstr "Messaggio del sito"
-
-#: actions/siteadminpanel.php:328
+#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
msgstr ""
-#: actions/siteadminpanel.php:330
+#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
+#: actions/siteadminpanel.php:331
+#, fuzzy
+msgid "Access"
+msgstr "Accetta"
+
#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
@@ -3290,7 +3323,7 @@ msgstr "Invita"
msgid "Make registration invitation only."
msgstr ""
-#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#: actions/siteadminpanel.php:346
#, fuzzy
msgid "Closed"
msgstr "Blocca"
@@ -3299,33 +3332,37 @@ msgstr "Blocca"
msgid "Disable new registrations."
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
#, fuzzy
msgid "Never"
msgstr "Recupera"
-#: actions/siteadminpanel.php:357
+#: actions/siteadminpanel.php:360
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:358
+#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:364
+#: actions/siteadminpanel.php:366
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:365
-msgid "Snapshots will be sent once every N Web hits"
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
msgstr ""
#: actions/siteadminpanel.php:372
@@ -3336,48 +3373,57 @@ msgstr ""
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:381
+#: actions/siteadminpanel.php:380
+#, fuzzy
+msgid "SSL"
+msgstr "SMS"
+
+#: actions/siteadminpanel.php:384
#, fuzzy
msgid "Sometimes"
msgstr "Messaggi"
-#: actions/siteadminpanel.php:382
+#: actions/siteadminpanel.php:385
msgid "Always"
msgstr ""
-#: actions/siteadminpanel.php:384
+#: actions/siteadminpanel.php:387
msgid "Use SSL"
msgstr ""
-#: actions/siteadminpanel.php:385
+#: actions/siteadminpanel.php:388
msgid "When to use SSL"
msgstr ""
-#: actions/siteadminpanel.php:391
+#: actions/siteadminpanel.php:393
msgid "SSL Server"
msgstr ""
-#: actions/siteadminpanel.php:392
+#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr ""
+
+#: actions/siteadminpanel.php:403
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
#, fuzzy
msgid "Save site settings"
msgstr "Impostazioni immagine"
@@ -3687,7 +3733,8 @@ msgstr "Annullato abbonamento"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
-#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
msgid "User"
msgstr "Utente"
@@ -3695,17 +3742,89 @@ msgstr "Utente"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr ""
+
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:178
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr ""
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Profilo"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr ""
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
+msgstr ""
+
+#: actions/useradminpanel.php:231
#, fuzzy
-msgid "Invite-only"
-msgstr "Invita"
+msgid "New users"
+msgstr "Invita nuovi utenti"
+
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr ""
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr ""
+
+#: actions/useradminpanel.php:241
+#, fuzzy
+msgid "Default subscription"
+msgstr "Tutti gli abbonamenti"
+
+#: actions/useradminpanel.php:242
+#, fuzzy
+msgid "Automatically subscribe new users to this user."
+msgstr ""
+"Abbonami automaticamente a chi si abbona ai miei messaggi (utile per i non-"
+"umani)"
+
+#: actions/useradminpanel.php:251
+#, fuzzy
+msgid "Invitations"
+msgstr "Inviti inviati"
+
+#: actions/useradminpanel.php:256
+#, fuzzy
+msgid "Invitations enabled"
+msgstr "Inviti inviati"
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr ""
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr ""
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/userauthorization.php:105
@@ -3921,7 +4040,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"
@@ -3939,10 +4058,6 @@ msgstr "Impossibile impostare la membership al gruppo."
msgid "Welcome to %1$s, @%2$s!"
msgstr "Messaggio a %1$s su %2$s"
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr "Profilo"
-
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Modifica le impostazioni del tuo profilo"
@@ -3981,131 +4096,131 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "Pagina senza nome"
-#: lib/action.php:424
+#: lib/action.php:425
msgid "Primary site navigation"
msgstr "Esplorazione sito primaria"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Home"
msgstr "Home"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Personal profile and friends timeline"
msgstr "Profilo personale e attività degli amici"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Account"
msgstr "Account"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Change your email, avatar, password, profile"
msgstr "Modifica la tua email, immagine, password o il tuo profilo"
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect"
msgstr "Connetti"
-#: lib/action.php:435
+#: lib/action.php:436
#, fuzzy
msgid "Connect to services"
msgstr "Impossibile redirigere al server: %s"
-#: lib/action.php:439
+#: lib/action.php:440
#, fuzzy
msgid "Change site configuration"
msgstr "Esplorazione sito primaria"
-#: lib/action.php:443 lib/subgroupnav.php:105
+#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Invita"
-#: lib/action.php:444 lib/subgroupnav.php:106
+#: lib/action.php:445 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Invita amici e colleghi a seguirti su %s"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout"
msgstr "Esci"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout from the site"
msgstr "Sconnettiti dal sito"
-#: lib/action.php:454
+#: lib/action.php:455
msgid "Create an account"
msgstr "Crea un account"
-#: lib/action.php:457
+#: lib/action.php:458
msgid "Login to the site"
msgstr "Accedi al sito"
-#: lib/action.php:460 lib/action.php:723
+#: lib/action.php:461 lib/action.php:724
msgid "Help"
msgstr "Aiuto"
-#: lib/action.php:460
+#: lib/action.php:461
msgid "Help me!"
msgstr "Aiutami!"
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
msgstr "Ricerca"
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
msgstr "Ricerca persone o per testo"
-#: lib/action.php:484
+#: lib/action.php:485
msgid "Site notice"
msgstr "Messaggio del sito"
-#: lib/action.php:550
+#: lib/action.php:551
msgid "Local views"
msgstr "Viste locali"
-#: lib/action.php:616
+#: lib/action.php:617
msgid "Page notice"
msgstr "Pagina messaggio"
-#: lib/action.php:718
+#: lib/action.php:719
msgid "Secondary site navigation"
msgstr "Esplorazione secondaria del sito"
-#: lib/action.php:725
+#: lib/action.php:726
msgid "About"
msgstr "Informazioni"
-#: lib/action.php:727
+#: lib/action.php:728
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:731
+#: lib/action.php:732
msgid "TOS"
msgstr ""
-#: lib/action.php:734
+#: lib/action.php:735
msgid "Privacy"
msgstr "Privacy"
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
msgstr "Sorgenti"
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Contact"
msgstr "Contatti"
-#: lib/action.php:740
+#: lib/action.php:741
#, fuzzy
msgid "Badge"
msgstr "Richiama"
-#: lib/action.php:768
+#: lib/action.php:769
msgid "StatusNet software license"
msgstr "Licenza del software statusnet"
-#: lib/action.php:771
+#: lib/action.php:772
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4114,12 +4229,12 @@ msgstr ""
"**%%site.name%%** è un servizio di micro-blog offerto da [%%site.broughtby%%]"
"(%%site.broughtbyurl%%). "
-#: lib/action.php:773
+#: lib/action.php:774
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** è un servizio di micro-blog. "
-#: lib/action.php:775
+#: lib/action.php:776
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4130,32 +4245,32 @@ msgstr ""
"%s, disponibile sotto licenza [GNU Affero General Public License](http://www."
"fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:789
+#: lib/action.php:790
#, fuzzy
msgid "Site content license"
msgstr "Licenza del software statusnet"
-#: lib/action.php:798
+#: lib/action.php:799
msgid "All "
msgstr "Tutto "
-#: lib/action.php:803
+#: lib/action.php:804
msgid "license."
msgstr "licenza."
-#: lib/action.php:1067
+#: lib/action.php:1068
msgid "Pagination"
msgstr "Paginazione"
-#: lib/action.php:1076
+#: lib/action.php:1077
msgid "After"
msgstr "Successivi"
-#: lib/action.php:1084
+#: lib/action.php:1085
msgid "Before"
msgstr "Precedenti"
-#: lib/action.php:1132
+#: lib/action.php:1133
msgid "There was a problem with your session token."
msgstr "C'è stato un problema con il tuo token di sessione."
@@ -4189,6 +4304,11 @@ msgstr "Conferma indirizzo email"
msgid "Design configuration"
msgstr "Conferma SMS"
+#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+#, fuzzy
+msgid "Paths configuration"
+msgstr "Conferma SMS"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4363,11 +4483,10 @@ msgid "You are not subscribed to anyone."
msgstr "Non sei abbonato a quel profilo."
#: lib/command.php:620
-#, fuzzy
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
-msgstr[0] "Non sei abbonato a quel profilo."
-msgstr[1] "Non sei abbonato a quel profilo."
+msgstr[0] "Sei già abbonato a questi utenti:"
+msgstr[1] "Sei già abbonato a questi utenti:"
#: lib/command.php:640
#, fuzzy
@@ -4375,7 +4494,6 @@ msgid "No one is subscribed to you."
msgstr "Impossibile abbonare altri a te."
#: lib/command.php:642
-#, fuzzy
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Impossibile abbonare altri a te."
@@ -4387,7 +4505,6 @@ msgid "You are not a member of any groups."
msgstr "Non sei un membro di quel gruppo."
#: lib/command.php:664
-#, fuzzy
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."
@@ -4472,9 +4589,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: "
@@ -4569,7 +4687,7 @@ msgstr "Dove è situato il gruppo, tipo \"città, regione, stato\""
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
-#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85
msgid "Group"
msgstr "Gruppo"
@@ -4615,7 +4733,7 @@ msgstr "I gruppi con più messaggi"
msgid "Tags in %s group's notices"
msgstr "Etichette nei messaggi del gruppo %s"
-#: lib/htmloutputter.php:104
+#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
msgstr "Questa pagina non è disponibile in un tipo di supporto che tu accetti"
@@ -4648,6 +4766,14 @@ msgstr "Perso il nostro file."
msgid "Unknown file type"
msgstr "Tipo di file sconosciuto"
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
@@ -4679,7 +4805,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:424
+#: lib/mailbox.php:227 lib/noticelist.php:452
#, fuzzy
msgid "from"
msgstr " via "
@@ -4936,37 +5062,63 @@ msgstr "Invia un messaggio diretto"
msgid "To"
msgstr "A"
-#: lib/messageform.php:162 lib/noticeform.php:173
+#: lib/messageform.php:162 lib/noticeform.php:186
msgid "Available characters"
msgstr "Caratteri disponibili"
-#: lib/noticeform.php:145
+#: lib/noticeform.php:158
msgid "Send a notice"
msgstr "Invia un messaggio"
-#: lib/noticeform.php:158
+#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
msgstr "Cosa succede, %s?"
-#: lib/noticeform.php:180
+#: lib/noticeform.php:193
msgid "Attach"
msgstr ""
-#: lib/noticeform.php:184
+#: lib/noticeform.php:197
msgid "Attach a file"
msgstr ""
-#: lib/noticelist.php:478
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "No"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr ""
+
+#: lib/noticelist.php:506
#, fuzzy
msgid "in context"
msgstr "Nessun contenuto!"
-#: lib/noticelist.php:498
+#: lib/noticelist.php:526
msgid "Reply to this notice"
msgstr "Rispondi a questo messaggio"
-#: lib/noticelist.php:499
+#: lib/noticelist.php:527
msgid "Reply"
msgstr "Rispondi"
@@ -4999,12 +5151,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."
@@ -5114,6 +5266,10 @@ msgstr "Sblocca questo utente"
msgid "Search site"
msgstr "Ricerca"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
#, fuzzy
msgid "Search help"
@@ -5127,10 +5283,6 @@ msgstr "Persone"
msgid "Find people on this site"
msgstr "Ricerca persone in questo sito"
-#: lib/searchgroupnav.php:82
-msgid "Notice"
-msgstr "Messaggio"
-
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
msgstr "Ricerca contenuto dei messaggi"
@@ -5271,47 +5423,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"
@@ -5340,11 +5496,3 @@ msgstr "Quella non è la tua email di ricezione."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Email di ricezione non consentita."
-
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "Sblocca questo utente"
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "Persone abbonate a %s"
diff --git a/locale/ja/LC_MESSAGES/statusnet.mo b/locale/ja/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index eeceb93e6..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 54362b777..987282282 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,22 +9,21 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 10:43+0000\n"
-"PO-Revision-Date: 2009-11-18 19:32:07+0000\n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-11-28 19:50:28+0000\n"
"Language-Team: Japanese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ja\n"
"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
-#, fuzzy
msgid "No such page"
-msgstr "そのような通知はありません。"
+msgstr "そのようなページはありません。"
#: actions/all.php:74 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
@@ -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
@@ -444,7 +449,7 @@ msgstr "長すぎます。通知は最大 140 字までです。"
msgid "Not found"
msgstr ""
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -560,7 +565,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
+#: lib/noticelist.php:550
msgid "Delete"
msgstr "削除"
@@ -573,7 +578,7 @@ msgid "Crop"
msgstr ""
#: actions/avatarsettings.php:265 actions/disfavor.php:74
-#: actions/emailsettings.php:237 actions/favor.php:75
+#: 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
@@ -588,7 +593,7 @@ msgid "There was a problem with your session token. Try again, please."
msgstr ""
#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
-#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: 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."
@@ -723,15 +728,15 @@ msgstr "不明なアドレスタイプ %s"
msgid "That address has already been confirmed."
msgstr "そのアドレスは既に承認されています。"
-#: actions/confirmaddress.php:114 actions/emailsettings.php:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
#: actions/profilesettings.php:276 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "ユーザを更新できません"
-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
msgstr "メール承認を削除できません"
@@ -751,7 +756,7 @@ msgid "Conversation"
msgstr "確認コード"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206
+#: lib/profileaction.php:206 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "通知"
@@ -791,7 +796,7 @@ msgstr "本当にこの通知を削除しますか?"
msgid "Do not delete this notice"
msgstr "この通知を削除できません。"
-#: actions/deletenotice.php:146 lib/noticelist.php:522
+#: actions/deletenotice.php:146 lib/noticelist.php:550
msgid "Delete this notice"
msgstr "この通知を削除"
@@ -834,182 +839,119 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:278
+#: actions/designadminpanel.php:270
#, fuzzy
msgid "Invalid logo URL."
msgstr "不正なサイズ。"
-#: actions/designadminpanel.php:282
+#: actions/designadminpanel.php:274
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "このページはあなたが承認したメディアタイプでは利用できません。"
-#: actions/designadminpanel.php:288
-#, fuzzy, php-format
-msgid "Theme directory not readable: %s"
-msgstr "このページはあなたが承認したメディアタイプでは利用できません。"
-
-#: actions/designadminpanel.php:292
-#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:296
-#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:312
-#, php-format
-msgid "Max length for %s %s is 255 characters."
-msgstr ""
-
-#: actions/designadminpanel.php:412
+#: actions/designadminpanel.php:370
#, fuzzy
msgid "Change logo"
msgstr "パスワードの変更"
-#: actions/designadminpanel.php:417
+#: actions/designadminpanel.php:375
#, fuzzy
msgid "Site logo"
msgstr "新しい通知"
-#: actions/designadminpanel.php:424
+#: actions/designadminpanel.php:382
#, fuzzy
msgid "Change theme"
msgstr "変更"
-#: actions/designadminpanel.php:441
+#: actions/designadminpanel.php:399
#, fuzzy
msgid "Site theme"
msgstr "新しい通知"
-#: actions/designadminpanel.php:442
+#: actions/designadminpanel.php:400
#, fuzzy
msgid "Theme for the site."
msgstr "サイトからログアウト"
-#: actions/designadminpanel.php:447
-msgid "Theme server"
-msgstr ""
-
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
-
-#: actions/designadminpanel.php:455
-msgid "Theme directory"
-msgstr ""
-
-#: actions/designadminpanel.php:462
-#, fuzzy
-msgid "Avatar Settings"
-msgstr "設定"
-
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Avatar server"
-msgstr "設定"
-
-#: actions/designadminpanel.php:471
-#, fuzzy
-msgid "Avatar path"
-msgstr "アバターが更新されました。"
-
-#: actions/designadminpanel.php:475
-#, fuzzy
-msgid "Avatar directory"
-msgstr "アバターが更新されました。"
-
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:422
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "長すぎます。通知は最大 140 字までです。"
-#: actions/designadminpanel.php:526 lib/designsettings.php:139
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:542 lib/designsettings.php:155
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:543 lib/designsettings.php:156
+#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:548 lib/designsettings.php:161
+#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:554
-msgid "Background server"
-msgstr ""
-
-#: actions/designadminpanel.php:558
-msgid "Background path"
-msgstr ""
-
-#: actions/designadminpanel.php:562
-msgid "Background directory"
-msgstr ""
-
-#: actions/designadminpanel.php:569 lib/designsettings.php:170
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "パスワードの変更"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
msgid "Content"
msgstr "内容"
-#: actions/designadminpanel.php:604 lib/designsettings.php:204
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "検索"
-#: actions/designadminpanel.php:617 lib/designsettings.php:217
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
msgstr ""
-#: actions/designadminpanel.php:630 lib/designsettings.php:230
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "ログイン"
-#: actions/designadminpanel.php:658 lib/designsettings.php:247
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:659 lib/designsettings.php:248
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:665 lib/designsettings.php:254
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 actions/useradminpanel.php:226
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/pathsadminpanel.php:296 actions/profilesettings.php:167
+#: actions/siteadminpanel.php:421 actions/smssettings.php:181
+#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/useradminpanel.php:313 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "保存"
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: actions/designadminpanel.php:582 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1162,37 +1104,37 @@ msgstr ""
msgid "Publish a MicroID for my email address."
msgstr ""
-#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/emailsettings.php:302 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
msgstr "設定が保存されました。"
-#: actions/emailsettings.php:319
+#: actions/emailsettings.php:320
msgid "No email address."
msgstr ""
-#: actions/emailsettings.php:326
+#: actions/emailsettings.php:327
msgid "Cannot normalize that email address"
msgstr "そのメールアドレスを正規化できません"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr ""
-#: actions/emailsettings.php:333
+#: actions/emailsettings.php:334
msgid "That is already your email address."
msgstr ""
-#: actions/emailsettings.php:336
+#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
msgstr ""
-#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "確認コードを追加できません"
-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1201,47 +1143,47 @@ msgstr ""
"パムボックス)にコードとそれをどう使うのかという指示が届いていないか確認して"
"ください。"
-#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
msgstr "認証待ちのものはありません。"
-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
msgstr "その IM アドレスは不正です。"
-#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
msgstr "確認作業が中止されました。"
-#: actions/emailsettings.php:412
+#: actions/emailsettings.php:413
msgid "That is not your email address."
msgstr ""
-#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
msgstr "アドレスは削除されました。"
-#: actions/emailsettings.php:445 actions/smssettings.php:518
+#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
msgstr ""
-#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
msgid "Couldn't update user record."
msgstr ""
-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
msgstr ""
-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555
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"
@@ -1509,7 +1451,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
msgid "Admin"
msgstr "管理者"
@@ -1569,7 +1511,7 @@ msgid ""
msgstr ""
#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/subgroupnav.php:98
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1780,7 +1722,7 @@ msgstr ""
msgid "Optionally add a personal message to the invitation."
msgstr ""
-#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
msgstr "送る"
@@ -1906,7 +1848,7 @@ msgstr "ユーザ名またはパスワードが間違っています。"
msgid "Error setting user. You are probably not authorized."
msgstr "認証されていません。"
-#: actions/login.php:204 actions/login.php:257 lib/action.php:457
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "ログイン"
@@ -2015,7 +1957,7 @@ msgstr ""
msgid "Direct message to %s sent"
msgstr ""
-#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
msgid "Ajax Error"
msgstr ""
@@ -2023,7 +1965,7 @@ msgstr ""
msgid "New notice"
msgstr "新しい通知"
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
#, fuzzy
msgid "Notice posted"
msgstr "通知"
@@ -2058,12 +2000,12 @@ msgid ""
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
-#: actions/noticesearchrss.php:89
+#: actions/noticesearchrss.php:96
#, fuzzy, php-format
msgid "Updates with \"%s\""
msgstr "マイクロブログ by %s"
-#: actions/noticesearchrss.php:91
+#: actions/noticesearchrss.php:98
#, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
msgstr "検索語「%s」に一致するすべての更新"
@@ -2191,9 +2133,9 @@ msgstr "6文字以上"
msgid "Confirm"
msgstr "確認"
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "上のパスワードと同じ"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "上と同じパスワード"
#: actions/passwordsettings.php:117
msgid "Change"
@@ -2223,6 +2165,113 @@ msgstr "新しいパスワードを保存できません。"
msgid "Password saved."
msgstr "パスワードが保存されました。"
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr ""
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr ""
+
+#: actions/pathsadminpanel.php:140
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "このページはあなたが承認したメディアタイプでは利用できません。"
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+msgid "Site"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+#, fuzzy
+msgid "Site path"
+msgstr "新しい通知"
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr ""
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Avatars"
+msgstr "アバター"
+
+#: actions/pathsadminpanel.php:252
+#, fuzzy
+msgid "Avatar server"
+msgstr "設定"
+
+#: actions/pathsadminpanel.php:256
+#, fuzzy
+msgid "Avatar path"
+msgstr "アバターが更新されました。"
+
+#: actions/pathsadminpanel.php:260
+#, fuzzy
+msgid "Avatar directory"
+msgstr "アバターが更新されました。"
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:297
+#, fuzzy
+msgid "Save paths"
+msgstr "新しい通知"
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -2325,7 +2374,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr ""
@@ -2552,10 +2601,6 @@ msgstr ""
msgid "6 or more characters, and don't forget it!"
msgstr "6文字以上。忘れないでください!"
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "上と同じパスワード"
-
#: actions/recoverpassword.php:243
msgid "Reset"
msgstr "リセット"
@@ -2615,7 +2660,7 @@ msgstr "確認コードにエラーがあります。"
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "登録"
@@ -2660,7 +2705,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "メール"
@@ -2766,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 "購読"
@@ -3104,10 +3149,6 @@ msgstr ""
msgid "User is already silenced."
msgstr "プロファイルがありません。"
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
-msgid "Site"
-msgstr ""
-
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
msgstr ""
@@ -3139,102 +3180,98 @@ msgid "Snapshot frequency must be a number."
msgstr ""
#: actions/siteadminpanel.php:199
-msgid "You must set an SSL sever when enabling SSL."
+msgid "You must set an SSL server when enabling SSL."
msgstr ""
#: actions/siteadminpanel.php:204
-msgid "Invalid SSL server. Max length is 255 characters."
+msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
#: actions/siteadminpanel.php:210
-msgid "Minimum text limit is 140c."
+msgid "Minimum text limit is 140 characters."
msgstr ""
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:224
-#, php-format
-msgid "Locales directory not readable: %s"
+#: actions/siteadminpanel.php:266
+msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:275
+#: actions/siteadminpanel.php:269
#, fuzzy
msgid "Site name"
msgstr "新しい通知"
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:279
+#: actions/siteadminpanel.php:274
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:280
+#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:283
+#: actions/siteadminpanel.php:279
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:284
#, fuzzy
-msgid "contact email address for your site"
+msgid "Contact email address for your site"
msgstr "そのユーザにはメールアドレスの登録がありません。"
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:290
+#, fuzzy
+msgid "Local"
+msgstr "場所"
+
+#: actions/siteadminpanel.php:301
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:303
+#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:308
msgid "Default site language"
msgstr ""
#: actions/siteadminpanel.php:316
-msgid "Path to locales"
+msgid "URLs"
msgstr ""
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
-msgstr ""
-
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
#, fuzzy
msgid "Server"
msgstr "回復"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
msgstr ""
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-#, fuzzy
-msgid "Site path"
-msgstr "新しい通知"
-
-#: actions/siteadminpanel.php:328
+#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
msgstr ""
-#: actions/siteadminpanel.php:330
+#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
+#: actions/siteadminpanel.php:331
+#, fuzzy
+msgid "Access"
+msgstr "承認"
+
#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
@@ -3252,7 +3289,7 @@ msgstr ""
msgid "Make registration invitation only."
msgstr ""
-#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#: actions/siteadminpanel.php:346
#, fuzzy
msgid "Closed"
msgstr "ブロック"
@@ -3261,33 +3298,37 @@ msgstr "ブロック"
msgid "Disable new registrations."
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
#, fuzzy
msgid "Never"
msgstr "回復"
-#: actions/siteadminpanel.php:357
+#: actions/siteadminpanel.php:360
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:358
+#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:364
+#: actions/siteadminpanel.php:366
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:365
-msgid "Snapshots will be sent once every N Web hits"
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
msgstr ""
#: actions/siteadminpanel.php:372
@@ -3298,48 +3339,56 @@ msgstr ""
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:381
+#: actions/siteadminpanel.php:380
+msgid "SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
#, fuzzy
msgid "Sometimes"
msgstr "通知"
-#: actions/siteadminpanel.php:382
+#: actions/siteadminpanel.php:385
msgid "Always"
msgstr ""
-#: actions/siteadminpanel.php:384
+#: actions/siteadminpanel.php:387
msgid "Use SSL"
msgstr ""
-#: actions/siteadminpanel.php:385
+#: actions/siteadminpanel.php:388
msgid "When to use SSL"
msgstr ""
-#: actions/siteadminpanel.php:391
+#: actions/siteadminpanel.php:393
msgid "SSL Server"
msgstr ""
-#: actions/siteadminpanel.php:392
+#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr ""
+
+#: actions/siteadminpanel.php:403
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
#, fuzzy
msgid "Save site settings"
msgstr "設定"
@@ -3647,7 +3696,8 @@ msgstr "サブスクライブ解除済み"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
-#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
msgid "User"
msgstr ""
@@ -3655,16 +3705,86 @@ msgstr ""
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr ""
+
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
+msgstr ""
+
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr ""
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "プロファイル"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr ""
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:178
-msgid "Invite-only"
+#: actions/useradminpanel.php:231
+#, fuzzy
+msgid "New users"
+msgstr "削除"
+
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr ""
+
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
msgstr ""
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: actions/useradminpanel.php:241
+#, fuzzy
+msgid "Default subscription"
+msgstr "すべての購読"
+
+#: actions/useradminpanel.php:242
+#, fuzzy
+msgid "Automatically subscribe new users to this user."
+msgstr "自分を購読している者を自動的に購読する (非人間に最適)"
+
+#: actions/useradminpanel.php:251
+#, fuzzy
+msgid "Invitations"
+msgstr "確認コード"
+
+#: actions/useradminpanel.php:256
+msgid "Invitations enabled"
+msgstr ""
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr ""
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr ""
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/userauthorization.php:105
@@ -3868,7 +3988,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"
@@ -3888,10 +4008,6 @@ msgstr "サブスクリプションを作成できません"
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr "プロファイル"
-
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "プロファイル設定の変更"
@@ -3930,134 +4046,134 @@ msgstr ""
msgid "Untitled page"
msgstr "名称未設定ページ"
-#: lib/action.php:424
+#: lib/action.php:425
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Home"
msgstr "ホーム"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Account"
msgstr "アカウント"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Change your email, avatar, password, profile"
msgstr "メールアドレス、アバター、パスワード、プロパティの変更"
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect"
msgstr "接続"
-#: lib/action.php:435
+#: lib/action.php:436
#, fuzzy
msgid "Connect to services"
msgstr "サーバへリダイレクトできません : %s"
-#: lib/action.php:439
+#: lib/action.php:440
#, fuzzy
msgid "Change site configuration"
msgstr "サブスクリプション"
-#: lib/action.php:443 lib/subgroupnav.php:105
+#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:444 lib/subgroupnav.php:106
+#: lib/action.php:445 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout"
msgstr "ログアウト"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout from the site"
msgstr "サイトからログアウト"
-#: lib/action.php:454
+#: lib/action.php:455
msgid "Create an account"
msgstr "アカウントを作成"
-#: lib/action.php:457
+#: lib/action.php:458
msgid "Login to the site"
msgstr "サイトへログイン"
-#: lib/action.php:460 lib/action.php:723
+#: lib/action.php:461 lib/action.php:724
msgid "Help"
msgstr "ヘルプ"
-#: lib/action.php:460
+#: lib/action.php:461
msgid "Help me!"
msgstr "助けて!"
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
msgstr "検索"
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
msgstr "人々かテキストを検索"
-#: lib/action.php:484
+#: lib/action.php:485
#, fuzzy
msgid "Site notice"
msgstr "新しい通知"
-#: lib/action.php:550
+#: lib/action.php:551
msgid "Local views"
msgstr ""
-#: lib/action.php:616
+#: lib/action.php:617
#, fuzzy
msgid "Page notice"
msgstr "新しい通知"
-#: lib/action.php:718
+#: lib/action.php:719
#, fuzzy
msgid "Secondary site navigation"
msgstr "サブスクリプション"
-#: lib/action.php:725
+#: lib/action.php:726
msgid "About"
msgstr "解説"
-#: lib/action.php:727
+#: lib/action.php:728
msgid "FAQ"
msgstr "よくある質問"
-#: lib/action.php:731
+#: lib/action.php:732
msgid "TOS"
msgstr ""
-#: lib/action.php:734
+#: lib/action.php:735
msgid "Privacy"
msgstr "プライバシー"
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
msgstr "ソース"
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Contact"
msgstr "連絡先"
-#: lib/action.php:740
+#: lib/action.php:741
#, fuzzy
msgid "Badge"
msgstr "突く"
-#: lib/action.php:768
+#: lib/action.php:769
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:771
+#: lib/action.php:772
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4066,12 +4182,12 @@ msgstr ""
"**%%site.name%%** は [%%site.broughtby%%](%%site.broughtbyurl%%) が提供するマ"
"イクロブログサービスです。 "
-#: lib/action.php:773
+#: lib/action.php:774
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** はマイクロブログサービスです。 "
-#: lib/action.php:775
+#: lib/action.php:776
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4082,34 +4198,34 @@ msgstr ""
"いています。 ライセンス [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)。"
-#: lib/action.php:789
+#: lib/action.php:790
#, fuzzy
msgid "Site content license"
msgstr "新しい通知"
-#: lib/action.php:798
+#: lib/action.php:799
msgid "All "
msgstr ""
-#: lib/action.php:803
+#: lib/action.php:804
msgid "license."
msgstr "ライセンス。"
-#: lib/action.php:1067
+#: lib/action.php:1068
msgid "Pagination"
msgstr ""
-#: lib/action.php:1076
+#: lib/action.php:1077
#, fuzzy
msgid "After"
msgstr "<< 前"
-#: lib/action.php:1084
+#: lib/action.php:1085
#, fuzzy
msgid "Before"
msgstr "前 >>"
-#: lib/action.php:1132
+#: lib/action.php:1133
msgid "There was a problem with your session token."
msgstr ""
@@ -4139,6 +4255,11 @@ msgstr "メールアドレス確認"
msgid "Design configuration"
msgstr "メールアドレス確認"
+#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+#, fuzzy
+msgid "Paths configuration"
+msgstr "メールアドレス確認"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4313,11 +4434,9 @@ msgid "You are not subscribed to anyone."
msgstr "そのプロファイルは送信されていません。"
#: lib/command.php:620
-#, fuzzy
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "そのプロファイルは送信されていません。"
-msgstr[1] "そのプロファイルは送信されていません。"
#: lib/command.php:640
#, fuzzy
@@ -4325,11 +4444,9 @@ msgid "No one is subscribed to you."
msgstr "リモートサブスクライブ"
#: lib/command.php:642
-#, fuzzy
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "リモートサブスクライブ"
-msgstr[1] "リモートサブスクライブ"
#: lib/command.php:662
#, fuzzy
@@ -4337,11 +4454,9 @@ msgid "You are not a member of any groups."
msgstr "そのプロファイルは送信されていません。"
#: lib/command.php:664
-#, fuzzy
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
msgid ""
@@ -4422,9 +4537,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: "
@@ -4519,7 +4635,7 @@ msgstr "いる場所, 例えば \"City, State (or Region), Country\""
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
-#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85
msgid "Group"
msgstr "グループ"
@@ -4565,7 +4681,7 @@ msgstr "投稿が多いグループ"
msgid "Tags in %s group's notices"
msgstr "%s グループの通知にあるタグ"
-#: lib/htmloutputter.php:104
+#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
msgstr "このページはあなたが承認したメディアタイプでは利用できません。"
@@ -4599,6 +4715,14 @@ msgstr "そのような通知はありません。"
msgid "Unknown file type"
msgstr ""
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
@@ -4630,7 +4754,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:424
+#: lib/mailbox.php:227 lib/noticelist.php:452
msgid "from"
msgstr "から "
@@ -4877,37 +5001,62 @@ msgstr "直接通知を送る"
msgid "To"
msgstr ""
-#: lib/messageform.php:162 lib/noticeform.php:173
+#: lib/messageform.php:162 lib/noticeform.php:186
msgid "Available characters"
msgstr "利用可能な文字"
-#: lib/noticeform.php:145
+#: lib/noticeform.php:158
msgid "Send a notice"
msgstr "通知を送る"
-#: lib/noticeform.php:158
+#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
msgstr "最近どう %s?"
-#: lib/noticeform.php:180
+#: lib/noticeform.php:193
msgid "Attach"
msgstr ""
-#: lib/noticeform.php:184
+#: lib/noticeform.php:197
msgid "Attach a file"
msgstr ""
-#: lib/noticelist.php:478
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "N"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr ""
+
+#: lib/noticelist.php:506
#, fuzzy
msgid "in context"
msgstr "コンテンツがありません!"
-#: lib/noticelist.php:498
+#: lib/noticelist.php:526
msgid "Reply to this notice"
msgstr "この通知へ返信"
-#: lib/noticelist.php:499
+#: lib/noticelist.php:527
msgid "Reply"
msgstr "返信"
@@ -4940,11 +5089,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 "サブスクリプションを追加できません"
@@ -5053,6 +5202,10 @@ msgstr "このユーザをアンブロックする"
msgid "Search site"
msgstr "検索"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
#, fuzzy
msgid "Search help"
@@ -5066,10 +5219,6 @@ msgstr ""
msgid "Find people on this site"
msgstr ""
-#: lib/searchgroupnav.php:82
-msgid "Notice"
-msgstr "通知"
-
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
msgstr ""
@@ -5211,47 +5360,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 年前"
@@ -5280,11 +5433,3 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
-
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "このユーザをアンブロックする"
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "リモートサブスクライブ"
diff --git a/locale/ko/LC_MESSAGES/statusnet.mo b/locale/ko/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 19e0ecb93..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 767c4e75f..ed757fbc5 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 10:43+0000\n"
-"PO-Revision-Date: 2009-11-18 19:32:10+0000\n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-11-28 19:50:31+0000\n"
"Language-Team: Korean\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ko\n"
"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
@@ -445,7 +445,7 @@ msgstr "너무 깁니다. 통지의 최대 길이는 140글자 입니다."
msgid "Not found"
msgstr "찾지 못함"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -560,7 +560,7 @@ msgid "Preview"
msgstr "미리보기"
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
+#: lib/noticelist.php:550
msgid "Delete"
msgstr "삭제"
@@ -573,7 +573,7 @@ msgid "Crop"
msgstr "자르기"
#: actions/avatarsettings.php:265 actions/disfavor.php:74
-#: actions/emailsettings.php:237 actions/favor.php:75
+#: 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
@@ -588,7 +588,7 @@ msgid "There was a problem with your session token. Try again, please."
msgstr "세션토큰에 문제가 있습니다. 다시 시도해주세요."
#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
-#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: 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."
@@ -722,15 +722,15 @@ msgstr "인식되지않은 주소유형 %s"
msgid "That address has already been confirmed."
msgstr "그 주소는 이미 승인되었습니다."
-#: actions/confirmaddress.php:114 actions/emailsettings.php:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
#: actions/profilesettings.php:276 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "사용자를 업데이트 할 수 없습니다."
-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
msgstr "이메일 승인을 삭제 할 수 없습니다."
@@ -750,7 +750,7 @@ msgid "Conversation"
msgstr "인증 코드"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206
+#: lib/profileaction.php:206 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "통지"
@@ -792,7 +792,7 @@ msgstr "정말로 통지를 삭제하시겠습니까?"
msgid "Do not delete this notice"
msgstr "이 통지를 지울 수 없습니다."
-#: actions/deletenotice.php:146 lib/noticelist.php:522
+#: actions/deletenotice.php:146 lib/noticelist.php:550
msgid "Delete this notice"
msgstr "이 게시글 삭제하기"
@@ -836,183 +836,120 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:278
+#: actions/designadminpanel.php:270
#, fuzzy
msgid "Invalid logo URL."
msgstr "옳지 않은 크기"
-#: actions/designadminpanel.php:282
+#: actions/designadminpanel.php:274
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다."
-#: actions/designadminpanel.php:288
-#, fuzzy, php-format
-msgid "Theme directory not readable: %s"
-msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다."
-
-#: actions/designadminpanel.php:292
-#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:296
-#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:312
-#, php-format
-msgid "Max length for %s %s is 255 characters."
-msgstr ""
-
-#: actions/designadminpanel.php:412
+#: actions/designadminpanel.php:370
#, fuzzy
msgid "Change logo"
msgstr "비밀번호 바꾸기"
-#: actions/designadminpanel.php:417
+#: actions/designadminpanel.php:375
#, fuzzy
msgid "Site logo"
msgstr "초대"
-#: actions/designadminpanel.php:424
+#: actions/designadminpanel.php:382
#, fuzzy
msgid "Change theme"
msgstr "변환"
-#: actions/designadminpanel.php:441
+#: actions/designadminpanel.php:399
#, fuzzy
msgid "Site theme"
msgstr "사이트 공지"
-#: actions/designadminpanel.php:442
+#: actions/designadminpanel.php:400
#, fuzzy
msgid "Theme for the site."
msgstr "이 사이트로부터 로그아웃"
-#: actions/designadminpanel.php:447
-msgid "Theme server"
-msgstr ""
-
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
-
-#: actions/designadminpanel.php:455
-msgid "Theme directory"
-msgstr ""
-
-#: actions/designadminpanel.php:462
-#, fuzzy
-msgid "Avatar Settings"
-msgstr "아바타 설정"
-
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Avatar server"
-msgstr "아바타 설정"
-
-#: actions/designadminpanel.php:471
-#, fuzzy
-msgid "Avatar path"
-msgstr "아바타가 업데이트 되었습니다."
-
-#: actions/designadminpanel.php:475
-#, fuzzy
-msgid "Avatar directory"
-msgstr "아바타가 업데이트 되었습니다."
-
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:422
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "당신그룹의 로고 이미지를 업로드할 수 있습니다."
-#: actions/designadminpanel.php:526 lib/designsettings.php:139
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:542 lib/designsettings.php:155
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:543 lib/designsettings.php:156
+#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:548 lib/designsettings.php:161
+#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:554
-msgid "Background server"
-msgstr ""
-
-#: actions/designadminpanel.php:558
-msgid "Background path"
-msgstr ""
-
-#: actions/designadminpanel.php:562
-msgid "Background directory"
-msgstr ""
-
-#: actions/designadminpanel.php:569 lib/designsettings.php:170
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "비밀번호 바꾸기"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "연결"
-#: actions/designadminpanel.php:604 lib/designsettings.php:204
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "검색"
-#: actions/designadminpanel.php:617 lib/designsettings.php:217
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
msgstr "문자"
-#: actions/designadminpanel.php:630 lib/designsettings.php:230
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "로그인"
-#: actions/designadminpanel.php:658 lib/designsettings.php:247
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:659 lib/designsettings.php:248
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:665 lib/designsettings.php:254
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 actions/useradminpanel.php:226
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/pathsadminpanel.php:296 actions/profilesettings.php:167
+#: actions/siteadminpanel.php:421 actions/smssettings.php:181
+#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/useradminpanel.php:313 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "저장"
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: actions/designadminpanel.php:582 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1164,37 +1101,37 @@ msgstr "이메일로 통보를 포스트 하길 원합니다."
msgid "Publish a MicroID for my email address."
msgstr "이메일 주소를 위한 MicroID의 생성"
-#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/emailsettings.php:302 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
msgstr "설정이 저장되었습니다."
-#: actions/emailsettings.php:319
+#: actions/emailsettings.php:320
msgid "No email address."
msgstr "이메일이 추가 되지 않았습니다."
-#: actions/emailsettings.php:326
+#: actions/emailsettings.php:327
msgid "Cannot normalize that email address"
msgstr "그 이메일 주소를 정규화 할 수 없습니다."
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "유효한 이메일 주소가 아닙니다."
-#: actions/emailsettings.php:333
+#: actions/emailsettings.php:334
msgid "That is already your email address."
msgstr "그 이메일 주소는 이미 귀하의 것입니다."
-#: actions/emailsettings.php:336
+#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
msgstr "그 이메일 주소는 이미 다른 사용자의 소유입니다."
-#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "확인 코드를 추가 할 수 없습니다."
-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1202,47 +1139,47 @@ msgstr ""
"추가한 이메일로 인증 코드를 보냈습니다. 수신함(또는 스팸함)을 확인하셔서 코드"
"와 사용법을 확인하여 주시기 바랍니다."
-#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
msgstr "취소 할 대기중인 인증이 없습니다."
-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
msgstr "옳지 않은 메신저 계정 입니다."
-#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
msgstr "인증 취소"
-#: actions/emailsettings.php:412
+#: actions/emailsettings.php:413
msgid "That is not your email address."
msgstr "그 이메일 주소는 귀하의 것이 아닙니다."
-#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
msgstr "주소가 삭제되었습니다."
-#: actions/emailsettings.php:445 actions/smssettings.php:518
+#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
msgstr "이메일 주소가 없습니다."
-#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
msgid "Couldn't update user record."
msgstr "사용자 기록을 업데이트 할 수 없습니다."
-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
msgstr "받은 이메일 계정 삭제"
-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555
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 "인기있는 게시글"
@@ -1511,7 +1448,7 @@ msgstr "%s 그룹 회원, %d페이지"
msgid "A list of the users in this group."
msgstr "이 그룹의 회원리스트"
-#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
msgid "Admin"
msgstr "관리자"
@@ -1572,7 +1509,7 @@ msgid ""
msgstr ""
#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/subgroupnav.php:98
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "그룹"
@@ -1785,7 +1722,7 @@ msgstr "개인적인 메시지"
msgid "Optionally add a personal message to the invitation."
msgstr "초대장에 메시지 첨부하기."
-#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
msgstr "보내기"
@@ -1904,7 +1841,7 @@ msgstr "틀린 계정 또는 비밀 번호"
msgid "Error setting user. You are probably not authorized."
msgstr "인증이 되지 않았습니다."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:457
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "로그인"
@@ -2017,7 +1954,7 @@ msgstr "메시지"
msgid "Direct message to %s sent"
msgstr "%s에게 보낸 직접 메시지"
-#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
msgid "Ajax Error"
msgstr "Ajax 에러입니다."
@@ -2025,7 +1962,7 @@ msgstr "Ajax 에러입니다."
msgid "New notice"
msgstr "새로운 통지"
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
msgid "Notice posted"
msgstr "게시글이 등록되었습니다."
@@ -2061,12 +1998,12 @@ msgid ""
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
-#: actions/noticesearchrss.php:89
+#: actions/noticesearchrss.php:96
#, fuzzy, php-format
msgid "Updates with \"%s\""
msgstr "%2$s에 있는 %1$s의 업데이트!"
-#: actions/noticesearchrss.php:91
+#: actions/noticesearchrss.php:98
#, fuzzy, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
msgstr "\"%s\" 에 일치하는 모든 업데이트"
@@ -2192,9 +2129,9 @@ msgstr "6글자 이상"
msgid "Confirm"
msgstr "인증"
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "위 비밀번호와 동일하게"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "위와 같은 비밀 번호"
#: actions/passwordsettings.php:117
msgid "Change"
@@ -2224,6 +2161,114 @@ msgstr "새 비밀번호를 저장 할 수 없습니다."
msgid "Password saved."
msgstr "비밀 번호 저장"
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr ""
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr ""
+
+#: actions/pathsadminpanel.php:140
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다."
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+#, fuzzy
+msgid "Site"
+msgstr "초대"
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+#, fuzzy
+msgid "Site path"
+msgstr "사이트 공지"
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr ""
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Avatars"
+msgstr "아바타"
+
+#: actions/pathsadminpanel.php:252
+#, fuzzy
+msgid "Avatar server"
+msgstr "아바타 설정"
+
+#: actions/pathsadminpanel.php:256
+#, fuzzy
+msgid "Avatar path"
+msgstr "아바타가 업데이트 되었습니다."
+
+#: actions/pathsadminpanel.php:260
+#, fuzzy
+msgid "Avatar directory"
+msgstr "아바타가 업데이트 되었습니다."
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:297
+#, fuzzy
+msgid "Save paths"
+msgstr "사이트 공지"
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -2326,7 +2371,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr "당신을 위한 태그, (문자,숫자,-, ., _로 구성) 콤마 혹은 공백으로 구분."
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr "언어"
@@ -2553,10 +2598,6 @@ msgstr "알려지지 않은 행동"
msgid "6 or more characters, and don't forget it!"
msgstr "6글자 이상, 잊어 버리지 마십시오!"
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "위와 같은 비밀 번호"
-
#: actions/recoverpassword.php:243
msgid "Reset"
msgstr "초기화"
@@ -2617,7 +2658,7 @@ msgstr "확인 코드 오류"
msgid "Registration successful"
msgstr "회원 가입이 성공적입니다."
-#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "회원가입"
@@ -2663,7 +2704,7 @@ msgid "Same as password above. Required."
msgstr "위와 같은 비밀 번호. 필수 사항."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "이메일"
@@ -2768,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 "구독"
@@ -3109,11 +3150,6 @@ msgstr "당신은 이 사용자에게 메시지를 보낼 수 없습니다."
msgid "User is already silenced."
msgstr "회원이 당신을 차단해왔습니다."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
-#, fuzzy
-msgid "Site"
-msgstr "초대"
-
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
msgstr ""
@@ -3145,103 +3181,100 @@ msgid "Snapshot frequency must be a number."
msgstr ""
#: actions/siteadminpanel.php:199
-msgid "You must set an SSL sever when enabling SSL."
+msgid "You must set an SSL server when enabling SSL."
msgstr ""
#: actions/siteadminpanel.php:204
-msgid "Invalid SSL server. Max length is 255 characters."
+msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
#: actions/siteadminpanel.php:210
-msgid "Minimum text limit is 140c."
+msgid "Minimum text limit is 140 characters."
msgstr ""
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:224
-#, php-format
-msgid "Locales directory not readable: %s"
+#: actions/siteadminpanel.php:266
+msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:275
+#: actions/siteadminpanel.php:269
#, fuzzy
msgid "Site name"
msgstr "사이트 공지"
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:279
+#: actions/siteadminpanel.php:274
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:280
+#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:283
+#: actions/siteadminpanel.php:279
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:284
#, fuzzy
-msgid "contact email address for your site"
+msgid "Contact email address for your site"
msgstr "%s에 포스팅 할 새로운 이메일 주소"
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:290
+#, fuzzy
+msgid "Local"
+msgstr "로컬 뷰"
+
+#: actions/siteadminpanel.php:301
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:303
+#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:308
#, fuzzy
msgid "Default site language"
msgstr "언어 설정"
#: actions/siteadminpanel.php:316
-msgid "Path to locales"
-msgstr ""
-
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
-msgstr ""
+#, fuzzy
+msgid "URLs"
+msgstr "URL"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
#, fuzzy
msgid "Server"
msgstr "복구"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
msgstr ""
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-#, fuzzy
-msgid "Site path"
-msgstr "사이트 공지"
-
-#: actions/siteadminpanel.php:328
+#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
msgstr ""
-#: actions/siteadminpanel.php:330
+#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
+#: actions/siteadminpanel.php:331
+#, fuzzy
+msgid "Access"
+msgstr "수락"
+
#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
@@ -3260,7 +3293,7 @@ msgstr "초대"
msgid "Make registration invitation only."
msgstr ""
-#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#: actions/siteadminpanel.php:346
#, fuzzy
msgid "Closed"
msgstr "차단하기"
@@ -3269,33 +3302,37 @@ msgstr "차단하기"
msgid "Disable new registrations."
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
#, fuzzy
msgid "Never"
msgstr "복구"
-#: actions/siteadminpanel.php:357
+#: actions/siteadminpanel.php:360
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:358
+#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:364
+#: actions/siteadminpanel.php:366
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:365
-msgid "Snapshots will be sent once every N Web hits"
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
msgstr ""
#: actions/siteadminpanel.php:372
@@ -3306,48 +3343,57 @@ msgstr ""
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:381
+#: actions/siteadminpanel.php:380
+#, fuzzy
+msgid "SSL"
+msgstr "SMS"
+
+#: actions/siteadminpanel.php:384
#, fuzzy
msgid "Sometimes"
msgstr "통지"
-#: actions/siteadminpanel.php:382
+#: actions/siteadminpanel.php:385
msgid "Always"
msgstr ""
-#: actions/siteadminpanel.php:384
+#: actions/siteadminpanel.php:387
msgid "Use SSL"
msgstr ""
-#: actions/siteadminpanel.php:385
+#: actions/siteadminpanel.php:388
msgid "When to use SSL"
msgstr ""
-#: actions/siteadminpanel.php:391
+#: actions/siteadminpanel.php:393
msgid "SSL Server"
msgstr ""
-#: actions/siteadminpanel.php:392
+#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr ""
+
+#: actions/siteadminpanel.php:403
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
#, fuzzy
msgid "Save site settings"
msgstr "아바타 설정"
@@ -3653,7 +3699,8 @@ msgstr "구독취소 되었습니다."
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
-#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
msgid "User"
msgstr "이용자"
@@ -3661,17 +3708,87 @@ msgstr "이용자"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr ""
+
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:178
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr ""
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "프로필"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr ""
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
+msgstr ""
+
+#: actions/useradminpanel.php:231
#, fuzzy
-msgid "Invite-only"
-msgstr "초대"
+msgid "New users"
+msgstr "새 사용자를 초대"
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr ""
+
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr ""
+
+#: actions/useradminpanel.php:241
+#, fuzzy
+msgid "Default subscription"
+msgstr "모든 예약 구독"
+
+#: actions/useradminpanel.php:242
+#, fuzzy
+msgid "Automatically subscribe new users to this user."
+msgstr "나에게 구독하는 사람에게 자동 구독 신청"
+
+#: actions/useradminpanel.php:251
+#, fuzzy
+msgid "Invitations"
+msgstr "초대권을 보냈습니다"
+
+#: actions/useradminpanel.php:256
+#, fuzzy
+msgid "Invitations enabled"
+msgstr "초대권을 보냈습니다"
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr ""
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr ""
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/userauthorization.php:105
@@ -3885,7 +4002,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"
@@ -3903,10 +4020,6 @@ msgstr "그룹 맴버십을 세팅할 수 없습니다."
msgid "Welcome to %1$s, @%2$s!"
msgstr "%2$s에서 %1$s까지 메시지"
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr "프로필"
-
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "프로필 세팅 바꾸기"
@@ -3945,131 +4058,131 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "제목없는 페이지"
-#: lib/action.php:424
+#: lib/action.php:425
msgid "Primary site navigation"
msgstr "주 사이트 네비게이션"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Home"
msgstr "홈"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Personal profile and friends timeline"
msgstr "개인 프로필과 친구 타임라인"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Account"
msgstr "계정"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Change your email, avatar, password, profile"
msgstr "당신의 이메일, 아바타, 비밀 번호, 프로필을 변경하세요."
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect"
msgstr "연결"
-#: lib/action.php:435
+#: lib/action.php:436
#, fuzzy
msgid "Connect to services"
msgstr "서버에 재접속 할 수 없습니다 : %s"
-#: lib/action.php:439
+#: lib/action.php:440
#, fuzzy
msgid "Change site configuration"
msgstr "주 사이트 네비게이션"
-#: lib/action.php:443 lib/subgroupnav.php:105
+#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
msgstr "초대"
-#: lib/action.php:444 lib/subgroupnav.php:106
+#: lib/action.php:445 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "%s에 친구를 가입시키기 위해 친구와 동료를 초대합니다."
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout"
msgstr "로그아웃"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout from the site"
msgstr "이 사이트로부터 로그아웃"
-#: lib/action.php:454
+#: lib/action.php:455
msgid "Create an account"
msgstr "계정 만들기"
-#: lib/action.php:457
+#: lib/action.php:458
msgid "Login to the site"
msgstr "이 사이트 로그인"
-#: lib/action.php:460 lib/action.php:723
+#: lib/action.php:461 lib/action.php:724
msgid "Help"
msgstr "도움말"
-#: lib/action.php:460
+#: lib/action.php:461
msgid "Help me!"
msgstr "도움이 필요해!"
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
msgstr "검색"
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
msgstr "프로필이나 텍스트 검색"
-#: lib/action.php:484
+#: lib/action.php:485
msgid "Site notice"
msgstr "사이트 공지"
-#: lib/action.php:550
+#: lib/action.php:551
msgid "Local views"
msgstr "로컬 뷰"
-#: lib/action.php:616
+#: lib/action.php:617
msgid "Page notice"
msgstr "페이지 공지"
-#: lib/action.php:718
+#: lib/action.php:719
msgid "Secondary site navigation"
msgstr "보조 사이트 네비게이션"
-#: lib/action.php:725
+#: lib/action.php:726
msgid "About"
msgstr "정보"
-#: lib/action.php:727
+#: lib/action.php:728
msgid "FAQ"
msgstr "자주 묻는 질문"
-#: lib/action.php:731
+#: lib/action.php:732
msgid "TOS"
msgstr ""
-#: lib/action.php:734
+#: lib/action.php:735
msgid "Privacy"
msgstr "개인정보 취급방침"
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
msgstr "소스 코드"
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Contact"
msgstr "연락하기"
-#: lib/action.php:740
+#: lib/action.php:741
#, fuzzy
msgid "Badge"
msgstr "찔러 보기"
-#: lib/action.php:768
+#: lib/action.php:769
msgid "StatusNet software license"
msgstr "라코니카 소프트웨어 라이선스"
-#: lib/action.php:771
+#: lib/action.php:772
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4078,12 +4191,12 @@ msgstr ""
"**%%site.name%%** 는 [%%site.broughtby%%](%%site.broughtbyurl%%)가 제공하는 "
"마이크로블로깅서비스입니다."
-#: lib/action.php:773
+#: lib/action.php:774
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** 는 마이크로블로깅서비스입니다."
-#: lib/action.php:775
+#: lib/action.php:776
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4094,32 +4207,32 @@ msgstr ""
"을 사용합니다. StatusNet는 [GNU Affero General Public License](http://www."
"fsf.org/licensing/licenses/agpl-3.0.html) 라이선스에 따라 사용할 수 있습니다."
-#: lib/action.php:789
+#: lib/action.php:790
#, fuzzy
msgid "Site content license"
msgstr "라코니카 소프트웨어 라이선스"
-#: lib/action.php:798
+#: lib/action.php:799
msgid "All "
msgstr "모든 것"
-#: lib/action.php:803
+#: lib/action.php:804
msgid "license."
msgstr "라이선스"
-#: lib/action.php:1067
+#: lib/action.php:1068
msgid "Pagination"
msgstr "페이지수"
-#: lib/action.php:1076
+#: lib/action.php:1077
msgid "After"
msgstr "뒷 페이지"
-#: lib/action.php:1084
+#: lib/action.php:1085
msgid "Before"
msgstr "앞 페이지"
-#: lib/action.php:1132
+#: lib/action.php:1133
msgid "There was a problem with your session token."
msgstr "당신의 세션토큰관련 문제가 있습니다."
@@ -4153,6 +4266,11 @@ msgstr "이메일 주소 확인서"
msgid "Design configuration"
msgstr "SMS 인증"
+#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+#, fuzzy
+msgid "Paths configuration"
+msgstr "SMS 인증"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4327,11 +4445,9 @@ msgid "You are not subscribed to anyone."
msgstr "당신은 이 프로필에 구독되지 않고있습니다."
#: lib/command.php:620
-#, fuzzy
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
-msgstr[0] "당신은 이 프로필에 구독되지 않고있습니다."
-msgstr[1] "당신은 이 프로필에 구독되지 않고있습니다."
+msgstr[0] "당신은 다음 사용자를 이미 구독하고 있습니다."
#: lib/command.php:640
#, fuzzy
@@ -4339,11 +4455,9 @@ msgid "No one is subscribed to you."
msgstr "다른 사람을 구독 하실 수 없습니다."
#: lib/command.php:642
-#, fuzzy
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "다른 사람을 구독 하실 수 없습니다."
-msgstr[1] "다른 사람을 구독 하실 수 없습니다."
#: lib/command.php:662
#, fuzzy
@@ -4351,11 +4465,9 @@ msgid "You are not a member of any groups."
msgstr "당신은 해당 그룹의 멤버가 아닙니다."
#: lib/command.php:664
-#, fuzzy
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
msgid ""
@@ -4436,9 +4548,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: "
@@ -4533,7 +4646,7 @@ msgstr "그룹의 위치, \"시/군/구, 도, 나라\""
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
-#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85
msgid "Group"
msgstr "그룹"
@@ -4579,7 +4692,7 @@ msgstr "가장 많은 게시글이 있는 그룹들"
msgid "Tags in %s group's notices"
msgstr "%s 그룹 게시글의 태그"
-#: lib/htmloutputter.php:104
+#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다."
@@ -4612,6 +4725,14 @@ msgstr "파일을 잃어버렸습니다."
msgid "Unknown file type"
msgstr "알 수 없는 종류의 파일입니다"
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
@@ -4643,7 +4764,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:424
+#: lib/mailbox.php:227 lib/noticelist.php:452
#, fuzzy
msgid "from"
msgstr "다음에서:"
@@ -4892,37 +5013,63 @@ msgstr "직접 메시지 보내기"
msgid "To"
msgstr "에게"
-#: lib/messageform.php:162 lib/noticeform.php:173
+#: lib/messageform.php:162 lib/noticeform.php:186
msgid "Available characters"
msgstr "사용 가능한 글자"
-#: lib/noticeform.php:145
+#: lib/noticeform.php:158
msgid "Send a notice"
msgstr "게시글 보내기"
-#: lib/noticeform.php:158
+#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
msgstr "뭐하세요? %?"
-#: lib/noticeform.php:180
+#: lib/noticeform.php:193
msgid "Attach"
msgstr ""
-#: lib/noticeform.php:184
+#: lib/noticeform.php:197
msgid "Attach a file"
msgstr ""
-#: lib/noticelist.php:478
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "아니오"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr ""
+
+#: lib/noticelist.php:506
#, fuzzy
msgid "in context"
msgstr "내용이 없습니다!"
-#: lib/noticelist.php:498
+#: lib/noticelist.php:526
msgid "Reply to this notice"
msgstr "이 게시글에 대해 답장하기"
-#: lib/noticelist.php:499
+#: lib/noticelist.php:527
msgid "Reply"
msgstr "답장하기"
@@ -4955,12 +5102,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 "예약 구독을 추가 할 수 없습니다."
@@ -5070,6 +5217,10 @@ msgstr "이 사용자를 차단해제합니다."
msgid "Search site"
msgstr "검색"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
#, fuzzy
msgid "Search help"
@@ -5083,10 +5234,6 @@ msgstr "사람들"
msgid "Find people on this site"
msgstr "이 사이트에 있는 사람 찾기"
-#: lib/searchgroupnav.php:82
-msgid "Notice"
-msgstr "게시글"
-
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
msgstr "통지들의 내용 찾기"
@@ -5227,47 +5374,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년 전"
@@ -5296,11 +5447,3 @@ msgstr "죄송합니다. 귀하의 이메일이 아닙니다."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "죄송합니다. 이메일이 허용되지 않습니다."
-
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "이 사용자를 차단해제합니다."
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "%s에 의해 구독되는 사람들"
diff --git a/locale/mk/LC_MESSAGES/statusnet.mo b/locale/mk/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index a3e2cb11a..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 6e20b573e..1bf7e3ef1 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -8,16 +8,16 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 10:43+0000\n"
-"PO-Revision-Date: 2009-11-18 19:32:13+0000\n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-11-28 19:50:34+0000\n"
"Language-Team: Macedonian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural= n==1 or n%10==1 ? 0 : 1;\n"
-"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=2; plural= n==1 || n%10==1 ? 0 : 1;\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
@@ -441,7 +441,7 @@ msgstr "Ова е предолго. Максималната должина е 1
msgid "Not found"
msgstr ""
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -558,7 +558,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
+#: lib/noticelist.php:550
msgid "Delete"
msgstr ""
@@ -571,7 +571,7 @@ msgid "Crop"
msgstr ""
#: actions/avatarsettings.php:265 actions/disfavor.php:74
-#: actions/emailsettings.php:237 actions/favor.php:75
+#: 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
@@ -586,7 +586,7 @@ msgid "There was a problem with your session token. Try again, please."
msgstr ""
#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
-#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: 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."
@@ -722,15 +722,15 @@ msgstr "Непознат тип на адреса %s"
msgid "That address has already been confirmed."
msgstr "Оваа адреса веќе е потврдена."
-#: actions/confirmaddress.php:114 actions/emailsettings.php:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
#: actions/profilesettings.php:276 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Корисникот не може да се освежи/"
-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
msgstr "Не може да се креира потврда за е-пошта."
@@ -750,7 +750,7 @@ msgid "Conversation"
msgstr "Локација"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206
+#: lib/profileaction.php:206 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Известувања"
@@ -790,7 +790,7 @@ msgstr ""
msgid "Do not delete this notice"
msgstr "Нема такво известување."
-#: actions/deletenotice.php:146 lib/noticelist.php:522
+#: actions/deletenotice.php:146 lib/noticelist.php:550
msgid "Delete this notice"
msgstr ""
@@ -832,182 +832,119 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:278
+#: actions/designadminpanel.php:270
#, fuzzy
msgid "Invalid logo URL."
msgstr "Погрешна големина."
-#: actions/designadminpanel.php:282
+#: actions/designadminpanel.php:274
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Оваа страница не е достапна во форматот кој Вие го прифаќате."
-#: actions/designadminpanel.php:288
-#, fuzzy, php-format
-msgid "Theme directory not readable: %s"
-msgstr "Оваа страница не е достапна во форматот кој Вие го прифаќате."
-
-#: actions/designadminpanel.php:292
-#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:296
-#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:312
-#, php-format
-msgid "Max length for %s %s is 255 characters."
-msgstr ""
-
-#: actions/designadminpanel.php:412
+#: actions/designadminpanel.php:370
#, fuzzy
msgid "Change logo"
msgstr "Промени ја лозинката"
-#: actions/designadminpanel.php:417
+#: actions/designadminpanel.php:375
#, fuzzy
msgid "Site logo"
msgstr "Ново известување"
-#: actions/designadminpanel.php:424
+#: actions/designadminpanel.php:382
#, fuzzy
msgid "Change theme"
msgstr "Промени"
-#: actions/designadminpanel.php:441
+#: actions/designadminpanel.php:399
#, fuzzy
msgid "Site theme"
msgstr "Ново известување"
-#: actions/designadminpanel.php:442
+#: actions/designadminpanel.php:400
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:447
-msgid "Theme server"
-msgstr ""
-
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
-
-#: actions/designadminpanel.php:455
-msgid "Theme directory"
-msgstr ""
-
-#: actions/designadminpanel.php:462
-#, fuzzy
-msgid "Avatar Settings"
-msgstr "Поставки"
-
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Avatar server"
-msgstr "Поставки"
-
-#: actions/designadminpanel.php:471
-#, fuzzy
-msgid "Avatar path"
-msgstr "Аватарот е ажуриран."
-
-#: actions/designadminpanel.php:475
-#, fuzzy
-msgid "Avatar directory"
-msgstr "Аватарот е ажуриран."
-
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:422
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "Ова е предолго. Максималната должина е 140 знаци."
-#: actions/designadminpanel.php:526 lib/designsettings.php:139
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:542 lib/designsettings.php:155
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:543 lib/designsettings.php:156
+#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:548 lib/designsettings.php:161
+#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:554
-msgid "Background server"
-msgstr ""
-
-#: actions/designadminpanel.php:558
-msgid "Background path"
-msgstr ""
-
-#: actions/designadminpanel.php:562
-msgid "Background directory"
-msgstr ""
-
-#: actions/designadminpanel.php:569 lib/designsettings.php:170
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Промени ја лозинката"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Поврзи се"
-#: actions/designadminpanel.php:604 lib/designsettings.php:204
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Барај"
-#: actions/designadminpanel.php:617 lib/designsettings.php:217
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
msgstr ""
-#: actions/designadminpanel.php:630 lib/designsettings.php:230
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Пријави се"
-#: actions/designadminpanel.php:658 lib/designsettings.php:247
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:659 lib/designsettings.php:248
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:665 lib/designsettings.php:254
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 actions/useradminpanel.php:226
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/pathsadminpanel.php:296 actions/profilesettings.php:167
+#: actions/siteadminpanel.php:421 actions/smssettings.php:181
+#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/useradminpanel.php:313 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Сними"
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: actions/designadminpanel.php:582 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1158,83 +1095,83 @@ msgstr ""
msgid "Publish a MicroID for my email address."
msgstr ""
-#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/emailsettings.php:302 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
msgstr "Преференциите се снимени."
-#: actions/emailsettings.php:319
+#: actions/emailsettings.php:320
msgid "No email address."
msgstr ""
-#: actions/emailsettings.php:326
+#: actions/emailsettings.php:327
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr ""
-#: actions/emailsettings.php:333
+#: actions/emailsettings.php:334
msgid "That is already your email address."
msgstr ""
-#: actions/emailsettings.php:336
+#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
msgstr ""
-#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Кодот за потврда не може да се внесе."
-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
msgstr ""
-#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
msgstr "Нема потврди кои може да се откажат."
-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
msgstr "Ова е погрешната IM адреса."
-#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
msgstr "Потврдата е откажана"
-#: actions/emailsettings.php:412
+#: actions/emailsettings.php:413
msgid "That is not your email address."
msgstr ""
-#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
msgstr "Адресата е отстранета."
-#: actions/emailsettings.php:445 actions/smssettings.php:518
+#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
msgstr ""
-#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
msgid "Couldn't update user record."
msgstr ""
-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
msgstr ""
-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555
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"
@@ -1502,7 +1439,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
msgid "Admin"
msgstr ""
@@ -1562,7 +1499,7 @@ msgid ""
msgstr ""
#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/subgroupnav.php:98
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1775,7 +1712,7 @@ msgstr ""
msgid "Optionally add a personal message to the invitation."
msgstr ""
-#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
msgstr "Испрати"
@@ -1875,7 +1812,7 @@ msgstr "Неточно корисничко име или лозинка"
msgid "Error setting user. You are probably not authorized."
msgstr "Не е одобрено."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:457
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Пријави се"
@@ -1987,7 +1924,7 @@ msgstr ""
msgid "Direct message to %s sent"
msgstr ""
-#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
msgid "Ajax Error"
msgstr ""
@@ -1995,7 +1932,7 @@ msgstr ""
msgid "New notice"
msgstr "Ново известување"
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
#, fuzzy
msgid "Notice posted"
msgstr "Известувања"
@@ -2032,12 +1969,12 @@ msgid ""
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
-#: actions/noticesearchrss.php:89
+#: actions/noticesearchrss.php:96
#, fuzzy, php-format
msgid "Updates with \"%s\""
msgstr "Микроблог на %s"
-#: actions/noticesearchrss.php:91
+#: actions/noticesearchrss.php:98
#, fuzzy, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
msgstr "Сите новини кои се еднакви со бараниот термин „%s“"
@@ -2166,9 +2103,9 @@ msgstr "6 или повеќе знаци"
msgid "Confirm"
msgstr "Потврди"
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "исто како лозинката погоре"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Исто како лозинката погоре"
#: actions/passwordsettings.php:117
msgid "Change"
@@ -2198,6 +2135,113 @@ msgstr "Новата лозинка не може да се сними"
msgid "Password saved."
msgstr "Лозинката е снимена."
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr ""
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr ""
+
+#: actions/pathsadminpanel.php:140
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Оваа страница не е достапна во форматот кој Вие го прифаќате."
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+msgid "Site"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+#, fuzzy
+msgid "Site path"
+msgstr "Ново известување"
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr ""
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Avatars"
+msgstr "Аватар"
+
+#: actions/pathsadminpanel.php:252
+#, fuzzy
+msgid "Avatar server"
+msgstr "Поставки"
+
+#: actions/pathsadminpanel.php:256
+#, fuzzy
+msgid "Avatar path"
+msgstr "Аватарот е ажуриран."
+
+#: actions/pathsadminpanel.php:260
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Аватарот е ажуриран."
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:297
+#, fuzzy
+msgid "Save paths"
+msgstr "Ново известување"
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -2301,7 +2345,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr ""
@@ -2530,10 +2574,6 @@ msgstr ""
msgid "6 or more characters, and don't forget it!"
msgstr "6 или повеќе знаци и не ја заборавајте!"
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Исто како лозинката погоре"
-
#: actions/recoverpassword.php:243
msgid "Reset"
msgstr "Ресетирај"
@@ -2595,7 +2635,7 @@ msgstr "Грешка со кодот за потврдување."
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Регистрирај се"
@@ -2639,7 +2679,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Е-пошта"
@@ -2731,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 "Претплати се"
@@ -3068,10 +3108,6 @@ msgstr ""
msgid "User is already silenced."
msgstr "Корисникот нема профил."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
-msgid "Site"
-msgstr ""
-
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
msgstr ""
@@ -3103,102 +3139,98 @@ msgid "Snapshot frequency must be a number."
msgstr ""
#: actions/siteadminpanel.php:199
-msgid "You must set an SSL sever when enabling SSL."
+msgid "You must set an SSL server when enabling SSL."
msgstr ""
#: actions/siteadminpanel.php:204
-msgid "Invalid SSL server. Max length is 255 characters."
+msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
#: actions/siteadminpanel.php:210
-msgid "Minimum text limit is 140c."
+msgid "Minimum text limit is 140 characters."
msgstr ""
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:224
-#, php-format
-msgid "Locales directory not readable: %s"
+#: actions/siteadminpanel.php:266
+msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:275
+#: actions/siteadminpanel.php:269
#, fuzzy
msgid "Site name"
msgstr "Ново известување"
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:279
+#: actions/siteadminpanel.php:274
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:280
+#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:283
+#: actions/siteadminpanel.php:279
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:284
#, fuzzy
-msgid "contact email address for your site"
+msgid "Contact email address for your site"
msgstr "Нема регистрирана адреса за е-пошта за тој корисник."
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:290
+#, fuzzy
+msgid "Local"
+msgstr "Локација"
+
+#: actions/siteadminpanel.php:301
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:303
+#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:308
msgid "Default site language"
msgstr ""
#: actions/siteadminpanel.php:316
-msgid "Path to locales"
+msgid "URLs"
msgstr ""
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
-msgstr ""
-
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
#, fuzzy
msgid "Server"
msgstr "Пронајди"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
msgstr ""
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-#, fuzzy
-msgid "Site path"
-msgstr "Ново известување"
-
-#: actions/siteadminpanel.php:328
+#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
msgstr ""
-#: actions/siteadminpanel.php:330
+#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
+#: actions/siteadminpanel.php:331
+#, fuzzy
+msgid "Access"
+msgstr "Прифати"
+
#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
@@ -3216,7 +3248,7 @@ msgstr ""
msgid "Make registration invitation only."
msgstr ""
-#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#: actions/siteadminpanel.php:346
#, fuzzy
msgid "Closed"
msgstr "Нема таков корисник."
@@ -3225,33 +3257,37 @@ msgstr "Нема таков корисник."
msgid "Disable new registrations."
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
#, fuzzy
msgid "Never"
msgstr "Пронајди"
-#: actions/siteadminpanel.php:357
+#: actions/siteadminpanel.php:360
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:358
+#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:364
+#: actions/siteadminpanel.php:366
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:365
-msgid "Snapshots will be sent once every N Web hits"
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
msgstr ""
#: actions/siteadminpanel.php:372
@@ -3262,48 +3298,56 @@ msgstr ""
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:381
+#: actions/siteadminpanel.php:380
+msgid "SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
#, fuzzy
msgid "Sometimes"
msgstr "Известувања"
-#: actions/siteadminpanel.php:382
+#: actions/siteadminpanel.php:385
msgid "Always"
msgstr ""
-#: actions/siteadminpanel.php:384
+#: actions/siteadminpanel.php:387
msgid "Use SSL"
msgstr ""
-#: actions/siteadminpanel.php:385
+#: actions/siteadminpanel.php:388
msgid "When to use SSL"
msgstr ""
-#: actions/siteadminpanel.php:391
+#: actions/siteadminpanel.php:393
msgid "SSL Server"
msgstr ""
-#: actions/siteadminpanel.php:392
+#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr ""
+
+#: actions/siteadminpanel.php:403
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
#, fuzzy
msgid "Save site settings"
msgstr "Поставки"
@@ -3614,7 +3658,8 @@ msgstr "Откажи ја претплатата"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
-#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
msgid "User"
msgstr ""
@@ -3622,16 +3667,85 @@ msgstr ""
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr ""
+
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
+msgstr ""
+
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr ""
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Профил"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr ""
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
+msgstr ""
+
+#: actions/useradminpanel.php:231
+msgid "New users"
msgstr ""
-#: actions/useradminpanel.php:178
-msgid "Invite-only"
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
msgstr ""
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr ""
+
+#: actions/useradminpanel.php:241
+#, fuzzy
+msgid "Default subscription"
+msgstr "Сите претплати"
+
+#: actions/useradminpanel.php:242
+#, fuzzy
+msgid "Automatically subscribe new users to this user."
+msgstr "Претплатата е одобрена"
+
+#: actions/useradminpanel.php:251
+#, fuzzy
+msgid "Invitations"
+msgstr "Локација"
+
+#: actions/useradminpanel.php:256
+msgid "Invitations enabled"
+msgstr ""
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr ""
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr ""
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/userauthorization.php:105
@@ -3840,7 +3954,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"
@@ -3860,10 +3974,6 @@ msgstr "Не може да се креира претплатата"
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr "Профил"
-
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr ""
@@ -3903,136 +4013,136 @@ msgstr ""
msgid "Untitled page"
msgstr ""
-#: lib/action.php:424
+#: lib/action.php:425
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Home"
msgstr "Дома"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:432
+#: lib/action.php:433
#, fuzzy
msgid "Account"
msgstr "За"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect"
msgstr "Поврзи се"
-#: lib/action.php:435
+#: lib/action.php:436
#, fuzzy
msgid "Connect to services"
msgstr "Не може да се пренасочи кон серверот: %s"
-#: lib/action.php:439
+#: lib/action.php:440
#, fuzzy
msgid "Change site configuration"
msgstr "Претплати"
-#: lib/action.php:443 lib/subgroupnav.php:105
+#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:444 lib/subgroupnav.php:106
+#: lib/action.php:445 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout"
msgstr "Одјави се"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:454
+#: lib/action.php:455
#, fuzzy
msgid "Create an account"
msgstr "Креирај нова сметка"
-#: lib/action.php:457
+#: lib/action.php:458
msgid "Login to the site"
msgstr ""
-#: lib/action.php:460 lib/action.php:723
+#: lib/action.php:461 lib/action.php:724
msgid "Help"
msgstr "Помош"
-#: lib/action.php:460
+#: lib/action.php:461
#, fuzzy
msgid "Help me!"
msgstr "Помош"
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
msgstr "Барај"
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:484
+#: lib/action.php:485
#, fuzzy
msgid "Site notice"
msgstr "Ново известување"
-#: lib/action.php:550
+#: lib/action.php:551
msgid "Local views"
msgstr ""
-#: lib/action.php:616
+#: lib/action.php:617
#, fuzzy
msgid "Page notice"
msgstr "Ново известување"
-#: lib/action.php:718
+#: lib/action.php:719
#, fuzzy
msgid "Secondary site navigation"
msgstr "Претплати"
-#: lib/action.php:725
+#: lib/action.php:726
msgid "About"
msgstr "За"
-#: lib/action.php:727
+#: lib/action.php:728
msgid "FAQ"
msgstr "ЧПП"
-#: lib/action.php:731
+#: lib/action.php:732
msgid "TOS"
msgstr ""
-#: lib/action.php:734
+#: lib/action.php:735
msgid "Privacy"
msgstr "Приватност"
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
msgstr "Изворен код"
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Contact"
msgstr "Контакт"
-#: lib/action.php:740
+#: lib/action.php:741
msgid "Badge"
msgstr ""
-#: lib/action.php:768
+#: lib/action.php:769
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:771
+#: lib/action.php:772
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4041,12 +4151,12 @@ msgstr ""
"**%%site.name%%** е сервис за микроблогирање што ви го овозможува [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:773
+#: lib/action.php:774
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** е сервис за микроблогирање."
-#: lib/action.php:775
+#: lib/action.php:776
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4057,34 +4167,34 @@ msgstr ""
"верзија %s, достапен пд [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:789
+#: lib/action.php:790
#, fuzzy
msgid "Site content license"
msgstr "Ново известување"
-#: lib/action.php:798
+#: lib/action.php:799
msgid "All "
msgstr ""
-#: lib/action.php:803
+#: lib/action.php:804
msgid "license."
msgstr ""
-#: lib/action.php:1067
+#: lib/action.php:1068
msgid "Pagination"
msgstr ""
-#: lib/action.php:1076
+#: lib/action.php:1077
#, fuzzy
msgid "After"
msgstr "« Следни"
-#: lib/action.php:1084
+#: lib/action.php:1085
#, fuzzy
msgid "Before"
msgstr "Предходни »"
-#: lib/action.php:1132
+#: lib/action.php:1133
msgid "There was a problem with your session token."
msgstr ""
@@ -4114,6 +4224,11 @@ msgstr "Потврдување на адресата"
msgid "Design configuration"
msgstr "Потврдување на адресата"
+#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+#, fuzzy
+msgid "Paths configuration"
+msgstr "Потврдување на адресата"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4288,7 +4403,6 @@ msgid "You are not subscribed to anyone."
msgstr "Не ни го испративте тој профил."
#: lib/command.php:620
-#, fuzzy
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Не ни го испративте тој профил."
@@ -4300,7 +4414,6 @@ msgid "No one is subscribed to you."
msgstr "Оддалечена претплата"
#: lib/command.php:642
-#, fuzzy
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Оддалечена претплата"
@@ -4312,7 +4425,6 @@ msgid "You are not a member of any groups."
msgstr "Не ни го испративте тој профил."
#: lib/command.php:664
-#, fuzzy
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Не ни го испративте тој профил."
@@ -4396,9 +4508,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: "
@@ -4496,7 +4609,7 @@ msgstr "Каде се наоѓате, на пр. „Град, Држава“."
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
-#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85
msgid "Group"
msgstr ""
@@ -4543,7 +4656,7 @@ msgstr ""
msgid "Tags in %s group's notices"
msgstr ""
-#: lib/htmloutputter.php:104
+#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
msgstr "Оваа страница не е достапна во форматот кој Вие го прифаќате."
@@ -4577,6 +4690,14 @@ msgstr "Нема такво известување."
msgid "Unknown file type"
msgstr ""
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
@@ -4612,7 +4733,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:424
+#: lib/mailbox.php:227 lib/noticelist.php:452
msgid "from"
msgstr ""
@@ -4859,39 +4980,64 @@ msgstr ""
msgid "To"
msgstr ""
-#: lib/messageform.php:162 lib/noticeform.php:173
+#: lib/messageform.php:162 lib/noticeform.php:186
#, fuzzy
msgid "Available characters"
msgstr "6 или повеќе знаци"
-#: lib/noticeform.php:145
+#: lib/noticeform.php:158
#, fuzzy
msgid "Send a notice"
msgstr "Ново известување"
-#: lib/noticeform.php:158
+#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
msgstr "Што има %s?"
-#: lib/noticeform.php:180
+#: lib/noticeform.php:193
msgid "Attach"
msgstr ""
-#: lib/noticeform.php:184
+#: lib/noticeform.php:197
msgid "Attach a file"
msgstr ""
-#: lib/noticelist.php:478
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "N"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr ""
+
+#: lib/noticelist.php:506
#, fuzzy
msgid "in context"
msgstr "Нема содржина!"
-#: lib/noticelist.php:498
+#: lib/noticelist.php:526
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:499
+#: lib/noticelist.php:527
#, fuzzy
msgid "Reply"
msgstr "одговор"
@@ -4924,11 +5070,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 "Не може да се внесе нова претплата."
@@ -5038,6 +5184,10 @@ msgstr "Нема таков корисник."
msgid "Search site"
msgstr "Барај"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
#, fuzzy
msgid "Search help"
@@ -5051,11 +5201,6 @@ msgstr ""
msgid "Find people on this site"
msgstr ""
-#: lib/searchgroupnav.php:82
-#, fuzzy
-msgid "Notice"
-msgstr "Известувања"
-
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
msgstr ""
@@ -5197,47 +5342,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 "пред една година"
@@ -5266,11 +5415,3 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
-
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "Нема таков корисник."
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "Оддалечена претплата"
diff --git a/locale/nb/LC_MESSAGES/statusnet.mo b/locale/nb/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 00a1f197f..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 1439bee64..ee5126aaa 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 10:43+0000\n"
-"PO-Revision-Date: 2009-11-18 19:32:16+0000\n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-11-28 19:50:37+0000\n"
"Language-Team: Norwegian (bokmål)‬\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: no\n"
"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
@@ -440,7 +440,7 @@ msgstr ""
msgid "Not found"
msgstr ""
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -555,7 +555,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
+#: lib/noticelist.php:550
#, fuzzy
msgid "Delete"
msgstr "slett"
@@ -569,7 +569,7 @@ msgid "Crop"
msgstr ""
#: actions/avatarsettings.php:265 actions/disfavor.php:74
-#: actions/emailsettings.php:237 actions/favor.php:75
+#: 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
@@ -584,7 +584,7 @@ msgid "There was a problem with your session token. Try again, please."
msgstr ""
#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
-#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: 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."
@@ -717,15 +717,15 @@ msgstr ""
msgid "That address has already been confirmed."
msgstr ""
-#: actions/confirmaddress.php:114 actions/emailsettings.php:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
#: actions/profilesettings.php:276 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Klarte ikke å oppdatere bruker."
-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
msgstr ""
@@ -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/profileaction.php:206 lib/searchgroupnav.php:82
msgid "Notices"
msgstr ""
@@ -785,7 +785,7 @@ msgstr "Er du sikker på at du vil slette denne notisen?"
msgid "Do not delete this notice"
msgstr "Kan ikke slette notisen."
-#: actions/deletenotice.php:146 lib/noticelist.php:522
+#: actions/deletenotice.php:146 lib/noticelist.php:550
msgid "Delete this notice"
msgstr ""
@@ -828,181 +828,118 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:278
+#: actions/designadminpanel.php:270
#, fuzzy
msgid "Invalid logo URL."
msgstr "Ugyldig størrelse"
-#: actions/designadminpanel.php:282
+#: actions/designadminpanel.php:274
#, php-format
msgid "Theme not available: %s"
msgstr ""
-#: actions/designadminpanel.php:288
-#, php-format
-msgid "Theme directory not readable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:292
-#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:296
-#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:312
-#, php-format
-msgid "Max length for %s %s is 255 characters."
-msgstr ""
-
-#: actions/designadminpanel.php:412
+#: actions/designadminpanel.php:370
#, fuzzy
msgid "Change logo"
msgstr "Endre passordet ditt"
-#: actions/designadminpanel.php:417
+#: actions/designadminpanel.php:375
msgid "Site logo"
msgstr ""
-#: actions/designadminpanel.php:424
+#: actions/designadminpanel.php:382
#, fuzzy
msgid "Change theme"
msgstr "Endre"
-#: actions/designadminpanel.php:441
+#: actions/designadminpanel.php:399
#, fuzzy
msgid "Site theme"
msgstr "Endre"
-#: actions/designadminpanel.php:442
+#: actions/designadminpanel.php:400
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:447
-msgid "Theme server"
-msgstr ""
-
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
-
-#: actions/designadminpanel.php:455
-msgid "Theme directory"
-msgstr ""
-
-#: actions/designadminpanel.php:462
-#, fuzzy
-msgid "Avatar Settings"
-msgstr "Innstillinger for IM"
-
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Avatar server"
-msgstr "Innstillinger for IM"
-
-#: actions/designadminpanel.php:471
-#, fuzzy
-msgid "Avatar path"
-msgstr "Brukerbildet har blitt oppdatert."
-
-#: actions/designadminpanel.php:475
-#, fuzzy
-msgid "Avatar directory"
-msgstr "Brukerbildet har blitt oppdatert."
-
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:422
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr ""
-#: actions/designadminpanel.php:526 lib/designsettings.php:139
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:542 lib/designsettings.php:155
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:543 lib/designsettings.php:156
+#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:548 lib/designsettings.php:161
+#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:554
-msgid "Background server"
-msgstr ""
-
-#: actions/designadminpanel.php:558
-msgid "Background path"
-msgstr ""
-
-#: actions/designadminpanel.php:562
-msgid "Background directory"
-msgstr ""
-
-#: actions/designadminpanel.php:569 lib/designsettings.php:170
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Endre passordet ditt"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Koble til"
-#: actions/designadminpanel.php:604 lib/designsettings.php:204
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Søk"
-#: actions/designadminpanel.php:617 lib/designsettings.php:217
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
msgstr "Tekst"
-#: actions/designadminpanel.php:630 lib/designsettings.php:230
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Logg inn"
-#: actions/designadminpanel.php:658 lib/designsettings.php:247
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:659 lib/designsettings.php:248
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:665 lib/designsettings.php:254
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 actions/useradminpanel.php:226
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: 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 "Lagre"
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: actions/designadminpanel.php:582 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1154,37 +1091,37 @@ msgstr ""
msgid "Publish a MicroID for my email address."
msgstr "Publiser en MicroID for min e-postadresse."
-#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/emailsettings.php:302 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
msgstr ""
-#: actions/emailsettings.php:319
+#: actions/emailsettings.php:320
msgid "No email address."
msgstr "Ingen e-postadresse."
-#: actions/emailsettings.php:326
+#: actions/emailsettings.php:327
msgid "Cannot normalize that email address"
msgstr "Klarer ikke normalisere epostadressen"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "Ugyldig e-postadresse"
-#: actions/emailsettings.php:333
+#: actions/emailsettings.php:334
msgid "That is already your email address."
msgstr "Det er allerede din e-postadresse."
-#: actions/emailsettings.php:336
+#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
msgstr ""
-#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr ""
-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1192,47 +1129,47 @@ msgstr ""
"En bekreftelseskode ble sendt til epostadressen du la til. Sjekk innboksen "
"din (og søppelboksen) for koden, og hvordan du skal bruke den."
-#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
msgstr ""
-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
msgstr "Det er feil IM-adresse."
-#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
msgstr "Bekreftelse avbrutt."
-#: actions/emailsettings.php:412
+#: actions/emailsettings.php:413
msgid "That is not your email address."
msgstr "Det er ikke din e-postadresse."
-#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
msgstr ""
-#: actions/emailsettings.php:445 actions/smssettings.php:518
+#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
msgstr ""
-#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
msgid "Couldn't update user record."
msgstr ""
-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
msgstr ""
-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555
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 ""
@@ -1490,7 +1427,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
msgid "Admin"
msgstr ""
@@ -1547,7 +1484,7 @@ msgid ""
msgstr ""
#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/subgroupnav.php:98
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1752,7 +1689,7 @@ msgstr ""
msgid "Optionally add a personal message to the invitation."
msgstr ""
-#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
msgstr "Send"
@@ -1871,7 +1808,7 @@ msgstr "Feil brukernavn eller passord"
msgid "Error setting user. You are probably not authorized."
msgstr "Ikke autorisert."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:457
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Logg inn"
@@ -1979,7 +1916,7 @@ msgstr ""
msgid "Direct message to %s sent"
msgstr ""
-#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
msgid "Ajax Error"
msgstr ""
@@ -1987,7 +1924,7 @@ msgstr ""
msgid "New notice"
msgstr ""
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
msgid "Notice posted"
msgstr ""
@@ -2021,12 +1958,12 @@ msgid ""
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
-#: actions/noticesearchrss.php:89
+#: actions/noticesearchrss.php:96
#, php-format
msgid "Updates with \"%s\""
msgstr ""
-#: actions/noticesearchrss.php:91
+#: actions/noticesearchrss.php:98
#, fuzzy, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
msgstr "Alle oppdateringer for søket: «%s»"
@@ -2153,8 +2090,8 @@ msgstr "6 eller flere tegn"
msgid "Confirm"
msgstr "Bekreft"
-#: actions/passwordsettings.php:113
-msgid "same as password above"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
msgstr ""
#: actions/passwordsettings.php:117
@@ -2185,6 +2122,111 @@ msgstr "Klarer ikke å lagre nytt passord."
msgid "Password saved."
msgstr "Passordet ble lagret"
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr ""
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr ""
+
+#: actions/pathsadminpanel.php:140
+#, php-format
+msgid "Theme directory not readable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+msgid "Site"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+msgid "Site path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr ""
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Avatars"
+msgstr "Brukerbilde"
+
+#: actions/pathsadminpanel.php:252
+#, fuzzy
+msgid "Avatar server"
+msgstr "Innstillinger for IM"
+
+#: actions/pathsadminpanel.php:256
+#, fuzzy
+msgid "Avatar path"
+msgstr "Brukerbildet har blitt oppdatert."
+
+#: actions/pathsadminpanel.php:260
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Brukerbildet har blitt oppdatert."
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:297
+msgid "Save paths"
+msgstr ""
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -2283,7 +2325,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr "Språk"
@@ -2508,10 +2550,6 @@ msgstr ""
msgid "6 or more characters, and don't forget it!"
msgstr "6 eller flere tegn. Og ikke glem det!"
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr ""
-
#: actions/recoverpassword.php:243
msgid "Reset"
msgstr "Nullstill"
@@ -2572,7 +2610,7 @@ msgstr ""
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
#: lib/logingroupnav.php:85
msgid "Register"
msgstr ""
@@ -2617,7 +2655,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-post"
@@ -2720,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 ""
@@ -3053,10 +3091,6 @@ msgstr ""
msgid "User is already silenced."
msgstr "Du er allerede logget inn!"
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
-msgid "Site"
-msgstr ""
-
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
msgstr ""
@@ -3088,99 +3122,95 @@ msgid "Snapshot frequency must be a number."
msgstr ""
#: actions/siteadminpanel.php:199
-msgid "You must set an SSL sever when enabling SSL."
+msgid "You must set an SSL server when enabling SSL."
msgstr ""
#: actions/siteadminpanel.php:204
-msgid "Invalid SSL server. Max length is 255 characters."
+msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
#: actions/siteadminpanel.php:210
-msgid "Minimum text limit is 140c."
+msgid "Minimum text limit is 140 characters."
msgstr ""
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:224
-#, php-format
-msgid "Locales directory not readable: %s"
+#: actions/siteadminpanel.php:266
+msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:275
+#: actions/siteadminpanel.php:269
msgid "Site name"
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:279
+#: actions/siteadminpanel.php:274
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:280
+#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:283
+#: actions/siteadminpanel.php:279
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:288
-msgid "contact email address for your site"
+#: actions/siteadminpanel.php:284
+msgid "Contact email address for your site"
+msgstr ""
+
+#: actions/siteadminpanel.php:290
+msgid "Local"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:301
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:303
+#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:308
msgid "Default site language"
msgstr ""
#: actions/siteadminpanel.php:316
-msgid "Path to locales"
-msgstr ""
-
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
+msgid "URLs"
msgstr ""
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
#, fuzzy
msgid "Server"
msgstr "Gjenopprett"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
msgstr ""
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-msgid "Site path"
-msgstr ""
-
-#: actions/siteadminpanel.php:328
+#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
msgstr ""
-#: actions/siteadminpanel.php:330
+#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
+#: actions/siteadminpanel.php:331
+#, fuzzy
+msgid "Access"
+msgstr "Godta"
+
#: actions/siteadminpanel.php:334
msgid "Private"
msgstr ""
@@ -3197,7 +3227,7 @@ msgstr ""
msgid "Make registration invitation only."
msgstr ""
-#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#: actions/siteadminpanel.php:346
msgid "Closed"
msgstr ""
@@ -3205,33 +3235,37 @@ msgstr ""
msgid "Disable new registrations."
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
#, fuzzy
msgid "Never"
msgstr "Gjenopprett"
-#: actions/siteadminpanel.php:357
+#: actions/siteadminpanel.php:360
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:358
+#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:364
+#: actions/siteadminpanel.php:366
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:365
-msgid "Snapshots will be sent once every N Web hits"
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
msgstr ""
#: actions/siteadminpanel.php:372
@@ -3242,47 +3276,55 @@ msgstr ""
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:381
+#: actions/siteadminpanel.php:380
+msgid "SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
msgid "Sometimes"
msgstr ""
-#: actions/siteadminpanel.php:382
+#: actions/siteadminpanel.php:385
msgid "Always"
msgstr ""
-#: actions/siteadminpanel.php:384
+#: actions/siteadminpanel.php:387
msgid "Use SSL"
msgstr ""
-#: actions/siteadminpanel.php:385
+#: actions/siteadminpanel.php:388
msgid "When to use SSL"
msgstr ""
-#: actions/siteadminpanel.php:391
+#: actions/siteadminpanel.php:393
msgid "SSL Server"
msgstr ""
-#: actions/siteadminpanel.php:392
+#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr ""
+
+#: actions/siteadminpanel.php:403
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
#, fuzzy
msgid "Save site settings"
msgstr "Innstillinger for IM"
@@ -3586,7 +3628,8 @@ msgstr ""
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
-#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
msgid "User"
msgstr ""
@@ -3594,16 +3637,87 @@ msgstr ""
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr ""
+
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
+msgstr ""
+
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr ""
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Profil"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr ""
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
+msgstr ""
+
+#: actions/useradminpanel.php:231
+#, fuzzy
+msgid "New users"
+msgstr "slett"
+
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr ""
+
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr ""
+
+#: actions/useradminpanel.php:241
+#, fuzzy
+msgid "Default subscription"
+msgstr "Alle abonnementer"
+
+#: actions/useradminpanel.php:242
+#, fuzzy
+msgid "Automatically subscribe new users to this user."
+msgstr ""
+"Abonner automatisk på de som abonnerer på meg (best for ikke-mennesker)"
+
+#: actions/useradminpanel.php:251
+#, fuzzy
+msgid "Invitations"
+msgstr "Bekreftelseskode"
+
+#: actions/useradminpanel.php:256
+msgid "Invitations enabled"
+msgstr ""
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr ""
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
msgstr ""
-#: actions/useradminpanel.php:178
-msgid "Invite-only"
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
msgstr ""
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/userauthorization.php:105
@@ -3799,7 +3913,7 @@ msgstr ""
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
@@ -3819,10 +3933,6 @@ msgstr "Klarte ikke å lagre avatar-informasjonen"
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr "Profil"
-
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Endre profilinnstillingene dine"
@@ -3861,131 +3971,131 @@ msgstr ""
msgid "Untitled page"
msgstr ""
-#: lib/action.php:424
+#: lib/action.php:425
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Home"
msgstr "Hjem"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:432
+#: lib/action.php:433
#, fuzzy
msgid "Account"
msgstr "Om"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect"
msgstr "Koble til"
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect to services"
msgstr ""
-#: lib/action.php:439
+#: lib/action.php:440
msgid "Change site configuration"
msgstr ""
-#: lib/action.php:443 lib/subgroupnav.php:105
+#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:444 lib/subgroupnav.php:106
+#: lib/action.php:445 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout"
msgstr "Logg ut"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:454
+#: lib/action.php:455
#, fuzzy
msgid "Create an account"
msgstr "Opprett en ny konto"
-#: lib/action.php:457
+#: lib/action.php:458
msgid "Login to the site"
msgstr ""
-#: lib/action.php:460 lib/action.php:723
+#: lib/action.php:461 lib/action.php:724
msgid "Help"
msgstr "Hjelp"
-#: lib/action.php:460
+#: lib/action.php:461
#, fuzzy
msgid "Help me!"
msgstr "Hjelp"
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
msgstr "Søk"
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:484
+#: lib/action.php:485
msgid "Site notice"
msgstr ""
-#: lib/action.php:550
+#: lib/action.php:551
msgid "Local views"
msgstr ""
-#: lib/action.php:616
+#: lib/action.php:617
msgid "Page notice"
msgstr ""
-#: lib/action.php:718
+#: lib/action.php:719
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:725
+#: lib/action.php:726
msgid "About"
msgstr "Om"
-#: lib/action.php:727
+#: lib/action.php:728
msgid "FAQ"
msgstr "OSS/FAQ"
-#: lib/action.php:731
+#: lib/action.php:732
msgid "TOS"
msgstr ""
-#: lib/action.php:734
+#: lib/action.php:735
msgid "Privacy"
msgstr ""
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
msgstr "Kilde"
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:740
+#: lib/action.php:741
msgid "Badge"
msgstr ""
-#: lib/action.php:768
+#: lib/action.php:769
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:771
+#: lib/action.php:772
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3994,12 +4104,12 @@ msgstr ""
"**%%site.name%%** er en mikrobloggingtjeneste av [%%site.broughtby%%](%%site."
"broughtbyurl%%). "
-#: lib/action.php:773
+#: lib/action.php:774
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** er en mikrobloggingtjeneste. "
-#: lib/action.php:775
+#: lib/action.php:776
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4007,32 +4117,32 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:789
+#: lib/action.php:790
msgid "Site content license"
msgstr ""
-#: lib/action.php:798
+#: lib/action.php:799
msgid "All "
msgstr ""
-#: lib/action.php:803
+#: lib/action.php:804
msgid "license."
msgstr ""
-#: lib/action.php:1067
+#: lib/action.php:1068
msgid "Pagination"
msgstr ""
-#: lib/action.php:1076
+#: lib/action.php:1077
msgid "After"
msgstr ""
-#: lib/action.php:1084
+#: lib/action.php:1085
#, fuzzy
msgid "Before"
msgstr "Tidligere »"
-#: lib/action.php:1132
+#: lib/action.php:1133
msgid "There was a problem with your session token."
msgstr ""
@@ -4060,6 +4170,10 @@ msgstr ""
msgid "Design configuration"
msgstr ""
+#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+msgid "Paths configuration"
+msgstr ""
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4233,11 +4347,10 @@ msgid "You are not subscribed to anyone."
msgstr "Ikke autorisert."
#: lib/command.php:620
-#, fuzzy
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
-msgstr[0] "Svar til %s"
-msgstr[1] "Svar til %s"
+msgstr[0] "Ikke autorisert."
+msgstr[1] "Ikke autorisert."
#: lib/command.php:640
#, fuzzy
@@ -4245,7 +4358,6 @@ msgid "No one is subscribed to you."
msgstr "Svar til %s"
#: lib/command.php:642
-#, fuzzy
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Svar til %s"
@@ -4257,7 +4369,6 @@ msgid "You are not a member of any groups."
msgstr "Du er allerede logget inn!"
#: lib/command.php:664
-#, fuzzy
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Du er allerede logget inn!"
@@ -4342,7 +4453,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
@@ -4441,7 +4552,7 @@ msgstr ""
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
-#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85
msgid "Group"
msgstr ""
@@ -4487,7 +4598,7 @@ msgstr ""
msgid "Tags in %s group's notices"
msgstr ""
-#: lib/htmloutputter.php:104
+#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
msgstr ""
@@ -4521,6 +4632,14 @@ msgstr "Klarte ikke å lagre profil."
msgid "Unknown file type"
msgstr ""
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
@@ -4556,7 +4675,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:424
+#: lib/mailbox.php:227 lib/noticelist.php:452
#, fuzzy
msgid "from"
msgstr "fra"
@@ -4803,37 +4922,62 @@ msgstr ""
msgid "To"
msgstr ""
-#: lib/messageform.php:162 lib/noticeform.php:173
+#: lib/messageform.php:162 lib/noticeform.php:186
#, fuzzy
msgid "Available characters"
msgstr "6 eller flere tegn"
-#: lib/noticeform.php:145
+#: lib/noticeform.php:158
msgid "Send a notice"
msgstr ""
-#: lib/noticeform.php:158
+#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
msgstr ""
-#: lib/noticeform.php:180
+#: lib/noticeform.php:193
msgid "Attach"
msgstr ""
-#: lib/noticeform.php:184
+#: lib/noticeform.php:197
msgid "Attach a file"
msgstr ""
-#: lib/noticelist.php:478
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "N"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr ""
+
+#: lib/noticelist.php:506
msgid "in context"
msgstr ""
-#: lib/noticelist.php:498
+#: lib/noticelist.php:526
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:499
+#: lib/noticelist.php:527
#, fuzzy
msgid "Reply"
msgstr "svar"
@@ -4866,11 +5010,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 ""
@@ -4980,6 +5124,10 @@ msgstr "Kan ikke slette notisen."
msgid "Search site"
msgstr "Søk"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
#, fuzzy
msgid "Search help"
@@ -4993,10 +5141,6 @@ msgstr ""
msgid "Find people on this site"
msgstr ""
-#: lib/searchgroupnav.php:82
-msgid "Notice"
-msgstr ""
-
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
msgstr ""
@@ -5136,47 +5280,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"
@@ -5205,11 +5353,3 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
-
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "Kan ikke slette notisen."
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "Svar til %s"
diff --git a/locale/nl/LC_MESSAGES/statusnet.mo b/locale/nl/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 5384ea6b4..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 022b02b5f..bb3f44d55 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -9,16 +9,16 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 10:43+0000\n"
-"PO-Revision-Date: 2009-11-18 19:32:22+0000\n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-11-28 19:50:42+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
@@ -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
@@ -357,7 +357,7 @@ msgstr "Locatie is te lang (maximaal 255 tekens)."
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
-msgstr "Te veel aliasen! Het maximale aantal is %d."
+msgstr "Te veel aliassen! Het maximale aantal is %d."
#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
@@ -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
@@ -379,9 +379,8 @@ msgstr "Een alias kan niet hetzelfde zijn als de gebruikersnaam."
#: 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 "De API-functie is niet aangetroffen!"
+msgstr "De groep is niet aangetroffen!"
#: actions/apigroupjoin.php:110
msgid "You are already a member of that group."
@@ -389,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
@@ -451,7 +450,7 @@ msgstr "Dat is te lang. De maximale mededelingslengte is 140 tekens."
msgid "Not found"
msgstr "Niet gevonden"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -567,7 +566,7 @@ msgid "Preview"
msgstr "Voorvertoning"
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
+#: lib/noticelist.php:550
msgid "Delete"
msgstr "Verwijderen"
@@ -580,7 +579,7 @@ msgid "Crop"
msgstr "Uitsnijden"
#: actions/avatarsettings.php:265 actions/disfavor.php:74
-#: actions/emailsettings.php:237 actions/favor.php:75
+#: 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
@@ -597,7 +596,7 @@ msgstr ""
"alstublieft."
#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
-#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: 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."
@@ -664,7 +663,6 @@ msgid "Unblock this user"
msgstr "Deblokkeer deze gebruiker."
#: actions/block.php:69
-#, fuzzy
msgid "You already blocked that user."
msgstr "U hebt deze gebruiker reeds geblokkeerd."
@@ -730,15 +728,15 @@ msgstr "Onbekend adrestype %s"
msgid "That address has already been confirmed."
msgstr "Dit adres is al bevestigd."
-#: actions/confirmaddress.php:114 actions/emailsettings.php:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
#: actions/profilesettings.php:276 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Kon gebruiker niet actualiseren."
-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
msgstr "De e-mailbevestiging kon niet verwijderd worden."
@@ -757,7 +755,7 @@ msgid "Conversation"
msgstr "Dialoog"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206
+#: lib/profileaction.php:206 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Mededelingen"
@@ -798,7 +796,7 @@ msgstr "Weet u zeker dat u deze aankondiging wilt verwijderen?"
msgid "Do not delete this notice"
msgstr "Deze mededeling niet verwijderen"
-#: actions/deletenotice.php:146 lib/noticelist.php:522
+#: actions/deletenotice.php:146 lib/noticelist.php:550
msgid "Delete this notice"
msgstr "Deze mededeling verwijderen"
@@ -808,30 +806,29 @@ msgstr ""
"Er is een probleem ontstaan met uw sessietoken. Probeer het nog een keer."
#: actions/deleteuser.php:67
-#, fuzzy
msgid "You cannot delete users."
-msgstr "Het was niet mogelijk de gebruiker te actualiseren."
+msgstr "U kunt gebruikers niet verwijderen."
#: actions/deleteuser.php:74
-#, fuzzy
msgid "You can only delete local users."
-msgstr "U kunt de status van een andere gebruiker niet verwijderen."
+msgstr "U kunt alleen lokale gebruikers verwijderen."
#: actions/deleteuser.php:110 actions/deleteuser.php:133
-#, fuzzy
msgid "Delete user"
-msgstr "Verwijderen"
+msgstr "Gebruiker verwijderen"
#: 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 ""
+"Weet u zeker dat u deze gebruiker wilt verwijderen? Door deze handeling "
+"worden alle gegevens van deze gebruiker uit de database verwijderd. Het is "
+"niet mogelijk ze terug te zetten."
#: actions/deleteuser.php:148 lib/deleteuserform.php:77
-#, fuzzy
msgid "Delete this user"
-msgstr "Deze mededeling verwijderen"
+msgstr "Gebruiker verwijderen"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
#: lib/adminpanelaction.php:302 lib/groupnav.php:119
@@ -840,186 +837,114 @@ msgstr "Ontwerp"
#: actions/designadminpanel.php:73
msgid "Design settings for this StatusNet site."
-msgstr ""
+msgstr "Instellingen voor de vormgeving van deze StatusNet-website."
-#: actions/designadminpanel.php:278
-#, fuzzy
+#: actions/designadminpanel.php:270
msgid "Invalid logo URL."
-msgstr "Ongeldige afmetingen."
-
-#: actions/designadminpanel.php:282
-#, fuzzy, php-format
-msgid "Theme not available: %s"
-msgstr "IM is niet beschikbaar."
-
-#: actions/designadminpanel.php:288
-#, fuzzy, php-format
-msgid "Theme directory not readable: %s"
-msgstr "IM is niet beschikbaar."
-
-#: actions/designadminpanel.php:292
-#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:296
-#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
+msgstr "De logo-URL is ongeldig."
-#: actions/designadminpanel.php:312
+#: actions/designadminpanel.php:274
#, php-format
-msgid "Max length for %s %s is 255 characters."
-msgstr ""
+msgid "Theme not available: %s"
+msgstr "De vormgeving is niet beschikbaar: %s"
-#: actions/designadminpanel.php:412
-#, fuzzy
+#: actions/designadminpanel.php:370
msgid "Change logo"
-msgstr "Kleuren wijzigen"
+msgstr "Logo wijzigen"
-#: actions/designadminpanel.php:417
-#, fuzzy
+#: actions/designadminpanel.php:375
msgid "Site logo"
-msgstr "Uitnodigen"
+msgstr "Websitelogo"
-#: actions/designadminpanel.php:424
-#, fuzzy
+#: actions/designadminpanel.php:382
msgid "Change theme"
-msgstr "Wijzigen"
+msgstr "Vormgeving wijzigen"
-#: actions/designadminpanel.php:441
-#, fuzzy
+#: actions/designadminpanel.php:399
msgid "Site theme"
-msgstr "Kennisgeving van site"
+msgstr "Vormgeving website"
-#: actions/designadminpanel.php:442
-#, fuzzy
+#: actions/designadminpanel.php:400
msgid "Theme for the site."
-msgstr "Van de site afmelden"
-
-#: actions/designadminpanel.php:447
-msgid "Theme server"
-msgstr ""
+msgstr "Mogelijke vormgevingen voor deze website."
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
-
-#: actions/designadminpanel.php:455
-msgid "Theme directory"
-msgstr ""
-
-#: actions/designadminpanel.php:462
-#, fuzzy
-msgid "Avatar Settings"
-msgstr "Avatarinstellingen"
-
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Avatar server"
-msgstr "Avatarinstellingen"
-
-#: actions/designadminpanel.php:471
-#, fuzzy
-msgid "Avatar path"
-msgstr "De avatar is bijgewerkt."
-
-#: actions/designadminpanel.php:475
-#, fuzzy
-msgid "Avatar directory"
-msgstr "De avatar is verwijderd."
-
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
msgstr "Achtergrondafbeelding wijzigen"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
msgstr "Achtergrond"
-#: actions/designadminpanel.php:496
-#, fuzzy, php-format
+#: actions/designadminpanel.php:422
+#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr ""
-"Hier kunt u een logo voor uw groep uploaden. De maximale bestandsgrootte is %"
-"s."
+"Hier kunt u een achtergrondafbeelding voor de website uploaden. De maximale "
+"bestandsgrootte is %1$s."
-#: actions/designadminpanel.php:526 lib/designsettings.php:139
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
msgstr "Aan"
-#: actions/designadminpanel.php:542 lib/designsettings.php:155
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
msgstr "Uit"
-#: actions/designadminpanel.php:543 lib/designsettings.php:156
+#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Achtergrondafbeelding inschakelen of uitschakelen."
-#: actions/designadminpanel.php:548 lib/designsettings.php:161
+#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Achtergrondafbeelding naast elkaar"
-#: actions/designadminpanel.php:554
-#, fuzzy
-msgid "Background server"
-msgstr "Achtergrond"
-
-#: actions/designadminpanel.php:558
-#, fuzzy
-msgid "Background path"
-msgstr "Achtergrond"
-
-#: actions/designadminpanel.php:562
-#, fuzzy
-msgid "Background directory"
-msgstr "Achtergrond"
-
-#: actions/designadminpanel.php:569 lib/designsettings.php:170
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
msgid "Change colours"
msgstr "Kleuren wijzigen"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
msgid "Content"
msgstr "Inhoud"
-#: actions/designadminpanel.php:604 lib/designsettings.php:204
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Menubalk"
-#: actions/designadminpanel.php:617 lib/designsettings.php:217
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
msgstr "Tekst"
-#: actions/designadminpanel.php:630 lib/designsettings.php:230
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
msgid "Links"
msgstr "Verwijzingen"
-#: actions/designadminpanel.php:658 lib/designsettings.php:247
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Standaardinstellingen gebruiken"
-#: actions/designadminpanel.php:659 lib/designsettings.php:248
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Standaardontwerp toepassen"
-#: actions/designadminpanel.php:665 lib/designsettings.php:254
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Standaardinstellingen toepassen"
-#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 actions/useradminpanel.php:226
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: 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 "Opslaan"
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: actions/designadminpanel.php:582 lib/designsettings.php:257
msgid "Save design"
msgstr "Ontwerp opslaan"
@@ -1131,8 +1056,8 @@ msgstr "Stuur een email naar dit adres om een nieuw bericht te posten"
#: actions/emailsettings.php:145 actions/smssettings.php:162
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
-"Een nieuw e-mailadres instellen voor het onvangen van e-mail; verwijdert het "
-"eerder geinstelde e-mailadres."
+"Een nieuw e-mailadres instellen voor het ontvangen van e-mail. Hier wordt "
+"het het eerder ingestelde e-mailadres verwijderd."
#: actions/emailsettings.php:148 actions/smssettings.php:164
msgid "New"
@@ -1149,60 +1074,59 @@ msgstr "Mij e-mailen bij nieuwe abonnementen."
#: actions/emailsettings.php:163
msgid "Send me email when someone adds my notice as a favorite."
-msgstr "Mij een e-mail sturen als iemand mijn mededeling als favoriet instelt."
+msgstr "Mij e-mailen als iemand mijn mededeling als favoriet instelt."
#: actions/emailsettings.php:169
msgid "Send me email when someone sends me a private message."
-msgstr "Mij een e-mail sturen als iemand mij een privébericht zendt."
+msgstr "Mij e-mailen als iemand mij een privébericht zendt."
#: actions/emailsettings.php:174
msgid "Send me email when someone sends me an \"@-reply\"."
-msgstr ""
-"Mij een e-mail sturen als iemand mij een antwoord met \"@\" erin stuurt."
+msgstr "Mij e-mailen als iemand mij een antwoord met \"@\" erin stuurt."
#: actions/emailsettings.php:179
msgid "Allow friends to nudge me and send me an email."
-msgstr "Vrienden toestaan me te porren en te e-mailen."
+msgstr "Vrienden mogen me porren en e-mailen."
#: actions/emailsettings.php:185
msgid "I want to post notices by email."
-msgstr "Ik wil mededelingen per e-mail versturen."
+msgstr "Ik wil mededelingen per e-mail plaatsen."
#: actions/emailsettings.php:191
msgid "Publish a MicroID for my email address."
msgstr "Een MicroID voor mijn e-mailadres publiceren."
-#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/emailsettings.php:302 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
msgstr "De voorkeuren zijn opgeslagen."
-#: actions/emailsettings.php:319
+#: actions/emailsettings.php:320
msgid "No email address."
msgstr "Geen e-mailadres"
-#: actions/emailsettings.php:326
+#: actions/emailsettings.php:327
msgid "Cannot normalize that email address"
msgstr "Kan het emailadres niet normaliseren"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "Geen geldig e-mailadres."
-#: actions/emailsettings.php:333
+#: actions/emailsettings.php:334
msgid "That is already your email address."
msgstr "U hebt dit al ingesteld als uw e-mailadres."
-#: actions/emailsettings.php:336
+#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
msgstr "Dit e-mailadres is al geregistreerd door een andere gebruiker."
-#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "De bevestigingscode kon niet ingevoegd worden."
-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1211,47 +1135,47 @@ msgstr ""
"toegevoegd. Controleer uw inbox (en spam box!) Voor de code en instructies "
"hoe het te gebruiken."
-#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
msgstr "Er is geen openstaand bevestigingsverzoek om te annuleren."
-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
msgstr "Dat is het verkeerde IM-adres."
-#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
msgstr "Bevestiging geannuleerd."
-#: actions/emailsettings.php:412
+#: actions/emailsettings.php:413
msgid "That is not your email address."
msgstr "Dit is niet uw e-mailadres."
-#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
msgstr "Het adres is verwijderd."
-#: actions/emailsettings.php:445 actions/smssettings.php:518
+#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
msgstr "Geen binnenkomend e-mailadres"
-#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
msgid "Couldn't update user record."
msgstr "Kan de gebruikersgegevens niet vernieuwen"
-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
msgstr "Het e-mailadres voor inkomende mail is verwijderd."
-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555
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"
@@ -1464,7 +1388,7 @@ msgid ""
"Customize the way your group looks with a background image and a colour "
"palette of your choice."
msgstr ""
-"Het uiterlijk van uw groep aanpassen met een achtergrondafbeeldingen en een "
+"De vormgeving van uw groep aanpassen met een achtergrondafbeeldingen en een "
"kleurenpalet van uw keuze."
#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
@@ -1520,7 +1444,7 @@ msgstr "% groeps leden, pagina %d"
msgid "A list of the users in this group."
msgstr "Ledenlijst van deze groep"
-#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
msgid "Admin"
msgstr "Beheerder"
@@ -1583,7 +1507,7 @@ msgstr ""
"[aanmaken](%%action.newgroup%%)!"
#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/subgroupnav.php:98
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Groepen"
@@ -1634,8 +1558,8 @@ msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
"doc.im%%). Configure your address and settings below."
msgstr ""
-"U kunt berichten verzenden en ontvangen via Jabber/GTalk [\"instant messages"
-"\"](%%doc.im%%). Maak hieronder uw instellingen."
+"U kunt berichten verzenden en ontvangen via Jabber/GTalk [\"onmiddellijke "
+"berichten\"](%%doc.im%%). Maak hieronder uw instellingen."
#: actions/imsettings.php:89
msgid "IM is not available."
@@ -1670,16 +1594,16 @@ msgstr ""
#: actions/imsettings.php:143
msgid "Send me notices through Jabber/GTalk."
-msgstr "Stuur mij berichten via Jabber/GTalk."
+msgstr "Mij berichten sturen via Jabber/GTalk."
#: actions/imsettings.php:148
msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "Mededeling versturen als mijn Jabber/GTalk-status wijzigt."
+msgstr "Een mededeling versturen als mijn Jabber/GTalk-status wijzigt."
#: actions/imsettings.php:153
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
-"Stuur me antwoorden via Jabber/GTalk van gebruiker op wie ik niet "
+"Mij antwoorden sturen via Jabber/GTalk van gebruikers op wie ik niet "
"geabonneerd ben."
#: actions/imsettings.php:159
@@ -1808,7 +1732,7 @@ msgstr "Persoonlijk bericht"
msgid "Optionally add a personal message to the invitation."
msgstr "Persoonlijk bericht bij de uitnodiging (optioneel)."
-#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
msgstr "Verzenden"
@@ -1927,11 +1851,12 @@ msgid "Incorrect username or password."
msgstr "De gebruikersnaam of wachtwoord is onjuist."
#: actions/login.php:149
-#, fuzzy
msgid "Error setting user. You are probably not authorized."
-msgstr "U hebt niet de juiste toegangsrechten."
+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:457
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Aanmelden"
@@ -2042,7 +1967,7 @@ msgstr "Bericht verzonden."
msgid "Direct message to %s sent"
msgstr "Het directe bericht aan %s is verzonden"
-#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
msgid "Ajax Error"
msgstr "Er is een Ajax-fout opgetreden"
@@ -2050,7 +1975,7 @@ msgstr "Er is een Ajax-fout opgetreden"
msgid "New notice"
msgstr "Nieuw bericht"
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
msgid "Notice posted"
msgstr "De mededeling is verzonden"
@@ -2091,12 +2016,12 @@ msgstr ""
"zijn die een bericht plaatst in [dit onderwerp](%%%%action.newnotice%%%%?"
"status_textarea=%s)!"
-#: actions/noticesearchrss.php:89
+#: actions/noticesearchrss.php:96
#, php-format
msgid "Updates with \"%s\""
msgstr "Updates met \"%s\""
-#: actions/noticesearchrss.php:91
+#: actions/noticesearchrss.php:98
#, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
msgstr "Updates die overeenkomen met de zoekterm \"%1$s\" op %2$s."
@@ -2168,7 +2093,7 @@ msgstr "Te gebruiken automatische verkortingsdienst."
#: actions/othersettings.php:122
msgid "View profile designs"
-msgstr "Profielontwerpen bekijken"
+msgstr "Profielontwerpen gebruiken"
#: actions/othersettings.php:123
msgid "Show or hide profile designs."
@@ -2221,9 +2146,9 @@ msgstr "Zes of meer tekens"
msgid "Confirm"
msgstr "Bevestigen"
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "gelijk aan wachtwoord hierboven"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Gelijk aan het wachtwoord hierboven"
#: actions/passwordsettings.php:117
msgid "Change"
@@ -2253,6 +2178,107 @@ msgstr "Het was niet mogelijk het nieuwe wachtwoord op te slaan."
msgid "Password saved."
msgstr "Het wachtwoord is opgeslagen."
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr "Paden"
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr "Pad- en serverinstellingen voor de StatusNet-website."
+
+#: actions/pathsadminpanel.php:140
+#, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Er kan niet uit de vormgevingmap gelezen worden: %s"
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr "Er kan niet in de avatarmap geschreven worden: %s"
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr "Er kan niet in de achtergrondmap geschreven worden: %s"
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr "Er kan niet uit de talenmap gelezen worden: %s"
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+msgid "Site"
+msgstr "Website"
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr "Pad"
+
+#: actions/pathsadminpanel.php:216
+msgid "Site path"
+msgstr "Websitepad"
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr "Talenpad"
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr "Talenmap"
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr "Vormgeving"
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr "Vormgevingsserver"
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr "Vormgevingspad"
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr "Vormgevingsmap"
+
+#: actions/pathsadminpanel.php:247
+msgid "Avatars"
+msgstr "Avatars"
+
+#: actions/pathsadminpanel.php:252
+msgid "Avatar server"
+msgstr "Avatarserver"
+
+#: actions/pathsadminpanel.php:256
+msgid "Avatar path"
+msgstr "Avatarpad"
+
+#: actions/pathsadminpanel.php:260
+msgid "Avatar directory"
+msgstr "Avatarmap"
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr "Achtergronden"
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr "Achtergrondenserver"
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr "Achtergrondpad"
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr "Achtergrondenmap"
+
+#: actions/pathsadminpanel.php:297
+msgid "Save paths"
+msgstr "Opslagpaden"
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -2359,7 +2385,7 @@ msgstr ""
"Eigen labels (letter, getallen, -, ., en _). Gescheiden door komma's of "
"spaties"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr "Taal"
@@ -2479,9 +2505,8 @@ msgid ""
msgstr ""
"Dit is %%site.name%%, een [microblogdienst](http://en.wikipedia.org/wiki/"
"Micro-blogging) gebaseerd op de Vrije Software [StatusNet](http://status."
-"net/). [Registreer nu](%%%%action.register%%%%) om mededelingen over uzelf "
-"te delen met vrienden, familie en collega's! [Meer lezen...](%%%%doc.help%%%"
-"%)"
+"net/). [Registreer nu](%%action.register%%) om mededelingen over uzelf te "
+"delen met vrienden, familie en collega's! [Meer lezen...](%%doc.help%%)"
#: actions/public.php:238
#, php-format
@@ -2519,8 +2544,8 @@ msgid ""
"Why not [register an account](%%action.register%%) and be the first to post "
"one!"
msgstr ""
-"U kunt een [gebruiker registeren](%%%%action.register%%%%) en dan de eerste "
-"zijn die er een plaatst!"
+"U kunt een [gebruiker registeren](%%action.register%%) en dan de eerste zijn "
+"die er een plaatst!"
#: actions/publictagcloud.php:135
msgid "Tag cloud"
@@ -2605,10 +2630,6 @@ msgstr "Onbekende handeling"
msgid "6 or more characters, and don't forget it!"
msgstr "Zes of meer tekens, en vergeet uw wachtwoord niet!"
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Gelijk aan het wachtwoord hierboven"
-
#: actions/recoverpassword.php:243
msgid "Reset"
msgstr "Herstellen"
@@ -2671,7 +2692,7 @@ msgstr "Sorry. De uitnodigingscode is ongeldig."
msgid "Registration successful"
msgstr "De registratie is voltooid"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registreren"
@@ -2717,7 +2738,7 @@ msgid "Same as password above. Required."
msgstr "Gelijk aan het wachtwoord hierboven. Verplicht"
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-mail"
@@ -2824,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"
@@ -2906,14 +2927,12 @@ msgid "Replies to %1$s on %2$s!"
msgstr "Antwoorden aan %1$s op %2$s."
#: actions/sandbox.php:65 actions/unsandbox.php:65
-#, fuzzy
msgid "You cannot sandbox users on this site."
-msgstr "U kunt geen bericht naar deze gebruiker zenden."
+msgstr "Op deze website kunt u gebruikers niet in de zandbak plaatsen."
#: actions/sandbox.php:72
-#, fuzzy
msgid "User is already sandboxed."
-msgstr "Deze gebruiker is al de toegang tot de groep ontzegd."
+msgstr "Deze gebruiker is al in de zandbak geplaatst."
#: actions/showfavorites.php:79
#, php-format
@@ -2999,7 +3018,7 @@ msgstr "Opmerking"
#: actions/showgroup.php:284 lib/groupeditform.php:184
msgid "Aliases"
-msgstr "Aliasen"
+msgstr "Aliassen"
#: actions/showgroup.php:293
msgid "Group actions"
@@ -3056,7 +3075,7 @@ msgid ""
"their life and interests. [Join now](%%%%action.register%%%%) to become part "
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-"**%s** is een gebruikersgroep bij %%site.name%%, een [microblogdienst]"
+"**%s** is een gebruikersgroep bij %%%%site.name%%%%, een [microblogdienst]"
"(http://en.wikipedia.org/wiki/Micro-blogging) gebaseerd op de Vrije Software "
"[StatusNet](http://status.net/). De groepsleden wisselen korte berichten uit "
"over hun leven en interesses. [Registreer nu](%%%%action.register%%%%) om "
@@ -3168,10 +3187,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** is actief op %%site.name%%, een [microblogdienst](http://en.wikipedia."
-"org/wiki/Micro-blogging) gebaseerd op de Vrije Software [StatusNet](http://"
-"status.net/). [Registreer nu](%%%%action.register%%%%) om te abonneren op de "
-"mededelingen van **%s** en nog veel meer! [Meer lezen...](%%%%doc.help%%%%)"
+"**%s** is actief op %%%%site.name%%%%, een [microblogdienst](http://en."
+"wikipedia.org/wiki/Micro-blogging) gebaseerd op de Vrije Software [StatusNet]"
+"(http://status.net/). [Registreer nu](%%%%action.register%%%%) om te "
+"abonneren op de mededelingen van **%s** en nog veel meer! [Meer lezen...](%%%"
+"%doc.help%%%%)"
#: actions/showstream.php:239
#, php-format
@@ -3185,258 +3205,253 @@ msgstr ""
"[StatusNet](http://status.net/). "
#: actions/silence.php:65 actions/unsilence.php:65
-#, fuzzy
msgid "You cannot silence users on this site."
-msgstr "U kunt geen bericht naar deze gebruiker zenden."
+msgstr "U kunt gebruikers op deze website niet muilkorven."
#: actions/silence.php:72
-#, fuzzy
msgid "User is already silenced."
-msgstr "Deze gebruiker is al de toegang tot de groep ontzegd."
-
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
-#, fuzzy
-msgid "Site"
-msgstr "Uitnodigen"
+msgstr "Deze gebruiker is al gemuilkorfd."
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
-msgstr ""
+msgstr "Basisinstellingen voor deze StatusNet-website."
#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
-msgstr ""
+msgstr "De sitenaam moet ingevoerd worden en mag niet leeg zijn."
#: actions/siteadminpanel.php:155
-#, fuzzy
msgid "You must have a valid contact email address"
-msgstr "Geen geldig e-mailadres."
+msgstr ""
+"U moet een geldig e-mailadres opgeven waarop contact opgenomen kan worden"
#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
-msgstr ""
+msgstr "De taal \"%s\" is niet bekend"
#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
-msgstr ""
+msgstr "De rapportage-URL voor snapshots is ongeldig."
#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
-msgstr ""
+msgstr "De waarde voor het uitvoeren van snapshots is ongeldig."
#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
-msgstr ""
+msgstr "De snapshotfrequentie moet een getal zijn."
#: actions/siteadminpanel.php:199
-msgid "You must set an SSL sever when enabling SSL."
-msgstr ""
+msgid "You must set an SSL server when enabling SSL."
+msgstr "U moet een SSL-server instellen als u SSL wilt inschakelen."
#: actions/siteadminpanel.php:204
-msgid "Invalid SSL server. Max length is 255 characters."
-msgstr ""
+msgid "Invalid SSL server. The maximum length is 255 characters."
+msgstr "De SSL-server is ongeldig. De maximale lengte is 255 tekens."
#: actions/siteadminpanel.php:210
-msgid "Minimum text limit is 140c."
-msgstr ""
+msgid "Minimum text limit is 140 characters."
+msgstr "De minimale tekstlimiet is 140 tekens."
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
-msgstr ""
+msgstr "De duplicaatlimiet moet één of meer seconden zijn."
-#: actions/siteadminpanel.php:224
-#, php-format
-msgid "Locales directory not readable: %s"
-msgstr ""
+#: actions/siteadminpanel.php:266
+msgid "General"
+msgstr "Algemeen"
-#: actions/siteadminpanel.php:275
-#, fuzzy
+#: actions/siteadminpanel.php:269
msgid "Site name"
-msgstr "Kennisgeving van site"
+msgstr "Websitenaam"
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
-msgstr ""
+msgstr "De naam van de website, zoals \"UwBedrijf Microblog\""
-#: actions/siteadminpanel.php:279
+#: actions/siteadminpanel.php:274
msgid "Brought by"
-msgstr ""
+msgstr "Mogelijk gemaakt door"
-#: actions/siteadminpanel.php:280
+#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
msgstr ""
+"De tekst die gebruikt worden in de \"creditsverwijzing\" in de voettekst van "
+"iedere pagina"
-#: actions/siteadminpanel.php:283
+#: actions/siteadminpanel.php:279
msgid "Brought by URL"
-msgstr ""
+msgstr "\"Mogelijk gemaakt door\"-URL"
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
msgstr ""
+"URL die wordt gebruikt voor de verwijzing naar de hoster en dergelijke in de "
+"voettekst van iedere pagina"
-#: actions/siteadminpanel.php:288
-#, fuzzy
-msgid "contact email address for your site"
-msgstr "Nieuw e-mailadres om e-mail te versturen aan %s"
+#: actions/siteadminpanel.php:284
+msgid "Contact email address for your site"
+msgstr "E-mailadres om contact op te nemen met de websitebeheerder"
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:290
+msgid "Local"
+msgstr "Lokaal"
+
+#: actions/siteadminpanel.php:301
msgid "Default timezone"
-msgstr ""
+msgstr "Standaardtijdzone"
-#: actions/siteadminpanel.php:303
+#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
-msgstr ""
+msgstr "Standaardtijdzone voor de website. Meestal UTC."
-#: actions/siteadminpanel.php:310
-#, fuzzy
+#: actions/siteadminpanel.php:308
msgid "Default site language"
-msgstr "Voorkeurstaal"
+msgstr "Standaardtaal"
#: actions/siteadminpanel.php:316
-msgid "Path to locales"
-msgstr ""
+msgid "URLs"
+msgstr "URL's"
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
-msgstr ""
-
-#: actions/siteadminpanel.php:320
-#, fuzzy
+#: actions/siteadminpanel.php:319
msgid "Server"
-msgstr "Herstellen"
+msgstr "Server"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
-msgstr ""
+msgstr "Hostnaam van de website server."
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-#, fuzzy
-msgid "Site path"
-msgstr "Kennisgeving van site"
-
-#: actions/siteadminpanel.php:328
+#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
-msgstr ""
+msgstr "Nette URL's"
-#: actions/siteadminpanel.php:330
+#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
+msgstr "Nette URL's (meer leesbaar en beter te onthouden) gebruiken?"
+
+#: actions/siteadminpanel.php:331
+msgid "Access"
+msgstr "Toegang"
#: actions/siteadminpanel.php:334
-#, fuzzy
msgid "Private"
-msgstr "Privacy"
+msgstr "Privé"
#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
+msgstr "Mogen anonieme gebruikers (niet aangemeld) de website bekijken?"
#: actions/siteadminpanel.php:340
-#, fuzzy
msgid "Invite only"
-msgstr "Uitnodigen"
+msgstr "Alleen op uitnodiging"
#: actions/siteadminpanel.php:342
msgid "Make registration invitation only."
-msgstr ""
+msgstr "Registratie alleen op uitnodiging."
-#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
-#, fuzzy
+#: actions/siteadminpanel.php:346
msgid "Closed"
-msgstr "Geblokkeerd"
+msgstr "Gesloten"
#: actions/siteadminpanel.php:348
msgid "Disable new registrations."
-msgstr ""
+msgstr "Nieuwe registraties uitschakelen."
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
+msgstr "Snapshots"
+
+#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
-msgstr ""
+msgstr "Willekeurig tijdens een websitehit"
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
-msgstr ""
+msgstr "Als geplande taak"
-#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
-#, fuzzy
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
msgid "Never"
-msgstr "Herstellen"
+msgstr "Nooit"
-#: actions/siteadminpanel.php:357
+#: actions/siteadminpanel.php:360
msgid "Data snapshots"
-msgstr ""
+msgstr "Snapshots van gegevens"
-#: actions/siteadminpanel.php:358
+#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
msgstr ""
+"Wanneer statistische gegevens naar de status.net-servers verzonden worden"
-#: actions/siteadminpanel.php:364
+#: actions/siteadminpanel.php:366
msgid "Frequency"
-msgstr ""
+msgstr "Frequentie"
-#: actions/siteadminpanel.php:365
-msgid "Snapshots will be sent once every N Web hits"
-msgstr ""
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
+msgstr "Iedere zoveel websitehits wordt een snapshot verzonden"
#: actions/siteadminpanel.php:372
msgid "Report URL"
-msgstr ""
+msgstr "Rapportage-URL"
#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
-msgstr ""
+msgstr "Snapshots worden naar deze URL verzonden"
+
+#: actions/siteadminpanel.php:380
+msgid "SSL"
+msgstr "SSL"
-#: actions/siteadminpanel.php:381
-#, fuzzy
+#: actions/siteadminpanel.php:384
msgid "Sometimes"
-msgstr "Mededelingen"
+msgstr "Soms"
-#: actions/siteadminpanel.php:382
-#, fuzzy
+#: actions/siteadminpanel.php:385
msgid "Always"
-msgstr "Aliasen"
+msgstr "Altijd"
-#: actions/siteadminpanel.php:384
+#: actions/siteadminpanel.php:387
msgid "Use SSL"
-msgstr ""
+msgstr "SSL gebruiken"
-#: actions/siteadminpanel.php:385
+#: actions/siteadminpanel.php:388
msgid "When to use SSL"
-msgstr ""
+msgstr "Wanneer SSL gebruikt moet worden"
-#: actions/siteadminpanel.php:391
+#: actions/siteadminpanel.php:393
msgid "SSL Server"
-msgstr ""
+msgstr "SSL-server"
-#: actions/siteadminpanel.php:392
+#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
-msgstr ""
+msgstr "De server waar SSL-verzoeken heen gestuurd moeten worden"
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr "Limieten"
+
+#: actions/siteadminpanel.php:403
msgid "Text limit"
-msgstr ""
+msgstr "Tekstlimiet"
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
-msgstr ""
+msgstr "Maximaal aantal te gebruiken tekens voor mededelingen."
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "Dupe limit"
-msgstr ""
+msgstr "Duplicaatlimiet"
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
+"Hoe lang gebruikers moeten wachten (in seconden) voor ze hetzelfde kunnen "
+"zenden."
-#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
-#, fuzzy
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
msgid "Save site settings"
-msgstr "Avatarinstellingen"
+msgstr "Websiteinstellingen opslaan"
#: actions/smssettings.php:58
msgid "SMS Settings"
@@ -3469,7 +3484,7 @@ msgstr "Voer de code in die u via uw telefoon hebt ontvangen."
#: actions/smssettings.php:138
msgid "SMS Phone number"
-msgstr "SMS-telefoonnummer"
+msgstr "SMS-nummer"
#: actions/smssettings.php:140
msgid "Phone number, no punctuation or spaces, with area code"
@@ -3480,8 +3495,8 @@ msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
msgstr ""
-"Stuur me mededelingen via SMS. Ik begrijp dat dit exorbitante rekeningen van "
-"mijn provider kan opleveren."
+"Mij mededelingen via SMS sturen. Ik begrijp dat dit exorbitante rekeningen "
+"van mijn provider kan opleveren."
#: actions/smssettings.php:306
msgid "No phone number."
@@ -3695,7 +3710,7 @@ msgstr ""
#: actions/tag.php:68
#, php-format
msgid "Notices tagged with %s, page %d"
-msgstr "Kennisgevingen met het label %s, pagina %d"
+msgstr "Mededelingen met het label %s, pagina %d"
#: actions/tag.php:86
#, php-format
@@ -3721,19 +3736,16 @@ msgid "API method under construction."
msgstr "De API-functie is in bewerking."
#: actions/unblock.php:59
-#, fuzzy
msgid "You haven't blocked that user."
-msgstr "U hebt deze gebruiker reeds geblokkeerd."
+msgstr "U hebt deze gebruiker niet geblokkeerd."
#: actions/unsandbox.php:72
-#, fuzzy
msgid "User is not sandboxed."
-msgstr "De gebruiker is niet de toegang tot de groep ontzegd."
+msgstr "Deze gebruiker is niet in de zandbak geplaatst."
#: actions/unsilence.php:72
-#, fuzzy
msgid "User is not silenced."
-msgstr "Deze gebruiker heeft geen profiel."
+msgstr "Deze gebruiker is niet gemuilkorfd."
#: actions/unsubscribe.php:77
msgid "No profile id in request."
@@ -3754,26 +3766,92 @@ msgstr ""
"De licentie \"%s\" voor de stream die u wilt volgen is niet compatibel met "
"de sitelicentie \"%s\"."
-#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
msgid "User"
msgstr "Gebruiker"
#: actions/useradminpanel.php:69
msgid "User settings for this StatusNet site."
-msgstr ""
+msgstr "Gebruikersinstellingen voor deze StatusNet-website."
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
-msgstr ""
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr "Ongeldige beschrijvingslimiet. Het moet een getal zijn."
-#: actions/useradminpanel.php:178
-#, fuzzy
-msgid "Invite-only"
-msgstr "Uitnodigen"
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
+msgstr "Ongeldige welkomsttekst. De maximale lengte is 255 tekens."
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
-msgstr ""
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr "Ongeldig standaardabonnement: \"%1$s\" is geen gebruiker."
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Profiel"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr "Profiellimiet"
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
+msgstr "De maximale lengte van de profieltekst in tekens."
+
+#: actions/useradminpanel.php:231
+msgid "New users"
+msgstr "Nieuwe gebruikers"
+
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr "Welkom voor nieuwe gebruikers"
+
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr "Welkomsttekst voor nieuwe gebruikers. Maximaal 255 tekens."
+
+#: actions/useradminpanel.php:241
+msgid "Default subscription"
+msgstr "Standaardabonnement"
+
+#: actions/useradminpanel.php:242
+msgid "Automatically subscribe new users to this user."
+msgstr "Nieuwe gebruikers automatisch op deze gebruiker abonneren"
+
+#: actions/useradminpanel.php:251
+msgid "Invitations"
+msgstr "Uitnodigingen"
+
+#: actions/useradminpanel.php:256
+msgid "Invitations enabled"
+msgstr "Uitnodigingen ingeschakeld"
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr "Of gebruikers nieuwe gebruikers kunnen uitnodigen."
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr "Sessies"
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr "Sessieafhandeling"
+
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
+msgstr "Of sessies door de software zelf afgehandeld moeten worden."
+
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr "Sessies debuggen"
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
+msgstr "Debuguitvoer voor sessies inschakelen."
#: actions/userauthorization.php:105
msgid "Authorize subscription"
@@ -3891,7 +3969,7 @@ msgid ""
"Customize the way your profile looks with a background image and a colour "
"palette of your choice."
msgstr ""
-"U kunt het uiterlijk van uw profiel aanpassen door een achtergrondafbeelding "
+"U kunt de vormgeving van uw profiel aanpassen door een achtergrondafbeelding "
"toe te voegen of het kleurenpalet aan te passen."
#: actions/userdesignsettings.php:282
@@ -3940,9 +4018,8 @@ msgstr ""
"Een bestand van deze grootte overschijdt uw maandelijkse quota van %d bytes."
#: classes/Message.php:45
-#, fuzzy
msgid "You are banned from sending direct messages."
-msgstr "Er is een fout opgetreden bij het verzonden van het directe bericht."
+msgstr "U mag geen directe berichten verzenden."
#: classes/Message.php:61
msgid "Could not insert message."
@@ -3966,7 +4043,7 @@ msgstr ""
#: classes/Notice.php:183
msgid "Problem saving notice. Unknown user."
msgstr ""
-"Er was een probleem bij het opslaan vna de kennisgeving. De gebruiker is "
+"Er was een probleem bij het opslaan van de mededeling. De gebruiker is "
"onbekend."
#: classes/Notice.php:188
@@ -3993,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 ""
@@ -4012,10 +4089,6 @@ msgstr "Het was niet mogelijk het groepslidmaatschap in te stellen."
msgid "Welcome to %1$s, @%2$s!"
msgstr "Welkom bij %1$s, @%2$s!"
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr "Profiel"
-
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Uw profielgegevens wijzigen"
@@ -4053,129 +4126,128 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "Naamloze pagina"
-#: lib/action.php:424
+#: lib/action.php:425
msgid "Primary site navigation"
msgstr "Primaire sitenavigatie"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Home"
-msgstr "Thuis"
+msgstr "Thuispagina"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Personal profile and friends timeline"
msgstr "Persoonlijk profiel en tijdlijn van vrienden"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Account"
msgstr "Gebruiker"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Change your email, avatar, password, profile"
msgstr "Uw e-mailadres, avatar, wachtwoord of profiel wijzigen"
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect"
msgstr "Koppelen"
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect to services"
msgstr "Met diensten verbinden"
-#: lib/action.php:439
-#, fuzzy
+#: lib/action.php:440
msgid "Change site configuration"
-msgstr "Primaire sitenavigatie"
+msgstr "Websiteinstellingen wijzigen"
-#: lib/action.php:443 lib/subgroupnav.php:105
+#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Uitnodigen"
-#: lib/action.php:444 lib/subgroupnav.php:106
+#: lib/action.php:445 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Vrienden en collega's uitnodigen om u te vergezellen op %s"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout"
msgstr "Afmelden"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout from the site"
msgstr "Van de site afmelden"
-#: lib/action.php:454
+#: lib/action.php:455
msgid "Create an account"
msgstr "Gebruiker aanmaken"
-#: lib/action.php:457
+#: lib/action.php:458
msgid "Login to the site"
msgstr "Bij de site aanmelden"
-#: lib/action.php:460 lib/action.php:723
+#: lib/action.php:461 lib/action.php:724
msgid "Help"
msgstr "Help"
-#: lib/action.php:460
+#: lib/action.php:461
msgid "Help me!"
msgstr "Help me!"
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
msgstr "Zoeken"
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
msgstr "Naar gebruikers of tekst zoeken"
-#: lib/action.php:484
+#: lib/action.php:485
msgid "Site notice"
-msgstr "Kennisgeving van site"
+msgstr "Mededeling van de website"
-#: lib/action.php:550
+#: lib/action.php:551
msgid "Local views"
msgstr "Lokale weergaven"
-#: lib/action.php:616
+#: lib/action.php:617
msgid "Page notice"
-msgstr "Kennisgeving van pagina"
+msgstr "Mededeling van de pagina"
-#: lib/action.php:718
+#: lib/action.php:719
msgid "Secondary site navigation"
msgstr "Secundaire sitenavigatie"
-#: lib/action.php:725
+#: lib/action.php:726
msgid "About"
msgstr "Over"
-#: lib/action.php:727
+#: lib/action.php:728
msgid "FAQ"
-msgstr "Veelgestelde vragen"
+msgstr "Veel gestelde vragen"
-#: lib/action.php:731
+#: lib/action.php:732
msgid "TOS"
-msgstr "TOS"
+msgstr "Gebruiksvoorwaarden"
-#: lib/action.php:734
+#: lib/action.php:735
msgid "Privacy"
msgstr "Privacy"
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
-msgstr "Bron"
+msgstr "Broncode"
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Contact"
msgstr "Contact"
-#: lib/action.php:740
+#: lib/action.php:741
msgid "Badge"
-msgstr "Naamplaatje"
+msgstr "Widget"
-#: lib/action.php:768
+#: lib/action.php:769
msgid "StatusNet software license"
msgstr "Licentie van de StatusNet-software"
-#: lib/action.php:771
+#: lib/action.php:772
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4184,12 +4256,12 @@ msgstr ""
"**%%site.name%%** is een microblogdienst van [%%site.broughtby%%](%%site."
"broughtbyurl%%). "
-#: lib/action.php:773
+#: lib/action.php:774
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** is een microblogdienst. "
-#: lib/action.php:775
+#: lib/action.php:776
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4200,63 +4272,61 @@ msgstr ""
"versie %s, beschikbaar onder de [GNU Affero General Public License](http://"
"www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:789
+#: lib/action.php:790
msgid "Site content license"
msgstr "Licentie voor siteinhoud"
-#: lib/action.php:798
+#: lib/action.php:799
msgid "All "
msgstr "Alle "
-#: lib/action.php:803
+#: lib/action.php:804
msgid "license."
msgstr "licentie."
-#: lib/action.php:1067
+#: lib/action.php:1068
msgid "Pagination"
msgstr "Paginering"
-#: lib/action.php:1076
+#: lib/action.php:1077
msgid "After"
-msgstr "Na"
+msgstr "Later"
-#: lib/action.php:1084
+#: lib/action.php:1085
msgid "Before"
-msgstr "Voor"
+msgstr "Eerder"
-#: lib/action.php:1132
+#: lib/action.php:1133
msgid "There was a problem with your session token."
msgstr "Er is een probleem met uw sessietoken."
#: lib/adminpanelaction.php:96
-#, fuzzy
msgid "You cannot make changes to this site."
-msgstr "U kunt geen bericht naar deze gebruiker zenden."
+msgstr "U mag geen wijzigingen maken aan deze website."
#: lib/adminpanelaction.php:195
-#, fuzzy
msgid "showForm() not implemented."
-msgstr "Dit commando is nog niet geïmplementeerd."
+msgstr "showForm() is niet geïmplementeerd."
#: lib/adminpanelaction.php:224
-#, fuzzy
msgid "saveSettings() not implemented."
-msgstr "Dit commando is nog niet geïmplementeerd."
+msgstr "saveSettings() is nog niet geïmplementeerd."
#: lib/adminpanelaction.php:247
-#, fuzzy
msgid "Unable to delete design setting."
-msgstr "Het was niet mogelijk om uw ontwerpinstellingen op te slaan."
+msgstr "Het was niet mogelijk om de ontwerpinstellingen te verwijderen."
#: lib/adminpanelaction.php:300
-#, fuzzy
msgid "Basic site configuration"
-msgstr "E-mailadresbevestiging"
+msgstr "Basisinstellingen voor de website"
#: lib/adminpanelaction.php:303
-#, fuzzy
msgid "Design configuration"
-msgstr "SMS-bevestiging"
+msgstr "Instellingen vormgeving"
+
+#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+msgid "Paths configuration"
+msgstr "Padinstellingen"
#: lib/attachmentlist.php:87
msgid "Attachments"
@@ -4439,33 +4509,30 @@ msgid "You are not subscribed to anyone."
msgstr "U bent op geen enkele gebruiker geabonneerd."
#: lib/command.php:620
-#, fuzzy
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
-msgstr[0] "U bent op de volgende gebruikers geabonneerd: "
-msgstr[1] "U bent op de volgende gebruikers geabonneerd: "
+msgstr[0] "U bent geabonneerd op deze gebruiker:"
+msgstr[1] "U bent geabonneerd op deze gebruikers:"
#: lib/command.php:640
msgid "No one is subscribed to you."
msgstr "Niemand heeft een abonnenment op u."
#: lib/command.php:642
-#, fuzzy
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
-msgstr[0] "Niemand heeft een abonnenment op u."
-msgstr[1] "Niemand heeft een abonnenment op u."
+msgstr[0] "Deze gebruiker is op u geabonneerd:"
+msgstr[1] "Deze gebruikers zijn op u geabonneerd:"
#: lib/command.php:662
msgid "You are not a member of any groups."
msgstr "U bent lid van geen enkele groep."
#: lib/command.php:664
-#, fuzzy
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
-msgstr[0] "U bent lid van de volgende groepen: "
-msgstr[1] "U bent lid van de volgende groepen: "
+msgstr[0] "U bent lid van deze groep:"
+msgstr[1] "U bent lid van deze groepen:"
#: lib/command.php:678
msgid ""
@@ -4582,10 +4649,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: "
@@ -4597,11 +4664,11 @@ msgstr "Het standaardontwerp is weer ingesteld."
#: lib/disfavorform.php:114 lib/disfavorform.php:140
msgid "Disfavor this notice"
-msgstr "Mededeling uit favorieten verwijderen"
+msgstr "Uit de favorietenlijst verwijderen"
#: lib/favorform.php:114 lib/favorform.php:140
msgid "Favor this notice"
-msgstr "Deze kennisgeving op de favorietenlijst plaatsen"
+msgstr "Op de favorietenlijst plaatsen"
#: lib/favorform.php:140
msgid "Favor"
@@ -4609,7 +4676,7 @@ msgstr "Aan favorieten toevoegen"
#: lib/feedlist.php:64
msgid "Export data"
-msgstr "Gegevens exporteren"
+msgstr "Feeds"
#: lib/feed.php:85
msgid "RSS 1.0"
@@ -4680,7 +4747,7 @@ msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
"Extra namen voor de groep, gescheiden door komma's of spaties. Maximaal %d."
-#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85
msgid "Group"
msgstr "Groep"
@@ -4725,7 +4792,7 @@ msgstr "Groepen met de meeste berichten"
msgid "Tags in %s group's notices"
msgstr "Labels in de groepsmededelingen van %s"
-#: lib/htmloutputter.php:104
+#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
msgstr "Deze pagina is niet beschikbaar in een mediatype dat u accepteert"
@@ -4758,6 +4825,14 @@ msgstr "Het bestand is zoekgeraakt."
msgid "Unknown file type"
msgstr "Onbekend bestandstype"
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr "MB"
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr "kB"
+
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
@@ -4791,7 +4866,7 @@ msgstr ""
"U hebt geen privéberichten. U kunt privéberichten verzenden aan andere "
"gebruikers. Mensen kunnen u privéberichten sturen die alleen u kunt lezen."
-#: lib/mailbox.php:227 lib/noticelist.php:424
+#: lib/mailbox.php:227 lib/noticelist.php:452
msgid "from"
msgstr "van"
@@ -5124,36 +5199,61 @@ msgstr "Directe mededeling verzenden"
msgid "To"
msgstr "Aan"
-#: lib/messageform.php:162 lib/noticeform.php:173
+#: lib/messageform.php:162 lib/noticeform.php:186
msgid "Available characters"
msgstr "Beschikbare tekens"
-#: lib/noticeform.php:145
+#: lib/noticeform.php:158
msgid "Send a notice"
msgstr "Mededeling verzenden"
-#: lib/noticeform.php:158
+#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
msgstr "Hallo, %s."
-#: lib/noticeform.php:180
+#: lib/noticeform.php:193
msgid "Attach"
msgstr "Toevoegen"
-#: lib/noticeform.php:184
+#: lib/noticeform.php:197
msgid "Attach a file"
msgstr "Bestand toevoegen"
-#: lib/noticelist.php:478
+#: 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 "N"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr "Z"
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr "O"
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr "W"
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr "op"
+
+#: lib/noticelist.php:506
msgid "in context"
msgstr "in context"
-#: lib/noticelist.php:498
+#: lib/noticelist.php:526
msgid "Reply to this notice"
msgstr "Op deze mededeling antwoorden"
-#: lib/noticelist.php:499
+#: lib/noticelist.php:527
msgid "Reply"
msgstr "Antwoorden"
@@ -5184,15 +5284,13 @@ msgstr ""
#: lib/oauthstore.php:345
msgid "Duplicate notice"
-msgstr "Kennisgeving van duplicaat"
+msgstr "Duplicaatmelding"
-#: 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 ""
-"Die gebruiker heeft de mogelijkheid om te abonneren voor u geblokkeerd."
+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."
@@ -5258,13 +5356,12 @@ msgid "All groups"
msgstr "Alle groepen"
#: lib/profileformaction.php:123
-#, fuzzy
msgid "No return-to arguments"
-msgstr "Geen ID-argument."
+msgstr "Er zijn geen \"terug naar\"-parameters opgegeven"
#: lib/profileformaction.php:137
msgid "unimplemented method"
-msgstr ""
+msgstr "methode niet geïmplementeerd"
#: lib/publicgroupnav.php:78
msgid "Public"
@@ -5287,19 +5384,21 @@ msgid "Popular"
msgstr "Populair"
#: lib/sandboxform.php:67
-#, fuzzy
msgid "Sandbox"
-msgstr "Postvak IN"
+msgstr "Zandbak"
#: lib/sandboxform.php:78
-#, fuzzy
msgid "Sandbox this user"
-msgstr "Deblokkeer deze gebruiker."
+msgstr "Deze gebruiker in de zandbak plaatsen"
#: lib/searchaction.php:120
msgid "Search site"
msgstr "Site doorzoeken"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr "Term(en)"
+
#: lib/searchaction.php:162
msgid "Search help"
msgstr "Hulp bij zoeken"
@@ -5312,10 +5411,6 @@ msgstr "Gebruikers"
msgid "Find people on this site"
msgstr "Gebruikers op deze site vinden"
-#: lib/searchgroupnav.php:82
-msgid "Notice"
-msgstr "Mededeling"
-
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
msgstr "Inhoud van mededelingen vinden"
@@ -5333,14 +5428,12 @@ msgid "More..."
msgstr "Meer..."
#: lib/silenceform.php:67
-#, fuzzy
msgid "Silence"
-msgstr "Kennisgeving van site"
+msgstr "Muilkorven"
#: lib/silenceform.php:78
-#, fuzzy
msgid "Silence this user"
-msgstr "Deze gebruiker blokkeren"
+msgstr "Deze gebruiker muilkorven"
#: lib/subgroupnav.php:83
#, php-format
@@ -5360,12 +5453,12 @@ msgstr "Groepen waar %s lid van is"
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
-msgstr ""
+msgstr "Gebruikerslabelwolk als zelf gelabeld"
#: lib/subscriberspeopletagcloudsection.php:48
#: lib/subscriptionspeopletagcloudsection.php:48
msgid "People Tagcloud as tagged"
-msgstr ""
+msgstr "Gebruikerslabelwolk"
#: lib/subscriptionlist.php:126
msgid "(none)"
@@ -5405,21 +5498,19 @@ msgstr "Meest actieve gebruikers"
#: lib/unsandboxform.php:69
msgid "Unsandbox"
-msgstr ""
+msgstr "Uit de zandbak halen"
#: lib/unsandboxform.php:80
-#, fuzzy
msgid "Unsandbox this user"
-msgstr "Deblokkeer deze gebruiker."
+msgstr "Deze gebruiker uit de zandbak halen"
#: lib/unsilenceform.php:67
msgid "Unsilence"
-msgstr ""
+msgstr "Muilkorf afnemen"
#: lib/unsilenceform.php:78
-#, fuzzy
msgid "Unsilence this user"
-msgstr "Deblokkeer deze gebruiker."
+msgstr "Deze gebruiker de muilkorf afnemen"
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
@@ -5453,47 +5544,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"
@@ -5522,10 +5617,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."
-
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "Deblokkeer deze gebruiker."
-
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "De volgende gebruikers hebben een abonnement op u: "
diff --git a/locale/nn/LC_MESSAGES/statusnet.mo b/locale/nn/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 306a5b624..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 7e57fe4b3..625b5725e 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 10:43+0000\n"
-"PO-Revision-Date: 2009-11-18 19:32:19+0000\n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-11-28 19:50:39+0000\n"
"Language-Team: Norwegian Nynorsk\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nn\n"
"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
@@ -443,7 +443,7 @@ msgstr "Det er for langt! Ein notis kan berre innehalde 140 teikn."
msgid "Not found"
msgstr "Fann ikkje"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -558,7 +558,7 @@ msgid "Preview"
msgstr "Forhandsvis"
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
+#: lib/noticelist.php:550
msgid "Delete"
msgstr "Slett"
@@ -571,7 +571,7 @@ msgid "Crop"
msgstr "Skaler"
#: actions/avatarsettings.php:265 actions/disfavor.php:74
-#: actions/emailsettings.php:237 actions/favor.php:75
+#: 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
@@ -586,7 +586,7 @@ msgid "There was a problem with your session token. Try again, please."
msgstr "Der var eit problem med sesjonen din. Vennlegst prøv på nytt."
#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
-#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: 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."
@@ -720,15 +720,15 @@ msgstr "Ukjend adressetype %s"
msgid "That address has already been confirmed."
msgstr "Den addressa har alt blitt bekrefta."
-#: actions/confirmaddress.php:114 actions/emailsettings.php:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
#: actions/profilesettings.php:276 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Kan ikkje oppdatera brukar."
-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
msgstr "Kan ikkje sletta e-postgodkjenning."
@@ -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/profileaction.php:206 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Notisar"
@@ -791,7 +791,7 @@ msgstr "Sikker på at du vil sletta notisen?"
msgid "Do not delete this notice"
msgstr "Kan ikkje sletta notisen."
-#: actions/deletenotice.php:146 lib/noticelist.php:522
+#: actions/deletenotice.php:146 lib/noticelist.php:550
msgid "Delete this notice"
msgstr "Slett denne notisen"
@@ -835,183 +835,120 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:278
+#: actions/designadminpanel.php:270
#, fuzzy
msgid "Invalid logo URL."
msgstr "Ugyldig storleik."
-#: actions/designadminpanel.php:282
+#: actions/designadminpanel.php:274
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Denne sida er ikkje tilgjengleg i eit"
-#: actions/designadminpanel.php:288
-#, fuzzy, php-format
-msgid "Theme directory not readable: %s"
-msgstr "Denne sida er ikkje tilgjengleg i eit"
-
-#: actions/designadminpanel.php:292
-#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:296
-#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:312
-#, php-format
-msgid "Max length for %s %s is 255 characters."
-msgstr ""
-
-#: actions/designadminpanel.php:412
+#: actions/designadminpanel.php:370
#, fuzzy
msgid "Change logo"
msgstr "Endra passordet ditt"
-#: actions/designadminpanel.php:417
+#: actions/designadminpanel.php:375
#, fuzzy
msgid "Site logo"
msgstr "Invitér"
-#: actions/designadminpanel.php:424
+#: actions/designadminpanel.php:382
#, fuzzy
msgid "Change theme"
msgstr "Endra"
-#: actions/designadminpanel.php:441
+#: actions/designadminpanel.php:399
#, fuzzy
msgid "Site theme"
msgstr "Statusmelding"
-#: actions/designadminpanel.php:442
+#: actions/designadminpanel.php:400
#, fuzzy
msgid "Theme for the site."
msgstr "Logg ut or sida"
-#: actions/designadminpanel.php:447
-msgid "Theme server"
-msgstr ""
-
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
-
-#: actions/designadminpanel.php:455
-msgid "Theme directory"
-msgstr ""
-
-#: actions/designadminpanel.php:462
-#, fuzzy
-msgid "Avatar Settings"
-msgstr "Avatar-innstillingar"
-
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Avatar server"
-msgstr "Avatar-innstillingar"
-
-#: actions/designadminpanel.php:471
-#, fuzzy
-msgid "Avatar path"
-msgstr "Lasta opp brukarbilete."
-
-#: actions/designadminpanel.php:475
-#, fuzzy
-msgid "Avatar directory"
-msgstr "Lasta opp brukarbilete."
-
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:422
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "Du kan lasta opp ein logo for gruppa."
-#: actions/designadminpanel.php:526 lib/designsettings.php:139
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:542 lib/designsettings.php:155
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:543 lib/designsettings.php:156
+#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:548 lib/designsettings.php:161
+#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:554
-msgid "Background server"
-msgstr ""
-
-#: actions/designadminpanel.php:558
-msgid "Background path"
-msgstr ""
-
-#: actions/designadminpanel.php:562
-msgid "Background directory"
-msgstr ""
-
-#: actions/designadminpanel.php:569 lib/designsettings.php:170
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Endra passordet ditt"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Kopla til"
-#: actions/designadminpanel.php:604 lib/designsettings.php:204
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Søk"
-#: actions/designadminpanel.php:617 lib/designsettings.php:217
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
msgstr "Tekst"
-#: actions/designadminpanel.php:630 lib/designsettings.php:230
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Logg inn"
-#: actions/designadminpanel.php:658 lib/designsettings.php:247
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:659 lib/designsettings.php:248
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:665 lib/designsettings.php:254
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 actions/useradminpanel.php:226
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: 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 "Lagra"
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: actions/designadminpanel.php:582 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1164,37 +1101,37 @@ msgstr "Eg vil senda notisar med epost."
msgid "Publish a MicroID for my email address."
msgstr "Publiser ein MicroID for epost addressa mi."
-#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/emailsettings.php:302 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
msgstr "Lagra brukarval."
-#: actions/emailsettings.php:319
+#: actions/emailsettings.php:320
msgid "No email address."
msgstr "Ingen epostadresse."
-#: actions/emailsettings.php:326
+#: actions/emailsettings.php:327
msgid "Cannot normalize that email address"
msgstr "Klarar ikkje normalisera epostadressa"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "Ikkje ei gyldig epostadresse"
-#: actions/emailsettings.php:333
+#: actions/emailsettings.php:334
msgid "That is already your email address."
msgstr "Det er alt din epost addresse"
-#: actions/emailsettings.php:336
+#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
msgstr "Den epost addressa er alt registrert hos ein annan brukar."
-#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Kan ikkje leggja til godkjenningskode."
-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1202,47 +1139,47 @@ msgstr ""
"Sendte godkjenningskode til epostadressa du la til. Sjekk innboksen (og "
"søppelpostboksen) for koden og veiledning på korleis du nyttar han."
-#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
msgstr "Ingen ventande stadfesting å avbryta."
-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
msgstr "Det er feil lynmeldings addresse."
-#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
msgstr "Stadfesting avbrutt."
-#: actions/emailsettings.php:412
+#: actions/emailsettings.php:413
msgid "That is not your email address."
msgstr "Det er ikkje din epost addresse."
-#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
msgstr "Addressa blei fjerna."
-#: actions/emailsettings.php:445 actions/smssettings.php:518
+#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
msgstr "Ingen innkomande epostadresse."
-#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
msgid "Couldn't update user record."
msgstr "Kan ikkje oppdatera brukarinformajon."
-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
msgstr "Fjerna innkomande epostadresse."
-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555
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"
@@ -1511,7 +1448,7 @@ msgstr "%s medlemmar i gruppa, side %d"
msgid "A list of the users in this group."
msgstr "Ei liste over brukarane i denne gruppa."
-#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
msgid "Admin"
msgstr "Administrator"
@@ -1572,7 +1509,7 @@ msgid ""
msgstr ""
#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/subgroupnav.php:98
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Grupper"
@@ -1787,7 +1724,7 @@ msgstr "Personleg melding"
msgid "Optionally add a personal message to the invitation."
msgstr "Eventuelt legg til ei personleg melding til invitasjonen."
-#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
msgstr "Send"
@@ -1906,7 +1843,7 @@ msgstr "Feil brukarnamn eller passord"
msgid "Error setting user. You are probably not authorized."
msgstr "Ikkje autorisert."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:457
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Logg inn"
@@ -2021,7 +1958,7 @@ msgstr "Melding"
msgid "Direct message to %s sent"
msgstr "Direkte melding til %s sendt"
-#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
msgid "Ajax Error"
msgstr "Ajax feil"
@@ -2029,7 +1966,7 @@ msgstr "Ajax feil"
msgid "New notice"
msgstr "Ny notis"
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
msgid "Notice posted"
msgstr "Melding lagra"
@@ -2065,12 +2002,12 @@ msgid ""
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
-#: actions/noticesearchrss.php:89
+#: actions/noticesearchrss.php:96
#, fuzzy, php-format
msgid "Updates with \"%s\""
msgstr "Oppdateringar frå %1$s på %2$s!"
-#: actions/noticesearchrss.php:91
+#: actions/noticesearchrss.php:98
#, fuzzy, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
msgstr "Alle oppdateringer frå søket «%s»"
@@ -2197,9 +2134,9 @@ msgstr "6 eller fleire teikn"
msgid "Confirm"
msgstr "Godta"
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "same passord som ovanfor"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Samme passord som over"
#: actions/passwordsettings.php:117
msgid "Change"
@@ -2229,6 +2166,114 @@ msgstr "Klarar ikkje lagra nytt passord."
msgid "Password saved."
msgstr "Lagra passord."
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr ""
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr ""
+
+#: actions/pathsadminpanel.php:140
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Denne sida er ikkje tilgjengleg i eit"
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+#, fuzzy
+msgid "Site"
+msgstr "Invitér"
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+#, fuzzy
+msgid "Site path"
+msgstr "Statusmelding"
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr ""
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Avatars"
+msgstr "Brukarbilete"
+
+#: actions/pathsadminpanel.php:252
+#, fuzzy
+msgid "Avatar server"
+msgstr "Avatar-innstillingar"
+
+#: actions/pathsadminpanel.php:256
+#, fuzzy
+msgid "Avatar path"
+msgstr "Lasta opp brukarbilete."
+
+#: actions/pathsadminpanel.php:260
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Lasta opp brukarbilete."
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:297
+#, fuzzy
+msgid "Save paths"
+msgstr "Statusmelding"
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -2334,7 +2379,7 @@ msgstr ""
"merkelappar for deg sjølv ( bokstavar, nummer, -, ., og _ ), komma eller "
"mellomroms separert."
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr "Språk"
@@ -2562,10 +2607,6 @@ msgstr "Uventa handling."
msgid "6 or more characters, and don't forget it!"
msgstr "6 eller fleire teikn, og ikkje gløym dei."
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Samme passord som over"
-
#: actions/recoverpassword.php:243
msgid "Reset"
msgstr "Avbryt"
@@ -2627,7 +2668,7 @@ msgstr "Feil med stadfestingskode."
msgid "Registration successful"
msgstr "Registreringa gikk bra"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrér"
@@ -2673,7 +2714,7 @@ msgid "Same as password above. Required."
msgstr "Samme som passord over. Påkrevd."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Epost"
@@ -2781,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"
@@ -3122,11 +3163,6 @@ msgstr "Du kan ikkje sende melding til denne brukaren."
msgid "User is already silenced."
msgstr "Brukar har blokkert deg."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
-#, fuzzy
-msgid "Site"
-msgstr "Invitér"
-
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
msgstr ""
@@ -3158,103 +3194,100 @@ msgid "Snapshot frequency must be a number."
msgstr ""
#: actions/siteadminpanel.php:199
-msgid "You must set an SSL sever when enabling SSL."
+msgid "You must set an SSL server when enabling SSL."
msgstr ""
#: actions/siteadminpanel.php:204
-msgid "Invalid SSL server. Max length is 255 characters."
+msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
#: actions/siteadminpanel.php:210
-msgid "Minimum text limit is 140c."
+msgid "Minimum text limit is 140 characters."
msgstr ""
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:224
-#, php-format
-msgid "Locales directory not readable: %s"
+#: actions/siteadminpanel.php:266
+msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:275
+#: actions/siteadminpanel.php:269
#, fuzzy
msgid "Site name"
msgstr "Statusmelding"
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:279
+#: actions/siteadminpanel.php:274
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:280
+#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:283
+#: actions/siteadminpanel.php:279
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:284
#, fuzzy
-msgid "contact email address for your site"
+msgid "Contact email address for your site"
msgstr "Ny epostadresse for å oppdatera %s"
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:290
+#, fuzzy
+msgid "Local"
+msgstr "Lokale syningar"
+
+#: actions/siteadminpanel.php:301
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:303
+#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:308
#, fuzzy
msgid "Default site language"
msgstr "Foretrukke språk"
#: actions/siteadminpanel.php:316
-msgid "Path to locales"
-msgstr ""
-
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
-msgstr ""
+#, fuzzy
+msgid "URLs"
+msgstr "URL"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
#, fuzzy
msgid "Server"
msgstr "Gjenopprett"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
msgstr ""
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-#, fuzzy
-msgid "Site path"
-msgstr "Statusmelding"
-
-#: actions/siteadminpanel.php:328
+#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
msgstr ""
-#: actions/siteadminpanel.php:330
+#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
+#: actions/siteadminpanel.php:331
+#, fuzzy
+msgid "Access"
+msgstr "Godta"
+
#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
@@ -3273,7 +3306,7 @@ msgstr "Invitér"
msgid "Make registration invitation only."
msgstr ""
-#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#: actions/siteadminpanel.php:346
#, fuzzy
msgid "Closed"
msgstr "Blokkér"
@@ -3282,33 +3315,37 @@ msgstr "Blokkér"
msgid "Disable new registrations."
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
#, fuzzy
msgid "Never"
msgstr "Gjenopprett"
-#: actions/siteadminpanel.php:357
+#: actions/siteadminpanel.php:360
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:358
+#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:364
+#: actions/siteadminpanel.php:366
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:365
-msgid "Snapshots will be sent once every N Web hits"
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
msgstr ""
#: actions/siteadminpanel.php:372
@@ -3319,48 +3356,57 @@ msgstr ""
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:381
+#: actions/siteadminpanel.php:380
+#, fuzzy
+msgid "SSL"
+msgstr "SMS"
+
+#: actions/siteadminpanel.php:384
#, fuzzy
msgid "Sometimes"
msgstr "Notisar"
-#: actions/siteadminpanel.php:382
+#: actions/siteadminpanel.php:385
msgid "Always"
msgstr ""
-#: actions/siteadminpanel.php:384
+#: actions/siteadminpanel.php:387
msgid "Use SSL"
msgstr ""
-#: actions/siteadminpanel.php:385
+#: actions/siteadminpanel.php:388
msgid "When to use SSL"
msgstr ""
-#: actions/siteadminpanel.php:391
+#: actions/siteadminpanel.php:393
msgid "SSL Server"
msgstr ""
-#: actions/siteadminpanel.php:392
+#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr ""
+
+#: actions/siteadminpanel.php:403
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
#, fuzzy
msgid "Save site settings"
msgstr "Avatar-innstillingar"
@@ -3670,7 +3716,8 @@ msgstr "Fjerna tinging"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
-#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
msgid "User"
msgstr "Brukar"
@@ -3678,17 +3725,88 @@ msgstr "Brukar"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr ""
+
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:178
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr ""
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Profil"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr ""
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
+msgstr ""
+
+#: actions/useradminpanel.php:231
#, fuzzy
-msgid "Invite-only"
-msgstr "Invitér"
+msgid "New users"
+msgstr "Invitér nye brukarar"
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr ""
+
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr ""
+
+#: actions/useradminpanel.php:241
+#, fuzzy
+msgid "Default subscription"
+msgstr "Alle tingingar"
+
+#: actions/useradminpanel.php:242
+#, fuzzy
+msgid "Automatically subscribe new users to this user."
+msgstr ""
+"Automatisk ting notisane til dei som tingar mine (best for ikkje-menneskje)"
+
+#: actions/useradminpanel.php:251
+#, fuzzy
+msgid "Invitations"
+msgstr "Invitasjon(er) sendt"
+
+#: actions/useradminpanel.php:256
+#, fuzzy
+msgid "Invitations enabled"
+msgstr "Invitasjon(er) sendt"
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr ""
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr ""
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/userauthorization.php:105
@@ -3901,7 +4019,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"
@@ -3919,10 +4037,6 @@ msgstr "Kunne ikkje bli med i gruppa."
msgid "Welcome to %1$s, @%2$s!"
msgstr "Melding til %1$s på %2$s"
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr "Profil"
-
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Endra profilinnstillingane dine"
@@ -3961,131 +4075,131 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "Ingen tittel"
-#: lib/action.php:424
+#: lib/action.php:425
msgid "Primary site navigation"
msgstr "Navigasjon for hovudsida"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Home"
msgstr "Heim"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Personal profile and friends timeline"
msgstr "Personleg profil og oversyn over vener"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Account"
msgstr "Konto"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Change your email, avatar, password, profile"
msgstr "Endra e-posten, avataren, passordet eller profilen"
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect"
msgstr "Kopla til"
-#: lib/action.php:435
+#: lib/action.php:436
#, fuzzy
msgid "Connect to services"
msgstr "Klarte ikkje å omdirigera til tenaren: %s"
-#: lib/action.php:439
+#: lib/action.php:440
#, fuzzy
msgid "Change site configuration"
msgstr "Navigasjon for hovudsida"
-#: lib/action.php:443 lib/subgroupnav.php:105
+#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Invitér"
-#: lib/action.php:444 lib/subgroupnav.php:106
+#: lib/action.php:445 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Inviter vennar og kollega til å bli med deg på %s"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout"
msgstr "Logg ut"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout from the site"
msgstr "Logg ut or sida"
-#: lib/action.php:454
+#: lib/action.php:455
msgid "Create an account"
msgstr "Opprett ny konto"
-#: lib/action.php:457
+#: lib/action.php:458
msgid "Login to the site"
msgstr "Logg inn or sida"
-#: lib/action.php:460 lib/action.php:723
+#: lib/action.php:461 lib/action.php:724
msgid "Help"
msgstr "Hjelp"
-#: lib/action.php:460
+#: lib/action.php:461
msgid "Help me!"
msgstr "Hjelp meg!"
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
msgstr "Søk"
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
msgstr "Søk etter folk eller innhald"
-#: lib/action.php:484
+#: lib/action.php:485
msgid "Site notice"
msgstr "Statusmelding"
-#: lib/action.php:550
+#: lib/action.php:551
msgid "Local views"
msgstr "Lokale syningar"
-#: lib/action.php:616
+#: lib/action.php:617
msgid "Page notice"
msgstr "Sidenotis"
-#: lib/action.php:718
+#: lib/action.php:719
msgid "Secondary site navigation"
msgstr "Andrenivås side navigasjon"
-#: lib/action.php:725
+#: lib/action.php:726
msgid "About"
msgstr "Om"
-#: lib/action.php:727
+#: lib/action.php:728
msgid "FAQ"
msgstr "OSS"
-#: lib/action.php:731
+#: lib/action.php:732
msgid "TOS"
msgstr ""
-#: lib/action.php:734
+#: lib/action.php:735
msgid "Privacy"
msgstr "Personvern"
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
msgstr "Kjeldekode"
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:740
+#: lib/action.php:741
#, fuzzy
msgid "Badge"
msgstr "Dult"
-#: lib/action.php:768
+#: lib/action.php:769
msgid "StatusNet software license"
msgstr "StatusNets programvarelisens"
-#: lib/action.php:771
+#: lib/action.php:772
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4094,12 +4208,12 @@ msgstr ""
"**%%site.name%%** er ei mikrobloggingteneste av [%%site.broughtby%%](%%site."
"broughtbyurl%%). "
-#: lib/action.php:773
+#: lib/action.php:774
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** er ei mikrobloggingteneste. "
-#: lib/action.php:775
+#: lib/action.php:776
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4110,32 +4224,32 @@ msgstr ""
"%s, tilgjengeleg under [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:789
+#: lib/action.php:790
#, fuzzy
msgid "Site content license"
msgstr "StatusNets programvarelisens"
-#: lib/action.php:798
+#: lib/action.php:799
msgid "All "
msgstr "Alle"
-#: lib/action.php:803
+#: lib/action.php:804
msgid "license."
msgstr "lisens."
-#: lib/action.php:1067
+#: lib/action.php:1068
msgid "Pagination"
msgstr "Paginering"
-#: lib/action.php:1076
+#: lib/action.php:1077
msgid "After"
msgstr "« Etter"
-#: lib/action.php:1084
+#: lib/action.php:1085
msgid "Before"
msgstr "Før »"
-#: lib/action.php:1132
+#: lib/action.php:1133
msgid "There was a problem with your session token."
msgstr "Det var eit problem med sesjons billetten din."
@@ -4169,6 +4283,11 @@ msgstr "Stadfesting av epostadresse"
msgid "Design configuration"
msgstr "SMS bekreftelse"
+#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+#, fuzzy
+msgid "Paths configuration"
+msgstr "SMS bekreftelse"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4343,11 +4462,10 @@ msgid "You are not subscribed to anyone."
msgstr "Du tingar ikkje oppdateringar til den profilen."
#: lib/command.php:620
-#, fuzzy
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
-msgstr[0] "Du tingar ikkje oppdateringar til den profilen."
-msgstr[1] "Du tingar ikkje oppdateringar til den profilen."
+msgstr[0] "Du tingar allereie oppdatering frå desse brukarane:"
+msgstr[1] "Du tingar allereie oppdatering frå desse brukarane:"
#: lib/command.php:640
#, fuzzy
@@ -4355,7 +4473,6 @@ msgid "No one is subscribed to you."
msgstr "Kan ikkje tinga andre til deg."
#: lib/command.php:642
-#, fuzzy
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Kan ikkje tinga andre til deg."
@@ -4367,7 +4484,6 @@ msgid "You are not a member of any groups."
msgstr "Du er ikkje medlem av den gruppa."
#: lib/command.php:664
-#, fuzzy
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."
@@ -4452,9 +4568,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: "
@@ -4549,7 +4666,7 @@ msgstr "Kvar er du, t.d. «Stavanger, Rogaland, Noreg»"
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
-#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85
msgid "Group"
msgstr "Gruppe"
@@ -4595,7 +4712,7 @@ msgstr "Grupper med flest innlegg"
msgid "Tags in %s group's notices"
msgstr "Merkelappar i %s gruppa sine notisar"
-#: lib/htmloutputter.php:104
+#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
msgstr "Denne sida er ikkje tilgjengeleg i nokon mediatype du aksepterer."
@@ -4628,6 +4745,14 @@ msgstr "Mista fila vår."
msgid "Unknown file type"
msgstr "Ukjend fil type"
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
@@ -4659,7 +4784,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:424
+#: lib/mailbox.php:227 lib/noticelist.php:452
#, fuzzy
msgid "from"
msgstr " frå "
@@ -4915,37 +5040,63 @@ msgstr "Send ei direkte melding"
msgid "To"
msgstr "Til"
-#: lib/messageform.php:162 lib/noticeform.php:173
+#: lib/messageform.php:162 lib/noticeform.php:186
msgid "Available characters"
msgstr "Tilgjenglege teikn"
-#: lib/noticeform.php:145
+#: lib/noticeform.php:158
msgid "Send a notice"
msgstr "Send ei melding"
-#: lib/noticeform.php:158
+#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
msgstr "Kva skjer, %s?"
-#: lib/noticeform.php:180
+#: lib/noticeform.php:193
msgid "Attach"
msgstr ""
-#: lib/noticeform.php:184
+#: lib/noticeform.php:197
msgid "Attach a file"
msgstr ""
-#: lib/noticelist.php:478
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "Nei"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr ""
+
+#: lib/noticelist.php:506
#, fuzzy
msgid "in context"
msgstr "Ingen innhald."
-#: lib/noticelist.php:498
+#: lib/noticelist.php:526
msgid "Reply to this notice"
msgstr "Svar på denne notisen"
-#: lib/noticelist.php:499
+#: lib/noticelist.php:527
msgid "Reply"
msgstr "Svar"
@@ -4978,12 +5129,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."
@@ -5093,6 +5244,10 @@ msgstr "Lås opp brukaren"
msgid "Search site"
msgstr "Søk"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
#, fuzzy
msgid "Search help"
@@ -5106,10 +5261,6 @@ msgstr "Folk"
msgid "Find people on this site"
msgstr "Finn folk på denne sida"
-#: lib/searchgroupnav.php:82
-msgid "Notice"
-msgstr "Notis"
-
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
msgstr "Søk i innhaldet av notisar"
@@ -5250,47 +5401,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"
@@ -5319,11 +5474,3 @@ msgstr "Beklager, det er ikkje di inngåande epost addresse."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Beklager, inngåande epost er ikkje tillatt."
-
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "Lås opp brukaren"
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "Mennesker som tingar %s"
diff --git a/locale/pl/LC_MESSAGES/statusnet.mo b/locale/pl/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index b9d95d0d3..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 c7b3d860f..a5220f6e0 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -1,28 +1,32 @@
# Translation of StatusNet to Polish
#
+# Author@translatewiki.net: Raven
# --
-# This file is distributed under the same license as the StatusNet package.
+# Paweł Wilk <siefca@gnu.org>, 2008.
+# Piotr Drąg <piotrdrag@gmail.com>, 2009.
#
msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 10:43+0000\n"
-"PO-Revision-Date: 2009-11-18 19:32:25+0000\n"
-"Language-Team: Polish\n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-11-28 19:50:45+0000\n"
+"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
+"Language-Team: Polish <pl@li.org>\n"
+"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10< =4 && (n%100<10 or n%100>=20) ? 1 : 2);\n"
-"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\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(r59523); Translate extension (2009-11-16)\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
-#, fuzzy
msgid "No such page"
-msgstr "Nie ma takiego znacznika."
+msgstr "Nie ma takiej strony"
#: actions/all.php:74 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
@@ -89,8 +93,8 @@ msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
"something yourself."
msgstr ""
-"Spróbuj zasubskrybować więcej osób, [dołączyć do grupy](%%action.groups%%) "
-"lub wysłać coś samemu."
+"Spróbuj subskrybować więcej osób, [dołączyć do grupy](%%action.groups%%) lub "
+"wysłać coś samemu."
#: actions/all.php:134
#, php-format
@@ -98,7 +102,7 @@ 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 ""
-"Możesz spróbować [szturchnąć użytkownika %s](../%s) z jego profilu lub "
+"Można spróbować [szturchnąć użytkownika %s](../%s) z jego profilu lub "
"[wysłać coś wymagającego jego uwagi](%%%%action.newnotice%%%%?"
"status_textarea=%s)."
@@ -118,16 +122,15 @@ msgstr "Ty i przyjaciele"
#: actions/allrss.php:119 actions/apitimelinefriends.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
-msgstr "Aktualizacje od %1$s i przyjaciół na %2$s!"
+msgstr "Aktualizacje z %1$s i przyjaciół na %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 "Nie znaleziono metody API!"
+msgstr "Nie odnaleziono metody API."
#: actions/apiaccountupdatedeliverydevice.php:85
#: actions/apiaccountupdateprofilebackgroundimage.php:86
@@ -147,9 +150,9 @@ msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none"
msgstr ""
+"Należy podać parametr o nazwie \"device\" z jedną z wartości: sms, im, none"
#: actions/apiaccountupdatedeliverydevice.php:132
-#, fuzzy
msgid "Could not update user."
msgstr "Nie można zaktualizować użytkownika."
@@ -170,13 +173,11 @@ msgstr ""
#: actions/apiaccountupdateprofilebackgroundimage.php:146
#: actions/apiaccountupdateprofilecolors.php:164
#: actions/apiaccountupdateprofilecolors.php:174
-#, fuzzy
msgid "Unable to save your design settings."
-msgstr "Nie można zapisać ustawień wyglądu!"
+msgstr "Nie można zapisać ustawień wyglądu."
#: actions/apiaccountupdateprofilebackgroundimage.php:187
#: actions/apiaccountupdateprofilecolors.php:142
-#, fuzzy
msgid "Could not update your design."
msgstr "Nie można zaktualizować wyglądu."
@@ -190,7 +191,6 @@ msgid "User has no profile."
msgstr "Użytkownik nie posiada profilu."
#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
msgid "Could not save profile."
msgstr "Nie można zapisać profilu."
@@ -204,27 +204,27 @@ msgstr "Odblokowanie użytkownika nie powiodło się."
#: actions/apidirectmessagenew.php:126
msgid "No message text!"
-msgstr "Brak tekstu wiadomości!"
+msgstr "Brak tekstu wiadomości."
#: 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 "Wiadomość jest za długa. Maksymalna długość to 140 znaków."
+msgstr "Wiadomość jest za długa. Maksymalna długość wynosi %d znaków."
#: actions/apidirectmessagenew.php:146
msgid "Recipient user not found."
-msgstr "Nie znaleziono odbiorcy."
+msgstr "Nie odnaleziono odbiorcy."
#: actions/apidirectmessagenew.php:150
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
"Nie można wysłać bezpośredniej wiadomości do użytkowników, którzy nie są "
-"Twoimi przyjaciółmi."
+"twoimi przyjaciółmi."
#: actions/apidirectmessage.php:89
-#, fuzzy, php-format
+#, 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
@@ -256,16 +256,16 @@ msgstr "Wszystkie bezpośrednie wiadomości wysłane do użytkownika %s"
#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
msgid "API method not found!"
-msgstr "Nie znaleziono metody API!"
+msgstr "Nie odnaleziono metody API."
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
-msgstr "Nie znaleziono statusów z tym identyfikatorem."
+msgstr "Nie odnaleziono stanów z tym identyfikatorem."
#: actions/apifavoritecreate.php:119
msgid "This status is already a favorite!"
-msgstr "Ten status jest już ulubiony!"
+msgstr "Ten stan jest już ulubiony."
#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
msgid "Could not create favorite."
@@ -273,7 +273,7 @@ msgstr "Nie można utworzyć ulubionego wpisu."
#: actions/apifavoritedestroy.php:122
msgid "That status is not a favorite!"
-msgstr "Ten status nie jest ulubiony!"
+msgstr "Ten stan nie jest ulubiony."
#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
msgid "Could not delete favorite."
@@ -281,21 +281,21 @@ msgstr "Nie można usunąć ulubionego wpisu."
#: actions/apifriendshipscreate.php:109
msgid "Could not follow user: User not found."
-msgstr "Nie można obserwować użytkownika: nie znaleziono użytkownika."
+msgstr "Nie można obserwować użytkownika: nie odnaleziono użytkownika."
#: actions/apifriendshipscreate.php:118
#, php-format
msgid "Could not follow user: %s is already on your list."
-msgstr "Nie można obserwować użytkownika: %s jest już na Twojej liście."
+msgstr "Nie można obserwować użytkownika: %s jest już na twojej liście."
#: actions/apifriendshipsdestroy.php:109
-#, fuzzy
msgid "Could not unfollow user: User not found."
-msgstr "Nie można obserwować użytkownika: nie znaleziono użytkownika."
+msgstr ""
+"Nie można zrezygnować z obserwacji użytkownika: nie odnaleziono użytkownika."
#: actions/apifriendshipsdestroy.php:120
msgid "You cannot unfollow yourself!"
-msgstr ""
+msgstr "Nie można zrezygnować z obserwacji samego siebie."
#: actions/apifriendshipsexists.php:94
msgid "Two user ids or screen_names must be supplied."
@@ -307,7 +307,7 @@ msgstr "Nie można określić użytkownika źródłowego."
#: actions/apifriendshipsshow.php:143
msgid "Could not find target user."
-msgstr "Nie można znaleźć użytkownika docelowego."
+msgstr "Nie można odnaleźć użytkownika docelowego."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
@@ -340,9 +340,9 @@ msgid "Full name is too long (max 255 chars)."
msgstr "Imię i nazwisko jest za długie (maksymalnie 255 znaków)."
#: actions/apigroupcreate.php:213
-#, fuzzy, php-format
+#, php-format
msgid "Description is too long (max %d chars)."
-msgstr "opis jest za długi (maksymalnie 140 znaków)."
+msgstr "Opis jest za długi (maksymalnie %d znaków)."
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
#: actions/newgroup.php:148 actions/profilesettings.php:225
@@ -354,7 +354,7 @@ msgstr "Położenie jest za długie (maksymalnie 255 znaków)."
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
-msgstr "Za dużo aliasów! Maksymalnie %d."
+msgstr "Za dużo aliasów. Maksymalnie %d."
#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
@@ -376,33 +376,30 @@ msgstr "Alias nie może być taki sam jak pseudonim."
#: 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 "Nie znaleziono metody API!"
+msgstr "Nie odnaleziono grupy."
#: actions/apigroupjoin.php:110
-#, fuzzy
msgid "You are already a member of that group."
-msgstr "Jesteś już członkiem tej grupy"
+msgstr "Jesteś już członkiem tej grupy."
#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
msgid "You have been blocked from that group by the admin."
msgstr "Zostałeś zablokowany w tej grupie przez administratora."
#: actions/apigroupjoin.php:138
-#, fuzzy, php-format
+#, php-format
msgid "Could not join user %s to group %s."
-msgstr "Nie można dołączyć użytkownika %s do grupy %s"
+msgstr "Nie można dołączyć użytkownika %s do grupy %s."
#: actions/apigroupleave.php:114
-#, fuzzy
msgid "You are not a member of this group."
msgstr "Nie jesteś członkiem tej grupy."
#: actions/apigroupleave.php:124
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %s to group %s."
-msgstr "Nie można usunąć użytkownika %s z grupy %s"
+msgstr "Nie można usunąć użytkownika %s z grupy %s."
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
@@ -410,19 +407,19 @@ msgid "%s groups"
msgstr "Grupy %s"
#: actions/apigrouplistall.php:94
-#, fuzzy, php-format
+#, php-format
msgid "groups on %s"
-msgstr "Działania grupy"
+msgstr "grupy na %s"
#: actions/apigrouplist.php:95
-#, fuzzy, php-format
+#, php-format
msgid "%s's groups"
-msgstr "Grupy %s"
+msgstr "Grupy użytkownika %s"
#: actions/apigrouplist.php:103
-#, fuzzy, php-format
+#, php-format
msgid "Groups %s is a member of on %s."
-msgstr "Grupy %s są członkiem"
+msgstr "Grupy %s są członkiem na %s."
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
@@ -430,36 +427,34 @@ msgstr "Ta metoda wymaga POST lub DELETE."
#: actions/apistatusesdestroy.php:130
msgid "You may not delete another user's status."
-msgstr "Nie można usuwać statusów innych użytkowników."
+msgstr "Nie można usuwać stanów innych użytkowników."
#: actions/apistatusesshow.php:138
-#, fuzzy
msgid "Status deleted."
-msgstr "Usunięto awatar."
+msgstr "Usunięto stan."
#: actions/apistatusesshow.php:144
msgid "No status with that ID found."
-msgstr "Nie znaleziono statusów z tym identyfikatorem."
+msgstr "Nie odnaleziono stanów z tym identyfikatorem."
#: 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 "Wpis jest za długi. Maksymalna długość to 140 znaków."
+msgstr "Wpis jest za długi. Maksymalna długość wynosi %d znaków."
#: actions/apistatusesupdate.php:198
msgid "Not found"
-msgstr "Nie znaleziono"
+msgstr "Nie odnaleziono"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
-#, fuzzy, php-format
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
+#, php-format
msgid "Max notice size is %d chars, including attachment URL."
-msgstr "Maksymalny rozmiar wpisu to 140 znaków, w tym adres URL załącznika."
+msgstr "Maksymalny rozmiar wpisu wynosi %d znaków, w tym adres URL załącznika."
#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
-#, fuzzy
msgid "Unsupported format."
-msgstr "Nieobsługiwany format pliku obrazu."
+msgstr "Nieobsługiwany format."
#: actions/apitimelinefavorites.php:107
#, php-format
@@ -481,7 +476,7 @@ msgstr "Oś czasu użytkownika %s"
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
-msgstr "Aktualizacje od %1$s na %2$s!"
+msgstr "Aktualizacje z %1$s na %2$s."
#: actions/apitimelinementions.php:116
#, php-format
@@ -501,7 +496,7 @@ msgstr "Publiczna oś czasu użytkownika %s"
#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
-msgstr "Użytkownik %s aktualizuje od każdego!"
+msgstr "Użytkownik %s aktualizuje od każdego."
#: actions/apitimelinetag.php:101 actions/tag.php:66
#, php-format
@@ -511,11 +506,11 @@ msgstr "Wpisy ze znacznikiem %s"
#: actions/apitimelinetag.php:107 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
-msgstr "Aktualizacje ze znacznikiem %1$s na %2$s!"
+msgstr "Aktualizacje ze znacznikiem %1$s na %2$s."
#: actions/apiusershow.php:96
msgid "Not found."
-msgstr "Nie znaleziono."
+msgstr "Nie odnaleziono."
#: actions/attachment.php:73
msgid "No such attachment."
@@ -541,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
@@ -565,7 +560,7 @@ msgid "Preview"
msgstr "Podgląd"
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
+#: lib/noticelist.php:550
msgid "Delete"
msgstr "Usuń"
@@ -578,7 +573,7 @@ msgid "Crop"
msgstr "Przytnij"
#: actions/avatarsettings.php:265 actions/disfavor.php:74
-#: actions/emailsettings.php:237 actions/favor.php:75
+#: 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
@@ -593,7 +588,7 @@ msgid "There was a problem with your session token. Try again, please."
msgstr "Wystąpił problem z tokenem sesji. Spróbuj ponownie."
#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
-#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: 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."
@@ -660,9 +655,8 @@ msgid "Unblock this user"
msgstr "Odblokuj tego użytkownika"
#: actions/block.php:69
-#, fuzzy
msgid "You already blocked that user."
-msgstr "Ten użytkownik został już zablokowany."
+msgstr "Użytkownik jest już zablokowany."
#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
msgid "Block user"
@@ -675,8 +669,8 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
"Jesteś pewny, że chcesz zablokować tego użytkownika. Po tym jego subskrypcja "
-"do Ciebie zostanie usunięta, nie będzie mógł Cię zasubskrybować w "
-"przyszłości i nie będziesz powiadamiany o żadnych odpowiedziach @ od niego."
+"do ciebie zostanie usunięta, nie będzie mógł cię subskrybować w przyszłości "
+"i nie będziesz powiadamiany o żadnych odpowiedziach @ od niego."
#: actions/block.php:143 actions/deletenotice.php:145
#: actions/deleteuser.php:147 actions/groupblock.php:178
@@ -684,9 +678,8 @@ msgid "No"
msgstr "Nie"
#: actions/block.php:143 actions/deleteuser.php:147
-#, fuzzy
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
@@ -702,9 +695,8 @@ msgid "Failed to save block information."
msgstr "Zapisanie informacji o blokadzie nie powiodło się."
#: actions/bookmarklet.php:50
-#, fuzzy
msgid "Post to "
-msgstr "Zdjęcie"
+msgstr "Wyślij do "
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -712,11 +704,11 @@ msgstr "Brak kodu potwierdzającego."
#: actions/confirmaddress.php:80
msgid "Confirmation code not found."
-msgstr "Nie znaleziono kodu potwierdzającego."
+msgstr "Nie odnaleziono kodu potwierdzającego."
#: actions/confirmaddress.php:85
msgid "That confirmation code is not for you!"
-msgstr "Ten kod potwierdzający nie jest przeznaczony dla Ciebie!"
+msgstr "Ten kod potwierdzający nie jest przeznaczony dla ciebie."
#: actions/confirmaddress.php:90
#, php-format
@@ -727,15 +719,15 @@ msgstr "Nierozpoznany typ adresu %s"
msgid "That address has already been confirmed."
msgstr "Ten adres został już potwierdzony."
-#: actions/confirmaddress.php:114 actions/emailsettings.php:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
#: actions/profilesettings.php:276 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Nie można zaktualizować użytkownika."
-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
msgstr "Nie można usunąć potwierdzenia adresu e-mail."
@@ -747,14 +739,14 @@ msgstr "Potwierdź adres"
#: actions/confirmaddress.php:159
#, php-format
msgid "The address \"%s\" has been confirmed for your account."
-msgstr "Adres \"%s\" został potwierdzony dla Twojego konta."
+msgstr "Adres \"%s\" został potwierdzony dla twojego konta."
#: actions/conversation.php:99
msgid "Conversation"
msgstr "Rozmowa"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206
+#: lib/profileaction.php:206 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Wpisy"
@@ -780,8 +772,8 @@ msgid ""
"You are about to permanently delete a notice. Once this is done, it cannot "
"be undone."
msgstr ""
-"Za chwilę wpis zostanie trwale usunięty. Kiedy to się stanie, to już się nie "
-"odstanie."
+"Za chwilę wpis zostanie trwale usunięty. Kiedy to się stanie, nie będzie "
+"mogło zostać cofnięte."
#: actions/deletenotice.php:109 actions/deletenotice.php:141
msgid "Delete notice"
@@ -795,7 +787,7 @@ msgstr "Jesteś pewien, że chcesz usunąć ten wpis?"
msgid "Do not delete this notice"
msgstr "Nie usuwaj tego wpisu"
-#: actions/deletenotice.php:146 lib/noticelist.php:522
+#: actions/deletenotice.php:146 lib/noticelist.php:550
msgid "Delete this notice"
msgstr "Usuń ten wpis"
@@ -804,30 +796,28 @@ msgid "There was a problem with your session token. Try again, please."
msgstr "Wystąpił problem z tokenem sesji. Spróbuj ponownie."
#: actions/deleteuser.php:67
-#, fuzzy
msgid "You cannot delete users."
-msgstr "Nie można zaktualizować użytkownika."
+msgstr "Nie można usuwać użytkowników."
#: actions/deleteuser.php:74
-#, fuzzy
msgid "You can only delete local users."
-msgstr "Nie można usuwać statusów innych użytkowników."
+msgstr "Nie można usuwać lokalnych użytkowników."
#: actions/deleteuser.php:110 actions/deleteuser.php:133
-#, fuzzy
msgid "Delete user"
-msgstr "Usuń"
+msgstr "Usuń użytkownika"
#: 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 ""
+"Na pewno usunąć tego użytkownika? Wyczyści to wszystkie dane o użytkowniku z "
+"bazy danych, bez utworzenia kopii zapasowej."
#: actions/deleteuser.php:148 lib/deleteuserform.php:77
-#, fuzzy
msgid "Delete this user"
-msgstr "Usuń ten wpis"
+msgstr "Usuń tego użytkownika"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
#: lib/adminpanelaction.php:302 lib/groupnav.php:119
@@ -836,190 +826,118 @@ msgstr "Wygląd"
#: actions/designadminpanel.php:73
msgid "Design settings for this StatusNet site."
-msgstr ""
+msgstr "Ustawienia wyglądu tej strony StatusNet."
-#: actions/designadminpanel.php:278
-#, fuzzy
+#: actions/designadminpanel.php:270
msgid "Invalid logo URL."
-msgstr "Nieprawidłowy rozmiar."
-
-#: actions/designadminpanel.php:282
-#, fuzzy, php-format
-msgid "Theme not available: %s"
-msgstr "Ta strona nie jest dostępna w "
-
-#: actions/designadminpanel.php:288
-#, fuzzy, php-format
-msgid "Theme directory not readable: %s"
-msgstr "Ta strona nie jest dostępna w "
-
-#: actions/designadminpanel.php:292
-#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:296
-#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
+msgstr "Nieprawidłowy adres URL logo."
-#: actions/designadminpanel.php:312
+#: actions/designadminpanel.php:274
#, php-format
-msgid "Max length for %s %s is 255 characters."
-msgstr ""
+msgid "Theme not available: %s"
+msgstr "Motyw nie jest dostępny: %s"
-#: actions/designadminpanel.php:412
-#, fuzzy
+#: actions/designadminpanel.php:370
msgid "Change logo"
-msgstr "Zmień kolory"
+msgstr "Zmień logo"
-#: actions/designadminpanel.php:417
-#, fuzzy
+#: actions/designadminpanel.php:375
msgid "Site logo"
-msgstr "Zaproś"
+msgstr "Logo strony"
-#: actions/designadminpanel.php:424
-#, fuzzy
+#: actions/designadminpanel.php:382
msgid "Change theme"
-msgstr "Zmień"
+msgstr "Zmień motyw"
-#: actions/designadminpanel.php:441
-#, fuzzy
+#: actions/designadminpanel.php:399
msgid "Site theme"
-msgstr "Wpis strony"
+msgstr "Motyw strony"
-#: actions/designadminpanel.php:442
-#, fuzzy
+#: actions/designadminpanel.php:400
msgid "Theme for the site."
-msgstr "Wyloguj się ze strony"
+msgstr "Motyw strony."
-#: actions/designadminpanel.php:447
-msgid "Theme server"
-msgstr ""
-
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
-
-#: actions/designadminpanel.php:455
-msgid "Theme directory"
-msgstr ""
-
-#: actions/designadminpanel.php:462
-#, fuzzy
-msgid "Avatar Settings"
-msgstr "Ustawienia awatara"
-
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Avatar server"
-msgstr "Ustawienia awatara"
-
-#: actions/designadminpanel.php:471
-#, fuzzy
-msgid "Avatar path"
-msgstr "Zaktualizowano awatar."
-
-#: actions/designadminpanel.php:475
-#, fuzzy
-msgid "Avatar directory"
-msgstr "Usunięto awatar."
-
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
-msgstr "Zmień obraz tłas"
+msgstr "Zmień obraz tła"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
msgstr "Tło"
-#: actions/designadminpanel.php:496
-#, fuzzy, php-format
+#: actions/designadminpanel.php:422
+#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
-msgstr "Można wysłać obraz logo grupy. Maksymalny rozmiar pliku to %s."
+msgstr "Można wysłać obraz tła dla strony. Maksymalny rozmiar pliku to %1$s."
-#: actions/designadminpanel.php:526 lib/designsettings.php:139
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
msgstr "Włączone"
-#: actions/designadminpanel.php:542 lib/designsettings.php:155
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
msgstr "Wyłączone"
-#: actions/designadminpanel.php:543 lib/designsettings.php:156
+#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Włącz lub wyłącz obraz tła."
-#: actions/designadminpanel.php:548 lib/designsettings.php:161
+#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Kafelkowy obraz tła"
-#: actions/designadminpanel.php:554
-#, fuzzy
-msgid "Background server"
-msgstr "Tło"
-
-#: actions/designadminpanel.php:558
-#, fuzzy
-msgid "Background path"
-msgstr "Tło"
-
-#: actions/designadminpanel.php:562
-#, fuzzy
-msgid "Background directory"
-msgstr "Tło"
-
-#: actions/designadminpanel.php:569 lib/designsettings.php:170
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
msgid "Change colours"
msgstr "Zmień kolory"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
msgid "Content"
msgstr "Zawartość"
-#: actions/designadminpanel.php:604 lib/designsettings.php:204
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Panel boczny"
-#: actions/designadminpanel.php:617 lib/designsettings.php:217
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
msgstr "Tekst"
-#: actions/designadminpanel.php:630 lib/designsettings.php:230
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
msgid "Links"
msgstr "Odnośniki"
-#: actions/designadminpanel.php:658 lib/designsettings.php:247
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
-msgstr "Użyj domyślnych"
+msgstr "Użycie domyślnych"
-#: actions/designadminpanel.php:659 lib/designsettings.php:248
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Przywróć domyślny wygląd"
-#: actions/designadminpanel.php:665 lib/designsettings.php:254
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Przywróć domyślne ustawienia"
-#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 actions/useradminpanel.php:226
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: 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 "Zapisz"
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: actions/designadminpanel.php:582 lib/designsettings.php:257
msgid "Save design"
msgstr "Zapisz wygląd"
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
-msgstr "Ten wpis nie jest ulubiony!"
+msgstr "Ten wpis nie jest ulubiony."
#: actions/disfavor.php:94
msgid "Add to favorites"
@@ -1032,7 +950,7 @@ msgstr "Nie ma takiego dokumentu."
#: actions/editgroup.php:56
#, php-format
msgid "Edit %s group"
-msgstr "Edytuj grupę %s"
+msgstr "Zmodyfikuj grupę %s"
#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
msgid "You must be logged in to create a group."
@@ -1048,9 +966,9 @@ msgid "Use this form to edit the group."
msgstr "Użyj tego formularza, aby zmodyfikować grupę."
#: actions/editgroup.php:201 actions/newgroup.php:145
-#, fuzzy, php-format
+#, php-format
msgid "description is too long (max %d chars)."
-msgstr "opis jest za długi (maksymalnie 140 znaków)."
+msgstr "opis jest za długi (maksymalnie %d znaków)."
#: actions/editgroup.php:253
msgid "Could not update group."
@@ -1071,7 +989,7 @@ msgstr "Ustawienia adresu e-mail"
#: actions/emailsettings.php:71
#, php-format
msgid "Manage how you get email from %%site.name%%."
-msgstr "Zarządzaj, jak otrzymywać wiadomości e-mail od %%site.name%%."
+msgstr "Zarządzanie, jak otrzymywać wiadomości e-mail od %%site.name%%."
#: actions/emailsettings.php:100 actions/imsettings.php:100
#: actions/smssettings.php:104
@@ -1094,7 +1012,7 @@ msgid ""
"a message with further instructions."
msgstr ""
"Oczekiwanie na potwierdzenie tego adresu. Sprawdź swoją skrzynkę odbiorczą "
-"(także w wiadomościach niechcianych!), czy otrzymałeś wiadomość z dalszymi "
+"(także w wiadomościach niechcianych), czy otrzymałeś wiadomość z dalszymi "
"instrukcjami."
#: actions/emailsettings.php:117 actions/imsettings.php:120
@@ -1125,7 +1043,7 @@ msgstr "Wyślij wiadomość e-mail na ten adres, aby wysyłać nowe wpisy."
#: actions/emailsettings.php:145 actions/smssettings.php:162
msgid "Make a new email address for posting to; cancels the old one."
-msgstr "Używaj nowego adresu e-mail do wysyłania; anuluj stary."
+msgstr "Używaj nowego adresu e-mail do wysyłania; anuluj poprzedni."
#: actions/emailsettings.php:148 actions/smssettings.php:164
msgid "New"
@@ -1138,19 +1056,19 @@ msgstr "Preferencje"
#: actions/emailsettings.php:158
msgid "Send me notices of new subscriptions through email."
-msgstr "Wyślij mi wpisy nowych subskrypcji przez e-mail."
+msgstr "Wyślij wpisy nowych subskrypcji przez e-mail."
#: actions/emailsettings.php:163
msgid "Send me email when someone adds my notice as a favorite."
-msgstr "Wyślij mi wiadomość e-mail, kiedy ktoś doda mój wpis jako ulubiony."
+msgstr "Wyślij wiadomość e-mail, kiedy ktoś doda mój wpis jako ulubiony."
#: actions/emailsettings.php:169
msgid "Send me email when someone sends me a private message."
-msgstr "Wyślij mi wiadomość e-mail, kiedy ktoś wyśle mi prywatną wiadomość."
+msgstr "Wyślij wiadomość e-mail, kiedy ktoś wyśle prywatną wiadomość."
#: actions/emailsettings.php:174
msgid "Send me email when someone sends me an \"@-reply\"."
-msgstr "Wyślij mi wiadomość e-mail, kiedy ktoś wyśle mi odpowiedź \"@\"."
+msgstr "Wyślij wiadomość e-mail, kiedy ktoś wyśle odpowiedź \"@\"."
#: actions/emailsettings.php:179
msgid "Allow friends to nudge me and send me an email."
@@ -1158,92 +1076,92 @@ msgstr "Pozwól przyjaciołom na szturchanie mnie i wyślij mi wiadomość e-mai
#: actions/emailsettings.php:185
msgid "I want to post notices by email."
-msgstr "Chcę wysyłać wpisy przez e-mail."
+msgstr "Chcę wysyłać wpisy przez wiadomości e-mail."
#: actions/emailsettings.php:191
msgid "Publish a MicroID for my email address."
msgstr "Opublikuj MicroID adresu e-mail."
-#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/emailsettings.php:302 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
msgstr "Zapisano preferencje."
-#: actions/emailsettings.php:319
+#: actions/emailsettings.php:320
msgid "No email address."
msgstr "Brak adresu e-mail."
-#: actions/emailsettings.php:326
+#: actions/emailsettings.php:327
msgid "Cannot normalize that email address"
msgstr "Nie można znormalizować tego adresu e-mail"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "To nie jest prawidłowy adres e-mail"
-#: actions/emailsettings.php:333
+#: actions/emailsettings.php:334
msgid "That is already your email address."
-msgstr "Ten adres e-mail jest już Twój."
+msgstr "Ten adres e-mail jest już twój."
-#: actions/emailsettings.php:336
+#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
msgstr "Ten adres e-mail należy już do innego użytkownika."
-#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Nie można wprowadzić kodu potwierdzającego."
-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
msgstr ""
"Kod potwierdzający został wysłany na dodany adres e-mail. Sprawdź w swojej "
-"skrzynce odbiorczej (także w wiadomościach niechcianych!), czy otrzymałeś "
-"kod i instrukcje dotyczące jego użycia."
+"skrzynce odbiorczej (także w wiadomościach niechcianych), czy otrzymałeś kod "
+"i instrukcje dotyczące jego użycia."
-#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
msgstr "Brak oczekujących potwierdzeń do anulowania."
-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
msgstr "To jest błędny adres komunikatora."
-#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
msgstr "Anulowano potwierdzenie."
-#: actions/emailsettings.php:412
+#: actions/emailsettings.php:413
msgid "That is not your email address."
-msgstr "To nie jest Twój adres e-mail."
+msgstr "To nie jest twój adres e-mail."
-#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
msgstr "Adres został usunięty."
-#: actions/emailsettings.php:445 actions/smssettings.php:518
+#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
msgstr "Brak przychodzącego adresu e-mail."
-#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
msgid "Couldn't update user record."
msgstr "Nie można zaktualizować wpisu użytkownika."
-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
msgstr "Usunięto przychodzący adres e-mail."
-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555
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"
@@ -1269,7 +1187,7 @@ msgid ""
"next to any notice you like."
msgstr ""
"Bądź pierwszym, który doda wpis do ulubionych naciskając przycisk ulubionego "
-"obok wpisu, który Ci się podoba."
+"obok wpisu, który ci się podoba."
#: actions/favorited.php:156
#, php-format
@@ -1278,7 +1196,7 @@ msgid ""
"notice to your favorites!"
msgstr ""
"Dlaczego nie [zarejestrujesz konta](%%action.register%%) i zostaniesz "
-"pierwszym, który doda wpis do ulubionych!"
+"pierwszym, który doda wpis do ulubionych."
#: actions/favoritesrss.php:111 actions/showfavorites.php:77
#: lib/personalgroupnav.php:115
@@ -1287,13 +1205,13 @@ msgid "%s's favorite notices"
msgstr "Ulubione wpisy użytkownika %s"
#: actions/favoritesrss.php:115
-#, fuzzy, php-format
+#, php-format
msgid "Updates favored by %1$s on %2$s!"
-msgstr "Aktualizacje od %1$s na %2$s!"
+msgstr "Aktualizacje ulubione przez użytkownika %1$s na %2$s."
#: actions/favor.php:79
msgid "This notice is already a favorite!"
-msgstr "Ten wpis jest już ulubiony!"
+msgstr "Ten wpis jest już ulubiony."
#: actions/favor.php:92 lib/disfavorform.php:140
msgid "Disfavor favorite"
@@ -1332,35 +1250,31 @@ msgstr "Nie wysłano załączników"
#: actions/finishremotesubscribe.php:69
msgid "Not expecting this response!"
-msgstr "Nieoczekiwana odpowiedź!"
+msgstr "Nieoczekiwana odpowiedź."
#: actions/finishremotesubscribe.php:80
-#, fuzzy
msgid "User being listened to does not exist."
-msgstr "Obserwowany użytkownik nie istnieje."
+msgstr "Nasłuchiwany użytkownik nie istnieje."
#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
msgid "You can use the local subscription!"
-msgstr "Można używać lokalnej subskrypcji!"
+msgstr "Można używać lokalnej subskrypcji."
#: actions/finishremotesubscribe.php:96
msgid "That user has blocked you from subscribing."
-msgstr "Ten użytkownik zablokował Cię z subskrypcji."
+msgstr "Ten użytkownik zablokował cię z subskrypcji."
#: actions/finishremotesubscribe.php:106
-#, fuzzy
msgid "You are not authorized."
msgstr "Brak upoważnienia."
#: actions/finishremotesubscribe.php:109
-#, fuzzy
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
-#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
-msgstr "Nieznana wersja protokołu OMB."
+msgstr "Zdalna usługa używa nieznanej wersji protokołu OMB."
#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
msgid "Error updating remote profile"
@@ -1373,14 +1287,12 @@ msgid "No such group."
msgstr "Nie ma takiej grupy."
#: actions/getfile.php:75
-#, fuzzy
msgid "No such file."
-msgstr "Nie ma takiego wpisu."
+msgstr "Nie ma takiego pliku."
#: actions/getfile.php:79
-#, fuzzy
msgid "Cannot read file."
-msgstr "Utracono plik."
+msgstr "Nie można odczytać pliku."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
@@ -1423,7 +1335,7 @@ msgid ""
"group in the future."
msgstr ""
"Jesteś pewny, że chcesz zablokować użytkownika \"%s\" w grupie \"%s\"? "
-"Zostanie usunięty z grupy, nie będzie mógł wysyłać wpisów i zasubskrybować "
+"Zostanie usunięty z grupy, nie będzie mógł wysyłać wpisów i subskrybować "
"grupy w przyszłości."
#: actions/groupblock.php:178
@@ -1465,7 +1377,7 @@ msgstr "Nie można zaktualizować wyglądu."
#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
msgid "Unable to save your design settings!"
-msgstr "Nie można zapisać ustawień wyglądu!"
+msgstr "Nie można zapisać ustawień wyglądu."
#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
msgid "Design preferences saved."
@@ -1507,7 +1419,7 @@ msgstr "Członkowie grupy %s, strona %d"
msgid "A list of the users in this group."
msgstr "Lista użytkowników znajdujących się w tej grupie."
-#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
msgid "Admin"
msgstr "Administrator"
@@ -1528,9 +1440,9 @@ msgid "Make this user an admin"
msgstr "Uczyń tego użytkownika administratorem"
#: actions/grouprss.php:133
-#, fuzzy, php-format
+#, php-format
msgid "Updates from members of %1$s on %2$s!"
-msgstr "Aktualizacje od %1$s na %2$s!"
+msgstr "Aktualizacje od członków %1$s na %2$s."
#: actions/groupsearch.php:52
#, php-format
@@ -1538,12 +1450,12 @@ 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 ""
-"Znajdź grupy na %%site.name%% według ich nazwy, położenia lub opisu. Oddziel "
-"terminy spacjami; muszą mieć trzy znaki lub więcej."
+"Wyszukaj grupy na %%site.name%% według ich nazwy, położenia lub opisu. "
+"Oddziel terminy spacjami; muszą mieć trzy znaki lub więcej."
#: actions/groupsearch.php:58
msgid "Group search"
-msgstr "Znajdź grupę"
+msgstr "Wyszukaj grupę"
#: actions/groupsearch.php:79 actions/noticesearch.php:117
#: actions/peoplesearch.php:83
@@ -1556,7 +1468,7 @@ msgid ""
"If you can't find the group you're looking for, you can [create it](%%action."
"newgroup%%) yourself."
msgstr ""
-"Jeśli nie możesz znaleźć grupy, której szukasz, możesz sam [ją utworzyć](%%"
+"Jeśli nie można odnaleźć grupy, której szukasz, można samemu [ją utworzyć](%%"
"action.newgroup%%)."
#: actions/groupsearch.php:85
@@ -1566,10 +1478,10 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
"Dlaczego nie [zarejestrujesz konta](%%action.register%%) i sam [utworzysz "
-"grupę](%%action.newgroup%%)!"
+"grupę](%%action.newgroup%%)."
#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/subgroupnav.php:98
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Grupy"
@@ -1587,11 +1499,11 @@ msgid ""
"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
"%%%%)"
msgstr ""
-"Grupy %%%%site.name%%%% umożliwiają znalezienie i rozmawianie z osobami o "
+"Grupy %%%%site.name%%%% umożliwiają odnalezienie i rozmawianie z osobami o "
"podobnych zainteresowaniach. Po dołączeniu do grupy można wysyłać wiadomości "
"do wszystkich członków używając składni \"!nazwagrupy\". Nie widzisz grupy, "
-"która Cię interesuje? Spróbuj ją [znaleźć](%%%%action.groupsearch%%%%) lub "
-"[założyć własną!](%%%%action.newgroup%%%%)"
+"która cię interesuje? Spróbuj ją [znaleźć](%%%%action.groupsearch%%%%) lub "
+"[założyć własną.](%%%%action.newgroup%%%%)"
#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
msgid "Create a new group"
@@ -1623,13 +1535,12 @@ msgstr ""
"Skonfiguruj adres i ustawienia poniżej."
#: actions/imsettings.php:89
-#, fuzzy
msgid "IM is not available."
-msgstr "Ta strona nie jest dostępna w "
+msgstr "Komunikator nie jest dostępny."
#: actions/imsettings.php:106
msgid "Current confirmed Jabber/GTalk address."
-msgstr "Obecnie potwierdzone adresy Jabbera/GTalk."
+msgstr "Obecnie potwierdzone adresy Jabber/GTalk."
#: actions/imsettings.php:114
#, php-format
@@ -1637,7 +1548,7 @@ msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
"message with further instructions. (Did you add %s to your buddy list?)"
msgstr ""
-"Oczekiwanie na potwierdzenie tego adresu. Sprawdź swoje konto Jabbera/GTalk, "
+"Oczekiwanie na potwierdzenie tego adresu. Sprawdź swoje konto Jabber/GTalk, "
"czy otrzymałeś wiadomość z dalszymi instrukcjami (dodałeś %s do listy "
"znajomych?)."
@@ -1651,26 +1562,25 @@ 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 Jabbera 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."
-msgstr "Wyślij mi wpisy przez Jabbera/GTalk."
+msgstr "Wyślij mi wpisy przez Jabber/GTalk."
#: actions/imsettings.php:148
msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "Wyślij wpis, kiedy zmieni się mój status na Jabberze/GTalk."
+msgstr "Wyślij wpis, kiedy zmieni się mój stan na Jabber/GTalk."
#: actions/imsettings.php:153
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
-"Wyślij mi odpowiedzi przez Jabbera/GTalk od osób, których nie subskrybuję."
+"Wyślij mi odpowiedzi przez Jabber/GTalk od osób, których nie subskrybuję."
#: actions/imsettings.php:159
msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Opublikuj MicroID adresu Jabbera/GTalk."
+msgstr "Opublikuj MicroID adresu Jabber/GTalk."
#: actions/imsettings.php:285
msgid "No Jabber ID."
@@ -1686,7 +1596,7 @@ msgstr "To nie jest prawidłowy identyfikator Jabbera"
#: actions/imsettings.php:299
msgid "That is already your Jabber ID."
-msgstr "Ten identyfikator Jabbera jest już Twój."
+msgstr "Ten identyfikator Jabbera jest już twój."
#: actions/imsettings.php:302
msgid "Jabber ID already belongs to another user."
@@ -1698,12 +1608,12 @@ msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
"s for sending messages to you."
msgstr ""
-"Kod potwierdzający został wysłany na dodany adres komunikatora. Musisz "
+"Kod potwierdzający został wysłany na dodany adres komunikatora. Należy "
"zaakceptować otrzymywanie wiadomości od %s."
#: actions/imsettings.php:387
msgid "That is not your Jabber ID."
-msgstr "To nie jest Twój identyfikator Jabbera."
+msgstr "To nie jest twój identyfikator Jabbera."
#: actions/inbox.php:59
#, php-format
@@ -1745,7 +1655,7 @@ msgstr "Zaproś nowych użytkowników"
#: actions/invite.php:128
msgid "You are already subscribed to these users:"
-msgstr "Jesteś już zasubskrybowany do tych użytkowników:"
+msgstr "Jesteś już subskrybowany do tych użytkowników:"
#: actions/invite.php:131 actions/invite.php:139
#, php-format
@@ -1756,8 +1666,7 @@ msgstr "%s (%s)"
msgid ""
"These people are already users and you were automatically subscribed to them:"
msgstr ""
-"Te osoby są już użytkownikami i zostałeś do nich automatycznie "
-"zasubskrybowany:"
+"Te osoby są już użytkownikami i zostałeś do nich automatycznie subskrybowany:"
#: actions/invite.php:144
msgid "Invitation(s) sent to the following people:"
@@ -1769,7 +1678,7 @@ msgid ""
"on the site. Thanks for growing the community!"
msgstr ""
"Zostaniesz powiadomiony, kiedy ktoś zaakceptuje zaproszenie i zarejestruje "
-"się na stronie. Dziękujemy za pomoc w zwiększaniu społeczności!"
+"się na stronie. Dziękujemy za pomoc w zwiększaniu społeczności."
#: actions/invite.php:162
msgid ""
@@ -1794,14 +1703,14 @@ msgstr "Osobista wiadomość"
msgid "Optionally add a personal message to the invitation."
msgstr "Opcjonalnie dodaj osobistą wiadomość do zaproszenia."
-#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
msgstr "Wyślij"
#: actions/invite.php:226
#, php-format
msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s zapraszają Cię, abyś dołączył do nich w %2$s"
+msgstr "%1$s zapraszają cię, abyś dołączył do nich w %2$s"
#: actions/invite.php:228
#, php-format
@@ -1833,20 +1742,20 @@ msgid ""
"\n"
"Sincerely, %2$s\n"
msgstr ""
-"Użytkownik %1$s zapraszają Cię, abyś dołączył do nich w %2$s (%3$s).\n"
+"Użytkownik %1$s zapraszają cię, abyś dołączył do nich w %2$s (%3$s).\n"
"\n"
"%2$s jest usługą mikroblogowania, która umożliwia pozostawanie w kontakcie z "
-"osobami, których znasz i z tymi, którzy Cię interesują.\n"
+"osobami, których znasz i z tymi, którzy cię interesują.\n"
"\n"
-"Możesz także dzielić się w sieci nowinkami o sobie, swoimi przemyśleniami, "
-"lub swoim życiem z osobami, którzy Cię znają. To także wspaniały sposób na "
-"poznawanie nowych osób, którzy dzielą Twoje zainteresowania.\n"
+"Można także dzielić się w sieci nowinkami o sobie, swoimi przemyśleniami, "
+"lub swoim życiem z osobami, którzy cię znają. To także wspaniały sposób na "
+"poznawanie nowych osób, którzy dzielą twoje zainteresowania.\n"
"\n"
"Użytkownik %1$s powiedział:\n"
"\n"
"%4$s\n"
"\n"
-"Możesz zobaczyć stronę profilu %1$s na %2$s tutaj:\n"
+"Można zobaczyć stronę profilu %1$s na %2$s tutaj:\n"
"\n"
"%5$s\n"
"\n"
@@ -1855,7 +1764,7 @@ msgstr ""
"\n"
"%6$s\n"
"\n"
-"Jeśli nie, możesz zignorować tę wiadomość. Dziękujemy za Twoją cierpliwość i "
+"Jeśli nie, można zignorować tę wiadomość. Dziękujemy za twoją cierpliwość i "
"czas.\n"
"\n"
"Z poważaniem, %2$s\n"
@@ -1888,7 +1797,7 @@ msgstr "Nie jesteś członkiem tej grupy."
#: actions/leavegroup.php:119 lib/command.php:278
msgid "Could not find membership record."
-msgstr "Nie można znaleźć wpisu członkostwa."
+msgstr "Nie można odnaleźć wpisu członkostwa."
#: actions/leavegroup.php:127 lib/command.php:284
#, php-format
@@ -1905,20 +1814,18 @@ msgid "Already logged in."
msgstr "Jesteś już zalogowany."
#: actions/login.php:110 actions/login.php:120
-#, fuzzy
msgid "Invalid or expired token."
-msgstr "Nieprawidłowa zawartość wpisu"
+msgstr "Nieprawidłowy lub wygasły token."
#: actions/login.php:143
msgid "Incorrect username or password."
msgstr "Niepoprawna nazwa użytkownika lub hasło."
#: actions/login.php:149
-#, fuzzy
msgid "Error setting user. You are probably not authorized."
-msgstr "Brak upoważnienia."
+msgstr "Błąd podczas ustawiania użytkownika. Prawdopodobnie brak upoważnienia."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:457
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Zaloguj się"
@@ -1945,7 +1852,8 @@ msgstr "Zapamiętaj mnie"
#: actions/login.php:253 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
-"Automatyczne logowanie. Nie użyj na komputerach używanych przez wiele osób!"
+"Automatyczne logowanie. Nie należy używać na komputerach używanych przez "
+"wiele osób."
#: actions/login.php:263
msgid "Lost or forgotten password?"
@@ -1960,14 +1868,13 @@ msgstr ""
"zmienianiem ustawień."
#: actions/login.php:286
-#, fuzzy, php-format
+#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
"(%%action.register%%) a new account."
msgstr ""
"Zaloguj się za pomocą nazwy użytkownika i hasła. Nie masz ich jeszcze? "
-"[Zarejestruj](%%action.register%%) nowe konto lub wypróbuj [OpenID](%%action."
-"openidlogin%%). "
+"[Zarejestruj](%%action.register%%) nowe konto."
#: actions/makeadmin.php:91
msgid "Only an admin can make another user an admin."
@@ -1990,7 +1897,7 @@ msgstr "Nie można uczynić %s administratorem grupy %s"
#: actions/microsummary.php:69
msgid "No current status"
-msgstr "Brak obecnego statusu"
+msgstr "Brak obecnego stanu"
#: actions/newgroup.php:53
msgid "New group"
@@ -2011,7 +1918,7 @@ msgstr "Nie można wysłać wiadomości do tego użytkownika."
#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
#: lib/command.php:424
msgid "No content!"
-msgstr "Brak zawartości!"
+msgstr "Brak zawartości."
#: actions/newmessage.php:158
msgid "No recipient specified."
@@ -2031,7 +1938,7 @@ msgstr "Wysłano wiadomość"
msgid "Direct message to %s sent"
msgstr "Wysłano bezpośrednią wiadomość do użytkownika %s"
-#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
msgid "Ajax Error"
msgstr "Błąd AJAX"
@@ -2039,7 +1946,7 @@ msgstr "Błąd AJAX"
msgid "New notice"
msgstr "Nowy wpis"
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
msgid "Notice posted"
msgstr "Wysłano wpis"
@@ -2049,12 +1956,12 @@ msgid ""
"Search for notices on %%site.name%% by their contents. Separate search terms "
"by spaces; they must be 3 characters or more."
msgstr ""
-"Znajdź wpisy na %%site.name%% według ich zawartości. Oddziel wyszukiwane "
+"Wyszukaj wpisy na %%site.name%% według ich zawartości. Oddziel wyszukiwane "
"terminy spacjami. Terminy muszą mieć trzy znaki lub więcej."
#: actions/noticesearch.php:78
msgid "Text search"
-msgstr "Znajdź tekst"
+msgstr "Wyszukiwanie tekstu"
#: actions/noticesearch.php:91
#, php-format
@@ -2068,33 +1975,33 @@ msgid ""
"status_textarea=%s)!"
msgstr ""
"Zostań pierwszym, który [wyśle coś na ten temat](%%%%action.newnotice%%%%?"
-"status_textarea=%s)!"
+"status_textarea=%s)."
#: actions/noticesearch.php:124
-#, fuzzy, php-format
+#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
"Dlaczego nie [zarejestrujesz konta](%%%%action.register%%%%) i zostaniesz "
"pierwszym, który [wyśle coś na ten temat](%%%%action.newnotice%%%%?"
-"status_textarea=%s)!"
+"status_textarea=%s)."
-#: actions/noticesearchrss.php:89
-#, fuzzy, php-format
+#: actions/noticesearchrss.php:96
+#, php-format
msgid "Updates with \"%s\""
-msgstr "Aktualizacje ze znacznikiem %1$s na %2$s!"
+msgstr "Aktualizacje z \"%s\""
-#: actions/noticesearchrss.php:91
-#, fuzzy, php-format
+#: actions/noticesearchrss.php:98
+#, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr "Wszystkie aktualizacje pasujące do wyszukiwanego terminu \"%s\""
+msgstr "Aktualizacje pasujące do wyszukiwanego terminu \"%1$s\" na %2$s."
#: actions/nudge.php:85
msgid ""
"This user doesn't allow nudges or hasn't confirmed or set his email yet."
msgstr ""
-"Ten użytkownik nie pozwala na szturchnięcia lub nie potwierdził lub nie "
+"Ten użytkownik nie pozwala na szturchnięcia albo nie potwierdził lub nie "
"ustawił jeszcze swojego adresu e-mail."
#: actions/nudge.php:94
@@ -2103,7 +2010,7 @@ msgstr "Wysłano szturchnięcie"
#: actions/nudge.php:97
msgid "Nudge sent!"
-msgstr "Wysłano szturchnięcie!"
+msgstr "Wysłano szturchnięcie."
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
@@ -2112,16 +2019,15 @@ msgstr "Wpis nie posiada profilu"
#: actions/oembed.php:86 actions/shownotice.php:180
#, php-format
msgid "%1$s's status on %2$s"
-msgstr "Status użytkownika %1$s na %2$s"
+msgstr "Stan użytkownika %1$s na %2$s"
#: actions/oembed.php:157
-#, fuzzy
msgid "content type "
-msgstr "Zawartość"
+msgstr "typ zawartości "
#: actions/oembed.php:160
msgid "Only "
-msgstr ""
+msgstr "Tylko "
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
#: lib/api.php:1027 lib/api.php:1137
@@ -2146,11 +2052,11 @@ msgstr "Zarządzaj różnymi innymi opcjami."
#: actions/othersettings.php:108
msgid " (free service)"
-msgstr ""
+msgstr " (wolna usługa)"
#: actions/othersettings.php:116
msgid "Shorten URLs with"
-msgstr "Skracaj adresy URL za pomocą"
+msgstr "Skracanie adresów URL za pomocą"
#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
@@ -2196,7 +2102,7 @@ msgstr "Zmiana hasła"
#: actions/passwordsettings.php:104
msgid "Old password"
-msgstr "Stare hasło"
+msgstr "Poprzednie hasło"
#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
@@ -2211,9 +2117,9 @@ msgstr "6 lub więcej znaków"
msgid "Confirm"
msgstr "Potwierdź"
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "takie samo jak hasło powyżej"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Takie samo jak powyższe hasło"
#: actions/passwordsettings.php:117
msgid "Change"
@@ -2229,7 +2135,7 @@ msgstr "Hasła nie pasują do siebie."
#: actions/passwordsettings.php:165
msgid "Incorrect old password"
-msgstr "Niepoprawne stare hasło"
+msgstr "Niepoprawne poprzednie hasło"
#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
@@ -2243,13 +2149,114 @@ msgstr "Nie można zapisać nowego hasła."
msgid "Password saved."
msgstr "Zapisano hasło."
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr "Ścieżki"
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr "Ustawienia ścieżki i serwera dla tej strony StatusNet."
+
+#: actions/pathsadminpanel.php:140
+#, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Katalog motywu jest nieczytelny: %s"
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr "Katalog awatara jest niezapisywalny: %s"
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr "Katalog tła jest niezapisywalny: %s"
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr "Katalog lokalizacji jest nieczytelny: %s"
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+msgid "Site"
+msgstr "Strona"
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr "Ścieżka"
+
+#: actions/pathsadminpanel.php:216
+msgid "Site path"
+msgstr "Ścieżka do strony"
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr "Ścieżka do lokalizacji"
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr "Ścieżka do katalogu lokalizacji"
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr "Motyw"
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr "Serwer motywu"
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr "Ścieżka do motywu"
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr "Katalog motywu"
+
+#: actions/pathsadminpanel.php:247
+msgid "Avatars"
+msgstr "Awatary"
+
+#: actions/pathsadminpanel.php:252
+msgid "Avatar server"
+msgstr "Serwer awatara"
+
+#: actions/pathsadminpanel.php:256
+msgid "Avatar path"
+msgstr "Ścieżka do awatara"
+
+#: actions/pathsadminpanel.php:260
+msgid "Avatar directory"
+msgstr "Katalog awatara"
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr "Tła"
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr "Serwer tła"
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr "Ścieżka do tła"
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr "Katalog tła"
+
+#: actions/pathsadminpanel.php:297
+msgid "Save paths"
+msgstr "Ścieżki zapisu"
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
"Search for people on %%site.name%% by their name, location, or interests. "
"Separate the terms by spaces; they must be 3 characters or more."
msgstr ""
-"Znajdź osoby na %%site.name%% według ich nazwiska, położenia lub "
+"Wyszukaj osoby na %%site.name%% według ich nazwiska, położenia lub "
"zainteresowań. Oddziel wyszukiwane terminy spacjami. Terminy muszą mieć trzy "
"znaki lub więcej."
@@ -2274,7 +2281,7 @@ msgstr "Nieprawidłowa zawartość wpisu"
#: actions/postnotice.php:90
#, php-format
msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
-msgstr ""
+msgstr "Licencja wpisu \"%s\" nie jest zgodna z licencją strony \"%s\"."
#: actions/profilesettings.php:60
msgid "Profile settings"
@@ -2285,7 +2292,7 @@ msgid ""
"You can update your personal profile info here so people know more about you."
msgstr ""
"Tutaj można zaktualizować osobiste informacje w profilu, aby inni mogli "
-"lepiej Cię poznać."
+"lepiej cię poznać."
#: actions/profilesettings.php:99
msgid "Profile information"
@@ -2311,14 +2318,13 @@ msgid "URL of your homepage, blog, or profile on another site"
msgstr "Adres URL strony domowej, bloga lub profilu na innej stronie"
#: actions/profilesettings.php:122 actions/register.php:460
-#, fuzzy, php-format
+#, php-format
msgid "Describe yourself and your interests in %d chars"
-msgstr "Opisz się i swoje zainteresowania w 140 znakach"
+msgstr "Opisz się i swoje zainteresowania w %d znakach"
#: actions/profilesettings.php:125 actions/register.php:463
-#, fuzzy
msgid "Describe yourself and your interests"
-msgstr "Opisz się i swoje "
+msgstr "Opisz się i swoje zainteresowania"
#: actions/profilesettings.php:127 actions/register.php:465
msgid "Bio"
@@ -2348,7 +2354,7 @@ msgstr ""
"Znaczniki dla siebie (litery, liczby, -, . i _), oddzielone przecinkami lub "
"spacjami"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr "Język"
@@ -2368,13 +2374,12 @@ msgstr "W jakiej strefie czasowej zwykle się znajdujesz?"
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-"Automatycznie zasubskrybuj każdego, kto mnie zasubskrybuje (najlepsze dla "
-"botów)"
+"Automatycznie subskrybuj każdego, kto mnie subskrybuje (najlepsze dla botów)"
#: actions/profilesettings.php:221 actions/register.php:223
-#, fuzzy, php-format
+#, php-format
msgid "Bio is too long (max %d chars)."
-msgstr "Wpis \"O mnie\" jest za długi (maksymalnie 140 znaków)."
+msgstr "Wpis \"O mnie\" jest za długi (maksymalnie %d znaków)."
#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
@@ -2446,7 +2451,7 @@ msgstr ""
#: actions/public.php:182
msgid "Be the first to post!"
-msgstr "Zostań pierwszym, który coś wyśle!"
+msgstr "Zostań pierwszym, który coś wyśle."
#: actions/public.php:186
#, php-format
@@ -2454,7 +2459,7 @@ msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
"Dlaczego nie [zarejestrujesz konta](%%action.register%%) i zostaniesz "
-"pierwszym, który coś wyśle!"
+"pierwszym, który coś wyśle."
#: actions/public.php:233
#, php-format
@@ -2467,7 +2472,7 @@ msgstr ""
"To jest %%site.name%%, usługa [mikroblogowania](http://pl.wikipedia.org/wiki/"
"Mikroblog) oparta na wolnym narzędziu [StatusNet](http://status.net/). "
"[Dołącz teraz](%%action.register%%), aby dzielić się wpisami o sobie z "
-"przyjaciółmi, rodziną i kolegami! ([Przeczytaj więcej](%%doc.help%%))"
+"przyjaciółmi, rodziną i kolegami. ([Przeczytaj więcej](%%doc.help%%))"
#: actions/public.php:238
#, php-format
@@ -2492,11 +2497,11 @@ msgstr "To są najpopularniejsze ostatnie znaczniki na %s "
#, php-format
msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
msgstr ""
-"Nikt jeszcze nie wysłał wpisu za pomocą [znacznika hasha](%%doc.tags%%)."
+"Nikt jeszcze nie wysłał wpisu za pomocą [znacznika mieszania](%%doc.tags%%)."
#: actions/publictagcloud.php:72
msgid "Be the first to post one!"
-msgstr "Zostań pierwszym, który go wyśle!"
+msgstr "Zostań pierwszym, który go wyśle."
#: actions/publictagcloud.php:75
#, php-format
@@ -2505,7 +2510,7 @@ msgid ""
"one!"
msgstr ""
"Dlaczego nie [zarejestrujesz konta](%%action.register%%) i zostaniesz "
-"pierwszym, który go wyśle!"
+"pierwszym, który go wyśle."
#: actions/publictagcloud.php:135
msgid "Tag cloud"
@@ -2513,7 +2518,7 @@ msgstr "Chmura znaczników"
#: actions/recoverpassword.php:36
msgid "You are already logged in!"
-msgstr "Jesteś już zalogowany!"
+msgstr "Jesteś już zalogowany."
#: actions/recoverpassword.php:62
msgid "No such recovery code."
@@ -2544,22 +2549,24 @@ 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 ""
+"Jeśli zapomniano lub zgubiono swoje hasło, można otrzymać nowe, wysłane na "
+"adres e-mail przechowywany w koncie."
#: actions/recoverpassword.php:158
msgid "You have been identified. Enter a new password below. "
-msgstr ""
+msgstr "Zostałeś zidentyfikowany. Podaj poniżej nowe hasło. "
#: actions/recoverpassword.php:188
msgid "Password recovery"
-msgstr ""
+msgstr "Przywrócenie hasła"
#: actions/recoverpassword.php:191
msgid "Nickname or email address"
-msgstr ""
+msgstr "Pseudonim lub adres e-mail"
#: actions/recoverpassword.php:193
msgid "Your nickname on this server, or your registered email address."
-msgstr "Twój pseudonim na tym serwerze lub zarejestrowany adres e-mail."
+msgstr "Pseudonim na tym serwerze lub zarejestrowany adres e-mail."
#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
msgid "Recover"
@@ -2583,11 +2590,7 @@ msgstr "Nieznane działanie"
#: actions/recoverpassword.php:236
msgid "6 or more characters, and don't forget it!"
-msgstr "6 lub więcej znaków, i nie zapomnij go!"
-
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Takie samo jak powyższe hasło"
+msgstr "6 lub więcej znaków, i nie zapomnij go."
#: actions/recoverpassword.php:243
msgid "Reset"
@@ -2615,7 +2618,7 @@ msgid ""
"address registered to your account."
msgstr ""
"Instrukcje przywracania hasła zostały wysłane na adres e-mail zarejestrowany "
-"z Twoim kontem."
+"z twoim kontem."
#: actions/recoverpassword.php:344
msgid "Unexpected password reset."
@@ -2639,17 +2642,17 @@ msgstr "Pomyślnie zapisano nowe hasło. Jesteś teraz zalogowany."
#: actions/register.php:85 actions/register.php:189 actions/register.php:404
msgid "Sorry, only invited people can register."
-msgstr "Przepraszamy, tylko zaproszone osoby mogą się rejestrować."
+msgstr "Tylko zaproszone osoby mogą się rejestrować."
#: actions/register.php:92
msgid "Sorry, invalid invitation code."
-msgstr "Przepraszamy, nieprawidłowy kod zaproszenia."
+msgstr "Nieprawidłowy kod zaproszenia."
#: actions/register.php:112
msgid "Registration successful"
msgstr "Rejestracja powiodła się"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Zarejestruj się"
@@ -2661,7 +2664,7 @@ msgstr "Rejestracja nie jest dozwolona."
#: actions/register.php:198
msgid "You can't register if you don't agree to the license."
msgstr ""
-"Nie możesz się zarejestrować, jeśli nie zgadzasz się z warunkami licencji."
+"Nie można się zarejestrować, jeśli nie zgadzasz się z warunkami licencji."
#: actions/register.php:201
msgid "Not a valid email address."
@@ -2676,15 +2679,12 @@ msgid "Invalid username or password."
msgstr "Nieprawidłowa nazwa użytkownika lub hasło."
#: actions/register.php:342
-#, fuzzy
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
"Za pomocą tego formularza można utworzyć nowe konto. Można wtedy wysyłać "
-"wpisy i połączyć się z przyjaciółmi i kolegami. (Posiadasz identyfikator "
-"[OpenID](http://openid.net/)? Wypróbuj [rejestracji OpenID](%%action."
-"openidlogin%%)!)"
+"wpisy i połączyć się z przyjaciółmi i kolegami. "
#: actions/register.php:424
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
@@ -2700,7 +2700,7 @@ msgid "Same as password above. Required."
msgstr "Takie samo jak powyższe hasło. Wymagane."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-mail"
@@ -2710,7 +2710,7 @@ msgstr "Używane tylko do aktualizacji, ogłoszeń i przywracania hasła"
#: actions/register.php:449
msgid "Longer name, preferably your \"real\" name"
-msgstr "Dłuższa nazwa, najlepiej twoje \"prawdziwe\" nazwisko"
+msgstr "Dłuższa nazwa, najlepiej twoje \"prawdziwe\" imię i nazwisko"
#: actions/register.php:493
msgid "My text and files are available under "
@@ -2718,7 +2718,7 @@ msgstr "Moje teksty i pliki są dostępne na "
#: actions/register.php:495
msgid "Creative Commons Attribution 3.0"
-msgstr "Creative Commons Uznanie Autorstwa 3.0"
+msgstr "Creative Commons Uznanie autorstwa 3.0"
#: actions/register.php:496
msgid ""
@@ -2746,20 +2746,20 @@ msgid ""
"\n"
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-"Gratulacje, %s! Witaj na %%%%site.name%%%%. Stąd możesz chcieć...\n"
+"Gratulacje, %s! Witaj na %%%%site.name%%%%. Stąd można...\n"
"\n"
"* Przejść do [swojego profilu](%s) i wysłać swoją pierwszą wiadomość.\n"
-"* Dodać [adres Jabbera/GTalk](%%%%action.imsettings%%%%), abyś mógł wysyłać "
+"* Dodać [adres Jabber/GTalk](%%%%action.imsettings%%%%), abyś mógł wysyłać "
"wpisy przez komunikatora.\n"
"* [Poszukać osób](%%%%action.peoplesearch%%%%), których możesz znać lub "
-"którzy dzielą Twoje zainteresowania. \n"
+"którzy dzielą twoje zainteresowania. \n"
"* Zaktualizować swoje [ustawienia profilu](%%%%action.profilesettings%%%%), "
"aby powiedzieć innym więcej o sobie. \n"
"* Przeczytać [dokumentację w sieci](%%%%doc.help%%%%), aby dowiedzieć się o "
"funkcjach, które mogłeś pominąć. \n"
"\n"
"Dziękujemy za zarejestrowanie się i mamy nadzieję, że używanie tej usługi "
-"sprawi Ci przyjemność."
+"sprawi ci przyjemność."
#: actions/register.php:561
msgid ""
@@ -2776,18 +2776,18 @@ msgid ""
"register%%) a new account. If you already have an account on a [compatible "
"microblogging site](%%doc.openmublog%%), enter your profile URL below."
msgstr ""
-"Aby zasubskrybować, można [zalogować się](%%action.login%%) lub "
-"[zarejestrować](%%action.register%%) nowe konto. Jeśli już posiadasz konto "
-"na [zgodnej stronie mikroblogowania](%%doc.openmublog%%), podaj poniżej "
-"adres URL profilu."
+"Aby subskrybować, można [zalogować się](%%action.login%%) lub [zarejestrować]"
+"(%%action.register%%) nowe konto. Jeśli już posiadasz konto na [zgodnej "
+"stronie mikroblogowania](%%doc.openmublog%%), podaj poniżej adres URL "
+"profilu."
#: actions/remotesubscribe.php:112
msgid "Remote subscribe"
-msgstr "Zasubskrybuj zdalnie"
+msgstr "Subskrybuj zdalnie"
#: actions/remotesubscribe.php:124
msgid "Subscribe to a remote user"
-msgstr "Zasubskrybuj zdalnego użytkownika"
+msgstr "Subskrybuj zdalnego użytkownika"
#: actions/remotesubscribe.php:129
msgid "User nickname"
@@ -2806,27 +2806,26 @@ 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 "Zasubskrybuj"
+msgstr "Subskrybuj"
#: actions/remotesubscribe.php:159
msgid "Invalid profile URL (bad format)"
msgstr "Nieprawidłowy adres URL profilu (błędny format)"
#: actions/remotesubscribe.php:168
-#, fuzzy
msgid ""
"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
-msgstr "To nie jest prawidłowy adres URL profilu (brak dokumentu YADIS)."
+msgstr ""
+"To nie jest prawidłowy adres URL profilu (brak dokumentu YADIS lub określono "
+"nieprawidłowe XRDS)."
#: actions/remotesubscribe.php:176
-#, fuzzy
msgid "That’s a local profile! Login to subscribe."
-msgstr "To jest profil lokalny! Zaloguj się, aby zasubskrybować."
+msgstr "To jest profil lokalny. Zaloguj się, aby subskrybować."
#: actions/remotesubscribe.php:183
-#, fuzzy
msgid "Couldn’t get a request token."
msgstr "Nie można uzyskać tokenu żądana."
@@ -2842,19 +2841,19 @@ msgid "Replies to %s, page %d"
msgstr "Odpowiedzi na %s, strona %d"
#: actions/replies.php:144
-#, fuzzy, php-format
+#, php-format
msgid "Replies feed for %s (RSS 1.0)"
-msgstr "Kanał wpisów dla %s (RSS 1.0)"
+msgstr "Kanał odpowiedzi dla użytkownika %s (RSS 1.0)"
#: actions/replies.php:151
-#, fuzzy, php-format
+#, php-format
msgid "Replies feed for %s (RSS 2.0)"
-msgstr "Kanał wpisów dla %s (RSS 2.0)"
+msgstr "Kanał odpowiedzi dla użytkownika %s (RSS 2.0)"
#: actions/replies.php:158
-#, fuzzy, php-format
+#, php-format
msgid "Replies feed for %s (Atom)"
-msgstr "Kanał wpisów dla %s (Atom)"
+msgstr "Kanał odpowiedzi dla użytkownika %s (Atom)"
#: actions/replies.php:198
#, php-format
@@ -2871,8 +2870,8 @@ msgid ""
"You can engage other users in a conversation, subscribe to more people or "
"[join groups](%%action.groups%%)."
msgstr ""
-"Możesz nawiązać rozmowę z innymi użytkownikami, zasubskrybować więcej osób "
-"lub [dołączyć do grup](%%action.groups%%)."
+"Można nawiązać rozmowę z innymi użytkownikami, subskrybować więcej osób lub "
+"[dołączyć do grup](%%action.groups%%)."
#: actions/replies.php:205
#, php-format
@@ -2880,23 +2879,21 @@ msgid ""
"You can try to [nudge %s](../%s) or [post something to his or her attention]"
"(%%%%action.newnotice%%%%?status_textarea=%s)."
msgstr ""
-"Możesz spróbować [szturchnąć użytkownika %s](../%s) lub [wysłać coś "
+"Można spróbować [szturchnąć użytkownika %s](../%s) lub [wysłać coś "
"wymagającego jego uwagi](%%%%action.newnotice%%%%?status_textarea=%s)."
#: actions/repliesrss.php:72
-#, fuzzy, php-format
+#, php-format
msgid "Replies to %1$s on %2$s!"
-msgstr "Wiadomość do użytkownika %1$s na %2$s"
+msgstr "odpowiedzi dla użytkownika %1$s na %2$s."
#: actions/sandbox.php:65 actions/unsandbox.php:65
-#, fuzzy
msgid "You cannot sandbox users on this site."
-msgstr "Nie można wysłać wiadomości do tego użytkownika."
+msgstr "Nie można ograniczać użytkowników na tej stronie."
#: actions/sandbox.php:72
-#, fuzzy
msgid "User is already sandboxed."
-msgstr "Użytkownik został już zablokował w grupie."
+msgstr "Użytkownik jest już ograniczony."
#: actions/showfavorites.php:79
#, php-format
@@ -2908,19 +2905,19 @@ msgid "Could not retrieve favorite notices."
msgstr "Nie można odebrać ulubionych wpisów."
#: actions/showfavorites.php:170
-#, fuzzy, php-format
+#, php-format
msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr "Kanał dla znajomych użytkownika %s (RSS 1.0)"
+msgstr "Kanał dla ulubionych wpisów użytkownika %s (RSS 1.0)"
#: actions/showfavorites.php:177
-#, fuzzy, php-format
+#, php-format
msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr "Kanał dla znajomych użytkownika %s (RSS 2.0)"
+msgstr "Kanał dla ulubionych wpisów użytkownika %s (RSS 2.0)"
#: actions/showfavorites.php:184
-#, fuzzy, php-format
+#, php-format
msgid "Feed for favorites of %s (Atom)"
-msgstr "Kanał dla znajomych użytkownika %s (Atom)"
+msgstr "Kanał dla ulubionych wpisów użytkownika %s (Atom)"
#: actions/showfavorites.php:205
msgid ""
@@ -2941,7 +2938,7 @@ msgstr ""
"interesującego, aby chcieli dodać to do swoich ulubionych. :)"
#: actions/showfavorites.php:211
-#, fuzzy, php-format
+#, php-format
msgid ""
"%s hasn't added any notices to his favorites yet. Why not [register an "
"account](%%%%action.register%%%%) and then post something interesting they "
@@ -3003,9 +3000,9 @@ msgid "Notice feed for %s group (Atom)"
msgstr "Kanał wpisów dla grupy %s (Atom)"
#: actions/showgroup.php:345
-#, fuzzy, php-format
+#, php-format
msgid "FOAF for %s group"
-msgstr "FOAF dla %s"
+msgstr "FOAF dla grupy %s"
#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
msgid "Members"
@@ -3042,7 +3039,7 @@ msgstr ""
"[mikroblogowania](http://pl.wikipedia.org/wiki/Mikroblog) opartej na wolnym "
"narzędziu [StatusNet](http://status.net/). Jej członkowie dzielą się "
"krótkimi wiadomościami o swoim życiu i zainteresowaniach. [Dołącz teraz](%%%%"
-"action.register%%%%), aby stać się częścią tej grupy i wiele więcej! "
+"action.register%%%%), aby stać się częścią tej grupy i wiele więcej. "
"([Przeczytaj więcej](%%%%doc.help%%%%))"
#: actions/showgroup.php:454
@@ -3081,9 +3078,8 @@ msgid "Message from %1$s on %2$s"
msgstr "Wiadomość od użytkownika %1$s na %2$s"
#: actions/shownotice.php:90
-#, fuzzy
msgid "Notice deleted."
-msgstr "Wysłano wpis"
+msgstr "Usunięto wpis."
#: actions/showstream.php:73
#, php-format
@@ -3140,7 +3136,7 @@ msgid ""
"You can try to nudge %s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%s)."
msgstr ""
-"Możesz spróbować szturchnąć użytkownika %s lub [wysłać coś, co wymaga jego "
+"Można spróbować szturchnąć użytkownika %s lub [wysłać coś, co wymaga jego "
"uwagi](%%%%action.newnotice%%%%?status_textarea=%s)."
#: actions/showstream.php:234
@@ -3154,7 +3150,7 @@ msgstr ""
"**%s** posiada konto na %%%%site.name%%%%, usłudze [mikroblogowania](http://"
"pl.wikipedia.org/wiki/Mikroblog) opartej na wolnym narzędziu [StatusNet]"
"(http://status.net/). [Dołącz teraz](%%%%action.register%%%%), aby "
-"obserwować wpisy użytkownika **%s** i wiele więcej! ([Przeczytaj więcej](%%%%"
+"obserwować wpisy użytkownika **%s** i wiele więcej. ([Przeczytaj więcej](%%%%"
"doc.help%%%%))"
#: actions/showstream.php:239
@@ -3169,258 +3165,249 @@ msgstr ""
"(http://status.net/). "
#: actions/silence.php:65 actions/unsilence.php:65
-#, fuzzy
msgid "You cannot silence users on this site."
-msgstr "Nie można wysłać wiadomości do tego użytkownika."
+msgstr "Nie można wyciszać użytkowników na tej stronie."
#: actions/silence.php:72
-#, fuzzy
msgid "User is already silenced."
-msgstr "Użytkownik został już zablokował w grupie."
-
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
-#, fuzzy
-msgid "Site"
-msgstr "Zaproś"
+msgstr "Użytkownik jest już wyciszony."
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
-msgstr ""
+msgstr "Podstawowe ustawienia tej strony StatusNet."
#: actions/siteadminpanel.php:147
msgid "Site name must have non-zero length."
-msgstr ""
+msgstr "Nazwa strony nie może mieć zerową długość."
#: actions/siteadminpanel.php:155
-#, fuzzy
msgid "You must have a valid contact email address"
-msgstr "To nie jest prawidłowy adres e-mail"
+msgstr "Należy posiadać prawidłowy kontaktowy adres e-mail"
#: actions/siteadminpanel.php:173
#, php-format
msgid "Unknown language \"%s\""
-msgstr ""
+msgstr "Nieznany język \"%s\""
#: actions/siteadminpanel.php:180
msgid "Invalid snapshot report URL."
-msgstr ""
+msgstr "Nieprawidłowy adres URL zgłaszania migawek."
#: actions/siteadminpanel.php:186
msgid "Invalid snapshot run value."
-msgstr ""
+msgstr "Nieprawidłowa wartość wykonania migawki."
#: actions/siteadminpanel.php:192
msgid "Snapshot frequency must be a number."
-msgstr ""
+msgstr "Częstotliwość migawek musi być liczbą."
#: actions/siteadminpanel.php:199
-msgid "You must set an SSL sever when enabling SSL."
-msgstr ""
+msgid "You must set an SSL server when enabling SSL."
+msgstr "Należy ustawić serwer SSL podczas włączania SSL."
#: actions/siteadminpanel.php:204
-msgid "Invalid SSL server. Max length is 255 characters."
-msgstr ""
+msgid "Invalid SSL server. The maximum length is 255 characters."
+msgstr "Nieprawidłowy serwer SSL. Maksymalna długość to 255 znaków."
#: actions/siteadminpanel.php:210
-msgid "Minimum text limit is 140c."
-msgstr ""
+msgid "Minimum text limit is 140 characters."
+msgstr "Maksymalne ograniczenie tekstu to 14 znaków."
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
-msgstr ""
+msgstr "Ograniczenie duplikatów musi wynosić jedną lub więcej sekund."
-#: actions/siteadminpanel.php:224
-#, php-format
-msgid "Locales directory not readable: %s"
-msgstr ""
+#: actions/siteadminpanel.php:266
+msgid "General"
+msgstr "Ogólne"
-#: actions/siteadminpanel.php:275
-#, fuzzy
+#: actions/siteadminpanel.php:269
msgid "Site name"
-msgstr "Wpis strony"
+msgstr "Nazwa strony"
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
-msgstr ""
+msgstr "Nazwa strony, taka jak \"Mikroblog firmy X\""
-#: actions/siteadminpanel.php:279
+#: actions/siteadminpanel.php:274
msgid "Brought by"
-msgstr ""
+msgstr "Dostarczane przez"
-#: actions/siteadminpanel.php:280
+#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
-msgstr ""
+msgstr "Tekst używany do odnośnika do zasług w stopce każdej strony"
-#: actions/siteadminpanel.php:283
+#: actions/siteadminpanel.php:279
msgid "Brought by URL"
-msgstr ""
+msgstr "Adres URL \"Dostarczane przez\""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
-msgstr ""
+msgstr "Adres URL używany do odnośnika do zasług w stopce każdej strony"
-#: actions/siteadminpanel.php:288
-#, fuzzy
-msgid "contact email address for your site"
-msgstr "Nowy adres e-mail do wysyłania do %s"
+#: actions/siteadminpanel.php:284
+msgid "Contact email address for your site"
+msgstr "Kontaktowy adres e-mail strony"
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:290
+msgid "Local"
+msgstr "Lokalne"
+
+#: actions/siteadminpanel.php:301
msgid "Default timezone"
-msgstr ""
+msgstr "Domyślna strefa czasowa"
-#: actions/siteadminpanel.php:303
+#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
-msgstr ""
+msgstr "Domyśla strefa czasowa strony, zwykle UTC."
-#: actions/siteadminpanel.php:310
-#, fuzzy
+#: actions/siteadminpanel.php:308
msgid "Default site language"
-msgstr "Preferowany język"
+msgstr "Domyślny język strony"
#: actions/siteadminpanel.php:316
-msgid "Path to locales"
-msgstr ""
-
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
-msgstr ""
+msgid "URLs"
+msgstr "Adresy URL"
-#: actions/siteadminpanel.php:320
-#, fuzzy
+#: actions/siteadminpanel.php:319
msgid "Server"
-msgstr "Przywróć"
+msgstr "Serwer"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-#, fuzzy
-msgid "Site path"
-msgstr "Wpis strony"
+msgstr "Nazwa komputera serwera strony."
-#: actions/siteadminpanel.php:328
+#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
-msgstr ""
+msgstr "Eleganckie adresu URL"
-#: actions/siteadminpanel.php:330
+#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
+"Używać eleganckich (bardziej czytelnych i łatwiejszych do zapamiętania) "
+"adresów URL?"
+
+#: actions/siteadminpanel.php:331
+msgid "Access"
+msgstr "Dostęp"
#: actions/siteadminpanel.php:334
-#, fuzzy
msgid "Private"
-msgstr "Prywatność"
+msgstr "Prywatna"
#: actions/siteadminpanel.php:336
msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
+msgstr "Zabronić anonimowym użytkownikom (niezalogowanym) przeglądać stronę?"
#: actions/siteadminpanel.php:340
-#, fuzzy
msgid "Invite only"
-msgstr "Zaproś"
+msgstr "Tylko zaproszeni"
#: actions/siteadminpanel.php:342
msgid "Make registration invitation only."
-msgstr ""
+msgstr "Rejestracja tylko za zaproszeniem."
-#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
-#, fuzzy
+#: actions/siteadminpanel.php:346
msgid "Closed"
-msgstr "Zablokowano"
+msgstr "Zamknięte"
#: actions/siteadminpanel.php:348
msgid "Disable new registrations."
-msgstr ""
+msgstr "Wyłączenie nowych rejestracji."
+
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
+msgstr "Migawki"
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
-msgstr ""
+msgstr "Losowo podczas trafienia WWW"
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
-msgstr ""
+msgstr "Jako zaplanowane zadanie"
-#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
-#, fuzzy
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
msgid "Never"
-msgstr "Przywróć"
+msgstr "Nigdy"
-#: actions/siteadminpanel.php:357
+#: actions/siteadminpanel.php:360
msgid "Data snapshots"
-msgstr ""
+msgstr "Migawki danych"
-#: actions/siteadminpanel.php:358
+#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
-msgstr ""
+msgstr "Kiedy wysyłać dane statystyczne na serwery status.net"
-#: actions/siteadminpanel.php:364
+#: actions/siteadminpanel.php:366
msgid "Frequency"
-msgstr ""
+msgstr "Częstotliwość"
-#: actions/siteadminpanel.php:365
-msgid "Snapshots will be sent once every N Web hits"
-msgstr ""
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
+msgstr "Migawki będą wysyłane co N trafień WWW"
#: actions/siteadminpanel.php:372
msgid "Report URL"
-msgstr ""
+msgstr "Adres URL zgłaszania"
#: actions/siteadminpanel.php:373
msgid "Snapshots will be sent to this URL"
-msgstr ""
+msgstr "Migawki będą wysyłane na ten adres URL"
+
+#: actions/siteadminpanel.php:380
+msgid "SSL"
+msgstr "SSL"
-#: actions/siteadminpanel.php:381
-#, fuzzy
+#: actions/siteadminpanel.php:384
msgid "Sometimes"
-msgstr "Wpisy"
+msgstr "Czasem"
-#: actions/siteadminpanel.php:382
-#, fuzzy
+#: actions/siteadminpanel.php:385
msgid "Always"
-msgstr "Aliasy"
+msgstr "Zawsze"
-#: actions/siteadminpanel.php:384
+#: actions/siteadminpanel.php:387
msgid "Use SSL"
-msgstr ""
+msgstr "Użycie SSL"
-#: actions/siteadminpanel.php:385
+#: actions/siteadminpanel.php:388
msgid "When to use SSL"
-msgstr ""
+msgstr "Kiedy używać SSL"
-#: actions/siteadminpanel.php:391
+#: actions/siteadminpanel.php:393
msgid "SSL Server"
-msgstr ""
+msgstr "Serwer SSL"
-#: actions/siteadminpanel.php:392
+#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
-msgstr ""
+msgstr "Serwer do przekierowywania żądań SSL"
+
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr "Ograniczenia"
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Text limit"
-msgstr ""
+msgstr "Ograniczenie tekstu"
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
-msgstr ""
+msgstr "Maksymalna liczba znaków wpisów."
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "Dupe limit"
-msgstr ""
+msgstr "Ograniczenie duplikatów"
-#: actions/siteadminpanel.php:400
+#: 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."
-#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
-#, fuzzy
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
msgid "Save site settings"
-msgstr "Ustawienia awatara"
+msgstr "Zapisz ustawienia strony"
#: actions/smssettings.php:58
msgid "SMS Settings"
@@ -3432,9 +3419,8 @@ msgid "You can receive SMS messages through email from %%site.name%%."
msgstr "Można otrzymywać wiadomości SMS przez e-mail od %%site.name%%."
#: actions/smssettings.php:91
-#, fuzzy
msgid "SMS is not available."
-msgstr "Ta strona nie jest dostępna w "
+msgstr "Wiadomości SMS nie są dostępne."
#: actions/smssettings.php:112
msgid "Current confirmed SMS-enabled phone number."
@@ -3478,7 +3464,7 @@ msgstr "Nie wybrano operatora."
#: actions/smssettings.php:318
msgid "That is already your phone number."
-msgstr "Ten numer telefonu jest już Twój."
+msgstr "Ten numer telefonu jest już twój."
#: actions/smssettings.php:321
msgid "That phone number already belongs to another user."
@@ -3498,7 +3484,7 @@ msgstr "To jest błędny numer potwierdzenia."
#: actions/smssettings.php:405
msgid "That is not your phone number."
-msgstr "To nie jest Twój numer telefonu."
+msgstr "To nie jest twój numer telefonu."
#: actions/smssettings.php:465
msgid "Mobile carrier"
@@ -3514,7 +3500,7 @@ 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 ""
-"Operator komórkowy Twojego telefonu. Jeśli znasz operatora, który akceptuje "
+"Operator komórkowy twojego telefonu. Jeśli znasz operatora, który akceptuje "
"wiadomości SMS przez e-mail, a nie znajduje się na liście, wyślij wiadomość "
"e-mail na %s (w języku angielskim), aby nam o tym powiedzieć."
@@ -3524,7 +3510,7 @@ msgstr "Nie podano kodu"
#: actions/subedit.php:70
msgid "You are not subscribed to that profile."
-msgstr "Nie jesteś zasubskrybowany do tego profilu."
+msgstr "Nie jesteś subskrybowany do tego profilu."
#: actions/subedit.php:83
msgid "Could not save subscription."
@@ -3536,7 +3522,7 @@ msgstr "Nie jest lokalnym użytkownikiem."
#: actions/subscribe.php:69
msgid "Subscribed"
-msgstr "Zasubskrybowano"
+msgstr "Subskrybowano"
#: actions/subscribers.php:50
#, php-format
@@ -3550,7 +3536,7 @@ msgstr "Subskrybenci użytkownika %s, strona %d"
#: actions/subscribers.php:63
msgid "These are the people who listen to your notices."
-msgstr "Osoby obserwujący Twoje wpisy."
+msgstr "Osoby obserwujący twoje wpisy."
#: actions/subscribers.php:67
#, php-format
@@ -3562,7 +3548,7 @@ msgid ""
"You have no subscribers. Try subscribing to people you know and they might "
"return the favor"
msgstr ""
-"Nie masz żadnych subskrybentów. Spróbuj zasubskrybować osoby, które znasz, a "
+"Nie masz żadnych subskrybentów. Spróbuj subskrybować osoby, które znasz, a "
"oni mogą się odwdzięczyć"
#: actions/subscribers.php:110
@@ -3607,11 +3593,11 @@ msgid ""
"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
"automatically subscribe to people you already follow there."
msgstr ""
-"Nie obserwujesz teraz wpisów innych użytkowników. Spróbuj zasubskrybować "
-"osoby, które znasz. Spróbuj [znaleźć kogoś](%%action.peoplesearch%%), "
-"poszukać członków grup, które Cię interesują, a także [znanych użytkowników]"
-"(%%action.featured%%). Jeśli jesteś [użytkownikiem Twittera](%%action."
-"twittersettings%%), możesz automatycznie zasubskrybowć osoby, które tam już "
+"Nie obserwujesz teraz wpisów innych użytkowników. Spróbuj subskrybować "
+"osoby, które znasz. Spróbuj [wyszukać kogoś](%%action.peoplesearch%%), "
+"poszukać członków grup, które cię interesują, a także [znanych użytkowników]"
+"(%%action.featured%%). Jeśli jesteś [użytkownikiem serwisu Twitter](%%action."
+"twittersettings%%), można automatycznie subskrybować osoby, które tam już "
"obserwujesz."
#: actions/subscriptions.php:123 actions/subscriptions.php:127
@@ -3629,7 +3615,7 @@ msgstr "SMS"
#: actions/tagother.php:33
msgid "Not logged in"
-msgstr "Nie zalogowano"
+msgstr "Niezalogowano"
#: actions/tagother.php:39
msgid "No id argument."
@@ -3665,7 +3651,7 @@ msgid ""
"You can only tag people you are subscribed to or who are subscribed to you."
msgstr ""
"Można nadawać znaczniki tylko osobom, których subskrybujesz lub którzy "
-"subskrybują Ciebie."
+"subskrybują ciebie."
#: actions/tagother.php:200
msgid "Could not save tags."
@@ -3687,9 +3673,9 @@ msgid "Notice feed for tag %s (RSS 1.0)"
msgstr "Kanał wpisów dla znacznika %s (RSS 1.0)"
#: actions/tag.php:92
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Kanał wpisów dla znacznika %s (RSS 1.0)"
+msgstr "Kanał wpisów dla znacznika %s (RSS 2.0)"
#: actions/tag.php:98
#, php-format
@@ -3705,19 +3691,16 @@ msgid "API method under construction."
msgstr "Metoda API jest w trakcie tworzenia."
#: actions/unblock.php:59
-#, fuzzy
msgid "You haven't blocked that user."
-msgstr "Ten użytkownik został już zablokowany."
+msgstr "Ten użytkownik nie został zablokowany."
#: actions/unsandbox.php:72
-#, fuzzy
msgid "User is not sandboxed."
-msgstr "Użytkownik nie został zablokowany w grupie."
+msgstr "Użytkownik nie jest ograniczony."
#: actions/unsilence.php:72
-#, fuzzy
msgid "User is not silenced."
-msgstr "Użytkownik nie posiada profilu."
+msgstr "Użytkownik nie jest wyciszony."
#: actions/unsubscribe.php:77
msgid "No profile id in request."
@@ -3735,40 +3718,107 @@ msgstr "Zrezygnowano z subskrypcji"
#, php-format
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
+"Licencja nasłuchiwanego strumienia \"%s\" nie jest zgodna z licencją strony "
+"\"%s\"."
-#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
msgid "User"
msgstr "Użytkownik"
#: actions/useradminpanel.php:69
msgid "User settings for this StatusNet site."
-msgstr ""
+msgstr "Ustawienia użytkownika dla tej strony StatusNet."
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
-msgstr ""
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr "Nieprawidłowe ograniczenie informacji o sobie. Musi być liczbowa."
-#: actions/useradminpanel.php:178
-#, fuzzy
-msgid "Invite-only"
-msgstr "Zaproś"
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
+msgstr "Nieprawidłowy tekst powitania. Maksymalna długość to 255 znaków."
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
-msgstr ""
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr "Nieprawidłowa domyślna subskrypcja: \"%1$s\" nie jest użytkownikiem."
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Profil"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr "Ograniczenie informacji o sobie"
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
+msgstr "Maksymalna długość informacji o sobie jako liczba znaków."
+
+#: actions/useradminpanel.php:231
+msgid "New users"
+msgstr "Nowi użytkownicy"
+
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr "Powitanie nowego użytkownika"
+
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr "Tekst powitania nowych użytkowników (maksymalnie 255 znaków)."
+
+#: actions/useradminpanel.php:241
+msgid "Default subscription"
+msgstr "Domyślna subskrypcja"
+
+#: actions/useradminpanel.php:242
+msgid "Automatically subscribe new users to this user."
+msgstr "Automatyczne subskrybowanie nowych użytkowników do tego użytkownika."
+
+#: actions/useradminpanel.php:251
+msgid "Invitations"
+msgstr "Zaproszenia"
+
+#: actions/useradminpanel.php:256
+msgid "Invitations enabled"
+msgstr "Zaproszenia są włączone"
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr "Czy zezwolić użytkownikom zapraszanie nowych użytkowników."
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr "Sesje"
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr "Obsługa sesji"
+
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
+msgstr "Czy samodzielnie obsługiwać sesje."
+
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr "Debugowanie sesji"
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
+msgstr "Włącza wyjście debugowania dla sesji."
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Upoważnij subskrypcję"
#: 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 ""
-"Sprawdź te szczegóły, aby upewnić się, czy na pewno chcesz zasubskrybować "
+"Sprawdź te szczegóły, aby upewnić się, czy na pewno chcesz subskrybować "
"wpisy tego użytkownika. Jeżeli nie prosiłeś o subskrypcję czyichś wpisów, "
"naciśnij \"Odrzuć\"."
@@ -3783,7 +3833,7 @@ msgstr "Zaakceptuj"
#: actions/userauthorization.php:210 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
-msgstr "Zasubskrybuj tego użytkownika"
+msgstr "Subskrybuj tego użytkownika"
#: actions/userauthorization.php:211
msgid "Reject"
@@ -3795,14 +3845,13 @@ msgstr "Odrzuć tę subskrypcję"
#: actions/userauthorization.php:225
msgid "No authorization request!"
-msgstr "Brak żądania upoważnienia!"
+msgstr "Brak żądania upoważnienia."
#: actions/userauthorization.php:247
msgid "Subscription authorized"
msgstr "Upoważniono subskrypcję"
#: 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 "
@@ -3816,7 +3865,6 @@ msgid "Subscription rejected"
msgstr "Odrzucono subskrypcję"
#: 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 "
@@ -3828,37 +3876,37 @@ msgstr ""
#: actions/userauthorization.php:296
#, php-format
msgid "Listener URI ‘%s’ not found here"
-msgstr ""
+msgstr "Adres URI nasłuchującego \"%s\" nie został tutaj odnaleziony"
#: actions/userauthorization.php:301
#, php-format
msgid "Listenee URI ‘%s’ is too long."
-msgstr ""
+msgstr "Adres URI nasłuchującego \"%s\" jest za długi."
#: actions/userauthorization.php:307
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
-msgstr ""
+msgstr "Adres URI nasłuchującego \"%s\" jest lokalnym użytkownikiem."
#: actions/userauthorization.php:322
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
-msgstr ""
+msgstr "Adres URL profilu \"%s\" jest dla lokalnego użytkownika."
#: actions/userauthorization.php:338
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
-msgstr ""
+msgstr "Adres URL \"%s\" jest nieprawidłowy."
#: actions/userauthorization.php:343
-#, fuzzy, php-format
+#, php-format
msgid "Can’t read avatar URL ‘%s’."
-msgstr "Nie można odczytać adresu URL awatara \"%s\""
+msgstr "Nie można odczytać adresu URL awatara \"%s\"."
#: actions/userauthorization.php:348
-#, fuzzy, php-format
+#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
-msgstr "Błędny typ obrazu dla \"%s\""
+msgstr "Błędny typ obrazu dla adresu URL awatara \"%s\"."
#: actions/userbyid.php:70
msgid "No id."
@@ -3877,7 +3925,7 @@ msgstr ""
#: actions/userdesignsettings.php:282
msgid "Enjoy your hotdog!"
-msgstr "Smacznego hot-doga!"
+msgstr "Smacznego hot-doga."
#: actions/usergroups.php:64
#, php-format
@@ -3886,7 +3934,7 @@ msgstr "Grupy %s, strona %d"
#: actions/usergroups.php:130
msgid "Search for more groups"
-msgstr "Znajdź więcej grup"
+msgstr "Wyszukaj więcej grup"
#: actions/usergroups.php:153
#, php-format
@@ -3921,9 +3969,8 @@ msgstr ""
"d bajty."
#: classes/Message.php:45
-#, fuzzy
msgid "You are banned from sending direct messages."
-msgstr "Błąd podczas wysyłania bezpośredniej wiadomości."
+msgstr "Zablokowano wysyłanie bezpośrednich wiadomości."
#: classes/Message.php:61
msgid "Could not insert message."
@@ -3936,7 +3983,7 @@ msgstr "Nie można zaktualizować wiadomości za pomocą nowego adresu URL."
#: classes/Notice.php:164
#, php-format
msgid "DB error inserting hashtag: %s"
-msgstr "Błąd bazy danych podczas wprowadzania znacznika hasha: %s"
+msgstr "Błąd bazy danych podczas wprowadzania znacznika mieszania: %s"
#: classes/Notice.php:179
msgid "Problem saving notice. Too long."
@@ -3963,13 +4010,13 @@ msgstr ""
#: classes/Notice.php:200
msgid "You are banned from posting notices on this site."
-msgstr "Zabroniono Ci wysyłania wpisów na tej stronie."
+msgstr "Zabroniono ci wysyłania wpisów na tej stronie."
#: classes/Notice.php:265 classes/Notice.php:290
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"
@@ -3985,11 +4032,7 @@ msgstr "Nie można ustawić członkostwa w grupie."
#: classes/User.php:347
#, php-format
msgid "Welcome to %1$s, @%2$s!"
-msgstr "Witaj w %1$s, @%2$s!"
-
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr "Profil"
+msgstr "Witaj w %1$s, @%2$s."
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
@@ -4028,130 +4071,128 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "Strona bez nazwy"
-#: lib/action.php:424
+#: lib/action.php:425
msgid "Primary site navigation"
msgstr "Główna nawigacja strony"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Home"
-msgstr "Strona główna"
+msgstr "Strona domowa"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Personal profile and friends timeline"
msgstr "Profil osobisty i oś czasu przyjaciół"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Account"
msgstr "Konto"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Change your email, avatar, password, profile"
msgstr "Zmień adres e-mail, awatar, hasło, profil"
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect"
msgstr "Połącz"
-#: lib/action.php:435
-#, fuzzy
+#: lib/action.php:436
msgid "Connect to services"
-msgstr "Nie można przekierować do serwera: %s"
+msgstr "Połącz z serwisami"
-#: lib/action.php:439
-#, fuzzy
+#: lib/action.php:440
msgid "Change site configuration"
-msgstr "Główna nawigacja strony"
+msgstr "Zmień konfigurację strony"
-#: lib/action.php:443 lib/subgroupnav.php:105
+#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Zaproś"
-#: lib/action.php:444 lib/subgroupnav.php:106
+#: lib/action.php:445 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
-msgstr "Zaproś przyjaciół i kolegów do dołączenia do Ciebie na %s"
+msgstr "Zaproś przyjaciół i kolegów do dołączenia do ciebie na %s"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout"
msgstr "Wyloguj się"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout from the site"
msgstr "Wyloguj się ze strony"
-#: lib/action.php:454
+#: lib/action.php:455
msgid "Create an account"
msgstr "Utwórz konto"
-#: lib/action.php:457
+#: lib/action.php:458
msgid "Login to the site"
msgstr "Zaloguj się na stronę"
-#: lib/action.php:460 lib/action.php:723
+#: lib/action.php:461 lib/action.php:724
msgid "Help"
msgstr "Pomoc"
-#: lib/action.php:460
+#: lib/action.php:461
msgid "Help me!"
-msgstr "Pomóż mi!"
+msgstr "Pomóż mi."
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
-msgstr "Znajdź"
+msgstr "Wyszukaj"
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
-msgstr "Znajdź osoby lub tekst"
+msgstr "Wyszukaj osoby lub tekst"
-#: lib/action.php:484
+#: lib/action.php:485
msgid "Site notice"
msgstr "Wpis strony"
-#: lib/action.php:550
+#: lib/action.php:551
msgid "Local views"
msgstr "Lokalne widoki"
-#: lib/action.php:616
+#: lib/action.php:617
msgid "Page notice"
msgstr "Wpis strony"
-#: lib/action.php:718
+#: lib/action.php:719
msgid "Secondary site navigation"
msgstr "Druga nawigacja strony"
-#: lib/action.php:725
+#: lib/action.php:726
msgid "About"
msgstr "O usłudze"
-#: lib/action.php:727
+#: lib/action.php:728
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:731
+#: lib/action.php:732
msgid "TOS"
msgstr "TOS"
-#: lib/action.php:734
+#: lib/action.php:735
msgid "Privacy"
msgstr "Prywatność"
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
msgstr "Kod źródłowy"
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:740
+#: lib/action.php:741
msgid "Badge"
msgstr "Odznaka"
-#: lib/action.php:768
+#: lib/action.php:769
msgid "StatusNet software license"
msgstr "Licencja oprogramowania StatusNet"
-#: lib/action.php:771
+#: lib/action.php:772
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4160,12 +4201,12 @@ msgstr ""
"**%%site.name%%** jest usługą mikroblogowania prowadzoną przez [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:773
+#: lib/action.php:774
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** jest usługą mikroblogowania. "
-#: lib/action.php:775
+#: lib/action.php:776
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4176,64 +4217,61 @@ msgstr ""
"status.net/) w wersji %s, dostępnego na [Powszechnej Licencji Publicznej GNU "
"Affero](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:789
-#, fuzzy
+#: lib/action.php:790
msgid "Site content license"
-msgstr "Licencja oprogramowania StatusNet"
+msgstr "Licencja zawartości strony"
-#: lib/action.php:798
+#: lib/action.php:799
msgid "All "
msgstr "Wszystko "
-#: lib/action.php:803
+#: lib/action.php:804
msgid "license."
msgstr "licencja."
-#: lib/action.php:1067
+#: lib/action.php:1068
msgid "Pagination"
msgstr "Paginacja"
-#: lib/action.php:1076
+#: lib/action.php:1077
msgid "After"
-msgstr "Następne"
+msgstr "Później"
-#: lib/action.php:1084
+#: lib/action.php:1085
msgid "Before"
msgstr "Wcześniej"
-#: lib/action.php:1132
+#: lib/action.php:1133
msgid "There was a problem with your session token."
msgstr "Wystąpił problem z tokenem sesji."
#: lib/adminpanelaction.php:96
-#, fuzzy
msgid "You cannot make changes to this site."
-msgstr "Nie można wysłać wiadomości do tego użytkownika."
+msgstr "Nie można wprowadzić zmian strony."
#: lib/adminpanelaction.php:195
-#, fuzzy
msgid "showForm() not implemented."
-msgstr "Nie zaimplementowano polecenia."
+msgstr "showForm() nie jest zaimplementowane."
#: lib/adminpanelaction.php:224
-#, fuzzy
msgid "saveSettings() not implemented."
-msgstr "Nie zaimplementowano polecenia."
+msgstr "saveSettings() nie jest zaimplementowane."
#: lib/adminpanelaction.php:247
-#, fuzzy
msgid "Unable to delete design setting."
-msgstr "Nie można zapisać ustawień wyglądu!"
+msgstr "Nie można usunąć ustawienia wyglądu."
#: lib/adminpanelaction.php:300
-#, fuzzy
msgid "Basic site configuration"
-msgstr "Potwierdzenie adresu e-mail"
+msgstr "Podstawowa konfiguracja strony"
#: lib/adminpanelaction.php:303
-#, fuzzy
msgid "Design configuration"
-msgstr "Potwierdzenie SMS"
+msgstr "Konfiguracja wyglądu"
+
+#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+msgid "Paths configuration"
+msgstr "Konfiguracja ścieżek"
#: lib/attachmentlist.php:87
msgid "Attachments"
@@ -4269,21 +4307,21 @@ msgstr "Polecenie nie powiodło się"
#: lib/command.php:44
msgid "Sorry, this command is not yet implemented."
-msgstr "Przepraszamy, te polecenie nie zostało jeszcze zaimplementowane."
+msgstr "Te polecenie nie zostało jeszcze zaimplementowane."
#: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a user with nickname %s"
-msgstr "Nie można zaktualizować użytkownika z potwierdzonym adresem e-mail."
+msgstr "Nie można odnaleźć użytkownika z pseudonimem %s"
#: lib/command.php:92
msgid "It does not make a lot of sense to nudge yourself!"
-msgstr ""
+msgstr "Szturchanie samego siebie nie ma zbyt wiele sensu."
#: lib/command.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Nudge sent to %s"
-msgstr "Wysłano szturchnięcie"
+msgstr "Wysłano szturchnięcie do użytkownika %s"
#: lib/command.php:126
#, php-format
@@ -4298,7 +4336,7 @@ msgstr ""
#: lib/command.php:152 lib/command.php:400
msgid "Notice with that id does not exist"
-msgstr ""
+msgstr "Wpis z tym identyfikatorem nie istnieje"
#: lib/command.php:168 lib/command.php:416 lib/command.php:471
msgid "User has no last notice"
@@ -4334,37 +4372,36 @@ msgid "About: %s"
msgstr "O mnie: %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 "Wiadomość jest za długa - maksymalnie 140 znaków, wysłano %d"
+msgstr "Wiadomość jest za długa - maksymalnie %d znaków, wysłano %d"
#: lib/command.php:377
msgid "Error sending direct message."
msgstr "Błąd podczas wysyłania bezpośredniej wiadomości."
#: lib/command.php:431
-#, fuzzy, php-format
+#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr "Wiadomość jest za długa - maksymalnie 140 znaków, wysłano %d"
+msgstr "Wpis jest za długi - maksymalnie %d znaków, wysłano %d"
#: lib/command.php:439
-#, fuzzy, php-format
+#, php-format
msgid "Reply to %s sent"
-msgstr "Odpowiedz na ten wpis"
+msgstr "Wysłano odpowiedź do %s"
#: lib/command.php:441
-#, fuzzy
msgid "Error saving notice."
-msgstr "Problem podczas zapisywania wpisu."
+msgstr "Błąd podczas zapisywania wpisu."
#: lib/command.php:495
msgid "Specify the name of the user to subscribe to"
-msgstr "Podaj nazwę użytkownika do zasubskrybowania"
+msgstr "Podaj nazwę użytkownika do subskrybowania"
#: lib/command.php:502
#, php-format
msgid "Subscribed to %s"
-msgstr "Zasubskrybowano użytkownika %s"
+msgstr "Subskrybowano użytkownika %s"
#: lib/command.php:523
msgid "Specify the name of the user to unsubscribe from"
@@ -4396,53 +4433,51 @@ msgid "Can't turn on notification."
msgstr "Nie można włączyć powiadomień."
#: lib/command.php:597
-#, fuzzy, php-format
+#, php-format
msgid "Could not create login token for %s"
-msgstr "Nie można utworzyć formularza OpenID: %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
-#, fuzzy
msgid "You are not subscribed to anyone."
-msgstr "Nie jesteś zasubskrybowany do tego profilu."
+msgstr "Nie subskrybujesz nikogo."
#: lib/command.php:620
-#, fuzzy
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
-msgstr[0] "Nie jesteś zasubskrybowany do tego profilu."
-msgstr[1] "Nie jesteś zasubskrybowany do tego profilu."
+msgstr[0] "Subskrybujesz tę osobę:"
+msgstr[1] "Subskrybujesz te osoby:"
+msgstr[2] "Subskrybujesz te osoby:"
#: lib/command.php:640
-#, fuzzy
msgid "No one is subscribed to you."
-msgstr "Nie można zasubskrybować innych do Ciebie."
+msgstr "Nikt cię nie subskrybuje."
#: lib/command.php:642
-#, fuzzy
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
-msgstr[0] "Nie można zasubskrybować innych do Ciebie."
-msgstr[1] "Nie można zasubskrybować innych do Ciebie."
+msgstr[0] "Ta osoba cię subskrybuje:"
+msgstr[1] "Te osoby cię subskrybują:"
+msgstr[2] "Te osoby cię subskrybują:"
#: lib/command.php:662
-#, fuzzy
msgid "You are not a member of any groups."
-msgstr "Nie jesteś członkiem tej grupy."
+msgstr "Nie jesteś członkiem żadnej grupy."
#: lib/command.php:664
-#, fuzzy
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
-msgstr[0] "Nie jesteś członkiem tej grupy."
-msgstr[1] "Nie jesteś członkiem tej grupy."
+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
-#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4485,12 +4520,22 @@ msgstr ""
"off - wyłącza powiadomienia\n"
"help - wyświetla tę pomoc\n"
"follow <pseudonim> - subskrybuje użytkownika\n"
+"groups - wyświetla listę grup, do których dołączono\n"
+"subscriptions - wyświetla listę obserwowanych osób\n"
+"subscribers - wyświetla listę osób, które cię obserwują\n"
"leave <pseudonim> - rezygnuje z subskrypcji użytkownika\n"
"d <pseudonim> <tekst> - bezpośrednia wiadomość do użytkownika\n"
"get <pseudonim> - uzyskuje ostatni wpis użytkownika\n"
"whois <pseudonim> - uzyskuje informacje o profilu użytkownika\n"
"fav <pseudonim> - dodaje ostatni wpis użytkownika jako \"ulubiony\"\n"
-"stats - uzyskuje Twoje statystyki\n"
+"fav #<identyfikator_wpisu> - dodaje wpis z podanym identyfikatorem jako "
+"\"ulubiony\"\n"
+"reply #<identyfikator_wpisu> - odpowiada na wpis z podanym identyfikatorem\n"
+"reply <pseudonim> - odpowiada na ostatni wpis użytkownika\n"
+"join <grupa> - dołącza do grupy\n"
+"login - uzyskuje odnośnik do zalogowania się w interfejsie WWW\n"
+"drop <grupa> - opuszcza grupę\n"
+"stats - uzyskuje twoje statystyki\n"
"stop - to samo co \"off\"\n"
"quit - to samo co \"off\"\n"
"sub <pseudonim> - to samo co \"follow\"\n"
@@ -4508,22 +4553,20 @@ msgstr ""
"tracking - jeszcze nie zaimplementowano.\n"
#: lib/common.php:199
-#, fuzzy
msgid "No configuration file found. "
-msgstr "Brak kodu potwierdzającego."
+msgstr "Nie odnaleziono pliku konfiguracji."
#: lib/common.php:200
msgid "I looked for configuration files in the following places: "
-msgstr ""
+msgstr "Szukano plików konfiguracji w następujących miejscach: "
#: lib/common.php:201
msgid "You may wish to run the installer to fix this."
-msgstr ""
+msgstr "Należy uruchomić instalator, aby to naprawić."
#: lib/common.php:202
-#, fuzzy
msgid "Go to the installer."
-msgstr "Zaloguj się na stronę"
+msgstr "Przejdź do instalatora."
#: lib/connectsettingsaction.php:110
msgid "IM"
@@ -4547,8 +4590,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: "
@@ -4599,9 +4642,8 @@ msgid "All"
msgstr "Wszystko"
#: lib/galleryaction.php:139
-#, fuzzy
msgid "Select tag to filter"
-msgstr "Wybierz operatora"
+msgstr "Wybierz znacznik do filtrowania"
#: lib/galleryaction.php:140
msgid "Tag"
@@ -4620,14 +4662,13 @@ msgid "URL of the homepage or blog of the group or topic"
msgstr "Adres URL strony domowej lub bloga grupy, albo temat"
#: lib/groupeditform.php:168
-#, fuzzy
msgid "Describe the group or topic"
-msgstr "Opisz grupę lub temat w 140 znakach"
+msgstr "Opisz grupę lub temat"
#: lib/groupeditform.php:170
-#, fuzzy, php-format
+#, php-format
msgid "Describe the group or topic in %d characters"
-msgstr "Opisz grupę lub temat w 140 znakach"
+msgstr "Opisz grupę lub temat w %d znakach"
#: lib/groupeditform.php:172
msgid "Description"
@@ -4647,7 +4688,7 @@ msgstr ""
"Dodatkowe pseudonimy grupy, oddzielone przecinkami lub spacjami, maksymalnie "
"%d"
-#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85
msgid "Group"
msgstr "Grupa"
@@ -4663,7 +4704,7 @@ msgstr "%s zablokowani użytkownicy"
#: lib/groupnav.php:108
#, php-format
msgid "Edit %s group properties"
-msgstr "Edytuj właściwości grupy %s"
+msgstr "Zmodyfikuj właściwości grupy %s"
#: lib/groupnav.php:113
msgid "Logo"
@@ -4672,12 +4713,12 @@ msgstr "Logo"
#: lib/groupnav.php:114
#, php-format
msgid "Add or edit %s logo"
-msgstr "Dodaj lub edytuj logo grupy %s"
+msgstr "Dodaj lub zmodyfikuj logo grupy %s"
#: lib/groupnav.php:120
#, php-format
msgid "Add or edit %s design"
-msgstr "Dodaj lub edytuj wygląd %s"
+msgstr "Dodaj lub zmodyfikuj wygląd %s"
#: lib/groupsbymemberssection.php:71
msgid "Groups with most members"
@@ -4692,14 +4733,14 @@ msgstr "Grupy z największą ilością wpisów"
msgid "Tags in %s group's notices"
msgstr "Znaczniki we wpisach grupy %s"
-#: lib/htmloutputter.php:104
+#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
msgstr "Ta strona jest niedostępna dla akceptowanego typu medium"
#: lib/imagefile.php:75
-#, fuzzy, php-format
+#, php-format
msgid "That file is too big. The maximum file size is %s."
-msgstr "Ten plik jest za duży. Maksymalny rozmiar pliku to %d."
+msgstr "Ten plik jest za duży. Maksymalny rozmiar pliku to %s."
#: lib/imagefile.php:80
msgid "Partial upload."
@@ -4725,10 +4766,18 @@ msgstr "Utracono plik."
msgid "Unknown file type"
msgstr "Nieznany typ pliku"
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr "MB"
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr "KB"
+
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
-msgstr ""
+msgstr "[%s]"
#: lib/joinform.php:114
msgid "Join"
@@ -4756,13 +4805,12 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
"Brak prywatnych wiadomości. Można wysłać prywatną wiadomość, aby nawiązać "
-"rozmowę z innymi użytkownikami. Inni mogą wysyłać Ci wiadomości tylko dla "
-"Twoich oczu."
+"rozmowę z innymi użytkownikami. Inni mogą wysyłać ci wiadomości tylko dla "
+"twoich oczu."
-#: lib/mailbox.php:227 lib/noticelist.php:424
-#, fuzzy
+#: lib/mailbox.php:227 lib/noticelist.php:452
msgid "from"
-msgstr " z "
+msgstr "z"
#: lib/mail.php:172
msgid "Email address confirmation"
@@ -4795,13 +4843,13 @@ msgstr ""
"\n"
"Jeśli to nie ty, po prostu zignoruj tę wiadomość.\n"
"\n"
-"Dziękujemy za Twój czas, \n"
+"Dziękujemy za twój czas, \n"
"%s\n"
#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
-msgstr "Użytkownik %1$s obserwuje teraz Twoje wpisy na %2$s."
+msgstr "Użytkownik %1$s obserwuje teraz twoje wpisy na %2$s."
#: lib/mail.php:241
#, php-format
@@ -4817,7 +4865,7 @@ msgid ""
"----\n"
"Change your email address or notification options at %8$s\n"
msgstr ""
-"Użytkownik %1$s obserwuje teraz Twoje wpisy na %2$s.\n"
+"Użytkownik %1$s obserwuje teraz twoje wpisy na %2$s.\n"
"\n"
"\t%3$s\n"
"\n"
@@ -4868,7 +4916,7 @@ msgstr ""
"\n"
"Wyślij wiadomość e-mail na %2$s, aby wysłać nowe wpisy.\n"
"\n"
-"Więcej instrukcji dotyczących poczty e-mail można znaleźć na %3$s.\n"
+"Więcej instrukcji dotyczących poczty e-mail można odnaleźć na %3$s.\n"
"\n"
"Z poważaniem,\n"
"%4$s"
@@ -4876,7 +4924,7 @@ msgstr ""
#: lib/mail.php:413
#, php-format
msgid "%s status"
-msgstr "Status użytkownika %s"
+msgstr "Stan użytkownika %s"
#: lib/mail.php:439
msgid "SMS confirmation"
@@ -4903,7 +4951,7 @@ msgid ""
"%4$s\n"
msgstr ""
"Użytkownik %1$s (%2$s) zastanawia się, co się z Tobą dzieje w ostatnich "
-"dniach i zaprasza Cię do wysłania jakichś aktualności.\n"
+"dniach i zaprasza cię do wysłania aktualności.\n"
"\n"
"Tak więc do usłyszenia. :)\n"
"\n"
@@ -4937,13 +4985,13 @@ msgid ""
"With kind regards,\n"
"%5$s\n"
msgstr ""
-"Użytkownik %1$s (%2$s) wysłał Ci prywatną wiadomość:\n"
+"Użytkownik %1$s (%2$s) wysłał ci prywatną wiadomość:\n"
"\n"
"------------------------------------------------------\n"
"%3$s\n"
"------------------------------------------------------\n"
"\n"
-"Tutaj możesz na nią odpowiedzieć:\n"
+"Tutaj można na nią odpowiedzieć:\n"
"\n"
"%4$s\n"
"\n"
@@ -4953,12 +5001,12 @@ msgstr ""
"%5$s\n"
#: lib/mail.php:559
-#, fuzzy, php-format
+#, php-format
msgid "%s (@%s) added your notice as a favorite"
-msgstr "Użytkownik %s dodał Twój wpis jako ulubiony"
+msgstr "Użytkownik %s (@%s) dodał twój wpis jako ulubiony"
#: lib/mail.php:561
-#, fuzzy, php-format
+#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
"\n"
@@ -4977,17 +5025,18 @@ msgid ""
"Faithfully yours,\n"
"%6$s\n"
msgstr ""
-"%1$s właśnie dodał Twój wpis z %2$s jako jeden ze swoich ulubionych.\n"
+"Użytkownik %1$s (@%7$s) właśnie dodał twój wpis z %2$s jako jeden ze swoich "
+"ulubionych.\n"
"\n"
-"Adres URL Twojego wpisu:\n"
+"Adres URL wpisu:\n"
"\n"
"%3$s\n"
"\n"
-"Tekst Twojego wpisu:\n"
+"Tekst wpisu:\n"
"\n"
"%4$s\n"
"\n"
-"Tutaj możesz zobaczyć listę ulubionych wpisów użytkownika %1$s:\n"
+"Tutaj można zobaczyć listę ulubionych wpisów użytkownika %1$s:\n"
"\n"
"%5$s\n"
"\n"
@@ -4995,9 +5044,9 @@ msgstr ""
"%6$s\n"
#: lib/mail.php:620
-#, fuzzy, php-format
+#, php-format
msgid "%s (@%s) sent a notice to your attention"
-msgstr "Użytkownik %s wysłał wpis wymagający Twojej uwagi"
+msgstr "Użytkownik %s (@%s) wysłał wpis wymagający twojej uwagi"
#: lib/mail.php:622
#, php-format
@@ -5013,6 +5062,17 @@ msgid ""
"\t%4$s\n"
"\n"
msgstr ""
+"Użytkownik %1$s (@%9$s) właśnie wysłał wpis wymagający twojej uwagi "
+"(odpowiedź \"@\") na %2$s.\n"
+"\n"
+"Wpis znajduje się tutaj:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Tekst wpisu:\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."
@@ -5035,7 +5095,7 @@ msgstr "Plik został tylko częściowo wysłany."
#: lib/mediafile.php:159
msgid "Missing a temporary folder."
-msgstr "Brak folderu tymczasowego."
+msgstr "Brak katalogu tymczasowego."
#: lib/mediafile.php:162
msgid "Failed to write file to disk."
@@ -5047,16 +5107,15 @@ msgstr "Wysłanie pliku zostało zatrzymane przez rozszerzenie."
#: lib/mediafile.php:179 lib/mediafile.php:216
msgid "File exceeds user's quota!"
-msgstr ""
+msgstr "Plik przekracza przydział użytkownika."
#: lib/mediafile.php:196 lib/mediafile.php:233
msgid "File could not be moved to destination directory."
msgstr "Nie można przenieść pliku do katalogu docelowego."
#: lib/mediafile.php:201 lib/mediafile.php:237
-#, fuzzy
msgid "Could not determine file's mime-type!"
-msgstr "Nie można określić użytkownika źródłowego."
+msgstr "Nie można określić typu MIME pliku."
#: lib/mediafile.php:270
#, php-format
@@ -5076,36 +5135,61 @@ msgstr "Wyślij bezpośredni wpis"
msgid "To"
msgstr "Do"
-#: lib/messageform.php:162 lib/noticeform.php:173
+#: lib/messageform.php:162 lib/noticeform.php:186
msgid "Available characters"
msgstr "Dostępne znaki"
-#: lib/noticeform.php:145
+#: lib/noticeform.php:158
msgid "Send a notice"
msgstr "Wyślij wpis"
-#: lib/noticeform.php:158
+#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
msgstr "Co słychać, %s?"
-#: lib/noticeform.php:180
+#: lib/noticeform.php:193
msgid "Attach"
msgstr "Załącz"
-#: lib/noticeform.php:184
+#: lib/noticeform.php:197
msgid "Attach a file"
msgstr "Załącz plik"
-#: lib/noticelist.php:478
+#: 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 "Północ"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr "Południe"
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr "Wschód"
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr "Zachód"
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr "w"
+
+#: lib/noticelist.php:506
msgid "in context"
msgstr "w rozmowie"
-#: lib/noticelist.php:498
+#: lib/noticelist.php:526
msgid "Reply to this notice"
msgstr "Odpowiedz na ten wpis"
-#: lib/noticelist.php:499
+#: lib/noticelist.php:527
msgid "Reply"
msgstr "Odpowiedz"
@@ -5134,16 +5218,14 @@ msgid "Error inserting remote profile"
msgstr "Błąd podczas wprowadzania zdalnego profilu"
#: lib/oauthstore.php:345
-#, fuzzy
msgid "Duplicate notice"
-msgstr "Usuń wpis"
+msgstr "Duplikat wpisu"
-#: 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 "Ten użytkownik zablokował Cię z subskrypcji."
+msgstr "Zablokowano subskrybowanie."
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:492
msgid "Couldn't insert new subscription."
msgstr "Nie można wprowadzić nowej subskrypcji."
@@ -5209,13 +5291,12 @@ msgid "All groups"
msgstr "Wszystkie grupy"
#: lib/profileformaction.php:123
-#, fuzzy
msgid "No return-to arguments"
-msgstr "Brak parametru identyfikatora."
+msgstr "Brak parametrów powrotu"
#: lib/profileformaction.php:137
msgid "unimplemented method"
-msgstr ""
+msgstr "niezaimplementowana metoda"
#: lib/publicgroupnav.php:78
msgid "Public"
@@ -5238,22 +5319,24 @@ msgid "Popular"
msgstr "Popularne"
#: lib/sandboxform.php:67
-#, fuzzy
msgid "Sandbox"
-msgstr "Odebrane"
+msgstr "Ogranicz"
#: lib/sandboxform.php:78
-#, fuzzy
msgid "Sandbox this user"
-msgstr "Odblokuj tego użytkownika"
+msgstr "Ogranicz tego użytkownika"
#: lib/searchaction.php:120
msgid "Search site"
-msgstr "Znajdź stronę"
+msgstr "Przeszukaj stronę"
+
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr "Słowa kluczowe"
#: lib/searchaction.php:162
msgid "Search help"
-msgstr "Znajdź w pomocy"
+msgstr "Przeszukaj pomoc"
#: lib/searchgroupnav.php:80
msgid "People"
@@ -5263,10 +5346,6 @@ msgstr "Osoby"
msgid "Find people on this site"
msgstr "Znajdź osoby na tej stronie"
-#: lib/searchgroupnav.php:82
-msgid "Notice"
-msgstr "Wpis"
-
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
msgstr "Przeszukaj zawartość wpisów"
@@ -5284,24 +5363,22 @@ msgid "More..."
msgstr "Więcej..."
#: lib/silenceform.php:67
-#, fuzzy
msgid "Silence"
-msgstr "Wpis strony"
+msgstr "Wycisz"
#: lib/silenceform.php:78
-#, fuzzy
msgid "Silence this user"
-msgstr "Zablokuj tego użytkownika"
+msgstr "Wycisz tego użytkownika"
#: lib/subgroupnav.php:83
#, php-format
msgid "People %s subscribes to"
-msgstr "Osoby %s zasubskrybowane do"
+msgstr "Osoby %s subskrybowane do"
#: lib/subgroupnav.php:91
#, php-format
msgid "People subscribed to %s"
-msgstr "Osoby zasubskrybowane do %s"
+msgstr "Osoby subskrybowane do %s"
#: lib/subgroupnav.php:99
#, php-format
@@ -5324,24 +5401,23 @@ msgstr "(brak)"
#: lib/subs.php:52
msgid "Already subscribed!"
-msgstr ""
+msgstr "Już subskrybowane."
#: lib/subs.php:56
msgid "User has blocked you."
-msgstr "Użytkownik zablokował Cię."
+msgstr "Użytkownik zablokował cię."
#: lib/subs.php:60
msgid "Could not subscribe."
-msgstr "Nie można zasubskrybować."
+msgstr "Nie można subskrybować."
#: lib/subs.php:79
msgid "Could not subscribe other to you."
-msgstr "Nie można zasubskrybować innych do Ciebie."
+msgstr "Nie można subskrybować innych do ciebie."
#: lib/subs.php:128
-#, fuzzy
msgid "Not subscribed!"
-msgstr "Nie zasubskrybowane!"
+msgstr "Niesubskrybowane."
#: lib/subs.php:140
msgid "Couldn't delete subscription."
@@ -5357,21 +5433,19 @@ msgstr "Najczęściej wysyłający wpisy"
#: lib/unsandboxform.php:69
msgid "Unsandbox"
-msgstr ""
+msgstr "Usuń ograniczenie"
#: lib/unsandboxform.php:80
-#, fuzzy
msgid "Unsandbox this user"
-msgstr "Odblokuj tego użytkownika"
+msgstr "Usuń ograniczenie tego użytkownika"
#: lib/unsilenceform.php:67
msgid "Unsilence"
-msgstr ""
+msgstr "Usuń wyciszenie"
#: lib/unsilenceform.php:78
-#, fuzzy
msgid "Unsilence this user"
-msgstr "Odblokuj tego użytkownika"
+msgstr "Usuń wyciszenie tego użytkownika"
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
@@ -5383,19 +5457,19 @@ msgstr "Zrezygnuj z subskrypcji"
#: lib/userprofile.php:116
msgid "Edit Avatar"
-msgstr "Edytuj awatar"
+msgstr "Zmodyfikuj awatar"
#: lib/userprofile.php:236
msgid "User actions"
-msgstr "Działania użytkownika"
+msgstr "Czynności użytkownika"
#: lib/userprofile.php:248
msgid "Edit profile settings"
-msgstr "Edytuj ustawienia profilu"
+msgstr "Zmodyfikuj ustawienia profilu"
#: lib/userprofile.php:249
msgid "Edit"
-msgstr "Edytuj"
+msgstr "Edycja"
#: lib/userprofile.php:272
msgid "Send a direct message to this user"
@@ -5405,65 +5479,69 @@ 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"
#: lib/webcolor.php:82
#, php-format
msgid "%s is not a valid color!"
-msgstr "%s nie jest prawidłowym kolorem!"
+msgstr "%s nie jest prawidłowym kolorem."
#: lib/webcolor.php:123
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-"%s nie jest prawidłowym kolorem! Użyj trzech lub sześciu znaków "
+"%s nie jest prawidłowym kolorem. Użyj trzech lub sześciu znaków "
"szesnastkowych."
#: scripts/maildaemon.php:48
msgid "Could not parse message."
-msgstr "Nie można przeanalizować wiadomości."
+msgstr "Nie można przetworzyć wiadomości."
#: scripts/maildaemon.php:53
msgid "Not a registered user."
@@ -5471,16 +5549,8 @@ msgstr "To nie jest zarejestrowany użytkownik."
#: scripts/maildaemon.php:57
msgid "Sorry, that is not your incoming email address."
-msgstr "Przepraszamy, to nie jest twój przychodzący adres e-mail."
+msgstr "To nie jest przychodzący adres e-mail."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
-msgstr "Przepraszamy, przychodzący e-mail nie jest dozwolony."
-
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "Odblokuj tego użytkownika"
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "Osoby zasubskrybowane do %s"
+msgstr "Przychodzący e-mail nie jest dozwolony."
diff --git a/locale/pt/LC_MESSAGES/statusnet.mo b/locale/pt/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index b969c15b7..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 f2ef56285..0a2598f59 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -1,5 +1,6 @@
# Translation of StatusNet to Portuguese
#
+# Author@translatewiki.net: Hamilton Abreu
# --
# This file is distributed under the same license as the StatusNet package.
#
@@ -7,21 +8,21 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 10:43+0000\n"
-"PO-Revision-Date: 2009-11-18 19:32:28+0000\n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-11-28 19:50:48+0000\n"
"Language-Team: Portuguese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt\n"
"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
msgid "No such page"
-msgstr ""
+msgstr "Página não encontrada."
#: actions/all.php:74 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
@@ -46,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
@@ -60,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
@@ -86,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
@@ -93,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
@@ -100,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
@@ -131,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."
@@ -154,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
@@ -175,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
@@ -251,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."
@@ -275,27 +281,25 @@ msgid "Could not follow user: %s is already on your list."
msgstr "Não foi possível seguir utilizador: %s já está na sua lista."
#: actions/apifriendshipsdestroy.php:109
-#, fuzzy
msgid "Could not unfollow user: User not found."
-msgstr "Não foi possível seguir utilizador: Utilizador não encontrado."
+msgstr ""
+"Não foi possível deixar de seguir utilizador: Utilizador não encontrado."
#: actions/apifriendshipsdestroy.php:120
msgid "You cannot unfollow yourself!"
-msgstr ""
+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 ""
#: actions/apifriendshipsshow.php:135
-#, fuzzy
msgid "Could not determine source user."
-msgstr "Não foi possível actualizar o utilizador."
+msgstr "Não foi possível determinar o utilizador de origem."
#: actions/apifriendshipsshow.php:143
-#, fuzzy
msgid "Could not find target user."
-msgstr "Não foi possivel encontrar algum estado."
+msgstr "Não foi possível encontrar o utilizador de destino."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
@@ -307,144 +311,142 @@ 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á em uso. 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 Homepage inserida não é um URL válido."
+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:178
+#: 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
@@ -454,34 +456,34 @@ msgstr ""
#: 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
@@ -491,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."
@@ -512,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."
@@ -526,44 +528,44 @@ 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:522
+#: 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:237 actions/favor.php:75
+#: 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
@@ -576,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:255 actions/grouplogo.php:319
+#: 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."
@@ -601,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"
@@ -647,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 ""
@@ -661,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
@@ -668,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."
@@ -699,29 +701,29 @@ 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:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
#: actions/profilesettings.php:276 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Não foi possível actualizar o utilizador."
-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: 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"
@@ -730,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:206 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
@@ -753,309 +754,238 @@ 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:522
-#, fuzzy
+#: actions/deletenotice.php:146 lib/noticelist.php:550
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:278
-#, fuzzy
+#: actions/designadminpanel.php:270
msgid "Invalid logo URL."
-msgstr "Tamanho inválido."
+msgstr "URL do logótipo inválida."
-#: actions/designadminpanel.php:282
+#: actions/designadminpanel.php:274
#, php-format
msgid "Theme not available: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:288
-#, php-format
-msgid "Theme directory not readable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:292
-#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
+msgstr "Tema não está disponível: %s"
-#: actions/designadminpanel.php:296
-#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:312
-#, php-format
-msgid "Max length for %s %s is 255 characters."
-msgstr ""
-
-#: actions/designadminpanel.php:412
-#, fuzzy
+#: actions/designadminpanel.php:370
msgid "Change logo"
-msgstr "Modificar a sua palavra-passe"
+msgstr "Alterar logótipo"
-#: actions/designadminpanel.php:417
-#, fuzzy
+#: actions/designadminpanel.php:375
msgid "Site logo"
-msgstr "Convidar"
+msgstr "Logótipo do site"
-#: actions/designadminpanel.php:424
-#, fuzzy
+#: actions/designadminpanel.php:382
msgid "Change theme"
-msgstr "Modificar"
+msgstr "Alterar tema"
-#: actions/designadminpanel.php:441
-#, fuzzy
+#: actions/designadminpanel.php:399
msgid "Site theme"
-msgstr "Modificar"
+msgstr "Tema do site"
-#: actions/designadminpanel.php:442
+#: actions/designadminpanel.php:400
msgid "Theme for the site."
-msgstr ""
+msgstr "O tema para o site."
-#: actions/designadminpanel.php:447
-msgid "Theme server"
-msgstr ""
-
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
-
-#: actions/designadminpanel.php:455
-msgid "Theme directory"
-msgstr ""
-
-#: actions/designadminpanel.php:462
-#, fuzzy
-msgid "Avatar Settings"
-msgstr "Definições de IM"
-
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Avatar server"
-msgstr "Avatar actualizado."
-
-#: actions/designadminpanel.php:471
-#, fuzzy
-msgid "Avatar path"
-msgstr "Avatar actualizado."
-
-#: actions/designadminpanel.php:475
-#, fuzzy
-msgid "Avatar directory"
-msgstr "Avatar actualizado."
-
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
-msgstr ""
+msgstr "Alterar imagem de fundo"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
-msgstr ""
+msgstr "Imagem de fundo"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:422
#, php-format
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:526 lib/designsettings.php:139
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:542 lib/designsettings.php:155
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:543 lib/designsettings.php:156
+#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:548 lib/designsettings.php:161
+#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:554
-msgid "Background server"
-msgstr ""
-
-#: actions/designadminpanel.php:558
-msgid "Background path"
-msgstr ""
-
-#: actions/designadminpanel.php:562
-msgid "Background directory"
-msgstr ""
-
-#: actions/designadminpanel.php:569 lib/designsettings.php:170
-#, fuzzy
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
msgid "Change colours"
-msgstr "Modificar a sua palavra-passe"
+msgstr "Alterar cores"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
-#, fuzzy
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
msgid "Content"
-msgstr "Ligar"
+msgstr "Conteúdo"
-#: actions/designadminpanel.php:604 lib/designsettings.php:204
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
msgid "Sidebar"
-msgstr ""
+msgstr "Barra lateral"
-#: actions/designadminpanel.php:617 lib/designsettings.php:217
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
-msgstr ""
+msgstr "Texto"
-#: actions/designadminpanel.php:630 lib/designsettings.php:230
-#, fuzzy
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
msgid "Links"
-msgstr "Entrar"
+msgstr "Ligações"
-#: actions/designadminpanel.php:658 lib/designsettings.php:247
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
-msgstr ""
+msgstr "Usar predefinições"
-#: actions/designadminpanel.php:659 lib/designsettings.php:248
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
-msgstr ""
+msgstr "Repor designs predefinidos"
-#: actions/designadminpanel.php:665 lib/designsettings.php:254
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
-msgstr ""
+msgstr "Repor predefinição"
-#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 actions/useradminpanel.php:226
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: 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 ""
+msgstr "Gravar"
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: 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
@@ -1064,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
@@ -1087,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
@@ -1100,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"
@@ -1117,138 +1048,145 @@ 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:301 actions/imsettings.php:264
+#: 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:319
+#: actions/emailsettings.php:320
msgid "No email address."
-msgstr ""
+msgstr "Sem endereço de correio electrónico."
-#: actions/emailsettings.php:326
+#: 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:330 actions/siteadminpanel.php:158
+#: 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:333
+#: actions/emailsettings.php:334
msgid "That is already your email address."
-msgstr ""
+msgstr "Esse já é o seu endereço electrónico."
-#: actions/emailsettings.php:336
+#: 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:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Não foi possível inserir o código de confirmação."
-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
msgstr ""
-"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:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
msgstr "Nenhuma confirmação pendente para cancelar."
-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: 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:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
msgstr "Confirmação cancelada."
-#: actions/emailsettings.php:412
+#: 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:431 actions/imsettings.php:408
+#: 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:445 actions/smssettings.php:518
+#: 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:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
msgid "Couldn't update user record."
msgstr "Não foi possível actualizar o registo do utilizador."
-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: 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:480 actions/smssettings.php:555
+#: 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
@@ -1256,88 +1194,86 @@ 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 aos favoritos!"
#: 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
msgid "That user has blocked you from subscribing."
-msgstr ""
+msgstr "Esse utilizador bloqueou-o, impedindo que o subscreva."
#: actions/finishremotesubscribe.php:106
msgid "You are not authorized."
-msgstr ""
+msgstr "Não tem autorização."
#: actions/finishremotesubscribe.php:109
-#, fuzzy
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
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
msgid "Error updating remote profile"
@@ -1347,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 ID."
#: 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
@@ -1399,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:439 lib/groupnav.php:107
+#: 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"
@@ -1493,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
@@ -1514,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
@@ -1531,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
@@ -1538,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
+#: 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
@@ -1558,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"
@@ -1586,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."
@@ -1601,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"
@@ -1614,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."
@@ -1662,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"
@@ -1702,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
@@ -1713,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:"
@@ -1723,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)"
@@ -1739,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:208
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
-msgstr ""
+msgstr "Enviar"
#: actions/invite.php:226
#, php-format
@@ -1784,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"
@@ -1801,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"
@@ -1812,69 +1773,68 @@ 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
msgid "Invalid or expired token."
-msgstr "Conteúdo da mensagem inválido"
+msgstr "Chave inválida ou expirada."
#: actions/login.php:143
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
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:204 actions/login.php:257 lib/action.php:457
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Entrar"
#: actions/login.php:243
msgid "Login to site"
-msgstr ""
+msgstr "Iniciar sessão no site"
#: actions/login.php:246 actions/profilesettings.php:106
#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
@@ -1885,16 +1845,17 @@ msgstr "Alcunha"
#: actions/login.php:249 actions/register.php:428
#: lib/accountsettingsaction.php:116
msgid "Password"
-msgstr ""
+msgstr "Palavra-chave"
#: actions/login.php:252 actions/register.php:477
msgid "Remember me"
-msgstr ""
+msgstr "Lembrar-me neste computador"
#: actions/login.php:253 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
msgid "Lost or forgotten password?"
@@ -1909,88 +1870,87 @@ msgstr ""
"palavra-passe antes de alterar as suas configurações."
#: actions/login.php:286
-#, fuzzy, php-format
+#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
"(%%action.register%%) a new account."
msgstr ""
-"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:233 lib/channel.php:170
+#: 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:199
+#: actions/newnotice.php:206
msgid "Notice posted"
-msgstr ""
+msgstr "Nota publicada"
#: actions/noticesearch.php:68
#, php-format
@@ -1998,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
@@ -2014,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
@@ -2021,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:89
+#: actions/noticesearchrss.php:96
#, php-format
msgid "Updates with \"%s\""
-msgstr ""
+msgstr "Actualizações com \"%s\""
-#: actions/noticesearchrss.php:91
-#, fuzzy, php-format
+#: actions/noticesearchrss.php:98
+#, 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 "
@@ -2066,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"
@@ -2150,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
-msgid "same as password above"
-msgstr ""
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Repita a palavra-chave nova"
#: actions/passwordsettings.php:117
msgid "Change"
@@ -2162,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."
@@ -2178,11 +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 "Localizações"
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr "Configurações de localização e servidor deste site StatusNet."
+
+#: actions/pathsadminpanel.php:140
+#, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Sem acesso de leitura do directório do tema: %s"
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr "Sem acesso de escrita no directório do avatar: %s"
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr "Sem acesso de escrita no directório do fundo: %s"
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr "Sem acesso de leitura do directório do locales: %s"
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+msgid "Site"
+msgstr "Site"
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr "Localização"
+
+#: actions/pathsadminpanel.php:216
+msgid "Site path"
+msgstr "Localização do site"
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr "Localização do locales"
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr "Localização do directório do locales"
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr "Tema"
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr "Servidor do tema"
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr "Localização do tema"
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr "Directório do tema"
+
+#: actions/pathsadminpanel.php:247
+msgid "Avatars"
+msgstr "Avatares"
+
+#: actions/pathsadminpanel.php:252
+msgid "Avatar server"
+msgstr "Servidor do avatar"
+
+#: actions/pathsadminpanel.php:256
+msgid "Avatar path"
+msgstr "Localização do avatar"
+
+#: actions/pathsadminpanel.php:260
+msgid "Avatar directory"
+msgstr "Directório do avatar"
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr "Fundos"
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr "Servidor do fundo"
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr "Localização do fundo"
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr "Directório do fundo"
+
+#: actions/pathsadminpanel.php:297
+msgid "Save paths"
+msgstr "Gravar localizações"
#: actions/peoplesearch.php:52
#, php-format
@@ -2190,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"
@@ -2235,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
@@ -2269,106 +2340,106 @@ 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:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
-msgstr "Linguagem"
+msgstr "Língua"
#: actions/profilesettings.php:145
msgid "Preferred language"
-msgstr ""
+msgstr "Língua preferida"
#: actions/profilesettings.php:154
msgid "Timezone"
-msgstr ""
+msgstr "Fuso horário"
#: actions/profilesettings.php:155
msgid "What timezone are you normally in?"
-msgstr ""
+msgstr "Em que fuso horário se encontra normalmente?"
#: actions/profilesettings.php:160
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
-#, fuzzy, php-format
+#, php-format
msgid "Bio is too long (max %d chars)."
-msgstr "Bio é demasiada extensa (máx 140 car)."
+msgstr "Biografia demasiado extensa (máx. %d caracteres)."
#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
msgid "Timezone not selected."
-msgstr ""
+msgstr "Fuso horário não foi seleccionado."
#: actions/profilesettings.php:234
msgid "Language is too long (max 50 chars)."
-msgstr "Linguagem introduzida é muito longa (máx. 50 caracteres)."
+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."
-msgstr "Não foi possível salvar o perfil."
+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."
-msgstr ""
+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
@@ -2376,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
@@ -2395,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
@@ -2403,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 ""
+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
@@ -2428,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 ""
+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."
@@ -2455,74 +2542,74 @@ 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!"
msgstr "6 ou mais caracteres, e não a esqueça!"
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr ""
-
#: 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."
@@ -2537,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."
@@ -2562,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:454
+#: 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."
@@ -2614,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:287 lib/accountsettingsaction.php:120
+#: 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
@@ -2664,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
@@ -2693,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"
@@ -2713,16 +2805,16 @@ 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)"
@@ -2732,10 +2824,12 @@ msgstr "URL de perfil inválido (formato incorrecto)"
msgid ""
"Not a valid profile URL (no YADIS document or no 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
@@ -2746,27 +2840,27 @@ msgstr "Não foi possível obter um token de requisição."
#: 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
@@ -2774,6 +2868,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
@@ -2781,6 +2877,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
@@ -2788,50 +2886,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
@@ -2839,6 +2941,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
@@ -2847,85 +2951,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/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
msgid "Statistics"
-msgstr ""
+msgstr "Estatísticas"
#: actions/showgroup.php:432
-#, fuzzy
msgid "Created"
-msgstr "Criar"
+msgstr "Criado"
#: actions/showgroup.php:448
#, php-format
@@ -2936,6 +3042,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
@@ -2945,28 +3057,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."
@@ -2975,48 +3091,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
@@ -3024,6 +3142,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
@@ -3033,6 +3153,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
@@ -3041,20 +3166,17 @@ 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."
-
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
-#, fuzzy
-msgid "Site"
-msgstr "Convidar"
+msgstr "O utilizador já está silenciado."
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
@@ -3087,152 +3209,149 @@ msgid "Snapshot frequency must be a number."
msgstr ""
#: actions/siteadminpanel.php:199
-msgid "You must set an SSL sever when enabling SSL."
+msgid "You must set an SSL server when enabling SSL."
msgstr ""
#: actions/siteadminpanel.php:204
-msgid "Invalid SSL server. Max length is 255 characters."
+msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
#: actions/siteadminpanel.php:210
-msgid "Minimum text limit is 140c."
+msgid "Minimum text limit is 140 characters."
msgstr ""
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:224
-#, php-format
-msgid "Locales directory not readable: %s"
+#: actions/siteadminpanel.php:266
+msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:275
+#: actions/siteadminpanel.php:269
msgid "Site name"
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:279
+#: actions/siteadminpanel.php:274
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:280
+#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:283
+#: actions/siteadminpanel.php:279
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:284
#, fuzzy
-msgid "contact email address for your site"
+msgid "Contact email address for your site"
msgstr "O endereço de email de recepção removido."
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:290
+#, fuzzy
+msgid "Local"
+msgstr "Localidade"
+
+#: actions/siteadminpanel.php:301
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:303
+#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:308
msgid "Default site language"
msgstr ""
#: actions/siteadminpanel.php:316
-msgid "Path to locales"
-msgstr ""
-
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
+msgid "URLs"
msgstr ""
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Server"
msgstr ""
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
msgstr ""
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-#, fuzzy
-msgid "Site path"
-msgstr "Convidar"
-
-#: actions/siteadminpanel.php:328
+#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
msgstr ""
-#: actions/siteadminpanel.php:330
+#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
+#: actions/siteadminpanel.php:331
+msgid "Access"
+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 actions/useradminpanel.php:171
-#, fuzzy
+#: actions/siteadminpanel.php:346
msgid "Closed"
-msgstr "Bloquear"
+msgstr "Fechado"
#: actions/siteadminpanel.php:348
msgid "Disable new registrations."
-msgstr ""
+msgstr "Impossibilitar registos novos."
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
+msgstr "Instantâneos"
+
+#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
-msgstr ""
+msgstr "Aleatoriamente, durante o acesso pela internet"
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
-msgstr ""
+msgstr "Num processo agendado"
-#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
msgid "Never"
-msgstr ""
+msgstr "Nunca"
-#: actions/siteadminpanel.php:357
+#: actions/siteadminpanel.php:360
msgid "Data snapshots"
-msgstr ""
+msgstr "Instantâneos dos dados"
-#: actions/siteadminpanel.php:358
+#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:364
+#: actions/siteadminpanel.php:366
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:365
-msgid "Snapshots will be sent once every N Web hits"
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
msgstr ""
#: actions/siteadminpanel.php:372
@@ -3243,47 +3362,55 @@ msgstr ""
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:381
+#: actions/siteadminpanel.php:380
+msgid "SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
msgid "Sometimes"
msgstr ""
-#: actions/siteadminpanel.php:382
+#: actions/siteadminpanel.php:385
msgid "Always"
msgstr ""
-#: actions/siteadminpanel.php:384
+#: actions/siteadminpanel.php:387
msgid "Use SSL"
msgstr ""
-#: actions/siteadminpanel.php:385
+#: actions/siteadminpanel.php:388
msgid "When to use SSL"
msgstr ""
-#: actions/siteadminpanel.php:391
+#: actions/siteadminpanel.php:393
msgid "SSL Server"
msgstr ""
-#: actions/siteadminpanel.php:392
+#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr ""
+
+#: actions/siteadminpanel.php:403
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
#, fuzzy
msgid "Save site settings"
msgstr "Definições do Email"
@@ -3319,59 +3446,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
@@ -3379,6 +3507,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"
@@ -3386,49 +3517,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
@@ -3436,25 +3569,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
@@ -3465,23 +3600,29 @@ 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."
@@ -3490,81 +3631,82 @@ msgstr ""
#: 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."
@@ -3583,25 +3725,91 @@ msgstr ""
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
-#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+#: 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:173
-msgid "Is registration on this site prohibited?"
-msgstr ""
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr "Limite da biografia inválido. Tem de ser numérico."
-#: actions/useradminpanel.php:178
-#, fuzzy
-msgid "Invite-only"
-msgstr "Convidar"
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
+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 "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 "Perfil"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr "Limite da Bio"
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
+msgstr "Tamanho máximo de uma biografia em caracteres."
+
+#: actions/useradminpanel.php:231
+msgid "New users"
+msgstr "Utilizadores novos"
+
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr "Boas-vindas a utilizadores novos"
+
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr "Texto de boas-vindas a utilizadores novos (máx. 255 caracteres)."
+
+#: actions/useradminpanel.php:241
+msgid "Default subscription"
+msgstr "Subscrição predefinida"
+
+#: actions/useradminpanel.php:242
+msgid "Automatically subscribe new users to this user."
+msgstr "Novos utilizadores subscrevem automaticamente este utilizador."
+
+#: actions/useradminpanel.php:251
+msgid "Invitations"
+msgstr "Convites"
+
+#: actions/useradminpanel.php:256
+msgid "Invitations enabled"
+msgstr "Convites possibilitados"
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr "Permitir, ou não, que utilizadores convidem utilizadores novos."
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr "Sessões"
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr "Gerir sessões"
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
+msgstr "Se devemos gerir sessões nós próprios."
+
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr ""
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/userauthorization.php:105
@@ -3614,10 +3822,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"
@@ -3630,12 +3841,11 @@ 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!"
@@ -3643,7 +3853,7 @@ msgstr ""
#: actions/userauthorization.php:247
msgid "Subscription authorized"
-msgstr ""
+msgstr "Subscrição autorizada"
#: actions/userauthorization.php:249
msgid ""
@@ -3651,10 +3861,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 ""
@@ -3662,6 +3875,9 @@ 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
@@ -3681,22 +3897,22 @@ msgstr ""
#: 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."
@@ -3704,36 +3920,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
@@ -3741,82 +3959,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 ""
-
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr ""
+msgstr "%1$s dá-lhe as boas-vindas, @%2$s!"
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
@@ -3824,7 +4045,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"
@@ -3836,278 +4057,276 @@ 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:424
+#: lib/action.php:425
msgid "Primary site navigation"
-msgstr ""
+msgstr "Navegação primária deste site"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Home"
msgstr "Início"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Personal profile and friends timeline"
-msgstr ""
+msgstr "Perfil pessoal e cronolinha dos amigos"
-#: lib/action.php:432
-#, fuzzy
+#: lib/action.php:433
msgid "Account"
-msgstr "Sobre"
+msgstr "Conta"
-#: lib/action.php:432
-#, fuzzy
+#: lib/action.php:433
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:435
+#: lib/action.php:436
msgid "Connect"
msgstr "Ligar"
-#: lib/action.php:435
-#, fuzzy
+#: lib/action.php:436
msgid "Connect to services"
-msgstr "Não foi possível redireccionar para o servidor: %s"
+msgstr "Ligar aos serviços"
-#: lib/action.php:439
+#: lib/action.php:440
msgid "Change site configuration"
-msgstr ""
+msgstr "Alterar a configuração do site"
-#: lib/action.php:443 lib/subgroupnav.php:105
+#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Convidar"
-#: lib/action.php:444 lib/subgroupnav.php:106
+#: 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:449
+#: lib/action.php:450
msgid "Logout"
msgstr "Sair"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout from the site"
-msgstr ""
+msgstr "Terminar esta sessão"
-#: lib/action.php:454
-#, fuzzy
+#: lib/action.php:455
msgid "Create an account"
-msgstr "Ligar conta existente"
+msgstr "Criar uma conta"
-#: lib/action.php:457
+#: lib/action.php:458
msgid "Login to the site"
-msgstr ""
+msgstr "Iniciar uma sessão"
-#: lib/action.php:460 lib/action.php:723
+#: lib/action.php:461 lib/action.php:724
msgid "Help"
msgstr "Ajuda"
-#: lib/action.php:460
+#: lib/action.php:461
msgid "Help me!"
-msgstr ""
+msgstr "Ajudem-me!"
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
-msgstr ""
+msgstr "Pesquisar"
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
-msgstr ""
+msgstr "Procurar pessoas ou pesquisar texto"
-#: lib/action.php:484
+#: lib/action.php:485
msgid "Site notice"
-msgstr ""
+msgstr "Aviso do site"
-#: lib/action.php:550
+#: lib/action.php:551
msgid "Local views"
-msgstr ""
+msgstr "Vistas locais"
-#: lib/action.php:616
+#: lib/action.php:617
msgid "Page notice"
-msgstr ""
+msgstr "Aviso da página"
-#: lib/action.php:718
+#: lib/action.php:719
msgid "Secondary site navigation"
-msgstr ""
+msgstr "Navegação secundária deste site"
-#: lib/action.php:725
+#: lib/action.php:726
msgid "About"
msgstr "Sobre"
-#: lib/action.php:727
+#: lib/action.php:728
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:731
+#: lib/action.php:732
msgid "TOS"
-msgstr ""
+msgstr "Condições do Serviço"
-#: lib/action.php:734
+#: lib/action.php:735
msgid "Privacy"
-msgstr ""
+msgstr "Privacidade"
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
-msgstr ""
+msgstr "Fonte"
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Contact"
msgstr "Contacto"
-#: lib/action.php:740
+#: lib/action.php:741
msgid "Badge"
msgstr ""
-#: lib/action.php:768
+#: lib/action.php:769
msgid "StatusNet software license"
-msgstr ""
+msgstr "Licença de software do StatusNet"
-#: lib/action.php:771
+#: lib/action.php:772
#, php-format
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:773
+#: 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:775
+#: lib/action.php:776
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
"s, available under the [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
+"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:789
-#, fuzzy
+#: lib/action.php:790
msgid "Site content license"
-msgstr "Encontrar conteúdo dos mensagens"
+msgstr "Licença de conteúdos do site"
-#: lib/action.php:798
+#: lib/action.php:799
msgid "All "
msgstr ""
-#: lib/action.php:803
+#: lib/action.php:804
msgid "license."
-msgstr ""
+msgstr "licença."
-#: lib/action.php:1067
+#: lib/action.php:1068
msgid "Pagination"
-msgstr ""
+msgstr "Paginação"
-#: lib/action.php:1076
+#: lib/action.php:1077
msgid "After"
-msgstr ""
+msgstr "Depois"
-#: lib/action.php:1084
-#, fuzzy
+#: lib/action.php:1085
msgid "Before"
-msgstr "Antes »"
+msgstr "Antes"
-#: lib/action.php:1132
+#: 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
+msgid "Paths configuration"
+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
@@ -4116,149 +4335,149 @@ 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 ""
+msgstr "Não foi possível ligar a notificação."
#: lib/command.php:597
-#, fuzzy, php-format
+#, 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 criar a chave de entrada para %s"
#: lib/command.php:602
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
+"Esta ligação é utilizável uma única vez e só durante os próximos 2 minutos: %"
+"s"
#: lib/command.php:618
-#, fuzzy
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
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
-msgstr[0] "Já subscrito!."
-msgstr[1] "Já subscrito!."
+msgstr[0] "Subscreve esta pessoa:"
+msgstr[1] "Subscreve estas pessoas:"
#: lib/command.php:640
-#, fuzzy
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
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
msgid "You are not a member of any groups."
-msgstr ""
+msgstr "Não está em nenhum grupo."
#: lib/command.php:664
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
msgid ""
@@ -4298,23 +4517,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 id às favoritas\n"
+"reply #<id_da_nota> - responder à nota com esta id\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"
@@ -4322,236 +4575,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:104
+#: 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
#, 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:424
-#, fuzzy
+#: lib/mailbox.php:227 lib/noticelist.php:452
msgid "from"
msgstr "de"
#: lib/mail.php:172
msgid "Email address confirmation"
-msgstr "Confirmação do Endereço de Email"
+msgstr "Confirmação do endereço electrónico"
#: lib/mail.php:174
#, php-format
@@ -4569,14 +4833,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"
@@ -4589,22 +4865,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
@@ -4612,11 +4893,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
@@ -4630,6 +4913,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
@@ -4638,12 +4929,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
@@ -4660,11 +4951,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
@@ -4684,11 +4986,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
@@ -4710,11 +5026,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
@@ -4730,118 +5062,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:173
-#, fuzzy
+#: lib/messageform.php:162 lib/noticeform.php:186
msgid "Available characters"
-msgstr "6 ou mais caracteres"
+msgstr "Caracteres disponíveis"
-#: lib/noticeform.php:145
+#: lib/noticeform.php:158
msgid "Send a notice"
-msgstr ""
+msgstr "Enviar uma nota"
-#: lib/noticeform.php:158
+#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
-msgstr ""
+msgstr "Novidades, %s?"
-#: lib/noticeform.php:180
+#: lib/noticeform.php:193
msgid "Attach"
-msgstr ""
+msgstr "Anexar"
-#: lib/noticeform.php:184
+#: 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 "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+
+#: lib/noticelist.php:404
+msgid "N"
+msgstr "N"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr "S"
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr "E"
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr "O"
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr "coords."
-#: lib/noticelist.php:478
+#: lib/noticelist.php:506
msgid "in context"
-msgstr ""
+msgstr "em contexto"
-#: lib/noticelist.php:498
-#, fuzzy
+#: lib/noticelist.php:526
msgid "Reply to this notice"
-msgstr "Não é possível remover a mensagem."
+msgstr "Responder a esta nota"
-#: lib/noticelist.php:499
+#: 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"
@@ -4852,54 +5221,53 @@ 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
msgid "Subscriptions"
-msgstr ""
+msgstr "Subscrições"
#: lib/profileaction.php:126
msgid "All subscriptions"
@@ -4907,16 +5275,15 @@ msgstr "Todas as subscrições"
#: lib/profileaction.php:140 lib/profileaction.php:200 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
msgid "User ID"
-msgstr ""
+msgstr "ID de utilizador"
#: lib/profileaction.php:182
msgid "Member since"
@@ -4924,122 +5291,120 @@ msgstr "Membro desde"
#: lib/profileaction.php:235
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 "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."
@@ -5047,16 +5412,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."
@@ -5068,134 +5432,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 ""
-
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "Desbloquear este utilizador"
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "Já subscrito!."
+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 6b34a4f5e..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 074cde443..8c57cb2b5 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -1,7 +1,7 @@
# Translation of StatusNet to Brazilian Portuguese
#
# Author@translatewiki.net: Ewout
-# Author: Frederico Goncalves Guimaraes <frederico@teia.bio.br>, 2009.
+# Author@translatewiki.net: Vuln
# --
# This file is distributed under the same license as the StatusNet package.
#
@@ -9,22 +9,21 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 10:43+0000\n"
-"PO-Revision-Date: 2009-11-18 19:32:31+0000\n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-11-28 19:50:50+0000\n"
"Language-Team: Brazilian Portuguese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt-br\n"
"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
-#, fuzzy
msgid "No such page"
-msgstr "Essa etiqueta não existe."
+msgstr "Essa página não existe."
#: actions/all.php:74 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
@@ -105,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
@@ -199,9 +197,9 @@ msgid "No message text!"
msgstr "Nenhuma mensagem de texto!"
#: 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 "Muito extenso. O tamanho máximo das mensagens é 140 caracteres."
+msgstr "Isso é muito extenso. O tamanho máximo das mensagens é 140 caracteres."
#: actions/apidirectmessagenew.php:146
msgid "Recipient user not found."
@@ -214,9 +212,9 @@ msgstr ""
"amigos."
#: actions/apidirectmessage.php:89
-#, fuzzy, php-format
+#, php-format
msgid "Direct messages from %s"
-msgstr "Mensagem direta para %s"
+msgstr "Mensagens diretas de %s"
#: actions/apidirectmessage.php:93
#, php-format
@@ -301,9 +299,8 @@ msgid "Could not determine source user."
msgstr "Não foi possível recuperar o fluxo público."
#: actions/apifriendshipsshow.php:143
-#, fuzzy
msgid "Could not find target user."
-msgstr "Não foi possível encontrar nenhum status."
+msgstr "Não foi possível encontrar usuário alvo."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
@@ -338,9 +335,9 @@ msgid "Full name is too long (max 255 chars)."
msgstr "O nome completo é muito extenso (máx. 255 caracteres)"
#: actions/apigroupcreate.php:213
-#, fuzzy, php-format
+#, php-format
msgid "Description is too long (max %d chars)."
-msgstr "descrição muito extensa (máximo 140 caracteres)."
+msgstr "Descrição muito extensa (máximo 140 caracteres)."
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
#: actions/newgroup.php:148 actions/profilesettings.php:225
@@ -356,9 +353,9 @@ msgstr ""
#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
-#, fuzzy, php-format
+#, php-format
msgid "Invalid alias: \"%s\""
-msgstr "Etiqueta inválida: \"%s\""
+msgstr "Tag inválida: \"%s\""
#: actions/apigroupcreate.php:273 actions/editgroup.php:228
#: actions/newgroup.php:172
@@ -374,18 +371,16 @@ 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 "O método da API não foi encontrado!"
+msgstr "Grupo não encontrado."
#: actions/apigroupjoin.php:110
-#, fuzzy
msgid "You are already a member of that group."
-msgstr "Você já está assinando esses usuários:"
+msgstr "Você 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 "Você foi bloqueado desse grupo pelo administrador."
#: actions/apigroupjoin.php:138
#, fuzzy, php-format
@@ -393,14 +388,13 @@ msgid "Could not join user %s to group %s."
msgstr "Não é possível acompanhar o usuário: Usuário não encontrado."
#: actions/apigroupleave.php:114
-#, fuzzy
msgid "You are not a member of this group."
-msgstr "Você não está assinando esse perfil."
+msgstr "Você 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 é possível acompanhar o usuário: Usuário não encontrado."
+msgstr "Não foi possível remover o usuário %s do grupo %."
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, php-format
@@ -440,7 +434,7 @@ msgstr "Não foi encontrado nenhum status com esse 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 "Está muito extenso. O tamanho máximo é de 140 caracteres."
@@ -448,7 +442,7 @@ msgstr "Está muito extenso. O tamanho máximo é de 140 caracteres."
msgid "Not found"
msgstr "Não encontrado"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -537,9 +531,9 @@ 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 "Você pode enviar seu avatar pessoal."
+msgstr "Você pode enviar seu avatar pessoal. O tamanho máximo do arquivo é %s"
#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
@@ -563,7 +557,7 @@ msgid "Preview"
msgstr "Visualização"
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
+#: lib/noticelist.php:550
msgid "Delete"
msgstr "Excluir"
@@ -576,7 +570,7 @@ msgid "Crop"
msgstr "Cortar"
#: actions/avatarsettings.php:265 actions/disfavor.php:74
-#: actions/emailsettings.php:237 actions/favor.php:75
+#: 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
@@ -592,7 +586,7 @@ msgstr ""
"Ocorreu um problema com o seu token de sessão. Tente novamente, por favor."
#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
-#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: 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."
@@ -661,7 +655,6 @@ msgid "Unblock this user"
msgstr "Desbloquear este usuário"
#: actions/block.php:69
-#, fuzzy
msgid "You already blocked that user."
msgstr "Você já bloqueou esse usuário."
@@ -692,7 +685,6 @@ msgid "Yes"
msgstr "Sim"
#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
-#, fuzzy
msgid "Block this user"
msgstr "Bloquear usuário"
@@ -725,15 +717,15 @@ msgstr "Tipo de endereço %s desconhecido"
msgid "That address has already been confirmed."
msgstr "Esse endereço já foi confirmado."
-#: actions/confirmaddress.php:114 actions/emailsettings.php:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
#: actions/profilesettings.php:276 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Não foi possível atualizar o usuário."
-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: 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 excluir a confirmação de e-mail."
@@ -753,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/profileaction.php:206 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Mensagens"
@@ -775,7 +767,6 @@ msgid "Can't delete this notice."
msgstr "Não é possível excluir esta mensagem."
#: actions/deletenotice.php:103
-#, fuzzy
msgid ""
"You are about to permanently delete a notice. Once this is done, it cannot "
"be undone."
@@ -796,7 +787,7 @@ msgstr "Você tem certeza que deseja excluir esta mensagem?"
msgid "Do not delete this notice"
msgstr "Não é possível excluir esta mensagem."
-#: actions/deletenotice.php:146 lib/noticelist.php:522
+#: actions/deletenotice.php:146 lib/noticelist.php:550
msgid "Delete this notice"
msgstr "Excluir esta mensagem"
@@ -817,15 +808,16 @@ msgid "You can only delete local users."
msgstr "Você não pode apagar o status de outro usuário."
#: actions/deleteuser.php:110 actions/deleteuser.php:133
-#, fuzzy
msgid "Delete user"
-msgstr "Excluir"
+msgstr "Excluir usuário"
#: 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 ""
+"Você tem certeza que quer remover este usuário? Isso irá limpar todos os "
+"dados sobre o usuário do banco de dados, sem backup."
#: actions/deleteuser.php:148 lib/deleteuserform.php:77
#, fuzzy
@@ -841,183 +833,121 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:278
+#: actions/designadminpanel.php:270
#, fuzzy
msgid "Invalid logo URL."
msgstr "Tamanho inválido."
-#: actions/designadminpanel.php:282
+#: actions/designadminpanel.php:274
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Esta página não está disponível em um "
-#: actions/designadminpanel.php:288
-#, fuzzy, php-format
-msgid "Theme directory not readable: %s"
-msgstr "Esta página não está disponível em um "
-
-#: actions/designadminpanel.php:292
-#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:296
-#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:312
-#, php-format
-msgid "Max length for %s %s is 255 characters."
-msgstr ""
-
-#: actions/designadminpanel.php:412
+#: actions/designadminpanel.php:370
#, fuzzy
msgid "Change logo"
msgstr "Altere a sua senha"
-#: actions/designadminpanel.php:417
+#: actions/designadminpanel.php:375
#, fuzzy
msgid "Site logo"
msgstr "Convidar"
-#: actions/designadminpanel.php:424
+#: actions/designadminpanel.php:382
#, fuzzy
msgid "Change theme"
msgstr "Alterar"
-#: actions/designadminpanel.php:441
+#: actions/designadminpanel.php:399
#, fuzzy
msgid "Site theme"
msgstr "Nova mensagem"
-#: actions/designadminpanel.php:442
+#: actions/designadminpanel.php:400
#, fuzzy
msgid "Theme for the site."
msgstr "Sair deste site"
-#: actions/designadminpanel.php:447
-msgid "Theme server"
-msgstr ""
-
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
-
-#: actions/designadminpanel.php:455
-msgid "Theme directory"
-msgstr ""
-
-#: actions/designadminpanel.php:462
-#, fuzzy
-msgid "Avatar Settings"
-msgstr "Configurações do avatar"
-
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Avatar server"
-msgstr "Configurações do avatar"
-
-#: actions/designadminpanel.php:471
-#, fuzzy
-msgid "Avatar path"
-msgstr "O avatar foi atualizado."
-
-#: actions/designadminpanel.php:475
-#, fuzzy
-msgid "Avatar directory"
-msgstr "O avatar foi atualizado."
-
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
-msgstr ""
+msgstr "Alterar imagem de plano de fundo."
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:496
-#, fuzzy, php-format
+#: actions/designadminpanel.php:422
+#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
-msgstr "Você pode enviar seu avatar pessoal."
+msgstr ""
+"Você pode enviar uma imagem de plano de fundo para o site. O tamanho máximo "
+"do arquivo é %l$s"
-#: actions/designadminpanel.php:526 lib/designsettings.php:139
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
-msgstr ""
+msgstr "Ligado"
-#: actions/designadminpanel.php:542 lib/designsettings.php:155
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:543 lib/designsettings.php:156
+#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:548 lib/designsettings.php:161
+#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:554
-msgid "Background server"
-msgstr ""
-
-#: actions/designadminpanel.php:558
-msgid "Background path"
-msgstr ""
-
-#: actions/designadminpanel.php:562
-msgid "Background directory"
-msgstr ""
-
-#: actions/designadminpanel.php:569 lib/designsettings.php:170
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Altere a sua senha"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
-#, fuzzy
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
msgid "Content"
-msgstr "Conectar"
+msgstr "Conteúdo"
-#: actions/designadminpanel.php:604 lib/designsettings.php:204
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Procurar"
-#: actions/designadminpanel.php:617 lib/designsettings.php:217
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
msgstr "Texto"
-#: actions/designadminpanel.php:630 lib/designsettings.php:230
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Lista"
-#: actions/designadminpanel.php:658 lib/designsettings.php:247
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
-msgstr ""
+msgstr "Usar o padrão."
-#: actions/designadminpanel.php:659 lib/designsettings.php:248
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:665 lib/designsettings.php:254
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 actions/useradminpanel.php:226
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: 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 "Salvar"
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: actions/designadminpanel.php:582 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1052,7 +982,7 @@ msgid "Use this form to edit the group."
msgstr "Use esse 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 "descrição muito extensa (máximo 140 caracteres)."
@@ -1171,37 +1101,37 @@ msgstr "Eu quero publicar mensagens por e-mail."
msgid "Publish a MicroID for my email address."
msgstr "Publique um MicroID para meu endereço de e-mail."
-#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/emailsettings.php:302 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
msgstr "As preferências foram salvas."
-#: actions/emailsettings.php:319
+#: actions/emailsettings.php:320
msgid "No email address."
msgstr "Nenhum endereço de e-mail."
-#: actions/emailsettings.php:326
+#: actions/emailsettings.php:327
msgid "Cannot normalize that email address"
msgstr "Não foi possível normalizar este endereço de e-mail"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "Não é um endereço de e-mail válido"
-#: actions/emailsettings.php:333
+#: actions/emailsettings.php:334
msgid "That is already your email address."
msgstr "Esse já é seu endereço de e-mail."
-#: actions/emailsettings.php:336
+#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
msgstr "Esse endereço de e-mail já pertence à outro usuário."
-#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Não foi possível inserir o código de confirmação."
-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1210,48 +1140,48 @@ msgstr ""
"informou. Verifique a sua caixa de entrada (e de spam!) para o código e "
"instruções sobre como usá-lo."
-#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
msgstr "Nenhuma confirmação pendente para cancelar."
-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
msgstr "Isso é um endereço de IM errado."
-#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
msgstr "Confirmação cancelada."
-#: actions/emailsettings.php:412
+#: actions/emailsettings.php:413
msgid "That is not your email address."
msgstr "Esse não é seu endereço de email."
-#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
msgstr "O endereço foi removido."
-#: actions/emailsettings.php:445 actions/smssettings.php:518
+#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
msgstr "Nenhum endereço de e-mail para recebimentos."
-#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
msgid "Couldn't update user record."
msgstr "Não foi possível atualizar o registro do usuário."
-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
msgstr "O endereço de e-mail de recebimento foi removido."
-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555
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"
@@ -1352,7 +1282,6 @@ msgid "That user has blocked you from subscribing."
msgstr "Esse usuário bloqueou o seu pedido de assinatura."
#: actions/finishremotesubscribe.php:106
-#, fuzzy
msgid "You are not authorized."
msgstr "Não autorizado."
@@ -1408,7 +1337,7 @@ msgstr "Não foi especificado nenhum perfil."
#: actions/groupblock.php:91
msgid "Only an admin can block group members."
-msgstr ""
+msgstr "Apenas o administrador pode bloquear usuários do grupo."
#: actions/groupblock.php:95
#, fuzzy
@@ -1452,9 +1381,8 @@ msgid "No ID"
msgstr ""
#: actions/groupdesignsettings.php:68
-#, fuzzy
msgid "You must be logged in to edit a group."
-msgstr "Você deve estar logado para criar um grupo."
+msgstr "Você deve estar logado para editar um grupo."
#: actions/groupdesignsettings.php:141
#, fuzzy
@@ -1501,12 +1429,10 @@ msgid "Pick a square area of the image to be the logo."
msgstr "Selecione uma área quadrada da imagem para ser seu avatar"
#: actions/grouplogo.php:396
-#, fuzzy
msgid "Logo updated."
msgstr "O avatar foi atualizado."
#: actions/grouplogo.php:398
-#, fuzzy
msgid "Failed updating logo."
msgstr "Não foi possível atualizar o avatar."
@@ -1524,7 +1450,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
msgid "Admin"
msgstr "Admin"
@@ -1587,7 +1513,7 @@ msgid ""
msgstr ""
#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/subgroupnav.php:98
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1808,7 +1734,7 @@ msgstr "Mensagem pessoal"
msgid "Optionally add a personal message to the invitation."
msgstr "Você pode, opcionalmente, adicionar uma mensagem pessoal ao convite."
-#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
msgstr "Enviar"
@@ -1939,7 +1865,7 @@ msgstr "Nome de usuário e/ou senha incorreto(s)."
msgid "Error setting user. You are probably not authorized."
msgstr "Não autorizado."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:457
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Logar"
@@ -2057,7 +1983,7 @@ msgstr "Nova mensagem"
msgid "Direct message to %s sent"
msgstr "A mensagem direta para %s foi enviada"
-#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
msgid "Ajax Error"
msgstr "Erro no Ajax"
@@ -2065,7 +1991,7 @@ msgstr "Erro no Ajax"
msgid "New notice"
msgstr "Nova mensagem"
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
msgid "Notice posted"
msgstr "Mensagem publicada"
@@ -2101,12 +2027,12 @@ msgid ""
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
-#: actions/noticesearchrss.php:89
+#: actions/noticesearchrss.php:96
#, php-format
msgid "Updates with \"%s\""
msgstr ""
-#: actions/noticesearchrss.php:91
+#: actions/noticesearchrss.php:98
#, fuzzy, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
msgstr "Todas as atualizações correspondentes ao termo \"%s\""
@@ -2236,9 +2162,9 @@ msgstr "No mínimo 6 caracteres"
msgid "Confirm"
msgstr "Confirmar"
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "igual à senha acima"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Igual à senha acima"
#: actions/passwordsettings.php:117
msgid "Change"
@@ -2268,6 +2194,114 @@ msgstr "Não é possível salvar a nova senha."
msgid "Password saved."
msgstr "A senha foi salva."
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr ""
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr ""
+
+#: actions/pathsadminpanel.php:140
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Esta página não está disponível em um "
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+#, fuzzy
+msgid "Site"
+msgstr "Convidar"
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+#, fuzzy
+msgid "Site path"
+msgstr "Nova mensagem"
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr ""
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Avatars"
+msgstr "Avatar"
+
+#: actions/pathsadminpanel.php:252
+#, fuzzy
+msgid "Avatar server"
+msgstr "Configurações do avatar"
+
+#: actions/pathsadminpanel.php:256
+#, fuzzy
+msgid "Avatar path"
+msgstr "O avatar foi atualizado."
+
+#: actions/pathsadminpanel.php:260
+#, fuzzy
+msgid "Avatar directory"
+msgstr "O avatar foi atualizado."
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:297
+#, fuzzy
+msgid "Save paths"
+msgstr "Nova mensagem"
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -2374,7 +2408,7 @@ msgstr ""
"Suas etiquetas (letras, números, -, ., e _), separadas por vírgulas ou "
"espaços"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr "Idioma"
@@ -2603,10 +2637,6 @@ msgstr "Ação desconhecida"
msgid "6 or more characters, and don't forget it!"
msgstr "No mínimo 6 caracteres. E não se esqueça dela!"
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Igual à senha acima"
-
#: actions/recoverpassword.php:243
msgid "Reset"
msgstr "Restaurar"
@@ -2671,7 +2701,7 @@ msgstr "Erro com o código de confirmação."
msgid "Registration successful"
msgstr "Registro realizado com sucesso"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrar"
@@ -2716,7 +2746,7 @@ msgid "Same as password above. Required."
msgstr "Igual à senha acima. Obrigatório."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-mail"
@@ -2824,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"
@@ -3170,11 +3200,6 @@ msgstr "Você não pode enviar uma mensagem para esse usuário."
msgid "User is already silenced."
msgstr "O usuário bloqueou você."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
-#, fuzzy
-msgid "Site"
-msgstr "Convidar"
-
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
msgstr ""
@@ -3206,103 +3231,99 @@ msgid "Snapshot frequency must be a number."
msgstr ""
#: actions/siteadminpanel.php:199
-msgid "You must set an SSL sever when enabling SSL."
+msgid "You must set an SSL server when enabling SSL."
msgstr ""
#: actions/siteadminpanel.php:204
-msgid "Invalid SSL server. Max length is 255 characters."
+msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
#: actions/siteadminpanel.php:210
-msgid "Minimum text limit is 140c."
+msgid "Minimum text limit is 140 characters."
msgstr ""
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:224
-#, php-format
-msgid "Locales directory not readable: %s"
+#: actions/siteadminpanel.php:266
+msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:275
+#: actions/siteadminpanel.php:269
#, fuzzy
msgid "Site name"
msgstr "Nova mensagem"
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:279
+#: actions/siteadminpanel.php:274
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:280
+#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:283
+#: actions/siteadminpanel.php:279
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:284
#, fuzzy
-msgid "contact email address for your site"
+msgid "Contact email address for your site"
msgstr "Novo endereço de e-mail para postar para %s"
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:290
+#, fuzzy
+msgid "Local"
+msgstr "Localização"
+
+#: actions/siteadminpanel.php:301
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:303
+#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:308
#, fuzzy
msgid "Default site language"
msgstr "Idioma preferencial"
#: actions/siteadminpanel.php:316
-msgid "Path to locales"
-msgstr ""
-
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
+msgid "URLs"
msgstr ""
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
#, fuzzy
msgid "Server"
msgstr "Recuperar"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
msgstr ""
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-#, fuzzy
-msgid "Site path"
-msgstr "Nova mensagem"
-
-#: actions/siteadminpanel.php:328
+#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
msgstr ""
-#: actions/siteadminpanel.php:330
+#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
+#: actions/siteadminpanel.php:331
+#, fuzzy
+msgid "Access"
+msgstr "Aceitar"
+
#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
@@ -3321,7 +3342,7 @@ msgstr "Convidar"
msgid "Make registration invitation only."
msgstr ""
-#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#: actions/siteadminpanel.php:346
#, fuzzy
msgid "Closed"
msgstr "Bloquear"
@@ -3330,33 +3351,37 @@ msgstr "Bloquear"
msgid "Disable new registrations."
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
#, fuzzy
msgid "Never"
msgstr "Recuperar"
-#: actions/siteadminpanel.php:357
+#: actions/siteadminpanel.php:360
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:358
+#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:364
+#: actions/siteadminpanel.php:366
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:365
-msgid "Snapshots will be sent once every N Web hits"
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
msgstr ""
#: actions/siteadminpanel.php:372
@@ -3367,48 +3392,57 @@ msgstr ""
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:381
+#: actions/siteadminpanel.php:380
+#, fuzzy
+msgid "SSL"
+msgstr "SMS"
+
+#: actions/siteadminpanel.php:384
#, fuzzy
msgid "Sometimes"
msgstr "Mensagens"
-#: actions/siteadminpanel.php:382
+#: actions/siteadminpanel.php:385
msgid "Always"
msgstr ""
-#: actions/siteadminpanel.php:384
+#: actions/siteadminpanel.php:387
msgid "Use SSL"
msgstr ""
-#: actions/siteadminpanel.php:385
+#: actions/siteadminpanel.php:388
msgid "When to use SSL"
msgstr ""
-#: actions/siteadminpanel.php:391
+#: actions/siteadminpanel.php:393
msgid "SSL Server"
msgstr ""
-#: actions/siteadminpanel.php:392
+#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr ""
+
+#: actions/siteadminpanel.php:403
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
#, fuzzy
msgid "Save site settings"
msgstr "Configurações do avatar"
@@ -3721,7 +3755,8 @@ msgstr "Cancelado"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
-#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
msgid "User"
msgstr "Usuário"
@@ -3729,17 +3764,87 @@ msgstr "Usuário"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr ""
+
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:178
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr ""
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Perfil"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr ""
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
+msgstr ""
+
+#: actions/useradminpanel.php:231
#, fuzzy
-msgid "Invite-only"
-msgstr "Convidar"
+msgid "New users"
+msgstr "Convidar novos usuários"
+
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr ""
+
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr ""
+
+#: actions/useradminpanel.php:241
+#, fuzzy
+msgid "Default subscription"
+msgstr "Todas as assinaturas"
+
+#: actions/useradminpanel.php:242
+#, fuzzy
+msgid "Automatically subscribe new users to this user."
+msgstr "Assinar automaticamente à quem me assinar"
+
+#: actions/useradminpanel.php:251
+#, fuzzy
+msgid "Invitations"
+msgstr "Convite(s) enviado(s)"
+
+#: actions/useradminpanel.php:256
+#, fuzzy
+msgid "Invitations enabled"
+msgstr "Convite(s) enviado(s)"
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr ""
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr ""
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/userauthorization.php:105
@@ -3955,15 +4060,14 @@ 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"
#: classes/User_group.php:380
-#, fuzzy
msgid "Could not create group."
-msgstr "Não foi possível criar a favorita."
+msgstr "Não foi possível criar o grupo."
#: classes/User_group.php:409
#, fuzzy
@@ -3975,10 +4079,6 @@ msgstr "Não foi possível salvar a assinatura."
msgid "Welcome to %1$s, @%2$s!"
msgstr "Mensagem para %1$s no %2$s"
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr "Perfil"
-
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Alterar as suas configurações de perfil"
@@ -4017,134 +4117,134 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr "Página sem título"
-#: lib/action.php:424
+#: lib/action.php:425
msgid "Primary site navigation"
msgstr "Navegação primária no site"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Home"
msgstr "Início"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Personal profile and friends timeline"
msgstr "Perfil pessoal e mensagens dos amigos"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Account"
msgstr "Conta"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Change your email, avatar, password, profile"
msgstr "Alterar email, avatar, senha, perfil"
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect"
msgstr "Conectar"
-#: lib/action.php:435
+#: lib/action.php:436
#, fuzzy
msgid "Connect to services"
msgstr "Não foi possível redirecionar para o servidor: %s"
-#: lib/action.php:439
+#: lib/action.php:440
#, fuzzy
msgid "Change site configuration"
msgstr "Navegação primária no site"
-#: lib/action.php:443 lib/subgroupnav.php:105
+#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Convidar"
-#: lib/action.php:444 lib/subgroupnav.php:106
+#: lib/action.php:445 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Convide seus amigos e colegas para unir-se a você no %s"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout"
msgstr "Sair"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout from the site"
msgstr "Sair deste site"
-#: lib/action.php:454
+#: lib/action.php:455
msgid "Create an account"
msgstr "Criar uma nova conta"
-#: lib/action.php:457
+#: lib/action.php:458
msgid "Login to the site"
msgstr "Entrar"
-#: lib/action.php:460 lib/action.php:723
+#: lib/action.php:461 lib/action.php:724
msgid "Help"
msgstr "Ajuda"
-#: lib/action.php:460
+#: lib/action.php:461
msgid "Help me!"
msgstr "Ajuda"
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
msgstr "Procurar"
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
msgstr "Pesquisar por pessoa ou texto"
-#: lib/action.php:484
+#: lib/action.php:485
#, fuzzy
msgid "Site notice"
msgstr "Nova mensagem"
-#: lib/action.php:550
+#: lib/action.php:551
msgid "Local views"
msgstr ""
-#: lib/action.php:616
+#: lib/action.php:617
#, fuzzy
msgid "Page notice"
msgstr "Nova mensagem"
-#: lib/action.php:718
+#: lib/action.php:719
#, fuzzy
msgid "Secondary site navigation"
msgstr "Navegação pelas assinaturas"
-#: lib/action.php:725
+#: lib/action.php:726
msgid "About"
msgstr "Sobre"
-#: lib/action.php:727
+#: lib/action.php:728
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:731
+#: lib/action.php:732
msgid "TOS"
msgstr ""
-#: lib/action.php:734
+#: lib/action.php:735
msgid "Privacy"
msgstr "Privacidade"
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
msgstr "Fonte"
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Contact"
msgstr "Contato"
-#: lib/action.php:740
+#: lib/action.php:741
#, fuzzy
msgid "Badge"
msgstr "Chamar a atenção"
-#: lib/action.php:768
+#: lib/action.php:769
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:771
+#: lib/action.php:772
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4153,12 +4253,12 @@ msgstr ""
"**%%site.name%%** é um serviço de microblogagem disponibilizado por [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:773
+#: lib/action.php:774
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** é um serviço de microblogagem. "
-#: lib/action.php:775
+#: lib/action.php:776
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4169,33 +4269,33 @@ msgstr ""
"net/), versão %s, disponível sob a [GNU Affero General Public License] "
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:789
+#: lib/action.php:790
#, fuzzy
msgid "Site content license"
msgstr "Procure no conteúdo das mensagens"
-#: lib/action.php:798
+#: lib/action.php:799
#, fuzzy
msgid "All "
msgstr "Todas"
-#: lib/action.php:803
+#: lib/action.php:804
msgid "license."
msgstr "licença"
-#: lib/action.php:1067
+#: lib/action.php:1068
msgid "Pagination"
msgstr "Paginação"
-#: lib/action.php:1076
+#: lib/action.php:1077
msgid "After"
msgstr "Próximo"
-#: lib/action.php:1084
+#: lib/action.php:1085
msgid "Before"
msgstr "Anterior"
-#: lib/action.php:1132
+#: lib/action.php:1133
msgid "There was a problem with your session token."
msgstr ""
"Ocorreu um problema com o seu token de sessão. Tente novamente, por favor."
@@ -4230,6 +4330,11 @@ msgstr "Confirmação do endereço de e-mail"
msgid "Design configuration"
msgstr "Confirmação de SMS"
+#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+#, fuzzy
+msgid "Paths configuration"
+msgstr "Confirmação de SMS"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4407,11 +4512,10 @@ msgid "You are not subscribed to anyone."
msgstr "Você não está assinando esse perfil."
#: lib/command.php:620
-#, fuzzy
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
-msgstr[0] "Você não está assinando esse perfil."
-msgstr[1] "Você não está assinando esse perfil."
+msgstr[0] "Você já está assinando esses usuários:"
+msgstr[1] "Você já está assinando esses usuários:"
#: lib/command.php:640
#, fuzzy
@@ -4419,7 +4523,6 @@ msgid "No one is subscribed to you."
msgstr "Não foi possível fazer com que o outros o sigam."
#: lib/command.php:642
-#, fuzzy
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."
@@ -4431,11 +4534,10 @@ msgid "You are not a member of any groups."
msgstr "Você não está assinando esse perfil."
#: lib/command.php:664
-#, fuzzy
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
-msgstr[0] "Você não está assinando esse perfil."
-msgstr[1] "Você não está assinando esse perfil."
+msgstr[0] "Você não é membro deste grupo."
+msgstr[1] "Você não é membro deste grupo."
#: lib/command.php:678
msgid ""
@@ -4516,9 +4618,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: "
@@ -4613,7 +4716,7 @@ msgstr "Onde você está, ex: \"cidade, estado (ou região), país\""
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
-#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85
msgid "Group"
msgstr "Grupo"
@@ -4659,7 +4762,7 @@ msgstr "Grupos com mais mensagens"
msgid "Tags in %s group's notices"
msgstr "Etiquetas nas mensagens do grupo %s"
-#: lib/htmloutputter.php:104
+#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
msgstr "Esta página não está disponível em um tipo de mídia que você aceita"
@@ -4692,6 +4795,14 @@ msgstr "Nosso arquivo foi perdido."
msgid "Unknown file type"
msgstr "Tipo de arquivo desconhecido"
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
@@ -4723,7 +4834,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:424
+#: lib/mailbox.php:227 lib/noticelist.php:452
#, fuzzy
msgid "from"
msgstr " de "
@@ -4981,37 +5092,63 @@ msgstr "Enviar uma mensagem direta"
msgid "To"
msgstr "Para"
-#: lib/messageform.php:162 lib/noticeform.php:173
+#: lib/messageform.php:162 lib/noticeform.php:186
msgid "Available characters"
msgstr "Caracteres disponíveis"
-#: lib/noticeform.php:145
+#: lib/noticeform.php:158
msgid "Send a notice"
msgstr "Enviar uma mensagem"
-#: lib/noticeform.php:158
+#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
msgstr "E aí, %s?"
-#: lib/noticeform.php:180
+#: lib/noticeform.php:193
msgid "Attach"
msgstr ""
-#: lib/noticeform.php:184
+#: lib/noticeform.php:197
msgid "Attach a file"
msgstr ""
-#: lib/noticelist.php:478
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "Não"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr ""
+
+#: lib/noticelist.php:506
#, fuzzy
msgid "in context"
msgstr "Nenhum conteúdo!"
-#: lib/noticelist.php:498
+#: lib/noticelist.php:526
msgid "Reply to this notice"
msgstr "Responder a esta mensagem"
-#: lib/noticelist.php:499
+#: lib/noticelist.php:527
msgid "Reply"
msgstr "Responder"
@@ -5044,12 +5181,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."
@@ -5160,6 +5297,10 @@ msgstr "Desbloquear este usuário"
msgid "Search site"
msgstr "Procurar"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
#, fuzzy
msgid "Search help"
@@ -5173,10 +5314,6 @@ msgstr "Pessoas"
msgid "Find people on this site"
msgstr "Procure por pessoas neste site"
-#: lib/searchgroupnav.php:82
-msgid "Notice"
-msgstr "Mensagem"
-
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
msgstr "Procure no conteúdo das mensagens"
@@ -5320,47 +5457,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"
@@ -5389,11 +5530,3 @@ msgstr "Desculpe-me, mas este não é seu endereço de e-mail para recebimento."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Desculpe-me, mas não é permitido o recebimento de emails."
-
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "Desbloquear este usuário"
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "Assinantes de %s"
diff --git a/locale/ru/LC_MESSAGES/statusnet.mo b/locale/ru/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 978cb29f4..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 ce0aae056..b95b572cb 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -9,16 +9,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 10:43+0000\n"
-"PO-Revision-Date: 2009-11-18 19:32:36+0000\n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-11-28 19:50:53+0000\n"
"Language-Team: Russian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10< =4 && (n%100<10 or n%100>=20) ? 1 : 2);\n"
-"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ru\n"
"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10< =4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
@@ -80,7 +81,7 @@ msgstr "Лента друзей %s (Atom)"
#, 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,9 @@ msgid ""
"You can try to [nudge %s](../%s) from his profile or [post something to his "
"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
msgstr ""
+"Вы можете попробовать [«подтолкнуть» %s](../%s) из профиля или [написать что-"
+"нибудь для привлечения его или её внимания](%%%%action.newnotice%%%%?"
+"status_textarea=%s)."
#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
#, php-format
@@ -102,11 +108,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
@@ -138,10 +145,9 @@ msgstr "Этот метод требует POST."
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none"
-msgstr ""
+msgstr "Укажите параметр с именем 'device' и значением sms, im или none."
#: actions/apiaccountupdatedeliverydevice.php:132
-#, fuzzy
msgid "Could not update user."
msgstr "Не удаётся обновить пользователя."
@@ -155,20 +161,20 @@ msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
"current configuration."
msgstr ""
+"Сервер не смог обработать столько POST-данных (%s байт) из-за текущей "
+"конфигурации."
#: actions/apiaccountupdateprofilebackgroundimage.php:136
#: actions/apiaccountupdateprofilebackgroundimage.php:146
#: actions/apiaccountupdateprofilecolors.php:164
#: actions/apiaccountupdateprofilecolors.php:174
-#, 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
@@ -180,7 +186,6 @@ msgid "User has no profile."
msgstr "У пользователя нет профиля."
#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
msgid "Could not save profile."
msgstr "Не удаётся сохранить профиль."
@@ -197,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."
@@ -212,9 +217,9 @@ 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 +259,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."
@@ -290,7 +293,7 @@ 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."
@@ -350,31 +353,30 @@ msgstr "Слишком длинное месторасположение (мак
#: 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
msgid "You are already a member of that group."
@@ -382,22 +384,21 @@ 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
@@ -405,19 +406,19 @@ msgid "%s groups"
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"
#: 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."
@@ -445,10 +446,10 @@ msgstr "Слишком длинная запись. Максимальная д
msgid "Not found"
msgstr "Не найдено"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
-msgstr ""
+msgstr "Максимальная длина записи — %d символов, включая URL вложения."
#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
msgid "Unsupported format."
@@ -468,7 +469,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
@@ -489,12 +490,12 @@ msgstr ""
#: 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
@@ -502,18 +503,17 @@ msgid "Notices tagged with %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."
@@ -530,13 +530,13 @@ msgstr "Неверный размер."
#: actions/avatarsettings.php:67 actions/showgroup.php:221
#: lib/accountsettingsaction.php:112
msgid "Avatar"
-msgstr "Аватар"
+msgstr "Аватара"
#: actions/avatarsettings.php:78
#, php-format
msgid "You can upload your personal avatar. The maximum file size is %s."
msgstr ""
-"Вы можете загрузить свой аватар. Максимальный размер файла составляет %s."
+"Вы можете загрузить свою аватару. Максимальный размер файла составляет %s."
#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
@@ -547,7 +547,7 @@ msgstr "Пользователь без соответствующего про
#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
#: actions/grouplogo.php:251
msgid "Avatar settings"
-msgstr "Настройки аватара"
+msgstr "Настройки аватары"
#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
#: actions/grouplogo.php:199 actions/grouplogo.php:259
@@ -560,7 +560,7 @@ msgid "Preview"
msgstr "Просмотр"
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
+#: lib/noticelist.php:550
msgid "Delete"
msgstr "Удалить"
@@ -573,7 +573,7 @@ msgid "Crop"
msgstr "Обрезать"
#: actions/avatarsettings.php:265 actions/disfavor.php:74
-#: actions/emailsettings.php:237 actions/favor.php:75
+#: 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
@@ -588,7 +588,7 @@ msgid "There was a problem with your session token. Try again, please."
msgstr "Проблема с Вашей сессией. Попробуйте ещё раз, пожалуйста."
#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
-#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: 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."
@@ -596,7 +596,7 @@ 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."
@@ -604,15 +604,15 @@ msgstr "Потеряна информация о файле."
#: actions/avatarsettings.php:360
msgid "Avatar updated."
-msgstr "Аватар обновлён."
+msgstr "Аватара обновлена."
#: actions/avatarsettings.php:363
msgid "Failed updating avatar."
-msgstr "Неудача при обновлении аватара."
+msgstr "Неудача при обновлении аватары."
#: actions/avatarsettings.php:387
msgid "Avatar deleted."
-msgstr "Аватар удалён."
+msgstr "Аватара удалена."
#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
@@ -631,17 +631,16 @@ msgstr "Нет такой группы"
#: actions/blockedfromgroup.php:90
#, php-format
msgid "%s blocked profiles"
-msgstr "%s заблокированных профилей"
+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
msgid "Unblock user from group"
@@ -656,7 +655,6 @@ msgid "Unblock this user"
msgstr "Разблокировать пользователя."
#: actions/block.php:69
-#, fuzzy
msgid "You already blocked that user."
msgstr "Вы уже заблокировали этого пользователя."
@@ -670,6 +668,9 @@ msgid ""
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
+"Вы действительно хотите заблокировать этого пользователя? После этого он "
+"будет отписан от вас без возможности подписаться в будущем, а вам не будут "
+"приходить уведомления об @-ответах от него."
#: actions/block.php:143 actions/deletenotice.php:145
#: actions/deleteuser.php:147 actions/groupblock.php:178
@@ -694,9 +695,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."
@@ -719,15 +719,15 @@ msgstr "Нераспознанный тип адреса %s"
msgid "That address has already been confirmed."
msgstr "Этот адрес уже подтверждён."
-#: actions/confirmaddress.php:114 actions/emailsettings.php:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
#: actions/profilesettings.php:276 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Не удаётся обновить пользователя."
-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
msgstr "Не удаётся удалить подверждение по электронному адресу."
@@ -746,7 +746,7 @@ msgid "Conversation"
msgstr "Дискуссия"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206
+#: lib/profileaction.php:206 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Записи"
@@ -768,7 +768,6 @@ msgid "Can't delete this notice."
msgstr "Не удаётся удалить эту запись."
#: actions/deletenotice.php:103
-#, fuzzy
msgid ""
"You are about to permanently delete a notice. Once this is done, it cannot "
"be undone."
@@ -788,228 +787,155 @@ msgstr "Вы уверены, что хотите удалить эту запи
msgid "Do not delete this notice"
msgstr "Не удалять эту запись"
-#: actions/deletenotice.php:146 lib/noticelist.php:522
+#: actions/deletenotice.php:146 lib/noticelist.php:550
msgid "Delete this notice"
msgstr "Удалить эту запись"
#: actions/deletenotice.php:157
-#, fuzzy
msgid "There was a problem with your session token. Try again, please."
-msgstr "Проблема с Вашей сессией. Попробуйте ещё раз, пожалуйста."
+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:278
-#, fuzzy
+#: actions/designadminpanel.php:270
msgid "Invalid logo URL."
-msgstr "Неверный размер."
-
-#: actions/designadminpanel.php:282
-#, fuzzy, php-format
-msgid "Theme not available: %s"
-msgstr "Страница недоступна для того типа, который Вы задействовали."
-
-#: actions/designadminpanel.php:288
-#, fuzzy, php-format
-msgid "Theme directory not readable: %s"
-msgstr "Страница недоступна для того типа, который Вы задействовали."
+msgstr "Неверный URL логотипа."
-#: actions/designadminpanel.php:292
+#: actions/designadminpanel.php:274
#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:296
-#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:312
-#, php-format
-msgid "Max length for %s %s is 255 characters."
-msgstr ""
+msgid "Theme not available: %s"
+msgstr "Тема не доступна: %s"
-#: actions/designadminpanel.php:412
-#, fuzzy
+#: actions/designadminpanel.php:370
msgid "Change logo"
-msgstr "Изменение цветовой гаммы"
+msgstr "Изменить логотип"
-#: actions/designadminpanel.php:417
-#, fuzzy
+#: actions/designadminpanel.php:375
msgid "Site logo"
-msgstr "Пригласить"
+msgstr "Логотип сайта"
-#: actions/designadminpanel.php:424
-#, fuzzy
+#: actions/designadminpanel.php:382
msgid "Change theme"
-msgstr "Изменить"
+msgstr "Изменить тему"
-#: actions/designadminpanel.php:441
-#, fuzzy
+#: actions/designadminpanel.php:399
msgid "Site theme"
-msgstr "Новая запись"
+msgstr "Тема сайта"
-#: actions/designadminpanel.php:442
-#, fuzzy
+#: actions/designadminpanel.php:400
msgid "Theme for the site."
-msgstr "Выйти"
-
-#: actions/designadminpanel.php:447
-msgid "Theme server"
-msgstr ""
-
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
-
-#: actions/designadminpanel.php:455
-msgid "Theme directory"
-msgstr ""
-
-#: actions/designadminpanel.php:462
-#, fuzzy
-msgid "Avatar Settings"
-msgstr "Настройки аватара"
-
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Avatar server"
-msgstr "Настройки аватара"
-
-#: actions/designadminpanel.php:471
-#, fuzzy
-msgid "Avatar path"
-msgstr "Аватар обновлён."
-
-#: actions/designadminpanel.php:475
-#, fuzzy
-msgid "Avatar directory"
-msgstr "Аватар удалён."
+msgstr "Тема для сайта."
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
msgstr "Изменение фонового изображения"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
msgstr "Фон"
-#: actions/designadminpanel.php:496
-#, fuzzy, php-format
+#: actions/designadminpanel.php:422
+#, 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:526 lib/designsettings.php:139
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
-msgstr ""
+msgstr "Включить"
-#: actions/designadminpanel.php:542 lib/designsettings.php:155
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
-msgstr ""
+msgstr "Отключить"
-#: actions/designadminpanel.php:543 lib/designsettings.php:156
+#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
-msgstr ""
+msgstr "Включить или отключить показ фонового изображения."
-#: actions/designadminpanel.php:548 lib/designsettings.php:161
+#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
-msgstr ""
+msgstr "Растянуть фоновое изображение"
-#: actions/designadminpanel.php:554
-#, fuzzy
-msgid "Background server"
-msgstr "Фон"
-
-#: actions/designadminpanel.php:558
-#, fuzzy
-msgid "Background path"
-msgstr "Фон"
-
-#: actions/designadminpanel.php:562
-#, fuzzy
-msgid "Background directory"
-msgstr "Фон"
-
-#: actions/designadminpanel.php:569 lib/designsettings.php:170
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
msgid "Change colours"
msgstr "Изменение цветовой гаммы"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
msgid "Content"
msgstr "Содержание"
-#: actions/designadminpanel.php:604 lib/designsettings.php:204
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Боковая панель"
-#: actions/designadminpanel.php:617 lib/designsettings.php:217
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
msgstr "Текст"
-#: actions/designadminpanel.php:630 lib/designsettings.php:230
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
msgid "Links"
msgstr "Ссылки"
-#: actions/designadminpanel.php:658 lib/designsettings.php:247
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Использовать значения по умолчанию"
-#: actions/designadminpanel.php:659 lib/designsettings.php:248
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
-msgstr ""
+msgstr "Восстановить оформление по умолчанию"
-#: actions/designadminpanel.php:665 lib/designsettings.php:254
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
-msgstr ""
+msgstr "Восстановить значения по умолчанию"
-#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 actions/useradminpanel.php:226
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/pathsadminpanel.php:296 actions/profilesettings.php:167
+#: actions/siteadminpanel.php:421 actions/smssettings.php:181
+#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/useradminpanel.php:313 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Сохранить"
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: actions/designadminpanel.php:582 lib/designsettings.php:257
msgid "Save design"
-msgstr ""
+msgstr "Сохранить оформление"
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
@@ -1051,9 +977,8 @@ 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."
@@ -1066,7 +991,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
@@ -1148,11 +1073,10 @@ msgstr ""
"приватное сообщение."
#: actions/emailsettings.php:174
-#, fuzzy
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr ""
-"Посылать мне сообщение по электронной почте, если кто-нибудь пошлёт мне "
-"приватное сообщение."
+"Посылать мне сообщение по электронной почте, если кто-нибудь пошлёт мне «@-"
+"ответ»."
#: actions/emailsettings.php:179
msgid "Allow friends to nudge me and send me an email."
@@ -1167,37 +1091,37 @@ msgstr "Я хочу отправлять записи по электронно
msgid "Publish a MicroID for my email address."
msgstr "Опубликовать MicroID для моего электронного адреса."
-#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/emailsettings.php:302 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
msgstr "Предпочтения сохранены."
-#: actions/emailsettings.php:319
+#: actions/emailsettings.php:320
msgid "No email address."
msgstr "Нет электронного адреса."
-#: actions/emailsettings.php:326
+#: actions/emailsettings.php:327
msgid "Cannot normalize that email address"
msgstr "Не удаётся стандартизировать этот электронный адрес"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "Неверный электронный адрес"
-#: actions/emailsettings.php:333
+#: actions/emailsettings.php:334
msgid "That is already your email address."
msgstr "Это уже Ваш электронный адрес."
-#: actions/emailsettings.php:336
+#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
msgstr "Этот электронный адрес уже задействован другим пользователем."
-#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Не удаётся вставить код подтверждения."
-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1206,47 +1130,47 @@ msgstr ""
"папку входящей почты (а также папку спама!), чтобы найти этот кода и "
"инструкции по его использованию."
-#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
msgstr "Нет подтверждения отказа."
-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
msgstr "Это неверный IM-адрес."
-#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
msgstr "Подтверждение отменено."
-#: actions/emailsettings.php:412
+#: actions/emailsettings.php:413
msgid "That is not your email address."
msgstr "Это не Ваш электронный адрес."
-#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
msgstr "Адрес удалён."
-#: actions/emailsettings.php:445 actions/smssettings.php:518
+#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
msgstr "Нет входящего электронного адреса."
-#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
msgid "Couldn't update user record."
msgstr "Не удаётся обновить пользовательскую запись."
-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
msgstr "Входящий электронный адрес удалён."
-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555
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 "Популярные записи"
@@ -1258,17 +1182,21 @@ 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."
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
@@ -1276,6 +1204,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
@@ -1284,9 +1214,9 @@ 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!"
@@ -1312,31 +1242,28 @@ msgid "A selection of some of the great users on %s"
msgstr "Список наиболее активных, знаменитых и уважаемых пользователей на %s"
#: actions/file.php:34
-#, fuzzy
msgid "No notice id"
-msgstr "Новая запись"
+msgstr "ID записи отсутствует"
#: actions/file.php:38
-#, fuzzy
msgid "No notice"
-msgstr "Новая запись"
+msgstr "Запись отсутствует"
#: actions/file.php:42
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!"
@@ -1351,9 +1278,8 @@ msgid "You are not authorized."
msgstr "Вы не авторизованы."
#: actions/finishremotesubscribe.php:109
-#, fuzzy
msgid "Could not convert request token to access token."
-msgstr "Не удаётся преобразовать запросы в доступы."
+msgstr "Не удаётся преобразовать ключ запроса в ключ доступа."
#: actions/finishremotesubscribe.php:114
msgid "Remote service uses unknown version of OMB protocol."
@@ -1374,9 +1300,8 @@ msgid "No such file."
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
@@ -1397,22 +1322,19 @@ 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
@@ -1421,73 +1343,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."
@@ -1511,7 +1432,7 @@ msgstr "Участники группы %s, страница %d"
msgid "A list of the users in this group."
msgstr "Список пользователей, являющихся членами этой группы."
-#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
msgid "Admin"
msgstr "Настройки"
@@ -1520,31 +1441,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 буквы."
#: actions/groupsearch.php:58
@@ -1553,7 +1472,6 @@ msgstr "Поиск группы"
#: actions/groupsearch.php:79 actions/noticesearch.php:117
#: actions/peoplesearch.php:83
-#, fuzzy
msgid "No results."
msgstr "Нет результатов."
@@ -1570,9 +1488,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/subgroupnav.php:98
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Группы"
@@ -1597,12 +1517,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."
@@ -1622,9 +1541,8 @@ msgstr ""
"(%%doc.im%%). Настройте ваш аккаунт и предпочтения ниже."
#: actions/imsettings.php:89
-#, fuzzy
msgid "IM is not available."
-msgstr "Страница недоступна для того типа, который Вы задействовали."
+msgstr "IM не доступен."
#: actions/imsettings.php:106
msgid "Current confirmed Jabber/GTalk address."
@@ -1721,7 +1639,7 @@ msgstr ""
#: actions/invite.php:39
msgid "Invites have been disabled."
-msgstr ""
+msgstr "Приглашения отключены."
#: actions/invite.php:41
#, php-format
@@ -1750,7 +1668,7 @@ msgstr "Вы уже подписаны на пользователя:"
#: actions/invite.php:131 actions/invite.php:139
#, php-format
msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
#: actions/invite.php:136
msgid ""
@@ -1792,7 +1710,7 @@ msgstr "Личное сообщение"
msgid "Optionally add a personal message to the invitation."
msgstr "Можно добавить к приглашению личное сообщение."
-#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
msgstr "ОК"
@@ -1869,7 +1787,7 @@ msgstr "Вы уже являетесь членом этой группы"
#: actions/joingroup.php:128 lib/command.php:234
#, php-format
msgid "Could not join user %s to group %s"
-msgstr "Не удаётся присоеденить пользователя %s к группе %s"
+msgstr "Не удаётся присоединить пользователя %s к группе %s"
#: actions/joingroup.php:135 lib/command.php:239
#, php-format
@@ -1900,23 +1818,21 @@ 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
msgid "Invalid or expired token."
-msgstr "Неверный контент записи"
+msgstr "Неверный или устаревший ключ."
#: actions/login.php:143
msgid "Incorrect username or password."
msgstr "Некорректное имя или пароль."
#: actions/login.php:149
-#, fuzzy
msgid "Error setting user. You are probably not authorized."
-msgstr "Вы не авторизованы."
+msgstr "Ошибка установки пользователя. Вы, вероятно, не авторизованы."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:457
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Вход"
@@ -1957,33 +1873,33 @@ msgstr ""
"изменять Ваши установки."
#: actions/login.php:286
-#, fuzzy, php-format
+#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
"(%%action.register%%) a new account."
msgstr ""
-"Вход с вашим ником и паролем. Нет аккаунта? [Зарегистрируйте](%%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"
@@ -2028,7 +1944,7 @@ msgstr "Сообщение отправлено"
msgid "Direct message to %s sent"
msgstr "Прямое сообщение для %s послано"
-#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
msgid "Ajax Error"
msgstr "Ошибка AJAX"
@@ -2036,7 +1952,7 @@ msgstr "Ошибка AJAX"
msgid "New notice"
msgstr "Новая запись"
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
msgid "Notice posted"
msgstr "Запись опубликована"
@@ -2056,7 +1972,7 @@ msgstr "Поиск текста"
#: actions/noticesearch.php:91
#, php-format
msgid "Search results for \"%s\" on %s"
-msgstr ""
+msgstr "Результаты поиска для «%s» на %s"
#: actions/noticesearch.php:121
#, php-format
@@ -2064,6 +1980,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
@@ -2072,12 +1990,12 @@ msgid ""
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
-#: actions/noticesearchrss.php:89
-#, fuzzy, php-format
+#: actions/noticesearchrss.php:96
+#, php-format
msgid "Updates with \"%s\""
-msgstr "Обновлено от %1$s на %2$s!"
+msgstr "Обновления с «$s»"
-#: actions/noticesearchrss.php:91
+#: actions/noticesearchrss.php:98
#, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
msgstr "Все обновления, соответствующие поисковому запросу «%s»"
@@ -2091,11 +2009,11 @@ msgstr ""
#: actions/nudge.php:94
msgid "Nudge sent"
-msgstr "\"Подталкивание\" послано"
+msgstr "«Подталкивание» послано"
#: actions/nudge.php:97
msgid "Nudge sent!"
-msgstr "\"Подталкивание\" отправлено!"
+msgstr "«Подталкивание» отправлено!"
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
@@ -2104,16 +2022,15 @@ msgstr "Запись без профиля"
#: actions/oembed.php:86 actions/shownotice.php:180
#, php-format
msgid "%1$s's status on %2$s"
-msgstr ""
+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
@@ -2138,11 +2055,11 @@ 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."
@@ -2154,7 +2071,7 @@ 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)."
@@ -2182,7 +2099,7 @@ msgstr "Изменение пароля"
#: actions/passwordsettings.php:69
msgid "Change your password."
-msgstr "Изменить ваш пароль"
+msgstr "Измените ваш пароль."
#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
msgid "Password change"
@@ -2205,9 +2122,9 @@ msgstr "6 или больше знаков"
msgid "Confirm"
msgstr "Подтверждение"
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "тот же пароль, что и выше"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Тот же пароль, что и выше"
#: actions/passwordsettings.php:117
msgid "Change"
@@ -2237,6 +2154,107 @@ msgstr "Не удаётся сохранить новый пароль."
msgid "Password saved."
msgstr "Пароль сохранён."
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr "Пути"
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr "Настройки путей и серверов для этого сайта StatusNet."
+
+#: actions/pathsadminpanel.php:140
+#, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Директория тем недоступна для чтения: %s"
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr "Директория аватар не доступна для записи: %s"
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr "Директория фоновых изображений не доступна для записи: %s"
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr "Директория локализаций не доступна для чтения: %s"
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+msgid "Site"
+msgstr "Сайт"
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr "Путь"
+
+#: actions/pathsadminpanel.php:216
+msgid "Site path"
+msgstr "Путь к сайту"
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr "Пусть к локализациям"
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr "Путь к директории локализаций"
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr "Тема"
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr "Сервер темы"
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr "Путь темы"
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr "Директория темы"
+
+#: actions/pathsadminpanel.php:247
+msgid "Avatars"
+msgstr "Аватары"
+
+#: actions/pathsadminpanel.php:252
+msgid "Avatar server"
+msgstr "Сервер аватар"
+
+#: actions/pathsadminpanel.php:256
+msgid "Avatar path"
+msgstr "Путь к аватарам"
+
+#: actions/pathsadminpanel.php:260
+msgid "Avatar directory"
+msgstr "Директория аватар"
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr "Фоновые изображения"
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr "Сервер фонового изображения"
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr "Путь к фоновому изображению"
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr "Директория фонового изображения"
+
+#: actions/pathsadminpanel.php:297
+msgid "Save paths"
+msgstr "Сохранить пути"
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -2267,7 +2285,7 @@ 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,7 +2358,7 @@ msgstr ""
"Теги для самого себя (буквы, цифры, -, ., и _), разделенные запятой или "
"пробелом"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr "Язык"
@@ -2398,7 +2416,7 @@ msgstr "Настройки сохранены."
#: actions/public.php:83
#, php-format
msgid "Beyond the page limit (%s)"
-msgstr ""
+msgstr "Превышен предел страницы (%s)"
#: actions/public.php:92
msgid "Could not retrieve public stream."
@@ -2430,17 +2448,19 @@ msgstr "Лента публичного потока (Atom)"
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
-msgstr ""
+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
@@ -2474,16 +2494,16 @@ 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 "Пока никто на оставлял записей с [тегами](%%doc.tags%%)."
#: actions/publictagcloud.php:72
msgid "Be the first to post one!"
-msgstr ""
+msgstr "Станьте первым отправителем!"
#: actions/publictagcloud.php:75
#, php-format
@@ -2491,6 +2511,8 @@ 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"
@@ -2529,18 +2551,20 @@ msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
msgstr ""
+"Если вы забыли или потеряли свой пароль, вы можете запросить новый пароль на "
+"email-адрес вашей учётной записи."
#: 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 "Имя или email-адрес"
#: actions/recoverpassword.php:193
msgid "Your nickname on this server, or your registered email address."
@@ -2570,10 +2594,6 @@ msgstr "Неизвестное действие"
msgid "6 or more characters, and don't forget it!"
msgstr "6 или более символов, и не забывайте его!"
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Тот же пароль, что и выше"
-
#: actions/recoverpassword.php:243
msgid "Reset"
msgstr "Сбросить"
@@ -2627,15 +2647,14 @@ msgid "Sorry, only invited people can register."
msgstr "Простите, регистрация только по приглашению."
#: actions/register.php:92
-#, fuzzy
msgid "Sorry, invalid invitation code."
-msgstr "Ошибка, связанная с кодом подтверждения."
+msgstr "Извините, неверный пригласительный код."
#: actions/register.php:112
msgid "Registration successful"
msgstr "Регистрация успешна!"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Регистрация"
@@ -2683,10 +2702,10 @@ msgstr "6 или более символов. Обязательное поле.
#: actions/register.php:433
msgid "Same as password above. Required."
-msgstr "Тот же пароль что и сверху. Обязательно."
+msgstr "Тот же пароль что и сверху. Обязательное поле."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Email"
@@ -2704,15 +2723,14 @@ msgstr "Мои тексты и файлы находятся под лиценз
#: actions/register.php:495
msgid "Creative Commons Attribution 3.0"
-msgstr ""
+msgstr "Creative Commons Attribution 3.0"
#: actions/register.php:496
-#, fuzzy
msgid ""
" except this private data: password, email address, IM address, and phone "
"number."
msgstr ""
-", за исключением моей приватной информации: пароля, почты, мессенджера, "
+", за исключением моей личной информации: пароля, почты, мессенджера и номера "
"телефона."
#: actions/register.php:537
@@ -2772,9 +2790,8 @@ msgid "Remote subscribe"
msgstr "Подписаться на пользователя"
#: actions/remotesubscribe.php:124
-#, fuzzy
msgid "Subscribe to a remote user"
-msgstr "Подписаться на %s"
+msgstr "Подписаться на удалённого пользователя"
#: actions/remotesubscribe.php:129
msgid "User nickname"
@@ -2793,7 +2810,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 "Подписаться"
@@ -2802,20 +2819,19 @@ msgid "Invalid profile URL (bad format)"
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-документ)."
+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 "Не удаётся получить запрос."
+msgstr "Не удаётся получить получить ключ запроса."
#: actions/replies.php:125 actions/repliesrss.php:68
#: lib/personalgroupnav.php:105
@@ -2848,7 +2864,7 @@ msgstr "Лента записей для %s (Atom)"
msgid ""
"This is the timeline showing replies to %s but %s hasn't received a notice "
"to his attention yet."
-msgstr ""
+msgstr "Эта лента содержит ответы на записи %s, однако %s пока не получал их."
#: actions/replies.php:203
#, php-format
@@ -2856,6 +2872,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
@@ -2863,24 +2881,26 @@ 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"
@@ -2908,6 +2928,8 @@ 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
@@ -2915,6 +2937,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
@@ -2926,7 +2950,7 @@ msgstr ""
#: actions/showfavorites.php:242
msgid "This is a way to share what you like."
-msgstr ""
+msgstr "Это способ разделить то, что вам нравится."
#: actions/showgroup.php:82 lib/groupnav.php:86
#, php-format
@@ -2954,7 +2978,7 @@ msgstr "Запись"
#: actions/showgroup.php:284 lib/groupeditform.php:184
msgid "Aliases"
-msgstr ""
+msgstr "Алиасы"
#: actions/showgroup.php:293
msgid "Group actions"
@@ -2976,9 +3000,9 @@ msgid "Notice feed for %s group (Atom)"
msgstr "Лента записей группы %s (Atom)"
#: actions/showgroup.php:345
-#, fuzzy, php-format
+#, 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"
@@ -2999,9 +3023,8 @@ msgid "Statistics"
msgstr "Статистика"
#: actions/showgroup.php:432
-#, fuzzy
msgid "Created"
-msgstr "Создать"
+msgstr "Создано"
#: actions/showgroup.php:448
#, php-format
@@ -3012,12 +3035,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** - это группа на сайте %%%%site.name%%%%, предоставляющем сервис "
-"[микроблогинга](http://ru.wikipedia.org/wiki/Микроблоггинг), созданный с "
-"использованием свободного программного обеспечения [StatusNet](http://status."
-"net/). Участники обмениваются короткими сообщениями о своих новостях. "
-"[Зарегистрируйся](%%%%action.register%%%%), чтобы стать участником группы и "
-"получить множество других возможностей! ([Читать далее](%%%%doc.help%%%%))"
+"**%s** — группа на %%%%site.name%%%%, сервисе [микроблоггинга](http://ru."
+"wikipedia.org/wiki/Микроблоггинг), основанном на свободном программном "
+"обеспечении [StatusNet](http://status.net/). Участники обмениваются "
+"короткими сообщениями о своей жизни и интересах. [Зарегистрируйтесь](%%%%"
+"action.register%%%%), чтобы стать участником группы и получить множество "
+"других возможностей! ([Читать далее](%%%%doc.help%%%%))"
#: actions/showgroup.php:454
#, php-format
@@ -3027,10 +3050,10 @@ msgid ""
"[StatusNet](http://status.net/) tool. Its members share short messages about "
"their life and interests. "
msgstr ""
-"**%s** - это группа на сайте %%%%site.name%%%%, предоставляющем сервис "
-"[микроблогинга](http://ru.wikipedia.org/wiki/Микроблоггинг) , созданный с "
-"использованием свободного программного обеспечения [StatusNet](http://status."
-"net/). Участники обмениваются короткими сообщениями о своих новостях. "
+"**%s** — группа на %%%%site.name%%%%, сервисе [микроблоггинга](http://ru."
+"wikipedia.org/wiki/Микроблоггинг), основанном на свободном программном "
+"обеспечении [StatusNet](http://status.net/). Участники обмениваются "
+"короткими сообщениями о своей жизни и интересах. "
#: actions/showgroup.php:482
msgid "Admins"
@@ -3055,19 +3078,18 @@ 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
msgid "%s, page %d"
-msgstr "Входящие для %s - страница %d"
+msgstr "%s, страница %d"
#: actions/showstream.php:122
#, php-format
@@ -3090,20 +3112,22 @@ msgid "Notice feed for %s (Atom)"
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
@@ -3111,6 +3135,9 @@ 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
@@ -3140,257 +3167,249 @@ msgstr ""
"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 "Пользователь заблокировал Вас."
-
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
-#, fuzzy
-msgid "Site"
-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 "У вас должен быть действительный контактный email-адрес"
#: 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 sever when enabling SSL."
-msgstr ""
+msgid "You must set an SSL server when enabling SSL."
+msgstr "Вы должны указать SSL-сервер при включении SSL."
#: actions/siteadminpanel.php:204
-msgid "Invalid SSL server. Max length is 255 characters."
-msgstr ""
+msgid "Invalid SSL server. The maximum length is 255 characters."
+msgstr "Неверный SSL-сервер. Максимальная длина составляет 255 символов."
#: actions/siteadminpanel.php:210
-msgid "Minimum text limit is 140c."
-msgstr ""
+msgid "Minimum text limit is 140 characters."
+msgstr "Минимальное ограничение текста составляет 140 символов."
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
-msgstr ""
+msgstr "Ограничение дублирования должно составлять 1 или более секунд."
-#: actions/siteadminpanel.php:224
-#, php-format
-msgid "Locales directory not readable: %s"
-msgstr ""
+#: actions/siteadminpanel.php:266
+msgid "General"
+msgstr "Базовые"
-#: actions/siteadminpanel.php:275
-#, fuzzy
+#: actions/siteadminpanel.php:269
msgid "Site name"
-msgstr "Новая запись"
+msgstr "Имя сайта"
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
-msgstr ""
+msgstr "Имя вашего сайта, например, «Yourcompany Microblog»"
-#: actions/siteadminpanel.php:279
+#: actions/siteadminpanel.php:274
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:280
+#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
msgstr ""
+"Текст, используемый для указания авторов в нижнем колонтитуле каждой страницы"
-#: actions/siteadminpanel.php:283
+#: actions/siteadminpanel.php:279
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
msgstr ""
+"URL, используемый для ссылки на авторов в нижнем колонтитуле каждой страницы"
-#: actions/siteadminpanel.php:288
-#, fuzzy
-msgid "contact email address for your site"
-msgstr "Новый электронный адрес для постинга %s"
+#: actions/siteadminpanel.php:284
+msgid "Contact email address for your site"
+msgstr "Контактный email-адрес для вашего сайта"
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:290
+msgid "Local"
+msgstr "Внутренние настройки"
+
+#: actions/siteadminpanel.php:301
msgid "Default timezone"
-msgstr ""
+msgstr "Часовой пояс по умолчанию"
-#: actions/siteadminpanel.php:303
+#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
-msgstr ""
+msgstr "Часовой пояс по умолчанию для сайта; обычно UTC."
-#: actions/siteadminpanel.php:310
-#, fuzzy
+#: actions/siteadminpanel.php:308
msgid "Default site language"
-msgstr "Предпочитаемый язык"
+msgstr "Язык сайта по умолчанию"
#: actions/siteadminpanel.php:316
-msgid "Path to locales"
-msgstr ""
+msgid "URLs"
+msgstr "URL-адреса"
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
-msgstr ""
-
-#: actions/siteadminpanel.php:320
-#, fuzzy
+#: actions/siteadminpanel.php:319
msgid "Server"
-msgstr "Восстановление"
+msgstr "Сервер"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-#, fuzzy
-msgid "Site path"
-msgstr "Новая запись"
+msgstr "Имя хоста сервера сайта."
-#: actions/siteadminpanel.php:328
+#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
-msgstr ""
+msgstr "Короткие URL"
-#: actions/siteadminpanel.php:330
+#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
+msgstr "Использовать ли короткие (более читаемые и запоминаемые) URL-адреса?"
+
+#: actions/siteadminpanel.php:331
+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 actions/useradminpanel.php:171
-#, fuzzy
+#: actions/siteadminpanel.php:346
msgid "Closed"
-msgstr "Блокировать"
+msgstr "Закрыта"
#: actions/siteadminpanel.php:348
msgid "Disable new registrations."
-msgstr ""
+msgstr "Отключить новые регистрации."
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
+msgstr "Снимки"
+
+#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
-msgstr ""
+msgstr "При случайном посещении"
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
-msgstr ""
+msgstr "По заданному графику"
-#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
-#, fuzzy
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
msgid "Never"
-msgstr "Восстановление"
+msgstr "Никогда"
-#: actions/siteadminpanel.php:357
+#: actions/siteadminpanel.php:360
msgid "Data snapshots"
-msgstr ""
+msgstr "Снимки данных"
-#: actions/siteadminpanel.php:358
+#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
-msgstr ""
+msgstr "Когда отправлять статистические данные на сервера status.net"
-#: actions/siteadminpanel.php:364
+#: actions/siteadminpanel.php:366
msgid "Frequency"
-msgstr ""
+msgstr "Частота"
-#: actions/siteadminpanel.php:365
-msgid "Snapshots will be sent once every N Web hits"
-msgstr ""
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
+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:381
-#, fuzzy
+#: actions/siteadminpanel.php:380
+msgid "SSL"
+msgstr "SSL"
+
+#: actions/siteadminpanel.php:384
msgid "Sometimes"
-msgstr "Записи"
+msgstr "Иногда"
-#: actions/siteadminpanel.php:382
+#: actions/siteadminpanel.php:385
msgid "Always"
-msgstr ""
+msgstr "Всегда"
-#: actions/siteadminpanel.php:384
+#: actions/siteadminpanel.php:387
msgid "Use SSL"
-msgstr ""
+msgstr "Использовать SSL"
-#: actions/siteadminpanel.php:385
+#: actions/siteadminpanel.php:388
msgid "When to use SSL"
-msgstr ""
+msgstr "Когда использовать SSL"
-#: actions/siteadminpanel.php:391
+#: actions/siteadminpanel.php:393
msgid "SSL Server"
-msgstr ""
+msgstr "SSL-сервер"
-#: actions/siteadminpanel.php:392
+#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
-msgstr ""
+msgstr "Сервер, которому направлять SSL-запросы"
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr "Границы"
+
+#: actions/siteadminpanel.php:403
msgid "Text limit"
-msgstr ""
+msgstr "Границы текста"
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
-msgstr ""
+msgstr "Максимальное число символов для записей."
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "Dupe limit"
-msgstr ""
+msgstr "Предел дубликатов"
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
+"Сколько нужно ждать пользователям (в секундах) для отправки того же ещё раз."
-#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
-#, fuzzy
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
msgid "Save site settings"
-msgstr "Настройки аватара"
+msgstr "Сохранить настройки сайта"
#: actions/smssettings.php:58
msgid "SMS Settings"
@@ -3526,18 +3545,20 @@ 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
@@ -3545,6 +3566,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
@@ -3576,9 +3599,9 @@ msgid ""
msgstr ""
#: actions/subscriptions.php:123 actions/subscriptions.php:127
-#, fuzzy, php-format
+#, php-format
msgid "%s is not listening to anyone."
-msgstr "%1$s теперь просматривает твои записи на %2$s."
+msgstr "%s не просматривает ничьи записи."
#: actions/subscriptions.php:194
msgid "Jabber"
@@ -3643,19 +3666,19 @@ msgid "Notices tagged with %s, page %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."
@@ -3666,19 +3689,16 @@ 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."
@@ -3696,47 +3716,113 @@ msgstr "Отписано"
#, php-format
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
+"Лицензия просматриваемого потока «%s» несовместима с лицензией сайта «%s»."
-#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
msgid "User"
msgstr "Пользователь"
#: actions/useradminpanel.php:69
msgid "User settings for this StatusNet site."
-msgstr ""
+msgstr "Пользовательские настройки для этого сайта StatusNet."
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr "Неверное ограничение биографии. Должно быть числом."
+
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
+"Неверный текст приветствия. Максимальная длина составляет 255 символов."
-#: actions/useradminpanel.php:178
-#, fuzzy
-msgid "Invite-only"
-msgstr "Пригласить"
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr "Неверная подписка по умолчанию: «%1$s» не является пользователем."
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
-msgstr ""
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Профиль"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr "Ограничение биографии"
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
+msgstr "Максимальная длина биографии профиля в символах."
+
+#: actions/useradminpanel.php:231
+msgid "New users"
+msgstr "Новые пользователи"
+
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr "Приветствие новым пользователям"
+
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr "Текст приветствия для новых пользователей (максимум 255 символов)."
+
+#: actions/useradminpanel.php:241
+msgid "Default subscription"
+msgstr "Подписка по умолчанию"
+
+#: actions/useradminpanel.php:242
+msgid "Automatically subscribe new users to this user."
+msgstr "Автоматически подписывать новых пользователей на этого пользователя."
+
+#: actions/useradminpanel.php:251
+msgid "Invitations"
+msgstr "Приглашения"
+
+#: actions/useradminpanel.php:256
+msgid "Invitations enabled"
+msgstr "Приглашения включены"
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr "Разрешать ли пользователям приглашать новых пользователей."
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr "Сессии"
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr "Управление сессиями"
+
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
+msgstr "Управлять ли сессиями самостоятельно."
+
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr "Отладка сессий"
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
+msgstr "Включить отладочный вывод для сессий."
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Авторизовать подписку"
#: actions/userauthorization.php:110
-#, 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"
@@ -3752,9 +3838,8 @@ msgid "Reject"
msgstr "Отбросить"
#: actions/userauthorization.php:212
-#, fuzzy
msgid "Reject this subscription"
-msgstr "Подписки %s"
+msgstr "Отвергнуть эту подписку"
#: actions/userauthorization.php:225
msgid "No authorization request!"
@@ -3765,53 +3850,51 @@ 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 "
"subscription. Your subscription token is:"
msgstr ""
"Подписка авторизована, но нет обратного URL. Посмотрите инструкции на сайте "
-"о том, как авторизовать подписку. Ваш подписочный купон: "
+"о том, как авторизовать подписку. Ваш ключ подписки:"
#: actions/userauthorization.php:259
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
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
#, php-format
@@ -3819,9 +3902,9 @@ msgid "Can’t read avatar 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."
@@ -3841,7 +3924,7 @@ msgstr ""
#: actions/userdesignsettings.php:282
msgid "Enjoy your hotdog!"
-msgstr ""
+msgstr "Приятного аппетита!"
#: actions/usergroups.php:64
#, php-format
@@ -3853,14 +3936,15 @@ msgid "Search for more groups"
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
@@ -3868,21 +3952,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."
@@ -3898,9 +3983,8 @@ msgid "DB error inserting hashtag: %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."
@@ -3914,13 +3998,12 @@ 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
msgid "You are banned from posting notices on this site."
@@ -3930,7 +4013,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"
@@ -3944,13 +4027,9 @@ 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"
-
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr "Профиль"
+msgstr "Добро пожаловать на %1$s, @%2$s!"
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
@@ -3958,7 +4037,7 @@ msgstr "Изменить ваши настройки профиля"
#: lib/accountsettingsaction.php:112
msgid "Upload an avatar"
-msgstr "Загрузить аватар"
+msgstr "Загрузить аватару"
#: lib/accountsettingsaction.php:116
msgid "Change your password"
@@ -3969,9 +4048,8 @@ msgid "Change email handling"
msgstr "Изменить электронный адрес"
#: lib/accountsettingsaction.php:124
-#, fuzzy
msgid "Design your profile"
-msgstr "Профиль пользователя"
+msgstr "Оформить ваш профиль"
#: lib/accountsettingsaction.php:128
msgid "Other"
@@ -3990,130 +4068,128 @@ msgstr "%s (%s)"
msgid "Untitled page"
msgstr "Страница без названия"
-#: lib/action.php:424
+#: lib/action.php:425
msgid "Primary site navigation"
msgstr "Главная навигация"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Home"
msgstr "Моё"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Personal profile and friends timeline"
msgstr "Личный профиль и лента друзей"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Account"
msgstr "Настройки"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Change your email, avatar, password, profile"
-msgstr "Изменить ваш email, аватар, пароль, профиль и др."
+msgstr "Изменить ваш email, аватару, пароль, профиль"
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect"
msgstr "Соединить"
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect to services"
msgstr "Соединить с сервисами"
-#: lib/action.php:439
-#, fuzzy
+#: lib/action.php:440
msgid "Change site configuration"
-msgstr "Главная навигация"
+msgstr "Изменить конфигурацию сайта"
-#: lib/action.php:443 lib/subgroupnav.php:105
+#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Пригласить"
-#: lib/action.php:444 lib/subgroupnav.php:106
+#: lib/action.php:445 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Пригласи друзей и коллег стать такими же как ты участниками %s"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout"
msgstr "Выход"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout from the site"
msgstr "Выйти"
-#: lib/action.php:454
+#: lib/action.php:455
msgid "Create an account"
msgstr "Создать новый аккаунт"
-#: lib/action.php:457
+#: lib/action.php:458
msgid "Login to the site"
msgstr "Войти"
-#: lib/action.php:460 lib/action.php:723
+#: lib/action.php:461 lib/action.php:724
msgid "Help"
msgstr "Помощь"
-#: lib/action.php:460
+#: lib/action.php:461
msgid "Help me!"
msgstr "Помощь"
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
msgstr "Поиск"
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
msgstr "Искать людей или текст"
-#: lib/action.php:484
+#: lib/action.php:485
msgid "Site notice"
msgstr "Новая запись"
-#: lib/action.php:550
+#: lib/action.php:551
msgid "Local views"
msgstr "Локальные виды"
-#: lib/action.php:616
+#: lib/action.php:617
msgid "Page notice"
msgstr "Новая запись"
-#: lib/action.php:718
+#: lib/action.php:719
msgid "Secondary site navigation"
msgstr "Навигация по подпискам"
-#: lib/action.php:725
+#: lib/action.php:726
msgid "About"
msgstr "О проекте"
-#: lib/action.php:727
+#: lib/action.php:728
msgid "FAQ"
msgstr "ЧаВо"
-#: lib/action.php:731
+#: lib/action.php:732
msgid "TOS"
-msgstr ""
+msgstr "TOS"
-#: lib/action.php:734
+#: lib/action.php:735
msgid "Privacy"
msgstr "Пользовательское соглашение"
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
msgstr "Исходный код"
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Contact"
msgstr "Контактная информация"
-#: lib/action.php:740
-#, fuzzy
+#: lib/action.php:741
msgid "Badge"
-msgstr "\"Подтолкнуть\""
+msgstr "Бедж"
-#: lib/action.php:768
+#: lib/action.php:769
msgid "StatusNet software license"
msgstr "StatusNet лицензия"
-#: lib/action.php:771
+#: lib/action.php:772
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4122,12 +4198,12 @@ msgstr ""
"**%%site.name%%** — это сервис микроблогинга, созданный для вас при помощи [%"
"%site.broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:773
+#: lib/action.php:774
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** — сервис микроблогинга. "
-#: lib/action.php:775
+#: lib/action.php:776
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4139,85 +4215,81 @@ msgstr ""
"лицензией [GNU Affero General Public License](http://www.fsf.org/licensing/"
"licenses/agpl-3.0.html)."
-#: lib/action.php:789
-#, fuzzy
+#: lib/action.php:790
msgid "Site content license"
-msgstr "StatusNet лицензия"
+msgstr "Лицензия содержимого сайта"
-#: lib/action.php:798
+#: lib/action.php:799
msgid "All "
-msgstr "Все"
+msgstr "All "
-#: lib/action.php:803
+#: lib/action.php:804
msgid "license."
-msgstr "лицензия."
+msgstr "license."
-#: lib/action.php:1067
+#: lib/action.php:1068
msgid "Pagination"
-msgstr "Пагинация"
+msgstr "Разбиение на страницы"
-#: lib/action.php:1076
+#: lib/action.php:1077
msgid "After"
msgstr "Сюда"
-#: lib/action.php:1084
+#: lib/action.php:1085
msgid "Before"
msgstr "Туда"
-#: lib/action.php:1132
+#: lib/action.php:1133
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
+msgid "Paths configuration"
+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"
@@ -4236,18 +4308,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
@@ -4256,10 +4328,13 @@ 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 "Записи с таким id не существует"
#: lib/command.php:168 lib/command.php:416 lib/command.php:471
msgid "User has no last notice"
@@ -4295,26 +4370,25 @@ 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 "Проблемы с сохранением записи."
@@ -4357,50 +4431,47 @@ msgid "Can't turn on notification."
msgstr "Есть оповещение."
#: lib/command.php:597
-#, fuzzy, php-format
+#, php-format
msgid "Could not create login token for %s"
-msgstr "Не удаётся создать OpenID-форму: %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 ""
+msgstr "Эта ссылка действительна только один раз в течение 2 минут: %s"
#: lib/command.php:618
-#, fuzzy
msgid "You are not subscribed to anyone."
-msgstr "Вы не подписаны на этот профиль."
+msgstr "Вы ни на кого не подписаны."
#: lib/command.php:620
-#, fuzzy
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
-msgstr[0] "Вы не подписаны на этот профиль."
-msgstr[1] "Вы не подписаны на этот профиль."
+msgstr[0] "Вы подписаны на этих людей:"
+msgstr[1] "Вы подписаны на этих людей:"
+msgstr[2] "Вы подписаны на этих людей:"
#: lib/command.php:640
-#, fuzzy
msgid "No one is subscribed to you."
-msgstr "Не удаётся подписать других на вашу ленту."
+msgstr "Никто не подписан на вас."
#: lib/command.php:642
-#, fuzzy
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
-msgstr[0] "Не удаётся подписать других на вашу ленту."
-msgstr[1] "Не удаётся подписать других на вашу ленту."
+msgstr[0] "Эти люди подписались на вас:"
+msgstr[1] "Эти люди подписались на вас:"
+msgstr[2] "Эти люди подписались на вас:"
#: lib/command.php:662
-#, fuzzy
msgid "You are not a member of any groups."
-msgstr "Вы не являетесь членом этой группы."
+msgstr "Вы не состоите ни в одной группе."
#: lib/command.php:664
-#, fuzzy
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
-msgstr[0] "Вы не являетесь членом этой группы."
-msgstr[1] "Вы не являетесь членом этой группы."
+msgstr[0] "Вы являетесь участником следующих групп:"
+msgstr[1] "Вы являетесь участником следующих групп:"
+msgstr[2] "Вы являетесь участником следующих групп:"
#: lib/command.php:678
msgid ""
@@ -4440,24 +4511,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> — добавить запись с заданным id в число любимых\n"
+"reply #<notice_id> — ответить на запись с заданным 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"
@@ -4476,32 +4580,32 @@ 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."
+"You can upload your personal background image. The maximum file size is 2MB."
msgstr ""
"Вы можете загрузить собственное фоновое изображение. Максимальный размер "
"файла составляет 2Mb."
#: 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"
-msgstr "Мне не нравиться эта запись"
+msgstr "Мне не нравится эта запись"
#: lib/favorform.php:114 lib/favorform.php:140
msgid "Favor this notice"
-msgstr "Мне нравиться эта запись"
+msgstr "Мне нравится эта запись"
#: lib/favorform.php:140
msgid "Favor"
@@ -4513,19 +4617,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"
@@ -4536,9 +4640,8 @@ msgid "All"
msgstr "Все"
#: lib/galleryaction.php:139
-#, fuzzy
msgid "Select tag to filter"
-msgstr "Выбор провайдера"
+msgstr "Выберите тег для фильтрации"
#: lib/galleryaction.php:140
msgid "Tag"
@@ -4546,7 +4649,7 @@ msgstr "Теги"
#: lib/galleryaction.php:141
msgid "Choose a tag to narrow list"
-msgstr "Выберите тэг из выпадающего списка"
+msgstr "Выберите тег из выпадающего списка"
#: lib/galleryaction.php:143
msgid "Go"
@@ -4557,14 +4660,13 @@ msgid "URL of the homepage or blog of the group or topic"
msgstr "Адрес страницы, дневника или профиля группы на другом портале"
#: lib/groupeditform.php:168
-#, fuzzy
msgid "Describe the group or topic"
-msgstr "Опиши группу при помощи 140 символов"
+msgstr "Опишите группу или тему"
#: lib/groupeditform.php:170
-#, fuzzy, php-format
+#, php-format
msgid "Describe the group or topic in %d characters"
-msgstr "Опиши группу при помощи 140 символов"
+msgstr "Опишите группу или тему при помощи %d символов"
#: lib/groupeditform.php:172
msgid "Description"
@@ -4579,20 +4681,21 @@ msgstr "Где находится группа, например «Город,
#, php-format
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
+"Дополнительные имена для группы, разделённые запятой или пробелом, максимум %"
+"d имён"
-#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85
msgid "Group"
msgstr "Группа"
#: lib/groupnav.php:101
-#, fuzzy
msgid "Blocked"
-msgstr "Блокировать"
+msgstr "Заблокированные"
#: lib/groupnav.php:102
-#, fuzzy, php-format
+#, php-format
msgid "%s blocked users"
-msgstr "Заблокировать пользователя."
+msgstr "%s заблокированных пользователей"
#: lib/groupnav.php:108
#, php-format
@@ -4609,9 +4712,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"
@@ -4626,14 +4729,14 @@ msgstr "Группы с наибольшим количеством записе
msgid "Tags in %s group's notices"
msgstr "Теги записей группы %s"
-#: lib/htmloutputter.php:104
+#: 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."
@@ -4645,7 +4748,7 @@ msgstr "Системная ошибка при загрузке файла."
#: lib/imagefile.php:96
msgid "Not an image or corrupt file."
-msgstr "Не является изображением или разрушенный файл."
+msgstr "Не является изображением или повреждённый файл."
#: lib/imagefile.php:105
msgid "Unsupported image file format."
@@ -4659,10 +4762,18 @@ msgstr "Потерян файл."
msgid "Unknown file type"
msgstr "Неподдерживаемый тип файла"
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
-msgstr ""
+msgstr "[%s]"
#: lib/joinform.php:114
msgid "Join"
@@ -4670,7 +4781,7 @@ msgstr "Присоединиться"
#: lib/leaveform.php:114
msgid "Leave"
-msgstr "Выйти"
+msgstr "Покинуть"
#: lib/logingroupnav.php:80
msgid "Login with a username and password"
@@ -4689,8 +4800,11 @@ msgid ""
"You have no private messages. You can send private message to engage other "
"users in conversation. People can send you messages for your eyes only."
msgstr ""
+"У вас нет личных сообщений. Вы можете отправить личное сообщение для "
+"вовлечения других пользователей в разговор. Сообщения, получаемые от других "
+"людей, видите только вы."
-#: lib/mailbox.php:227 lib/noticelist.php:424
+#: lib/mailbox.php:227 lib/noticelist.php:452
msgid "from"
msgstr "от "
@@ -4714,6 +4828,19 @@ msgid ""
"Thanks for your time, \n"
"%s\n"
msgstr ""
+"Здраствуйте, %s.\n"
+"\n"
+"Кто-то только что ввёл этот email-адрес на %s.\n"
+"\n"
+"Если это были вы и вы хотите подтвердить введённые данные, используйте "
+"ссылку ниже:\n"
+"\n"
+"%s\n"
+"\n"
+"Если нет, просто проигнорируйте это сообщение.\n"
+"\n"
+"Благодарим за потраченное время, \n"
+"%s\n"
#: lib/mail.php:236
#, php-format
@@ -4734,6 +4861,16 @@ msgid ""
"----\n"
"Change your email address or notification options at %8$s\n"
msgstr ""
+"%1$s сейчас следит за вашими записями на %2$s.\n"
+"\n"
+"%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Искренне ваш,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Измените email-адрес и настройки уведомлений на %8$s\n"
#: lib/mail.php:254
#, php-format
@@ -4751,7 +4888,7 @@ msgid ""
"Bio: %s\n"
"\n"
msgstr ""
-"Био: %s\n"
+"Биография: %s\n"
"\n"
#: lib/mail.php:286
@@ -4792,7 +4929,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
@@ -4809,6 +4946,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
@@ -4833,11 +4981,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
@@ -4859,11 +5021,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
@@ -4879,59 +5057,72 @@ msgid ""
"\t%4$s\n"
"\n"
msgstr ""
+"%1$s (@%9$s) только что отправил запись для вашего внимания («@-ответ») на %2"
+"$s.\n"
+"\n"
+"Текст записи:\n"
+"\n"
+"%3$s\n"
+"\n"
+"Оно содержит:\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 ""
+"При сохранении вашего файла возникла ошибка базы данных. Пожалуйста, "
+"попробуйте ещё раз."
#: 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
-#, fuzzy
msgid "Could not determine file's mime-type!"
-msgstr "Не удаётся вернуть публичный поток."
+msgstr "Не удаётся определить mime-тип файла!"
#: 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"
@@ -4941,51 +5132,75 @@ msgstr "Послать прямую запись"
msgid "To"
msgstr "Для"
-#: lib/messageform.php:162 lib/noticeform.php:173
+#: lib/messageform.php:162 lib/noticeform.php:186
msgid "Available characters"
msgstr "6 или больше знаков"
-#: lib/noticeform.php:145
+#: lib/noticeform.php:158
msgid "Send a notice"
msgstr "Послать запись"
-#: lib/noticeform.php:158
+#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
msgstr "Что нового, %s?"
-#: lib/noticeform.php:180
+#: lib/noticeform.php:193
msgid "Attach"
-msgstr ""
+msgstr "Прикрепить"
-#: lib/noticeform.php:184
+#: lib/noticeform.php:197
msgid "Attach a file"
-msgstr ""
+msgstr "Прикрепить файл"
-#: lib/noticelist.php:478
-#, fuzzy
+#: 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 "с. ш."
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr "ю. ш."
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr "в. д."
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr "з. д."
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr "на"
+
+#: lib/noticelist.php:506
msgid "in context"
-msgstr "Нет контента!"
+msgstr "в контексте"
-#: lib/noticelist.php:498
+#: lib/noticelist.php:526
msgid "Reply to this notice"
msgstr "Ответить на эту запись"
-#: lib/noticelist.php:499
+#: lib/noticelist.php:527
msgid "Reply"
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"
@@ -4993,23 +5208,21 @@ msgstr "Ошибка при вставке нового профиля"
#: lib/oauthstore.php:291
msgid "Error inserting avatar"
-msgstr "Ошибка при вставке аватара"
+msgstr "Ошибка при вставке аватары"
#: lib/oauthstore.php:311
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 "Не удаётся вставить новую подписку."
@@ -5035,7 +5248,7 @@ msgstr "Ваши входящие сообщения"
#: lib/personalgroupnav.php:129
msgid "Outbox"
-msgstr "Исходящее"
+msgstr "Исходящие"
#: lib/personalgroupnav.php:130
msgid "Your sent messages"
@@ -5075,13 +5288,12 @@ msgid "All groups"
msgstr "Все группы"
#: lib/profileformaction.php:123
-#, fuzzy
msgid "No return-to arguments"
-msgstr "Нет ID аргумента."
+msgstr "Нет аргумента return-to"
#: lib/profileformaction.php:137
msgid "unimplemented method"
-msgstr ""
+msgstr "нереализованный метод"
#: lib/publicgroupnav.php:78
msgid "Public"
@@ -5093,7 +5305,7 @@ msgstr "Группы"
#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
msgid "Recent tags"
-msgstr "Облаго тэгов"
+msgstr "Облако тегов"
#: lib/publicgroupnav.php:88
msgid "Featured"
@@ -5104,24 +5316,24 @@ 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 "Поиск"
+msgstr "Поиск по сайту"
+
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr "Ключевые слова"
#: lib/searchaction.php:162
-#, fuzzy
msgid "Search help"
-msgstr "Поиск"
+msgstr "Справка по поиску"
#: lib/searchgroupnav.php:80
msgid "People"
@@ -5131,10 +5343,6 @@ msgstr "Люди"
msgid "Find people on this site"
msgstr "Найти человека на этом сайте"
-#: lib/searchgroupnav.php:82
-msgid "Notice"
-msgstr "Запись"
-
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
msgstr "Найти запись по содержимому"
@@ -5149,17 +5357,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
@@ -5179,12 +5385,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)"
@@ -5192,7 +5398,7 @@ msgstr "(пока ничего нет)"
#: lib/subs.php:52
msgid "Already subscribed!"
-msgstr ""
+msgstr "Уже подписаны!"
#: lib/subs.php:56
msgid "User has blocked you."
@@ -5207,9 +5413,8 @@ msgid "Could not subscribe other to you."
msgstr "Не удаётся подписать других на вашу ленту."
#: lib/subs.php:128
-#, fuzzy
msgid "Not subscribed!"
-msgstr "Не подписан!"
+msgstr "Не подписаны!"
#: lib/subs.php:140
msgid "Couldn't delete subscription."
@@ -5217,7 +5422,7 @@ msgstr "Не удаётся удалить подписку."
#: lib/tagcloudsection.php:56
msgid "None"
-msgstr "Нет тэгов"
+msgstr "Нет тегов"
#: lib/topposterssection.php:74
msgid "Top posters"
@@ -5225,21 +5430,19 @@ 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"
@@ -5250,9 +5453,8 @@ msgid "Unsubscribe"
msgstr "Отписаться"
#: lib/userprofile.php:116
-#, fuzzy
msgid "Edit Avatar"
-msgstr "Аватар"
+msgstr "Изменить аватару"
#: lib/userprofile.php:236
msgid "User actions"
@@ -5264,7 +5466,7 @@ msgstr "Изменение настроек профиля"
#: lib/userprofile.php:249
msgid "Edit"
-msgstr ""
+msgstr "Редактировать"
#: lib/userprofile.php:272
msgid "Send a direct message to this user"
@@ -5274,59 +5476,65 @@ 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 ""
+"%s не является допустимым цветом! Используйте 3 или 6 шестнадцатеричных "
+"символов."
#: scripts/maildaemon.php:48
msgid "Could not parse message."
@@ -5343,11 +5551,3 @@ msgstr "Простите, это не Ваш входящий электронн
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Простите, входящих писем нет."
-
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "Разблокировать пользователя."
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "Люди подписанные на %s"
diff --git a/locale/statusnet.po b/locale/statusnet.po
index d65222eb1..67847bc98 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-19 10:43+0000\n"
+"POT-Creation-Date: 2009-11-28 19:49+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"
@@ -426,7 +426,7 @@ msgstr ""
msgid "Not found"
msgstr ""
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -539,7 +539,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
+#: lib/noticelist.php:550
msgid "Delete"
msgstr ""
@@ -552,7 +552,7 @@ msgid "Crop"
msgstr ""
#: actions/avatarsettings.php:265 actions/disfavor.php:74
-#: actions/emailsettings.php:237 actions/favor.php:75
+#: 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
@@ -567,7 +567,7 @@ msgid "There was a problem with your session token. Try again, please."
msgstr ""
#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
-#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: 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."
@@ -695,15 +695,15 @@ msgstr ""
msgid "That address has already been confirmed."
msgstr ""
-#: actions/confirmaddress.php:114 actions/emailsettings.php:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
#: actions/profilesettings.php:276 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr ""
-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
msgstr ""
@@ -722,7 +722,7 @@ msgid "Conversation"
msgstr ""
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206
+#: lib/profileaction.php:206 lib/searchgroupnav.php:82
msgid "Notices"
msgstr ""
@@ -761,7 +761,7 @@ msgstr ""
msgid "Do not delete this notice"
msgstr ""
-#: actions/deletenotice.php:146 lib/noticelist.php:522
+#: actions/deletenotice.php:146 lib/noticelist.php:550
msgid "Delete this notice"
msgstr ""
@@ -800,169 +800,110 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:278
+#: actions/designadminpanel.php:270
msgid "Invalid logo URL."
msgstr ""
-#: actions/designadminpanel.php:282
+#: actions/designadminpanel.php:274
#, php-format
msgid "Theme not available: %s"
msgstr ""
-#: actions/designadminpanel.php:288
-#, php-format
-msgid "Theme directory not readable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:292
-#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:296
-#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:312
-#, php-format
-msgid "Max length for %s %s is 255 characters."
-msgstr ""
-
-#: actions/designadminpanel.php:412
+#: actions/designadminpanel.php:370
msgid "Change logo"
msgstr ""
-#: actions/designadminpanel.php:417
+#: actions/designadminpanel.php:375
msgid "Site logo"
msgstr ""
-#: actions/designadminpanel.php:424
+#: actions/designadminpanel.php:382
msgid "Change theme"
msgstr ""
-#: actions/designadminpanel.php:441
+#: actions/designadminpanel.php:399
msgid "Site theme"
msgstr ""
-#: actions/designadminpanel.php:442
+#: actions/designadminpanel.php:400
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:447
-msgid "Theme server"
-msgstr ""
-
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
-
-#: actions/designadminpanel.php:455
-msgid "Theme directory"
-msgstr ""
-
-#: actions/designadminpanel.php:462
-msgid "Avatar Settings"
-msgstr ""
-
-#: actions/designadminpanel.php:467
-msgid "Avatar server"
-msgstr ""
-
-#: actions/designadminpanel.php:471
-msgid "Avatar path"
-msgstr ""
-
-#: actions/designadminpanel.php:475
-msgid "Avatar directory"
-msgstr ""
-
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:422
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr ""
-#: actions/designadminpanel.php:526 lib/designsettings.php:139
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:542 lib/designsettings.php:155
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:543 lib/designsettings.php:156
+#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:548 lib/designsettings.php:161
+#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:554
-msgid "Background server"
-msgstr ""
-
-#: actions/designadminpanel.php:558
-msgid "Background path"
-msgstr ""
-
-#: actions/designadminpanel.php:562
-msgid "Background directory"
-msgstr ""
-
-#: actions/designadminpanel.php:569 lib/designsettings.php:170
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
msgid "Change colours"
msgstr ""
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
msgid "Content"
msgstr ""
-#: actions/designadminpanel.php:604 lib/designsettings.php:204
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
msgid "Sidebar"
msgstr ""
-#: actions/designadminpanel.php:617 lib/designsettings.php:217
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
msgstr ""
-#: actions/designadminpanel.php:630 lib/designsettings.php:230
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
msgid "Links"
msgstr ""
-#: actions/designadminpanel.php:658 lib/designsettings.php:247
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:659 lib/designsettings.php:248
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:665 lib/designsettings.php:254
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 actions/useradminpanel.php:226
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/pathsadminpanel.php:296 actions/profilesettings.php:167
+#: actions/siteadminpanel.php:421 actions/smssettings.php:181
+#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/useradminpanel.php:313 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr ""
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: actions/designadminpanel.php:582 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1110,83 +1051,83 @@ msgstr ""
msgid "Publish a MicroID for my email address."
msgstr ""
-#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/emailsettings.php:302 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
msgstr ""
-#: actions/emailsettings.php:319
+#: actions/emailsettings.php:320
msgid "No email address."
msgstr ""
-#: actions/emailsettings.php:326
+#: actions/emailsettings.php:327
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr ""
-#: actions/emailsettings.php:333
+#: actions/emailsettings.php:334
msgid "That is already your email address."
msgstr ""
-#: actions/emailsettings.php:336
+#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
msgstr ""
-#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr ""
-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
msgstr ""
-#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
msgstr ""
-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
msgstr ""
-#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
msgstr ""
-#: actions/emailsettings.php:412
+#: actions/emailsettings.php:413
msgid "That is not your email address."
msgstr ""
-#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
msgstr ""
-#: actions/emailsettings.php:445 actions/smssettings.php:518
+#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
msgstr ""
-#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
msgid "Couldn't update user record."
msgstr ""
-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
msgstr ""
-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555
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 ""
@@ -1435,7 +1376,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
msgid "Admin"
msgstr ""
@@ -1491,7 +1432,7 @@ msgid ""
msgstr ""
#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/subgroupnav.php:98
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1691,7 +1632,7 @@ msgstr ""
msgid "Optionally add a personal message to the invitation."
msgstr ""
-#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
msgstr ""
@@ -1787,7 +1728,7 @@ msgstr ""
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:204 actions/login.php:257 lib/action.php:457
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr ""
@@ -1894,7 +1835,7 @@ msgstr ""
msgid "Direct message to %s sent"
msgstr ""
-#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
msgid "Ajax Error"
msgstr ""
@@ -1902,7 +1843,7 @@ msgstr ""
msgid "New notice"
msgstr ""
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
msgid "Notice posted"
msgstr ""
@@ -1936,12 +1877,12 @@ msgid ""
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
-#: actions/noticesearchrss.php:89
+#: actions/noticesearchrss.php:96
#, php-format
msgid "Updates with \"%s\""
msgstr ""
-#: actions/noticesearchrss.php:91
+#: actions/noticesearchrss.php:98
#, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
msgstr ""
@@ -2064,8 +2005,8 @@ msgstr ""
msgid "Confirm"
msgstr ""
-#: actions/passwordsettings.php:113
-msgid "same as password above"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
msgstr ""
#: actions/passwordsettings.php:117
@@ -2096,6 +2037,107 @@ msgstr ""
msgid "Password saved."
msgstr ""
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr ""
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr ""
+
+#: actions/pathsadminpanel.php:140
+#, php-format
+msgid "Theme directory not readable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+msgid "Site"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+msgid "Site path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr ""
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:247
+msgid "Avatars"
+msgstr ""
+
+#: actions/pathsadminpanel.php:252
+msgid "Avatar server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:256
+msgid "Avatar path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:260
+msgid "Avatar directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:297
+msgid "Save paths"
+msgstr ""
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -2193,7 +2235,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr ""
@@ -2415,10 +2457,6 @@ msgstr ""
msgid "6 or more characters, and don't forget it!"
msgstr ""
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr ""
-
#: actions/recoverpassword.php:243
msgid "Reset"
msgstr ""
@@ -2477,7 +2515,7 @@ msgstr ""
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
#: lib/logingroupnav.php:85
msgid "Register"
msgstr ""
@@ -2521,7 +2559,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
msgid "Email"
msgstr ""
@@ -2605,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 ""
@@ -2932,10 +2970,6 @@ msgstr ""
msgid "User is already silenced."
msgstr ""
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
-msgid "Site"
-msgstr ""
-
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
msgstr ""
@@ -2966,98 +3000,93 @@ msgid "Snapshot frequency must be a number."
msgstr ""
#: actions/siteadminpanel.php:199
-msgid "You must set an SSL sever when enabling SSL."
+msgid "You must set an SSL server when enabling SSL."
msgstr ""
#: actions/siteadminpanel.php:204
-msgid "Invalid SSL server. Max length is 255 characters."
+msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
#: actions/siteadminpanel.php:210
-msgid "Minimum text limit is 140c."
+msgid "Minimum text limit is 140 characters."
msgstr ""
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:224
-#, php-format
-msgid "Locales directory not readable: %s"
+#: actions/siteadminpanel.php:266
+msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:275
+#: actions/siteadminpanel.php:269
msgid "Site name"
msgstr ""
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:279
+#: actions/siteadminpanel.php:274
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:280
+#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:283
+#: actions/siteadminpanel.php:279
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:288
-msgid "contact email address for your site"
+#: actions/siteadminpanel.php:284
+msgid "Contact email address for your site"
msgstr ""
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:290
+msgid "Local"
+msgstr ""
+
+#: actions/siteadminpanel.php:301
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:303
+#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:308
msgid "Default site language"
msgstr ""
#: actions/siteadminpanel.php:316
-msgid "Path to locales"
-msgstr ""
-
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
+msgid "URLs"
msgstr ""
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Server"
msgstr ""
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
msgstr ""
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-msgid "Site path"
-msgstr ""
-
-#: actions/siteadminpanel.php:328
+#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
msgstr ""
-#: actions/siteadminpanel.php:330
+#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
+#: actions/siteadminpanel.php:331
+msgid "Access"
+msgstr ""
+
#: actions/siteadminpanel.php:334
msgid "Private"
msgstr ""
@@ -3074,7 +3103,7 @@ msgstr ""
msgid "Make registration invitation only."
msgstr ""
-#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#: actions/siteadminpanel.php:346
msgid "Closed"
msgstr ""
@@ -3082,32 +3111,36 @@ msgstr ""
msgid "Disable new registrations."
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
msgid "Never"
msgstr ""
-#: actions/siteadminpanel.php:357
+#: actions/siteadminpanel.php:360
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:358
+#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:364
+#: actions/siteadminpanel.php:366
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:365
-msgid "Snapshots will be sent once every N Web hits"
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
msgstr ""
#: actions/siteadminpanel.php:372
@@ -3118,47 +3151,55 @@ msgstr ""
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:381
+#: actions/siteadminpanel.php:380
+msgid "SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
msgid "Sometimes"
msgstr ""
-#: actions/siteadminpanel.php:382
+#: actions/siteadminpanel.php:385
msgid "Always"
msgstr ""
-#: actions/siteadminpanel.php:384
+#: actions/siteadminpanel.php:387
msgid "Use SSL"
msgstr ""
-#: actions/siteadminpanel.php:385
+#: actions/siteadminpanel.php:388
msgid "When to use SSL"
msgstr ""
-#: actions/siteadminpanel.php:391
+#: actions/siteadminpanel.php:393
msgid "SSL Server"
msgstr ""
-#: actions/siteadminpanel.php:392
+#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr ""
+
+#: actions/siteadminpanel.php:403
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
msgid "Save site settings"
msgstr ""
@@ -3450,7 +3491,8 @@ msgstr ""
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
-#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
msgid "User"
msgstr ""
@@ -3458,16 +3500,82 @@ msgstr ""
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr ""
+
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
+msgstr ""
+
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr ""
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr ""
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr ""
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
+msgstr ""
+
+#: actions/useradminpanel.php:231
+msgid "New users"
msgstr ""
-#: actions/useradminpanel.php:178
-msgid "Invite-only"
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
msgstr ""
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr ""
+
+#: actions/useradminpanel.php:241
+msgid "Default subscription"
+msgstr ""
+
+#: actions/useradminpanel.php:242
+msgid "Automatically subscribe new users to this user."
+msgstr ""
+
+#: actions/useradminpanel.php:251
+msgid "Invitations"
+msgstr ""
+
+#: actions/useradminpanel.php:256
+msgid "Invitations enabled"
+msgstr ""
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr ""
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr ""
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/userauthorization.php:105
@@ -3661,7 +3769,7 @@ msgstr ""
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
@@ -3679,10 +3787,6 @@ msgstr ""
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr ""
-
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr ""
@@ -3720,140 +3824,140 @@ msgstr ""
msgid "Untitled page"
msgstr ""
-#: lib/action.php:424
+#: lib/action.php:425
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Home"
msgstr ""
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Account"
msgstr ""
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect"
msgstr ""
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect to services"
msgstr ""
-#: lib/action.php:439
+#: lib/action.php:440
msgid "Change site configuration"
msgstr ""
-#: lib/action.php:443 lib/subgroupnav.php:105
+#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:444 lib/subgroupnav.php:106
+#: lib/action.php:445 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout"
msgstr ""
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:454
+#: lib/action.php:455
msgid "Create an account"
msgstr ""
-#: lib/action.php:457
+#: lib/action.php:458
msgid "Login to the site"
msgstr ""
-#: lib/action.php:460 lib/action.php:723
+#: lib/action.php:461 lib/action.php:724
msgid "Help"
msgstr ""
-#: lib/action.php:460
+#: lib/action.php:461
msgid "Help me!"
msgstr ""
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
msgstr ""
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:484
+#: lib/action.php:485
msgid "Site notice"
msgstr ""
-#: lib/action.php:550
+#: lib/action.php:551
msgid "Local views"
msgstr ""
-#: lib/action.php:616
+#: lib/action.php:617
msgid "Page notice"
msgstr ""
-#: lib/action.php:718
+#: lib/action.php:719
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:725
+#: lib/action.php:726
msgid "About"
msgstr ""
-#: lib/action.php:727
+#: lib/action.php:728
msgid "FAQ"
msgstr ""
-#: lib/action.php:731
+#: lib/action.php:732
msgid "TOS"
msgstr ""
-#: lib/action.php:734
+#: lib/action.php:735
msgid "Privacy"
msgstr ""
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
msgstr ""
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Contact"
msgstr ""
-#: lib/action.php:740
+#: lib/action.php:741
msgid "Badge"
msgstr ""
-#: lib/action.php:768
+#: lib/action.php:769
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:771
+#: lib/action.php:772
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
msgstr ""
-#: lib/action.php:773
+#: lib/action.php:774
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
-#: lib/action.php:775
+#: lib/action.php:776
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3861,31 +3965,31 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:789
+#: lib/action.php:790
msgid "Site content license"
msgstr ""
-#: lib/action.php:798
+#: lib/action.php:799
msgid "All "
msgstr ""
-#: lib/action.php:803
+#: lib/action.php:804
msgid "license."
msgstr ""
-#: lib/action.php:1067
+#: lib/action.php:1068
msgid "Pagination"
msgstr ""
-#: lib/action.php:1076
+#: lib/action.php:1077
msgid "After"
msgstr ""
-#: lib/action.php:1084
+#: lib/action.php:1085
msgid "Before"
msgstr ""
-#: lib/action.php:1132
+#: lib/action.php:1133
msgid "There was a problem with your session token."
msgstr ""
@@ -3913,6 +4017,10 @@ msgstr ""
msgid "Design configuration"
msgstr ""
+#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+msgid "Paths configuration"
+msgstr ""
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4186,7 +4294,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
@@ -4280,7 +4388,7 @@ msgstr ""
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
-#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85
msgid "Group"
msgstr ""
@@ -4325,7 +4433,7 @@ msgstr ""
msgid "Tags in %s group's notices"
msgstr ""
-#: lib/htmloutputter.php:104
+#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
msgstr ""
@@ -4358,6 +4466,14 @@ msgstr ""
msgid "Unknown file type"
msgstr ""
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
@@ -4389,7 +4505,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:424
+#: lib/mailbox.php:227 lib/noticelist.php:452
msgid "from"
msgstr ""
@@ -4629,36 +4745,61 @@ msgstr ""
msgid "To"
msgstr ""
-#: lib/messageform.php:162 lib/noticeform.php:173
+#: lib/messageform.php:162 lib/noticeform.php:186
msgid "Available characters"
msgstr ""
-#: lib/noticeform.php:145
+#: lib/noticeform.php:158
msgid "Send a notice"
msgstr ""
-#: lib/noticeform.php:158
+#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
msgstr ""
-#: lib/noticeform.php:180
+#: lib/noticeform.php:193
msgid "Attach"
msgstr ""
-#: lib/noticeform.php:184
+#: lib/noticeform.php:197
msgid "Attach a file"
msgstr ""
-#: lib/noticelist.php:478
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "N"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr ""
+
+#: lib/noticelist.php:506
msgid "in context"
msgstr ""
-#: lib/noticelist.php:498
+#: lib/noticelist.php:526
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:499
+#: lib/noticelist.php:527
msgid "Reply"
msgstr ""
@@ -4690,11 +4831,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 ""
@@ -4799,6 +4940,10 @@ msgstr ""
msgid "Search site"
msgstr ""
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
msgid "Search help"
msgstr ""
@@ -4811,10 +4956,6 @@ msgstr ""
msgid "Find people on this site"
msgstr ""
-#: lib/searchgroupnav.php:82
-msgid "Notice"
-msgstr ""
-
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
msgstr ""
@@ -4948,47 +5089,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 7a03482ed..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 ce932a624..f82bb65f1 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -1,5 +1,6 @@
# Translation of StatusNet to Swedish
#
+# Author@translatewiki.net: McDutchie
# --
# This file is distributed under the same license as the StatusNet package.
#
@@ -7,16 +8,16 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 10:43+0000\n"
-"PO-Revision-Date: 2009-11-18 19:32:39+0000\n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-11-28 19:50:56+0000\n"
"Language-Team: Swedish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: sv\n"
"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
@@ -132,7 +133,7 @@ msgstr "API-metoden hittades inte!"
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
-msgstr "Denna metod kräver skicka."
+msgstr "Denna metod kräver en POST."
#: actions/apiaccountupdatedeliverydevice.php:105
msgid ""
@@ -445,7 +446,7 @@ msgstr "För långt. Maximalt 140 tecken"
msgid "Not found"
msgstr "Hittades inte"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -562,7 +563,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
+#: lib/noticelist.php:550
#, fuzzy
msgid "Delete"
msgstr "Ta bort"
@@ -576,7 +577,7 @@ msgid "Crop"
msgstr ""
#: actions/avatarsettings.php:265 actions/disfavor.php:74
-#: actions/emailsettings.php:237 actions/favor.php:75
+#: 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
@@ -591,7 +592,7 @@ msgid "There was a problem with your session token. Try again, please."
msgstr "Det var något problem med din session. Försök igen, tack."
#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
-#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: 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."
@@ -728,15 +729,15 @@ msgstr "Adresstypen känns inte igen %s"
msgid "That address has already been confirmed."
msgstr "Den adressen har redan blivit bekräftad en gång."
-#: actions/confirmaddress.php:114 actions/emailsettings.php:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
#: actions/profilesettings.php:276 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Kunde inte uppdatera användare."
-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
msgstr "Kunde inte radera epost bekräftelsen."
@@ -756,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/profileaction.php:206 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Inlägg"
@@ -799,7 +800,7 @@ msgstr "Är du säker på att du vill tabort detta inlägg?"
msgid "Do not delete this notice"
msgstr "Kan inte ta bort detta inlägg."
-#: actions/deletenotice.php:146 lib/noticelist.php:522
+#: actions/deletenotice.php:146 lib/noticelist.php:550
#, fuzzy
msgid "Delete this notice"
msgstr "Ta bort inlägg"
@@ -844,182 +845,119 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:278
+#: actions/designadminpanel.php:270
#, fuzzy
msgid "Invalid logo URL."
msgstr "Felaktig storlek"
-#: actions/designadminpanel.php:282
+#: actions/designadminpanel.php:274
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Denna sida är inte tillgänglig i den mediatyp du accepterat"
-#: actions/designadminpanel.php:288
-#, fuzzy, php-format
-msgid "Theme directory not readable: %s"
-msgstr "Denna sida är inte tillgänglig i den mediatyp du accepterat"
-
-#: actions/designadminpanel.php:292
-#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:296
-#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:312
-#, php-format
-msgid "Max length for %s %s is 255 characters."
-msgstr ""
-
-#: actions/designadminpanel.php:412
+#: actions/designadminpanel.php:370
#, fuzzy
msgid "Change logo"
msgstr "Ändra ditt lösenord"
-#: actions/designadminpanel.php:417
+#: actions/designadminpanel.php:375
#, fuzzy
msgid "Site logo"
msgstr "Bjud in"
-#: actions/designadminpanel.php:424
+#: actions/designadminpanel.php:382
#, fuzzy
msgid "Change theme"
msgstr "Ändra"
-#: actions/designadminpanel.php:441
+#: actions/designadminpanel.php:399
#, fuzzy
msgid "Site theme"
msgstr "Nytt inlägg"
-#: actions/designadminpanel.php:442
+#: actions/designadminpanel.php:400
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:447
-msgid "Theme server"
-msgstr ""
-
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
-
-#: actions/designadminpanel.php:455
-msgid "Theme directory"
-msgstr ""
-
-#: actions/designadminpanel.php:462
-#, fuzzy
-msgid "Avatar Settings"
-msgstr "Twitter inställningar"
-
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Avatar server"
-msgstr "Twitter inställningar"
-
-#: actions/designadminpanel.php:471
-#, fuzzy
-msgid "Avatar path"
-msgstr "Användarbilden uppdaterad."
-
-#: actions/designadminpanel.php:475
-#, fuzzy
-msgid "Avatar directory"
-msgstr "Användarbilden uppdaterad."
-
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:422
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "Du kan uppdatera din personliga profil här"
-#: actions/designadminpanel.php:526 lib/designsettings.php:139
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:542 lib/designsettings.php:155
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:543 lib/designsettings.php:156
+#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:548 lib/designsettings.php:161
+#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:554
-msgid "Background server"
-msgstr ""
-
-#: actions/designadminpanel.php:558
-msgid "Background path"
-msgstr ""
-
-#: actions/designadminpanel.php:562
-msgid "Background directory"
-msgstr ""
-
-#: actions/designadminpanel.php:569 lib/designsettings.php:170
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Ändra ditt lösenord"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Anslut"
-#: actions/designadminpanel.php:604 lib/designsettings.php:204
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Sök"
-#: actions/designadminpanel.php:617 lib/designsettings.php:217
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
msgstr "Text"
-#: actions/designadminpanel.php:630 lib/designsettings.php:230
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Logga in"
-#: actions/designadminpanel.php:658 lib/designsettings.php:247
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:659 lib/designsettings.php:248
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:665 lib/designsettings.php:254
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 actions/useradminpanel.php:226
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: 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 "Spara"
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: actions/designadminpanel.php:582 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1176,37 +1114,37 @@ msgstr "Jag vill posta inlägg via min email."
msgid "Publish a MicroID for my email address."
msgstr "Publicera ett MicroID för min emailadress."
-#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/emailsettings.php:302 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
msgstr "Inställningar sparade."
-#: actions/emailsettings.php:319
+#: actions/emailsettings.php:320
msgid "No email address."
msgstr "Ingen emailadress."
-#: actions/emailsettings.php:326
+#: actions/emailsettings.php:327
msgid "Cannot normalize that email address"
msgstr "Kan inte normalisera den emailadressen"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "Ingen giltig emailadress"
-#: actions/emailsettings.php:333
+#: actions/emailsettings.php:334
msgid "That is already your email address."
msgstr "Det är redan din emailadress."
-#: actions/emailsettings.php:336
+#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
msgstr "Den emailadressen tillhör redan en annan användare."
-#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Kunde inte lägga till bekräftelsekoden."
-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1215,47 +1153,47 @@ msgstr ""
"Kontrollera din inbox (och spamlådan!) efter kod och instruktioner hur du "
"använder den."
-#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
msgstr "Ingen väntande bekräftelse att avbryta."
-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
msgstr "Det är fel IM adress."
-#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
msgstr "Verifikation avbruten"
-#: actions/emailsettings.php:412
+#: actions/emailsettings.php:413
msgid "That is not your email address."
msgstr "Det är inte din emailadress."
-#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
msgstr "Adressen är borttagen."
-#: actions/emailsettings.php:445 actions/smssettings.php:518
+#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
msgstr "Ingen inkommande emailadress."
-#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
msgid "Couldn't update user record."
msgstr "Kunde inte uppdatera användarens inställningar."
-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
msgstr "Inkommande emailadress borttagen."
-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555
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"
@@ -1530,7 +1468,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
msgid "Admin"
msgstr ""
@@ -1591,7 +1529,7 @@ msgid ""
msgstr ""
#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/subgroupnav.php:98
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1811,7 +1749,7 @@ msgstr "Personligt meddelande"
msgid "Optionally add a personal message to the invitation."
msgstr "Om du vill, skriv ett personligt meddelande med inbjudan."
-#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
msgstr "Skicka"
@@ -1937,7 +1875,7 @@ msgstr "Felaktigt användarnamn eller lösenord."
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:457
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Logga in"
@@ -2050,7 +1988,7 @@ msgstr "Nytt meddelande"
msgid "Direct message to %s sent"
msgstr ""
-#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
msgid "Ajax Error"
msgstr ""
@@ -2058,7 +1996,7 @@ msgstr ""
msgid "New notice"
msgstr "Nytt inlägg"
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
#, fuzzy
msgid "Notice posted"
msgstr "Inlägg"
@@ -2095,12 +2033,12 @@ msgid ""
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
-#: actions/noticesearchrss.php:89
+#: actions/noticesearchrss.php:96
#, fuzzy, php-format
msgid "Updates with \"%s\""
msgstr "Uppdateringar från %1$s på %2$s!"
-#: actions/noticesearchrss.php:91
+#: actions/noticesearchrss.php:98
#, fuzzy, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
msgstr "Alla uppdateringar som matchar söksträngen \"%s\""
@@ -2229,9 +2167,9 @@ msgstr "Minst 6 tecken"
msgid "Confirm"
msgstr "Bekräfta"
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "samma som lösenordet ovan"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Samma som lösenordet ovan"
#: actions/passwordsettings.php:117
msgid "Change"
@@ -2261,6 +2199,114 @@ msgstr "Kan inte spara det nya lösenordet."
msgid "Password saved."
msgstr "Lösenord är sparat."
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr ""
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr ""
+
+#: actions/pathsadminpanel.php:140
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Denna sida är inte tillgänglig i den mediatyp du accepterat"
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+#, fuzzy
+msgid "Site"
+msgstr "Bjud in"
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+#, fuzzy
+msgid "Site path"
+msgstr "Nytt inlägg"
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr ""
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Avatars"
+msgstr "Användarbild"
+
+#: actions/pathsadminpanel.php:252
+#, fuzzy
+msgid "Avatar server"
+msgstr "Twitter inställningar"
+
+#: actions/pathsadminpanel.php:256
+#, fuzzy
+msgid "Avatar path"
+msgstr "Användarbilden uppdaterad."
+
+#: actions/pathsadminpanel.php:260
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Användarbilden uppdaterad."
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:297
+#, fuzzy
+msgid "Save paths"
+msgstr "Nytt inlägg"
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -2363,7 +2409,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr "Språk"
@@ -2593,10 +2639,6 @@ msgstr "Okänd funktion"
msgid "6 or more characters, and don't forget it!"
msgstr "Minst 6 tecken och glöm inte bort det!"
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Samma som lösenordet ovan"
-
#: actions/recoverpassword.php:243
msgid "Reset"
msgstr "Återställ"
@@ -2658,7 +2700,7 @@ msgstr "Fel uppstog med bekräftelsekoden."
msgid "Registration successful"
msgstr "Registreringen är genomförd"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrera"
@@ -2704,7 +2746,7 @@ msgid "Same as password above. Required."
msgstr "Samma som lösenordet ovan. Måste fyllas i."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Epost"
@@ -2813,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"
@@ -3151,11 +3193,6 @@ msgstr "Du kan inte skicka meddelande till den användaren."
msgid "User is already silenced."
msgstr "Användaren har ingen profil."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
-#, fuzzy
-msgid "Site"
-msgstr "Bjud in"
-
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
msgstr ""
@@ -3187,103 +3224,99 @@ msgid "Snapshot frequency must be a number."
msgstr ""
#: actions/siteadminpanel.php:199
-msgid "You must set an SSL sever when enabling SSL."
+msgid "You must set an SSL server when enabling SSL."
msgstr ""
#: actions/siteadminpanel.php:204
-msgid "Invalid SSL server. Max length is 255 characters."
+msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
#: actions/siteadminpanel.php:210
-msgid "Minimum text limit is 140c."
+msgid "Minimum text limit is 140 characters."
msgstr ""
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:224
-#, php-format
-msgid "Locales directory not readable: %s"
+#: actions/siteadminpanel.php:266
+msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:275
+#: actions/siteadminpanel.php:269
#, fuzzy
msgid "Site name"
msgstr "Nytt inlägg"
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:279
+#: actions/siteadminpanel.php:274
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:280
+#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:283
+#: actions/siteadminpanel.php:279
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:284
#, fuzzy
-msgid "contact email address for your site"
+msgid "Contact email address for your site"
msgstr "Ny emailadress för att skicka till %s"
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:290
+#, fuzzy
+msgid "Local"
+msgstr "Plats"
+
+#: actions/siteadminpanel.php:301
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:303
+#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:308
#, fuzzy
msgid "Default site language"
msgstr "Språkval"
#: actions/siteadminpanel.php:316
-msgid "Path to locales"
+msgid "URLs"
msgstr ""
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
-msgstr ""
-
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
#, fuzzy
msgid "Server"
msgstr "Återställ"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
msgstr ""
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-#, fuzzy
-msgid "Site path"
-msgstr "Nytt inlägg"
-
-#: actions/siteadminpanel.php:328
+#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
msgstr ""
-#: actions/siteadminpanel.php:330
+#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
+#: actions/siteadminpanel.php:331
+#, fuzzy
+msgid "Access"
+msgstr "Acceptera"
+
#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
@@ -3302,7 +3335,7 @@ msgstr "Bjud in"
msgid "Make registration invitation only."
msgstr ""
-#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#: actions/siteadminpanel.php:346
#, fuzzy
msgid "Closed"
msgstr "Ingen sådan användare"
@@ -3311,33 +3344,37 @@ msgstr "Ingen sådan användare"
msgid "Disable new registrations."
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
#, fuzzy
msgid "Never"
msgstr "Återställ"
-#: actions/siteadminpanel.php:357
+#: actions/siteadminpanel.php:360
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:358
+#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:364
+#: actions/siteadminpanel.php:366
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:365
-msgid "Snapshots will be sent once every N Web hits"
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
msgstr ""
#: actions/siteadminpanel.php:372
@@ -3348,48 +3385,57 @@ msgstr ""
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:381
+#: actions/siteadminpanel.php:380
+#, fuzzy
+msgid "SSL"
+msgstr "SMS"
+
+#: actions/siteadminpanel.php:384
#, fuzzy
msgid "Sometimes"
msgstr "Inlägg"
-#: actions/siteadminpanel.php:382
+#: actions/siteadminpanel.php:385
msgid "Always"
msgstr ""
-#: actions/siteadminpanel.php:384
+#: actions/siteadminpanel.php:387
msgid "Use SSL"
msgstr ""
-#: actions/siteadminpanel.php:385
+#: actions/siteadminpanel.php:388
msgid "When to use SSL"
msgstr ""
-#: actions/siteadminpanel.php:391
+#: actions/siteadminpanel.php:393
msgid "SSL Server"
msgstr ""
-#: actions/siteadminpanel.php:392
+#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr ""
+
+#: actions/siteadminpanel.php:403
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
#, fuzzy
msgid "Save site settings"
msgstr "Twitter inställningar"
@@ -3710,7 +3756,8 @@ msgstr "Lämnar pren."
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
-#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
msgid "User"
msgstr ""
@@ -3718,17 +3765,89 @@ msgstr ""
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr ""
+
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:178
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr ""
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Profil"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr ""
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
+msgstr ""
+
+#: actions/useradminpanel.php:231
#, fuzzy
-msgid "Invite-only"
-msgstr "Bjud in"
+msgid "New users"
+msgstr "Bjud in nya användare"
+
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr ""
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr ""
+
+#: actions/useradminpanel.php:241
+#, fuzzy
+msgid "Default subscription"
+msgstr "Alla prenumerationer"
+
+#: actions/useradminpanel.php:242
+#, fuzzy
+msgid "Automatically subscribe new users to this user."
+msgstr ""
+"Automatisk prenummeration på den som prenumererar på mig. (Bäst för icke "
+"mänsklig användare) "
+
+#: actions/useradminpanel.php:251
+#, fuzzy
+msgid "Invitations"
+msgstr "Inbjudan(ar) skickad"
+
+#: actions/useradminpanel.php:256
+#, fuzzy
+msgid "Invitations enabled"
+msgstr "Inbjudan(ar) skickad"
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr ""
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr ""
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/userauthorization.php:105
@@ -3938,7 +4057,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"
@@ -3958,10 +4077,6 @@ msgstr "Kunde inte skapa prenumeration."
msgid "Welcome to %1$s, @%2$s!"
msgstr "Meddelande till %1$s på %2$s"
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr "Profil"
-
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Ändra dina profilinställningar"
@@ -4001,139 +4116,139 @@ msgstr "%s(%s)"
msgid "Untitled page"
msgstr ""
-#: lib/action.php:424
+#: lib/action.php:425
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Home"
msgstr "Hem"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:432
+#: lib/action.php:433
#, fuzzy
msgid "Account"
msgstr "Om"
-#: lib/action.php:432
+#: lib/action.php:433
#, fuzzy
msgid "Change your email, avatar, password, profile"
msgstr "Ändra ditt lösenord"
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect"
msgstr "Anslut"
-#: lib/action.php:435
+#: lib/action.php:436
#, fuzzy
msgid "Connect to services"
msgstr "Kunde inte skicka vidare till servern: %s"
-#: lib/action.php:439
+#: lib/action.php:440
#, fuzzy
msgid "Change site configuration"
msgstr "Prenumerationer"
-#: lib/action.php:443 lib/subgroupnav.php:105
+#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Bjud in"
-#: lib/action.php:444 lib/subgroupnav.php:106
+#: lib/action.php:445 lib/subgroupnav.php:106
#, fuzzy, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
"Använd detta formulär för att bjuda in dina vänner och kollegor till denna "
"sida."
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout"
msgstr "Logga ut"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:454
+#: lib/action.php:455
#, fuzzy
msgid "Create an account"
msgstr "Skapa ett nytt konto"
-#: lib/action.php:457
+#: lib/action.php:458
msgid "Login to the site"
msgstr ""
-#: lib/action.php:460 lib/action.php:723
+#: lib/action.php:461 lib/action.php:724
msgid "Help"
msgstr "Hjälp"
-#: lib/action.php:460
+#: lib/action.php:461
#, fuzzy
msgid "Help me!"
msgstr "Hjälp"
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
msgstr "Sök"
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:484
+#: lib/action.php:485
#, fuzzy
msgid "Site notice"
msgstr "Nytt inlägg"
-#: lib/action.php:550
+#: lib/action.php:551
msgid "Local views"
msgstr ""
-#: lib/action.php:616
+#: lib/action.php:617
#, fuzzy
msgid "Page notice"
msgstr "Nytt inlägg"
-#: lib/action.php:718
+#: lib/action.php:719
#, fuzzy
msgid "Secondary site navigation"
msgstr "Prenumerationer"
-#: lib/action.php:725
+#: lib/action.php:726
msgid "About"
msgstr "Om"
-#: lib/action.php:727
+#: lib/action.php:728
msgid "FAQ"
msgstr "Frågor & svar"
-#: lib/action.php:731
+#: lib/action.php:732
msgid "TOS"
msgstr ""
-#: lib/action.php:734
+#: lib/action.php:735
msgid "Privacy"
msgstr "Sekretesspolicy"
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
msgstr "Källa"
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Contact"
msgstr "Kontakta"
-#: lib/action.php:740
+#: lib/action.php:741
msgid "Badge"
msgstr ""
-#: lib/action.php:768
+#: lib/action.php:769
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:771
+#: lib/action.php:772
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4142,12 +4257,12 @@ msgstr ""
"**%%site.name%%** är en mikroblogg service för dig ifrån [%%site.broughtby%%]"
"(%%site.broughtbyurl%%)"
-#: lib/action.php:773
+#: lib/action.php:774
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** är en mikroblogg service."
-#: lib/action.php:775
+#: lib/action.php:776
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4158,34 +4273,34 @@ msgstr ""
"version %s, tillgängligt under [GNU Affero General Public License](http://"
"www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:789
+#: lib/action.php:790
#, fuzzy
msgid "Site content license"
msgstr "Sök innehåll i inlägg"
-#: lib/action.php:798
+#: lib/action.php:799
msgid "All "
msgstr ""
-#: lib/action.php:803
+#: lib/action.php:804
msgid "license."
msgstr ""
-#: lib/action.php:1067
+#: lib/action.php:1068
msgid "Pagination"
msgstr ""
-#: lib/action.php:1076
+#: lib/action.php:1077
#, fuzzy
msgid "After"
msgstr "« Nyare"
-#: lib/action.php:1084
+#: lib/action.php:1085
#, fuzzy
msgid "Before"
msgstr "Tidigare »"
-#: lib/action.php:1132
+#: lib/action.php:1133
#, fuzzy
msgid "There was a problem with your session token."
msgstr "Det var något problem med din session. Försök igen, tack."
@@ -4218,6 +4333,11 @@ msgstr "Bekräfta epostadress"
msgid "Design configuration"
msgstr "SMS Bekräftelse"
+#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+#, fuzzy
+msgid "Paths configuration"
+msgstr "SMS Bekräftelse"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4392,11 +4512,10 @@ msgid "You are not subscribed to anyone."
msgstr "Du skickade inte oss den profilen"
#: lib/command.php:620
-#, fuzzy
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
-msgstr[0] "Du skickade inte oss den profilen"
-msgstr[1] "Du skickade inte oss den profilen"
+msgstr[0] "Du prenumererar redan på dessa användare:"
+msgstr[1] "Du prenumererar redan på dessa användare:"
#: lib/command.php:640
#, fuzzy
@@ -4404,7 +4523,6 @@ msgid "No one is subscribed to you."
msgstr "Kunde inte prenumerera på annat åt dig."
#: lib/command.php:642
-#, fuzzy
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Kunde inte prenumerera på annat åt dig."
@@ -4416,7 +4534,6 @@ msgid "You are not a member of any groups."
msgstr "Du skickade inte oss den profilen"
#: lib/command.php:664
-#, fuzzy
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"
@@ -4500,9 +4617,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: "
@@ -4604,7 +4722,7 @@ msgstr "Var du håller till, såsom \"Stad, Län, Land\""
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
-#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85
msgid "Group"
msgstr ""
@@ -4651,7 +4769,7 @@ msgstr ""
msgid "Tags in %s group's notices"
msgstr ""
-#: lib/htmloutputter.php:104
+#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
msgstr "Denna sida är inte tillgänglig i den mediatyp du accepterat"
@@ -4686,6 +4804,14 @@ msgstr "Inget sådant inlägg."
msgid "Unknown file type"
msgstr "okänd fil typ"
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
@@ -4721,7 +4847,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:424
+#: lib/mailbox.php:227 lib/noticelist.php:452
#, fuzzy
msgid "from"
msgstr "från"
@@ -4975,40 +5101,66 @@ msgstr "Tabort inlägg"
msgid "To"
msgstr ""
-#: lib/messageform.php:162 lib/noticeform.php:173
+#: lib/messageform.php:162 lib/noticeform.php:186
#, fuzzy
msgid "Available characters"
msgstr "Minst 6 tecken"
-#: lib/noticeform.php:145
+#: lib/noticeform.php:158
#, fuzzy
msgid "Send a notice"
msgstr "Skicka ett meddelande"
-#: lib/noticeform.php:158
+#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
msgstr "Vad är på gång, %s?"
-#: lib/noticeform.php:180
+#: lib/noticeform.php:193
msgid "Attach"
msgstr ""
-#: lib/noticeform.php:184
+#: lib/noticeform.php:197
msgid "Attach a file"
msgstr ""
-#: lib/noticelist.php:478
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "Nej"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr ""
+
+#: lib/noticelist.php:506
#, fuzzy
msgid "in context"
msgstr "Inget innehåll!"
-#: lib/noticelist.php:498
+#: lib/noticelist.php:526
#, fuzzy
msgid "Reply to this notice"
msgstr "Svara på detta inlägg"
-#: lib/noticelist.php:499
+#: lib/noticelist.php:527
#, fuzzy
msgid "Reply"
msgstr "svar"
@@ -5043,11 +5195,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."
@@ -5158,6 +5310,10 @@ msgstr "Ingen sådan användare"
msgid "Search site"
msgstr "Sök"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
#, fuzzy
msgid "Search help"
@@ -5171,11 +5327,6 @@ msgstr "Personer"
msgid "Find people on this site"
msgstr "Sök personer på denna sida"
-#: lib/searchgroupnav.php:82
-#, fuzzy
-msgid "Notice"
-msgstr "Inlägg"
-
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
msgstr "Sök innehåll i inlägg"
@@ -5322,47 +5473,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"
@@ -5391,11 +5546,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 "Unlock this user"
-#~ msgstr "Ingen sådan användare"
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "Fjärrprenumerera"
diff --git a/locale/te/LC_MESSAGES/statusnet.mo b/locale/te/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 9a225e09b..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 cb02d50f6..65a32c04e 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -8,16 +8,16 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 10:43+0000\n"
-"PO-Revision-Date: 2009-11-18 19:32:42+0000\n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-11-28 19:50:58+0000\n"
"Language-Team: Telugu\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: te\n"
"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
@@ -364,9 +364,8 @@ msgstr "మారుపేరు పేరుతో సమానంగా ఉం
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
-#, fuzzy
msgid "Group not found!"
-msgstr "దొరకలేదు"
+msgstr "గుంపు దొరకలేదు!"
#: actions/apigroupjoin.php:110
msgid "You are already a member of that group."
@@ -437,7 +436,7 @@ msgstr "ఇది చాలా పొడవుంది. గరిష్ఠ స
msgid "Not found"
msgstr "దొరకలేదు"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -551,7 +550,7 @@ msgid "Preview"
msgstr "మునుజూపు"
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
+#: lib/noticelist.php:550
msgid "Delete"
msgstr "తొలగించు"
@@ -564,7 +563,7 @@ msgid "Crop"
msgstr "కత్తిరించు"
#: actions/avatarsettings.php:265 actions/disfavor.php:74
-#: actions/emailsettings.php:237 actions/favor.php:75
+#: 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
@@ -579,7 +578,7 @@ msgid "There was a problem with your session token. Try again, please."
msgstr ""
#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
-#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: 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."
@@ -711,15 +710,15 @@ msgstr "గుర్తుతెలియని చిరునామా రక
msgid "That address has already been confirmed."
msgstr "ఆ చిరునామా ఇప్పటికే నిర్ధారితమైంది."
-#: actions/confirmaddress.php:114 actions/emailsettings.php:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
#: actions/profilesettings.php:276 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
msgstr "ఈమెయిల్ నిర్ధారణని తొలగించలేకున్నాం."
@@ -738,7 +737,7 @@ msgid "Conversation"
msgstr "సంభాషణ"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206
+#: lib/profileaction.php:206 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "సందేశాలు"
@@ -778,7 +777,7 @@ msgstr "మీరు నిజంగానే ఈ నోటీసుని త
msgid "Do not delete this notice"
msgstr "ఈ నోటీసుని తొలగించలేము."
-#: actions/deletenotice.php:146 lib/noticelist.php:522
+#: actions/deletenotice.php:146 lib/noticelist.php:550
msgid "Delete this notice"
msgstr "ఈ నోటీసుని తొలగించు"
@@ -797,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 ""
@@ -808,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
@@ -821,182 +818,113 @@ msgstr "రూపురేఖలు"
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:278
+#: actions/designadminpanel.php:270
#, fuzzy
msgid "Invalid logo URL."
msgstr "తప్పుడు పరిమాణం."
-#: actions/designadminpanel.php:282
+#: actions/designadminpanel.php:274
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "హోమ్ పేజీ URL సరైనది కాదు."
-#: actions/designadminpanel.php:288
-#, fuzzy, php-format
-msgid "Theme directory not readable: %s"
-msgstr "హోమ్ పేజీ URL సరైనది కాదు."
-
-#: actions/designadminpanel.php:292
-#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:296
-#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:312
-#, php-format
-msgid "Max length for %s %s is 255 characters."
-msgstr ""
-
-#: actions/designadminpanel.php:412
+#: actions/designadminpanel.php:370
#, fuzzy
msgid "Change logo"
msgstr "రంగులను మార్చు"
-#: actions/designadminpanel.php:417
-#, fuzzy
+#: actions/designadminpanel.php:375
msgid "Site logo"
-msgstr "ఆహ్వానించు"
+msgstr "సైటు చిహ్నం"
-#: actions/designadminpanel.php:424
-#, fuzzy
+#: actions/designadminpanel.php:382
msgid "Change theme"
-msgstr "మార్చు"
+msgstr "అలంకారాన్ని మార్చు"
-#: actions/designadminpanel.php:441
-#, fuzzy
+#: actions/designadminpanel.php:399
msgid "Site theme"
-msgstr "కొత్త సందేశం"
+msgstr "సైటు అలంకారం"
-#: actions/designadminpanel.php:442
+#: actions/designadminpanel.php:400
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:447
-msgid "Theme server"
-msgstr ""
-
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
-
-#: actions/designadminpanel.php:455
-msgid "Theme directory"
-msgstr ""
-
-#: actions/designadminpanel.php:462
-#, fuzzy
-msgid "Avatar Settings"
-msgstr "అవతారపు అమరికలు"
-
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Avatar server"
-msgstr "అవతారపు అమరికలు"
-
-#: actions/designadminpanel.php:471
-#, fuzzy
-msgid "Avatar path"
-msgstr "అవతారాన్ని తాజాకరించాం."
-
-#: actions/designadminpanel.php:475
-#, fuzzy
-msgid "Avatar directory"
-msgstr "అవతారాన్ని తొలగించాం."
-
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
msgstr "నేపథ్య చిత్రాన్ని మార్చు"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
msgstr "నేపథ్యం"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:422
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "మీ స్వంత నేపథ్యపు చిత్రాన్ని మీరు ఎక్కించవచ్చు. గరిష్ఠ ఫైలు పరిమాణం 2మెబై."
-#: actions/designadminpanel.php:526 lib/designsettings.php:139
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:542 lib/designsettings.php:155
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:543 lib/designsettings.php:156
+#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:548 lib/designsettings.php:161
+#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:554
-#, fuzzy
-msgid "Background server"
-msgstr "నేపథ్యం"
-
-#: actions/designadminpanel.php:558
-#, fuzzy
-msgid "Background path"
-msgstr "నేపథ్యం"
-
-#: actions/designadminpanel.php:562
-#, fuzzy
-msgid "Background directory"
-msgstr "నేపథ్యం"
-
-#: actions/designadminpanel.php:569 lib/designsettings.php:170
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
msgid "Change colours"
msgstr "రంగులను మార్చు"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "అనుసంధానించు"
-#: actions/designadminpanel.php:604 lib/designsettings.php:204
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
msgid "Sidebar"
msgstr "పక్కపట్టీ"
-#: actions/designadminpanel.php:617 lib/designsettings.php:217
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
msgstr "పాఠ్యం"
-#: actions/designadminpanel.php:630 lib/designsettings.php:230
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
msgid "Links"
msgstr "లంకెలు"
-#: actions/designadminpanel.php:658 lib/designsettings.php:247
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:659 lib/designsettings.php:248
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:665 lib/designsettings.php:254
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 actions/useradminpanel.php:226
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/pathsadminpanel.php:296 actions/profilesettings.php:167
+#: actions/siteadminpanel.php:421 actions/smssettings.php:181
+#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/useradminpanel.php:313 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "భద్రపరచు"
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: actions/designadminpanel.php:582 lib/designsettings.php:257
msgid "Save design"
msgstr "రూపురేఖలని భద్రపరచు"
@@ -1145,83 +1073,83 @@ msgstr ""
msgid "Publish a MicroID for my email address."
msgstr ""
-#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/emailsettings.php:302 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
msgstr "అభిరుచులు భద్రమయ్యాయి."
-#: actions/emailsettings.php:319
+#: actions/emailsettings.php:320
msgid "No email address."
msgstr "ఈమెయిలు చిరునామా లేదు."
-#: actions/emailsettings.php:326
+#: actions/emailsettings.php:327
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "సరైన ఈమెయిలు చిరునామా కాదు"
-#: actions/emailsettings.php:333
+#: actions/emailsettings.php:334
msgid "That is already your email address."
msgstr "అది ఇప్పటికే మీ ఈమెయిల్ చిరునామా."
-#: actions/emailsettings.php:336
+#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
msgstr "ఆ ఈమెయిల్ చిరునామా ఇప్పటేకే ఇతర వాడుకరికి సంబంధించినది."
-#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "నిర్ధారణ సంకేతాన్ని చేర్చలేకపోయాం."
-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
msgstr ""
-#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
msgstr "రద్దుచేయడానికి వేచివున్న నిర్ధారణలేమీ లేవు."
-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
msgstr "ఆ IM చిరునామా సరైనది కాదు."
-#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
msgstr "నిర్ధారణ రద్దయింది."
-#: actions/emailsettings.php:412
+#: actions/emailsettings.php:413
msgid "That is not your email address."
msgstr "అది మీ ఈమెయిలు చిరునామా కాదు."
-#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
msgstr "ఆ చిరునామాని తొలగించాం."
-#: actions/emailsettings.php:445 actions/smssettings.php:518
+#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
msgstr ""
-#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
msgid "Couldn't update user record."
msgstr ""
-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
msgstr ""
-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555
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 "ప్రాచుర్య నోటీసులు"
@@ -1476,7 +1404,7 @@ msgstr "%s గుంపు సభ్యులు, పేజీ %d"
msgid "A list of the users in this group."
msgstr "ఈ గుంపులో వాడుకరులు జాబితా."
-#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
msgid "Admin"
msgstr ""
@@ -1534,7 +1462,7 @@ msgid ""
msgstr ""
#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/subgroupnav.php:98
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "గుంపులు"
@@ -1737,7 +1665,7 @@ msgstr "వ్యక్తిగత సందేశం"
msgid "Optionally add a personal message to the invitation."
msgstr ""
-#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
msgstr "పంపించు"
@@ -1834,7 +1762,7 @@ msgstr "వాడుకరిపేరు లేదా సంకేతపదం
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:204 actions/login.php:257 lib/action.php:457
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "ప్రవేశించండి"
@@ -1942,7 +1870,7 @@ msgstr "సందేశాన్ని పంపించాం"
msgid "Direct message to %s sent"
msgstr ""
-#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
msgid "Ajax Error"
msgstr ""
@@ -1950,7 +1878,7 @@ msgstr ""
msgid "New notice"
msgstr "కొత్త సందేశం"
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
#, fuzzy
msgid "Notice posted"
msgstr "సందేశాలు"
@@ -1987,12 +1915,12 @@ msgid ""
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
-#: actions/noticesearchrss.php:89
+#: actions/noticesearchrss.php:96
#, fuzzy, php-format
msgid "Updates with \"%s\""
msgstr "%s యొక్క మైక్రోబ్లాగు"
-#: actions/noticesearchrss.php:91
+#: actions/noticesearchrss.php:98
#, fuzzy, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
msgstr "\"%s\"తో సరిపోలే అన్ని తాజాకరణలు"
@@ -2118,8 +2046,8 @@ msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షర
msgid "Confirm"
msgstr "నిర్థారించు"
-#: actions/passwordsettings.php:113
-msgid "same as password above"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
msgstr "పై సంకేతపదం వలెనే"
#: actions/passwordsettings.php:117
@@ -2150,6 +2078,117 @@ msgstr "కొత్త సంకేతపదాన్ని భద్రపర
msgid "Password saved."
msgstr "సంకేతపదం భద్రమయ్యింది."
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr ""
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr ""
+
+#: actions/pathsadminpanel.php:140
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "హోమ్ పేజీ URL సరైనది కాదు."
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+#, fuzzy
+msgid "Site"
+msgstr "ఆహ్వానించు"
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+#, fuzzy
+msgid "Site path"
+msgstr "కొత్త సందేశం"
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr "అలంకారం"
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:247
+msgid "Avatars"
+msgstr "అవతారాలు"
+
+#: actions/pathsadminpanel.php:252
+#, fuzzy
+msgid "Avatar server"
+msgstr "అవతారపు అమరికలు"
+
+#: actions/pathsadminpanel.php:256
+#, fuzzy
+msgid "Avatar path"
+msgstr "అవతారాన్ని తాజాకరించాం."
+
+#: actions/pathsadminpanel.php:260
+#, fuzzy
+msgid "Avatar directory"
+msgstr "అవతారాన్ని తొలగించాం."
+
+#: actions/pathsadminpanel.php:269
+#, fuzzy
+msgid "Backgrounds"
+msgstr "నేపథ్యం"
+
+#: actions/pathsadminpanel.php:273
+#, fuzzy
+msgid "Background server"
+msgstr "నేపథ్యం"
+
+#: actions/pathsadminpanel.php:277
+#, fuzzy
+msgid "Background path"
+msgstr "నేపథ్యం"
+
+#: actions/pathsadminpanel.php:281
+#, fuzzy
+msgid "Background directory"
+msgstr "నేపథ్యం"
+
+#: actions/pathsadminpanel.php:297
+#, fuzzy
+msgid "Save paths"
+msgstr "కొత్త సందేశం"
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -2249,7 +2288,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr "భాష"
@@ -2475,10 +2514,6 @@ msgstr ""
msgid "6 or more characters, and don't forget it!"
msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు, మర్చిపోకండి!"
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "పై సంకేతపదం వలెనే"
-
#: actions/recoverpassword.php:243
msgid "Reset"
msgstr ""
@@ -2538,7 +2573,7 @@ msgstr "నిర్ధారణ సంకేతంలో పొరపాటు.
msgid "Registration successful"
msgstr "నమోదు విజయవంతం"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "నమోదు"
@@ -2582,7 +2617,7 @@ msgid "Same as password above. Required."
msgstr "పై సంకేతపదం మరోసారి. తప్పనిసరి."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "ఈమెయిల్"
@@ -2668,7 +2703,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 "చందాచేరు"
@@ -2696,9 +2731,9 @@ msgid "Replies to %s"
msgstr "%sకి స్పందనలు"
#: actions/replies.php:127
-#, fuzzy, php-format
+#, php-format
msgid "Replies to %s, page %d"
-msgstr "%sకి స్పందనలు"
+msgstr "%sకి స్పందనలు, పేజీ %d"
#: actions/replies.php:144
#, fuzzy, php-format
@@ -2999,11 +3034,6 @@ msgstr ""
msgid "User is already silenced."
msgstr "వాడుకరిని ఇప్పటికే గుంపునుండి నిరోధించారు."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
-#, fuzzy
-msgid "Site"
-msgstr "ఆహ్వానించు"
-
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
msgstr ""
@@ -3035,103 +3065,98 @@ msgid "Snapshot frequency must be a number."
msgstr ""
#: actions/siteadminpanel.php:199
-msgid "You must set an SSL sever when enabling SSL."
+msgid "You must set an SSL server when enabling SSL."
msgstr ""
#: actions/siteadminpanel.php:204
-msgid "Invalid SSL server. Max length is 255 characters."
+msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
#: actions/siteadminpanel.php:210
-msgid "Minimum text limit is 140c."
+msgid "Minimum text limit is 140 characters."
msgstr ""
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:224
-#, php-format
-msgid "Locales directory not readable: %s"
-msgstr ""
+#: actions/siteadminpanel.php:266
+msgid "General"
+msgstr "సాధారణ"
-#: actions/siteadminpanel.php:275
-#, fuzzy
+#: actions/siteadminpanel.php:269
msgid "Site name"
-msgstr "కొత్త సందేశం"
+msgstr "సైటు పేరు"
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:279
+#: actions/siteadminpanel.php:274
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:280
+#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:283
+#: actions/siteadminpanel.php:279
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:284
#, fuzzy
-msgid "contact email address for your site"
+msgid "Contact email address for your site"
msgstr "ఈ వాడుకరికై నమోదైన ఈమెయిల్ చిరునామాలు ఏమీ లేవు."
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:290
+#, fuzzy
+msgid "Local"
+msgstr "ప్రాంతం"
+
+#: actions/siteadminpanel.php:301
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:303
+#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:308
#, fuzzy
msgid "Default site language"
msgstr "ప్రాథాన్యతా భాష"
#: actions/siteadminpanel.php:316
-msgid "Path to locales"
-msgstr ""
-
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
+msgid "URLs"
msgstr ""
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
#, fuzzy
msgid "Server"
msgstr "వైదొలగు"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
msgstr ""
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-#, fuzzy
-msgid "Site path"
-msgstr "కొత్త సందేశం"
-
-#: actions/siteadminpanel.php:328
+#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
msgstr ""
-#: actions/siteadminpanel.php:330
+#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
+#: actions/siteadminpanel.php:331
+#, fuzzy
+msgid "Access"
+msgstr "అంగీకరించు"
+
#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
@@ -3150,7 +3175,7 @@ msgstr "ఆహ్వానించు"
msgid "Make registration invitation only."
msgstr ""
-#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#: actions/siteadminpanel.php:346
#, fuzzy
msgid "Closed"
msgstr "అటువంటి వాడుకరి లేరు."
@@ -3159,33 +3184,37 @@ msgstr "అటువంటి వాడుకరి లేరు."
msgid "Disable new registrations."
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
#, fuzzy
msgid "Never"
msgstr "వైదొలగు"
-#: actions/siteadminpanel.php:357
+#: actions/siteadminpanel.php:360
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:358
+#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:364
+#: actions/siteadminpanel.php:366
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:365
-msgid "Snapshots will be sent once every N Web hits"
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
msgstr ""
#: actions/siteadminpanel.php:372
@@ -3196,49 +3225,57 @@ msgstr ""
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:381
+#: actions/siteadminpanel.php:380
+msgid "SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
#, fuzzy
msgid "Sometimes"
msgstr "సందేశాలు"
-#: actions/siteadminpanel.php:382
+#: actions/siteadminpanel.php:385
#, fuzzy
msgid "Always"
msgstr "మారుపేర్లు"
-#: actions/siteadminpanel.php:384
+#: actions/siteadminpanel.php:387
msgid "Use SSL"
msgstr ""
-#: actions/siteadminpanel.php:385
+#: actions/siteadminpanel.php:388
msgid "When to use SSL"
msgstr ""
-#: actions/siteadminpanel.php:391
+#: actions/siteadminpanel.php:393
msgid "SSL Server"
msgstr ""
-#: actions/siteadminpanel.php:392
+#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr "పరిమితులు"
+
+#: actions/siteadminpanel.php:403
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
#, fuzzy
msgid "Save site settings"
msgstr "అవతారపు అమరికలు"
@@ -3543,7 +3580,8 @@ msgstr "చందాదార్లు"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
-#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
msgid "User"
msgstr "వాడుకరి"
@@ -3551,17 +3589,85 @@ msgstr "వాడుకరి"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr ""
+
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
+msgstr ""
+
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr ""
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "ప్రొఫైలు"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr ""
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
+msgstr ""
+
+#: actions/useradminpanel.php:231
+msgid "New users"
+msgstr "కొత్త వాడుకరులు"
+
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr ""
+
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
msgstr ""
-#: actions/useradminpanel.php:178
+#: actions/useradminpanel.php:241
#, fuzzy
-msgid "Invite-only"
-msgstr "ఆహ్వానించు"
+msgid "Default subscription"
+msgstr "అన్ని చందాలు"
+
+#: actions/useradminpanel.php:242
+#, fuzzy
+msgid "Automatically subscribe new users to this user."
+msgstr "ఉపయోగించాల్సిన యాంత్రిక కుదింపు సేవ."
+
+#: actions/useradminpanel.php:251
+msgid "Invitations"
+msgstr "ఆహ్వానాలు"
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: actions/useradminpanel.php:256
+#, fuzzy
+msgid "Invitations enabled"
+msgstr "ఆహ్వానము(ల)ని పంపించాం"
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr ""
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr ""
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/userauthorization.php:105
@@ -3760,7 +3866,7 @@ msgstr ""
msgid "Problem saving notice."
msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
-#: classes/Notice.php:1117
+#: classes/Notice.php:1124
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
@@ -3779,10 +3885,6 @@ msgstr "చందాని సృష్టించలేకపోయాం."
msgid "Welcome to %1$s, @%2$s!"
msgstr "@%2$s, %1$sకి స్వాగతం!"
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr "ప్రొఫైలు"
-
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr ""
@@ -3821,133 +3923,133 @@ msgstr "%s - %s"
msgid "Untitled page"
msgstr ""
-#: lib/action.php:424
+#: lib/action.php:425
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Home"
msgstr "ముంగిలి"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Account"
msgstr "ఖాతా"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect"
msgstr "అనుసంధానించు"
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect to services"
msgstr ""
-#: lib/action.php:439
+#: lib/action.php:440
#, fuzzy
msgid "Change site configuration"
msgstr "చందాలు"
-#: lib/action.php:443 lib/subgroupnav.php:105
+#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
msgstr "ఆహ్వానించు"
-#: lib/action.php:444 lib/subgroupnav.php:106
+#: lib/action.php:445 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout"
msgstr "నిష్క్రమించు"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:454
+#: lib/action.php:455
msgid "Create an account"
msgstr "కొత్త ఖాతా సృష్టించు"
-#: lib/action.php:457
+#: lib/action.php:458
msgid "Login to the site"
msgstr ""
-#: lib/action.php:460 lib/action.php:723
+#: lib/action.php:461 lib/action.php:724
msgid "Help"
msgstr "సహాయం"
-#: lib/action.php:460
+#: lib/action.php:461
#, fuzzy
msgid "Help me!"
msgstr "సహాయం"
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
msgstr "వెతుకు"
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:484
+#: lib/action.php:485
#, fuzzy
msgid "Site notice"
msgstr "కొత్త సందేశం"
-#: lib/action.php:550
+#: lib/action.php:551
msgid "Local views"
msgstr ""
-#: lib/action.php:616
+#: lib/action.php:617
#, fuzzy
msgid "Page notice"
msgstr "కొత్త సందేశం"
-#: lib/action.php:718
+#: lib/action.php:719
#, fuzzy
msgid "Secondary site navigation"
msgstr "చందాలు"
-#: lib/action.php:725
+#: lib/action.php:726
msgid "About"
msgstr "గురించి"
-#: lib/action.php:727
+#: lib/action.php:728
msgid "FAQ"
msgstr "ప్రశ్నలు"
-#: lib/action.php:731
+#: lib/action.php:732
msgid "TOS"
msgstr "సేవా నియమాలు"
-#: lib/action.php:734
+#: lib/action.php:735
msgid "Privacy"
msgstr "అంతరంగికత"
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
msgstr "మూలము"
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Contact"
msgstr "సంప్రదించు"
-#: lib/action.php:740
+#: lib/action.php:741
msgid "Badge"
msgstr ""
-#: lib/action.php:768
+#: lib/action.php:769
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:771
+#: lib/action.php:772
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3956,12 +4058,12 @@ msgstr ""
"**%%site.name%%** అనేది [%%site.broughtby%%](%%site.broughtbyurl%%) వారు "
"అందిస్తున్న మైక్రో బ్లాగింగు సదుపాయం. "
-#: lib/action.php:773
+#: lib/action.php:774
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** అనేది మైక్రో బ్లాగింగు సదుపాయం."
-#: lib/action.php:775
+#: lib/action.php:776
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3972,32 +4074,32 @@ msgstr ""
"html) కింద లభ్యమయ్యే [స్టేటస్&zwnj;నెట్](http://status.net/) మైక్రోబ్లాగింగ్ ఉపకరణం సంచిక %s "
"పై నడుస్తుంది."
-#: lib/action.php:789
+#: lib/action.php:790
#, fuzzy
msgid "Site content license"
msgstr "కొత్త సందేశం"
-#: lib/action.php:798
+#: lib/action.php:799
msgid "All "
msgstr "అన్నీ "
-#: lib/action.php:803
+#: lib/action.php:804
msgid "license."
msgstr ""
-#: lib/action.php:1067
+#: lib/action.php:1068
msgid "Pagination"
msgstr "పేజీకరణ"
-#: lib/action.php:1076
+#: lib/action.php:1077
msgid "After"
msgstr "తర్వాత"
-#: lib/action.php:1084
+#: lib/action.php:1085
msgid "Before"
msgstr "ఇంతక్రితం"
-#: lib/action.php:1132
+#: lib/action.php:1133
msgid "There was a problem with your session token."
msgstr ""
@@ -4027,6 +4129,11 @@ msgstr "ఈమెయిల్ చిరునామా నిర్ధారణ"
msgid "Design configuration"
msgstr "SMS నిర్ధారణ"
+#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+#, fuzzy
+msgid "Paths configuration"
+msgstr "SMS నిర్ధారణ"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr "జోడింపులు"
@@ -4204,7 +4311,6 @@ msgid "You are not subscribed to anyone."
msgstr "%sకి స్పందనలు"
#: lib/command.php:620
-#, fuzzy
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "%sకి స్పందనలు"
@@ -4216,7 +4322,6 @@ msgid "No one is subscribed to you."
msgstr "%sకి స్పందనలు"
#: lib/command.php:642
-#, fuzzy
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "%sకి స్పందనలు"
@@ -4228,7 +4333,6 @@ msgid "You are not a member of any groups."
msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
#: lib/command.php:664
-#, fuzzy
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
@@ -4312,8 +4416,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
@@ -4411,7 +4516,7 @@ msgstr "మీరు ఎక్కడ నుండి, \"నగరం, రాష
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
-#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85
msgid "Group"
msgstr "గుంపు"
@@ -4457,7 +4562,7 @@ msgstr "ఎక్కువ టపాలున్న గుంపులు"
msgid "Tags in %s group's notices"
msgstr ""
-#: lib/htmloutputter.php:104
+#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
msgstr ""
@@ -4491,6 +4596,14 @@ msgstr "అటువంటి సందేశమేమీ లేదు."
msgid "Unknown file type"
msgstr "తెలియని ఫైలు రకం"
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
@@ -4523,7 +4636,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:424
+#: lib/mailbox.php:227 lib/noticelist.php:452
msgid "from"
msgstr "నుండి"
@@ -4764,38 +4877,64 @@ msgstr ""
msgid "To"
msgstr ""
-#: lib/messageform.php:162 lib/noticeform.php:173
+#: lib/messageform.php:162 lib/noticeform.php:186
msgid "Available characters"
msgstr "అందుబాటులో ఉన్న అక్షరాలు"
-#: lib/noticeform.php:145
+#: lib/noticeform.php:158
#, fuzzy
msgid "Send a notice"
msgstr "కొత్త సందేశం"
-#: lib/noticeform.php:158
+#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
msgstr "%s, సంగతులేమిటి?"
-#: lib/noticeform.php:180
+#: lib/noticeform.php:193
msgid "Attach"
msgstr "జోడించు"
-#: lib/noticeform.php:184
+#: lib/noticeform.php:197
msgid "Attach a file"
msgstr "ఒక ఫైలుని జోడించు"
-#: lib/noticelist.php:478
+#: 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
+#, fuzzy
+msgid "N"
+msgstr "కాదు"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr ""
+
+#: lib/noticelist.php:506
#, fuzzy
msgid "in context"
msgstr "విషయం లేదు!"
-#: lib/noticelist.php:498
+#: lib/noticelist.php:526
msgid "Reply to this notice"
msgstr "ఈ నోటీసుపై స్పందించండి"
-#: lib/noticelist.php:499
+#: lib/noticelist.php:527
msgid "Reply"
msgstr "స్పందించండి"
@@ -4829,11 +4968,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 ""
@@ -4941,6 +5080,10 @@ msgstr "అటువంటి వాడుకరి లేరు."
msgid "Search site"
msgstr "వెతుకు"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr "కీపదము(లు)"
+
#: lib/searchaction.php:162
#, fuzzy
msgid "Search help"
@@ -4954,11 +5097,6 @@ msgstr "ప్రజలు"
msgid "Find people on this site"
msgstr ""
-#: lib/searchgroupnav.php:82
-#, fuzzy
-msgid "Notice"
-msgstr "సందేశాలు"
-
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
msgstr ""
@@ -5098,47 +5236,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 "ఒక సంవత్సరం క్రితం"
@@ -5167,11 +5309,3 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
-
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "అటువంటి వాడుకరి లేరు."
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "%sకి స్పందనలు"
diff --git a/locale/tr/LC_MESSAGES/statusnet.mo b/locale/tr/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index c2079ecf0..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 76336f905..23f9bc91e 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 10:43+0000\n"
-"PO-Revision-Date: 2009-11-18 19:32:45+0000\n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-11-28 19:51:01+0000\n"
"Language-Team: Turkish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: tr\n"
"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
@@ -444,7 +444,7 @@ msgstr ""
msgid "Not found"
msgstr ""
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -561,7 +561,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
+#: lib/noticelist.php:550
msgid "Delete"
msgstr ""
@@ -574,7 +574,7 @@ msgid "Crop"
msgstr ""
#: actions/avatarsettings.php:265 actions/disfavor.php:74
-#: actions/emailsettings.php:237 actions/favor.php:75
+#: 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
@@ -589,7 +589,7 @@ msgid "There was a problem with your session token. Try again, please."
msgstr ""
#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
-#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: 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."
@@ -726,15 +726,15 @@ msgstr "Tanınmayan adres türü %s"
msgid "That address has already been confirmed."
msgstr "O adres daha önce onaylanmış."
-#: actions/confirmaddress.php:114 actions/emailsettings.php:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
#: actions/profilesettings.php:276 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Kullanıcı güncellenemedi."
-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
msgstr "Eposta onayı silinemedi."
@@ -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/profileaction.php:206 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Durum mesajları"
@@ -794,7 +794,7 @@ msgstr ""
msgid "Do not delete this notice"
msgstr "Böyle bir durum mesajı yok."
-#: actions/deletenotice.php:146 lib/noticelist.php:522
+#: actions/deletenotice.php:146 lib/noticelist.php:550
msgid "Delete this notice"
msgstr ""
@@ -836,102 +836,50 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:278
+#: actions/designadminpanel.php:270
#, fuzzy
msgid "Invalid logo URL."
msgstr "Geçersiz büyüklük."
-#: actions/designadminpanel.php:282
+#: actions/designadminpanel.php:274
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
-#: actions/designadminpanel.php:288
-#, fuzzy, php-format
-msgid "Theme directory not readable: %s"
-msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
-
-#: actions/designadminpanel.php:292
-#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:296
-#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:312
-#, php-format
-msgid "Max length for %s %s is 255 characters."
-msgstr ""
-
-#: actions/designadminpanel.php:412
+#: actions/designadminpanel.php:370
#, fuzzy
msgid "Change logo"
msgstr "Parolayı değiştir"
-#: actions/designadminpanel.php:417
+#: actions/designadminpanel.php:375
#, fuzzy
msgid "Site logo"
msgstr "Yeni durum mesajı"
-#: actions/designadminpanel.php:424
+#: actions/designadminpanel.php:382
#, fuzzy
msgid "Change theme"
msgstr "Değiştir"
-#: actions/designadminpanel.php:441
+#: actions/designadminpanel.php:399
#, fuzzy
msgid "Site theme"
msgstr "Yeni durum mesajı"
-#: actions/designadminpanel.php:442
+#: actions/designadminpanel.php:400
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:447
-msgid "Theme server"
-msgstr ""
-
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
-
-#: actions/designadminpanel.php:455
-msgid "Theme directory"
-msgstr ""
-
-#: actions/designadminpanel.php:462
-#, fuzzy
-msgid "Avatar Settings"
-msgstr "Ayarlar"
-
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Avatar server"
-msgstr "Ayarlar"
-
-#: actions/designadminpanel.php:471
-#, fuzzy
-msgid "Avatar path"
-msgstr "Avatar güncellendi."
-
-#: actions/designadminpanel.php:475
-#, fuzzy
-msgid "Avatar directory"
-msgstr "Avatar güncellendi."
-
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:422
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -939,80 +887,69 @@ msgid ""
msgstr ""
"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
-#: actions/designadminpanel.php:526 lib/designsettings.php:139
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:542 lib/designsettings.php:155
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:543 lib/designsettings.php:156
+#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:548 lib/designsettings.php:161
+#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:554
-msgid "Background server"
-msgstr ""
-
-#: actions/designadminpanel.php:558
-msgid "Background path"
-msgstr ""
-
-#: actions/designadminpanel.php:562
-msgid "Background directory"
-msgstr ""
-
-#: actions/designadminpanel.php:569 lib/designsettings.php:170
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Parolayı değiştir"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Bağlan"
-#: actions/designadminpanel.php:604 lib/designsettings.php:204
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Ara"
-#: actions/designadminpanel.php:617 lib/designsettings.php:217
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
msgstr ""
-#: actions/designadminpanel.php:630 lib/designsettings.php:230
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Giriş"
-#: actions/designadminpanel.php:658 lib/designsettings.php:247
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:659 lib/designsettings.php:248
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:665 lib/designsettings.php:254
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 actions/useradminpanel.php:226
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: 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 "Kaydet"
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: actions/designadminpanel.php:582 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1163,83 +1100,83 @@ msgstr ""
msgid "Publish a MicroID for my email address."
msgstr ""
-#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/emailsettings.php:302 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
msgstr "Tercihler kaydedildi."
-#: actions/emailsettings.php:319
+#: actions/emailsettings.php:320
msgid "No email address."
msgstr ""
-#: actions/emailsettings.php:326
+#: actions/emailsettings.php:327
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr ""
-#: actions/emailsettings.php:333
+#: actions/emailsettings.php:334
msgid "That is already your email address."
msgstr ""
-#: actions/emailsettings.php:336
+#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
msgstr ""
-#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Onay kodu eklenemedi."
-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
msgstr ""
-#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
msgstr "İptal etmek için beklenen onay yok."
-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
msgstr "Yanlış IM adresi."
-#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
msgstr "Onaylama iptal edildi."
-#: actions/emailsettings.php:412
+#: actions/emailsettings.php:413
msgid "That is not your email address."
msgstr ""
-#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
msgstr "Bu adres kaldırılmıştı."
-#: actions/emailsettings.php:445 actions/smssettings.php:518
+#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
msgstr ""
-#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
msgid "Couldn't update user record."
msgstr ""
-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
msgstr ""
-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555
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"
@@ -1505,7 +1442,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
msgid "Admin"
msgstr ""
@@ -1566,7 +1503,7 @@ msgid ""
msgstr ""
#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/subgroupnav.php:98
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1779,7 +1716,7 @@ msgstr ""
msgid "Optionally add a personal message to the invitation."
msgstr ""
-#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
msgstr "Gönder"
@@ -1879,7 +1816,7 @@ msgstr "Yanlış kullanıcı adı veya parola."
msgid "Error setting user. You are probably not authorized."
msgstr "Yetkilendirilmemiş."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:457
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Giriş"
@@ -1992,7 +1929,7 @@ msgstr ""
msgid "Direct message to %s sent"
msgstr ""
-#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
msgid "Ajax Error"
msgstr ""
@@ -2000,7 +1937,7 @@ msgstr ""
msgid "New notice"
msgstr "Yeni durum mesajı"
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
#, fuzzy
msgid "Notice posted"
msgstr "Durum mesajları"
@@ -2037,12 +1974,12 @@ msgid ""
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
-#: actions/noticesearchrss.php:89
+#: actions/noticesearchrss.php:96
#, fuzzy, php-format
msgid "Updates with \"%s\""
msgstr "%s adli kullanicinin durum mesajlari"
-#: actions/noticesearchrss.php:91
+#: actions/noticesearchrss.php:98
#, fuzzy, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
msgstr "\"%s\" kelimesinin geçtiği tüm güncellemeler"
@@ -2171,9 +2108,9 @@ msgstr "6 veya daha fazla karakter"
msgid "Confirm"
msgstr "Onayla"
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "yukaridaki parola ile aynı"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "yukarıdaki parolanın aynısı"
#: actions/passwordsettings.php:117
msgid "Change"
@@ -2203,6 +2140,113 @@ msgstr "Yeni parola kaydedilemedi."
msgid "Password saved."
msgstr "Parola kaydedildi."
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr ""
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr ""
+
+#: actions/pathsadminpanel.php:140
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+msgid "Site"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+#, fuzzy
+msgid "Site path"
+msgstr "Yeni durum mesajı"
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr ""
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Avatars"
+msgstr "Avatar"
+
+#: actions/pathsadminpanel.php:252
+#, fuzzy
+msgid "Avatar server"
+msgstr "Ayarlar"
+
+#: actions/pathsadminpanel.php:256
+#, fuzzy
+msgid "Avatar path"
+msgstr "Avatar güncellendi."
+
+#: actions/pathsadminpanel.php:260
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Avatar güncellendi."
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:297
+#, fuzzy
+msgid "Save paths"
+msgstr "Yeni durum mesajı"
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -2310,7 +2354,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr ""
@@ -2537,10 +2581,6 @@ msgstr ""
msgid "6 or more characters, and don't forget it!"
msgstr "Unutmayın, 6 veya daha fazla karakter"
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "yukarıdaki parolanın aynısı"
-
#: actions/recoverpassword.php:243
msgid "Reset"
msgstr "Sıfırla"
@@ -2602,7 +2642,7 @@ msgstr "Onay kodu hatası."
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Kayıt"
@@ -2646,7 +2686,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Eposta"
@@ -2735,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"
@@ -3071,10 +3111,6 @@ msgstr ""
msgid "User is already silenced."
msgstr "Kullanıcının profili yok."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
-msgid "Site"
-msgstr ""
-
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
msgstr ""
@@ -3106,102 +3142,98 @@ msgid "Snapshot frequency must be a number."
msgstr ""
#: actions/siteadminpanel.php:199
-msgid "You must set an SSL sever when enabling SSL."
+msgid "You must set an SSL server when enabling SSL."
msgstr ""
#: actions/siteadminpanel.php:204
-msgid "Invalid SSL server. Max length is 255 characters."
+msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
#: actions/siteadminpanel.php:210
-msgid "Minimum text limit is 140c."
+msgid "Minimum text limit is 140 characters."
msgstr ""
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:224
-#, php-format
-msgid "Locales directory not readable: %s"
+#: actions/siteadminpanel.php:266
+msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:275
+#: actions/siteadminpanel.php:269
#, fuzzy
msgid "Site name"
msgstr "Yeni durum mesajı"
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:279
+#: actions/siteadminpanel.php:274
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:280
+#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:283
+#: actions/siteadminpanel.php:279
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:284
#, fuzzy
-msgid "contact email address for your site"
+msgid "Contact email address for your site"
msgstr "Kullanıcı için kaydedilmiş eposta adresi yok."
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:290
+#, fuzzy
+msgid "Local"
+msgstr "Yer"
+
+#: actions/siteadminpanel.php:301
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:303
+#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:308
msgid "Default site language"
msgstr ""
#: actions/siteadminpanel.php:316
-msgid "Path to locales"
-msgstr ""
-
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
+msgid "URLs"
msgstr ""
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
#, fuzzy
msgid "Server"
msgstr "Geri al"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
msgstr ""
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-#, fuzzy
-msgid "Site path"
-msgstr "Yeni durum mesajı"
-
-#: actions/siteadminpanel.php:328
+#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
msgstr ""
-#: actions/siteadminpanel.php:330
+#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
+#: actions/siteadminpanel.php:331
+#, fuzzy
+msgid "Access"
+msgstr "Kabul et"
+
#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
@@ -3219,7 +3251,7 @@ msgstr ""
msgid "Make registration invitation only."
msgstr ""
-#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#: actions/siteadminpanel.php:346
#, fuzzy
msgid "Closed"
msgstr "Böyle bir kullanıcı yok."
@@ -3228,33 +3260,37 @@ msgstr "Böyle bir kullanıcı yok."
msgid "Disable new registrations."
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
#, fuzzy
msgid "Never"
msgstr "Geri al"
-#: actions/siteadminpanel.php:357
+#: actions/siteadminpanel.php:360
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:358
+#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:364
+#: actions/siteadminpanel.php:366
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:365
-msgid "Snapshots will be sent once every N Web hits"
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
msgstr ""
#: actions/siteadminpanel.php:372
@@ -3265,48 +3301,56 @@ msgstr ""
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:381
+#: actions/siteadminpanel.php:380
+msgid "SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
#, fuzzy
msgid "Sometimes"
msgstr "Durum mesajları"
-#: actions/siteadminpanel.php:382
+#: actions/siteadminpanel.php:385
msgid "Always"
msgstr ""
-#: actions/siteadminpanel.php:384
+#: actions/siteadminpanel.php:387
msgid "Use SSL"
msgstr ""
-#: actions/siteadminpanel.php:385
+#: actions/siteadminpanel.php:388
msgid "When to use SSL"
msgstr ""
-#: actions/siteadminpanel.php:391
+#: actions/siteadminpanel.php:393
msgid "SSL Server"
msgstr ""
-#: actions/siteadminpanel.php:392
+#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr ""
+
+#: actions/siteadminpanel.php:403
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
#, fuzzy
msgid "Save site settings"
msgstr "Ayarlar"
@@ -3616,7 +3660,8 @@ msgstr "Aboneliği sonlandır"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
-#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
msgid "User"
msgstr ""
@@ -3624,16 +3669,85 @@ msgstr ""
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr ""
+
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
+msgstr ""
+
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr ""
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Profil"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr ""
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:178
-msgid "Invite-only"
+#: actions/useradminpanel.php:231
+msgid "New users"
msgstr ""
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr ""
+
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr ""
+
+#: actions/useradminpanel.php:241
+#, fuzzy
+msgid "Default subscription"
+msgstr "Bütün abonelikler"
+
+#: actions/useradminpanel.php:242
+#, fuzzy
+msgid "Automatically subscribe new users to this user."
+msgstr "Takip talebine izin verildi"
+
+#: actions/useradminpanel.php:251
+#, fuzzy
+msgid "Invitations"
+msgstr "Yer"
+
+#: actions/useradminpanel.php:256
+msgid "Invitations enabled"
+msgstr ""
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr ""
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr ""
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/userauthorization.php:105
@@ -3836,7 +3950,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"
@@ -3856,10 +3970,6 @@ msgstr "Abonelik oluşturulamadı."
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr "Profil"
-
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr ""
@@ -3899,136 +4009,136 @@ msgstr ""
msgid "Untitled page"
msgstr ""
-#: lib/action.php:424
+#: lib/action.php:425
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Home"
msgstr "Başlangıç"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:432
+#: lib/action.php:433
#, fuzzy
msgid "Account"
msgstr "Hakkında"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect"
msgstr "Bağlan"
-#: lib/action.php:435
+#: lib/action.php:436
#, fuzzy
msgid "Connect to services"
msgstr "Sunucuya yönlendirme yapılamadı: %s"
-#: lib/action.php:439
+#: lib/action.php:440
#, fuzzy
msgid "Change site configuration"
msgstr "Abonelikler"
-#: lib/action.php:443 lib/subgroupnav.php:105
+#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:444 lib/subgroupnav.php:106
+#: lib/action.php:445 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout"
msgstr "Çıkış"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:454
+#: lib/action.php:455
#, fuzzy
msgid "Create an account"
msgstr "Yeni hesap oluştur"
-#: lib/action.php:457
+#: lib/action.php:458
msgid "Login to the site"
msgstr ""
-#: lib/action.php:460 lib/action.php:723
+#: lib/action.php:461 lib/action.php:724
msgid "Help"
msgstr "Yardım"
-#: lib/action.php:460
+#: lib/action.php:461
#, fuzzy
msgid "Help me!"
msgstr "Yardım"
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
msgstr "Ara"
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:484
+#: lib/action.php:485
#, fuzzy
msgid "Site notice"
msgstr "Yeni durum mesajı"
-#: lib/action.php:550
+#: lib/action.php:551
msgid "Local views"
msgstr ""
-#: lib/action.php:616
+#: lib/action.php:617
#, fuzzy
msgid "Page notice"
msgstr "Yeni durum mesajı"
-#: lib/action.php:718
+#: lib/action.php:719
#, fuzzy
msgid "Secondary site navigation"
msgstr "Abonelikler"
-#: lib/action.php:725
+#: lib/action.php:726
msgid "About"
msgstr "Hakkında"
-#: lib/action.php:727
+#: lib/action.php:728
msgid "FAQ"
msgstr "SSS"
-#: lib/action.php:731
+#: lib/action.php:732
msgid "TOS"
msgstr ""
-#: lib/action.php:734
+#: lib/action.php:735
msgid "Privacy"
msgstr "Gizlilik"
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
msgstr "Kaynak"
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Contact"
msgstr "İletişim"
-#: lib/action.php:740
+#: lib/action.php:741
msgid "Badge"
msgstr ""
-#: lib/action.php:768
+#: lib/action.php:769
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:771
+#: lib/action.php:772
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4037,12 +4147,12 @@ msgstr ""
"**%%site.name%%** [%%site.broughtby%%](%%site.broughtbyurl%%)\" tarafından "
"hazırlanan anında mesajlaşma ağıdır. "
-#: lib/action.php:773
+#: lib/action.php:774
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** bir aninda mesajlaşma sosyal ağıdır."
-#: lib/action.php:775
+#: lib/action.php:776
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4053,34 +4163,34 @@ msgstr ""
"licenses/agpl-3.0.html) lisansı ile korunan [StatusNet](http://status.net/) "
"microbloglama yazılımının %s. versiyonunu kullanmaktadır."
-#: lib/action.php:789
+#: lib/action.php:790
#, fuzzy
msgid "Site content license"
msgstr "Yeni durum mesajı"
-#: lib/action.php:798
+#: lib/action.php:799
msgid "All "
msgstr ""
-#: lib/action.php:803
+#: lib/action.php:804
msgid "license."
msgstr ""
-#: lib/action.php:1067
+#: lib/action.php:1068
msgid "Pagination"
msgstr ""
-#: lib/action.php:1076
+#: lib/action.php:1077
#, fuzzy
msgid "After"
msgstr "« Sonra"
-#: lib/action.php:1084
+#: lib/action.php:1085
#, fuzzy
msgid "Before"
msgstr "Önce »"
-#: lib/action.php:1132
+#: lib/action.php:1133
msgid "There was a problem with your session token."
msgstr ""
@@ -4110,6 +4220,11 @@ msgstr "Eposta adresi onayı"
msgid "Design configuration"
msgstr "Eposta adresi onayı"
+#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+#, fuzzy
+msgid "Paths configuration"
+msgstr "Eposta adresi onayı"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4284,11 +4399,9 @@ msgid "You are not subscribed to anyone."
msgstr "Bize o profili yollamadınız"
#: lib/command.php:620
-#, fuzzy
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Bize o profili yollamadınız"
-msgstr[1] "Bize o profili yollamadınız"
#: lib/command.php:640
#, fuzzy
@@ -4296,11 +4409,9 @@ msgid "No one is subscribed to you."
msgstr "Uzaktan abonelik"
#: lib/command.php:642
-#, fuzzy
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Uzaktan abonelik"
-msgstr[1] "Uzaktan abonelik"
#: lib/command.php:662
#, fuzzy
@@ -4308,11 +4419,9 @@ msgid "You are not a member of any groups."
msgstr "Bize o profili yollamadınız"
#: lib/command.php:664
-#, fuzzy
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"
-msgstr[1] "Bize o profili yollamadınız"
#: lib/command.php:678
msgid ""
@@ -4392,9 +4501,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: "
@@ -4493,7 +4604,7 @@ msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi"
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
-#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85
msgid "Group"
msgstr ""
@@ -4540,7 +4651,7 @@ msgstr ""
msgid "Tags in %s group's notices"
msgstr ""
-#: lib/htmloutputter.php:104
+#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
@@ -4575,6 +4686,14 @@ msgstr "Böyle bir durum mesajı yok."
msgid "Unknown file type"
msgstr ""
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
@@ -4610,7 +4729,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:424
+#: lib/mailbox.php:227 lib/noticelist.php:452
msgid "from"
msgstr ""
@@ -4857,39 +4976,64 @@ msgstr ""
msgid "To"
msgstr ""
-#: lib/messageform.php:162 lib/noticeform.php:173
+#: lib/messageform.php:162 lib/noticeform.php:186
#, fuzzy
msgid "Available characters"
msgstr "6 veya daha fazla karakter"
-#: lib/noticeform.php:145
+#: lib/noticeform.php:158
#, fuzzy
msgid "Send a notice"
msgstr "Yeni durum mesajı"
-#: lib/noticeform.php:158
+#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
msgstr "N'aber %s?"
-#: lib/noticeform.php:180
+#: lib/noticeform.php:193
msgid "Attach"
msgstr ""
-#: lib/noticeform.php:184
+#: lib/noticeform.php:197
msgid "Attach a file"
msgstr ""
-#: lib/noticelist.php:478
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "N"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr ""
+
+#: lib/noticelist.php:506
#, fuzzy
msgid "in context"
msgstr "İçerik yok!"
-#: lib/noticelist.php:498
+#: lib/noticelist.php:526
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:499
+#: lib/noticelist.php:527
#, fuzzy
msgid "Reply"
msgstr "cevapla"
@@ -4923,11 +5067,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."
@@ -5037,6 +5181,10 @@ msgstr "Böyle bir kullanıcı yok."
msgid "Search site"
msgstr "Ara"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
#, fuzzy
msgid "Search help"
@@ -5050,11 +5198,6 @@ msgstr ""
msgid "Find people on this site"
msgstr ""
-#: lib/searchgroupnav.php:82
-#, fuzzy
-msgid "Notice"
-msgstr "Durum mesajları"
-
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
msgstr ""
@@ -5196,47 +5339,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"
@@ -5265,11 +5412,3 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
-
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "Böyle bir kullanıcı yok."
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "Uzaktan abonelik"
diff --git a/locale/uk/LC_MESSAGES/statusnet.mo b/locale/uk/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 4cb71655b..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 94db9c503..12c99926b 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -1,5 +1,8 @@
# Translation of StatusNet to Ukrainian
#
+# Author@translatewiki.net: AS
+# Author@translatewiki.net: Boogie
+# Author@translatewiki.net: Prima klasy4na
# --
# This file is distributed under the same license as the StatusNet package.
#
@@ -7,22 +10,22 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 10:43+0000\n"
-"PO-Revision-Date: 2009-11-18 19:32:48+0000\n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-11-28 19:51:04+0000\n"
"Language-Team: Ukrainian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10< =4 && (n%100<10 or n%100>=20) ? 1 : 2);\n"
-"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10< =4 && (n%100<10 or n%100>=20) ? 1 : 2);\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
-#, fuzzy
msgid "No such page"
-msgstr "Такого тегу немає."
+msgstr "Немає такої сторінки"
#: actions/all.php:74 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
@@ -61,25 +64,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
@@ -87,6 +90,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
@@ -94,6 +99,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
@@ -101,11 +108,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
@@ -117,9 +125,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
@@ -132,16 +139,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 "Не вдалося оновити користувача."
@@ -155,20 +162,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
@@ -180,7 +187,6 @@ msgid "User has no profile."
msgstr "Користувач не має профілю."
#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
msgid "Could not save profile."
msgstr "Не вдалося зберегти профіль."
@@ -197,9 +203,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."
@@ -208,12 +214,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
@@ -253,18 +259,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."
@@ -277,50 +281,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
@@ -332,92 +333,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."
@@ -428,9 +426,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."
@@ -438,23 +435,24 @@ 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"
msgstr "Не знайдено"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, 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
@@ -470,7 +468,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
@@ -479,43 +477,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."
@@ -535,9 +532,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
@@ -561,7 +558,7 @@ msgid "Preview"
msgstr "Перегляд"
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
+#: lib/noticelist.php:550
msgid "Delete"
msgstr "Видалити"
@@ -574,7 +571,7 @@ msgid "Crop"
msgstr "Втяти"
#: actions/avatarsettings.php:265 actions/disfavor.php:74
-#: actions/emailsettings.php:237 actions/favor.php:75
+#: 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
@@ -590,7 +587,7 @@ msgstr ""
"Виникли певні проблеми з токеном поточної сесії. Спробуйте знов, будь ласка."
#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
-#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: 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."
@@ -598,11 +595,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."
@@ -613,9 +610,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
@@ -632,24 +628,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"
@@ -660,13 +654,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 ""
@@ -674,6 +667,9 @@ msgid ""
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
+"Впевнені, що бажаєте блокувати цього користувача? Позаяк, його буде "
+"відписано від Вас, він не зможе підписитасть до Вас у майбутньому і Ви "
+"більше не отримуватимете жодних дописів від нього."
#: actions/block.php:143 actions/deletenotice.php:145
#: actions/deleteuser.php:147 actions/groupblock.php:178
@@ -681,9 +677,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
@@ -699,9 +694,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."
@@ -713,26 +707,26 @@ 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."
msgstr "Цю адресу вже було підтверджено."
-#: actions/confirmaddress.php:114 actions/emailsettings.php:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
#: actions/profilesettings.php:276 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Не вдалося оновити користувача."
-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
msgstr "Не вдалося видалити підтвердження поштової адреси."
@@ -744,21 +738,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/profileaction.php:206 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
@@ -771,258 +764,180 @@ 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:522
+#: 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:278
-#, fuzzy
+#: actions/designadminpanel.php:270
msgid "Invalid logo URL."
-msgstr "Недійсний розмір."
-
-#: actions/designadminpanel.php:282
-#, fuzzy, php-format
-msgid "Theme not available: %s"
-msgstr "Ця сторінка не доступна в "
-
-#: actions/designadminpanel.php:288
-#, fuzzy, php-format
-msgid "Theme directory not readable: %s"
-msgstr "Ця сторінка не доступна в "
-
-#: actions/designadminpanel.php:292
-#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:296
-#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
+msgstr "Помилкова URL-адреса логотипу."
-#: actions/designadminpanel.php:312
+#: actions/designadminpanel.php:274
#, php-format
-msgid "Max length for %s %s is 255 characters."
-msgstr ""
+msgid "Theme not available: %s"
+msgstr "Тема не доступна: %s"
-#: actions/designadminpanel.php:412
-#, fuzzy
+#: actions/designadminpanel.php:370
msgid "Change logo"
-msgstr "Змінити ваш пароль"
+msgstr "Змінити логотип"
-#: actions/designadminpanel.php:417
-#, fuzzy
+#: actions/designadminpanel.php:375
msgid "Site logo"
-msgstr "Запросити"
+msgstr "Логотип сайту"
-#: actions/designadminpanel.php:424
-#, fuzzy
+#: actions/designadminpanel.php:382
msgid "Change theme"
-msgstr "Змінити"
+msgstr "Змінити тему"
-#: actions/designadminpanel.php:441
-#, fuzzy
+#: actions/designadminpanel.php:399
msgid "Site theme"
-msgstr "Зауваження сайту"
+msgstr "Тема сайту"
-#: actions/designadminpanel.php:442
-#, fuzzy
+#: actions/designadminpanel.php:400
msgid "Theme for the site."
-msgstr "Вийти з сайту"
-
-#: actions/designadminpanel.php:447
-msgid "Theme server"
-msgstr ""
-
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
-
-#: actions/designadminpanel.php:455
-msgid "Theme directory"
-msgstr ""
-
-#: actions/designadminpanel.php:462
-#, fuzzy
-msgid "Avatar Settings"
-msgstr "Налаштування аватари"
+msgstr "Тема для цього сайту."
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Avatar server"
-msgstr "Налаштування аватари"
-
-#: actions/designadminpanel.php:471
-#, fuzzy
-msgid "Avatar path"
-msgstr "Аватару оновлено."
-
-#: actions/designadminpanel.php:475
-#, fuzzy
-msgid "Avatar directory"
-msgstr "Аватару оновлено."
-
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
-msgstr ""
+msgstr "Змінити фонове зображення"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
-msgstr ""
+msgstr "Фон"
-#: actions/designadminpanel.php:496
-#, fuzzy, php-format
+#: actions/designadminpanel.php:422
+#, 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:526 lib/designsettings.php:139
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
-msgstr ""
+msgstr "Увімк."
-#: actions/designadminpanel.php:542 lib/designsettings.php:155
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
-msgstr ""
+msgstr "Вимк."
-#: actions/designadminpanel.php:543 lib/designsettings.php:156
+#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
-msgstr ""
+msgstr "Увімкнути або вимкнути фонове зображення."
-#: actions/designadminpanel.php:548 lib/designsettings.php:161
+#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
-msgstr ""
+msgstr "Замостити фон"
-#: actions/designadminpanel.php:554
-msgid "Background server"
-msgstr ""
-
-#: actions/designadminpanel.php:558
-msgid "Background path"
-msgstr ""
-
-#: actions/designadminpanel.php:562
-msgid "Background directory"
-msgstr ""
-
-#: actions/designadminpanel.php:569 lib/designsettings.php:170
-#, fuzzy
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
msgid "Change colours"
-msgstr "Змінити ваш пароль"
+msgstr "Змінити кольори"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
-#, fuzzy
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
msgid "Content"
-msgstr "З'єднання"
+msgstr "Зміст"
-#: actions/designadminpanel.php:604 lib/designsettings.php:204
-#, fuzzy
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
msgid "Sidebar"
-msgstr "Пошук"
+msgstr "Бічна панель"
-#: actions/designadminpanel.php:617 lib/designsettings.php:217
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
msgstr "Текст"
-#: actions/designadminpanel.php:630 lib/designsettings.php:230
-#, fuzzy
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
msgid "Links"
-msgstr "Увійти"
+msgstr "Посилання"
-#: actions/designadminpanel.php:658 lib/designsettings.php:247
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
-msgstr ""
+msgstr "За замовчанням"
-#: actions/designadminpanel.php:659 lib/designsettings.php:248
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
-msgstr ""
+msgstr "Оновити налаштування за замовчанням"
-#: actions/designadminpanel.php:665 lib/designsettings.php:254
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
-msgstr ""
+msgstr "Повернутись до початкових налаштувань"
-#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 actions/useradminpanel.php:226
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/pathsadminpanel.php:296 actions/profilesettings.php:167
+#: actions/siteadminpanel.php:421 actions/smssettings.php:181
+#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/useradminpanel.php:313 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Зберегти"
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: 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"
@@ -1051,18 +966,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."
@@ -1124,7 +1038,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."
@@ -1145,110 +1059,108 @@ 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."
msgstr "Позначати міткою MicroID мою електронну адресу."
-#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/emailsettings.php:302 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
msgstr "Преференції збережно."
-#: actions/emailsettings.php:319
+#: actions/emailsettings.php:320
msgid "No email address."
msgstr "Немає електронної адреси."
-#: actions/emailsettings.php:326
+#: actions/emailsettings.php:327
msgid "Cannot normalize that email address"
msgstr "Не можна полагодити цю поштову адресу"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "Це недійсна електронна адреса"
-#: actions/emailsettings.php:333
+#: actions/emailsettings.php:334
msgid "That is already your email address."
-msgstr "Це і так вже ваша адреса."
+msgstr "Це і є Вашою адресою."
-#: actions/emailsettings.php:336
+#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
msgstr "Ця електронна адреса належить іншому користувачу."
-#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Не вдалося додати код підтвердження."
-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
msgstr ""
-"Код підтвердження був відправлений на електронну адресу, яку ви додали. "
+"Код підтвердження був відправлений на електронну адресу, яку Ви додали. "
"Перевірте вхідну пошту (і теку зі спамом також!), там має бути код та "
"подальші інструкції."
-#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
msgstr "Не очікується підтвердження для скасування."
-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
msgstr "Це помилкова адреса IM."
-#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
msgstr "Підтвердження скасовано."
-#: actions/emailsettings.php:412
+#: actions/emailsettings.php:413
msgid "That is not your email address."
-msgstr "Це не ваша адреса."
+msgstr "Це не є Вашою адресою."
-#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
msgstr "Адресу було видалено."
-#: actions/emailsettings.php:445 actions/smssettings.php:518
+#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
msgstr "Немає адреси для вхідної пошти."
-#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
msgid "Couldn't update user record."
msgstr "Не вдалося оновити запис користувача."
-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
msgstr "Адресу вхідної пошти видалено."
-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555
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,13 +1176,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
@@ -1278,6 +1192,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
@@ -1286,13 +1202,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"
@@ -1314,31 +1230,28 @@ 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!"
@@ -1346,20 +1259,17 @@ msgstr "Ви можете користуватись локальними під
#: actions/finishremotesubscribe.php:96
msgid "That user has blocked you from subscribing."
-msgstr "Цей користувач заблокував вашу можливість підписатись."
+msgstr "Цей користувач заблокував Вашу можливість підписатись."
#: actions/finishremotesubscribe.php:106
-#, fuzzy
msgid "You are not authorized."
msgstr "Не авторизовано."
#: actions/finishremotesubscribe.php:109
-#, fuzzy
msgid "Could not convert request token to access token."
msgstr "Не вдалося перетворити токени запиту на токени звернення."
#: actions/finishremotesubscribe.php:114
-#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Невідома версія протоколу OMB."
@@ -1374,14 +1284,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
@@ -1397,28 +1305,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
@@ -1427,73 +1331,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."
@@ -1517,7 +1420,7 @@ msgstr "Учасники групи %s, сторінка %d"
msgid "A list of the users in this group."
msgstr "Список учасників цієї групи."
-#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
msgid "Admin"
msgstr "Адмін"
@@ -1526,31 +1429,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 знаків "
"або більше."
@@ -1560,9 +1461,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
@@ -1570,6 +1470,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
@@ -1577,9 +1479,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/subgroupnav.php:98
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "Групи"
@@ -1597,6 +1501,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"
@@ -1604,12 +1513,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."
@@ -1625,14 +1533,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."
@@ -1644,9 +1550,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"
@@ -1668,8 +1574,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."
@@ -1695,7 +1600,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."
@@ -1707,17 +1612,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
@@ -1727,11 +1632,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
@@ -1745,7 +1650,7 @@ msgstr "Недійсна електронна адреса: %s"
#: actions/invite.php:110
msgid "Invitation(s) sent"
-msgstr "Запрошення відіслано"
+msgstr "Запрошення надіслано"
#: actions/invite.php:112
msgid "Invite new users"
@@ -1763,7 +1668,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:"
@@ -1774,14 +1679,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
@@ -1801,14 +1706,14 @@ msgstr "Особисті повідомлення"
msgid "Optionally add a personal message to the invitation."
msgstr "Можна додати персональне повідомлення до запрошення (опціонально)."
-#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
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
@@ -1840,13 +1745,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"
@@ -1858,7 +1763,7 @@ msgstr ""
"\n"
"%5$s\n"
"\n"
-"Якщо ви виявили бажання спробувати користуватись даним сервісом, то "
+"Якщо Ви виявили бажання спробувати користуватись даним сервісом, то "
"перейдіть за посиланням внизу, аби погодитись із запрошенням.\n"
"\n"
"%6$s\n"
@@ -1866,7 +1771,7 @@ msgstr ""
"Якщо ж ні, то просто проігноруйте це повідомлення. Дякуємо за розуміння та "
"витрачений час.\n"
"\n"
-"Щиро ваші, %2$s\n"
+"Щиро Ваші, %2$s\n"
#: actions/joingroup.php:60
msgid "You must be logged in to join a group."
@@ -1910,23 +1815,21 @@ 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
msgid "Invalid or expired token."
-msgstr "Недійсний зміст повідомлення"
+msgstr "Недійсний або неправильний токен."
#: actions/login.php:143
msgid "Incorrect username or password."
-msgstr "Неточне ім'я або пароль."
+msgstr "Неточне ім’я або пароль."
#: actions/login.php:149
-#, fuzzy
msgid "Error setting user. You are probably not authorized."
-msgstr "Не авторизовано."
+msgstr "Помилка. Можливо, Ви не авторизовані."
-#: actions/login.php:204 actions/login.php:257 lib/action.php:457
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Увійти"
@@ -1939,7 +1842,7 @@ msgstr "Вхід на сайт"
#: 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
#: lib/accountsettingsaction.php:116
@@ -1948,12 +1851,12 @@ msgstr "Пароль"
#: actions/login.php:252 actions/register.php:477
msgid "Remember me"
-msgstr "Пам'ятати мене"
+msgstr "Пам’ятати мене"
#: actions/login.php:253 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
-"Автоматично входити у майбутньому; не для комп'ютерів загального "
+"Автоматично входити у майбутньому; не для комп’ютерів загального "
"користування!"
#: actions/login.php:263
@@ -1965,37 +1868,37 @@ msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
-"З міркувань безпеки, будь ласка, введіть ще раз ім'я та пароль, перед тим як "
+"З міркувань безпеки, будь ласка, введіть ще раз ім’я та пароль, перед тим як "
"змінювати налаштування."
#: actions/login.php:286
-#, fuzzy, php-format
+#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
"(%%action.register%%) a new account."
msgstr ""
-"Увійти викристовуючи ім'я та пароль. Ще не маєте імені користувача? "
-"[Зареєструвати](%%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"
@@ -2030,30 +1933,28 @@ 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
msgid "Direct message to %s sent"
msgstr "Пряме повідомлення до %s надіслано"
-#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
msgid "Ajax Error"
msgstr "Помилка в Ajax"
#: actions/newnotice.php:69
msgid "New notice"
-msgstr "Нове повідомлення"
+msgstr "Новий допис"
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
msgid "Notice posted"
-msgstr "Повідомлення відправлено"
+msgstr "Допис надіслано"
#: actions/noticesearch.php:68
#, php-format
@@ -2061,17 +1962,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
@@ -2079,6 +1980,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
@@ -2086,35 +1989,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:89
-#, fuzzy, php-format
+#: actions/noticesearchrss.php:96
+#, php-format
msgid "Updates with \"%s\""
-msgstr "Оновлення від %1$s на %2$s!"
+msgstr "Оновлення з \"%s\""
-#: actions/noticesearchrss.php:91
-#, fuzzy, php-format
+#: actions/noticesearchrss.php:98
+#, 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
@@ -2122,13 +2027,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
@@ -2141,7 +2045,7 @@ msgstr "Пошук людей"
#: actions/opensearch.php:67
msgid "Notice Search"
-msgstr "Пошук повідомлень"
+msgstr "Пошук дописів"
#: actions/othersettings.php:60
msgid "Other Settings"
@@ -2149,28 +2053,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)."
@@ -2179,7 +2082,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
@@ -2189,7 +2092,7 @@ msgstr "Вихідні для %s"
#: actions/outbox.php:116
msgid "This is your outbox, which lists private messages you have sent."
msgstr ""
-"Це ваші вихідні повідомлення, тут містяться повідомлення, які ви надіслали "
+"Це Ваші вихідні повідомлення, тут містяться повідомлення, які Ви надіслали "
"приватно."
#: actions/passwordsettings.php:58
@@ -2221,9 +2124,9 @@ msgstr "6 або більше знаків"
msgid "Confirm"
msgstr "Підтвердити"
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "такий само, як і пароль вище"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Такий само, як і пароль вище"
#: actions/passwordsettings.php:117
msgid "Change"
@@ -2239,7 +2142,7 @@ msgstr "Паролі не співпадають."
#: actions/passwordsettings.php:165
msgid "Incorrect old password"
-msgstr "Старий пароль неточний"
+msgstr "Старий пароль є неточним"
#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
@@ -2247,19 +2150,120 @@ 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."
msgstr "Пароль збережено."
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr "Шлях"
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr "Шлях та налаштування серверу для цього сайту StatusNet."
+
+#: actions/pathsadminpanel.php:140
+#, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Дирикторію теми неможна прочитати: %s"
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr "Щось не так із написанням директорії аватари: %s"
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr "Щось не так із написанням директорії фону: %s"
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr "Не можу прочитати директорію локалі: %s"
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+msgid "Site"
+msgstr "Сайт"
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr "Шлях"
+
+#: actions/pathsadminpanel.php:216
+msgid "Site path"
+msgstr "Шлях до сайту"
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr "Шлях до локалей"
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr "Директорія шляху до локалей"
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr "Тема"
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr "Сервер теми"
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr "Шлях до теми"
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr "Директорія теми"
+
+#: actions/pathsadminpanel.php:247
+msgid "Avatars"
+msgstr "Аватари"
+
+#: actions/pathsadminpanel.php:252
+msgid "Avatar server"
+msgstr "Сервер аватари"
+
+#: actions/pathsadminpanel.php:256
+msgid "Avatar path"
+msgstr "Шлях до аватари"
+
+#: actions/pathsadminpanel.php:260
+msgid "Avatar directory"
+msgstr "Директорія аватари"
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr "Фони"
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr "Сервер фонів"
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr "Шлях до фонів"
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr "Директорія фонів"
+
+#: actions/pathsadminpanel.php:297
+msgid "Save paths"
+msgstr "Зберегти шляхи"
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
"Search for people on %%site.name%% by their name, location, or interests. "
"Separate the terms by spaces; they must be 3 characters or more."
msgstr ""
-"Пошук людей на %%site.name%% за їх ім'ям, локацією або інтересами. "
+"Пошук людей на %%site.name%% за їх ім’ям, локацією або інтересами. "
"Відокремлюйте пошукові умови інтервалами; вони повинні складатись з 3 знаків "
"або більше."
@@ -2270,21 +2274,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"
@@ -2294,8 +2298,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"
@@ -2310,7 +2313,7 @@ msgstr ""
#: 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
@@ -2319,17 +2322,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"
@@ -2344,28 +2346,28 @@ 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:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr "Мова"
#: actions/profilesettings.php:145
msgid "Preferred language"
-msgstr "Мова, якій надаєте перевагу"
+msgstr "Мова, котрій надаєте перевагу"
#: actions/profilesettings.php:154
msgid "Timezone"
@@ -2373,19 +2375,19 @@ 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."
@@ -2393,12 +2395,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."
@@ -2410,7 +2412,7 @@ msgstr "Не вдалося зберегти профіль."
#: actions/profilesettings.php:336
msgid "Couldn't save tags."
-msgstr "Не вдалося зберегти теги."
+msgstr "Не вдалося зберегти теґи."
#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
msgid "Settings saved."
@@ -2419,35 +2421,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
@@ -2455,16 +2454,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
@@ -2474,34 +2476,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
@@ -2509,10 +2517,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!"
@@ -2524,7 +2534,7 @@ msgstr "Немає такого коду відновлення."
#: actions/recoverpassword.php:66
msgid "Not a recovery code."
-msgstr "Це не код оновлення."
+msgstr "Це не код відновлення."
#: actions/recoverpassword.php:73
msgid "Recovery code for unknown user."
@@ -2547,23 +2557,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"
@@ -2579,7 +2591,7 @@ msgstr "Відновити пароль"
#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
msgid "Password recovery requested"
-msgstr "Запит на відновлення паролю відправлено."
+msgstr "Запит на відновлення паролю відправлено"
#: actions/recoverpassword.php:213
msgid "Unknown action"
@@ -2589,21 +2601,17 @@ msgstr "Дія невідома"
msgid "6 or more characters, and don't forget it!"
msgstr "6 або більше знаків, і не забудьте їх!"
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Такий само, як і пароль вище"
-
#: actions/recoverpassword.php:243
msgid "Reset"
msgstr "Скинути"
#: actions/recoverpassword.php:252
msgid "Enter a nickname or email address."
-msgstr "Введіть ім'я або електронну адресу."
+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."
@@ -2618,8 +2626,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."
@@ -2639,7 +2647,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."
@@ -2647,15 +2655,14 @@ msgstr ""
"Пробачте, але лише ті, кого було запрошено, мають змогу зареєструватись тут."
#: actions/register.php:92
-#, fuzzy
msgid "Sorry, invalid invitation code."
-msgstr "Помилка з кодом підтвердження."
+msgstr "Даруйте, помилка у коді запрошення."
#: actions/register.php:112
msgid "Registration successful"
msgstr "Реєстрація успішна"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Реєстрація"
@@ -2678,13 +2685,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."
@@ -2701,7 +2710,7 @@ msgid "Same as password above. Required."
msgstr "Такий само, як і пароль вище. Неодмінно."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Пошта"
@@ -2711,7 +2720,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 "
@@ -2719,10 +2728,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."
@@ -2748,20 +2756,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
@@ -2770,7 +2778,7 @@ msgid ""
"to confirm your email address.)"
msgstr ""
"(Ви маєте негайно отримати листа електронною поштою, в якому знаходитимуться "
-"інструкції щодо підтвердження вашої електронної адреси.)"
+"інструкції щодо підтвердження Вашої електронної адреси.)"
#: actions/remotesubscribe.php:98
#, php-format
@@ -2779,26 +2787,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"
@@ -2806,10 +2813,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 "Підписатись"
@@ -2818,18 +2825,17 @@ msgid "Invalid profile URL (bad format)"
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)."
+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 "Не вдалося отримати токен запиту."
@@ -2845,19 +2851,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
@@ -2865,6 +2871,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
@@ -2872,6 +2880,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
@@ -2879,51 +2889,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
@@ -2931,6 +2944,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
@@ -2939,10 +2954,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
@@ -2970,31 +2988,31 @@ 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"
@@ -3015,9 +3033,8 @@ msgid "Statistics"
msgstr "Статистика"
#: actions/showgroup.php:432
-#, fuzzy
msgid "Created"
-msgstr "Створити"
+msgstr "Створено"
#: actions/showgroup.php:448
#, php-format
@@ -3028,22 +3045,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."
@@ -3064,14 +3087,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
@@ -3079,40 +3101,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
@@ -3120,6 +3144,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
@@ -3129,269 +3155,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 "Користувач заблокував вас."
-
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
-#, fuzzy
-msgid "Site"
-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 sever when enabling SSL."
-msgstr ""
+msgid "You must set an SSL server when enabling SSL."
+msgstr "Ви маєте встановити SSL-сервер, коли використовуєте SSL."
#: actions/siteadminpanel.php:204
-msgid "Invalid SSL server. Max length is 255 characters."
-msgstr ""
+msgid "Invalid SSL server. The maximum length is 255 characters."
+msgstr "Помилковий SSL-сервер. Максимальна довжина 255 знаків."
#: actions/siteadminpanel.php:210
-msgid "Minimum text limit is 140c."
-msgstr ""
+msgid "Minimum text limit is 140 characters."
+msgstr "Ліміт текстових повідомлень становить 140 знаків."
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
msgstr ""
+"Часове обмеження при надсиланні дублікату повідомлення має становити від 1 і "
+"більше секунд."
-#: actions/siteadminpanel.php:224
-#, php-format
-msgid "Locales directory not readable: %s"
-msgstr ""
+#: actions/siteadminpanel.php:266
+msgid "General"
+msgstr "Основні"
-#: actions/siteadminpanel.php:275
-#, fuzzy
+#: actions/siteadminpanel.php:269
msgid "Site name"
-msgstr "Зауваження сайту"
+msgstr "Назва сайту"
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
-msgstr ""
+msgstr "Назва Вашого сайту, штибу \"Мікроблоґи компанії ...\""
-#: actions/siteadminpanel.php:279
+#: actions/siteadminpanel.php:274
msgid "Brought by"
-msgstr ""
+msgstr "Надано"
-#: actions/siteadminpanel.php:280
+#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
-msgstr ""
+msgstr "Текст використаний для посілань кредитів унизу кожної сторінки"
-#: actions/siteadminpanel.php:283
+#: actions/siteadminpanel.php:279
msgid "Brought by URL"
-msgstr ""
+msgstr "Наданий URL"
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
-msgstr ""
+msgstr "URL використаний для посілань кредитів унизу кожної сторінки"
-#: actions/siteadminpanel.php:288
-#, fuzzy
-msgid "contact email address for your site"
-msgstr "Нова електронна адреса для надсилання повідомлень на %s"
+#: actions/siteadminpanel.php:284
+msgid "Contact email address for your site"
+msgstr "Контактна електронна адреса для Вашого сайту"
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:290
+msgid "Local"
+msgstr "Локаль"
+
+#: actions/siteadminpanel.php:301
msgid "Default timezone"
-msgstr ""
+msgstr "Часовий пояс за замовчанням"
-#: actions/siteadminpanel.php:303
+#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
-msgstr ""
+msgstr "Часовий пояс за замовчанням для сайту; зазвичай UTC."
-#: actions/siteadminpanel.php:310
-#, fuzzy
+#: actions/siteadminpanel.php:308
msgid "Default site language"
-msgstr "Мова, якій надаєте перевагу"
+msgstr "Мова сайту за замовчанням"
#: actions/siteadminpanel.php:316
-msgid "Path to locales"
-msgstr ""
+msgid "URLs"
+msgstr "URL-адреси"
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
-msgstr ""
-
-#: actions/siteadminpanel.php:320
-#, fuzzy
+#: actions/siteadminpanel.php:319
msgid "Server"
-msgstr "Відновити"
+msgstr "Сервер"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
+msgstr "Ім’я хосту сервера на якому знаходиться сайт."
-#: actions/siteadminpanel.php:324
-#, fuzzy
-msgid "Site path"
-msgstr "Зауваження сайту"
-
-#: actions/siteadminpanel.php:328
+#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
-msgstr ""
+msgstr "Надзвичайні URL-адреси"
-#: actions/siteadminpanel.php:330
+#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
+msgstr "Використовувати надзвичайні (найбільш пам’ятні і визначні) URL-адреси?"
+
+#: actions/siteadminpanel.php:331
+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 actions/useradminpanel.php:171
-#, fuzzy
+#: actions/siteadminpanel.php:346
msgid "Closed"
-msgstr "Блок"
+msgstr "Закрито"
#: actions/siteadminpanel.php:348
msgid "Disable new registrations."
-msgstr ""
+msgstr "Скасувати подальшу регістрацію."
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
+msgstr "Снепшоти"
+
+#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
-msgstr ""
+msgstr "Випадково під час веб-хіта"
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
-msgstr ""
+msgstr "Згідно плану робіт"
-#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
-#, fuzzy
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
msgid "Never"
-msgstr "Відновити"
+msgstr "Ніколи"
-#: actions/siteadminpanel.php:357
+#: actions/siteadminpanel.php:360
msgid "Data snapshots"
-msgstr ""
+msgstr "Снепшоти даних"
-#: actions/siteadminpanel.php:358
+#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
-msgstr ""
+msgstr "Коли надсилати статистичні дані до серверів status.net"
-#: actions/siteadminpanel.php:364
+#: actions/siteadminpanel.php:366
msgid "Frequency"
-msgstr ""
+msgstr "Частота"
-#: actions/siteadminpanel.php:365
-msgid "Snapshots will be sent once every N Web hits"
-msgstr ""
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
+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:381
-#, fuzzy
+#: actions/siteadminpanel.php:380
+msgid "SSL"
+msgstr "SSL-шифрування"
+
+#: actions/siteadminpanel.php:384
msgid "Sometimes"
-msgstr "Повідомлення"
+msgstr "Іноді"
-#: actions/siteadminpanel.php:382
+#: actions/siteadminpanel.php:385
msgid "Always"
-msgstr ""
+msgstr "Завжди"
-#: actions/siteadminpanel.php:384
+#: actions/siteadminpanel.php:387
msgid "Use SSL"
-msgstr ""
+msgstr "Використовувати SSL"
-#: actions/siteadminpanel.php:385
+#: actions/siteadminpanel.php:388
msgid "When to use SSL"
-msgstr ""
+msgstr "Тоді використовувати SSL"
-#: actions/siteadminpanel.php:391
+#: actions/siteadminpanel.php:393
msgid "SSL Server"
-msgstr ""
+msgstr "SSL-сервер"
-#: actions/siteadminpanel.php:392
+#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
-msgstr ""
+msgstr "Сервер на який направляти SSL-запити"
+
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr "Обмеження"
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Text limit"
-msgstr ""
+msgstr "Текстові обмеження"
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
-msgstr ""
+msgstr "Максимальна кількість знаків у дописі."
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "Dupe limit"
-msgstr ""
+msgstr "Часове обмеження"
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
+"Як довго користувачі мають зачекати (в секундах) аби надіслати той самий "
+"допис ще раз."
-#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
-#, fuzzy
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
msgid "Save site settings"
-msgstr "Налаштування аватари"
+msgstr "Зберегти налаштування сайту"
#: actions/smssettings.php:58
msgid "SMS Settings"
@@ -3403,9 +3429,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."
@@ -3421,7 +3446,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"
@@ -3449,19 +3474,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
@@ -3470,7 +3494,7 @@ msgstr "Це помилковий код підтвердження."
#: actions/smssettings.php:405
msgid "That is not your phone number."
-msgstr "Це не ваш телефонний номер."
+msgstr "Це не Ваш телефонний номер."
#: actions/smssettings.php:465
msgid "Mobile carrier"
@@ -3486,8 +3510,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
@@ -3522,23 +3546,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
@@ -3546,6 +3572,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
@@ -3559,12 +3587,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
@@ -3575,11 +3603,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"
@@ -3619,66 +3653,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."
@@ -3695,48 +3726,113 @@ 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/personalgroupnav.php:115
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
msgid "User"
msgstr "Користувач"
#: actions/useradminpanel.php:69
msgid "User settings for this StatusNet site."
-msgstr ""
+msgstr "Власні налаштування користувача для цього сайту StatusNet."
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
-msgstr ""
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr "Помилкове обмеження біо. Це мають бути цифри."
-#: actions/useradminpanel.php:178
-#, fuzzy
-msgid "Invite-only"
-msgstr "Запросити"
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
+msgstr "Помилковий текст привітання. Максимальна довжина 255 знаків."
+
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr "Помилкова підписка за замовчанням: '%1$s' не є користувачем."
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Профіль"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr "Обмеження біо"
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
+msgstr "Максимальна довжина біо користувача в знаках."
+
+#: actions/useradminpanel.php:231
+msgid "New users"
+msgstr "Нові користувачі"
+
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr "Привітання нового користувача"
+
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr "Текст привітання нових користувачів (255 знаків)."
+
+#: actions/useradminpanel.php:241
+msgid "Default subscription"
+msgstr "Підписка за замовчанням"
+
+#: actions/useradminpanel.php:242
+msgid "Automatically subscribe new users to this user."
+msgstr "Автоматично підписувати нових користувачів до цього користувача."
+
+#: actions/useradminpanel.php:251
+msgid "Invitations"
+msgstr "Запрошення"
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: actions/useradminpanel.php:256
+msgid "Invitations enabled"
+msgstr "Запрошення скасовано"
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
msgstr ""
+"В той чи інший спосіб дозволити користувачам вітати нових користувачів."
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr "Сесії"
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr "Сесії обробки даних"
+
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
+msgstr "Обробка даних сесій самостійно."
+
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr "Сесія наладки"
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
+msgstr "Виводити дані сесії наладки."
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Авторизувати підписку"
#: actions/userauthorization.php:110
-#, 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"
@@ -3752,9 +3848,8 @@ msgid "Reject"
msgstr "Забраковано"
#: actions/userauthorization.php:212
-#, fuzzy
msgid "Reject this subscription"
-msgstr "Підписки %s"
+msgstr "Відмінити цю підписку"
#: actions/userauthorization.php:225
msgid "No authorization request!"
@@ -3765,7 +3860,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 "
@@ -3780,7 +3874,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 "
@@ -3793,56 +3886,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
@@ -3850,19 +3944,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
@@ -3870,21 +3964,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."
@@ -3897,31 +3992,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
@@ -3930,29 +4023,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"
-
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr "Профіль"
+msgstr "Вітаємо на %1$s, @%2$s!"
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
@@ -3964,16 +4053,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"
@@ -3986,240 +4074,233 @@ msgstr "Інші опції"
#: lib/action.php:144
#, php-format
msgid "%s - %s"
-msgstr "%s - %s"
+msgstr "%s — %s"
#: lib/action.php:159
msgid "Untitled page"
msgstr "Сторінка без заголовку"
-#: lib/action.php:424
+#: lib/action.php:425
msgid "Primary site navigation"
msgstr "Відправна навігація по сайту"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Home"
msgstr "Дім"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Personal profile and friends timeline"
-msgstr "Персональний профіль і потік друзів"
+msgstr "Персональний профіль і стрічка друзів"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Account"
-msgstr "Рахунок"
+msgstr "Акаунт"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Change your email, avatar, password, profile"
msgstr "Змінити електронну адресу, аватару, пароль, профіль"
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect"
-msgstr "З'єднання"
+msgstr "З’єднання"
-#: lib/action.php:435
-#, fuzzy
+#: lib/action.php:436
msgid "Connect to services"
-msgstr "Невдале перенаправлення на сервер: %s"
+msgstr "З’єднання з сервісами"
-#: lib/action.php:439
-#, fuzzy
+#: lib/action.php:440
msgid "Change site configuration"
-msgstr "Відправна навігація по сайту"
+msgstr "Змінити конфігурацію сайту"
-#: lib/action.php:443 lib/subgroupnav.php:105
+#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Запросити"
-#: lib/action.php:444 lib/subgroupnav.php:106
+#: 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:449
+#: lib/action.php:450
msgid "Logout"
msgstr "Вийти"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout from the site"
msgstr "Вийти з сайту"
-#: lib/action.php:454
+#: lib/action.php:455
msgid "Create an account"
-msgstr "Створити новий рахунок"
+msgstr "Створити новий акаунт"
-#: lib/action.php:457
+#: lib/action.php:458
msgid "Login to the site"
msgstr "Увійти на сайт"
-#: lib/action.php:460 lib/action.php:723
+#: lib/action.php:461 lib/action.php:724
msgid "Help"
msgstr "Допомога"
-#: lib/action.php:460
+#: lib/action.php:461
msgid "Help me!"
msgstr "Допоможіть!"
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
msgstr "Пошук"
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
msgstr "Пошук людей або текстів"
-#: lib/action.php:484
+#: lib/action.php:485
msgid "Site notice"
msgstr "Зауваження сайту"
-#: lib/action.php:550
+#: lib/action.php:551
msgid "Local views"
msgstr "Огляд"
-#: lib/action.php:616
+#: lib/action.php:617
msgid "Page notice"
msgstr "Зауваження сторінки"
-#: lib/action.php:718
+#: lib/action.php:719
msgid "Secondary site navigation"
msgstr "Другорядна навігація по сайту"
-#: lib/action.php:725
+#: lib/action.php:726
msgid "About"
msgstr "Про"
-#: lib/action.php:727
+#: lib/action.php:728
msgid "FAQ"
msgstr "ЧаПи"
-#: lib/action.php:731
+#: lib/action.php:732
msgid "TOS"
-msgstr ""
+msgstr "Умови"
-#: lib/action.php:734
+#: lib/action.php:735
msgid "Privacy"
msgstr "Конфіденційність"
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
msgstr "Джерело"
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Contact"
msgstr "Контакт"
-#: lib/action.php:740
-#, fuzzy
+#: lib/action.php:741
msgid "Badge"
-msgstr "\"Розштовхати\""
+msgstr "«Розштовхати»"
-#: lib/action.php:768
+#: lib/action.php:769
msgid "StatusNet software license"
-msgstr "Ліцензія StatusNet software"
+msgstr "Ліцензія програмного забезпечення StatusNet"
-#: lib/action.php:771
+#: lib/action.php:772
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
msgstr ""
-"**%%site.name%%** це сервіс мікроблогів наданий вам [%%site.broughtby%%](%%"
+"**%%site.name%%** — це сервіс мікроблоґів наданий вам [%%site.broughtby%%](%%"
"site.broughtbyurl%%). "
-#: lib/action.php:773
+#: lib/action.php:774
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** це сервіс мікроблогів. "
+msgstr "**%%site.name%%** — це сервіс мікроблоґів. "
-#: lib/action.php:775
+#: lib/action.php:776
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
"s, available under the [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-"Сервіс працює на [StatusNet](http://status.net/) - програмному забезпеченні "
-"для мікроблогів, версія %s, доступному під [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:789
-#, fuzzy
+#: lib/action.php:790
msgid "Site content license"
-msgstr "Ліцензія StatusNet software"
+msgstr "Ліцензія змісту сайту"
-#: lib/action.php:798
+#: lib/action.php:799
msgid "All "
msgstr "Всі "
-#: lib/action.php:803
+#: lib/action.php:804
msgid "license."
msgstr "ліцензія."
-#: lib/action.php:1067
+#: lib/action.php:1068
msgid "Pagination"
msgstr "Нумерація сторінок"
-#: lib/action.php:1076
+#: lib/action.php:1077
msgid "After"
msgstr "Вперед"
-#: lib/action.php:1084
+#: lib/action.php:1085
msgid "Before"
msgstr "Назад"
-#: lib/action.php:1132
+#: lib/action.php:1133
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
+msgid "Paths configuration"
+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"
@@ -4238,18 +4319,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
@@ -4258,18 +4339,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
@@ -4279,7 +4363,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
@@ -4297,32 +4381,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
@@ -4331,7 +4414,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
@@ -4359,50 +4442,48 @@ msgid "Can't turn on notification."
msgstr "Не можна увімкнути сповіщення."
#: lib/command.php:597
-#, fuzzy, php-format
+#, php-format
msgid "Could not create login token for %s"
-msgstr "Не вдалося створити форму OpenID: %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
-#, fuzzy
msgid "You are not subscribed to anyone."
-msgstr "Ви не підписані до цього профілю."
+msgstr "Ви не маєте жодних підписок."
#: lib/command.php:620
-#, fuzzy
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
-msgstr[0] "Ви не підписані до цього профілю."
-msgstr[1] "Ви не підписані до цього профілю."
+msgstr[0] "Ви підписані до цієї особи:"
+msgstr[1] "Ви підписані до цих людей:"
+msgstr[2] "Ви підписані до цих людей:"
#: lib/command.php:640
-#, fuzzy
msgid "No one is subscribed to you."
-msgstr "Не вдалося підписати іншого до вас."
+msgstr "До Вас ніхто не підписаний."
#: lib/command.php:642
-#, fuzzy
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
-msgstr[0] "Не вдалося підписати іншого до вас."
-msgstr[1] "Не вдалося підписати іншого до вас."
+msgstr[0] "Ця особа є підписаною до Вас:"
+msgstr[1] "Ці люди підписані до Вас:"
+msgstr[2] "Ці люди підписані до Вас:"
#: lib/command.php:662
-#, fuzzy
msgid "You are not a member of any groups."
-msgstr "Ви не є учасником цієї групи."
+msgstr "Ви не є учасником жодної групи."
#: lib/command.php:664
-#, fuzzy
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
-msgstr[0] "Ви не є учасником цієї групи."
-msgstr[1] "Ви не є учасником цієї групи."
+msgstr[0] "Ви є учасником групи:"
+msgstr[1] "Ви є учасником таких груп:"
+msgstr[2] "Ви є учасником таких груп:"
#: lib/command.php:678
msgid ""
@@ -4442,24 +4523,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"
@@ -4471,29 +4585,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"
@@ -4513,40 +4628,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"
@@ -4554,17 +4668,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"
@@ -4573,26 +4686,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 lib/searchgroupnav.php:84
+#: 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
@@ -4609,9 +4722,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"
@@ -4624,16 +4737,16 @@ msgstr "Групи з найбільшою кількістю дописів"
#: lib/grouptagcloudsection.php:56
#, php-format
msgid "Tags in %s group's notices"
-msgstr "Теги у повідомленнях групи %s"
+msgstr "Теґи у дописах групи %s"
-#: lib/htmloutputter.php:104
+#: 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."
@@ -4659,10 +4772,18 @@ msgstr "Файл втрачено."
msgid "Unknown file type"
msgstr "Тип файлу не підтримується"
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr "Мб"
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr "кб"
+
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
-msgstr ""
+msgstr "[%s]"
#: lib/joinform.php:114
msgid "Join"
@@ -4674,11 +4795,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."
@@ -4690,11 +4811,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:424
-#, fuzzy
+#: lib/mailbox.php:227 lib/noticelist.php:452
msgid "from"
-msgstr " від "
+msgstr "від"
#: lib/mail.php:172
msgid "Email address confirmation"
@@ -4716,14 +4839,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"
@@ -4736,12 +4871,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
@@ -4779,13 +4918,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
@@ -4800,7 +4939,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
@@ -4817,6 +4956,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
@@ -4841,11 +4991,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
@@ -4867,11 +5031,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
@@ -4887,112 +5067,149 @@ 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"
msgstr "До"
-#: lib/messageform.php:162 lib/noticeform.php:173
+#: lib/messageform.php:162 lib/noticeform.php:186
msgid "Available characters"
msgstr "Лишилось знаків"
-#: lib/noticeform.php:145
+#: lib/noticeform.php:158
msgid "Send a notice"
-msgstr "Надіслати повідомлення"
+msgstr "Надіслати допис"
-#: lib/noticeform.php:158
+#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
msgstr "Що нового, %s?"
-#: lib/noticeform.php:180
+#: lib/noticeform.php:193
msgid "Attach"
-msgstr ""
+msgstr "Вкласти"
-#: lib/noticeform.php:184
+#: lib/noticeform.php:197
msgid "Attach a file"
-msgstr ""
+msgstr "Вкласти файл"
-#: lib/noticelist.php:478
-#, fuzzy
+#: 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 "Півн."
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr "Півд."
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr "Сх."
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr "Зах."
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr "о"
+
+#: lib/noticelist.php:506
msgid "in context"
-msgstr "Немає змісту!"
+msgstr "в контексті"
-#: lib/noticelist.php:498
+#: lib/noticelist.php:526
msgid "Reply to this notice"
-msgstr "Відповісти на це повідомлення"
+msgstr "Відповісти на цей допис"
-#: lib/noticelist.php:499
+#: lib/noticelist.php:527
msgid "Reply"
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"
@@ -5007,16 +5224,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 "Не вдалося додати нову підписку."
@@ -5051,7 +5266,7 @@ 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
msgid "Subscriptions"
@@ -5070,9 +5285,8 @@ msgid "All subscribers"
msgstr "Всі підписчики"
#: lib/profileaction.php:177
-#, fuzzy
msgid "User ID"
-msgstr "Користувач"
+msgstr "ІД"
#: lib/profileaction.php:182
msgid "Member since"
@@ -5083,13 +5297,12 @@ 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"
@@ -5101,7 +5314,7 @@ msgstr "Групи користувачів"
#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
msgid "Recent tags"
-msgstr "Нові теги"
+msgstr "Нові теґи"
#: lib/publicgroupnav.php:88
msgid "Featured"
@@ -5112,22 +5325,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 "Ключові слова"
+
#: lib/searchaction.php:162
-#, fuzzy
msgid "Search help"
msgstr "Пошук"
@@ -5139,13 +5352,9 @@ msgstr "Люди"
msgid "Find people on this site"
msgstr "Знайти людей на цьому сайті"
-#: lib/searchgroupnav.php:82
-msgid "Notice"
-msgstr "Повідомлення"
-
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
-msgstr "Знайти за змістом повідомлень"
+msgstr "Знайти за змістом дописів"
#: lib/searchgroupnav.php:85
msgid "Find groups on this site"
@@ -5157,17 +5366,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
@@ -5187,12 +5394,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)"
@@ -5200,11 +5407,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."
@@ -5212,12 +5419,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."
@@ -5229,25 +5435,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"
@@ -5258,7 +5462,6 @@ msgid "Unsubscribe"
msgstr "Відписатись"
#: lib/userprofile.php:116
-#, fuzzy
msgid "Edit Avatar"
msgstr "Аватара"
@@ -5267,13 +5470,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"
@@ -5283,59 +5485,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."
@@ -5343,21 +5549,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 ""
"Вибачте, але не затверджено жодної електронної адреси для вхідної пошти."
-
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "Розблокувати цього користувача"
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "Люди підписані до %s"
diff --git a/locale/vi/LC_MESSAGES/statusnet.mo b/locale/vi/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 2c799667d..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 0fe1fed57..e3b2ac65a 100644
--- a/locale/vi/LC_MESSAGES/statusnet.po
+++ b/locale/vi/LC_MESSAGES/statusnet.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 10:43+0000\n"
-"PO-Revision-Date: 2009-11-18 19:32:50+0000\n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-11-28 19:51:06+0000\n"
"Language-Team: Vietnamese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: vi\n"
"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
@@ -447,7 +447,7 @@ msgstr "Quá dài. Tối đa là 140 ký tự."
msgid "Not found"
msgstr "Không tìm thấy"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -566,7 +566,7 @@ msgid "Preview"
msgstr "Xem trước"
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
+#: lib/noticelist.php:550
#, fuzzy
msgid "Delete"
msgstr "Xóa tin nhắn"
@@ -581,7 +581,7 @@ msgid "Crop"
msgstr "Nhóm"
#: actions/avatarsettings.php:265 actions/disfavor.php:74
-#: actions/emailsettings.php:237 actions/favor.php:75
+#: 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
@@ -596,7 +596,7 @@ msgid "There was a problem with your session token. Try again, please."
msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa."
#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
-#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: 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."
@@ -732,15 +732,15 @@ msgstr "Không nhận dạng kiểu địa chỉ %s"
msgid "That address has already been confirmed."
msgstr "Địa chỉ đó đã được xác nhận rồi."
-#: actions/confirmaddress.php:114 actions/emailsettings.php:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
#: actions/profilesettings.php:276 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "Không thể cập nhật thành viên."
-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
msgstr "Không thể xóa email xác nhận."
@@ -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/profileaction.php:206 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Tin nhắn"
@@ -801,7 +801,7 @@ msgstr "Bạn có chắc chắn là muốn xóa tin nhắn này không?"
msgid "Do not delete this notice"
msgstr "Không thể xóa tin nhắn này."
-#: actions/deletenotice.php:146 lib/noticelist.php:522
+#: actions/deletenotice.php:146 lib/noticelist.php:550
#, fuzzy
msgid "Delete this notice"
msgstr "Xóa tin nhắn"
@@ -846,104 +846,52 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:278
+#: actions/designadminpanel.php:270
#, fuzzy
msgid "Invalid logo URL."
msgstr "Kích thước không hợp lệ."
-#: actions/designadminpanel.php:282
+#: actions/designadminpanel.php:274
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "Trang này không phải là phương tiện truyền thông mà bạn chấp nhận."
-#: actions/designadminpanel.php:288
-#, fuzzy, php-format
-msgid "Theme directory not readable: %s"
-msgstr "Trang này không phải là phương tiện truyền thông mà bạn chấp nhận."
-
-#: actions/designadminpanel.php:292
-#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:296
-#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:312
-#, php-format
-msgid "Max length for %s %s is 255 characters."
-msgstr ""
-
-#: actions/designadminpanel.php:412
+#: actions/designadminpanel.php:370
#, fuzzy
msgid "Change logo"
msgstr "Thay đổi mật khẩu của bạn"
-#: actions/designadminpanel.php:417
+#: actions/designadminpanel.php:375
#, fuzzy
msgid "Site logo"
msgstr "Thư mời"
-#: actions/designadminpanel.php:424
+#: actions/designadminpanel.php:382
#, fuzzy
msgid "Change theme"
msgstr "Thay đổi"
-#: actions/designadminpanel.php:441
+#: actions/designadminpanel.php:399
#, fuzzy
msgid "Site theme"
msgstr "Thông báo mới"
-#: actions/designadminpanel.php:442
+#: actions/designadminpanel.php:400
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:447
-msgid "Theme server"
-msgstr ""
-
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
-
-#: actions/designadminpanel.php:455
-msgid "Theme directory"
-msgstr ""
-
-#: actions/designadminpanel.php:462
-#, fuzzy
-msgid "Avatar Settings"
-msgstr "Thay đổi hình đại diện"
-
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Avatar server"
-msgstr "Thay đổi hình đại diện"
-
-#: actions/designadminpanel.php:471
-#, fuzzy
-msgid "Avatar path"
-msgstr "Hình đại diện đã được cập nhật."
-
-#: actions/designadminpanel.php:475
-#, fuzzy
-msgid "Avatar directory"
-msgstr "Hình đại diện đã được cập nhật."
-
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
#, fuzzy
msgid "Change background image"
msgstr "Background Theme:"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
#, fuzzy
msgid "Background"
msgstr "Background Theme:"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:422
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -952,84 +900,70 @@ msgstr ""
"Bạn có thể cập nhật hồ sơ cá nhân tại đây để mọi người có thể biết thông tin "
"về bạn."
-#: actions/designadminpanel.php:526 lib/designsettings.php:139
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:542 lib/designsettings.php:155
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:543 lib/designsettings.php:156
+#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:548 lib/designsettings.php:161
+#: actions/designadminpanel.php:474 lib/designsettings.php:161
#, fuzzy
msgid "Tile background image"
msgstr "Background Theme:"
-#: actions/designadminpanel.php:554
-#, fuzzy
-msgid "Background server"
-msgstr "Background Theme:"
-
-#: actions/designadminpanel.php:558
-#, fuzzy
-msgid "Background path"
-msgstr "Background Theme:"
-
-#: actions/designadminpanel.php:562
-#, fuzzy
-msgid "Background directory"
-msgstr "Background Theme:"
-
-#: actions/designadminpanel.php:569 lib/designsettings.php:170
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Thay đổi mật khẩu của bạn"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Kết nối"
-#: actions/designadminpanel.php:604 lib/designsettings.php:204
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Tìm kiếm"
-#: actions/designadminpanel.php:617 lib/designsettings.php:217
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
msgstr "Chuỗi bất kỳ"
-#: actions/designadminpanel.php:630 lib/designsettings.php:230
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Đăng nhập"
-#: actions/designadminpanel.php:658 lib/designsettings.php:247
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:659 lib/designsettings.php:248
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:665 lib/designsettings.php:254
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 actions/useradminpanel.php:226
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: 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 "Lưu"
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: actions/designadminpanel.php:582 lib/designsettings.php:257
#, fuzzy
msgid "Save design"
msgstr "Lưu"
@@ -1192,41 +1126,41 @@ msgstr "Tôi muốn đưa tin nhắn lên bằng email."
msgid "Publish a MicroID for my email address."
msgstr "Xuất bản một MicroID đến địa chỉ email của tôi."
-#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/emailsettings.php:302 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
msgstr "Các tính năng đã được lưu."
-#: actions/emailsettings.php:319
+#: actions/emailsettings.php:320
msgid "No email address."
msgstr "Không có địa chỉ email."
-#: actions/emailsettings.php:326
+#: actions/emailsettings.php:327
#, fuzzy
msgid "Cannot normalize that email address"
msgstr "Không thể bình thường hóa địa chỉ GTalk này"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
#, fuzzy
msgid "Not a valid email address"
msgstr "Địa chỉ email không hợp lệ."
-#: actions/emailsettings.php:333
+#: actions/emailsettings.php:334
#, fuzzy
msgid "That is already your email address."
msgstr "Bạn đã dùng địa chỉ email này rồi"
-#: actions/emailsettings.php:336
+#: actions/emailsettings.php:337
#, fuzzy
msgid "That email address already belongs to another user."
msgstr "Địa chỉ email GTalk này đã có người khác sử dụng rồi."
-#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "Không thể chèn mã xác nhận."
-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1234,52 +1168,52 @@ msgstr ""
"Mã xác nhận đã được gửi tới địa chỉ email của bạn. Hãy kiểm tra hộp thư và "
"làm theo hướng dẫn."
-#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
msgstr "Sự xác nhận chưa được hủy bỏ."
-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
msgstr "Sai IM."
-#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
msgstr "Sự xác nhận đã bị hủy bỏ."
-#: actions/emailsettings.php:412
+#: actions/emailsettings.php:413
#, fuzzy
msgid "That is not your email address."
msgstr "Xin lỗi, đó không phải là địa chỉ email mà bạn nhập vào."
-#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
msgstr "Đã xóa địa chỉ."
-#: actions/emailsettings.php:445 actions/smssettings.php:518
+#: actions/emailsettings.php:446 actions/smssettings.php:518
#, fuzzy
msgid "No incoming email address."
msgstr "Địa chỉ email không hợp lệ."
-#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
#, fuzzy
msgid "Couldn't update user record."
msgstr "Không thể cập nhật thành viên."
-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: actions/emailsettings.php:459 actions/smssettings.php:531
#, fuzzy
msgid "Incoming email address removed."
msgstr "Địa chỉ email hoặc mật khẩu không đúng."
-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555
#, fuzzy
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"
@@ -1554,7 +1488,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
msgid "Admin"
msgstr ""
@@ -1616,7 +1550,7 @@ msgid ""
msgstr ""
#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/subgroupnav.php:98
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
#, fuzzy
msgid "Groups"
msgstr "Nhóm"
@@ -1838,7 +1772,7 @@ msgstr "Tin nhắn cá nhân"
msgid "Optionally add a personal message to the invitation."
msgstr "Không bắt buộc phải thêm thông điệp vào thư mời."
-#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
msgstr "Gửi"
@@ -1967,7 +1901,7 @@ msgstr "Sai tên đăng nhập hoặc mật khẩu."
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:457
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Đăng nhập"
@@ -2083,7 +2017,7 @@ msgstr "Tin mới nhất"
msgid "Direct message to %s sent"
msgstr "Tin nhắn riêng"
-#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
#, fuzzy
msgid "Ajax Error"
msgstr "Lỗi"
@@ -2092,7 +2026,7 @@ msgstr "Lỗi"
msgid "New notice"
msgstr "Thông báo mới"
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
#, fuzzy
msgid "Notice posted"
msgstr "Tin đã gửi"
@@ -2129,12 +2063,12 @@ msgid ""
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
-#: actions/noticesearchrss.php:89
+#: actions/noticesearchrss.php:96
#, fuzzy, php-format
msgid "Updates with \"%s\""
msgstr "Dòng tin nhắn cho %s"
-#: actions/noticesearchrss.php:91
+#: actions/noticesearchrss.php:98
#, fuzzy, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
msgstr "Các thay đổi phù hợp với từ \"%s\""
@@ -2268,9 +2202,9 @@ msgstr "Nhiều hơn 6 ký tự"
msgid "Confirm"
msgstr "Xác nhận"
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "cùng mật khẩu ở trên"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Cùng mật khẩu ở trên"
#: actions/passwordsettings.php:117
msgid "Change"
@@ -2301,6 +2235,118 @@ msgstr "Không thể lưu mật khẩu mới"
msgid "Password saved."
msgstr "Đã lưu mật khẩu."
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr ""
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr ""
+
+#: actions/pathsadminpanel.php:140
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "Trang này không phải là phương tiện truyền thông mà bạn chấp nhận."
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+#, fuzzy
+msgid "Site"
+msgstr "Thư mời"
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+#, fuzzy
+msgid "Site path"
+msgstr "Thông báo mới"
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr ""
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Avatars"
+msgstr "Hình đại diện"
+
+#: actions/pathsadminpanel.php:252
+#, fuzzy
+msgid "Avatar server"
+msgstr "Thay đổi hình đại diện"
+
+#: actions/pathsadminpanel.php:256
+#, fuzzy
+msgid "Avatar path"
+msgstr "Hình đại diện đã được cập nhật."
+
+#: actions/pathsadminpanel.php:260
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Hình đại diện đã được cập nhật."
+
+#: actions/pathsadminpanel.php:269
+#, fuzzy
+msgid "Backgrounds"
+msgstr "Background Theme:"
+
+#: actions/pathsadminpanel.php:273
+#, fuzzy
+msgid "Background server"
+msgstr "Background Theme:"
+
+#: actions/pathsadminpanel.php:277
+#, fuzzy
+msgid "Background path"
+msgstr "Background Theme:"
+
+#: actions/pathsadminpanel.php:281
+#, fuzzy
+msgid "Background directory"
+msgstr "Background Theme:"
+
+#: actions/pathsadminpanel.php:297
+#, fuzzy
+msgid "Save paths"
+msgstr "Thông báo mới"
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -2404,7 +2450,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr "Ngôn ngữ"
@@ -2634,10 +2680,6 @@ msgstr "Không tìm thấy action"
msgid "6 or more characters, and don't forget it!"
msgstr "Nhiều hơn 6 ký tự, đừng quên nó!"
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Cùng mật khẩu ở trên"
-
#: actions/recoverpassword.php:243
msgid "Reset"
msgstr "Khởi tạo"
@@ -2700,7 +2742,7 @@ msgstr "Lỗi xảy ra với mã xác nhận."
msgid "Registration successful"
msgstr "Đăng ký thành công"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Đăng ký"
@@ -2747,7 +2789,7 @@ msgid "Same as password above. Required."
msgstr "Cùng mật khẩu ở trên. Bắt buộc."
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Email"
@@ -2851,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"
@@ -3191,11 +3233,6 @@ msgstr "Bạn đã theo những người này:"
msgid "User is already silenced."
msgstr "Người dùng không có thông tin."
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
-#, fuzzy
-msgid "Site"
-msgstr "Thư mời"
-
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
msgstr ""
@@ -3227,103 +3264,99 @@ msgid "Snapshot frequency must be a number."
msgstr ""
#: actions/siteadminpanel.php:199
-msgid "You must set an SSL sever when enabling SSL."
+msgid "You must set an SSL server when enabling SSL."
msgstr ""
#: actions/siteadminpanel.php:204
-msgid "Invalid SSL server. Max length is 255 characters."
+msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
#: actions/siteadminpanel.php:210
-msgid "Minimum text limit is 140c."
+msgid "Minimum text limit is 140 characters."
msgstr ""
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:224
-#, php-format
-msgid "Locales directory not readable: %s"
+#: actions/siteadminpanel.php:266
+msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:275
+#: actions/siteadminpanel.php:269
#, fuzzy
msgid "Site name"
msgstr "Thông báo mới"
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:279
+#: actions/siteadminpanel.php:274
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:280
+#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:283
+#: actions/siteadminpanel.php:279
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:284
#, fuzzy
-msgid "contact email address for your site"
+msgid "Contact email address for your site"
msgstr "Dia chi email moi de gui tin nhan den %s"
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:290
+#, fuzzy
+msgid "Local"
+msgstr "Thành phố"
+
+#: actions/siteadminpanel.php:301
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:303
+#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:308
#, fuzzy
msgid "Default site language"
msgstr "Ngôn ngữ bạn thích"
#: actions/siteadminpanel.php:316
-msgid "Path to locales"
+msgid "URLs"
msgstr ""
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
-msgstr ""
-
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
#, fuzzy
msgid "Server"
msgstr "Khôi phục"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
msgstr ""
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-#, fuzzy
-msgid "Site path"
-msgstr "Thông báo mới"
-
-#: actions/siteadminpanel.php:328
+#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
msgstr ""
-#: actions/siteadminpanel.php:330
+#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
+#: actions/siteadminpanel.php:331
+#, fuzzy
+msgid "Access"
+msgstr "Chấp nhận"
+
#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
@@ -3342,7 +3375,7 @@ msgstr "Thư mời"
msgid "Make registration invitation only."
msgstr ""
-#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#: actions/siteadminpanel.php:346
#, fuzzy
msgid "Closed"
msgstr "Ban user"
@@ -3351,33 +3384,37 @@ msgstr "Ban user"
msgid "Disable new registrations."
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
#, fuzzy
msgid "Never"
msgstr "Khôi phục"
-#: actions/siteadminpanel.php:357
+#: actions/siteadminpanel.php:360
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:358
+#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:364
+#: actions/siteadminpanel.php:366
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:365
-msgid "Snapshots will be sent once every N Web hits"
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
msgstr ""
#: actions/siteadminpanel.php:372
@@ -3388,48 +3425,57 @@ msgstr ""
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:381
+#: actions/siteadminpanel.php:380
+#, fuzzy
+msgid "SSL"
+msgstr "SMS"
+
+#: actions/siteadminpanel.php:384
#, fuzzy
msgid "Sometimes"
msgstr "Tin nhắn"
-#: actions/siteadminpanel.php:382
+#: actions/siteadminpanel.php:385
msgid "Always"
msgstr ""
-#: actions/siteadminpanel.php:384
+#: actions/siteadminpanel.php:387
msgid "Use SSL"
msgstr ""
-#: actions/siteadminpanel.php:385
+#: actions/siteadminpanel.php:388
msgid "When to use SSL"
msgstr ""
-#: actions/siteadminpanel.php:391
+#: actions/siteadminpanel.php:393
msgid "SSL Server"
msgstr ""
-#: actions/siteadminpanel.php:392
+#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr ""
+
+#: actions/siteadminpanel.php:403
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
#, fuzzy
msgid "Save site settings"
msgstr "Thay đổi hình đại diện"
@@ -3755,7 +3801,8 @@ msgstr "Hết theo"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
-#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
msgid "User"
msgstr ""
@@ -3763,17 +3810,87 @@ msgstr ""
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:178
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
+msgstr ""
+
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr ""
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Hồ sơ "
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr ""
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
+msgstr ""
+
+#: actions/useradminpanel.php:231
#, fuzzy
-msgid "Invite-only"
-msgstr "Thư mời"
+msgid "New users"
+msgstr "Gửi thư mời đến những người chưa có tài khoản"
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr ""
+
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr ""
+
+#: actions/useradminpanel.php:241
+#, fuzzy
+msgid "Default subscription"
+msgstr "Tất cả đăng nhận"
+
+#: actions/useradminpanel.php:242
+#, fuzzy
+msgid "Automatically subscribe new users to this user."
+msgstr "Tự động theo những người nào đăng ký theo tôi"
+
+#: actions/useradminpanel.php:251
+#, fuzzy
+msgid "Invitations"
+msgstr "Thư mời đã gửi"
+
+#: actions/useradminpanel.php:256
+#, fuzzy
+msgid "Invitations enabled"
+msgstr "Thư mời đã gửi"
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr ""
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr ""
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/userauthorization.php:105
@@ -3986,7 +4103,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"
@@ -4006,10 +4123,6 @@ msgstr "Không thể tạo đăng nhận."
msgid "Welcome to %1$s, @%2$s!"
msgstr "%s chào mừng bạn "
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr "Hồ sơ "
-
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Thay đổi các thiết lập trong hồ sơ cá nhân của bạn"
@@ -4050,140 +4163,140 @@ msgstr "%s (%s)"
msgid "Untitled page"
msgstr ""
-#: lib/action.php:424
+#: lib/action.php:425
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Home"
msgstr "Trang chủ"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:432
+#: lib/action.php:433
#, fuzzy
msgid "Account"
msgstr "Giới thiệu"
-#: lib/action.php:432
+#: lib/action.php:433
#, fuzzy
msgid "Change your email, avatar, password, profile"
msgstr "Thay đổi mật khẩu của bạn"
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect"
msgstr "Kết nối"
-#: lib/action.php:435
+#: lib/action.php:436
#, fuzzy
msgid "Connect to services"
msgstr "Không thể chuyển đến máy chủ: %s"
-#: lib/action.php:439
+#: lib/action.php:440
#, fuzzy
msgid "Change site configuration"
msgstr "Tôi theo"
-#: lib/action.php:443 lib/subgroupnav.php:105
+#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Thư mời"
-#: lib/action.php:444 lib/subgroupnav.php:106
+#: lib/action.php:445 lib/subgroupnav.php:106
#, fuzzy, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
"Điền địa chỉ email và nội dung tin nhắn để gửi thư mời bạn bè và đồng nghiệp "
"của bạn tham gia vào dịch vụ này."
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout"
msgstr "Thoát"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:454
+#: lib/action.php:455
#, fuzzy
msgid "Create an account"
msgstr "Tạo tài khoản mới"
-#: lib/action.php:457
+#: lib/action.php:458
msgid "Login to the site"
msgstr ""
-#: lib/action.php:460 lib/action.php:723
+#: lib/action.php:461 lib/action.php:724
msgid "Help"
msgstr "Hướng dẫn"
-#: lib/action.php:460
+#: lib/action.php:461
#, fuzzy
msgid "Help me!"
msgstr "Hướng dẫn"
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
msgstr "Tìm kiếm"
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:484
+#: lib/action.php:485
#, fuzzy
msgid "Site notice"
msgstr "Thông báo mới"
-#: lib/action.php:550
+#: lib/action.php:551
msgid "Local views"
msgstr ""
-#: lib/action.php:616
+#: lib/action.php:617
#, fuzzy
msgid "Page notice"
msgstr "Thông báo mới"
-#: lib/action.php:718
+#: lib/action.php:719
#, fuzzy
msgid "Secondary site navigation"
msgstr "Tôi theo"
-#: lib/action.php:725
+#: lib/action.php:726
msgid "About"
msgstr "Giới thiệu"
-#: lib/action.php:727
+#: lib/action.php:728
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:731
+#: lib/action.php:732
msgid "TOS"
msgstr ""
-#: lib/action.php:734
+#: lib/action.php:735
msgid "Privacy"
msgstr "Riêng tư"
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
msgstr "Nguồn"
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Contact"
msgstr "Liên hệ"
-#: lib/action.php:740
+#: lib/action.php:741
#, fuzzy
msgid "Badge"
msgstr "Tin đã gửi"
-#: lib/action.php:768
+#: lib/action.php:769
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:771
+#: lib/action.php:772
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4192,12 +4305,12 @@ msgstr ""
"**%%site.name%%** là dịch vụ gửi tin nhắn được cung cấp từ [%%site.broughtby%"
"%](%%site.broughtbyurl%%). "
-#: lib/action.php:773
+#: lib/action.php:774
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** là dịch vụ gửi tin nhắn. "
-#: lib/action.php:775
+#: lib/action.php:776
#, fuzzy, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4208,34 +4321,34 @@ msgstr ""
"quyền [GNU Affero General Public License](http://www.fsf.org/licensing/"
"licenses/agpl-3.0.html)."
-#: lib/action.php:789
+#: lib/action.php:790
#, fuzzy
msgid "Site content license"
msgstr "Tìm theo nội dung của tin nhắn"
-#: lib/action.php:798
+#: lib/action.php:799
msgid "All "
msgstr ""
-#: lib/action.php:803
+#: lib/action.php:804
msgid "license."
msgstr ""
-#: lib/action.php:1067
+#: lib/action.php:1068
msgid "Pagination"
msgstr ""
-#: lib/action.php:1076
+#: lib/action.php:1077
#, fuzzy
msgid "After"
msgstr "Sau"
-#: lib/action.php:1084
+#: lib/action.php:1085
#, fuzzy
msgid "Before"
msgstr "Trước"
-#: lib/action.php:1132
+#: lib/action.php:1133
#, fuzzy
msgid "There was a problem with your session token."
msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa."
@@ -4268,6 +4381,11 @@ msgstr "Xac nhan dia chi email"
msgid "Design configuration"
msgstr "Xác nhận SMS"
+#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+#, fuzzy
+msgid "Paths configuration"
+msgstr "Xác nhận SMS"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4449,11 +4567,9 @@ msgid "You are not subscribed to anyone."
msgstr "Bạn chưa cập nhật thông tin riêng"
#: lib/command.php:620
-#, fuzzy
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
-msgstr[0] "Bạn chưa cập nhật thông tin riêng"
-msgstr[1] "Bạn chưa cập nhật thông tin riêng"
+msgstr[0] "Bạn đã theo những người này:"
#: lib/command.php:640
#, fuzzy
@@ -4461,11 +4577,9 @@ msgid "No one is subscribed to you."
msgstr "Không thể tạo favorite."
#: lib/command.php:642
-#, fuzzy
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Không thể tạo favorite."
-msgstr[1] "Không thể tạo favorite."
#: lib/command.php:662
#, fuzzy
@@ -4473,11 +4587,9 @@ 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
-#, fuzzy
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"
-msgstr[1] "Bạn chưa cập nhật thông tin riêng"
#: lib/command.php:678
msgid ""
@@ -4557,9 +4669,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: "
@@ -4660,7 +4775,7 @@ msgstr "Bạn ở đâu, \"Thành phố, Tỉnh thành, Quốc gia\""
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
-#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85
msgid "Group"
msgstr "Nhóm"
@@ -4708,7 +4823,7 @@ msgstr ""
msgid "Tags in %s group's notices"
msgstr ""
-#: lib/htmloutputter.php:104
+#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
msgstr "Trang này không phải là phương tiện truyền thông mà bạn chấp nhận."
@@ -4745,6 +4860,14 @@ 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/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
@@ -4780,7 +4903,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:424
+#: lib/mailbox.php:227 lib/noticelist.php:452
#, fuzzy
msgid "from"
msgstr " từ "
@@ -5078,40 +5201,66 @@ msgstr "Xóa tin nhắn"
msgid "To"
msgstr ""
-#: lib/messageform.php:162 lib/noticeform.php:173
+#: lib/messageform.php:162 lib/noticeform.php:186
#, fuzzy
msgid "Available characters"
msgstr "Nhiều hơn 6 ký tự"
-#: lib/noticeform.php:145
+#: lib/noticeform.php:158
#, fuzzy
msgid "Send a notice"
msgstr "Thông báo mới"
-#: lib/noticeform.php:158
+#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
msgstr "Bạn đang làm gì thế, %s?"
-#: lib/noticeform.php:180
+#: lib/noticeform.php:193
msgid "Attach"
msgstr ""
-#: lib/noticeform.php:184
+#: lib/noticeform.php:197
msgid "Attach a file"
msgstr ""
-#: lib/noticelist.php:478
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "Không"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr ""
+
+#: lib/noticelist.php:506
#, fuzzy
msgid "in context"
msgstr "Không có nội dung!"
-#: lib/noticelist.php:498
+#: lib/noticelist.php:526
#, fuzzy
msgid "Reply to this notice"
msgstr "Trả lời tin nhắn này"
-#: lib/noticelist.php:499
+#: lib/noticelist.php:527
msgid "Reply"
msgstr "Trả lời"
@@ -5147,11 +5296,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."
@@ -5265,6 +5414,10 @@ msgstr "Bỏ chặn người dùng này"
msgid "Search site"
msgstr "Tìm kiếm"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
#, fuzzy
msgid "Search help"
@@ -5278,11 +5431,6 @@ msgstr "Tên tài khoản"
msgid "Find people on this site"
msgstr "Tìm kiếm mọi người trên trang web này"
-#: lib/searchgroupnav.php:82
-#, fuzzy
-msgid "Notice"
-msgstr "Tin nhắn"
-
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
msgstr "Tìm theo nội dung của tin nhắn"
@@ -5432,47 +5580,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"
@@ -5502,11 +5654,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 "Unlock this user"
-#~ msgstr "Bỏ chặn người dùng này"
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "Theo nhóm này"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.mo b/locale/zh_CN/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 6f41c554e..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 f32b9e629..689217738 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -1,7 +1,5 @@
# Translation of StatusNet to Simplified Chinese
#
-# Author@translatewiki.net: Translationista
-# Author: Gouki <gouki@goukihq.org>, 2008
# --
# Messages of identi.ca
# Copyright (C) 2008 Gouki <gouki@goukihq.org>
@@ -11,16 +9,16 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 10:43+0000\n"
-"PO-Revision-Date: 2009-11-18 19:32:53+0000\n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-11-28 19:51:09+0000\n"
"Language-Team: Simplified Chinese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hans\n"
"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
@@ -447,7 +445,7 @@ msgstr "超出长度限制。不能超过 140 个字符。"
msgid "Not found"
msgstr "未找到"
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -563,7 +561,7 @@ msgid "Preview"
msgstr "预览"
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
+#: lib/noticelist.php:550
#, fuzzy
msgid "Delete"
msgstr "删除"
@@ -577,7 +575,7 @@ msgid "Crop"
msgstr "剪裁"
#: actions/avatarsettings.php:265 actions/disfavor.php:74
-#: actions/emailsettings.php:237 actions/favor.php:75
+#: 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
@@ -592,7 +590,7 @@ msgid "There was a problem with your session token. Try again, please."
msgstr "会话标识有问题,请重试。"
#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
-#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: 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."
@@ -730,15 +728,15 @@ msgstr "不可识别的地址类型 %s"
msgid "That address has already been confirmed."
msgstr "此地址已被确认。"
-#: actions/confirmaddress.php:114 actions/emailsettings.php:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
#: actions/profilesettings.php:276 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "无法更新用户。"
-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
msgstr "无法删除电子邮件确认。"
@@ -758,7 +756,7 @@ msgid "Conversation"
msgstr "确认码"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206
+#: lib/profileaction.php:206 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "通告"
@@ -799,7 +797,7 @@ msgstr "确定要删除这条消息吗?"
msgid "Do not delete this notice"
msgstr "无法删除通告。"
-#: actions/deletenotice.php:146 lib/noticelist.php:522
+#: actions/deletenotice.php:146 lib/noticelist.php:550
#, fuzzy
msgid "Delete this notice"
msgstr "删除通告"
@@ -844,183 +842,120 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:278
+#: actions/designadminpanel.php:270
#, fuzzy
msgid "Invalid logo URL."
msgstr "大小不正确。"
-#: actions/designadminpanel.php:282
+#: actions/designadminpanel.php:274
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "这个页面不提供您想要的媒体类型"
-#: actions/designadminpanel.php:288
-#, fuzzy, php-format
-msgid "Theme directory not readable: %s"
-msgstr "这个页面不提供您想要的媒体类型"
-
-#: actions/designadminpanel.php:292
-#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:296
-#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:312
-#, php-format
-msgid "Max length for %s %s is 255 characters."
-msgstr ""
-
-#: actions/designadminpanel.php:412
+#: actions/designadminpanel.php:370
#, fuzzy
msgid "Change logo"
msgstr "修改密码"
-#: actions/designadminpanel.php:417
+#: actions/designadminpanel.php:375
#, fuzzy
msgid "Site logo"
msgstr "邀请"
-#: actions/designadminpanel.php:424
+#: actions/designadminpanel.php:382
#, fuzzy
msgid "Change theme"
msgstr "修改"
-#: actions/designadminpanel.php:441
+#: actions/designadminpanel.php:399
#, fuzzy
msgid "Site theme"
msgstr "新通告"
-#: actions/designadminpanel.php:442
+#: actions/designadminpanel.php:400
#, fuzzy
msgid "Theme for the site."
msgstr "登出本站"
-#: actions/designadminpanel.php:447
-msgid "Theme server"
-msgstr ""
-
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
-
-#: actions/designadminpanel.php:455
-msgid "Theme directory"
-msgstr ""
-
-#: actions/designadminpanel.php:462
-#, fuzzy
-msgid "Avatar Settings"
-msgstr "头像设置"
-
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Avatar server"
-msgstr "头像设置"
-
-#: actions/designadminpanel.php:471
-#, fuzzy
-msgid "Avatar path"
-msgstr "头像已更新。"
-
-#: actions/designadminpanel.php:475
-#, fuzzy
-msgid "Avatar directory"
-msgstr "头像已更新。"
-
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:422
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "你可以给你的组上载一个logo图。"
-#: actions/designadminpanel.php:526 lib/designsettings.php:139
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:542 lib/designsettings.php:155
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:543 lib/designsettings.php:156
+#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:548 lib/designsettings.php:161
+#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:554
-msgid "Background server"
-msgstr ""
-
-#: actions/designadminpanel.php:558
-msgid "Background path"
-msgstr ""
-
-#: actions/designadminpanel.php:562
-msgid "Background directory"
-msgstr ""
-
-#: actions/designadminpanel.php:569 lib/designsettings.php:170
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "修改密码"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "连接"
-#: actions/designadminpanel.php:604 lib/designsettings.php:204
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "搜索"
-#: actions/designadminpanel.php:617 lib/designsettings.php:217
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
msgstr "文本"
-#: actions/designadminpanel.php:630 lib/designsettings.php:230
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "登录"
-#: actions/designadminpanel.php:658 lib/designsettings.php:247
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:659 lib/designsettings.php:248
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:665 lib/designsettings.php:254
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 actions/useradminpanel.php:226
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/pathsadminpanel.php:296 actions/profilesettings.php:167
+#: actions/siteadminpanel.php:421 actions/smssettings.php:181
+#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/useradminpanel.php:313 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "保存"
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: actions/designadminpanel.php:582 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1172,37 +1107,37 @@ msgstr "我希望通过邮件发布信息。"
msgid "Publish a MicroID for my email address."
msgstr "公开电子邮件的 MicroID。"
-#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/emailsettings.php:302 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
msgstr "首选项已保存。"
-#: actions/emailsettings.php:319
+#: actions/emailsettings.php:320
msgid "No email address."
msgstr "没有电子邮件地址。"
-#: actions/emailsettings.php:326
+#: actions/emailsettings.php:327
msgid "Cannot normalize that email address"
msgstr "无法识别此电子邮件"
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr "不是有效的电子邮件"
-#: actions/emailsettings.php:333
+#: actions/emailsettings.php:334
msgid "That is already your email address."
msgstr "您已登记此电子邮件。"
-#: actions/emailsettings.php:336
+#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
msgstr "此电子邮件属于其他用户。"
-#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "无法插入验证码。"
-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1210,47 +1145,47 @@ msgstr ""
"验证码已被发送到您新增的电子邮件。请检查收件箱(和垃圾箱),找到验证码并按要求"
"使用它。"
-#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
msgstr "没有可以取消的确认。"
-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
msgstr "即时通讯帐号错误。"
-#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
msgstr "已取消确认。"
-#: actions/emailsettings.php:412
+#: actions/emailsettings.php:413
msgid "That is not your email address."
msgstr "这是他人的电子邮件。"
-#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
msgstr "地址被移除。"
-#: actions/emailsettings.php:445 actions/smssettings.php:518
+#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
msgstr "没有发布用的电子邮件地址。"
-#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
msgid "Couldn't update user record."
msgstr "无法更新用户记录。"
-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
msgstr "发布用的电子邮件被移除。"
-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555
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"
@@ -1525,7 +1460,7 @@ msgstr "%s 组成员, 第 %d 页"
msgid "A list of the users in this group."
msgstr "该组成员列表。"
-#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
msgid "Admin"
msgstr "admin管理员"
@@ -1586,7 +1521,7 @@ msgid ""
msgstr ""
#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/subgroupnav.php:98
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "组"
@@ -1796,7 +1731,7 @@ msgstr "个人消息"
msgid "Optionally add a personal message to the invitation."
msgstr "在邀请中加几句话(可选)。"
-#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
msgstr "发送"
@@ -1918,7 +1853,7 @@ msgstr "用户名或密码不正确。"
msgid "Error setting user. You are probably not authorized."
msgstr "未认证。"
-#: actions/login.php:204 actions/login.php:257 lib/action.php:457
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "登录"
@@ -2028,7 +1963,7 @@ msgstr "新消息"
msgid "Direct message to %s sent"
msgstr "已向 %s 发送消息"
-#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
msgid "Ajax Error"
msgstr "Ajax错误"
@@ -2036,7 +1971,7 @@ msgstr "Ajax错误"
msgid "New notice"
msgstr "新通告"
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
msgid "Notice posted"
msgstr "消息已发布。"
@@ -2072,12 +2007,12 @@ msgid ""
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
-#: actions/noticesearchrss.php:89
+#: actions/noticesearchrss.php:96
#, fuzzy, php-format
msgid "Updates with \"%s\""
msgstr "%2$s 上 %1$s 的更新!"
-#: actions/noticesearchrss.php:91
+#: actions/noticesearchrss.php:98
#, fuzzy, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
msgstr "所有匹配搜索条件\"%s\"的消息"
@@ -2206,8 +2141,8 @@ msgstr "6 个或更多字符"
msgid "Confirm"
msgstr "确认"
-#: actions/passwordsettings.php:113
-msgid "same as password above"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
msgstr "相同的密码"
#: actions/passwordsettings.php:117
@@ -2238,6 +2173,114 @@ msgstr "无法保存新密码。"
msgid "Password saved."
msgstr "密码已保存。"
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr ""
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr ""
+
+#: actions/pathsadminpanel.php:140
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "这个页面不提供您想要的媒体类型"
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+#, fuzzy
+msgid "Site"
+msgstr "邀请"
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+#, fuzzy
+msgid "Site path"
+msgstr "新通告"
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr ""
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Avatars"
+msgstr "头像"
+
+#: actions/pathsadminpanel.php:252
+#, fuzzy
+msgid "Avatar server"
+msgstr "头像设置"
+
+#: actions/pathsadminpanel.php:256
+#, fuzzy
+msgid "Avatar path"
+msgstr "头像已更新。"
+
+#: actions/pathsadminpanel.php:260
+#, fuzzy
+msgid "Avatar directory"
+msgstr "头像已更新。"
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:297
+#, fuzzy
+msgid "Save paths"
+msgstr "新通告"
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -2339,7 +2382,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr "你的标签 (字母letters, 数字numbers, -, ., 和 _), 以逗号或空格分隔"
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr "语言"
@@ -2569,10 +2612,6 @@ msgstr "未知动作"
msgid "6 or more characters, and don't forget it!"
msgstr "6 个或更多字符,不能忘记!"
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "相同的密码"
-
#: actions/recoverpassword.php:243
msgid "Reset"
msgstr "重置"
@@ -2632,7 +2671,7 @@ msgstr "验证码出错。"
msgid "Registration successful"
msgstr "注册成功。"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "注册"
@@ -2676,7 +2715,7 @@ msgid "Same as password above. Required."
msgstr "相同的密码。此项必填。"
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "电子邮件"
@@ -2777,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 "订阅"
@@ -3121,11 +3160,6 @@ msgstr "无法向此用户发送消息。"
msgid "User is already silenced."
msgstr "用户没有个人信息。"
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
-#, fuzzy
-msgid "Site"
-msgstr "邀请"
-
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
msgstr ""
@@ -3157,103 +3191,100 @@ msgid "Snapshot frequency must be a number."
msgstr ""
#: actions/siteadminpanel.php:199
-msgid "You must set an SSL sever when enabling SSL."
+msgid "You must set an SSL server when enabling SSL."
msgstr ""
#: actions/siteadminpanel.php:204
-msgid "Invalid SSL server. Max length is 255 characters."
+msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
#: actions/siteadminpanel.php:210
-msgid "Minimum text limit is 140c."
+msgid "Minimum text limit is 140 characters."
msgstr ""
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:224
-#, php-format
-msgid "Locales directory not readable: %s"
+#: actions/siteadminpanel.php:266
+msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:275
+#: actions/siteadminpanel.php:269
#, fuzzy
msgid "Site name"
msgstr "新通告"
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:279
+#: actions/siteadminpanel.php:274
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:280
+#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:283
+#: actions/siteadminpanel.php:279
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:284
#, fuzzy
-msgid "contact email address for your site"
+msgid "Contact email address for your site"
msgstr "新的电子邮件地址,用于发布 %s 信息"
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:290
+#, fuzzy
+msgid "Local"
+msgstr "本地显示"
+
+#: actions/siteadminpanel.php:301
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:303
+#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:308
#, fuzzy
msgid "Default site language"
msgstr "首选语言"
#: actions/siteadminpanel.php:316
-msgid "Path to locales"
-msgstr ""
-
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
-msgstr ""
+#, fuzzy
+msgid "URLs"
+msgstr "URL 互联网地址"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
#, fuzzy
msgid "Server"
msgstr "恢复"
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
msgstr ""
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-#, fuzzy
-msgid "Site path"
-msgstr "新通告"
-
-#: actions/siteadminpanel.php:328
+#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
msgstr ""
-#: actions/siteadminpanel.php:330
+#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
+#: actions/siteadminpanel.php:331
+#, fuzzy
+msgid "Access"
+msgstr "接受"
+
#: actions/siteadminpanel.php:334
#, fuzzy
msgid "Private"
@@ -3272,7 +3303,7 @@ msgstr "邀请"
msgid "Make registration invitation only."
msgstr ""
-#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#: actions/siteadminpanel.php:346
#, fuzzy
msgid "Closed"
msgstr "阻止"
@@ -3281,33 +3312,37 @@ msgstr "阻止"
msgid "Disable new registrations."
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
#, fuzzy
msgid "Never"
msgstr "恢复"
-#: actions/siteadminpanel.php:357
+#: actions/siteadminpanel.php:360
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:358
+#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:364
+#: actions/siteadminpanel.php:366
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:365
-msgid "Snapshots will be sent once every N Web hits"
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
msgstr ""
#: actions/siteadminpanel.php:372
@@ -3318,48 +3353,57 @@ msgstr ""
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:381
+#: actions/siteadminpanel.php:380
+#, fuzzy
+msgid "SSL"
+msgstr "SMS短信"
+
+#: actions/siteadminpanel.php:384
#, fuzzy
msgid "Sometimes"
msgstr "通告"
-#: actions/siteadminpanel.php:382
+#: actions/siteadminpanel.php:385
msgid "Always"
msgstr ""
-#: actions/siteadminpanel.php:384
+#: actions/siteadminpanel.php:387
msgid "Use SSL"
msgstr ""
-#: actions/siteadminpanel.php:385
+#: actions/siteadminpanel.php:388
msgid "When to use SSL"
msgstr ""
-#: actions/siteadminpanel.php:391
+#: actions/siteadminpanel.php:393
msgid "SSL Server"
msgstr ""
-#: actions/siteadminpanel.php:392
+#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr ""
+
+#: actions/siteadminpanel.php:403
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
#, fuzzy
msgid "Save site settings"
msgstr "头像设置"
@@ -3677,7 +3721,8 @@ msgstr "退订"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
-#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
msgid "User"
msgstr "用户"
@@ -3685,17 +3730,87 @@ msgstr "用户"
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr ""
+
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:178
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr ""
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "个人信息"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr ""
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
+msgstr ""
+
+#: actions/useradminpanel.php:231
#, fuzzy
-msgid "Invite-only"
-msgstr "邀请"
+msgid "New users"
+msgstr "邀请新用户"
+
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr ""
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr ""
+
+#: actions/useradminpanel.php:241
+#, fuzzy
+msgid "Default subscription"
+msgstr "所有订阅"
+
+#: actions/useradminpanel.php:242
+#, fuzzy
+msgid "Automatically subscribe new users to this user."
+msgstr "自动订阅任何订阅我的更新的人(这个选项最适合机器人)"
+
+#: actions/useradminpanel.php:251
+#, fuzzy
+msgid "Invitations"
+msgstr "已发送邀请"
+
+#: actions/useradminpanel.php:256
+#, fuzzy
+msgid "Invitations enabled"
+msgstr "已发送邀请"
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr ""
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr ""
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/userauthorization.php:105
@@ -3904,7 +4019,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"
@@ -3923,10 +4038,6 @@ msgstr "无法删除订阅。"
msgid "Welcome to %1$s, @%2$s!"
msgstr "发送给 %1$s 的 %2$s 消息"
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr "个人信息"
-
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "修改您的个人信息"
@@ -3965,137 +4076,137 @@ msgstr "%s (%s)"
msgid "Untitled page"
msgstr "无标题页"
-#: lib/action.php:424
+#: lib/action.php:425
msgid "Primary site navigation"
msgstr "主站导航"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Home"
msgstr "主页"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Personal profile and friends timeline"
msgstr "个人资料及朋友年表"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Account"
msgstr "帐号"
-#: lib/action.php:432
+#: lib/action.php:433
#, fuzzy
msgid "Change your email, avatar, password, profile"
msgstr "修改资料"
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect"
msgstr "连接"
-#: lib/action.php:435
+#: lib/action.php:436
#, fuzzy
msgid "Connect to services"
msgstr "无法重定向到服务器:%s"
-#: lib/action.php:439
+#: lib/action.php:440
#, fuzzy
msgid "Change site configuration"
msgstr "主站导航"
-#: lib/action.php:443 lib/subgroupnav.php:105
+#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
msgstr "邀请"
-#: lib/action.php:444 lib/subgroupnav.php:106
+#: lib/action.php:445 lib/subgroupnav.php:106
#, fuzzy, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "使用这个表单来邀请好友和同事加入。"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout"
msgstr "登出"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout from the site"
msgstr "登出本站"
-#: lib/action.php:454
+#: lib/action.php:455
#, fuzzy
msgid "Create an account"
msgstr "创建新帐号"
-#: lib/action.php:457
+#: lib/action.php:458
msgid "Login to the site"
msgstr "登入本站"
-#: lib/action.php:460 lib/action.php:723
+#: lib/action.php:461 lib/action.php:724
msgid "Help"
msgstr "帮助"
-#: lib/action.php:460
+#: lib/action.php:461
#, fuzzy
msgid "Help me!"
msgstr "帮助"
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
msgstr "搜索"
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
msgstr "检索人或文字"
-#: lib/action.php:484
+#: lib/action.php:485
#, fuzzy
msgid "Site notice"
msgstr "新通告"
-#: lib/action.php:550
+#: lib/action.php:551
msgid "Local views"
msgstr "本地显示"
-#: lib/action.php:616
+#: lib/action.php:617
#, fuzzy
msgid "Page notice"
msgstr "新通告"
-#: lib/action.php:718
+#: lib/action.php:719
#, fuzzy
msgid "Secondary site navigation"
msgstr "次项站导航"
-#: lib/action.php:725
+#: lib/action.php:726
msgid "About"
msgstr "关于"
-#: lib/action.php:727
+#: lib/action.php:728
msgid "FAQ"
msgstr "常见问题FAQ"
-#: lib/action.php:731
+#: lib/action.php:732
msgid "TOS"
msgstr ""
-#: lib/action.php:734
+#: lib/action.php:735
msgid "Privacy"
msgstr "隐私"
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
msgstr "来源"
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Contact"
msgstr "联系人"
-#: lib/action.php:740
+#: lib/action.php:741
#, fuzzy
msgid "Badge"
msgstr "呼叫"
-#: lib/action.php:768
+#: lib/action.php:769
msgid "StatusNet software license"
msgstr "StatusNet软件注册证"
-#: lib/action.php:771
+#: lib/action.php:772
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4104,12 +4215,12 @@ msgstr ""
"**%%site.name%%** 是一个微博客服务,提供者为 [%%site.broughtby%%](%%site."
"broughtbyurl%%)。"
-#: lib/action.php:773
+#: lib/action.php:774
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** 是一个微博客服务。"
-#: lib/action.php:775
+#: lib/action.php:776
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4120,34 +4231,34 @@ msgstr ""
"General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)"
"授权。"
-#: lib/action.php:789
+#: lib/action.php:790
#, fuzzy
msgid "Site content license"
msgstr "StatusNet软件注册证"
-#: lib/action.php:798
+#: lib/action.php:799
msgid "All "
msgstr "全部"
-#: lib/action.php:803
+#: lib/action.php:804
msgid "license."
msgstr "注册证"
-#: lib/action.php:1067
+#: lib/action.php:1068
msgid "Pagination"
msgstr "分页"
-#: lib/action.php:1076
+#: lib/action.php:1077
#, fuzzy
msgid "After"
msgstr "« 之后"
-#: lib/action.php:1084
+#: lib/action.php:1085
#, fuzzy
msgid "Before"
msgstr "之前 »"
-#: lib/action.php:1132
+#: lib/action.php:1133
#, fuzzy
msgid "There was a problem with your session token."
msgstr "会话标识有问题,请重试。"
@@ -4182,6 +4293,11 @@ msgstr "电子邮件地址确认"
msgid "Design configuration"
msgstr "SMS短信确认"
+#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+#, fuzzy
+msgid "Paths configuration"
+msgstr "SMS短信确认"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4356,11 +4472,9 @@ msgid "You are not subscribed to anyone."
msgstr "您未告知此个人信息"
#: lib/command.php:620
-#, fuzzy
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
-msgstr[0] "您未告知此个人信息"
-msgstr[1] "您未告知此个人信息"
+msgstr[0] "您已订阅这些用户:"
#: lib/command.php:640
#, fuzzy
@@ -4368,11 +4482,9 @@ msgid "No one is subscribed to you."
msgstr "无法订阅他人更新。"
#: lib/command.php:642
-#, fuzzy
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "无法订阅他人更新。"
-msgstr[1] "无法订阅他人更新。"
#: lib/command.php:662
#, fuzzy
@@ -4380,11 +4492,9 @@ msgid "You are not a member of any groups."
msgstr "您未告知此个人信息"
#: lib/command.php:664
-#, fuzzy
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
msgid ""
@@ -4465,9 +4575,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: "
@@ -4569,7 +4680,7 @@ msgstr "你的位置,格式类似\"城市,省份,国家\""
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
-#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85
msgid "Group"
msgstr "组"
@@ -4616,7 +4727,7 @@ msgstr "消息最多的群"
msgid "Tags in %s group's notices"
msgstr "这个组所发布的消息的标签"
-#: lib/htmloutputter.php:104
+#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
msgstr "这个页面不提供您想要的媒体类型"
@@ -4650,6 +4761,14 @@ msgstr "没有这份通告。"
msgid "Unknown file type"
msgstr "未知文件类型"
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
@@ -4685,7 +4804,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:424
+#: lib/mailbox.php:227 lib/noticelist.php:452
#, fuzzy
msgid "from"
msgstr " 从 "
@@ -4941,40 +5060,66 @@ msgstr "删除通告"
msgid "To"
msgstr "到"
-#: lib/messageform.php:162 lib/noticeform.php:173
+#: lib/messageform.php:162 lib/noticeform.php:186
#, fuzzy
msgid "Available characters"
msgstr "6 个或更多字符"
-#: lib/noticeform.php:145
+#: lib/noticeform.php:158
#, fuzzy
msgid "Send a notice"
msgstr "发送消息"
-#: lib/noticeform.php:158
+#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
msgstr "怎么样,%s?"
-#: lib/noticeform.php:180
+#: lib/noticeform.php:193
msgid "Attach"
msgstr ""
-#: lib/noticeform.php:184
+#: lib/noticeform.php:197
msgid "Attach a file"
msgstr ""
-#: lib/noticelist.php:478
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "否"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr ""
+
+#: lib/noticelist.php:506
#, fuzzy
msgid "in context"
msgstr "没有内容!"
-#: lib/noticelist.php:498
+#: lib/noticelist.php:526
#, fuzzy
msgid "Reply to this notice"
msgstr "无法删除通告。"
-#: lib/noticelist.php:499
+#: lib/noticelist.php:527
#, fuzzy
msgid "Reply"
msgstr "回复"
@@ -5009,12 +5154,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 "无法添加新的订阅。"
@@ -5127,6 +5272,10 @@ msgstr "取消阻止次用户"
msgid "Search site"
msgstr "搜索"
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
#, fuzzy
msgid "Search help"
@@ -5140,11 +5289,6 @@ msgstr "用户"
msgid "Find people on this site"
msgstr "搜索用户信息"
-#: lib/searchgroupnav.php:82
-#, fuzzy
-msgid "Notice"
-msgstr "通告"
-
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
msgstr "搜索通告内容"
@@ -5293,47 +5437,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 "一年前"
@@ -5362,11 +5510,3 @@ msgstr "对不起,这个发布用的电子邮件属于其他用户。"
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "对不起,发布用的电子邮件无法使用。"
-
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "取消阻止次用户"
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "订阅 %s"
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.mo b/locale/zh_TW/LC_MESSAGES/statusnet.mo
deleted file mode 100644
index 89afaf8af..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 ed366612b..ec49a73f8 100644
--- a/locale/zh_TW/LC_MESSAGES/statusnet.po
+++ b/locale/zh_TW/LC_MESSAGES/statusnet.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 10:43+0000\n"
-"PO-Revision-Date: 2009-11-18 19:32:56+0000\n"
+"POT-Creation-Date: 2009-11-27 23:50+0000\n"
+"PO-Revision-Date: 2009-11-28 19:51:12+0000\n"
"Language-Team: Traditional Chinese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hant\n"
"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
@@ -439,7 +439,7 @@ msgstr ""
msgid "Not found"
msgstr ""
-#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -555,7 +555,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:522
+#: lib/noticelist.php:550
msgid "Delete"
msgstr ""
@@ -568,7 +568,7 @@ msgid "Crop"
msgstr ""
#: actions/avatarsettings.php:265 actions/disfavor.php:74
-#: actions/emailsettings.php:237 actions/favor.php:75
+#: 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
@@ -583,7 +583,7 @@ msgid "There was a problem with your session token. Try again, please."
msgstr ""
#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
-#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: 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."
@@ -720,15 +720,15 @@ msgstr ""
msgid "That address has already been confirmed."
msgstr ""
-#: actions/confirmaddress.php:114 actions/emailsettings.php:295
-#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
#: actions/imsettings.php:401 actions/othersettings.php:174
#: actions/profilesettings.php:276 actions/smssettings.php:278
#: actions/smssettings.php:420
msgid "Couldn't update user."
msgstr "無法更新使用者"
-#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
msgstr "無法取消信箱確認"
@@ -748,7 +748,7 @@ msgid "Conversation"
msgstr "地點"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206
+#: lib/profileaction.php:206 lib/searchgroupnav.php:82
msgid "Notices"
msgstr ""
@@ -788,7 +788,7 @@ msgstr ""
msgid "Do not delete this notice"
msgstr "無此通知"
-#: actions/deletenotice.php:146 lib/noticelist.php:522
+#: actions/deletenotice.php:146 lib/noticelist.php:550
msgid "Delete this notice"
msgstr ""
@@ -830,181 +830,118 @@ msgstr ""
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:278
+#: actions/designadminpanel.php:270
#, fuzzy
msgid "Invalid logo URL."
msgstr "尺寸錯誤"
-#: actions/designadminpanel.php:282
+#: actions/designadminpanel.php:274
#, fuzzy, php-format
msgid "Theme not available: %s"
msgstr "個人首頁位址錯誤"
-#: actions/designadminpanel.php:288
-#, fuzzy, php-format
-msgid "Theme directory not readable: %s"
-msgstr "個人首頁位址錯誤"
-
-#: actions/designadminpanel.php:292
-#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:296
-#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
-
-#: actions/designadminpanel.php:312
-#, php-format
-msgid "Max length for %s %s is 255 characters."
-msgstr ""
-
-#: actions/designadminpanel.php:412
+#: actions/designadminpanel.php:370
#, fuzzy
msgid "Change logo"
msgstr "更改密碼"
-#: actions/designadminpanel.php:417
+#: actions/designadminpanel.php:375
#, fuzzy
msgid "Site logo"
msgstr "新訊息"
-#: actions/designadminpanel.php:424
+#: actions/designadminpanel.php:382
#, fuzzy
msgid "Change theme"
msgstr "更改"
-#: actions/designadminpanel.php:441
+#: actions/designadminpanel.php:399
#, fuzzy
msgid "Site theme"
msgstr "新訊息"
-#: actions/designadminpanel.php:442
+#: actions/designadminpanel.php:400
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:447
-msgid "Theme server"
-msgstr ""
-
-#: actions/designadminpanel.php:451
-msgid "Theme path"
-msgstr ""
-
-#: actions/designadminpanel.php:455
-msgid "Theme directory"
-msgstr ""
-
-#: actions/designadminpanel.php:462
-#, fuzzy
-msgid "Avatar Settings"
-msgstr "線上即時通設定"
-
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Avatar server"
-msgstr "線上即時通設定"
-
-#: actions/designadminpanel.php:471
-#, fuzzy
-msgid "Avatar path"
-msgstr "更新個人圖像"
-
-#: actions/designadminpanel.php:475
-#, fuzzy
-msgid "Avatar directory"
-msgstr "更新個人圖像"
-
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:412 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: actions/designadminpanel.php:417 actions/designadminpanel.php:492
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:422
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr ""
-#: actions/designadminpanel.php:526 lib/designsettings.php:139
+#: actions/designadminpanel.php:452 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:542 lib/designsettings.php:155
+#: actions/designadminpanel.php:468 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:543 lib/designsettings.php:156
+#: actions/designadminpanel.php:469 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:548 lib/designsettings.php:161
+#: actions/designadminpanel.php:474 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:554
-msgid "Background server"
-msgstr ""
-
-#: actions/designadminpanel.php:558
-msgid "Background path"
-msgstr ""
-
-#: actions/designadminpanel.php:562
-msgid "Background directory"
-msgstr ""
-
-#: actions/designadminpanel.php:569 lib/designsettings.php:170
+#: actions/designadminpanel.php:483 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "更改密碼"
-#: actions/designadminpanel.php:591 lib/designsettings.php:191
+#: actions/designadminpanel.php:505 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "連結"
-#: actions/designadminpanel.php:604 lib/designsettings.php:204
+#: actions/designadminpanel.php:518 lib/designsettings.php:204
msgid "Sidebar"
msgstr ""
-#: actions/designadminpanel.php:617 lib/designsettings.php:217
+#: actions/designadminpanel.php:531 lib/designsettings.php:217
msgid "Text"
msgstr ""
-#: actions/designadminpanel.php:630 lib/designsettings.php:230
+#: actions/designadminpanel.php:544 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "登入"
-#: actions/designadminpanel.php:658 lib/designsettings.php:247
+#: actions/designadminpanel.php:572 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:659 lib/designsettings.php:248
+#: actions/designadminpanel.php:573 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:665 lib/designsettings.php:254
+#: actions/designadminpanel.php:579 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/designadminpanel.php:581 actions/emailsettings.php:195
#: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
-#: actions/smssettings.php:181 actions/subscriptions.php:203
-#: actions/tagother.php:154 actions/useradminpanel.php:226
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/pathsadminpanel.php:296 actions/profilesettings.php:167
+#: actions/siteadminpanel.php:421 actions/smssettings.php:181
+#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/useradminpanel.php:313 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr ""
-#: actions/designadminpanel.php:668 lib/designsettings.php:257
+#: actions/designadminpanel.php:582 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1154,83 +1091,83 @@ msgstr ""
msgid "Publish a MicroID for my email address."
msgstr ""
-#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/emailsettings.php:302 actions/imsettings.php:264
#: actions/othersettings.php:180 actions/smssettings.php:284
msgid "Preferences saved."
msgstr ""
-#: actions/emailsettings.php:319
+#: actions/emailsettings.php:320
msgid "No email address."
msgstr ""
-#: actions/emailsettings.php:326
+#: actions/emailsettings.php:327
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
msgid "Not a valid email address"
msgstr ""
-#: actions/emailsettings.php:333
+#: actions/emailsettings.php:334
msgid "That is already your email address."
msgstr ""
-#: actions/emailsettings.php:336
+#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
msgstr ""
-#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
msgstr "無法輸入確認碼"
-#: actions/emailsettings.php:358
+#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
msgstr ""
-#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
msgstr ""
-#: actions/emailsettings.php:382 actions/imsettings.php:355
+#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
msgstr ""
-#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
msgstr "確認取消"
-#: actions/emailsettings.php:412
+#: actions/emailsettings.php:413
msgid "That is not your email address."
msgstr ""
-#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
msgstr ""
-#: actions/emailsettings.php:445 actions/smssettings.php:518
+#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
msgstr ""
-#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
msgid "Couldn't update user record."
msgstr ""
-#: actions/emailsettings.php:458 actions/smssettings.php:531
+#: actions/emailsettings.php:459 actions/smssettings.php:531
msgid "Incoming email address removed."
msgstr ""
-#: actions/emailsettings.php:480 actions/smssettings.php:555
+#: actions/emailsettings.php:481 actions/smssettings.php:555
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"
@@ -1492,7 +1429,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
msgid "Admin"
msgstr ""
@@ -1549,7 +1486,7 @@ msgid ""
msgstr ""
#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/subgroupnav.php:98
+#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr ""
@@ -1754,7 +1691,7 @@ msgstr ""
msgid "Optionally add a personal message to the invitation."
msgstr ""
-#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:225
msgid "Send"
msgstr ""
@@ -1850,7 +1787,7 @@ msgstr "使用者名稱或密碼錯誤"
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:204 actions/login.php:257 lib/action.php:457
+#: actions/login.php:204 actions/login.php:257 lib/action.php:458
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "登入"
@@ -1957,7 +1894,7 @@ msgstr ""
msgid "Direct message to %s sent"
msgstr ""
-#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
msgid "Ajax Error"
msgstr ""
@@ -1965,7 +1902,7 @@ msgstr ""
msgid "New notice"
msgstr "新訊息"
-#: actions/newnotice.php:199
+#: actions/newnotice.php:206
msgid "Notice posted"
msgstr ""
@@ -1999,12 +1936,12 @@ msgid ""
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
-#: actions/noticesearchrss.php:89
+#: actions/noticesearchrss.php:96
#, fuzzy, php-format
msgid "Updates with \"%s\""
msgstr "&s的微型部落格"
-#: actions/noticesearchrss.php:91
+#: actions/noticesearchrss.php:98
#, fuzzy, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
msgstr "所有符合 \"%s\"的更新"
@@ -2131,8 +2068,8 @@ msgstr "6個以上字元"
msgid "Confirm"
msgstr "確認"
-#: actions/passwordsettings.php:113
-msgid "same as password above"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
msgstr ""
#: actions/passwordsettings.php:117
@@ -2163,6 +2100,113 @@ msgstr "無法存取新密碼"
msgid "Password saved."
msgstr ""
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr ""
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr ""
+
+#: actions/pathsadminpanel.php:140
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "個人首頁位址錯誤"
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+msgid "Site"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:216
+#, fuzzy
+msgid "Site path"
+msgstr "新訊息"
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr ""
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Avatars"
+msgstr "個人圖像"
+
+#: actions/pathsadminpanel.php:252
+#, fuzzy
+msgid "Avatar server"
+msgstr "線上即時通設定"
+
+#: actions/pathsadminpanel.php:256
+#, fuzzy
+msgid "Avatar path"
+msgstr "更新個人圖像"
+
+#: actions/pathsadminpanel.php:260
+#, fuzzy
+msgid "Avatar directory"
+msgstr "更新個人圖像"
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:297
+#, fuzzy
+msgid "Save paths"
+msgstr "新訊息"
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -2261,7 +2305,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
msgid "Language"
msgstr ""
@@ -2485,10 +2529,6 @@ msgstr ""
msgid "6 or more characters, and don't forget it!"
msgstr "6個或6個以上字元,別忘了自己密碼喔"
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr ""
-
#: actions/recoverpassword.php:243
msgid "Reset"
msgstr ""
@@ -2548,7 +2588,7 @@ msgstr "確認碼發生錯誤"
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
#: lib/logingroupnav.php:85
msgid "Register"
msgstr ""
@@ -2592,7 +2632,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "電子信箱"
@@ -2677,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 ""
@@ -3010,10 +3050,6 @@ msgstr ""
msgid "User is already silenced."
msgstr ""
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
-msgid "Site"
-msgstr ""
-
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
msgstr ""
@@ -3045,101 +3081,97 @@ msgid "Snapshot frequency must be a number."
msgstr ""
#: actions/siteadminpanel.php:199
-msgid "You must set an SSL sever when enabling SSL."
+msgid "You must set an SSL server when enabling SSL."
msgstr ""
#: actions/siteadminpanel.php:204
-msgid "Invalid SSL server. Max length is 255 characters."
+msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
#: actions/siteadminpanel.php:210
-msgid "Minimum text limit is 140c."
+msgid "Minimum text limit is 140 characters."
msgstr ""
#: actions/siteadminpanel.php:216
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:224
-#, php-format
-msgid "Locales directory not readable: %s"
+#: actions/siteadminpanel.php:266
+msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:275
+#: actions/siteadminpanel.php:269
#, fuzzy
msgid "Site name"
msgstr "新訊息"
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:270
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:279
+#: actions/siteadminpanel.php:274
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:280
+#: actions/siteadminpanel.php:275
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:283
+#: actions/siteadminpanel.php:279
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:280
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:288
+#: actions/siteadminpanel.php:284
#, fuzzy
-msgid "contact email address for your site"
+msgid "Contact email address for your site"
msgstr "查無此使用者所註冊的信箱"
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:290
+#, fuzzy
+msgid "Local"
+msgstr "地點"
+
+#: actions/siteadminpanel.php:301
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:303
+#: actions/siteadminpanel.php:302
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:308
msgid "Default site language"
msgstr ""
#: actions/siteadminpanel.php:316
-msgid "Path to locales"
-msgstr ""
-
-#: actions/siteadminpanel.php:316
-msgid "Directory path to locales"
+msgid "URLs"
msgstr ""
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Server"
msgstr ""
-#: actions/siteadminpanel.php:320
+#: actions/siteadminpanel.php:319
msgid "Site's server hostname."
msgstr ""
-#: actions/siteadminpanel.php:324
-msgid "Path"
-msgstr ""
-
-#: actions/siteadminpanel.php:324
-#, fuzzy
-msgid "Site path"
-msgstr "新訊息"
-
-#: actions/siteadminpanel.php:328
+#: actions/siteadminpanel.php:323
msgid "Fancy URLs"
msgstr ""
-#: actions/siteadminpanel.php:330
+#: actions/siteadminpanel.php:325
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
+#: actions/siteadminpanel.php:331
+#, fuzzy
+msgid "Access"
+msgstr "接受"
+
#: actions/siteadminpanel.php:334
msgid "Private"
msgstr ""
@@ -3156,7 +3188,7 @@ msgstr ""
msgid "Make registration invitation only."
msgstr ""
-#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#: actions/siteadminpanel.php:346
#, fuzzy
msgid "Closed"
msgstr "無此使用者"
@@ -3165,32 +3197,36 @@ msgstr "無此使用者"
msgid "Disable new registrations."
msgstr ""
-#: actions/siteadminpanel.php:353
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:357
msgid "Randomly during Web hit"
msgstr ""
-#: actions/siteadminpanel.php:354
+#: actions/siteadminpanel.php:358
msgid "In a scheduled job"
msgstr ""
-#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
msgid "Never"
msgstr ""
-#: actions/siteadminpanel.php:357
+#: actions/siteadminpanel.php:360
msgid "Data snapshots"
msgstr ""
-#: actions/siteadminpanel.php:358
+#: actions/siteadminpanel.php:361
msgid "When to send statistical data to status.net servers"
msgstr ""
-#: actions/siteadminpanel.php:364
+#: actions/siteadminpanel.php:366
msgid "Frequency"
msgstr ""
-#: actions/siteadminpanel.php:365
-msgid "Snapshots will be sent once every N Web hits"
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
msgstr ""
#: actions/siteadminpanel.php:372
@@ -3201,47 +3237,55 @@ msgstr ""
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/siteadminpanel.php:381
+#: actions/siteadminpanel.php:380
+msgid "SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
msgid "Sometimes"
msgstr ""
-#: actions/siteadminpanel.php:382
+#: actions/siteadminpanel.php:385
msgid "Always"
msgstr ""
-#: actions/siteadminpanel.php:384
+#: actions/siteadminpanel.php:387
msgid "Use SSL"
msgstr ""
-#: actions/siteadminpanel.php:385
+#: actions/siteadminpanel.php:388
msgid "When to use SSL"
msgstr ""
-#: actions/siteadminpanel.php:391
+#: actions/siteadminpanel.php:393
msgid "SSL Server"
msgstr ""
-#: actions/siteadminpanel.php:392
+#: actions/siteadminpanel.php:394
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr ""
+
+#: actions/siteadminpanel.php:403
msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:396
+#: actions/siteadminpanel.php:403
msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:400
+#: actions/siteadminpanel.php:407
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
#, fuzzy
msgid "Save site settings"
msgstr "線上即時通設定"
@@ -3548,7 +3592,8 @@ msgstr "此帳號已註冊"
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
-#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
msgid "User"
msgstr ""
@@ -3556,16 +3601,84 @@ msgstr ""
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:173
-msgid "Is registration on this site prohibited?"
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr ""
+
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
+msgstr ""
+
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr ""
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr ""
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
msgstr ""
-#: actions/useradminpanel.php:178
-msgid "Invite-only"
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:180
-msgid "Is registration on this site only open to invited users?"
+#: actions/useradminpanel.php:231
+msgid "New users"
+msgstr ""
+
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr ""
+
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr ""
+
+#: actions/useradminpanel.php:241
+#, fuzzy
+msgid "Default subscription"
+msgstr "所有訂閱"
+
+#: actions/useradminpanel.php:242
+msgid "Automatically subscribe new users to this user."
+msgstr ""
+
+#: actions/useradminpanel.php:251
+#, fuzzy
+msgid "Invitations"
+msgstr "地點"
+
+#: actions/useradminpanel.php:256
+msgid "Invitations enabled"
+msgstr ""
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr ""
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr ""
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/userauthorization.php:105
@@ -3762,7 +3875,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"
@@ -3782,10 +3895,6 @@ msgstr "註冊失敗"
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr ""
-
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr ""
@@ -3825,134 +3934,134 @@ msgstr ""
msgid "Untitled page"
msgstr ""
-#: lib/action.php:424
+#: lib/action.php:425
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Home"
msgstr "主頁"
-#: lib/action.php:430
+#: lib/action.php:431
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:432
+#: lib/action.php:433
#, fuzzy
msgid "Account"
msgstr "關於"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:435
+#: lib/action.php:436
msgid "Connect"
msgstr "連結"
-#: lib/action.php:435
+#: lib/action.php:436
#, fuzzy
msgid "Connect to services"
msgstr "無法連結到伺服器:%s"
-#: lib/action.php:439
+#: lib/action.php:440
msgid "Change site configuration"
msgstr ""
-#: lib/action.php:443 lib/subgroupnav.php:105
+#: lib/action.php:444 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:444 lib/subgroupnav.php:106
+#: lib/action.php:445 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout"
msgstr "登出"
-#: lib/action.php:449
+#: lib/action.php:450
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:454
+#: lib/action.php:455
#, fuzzy
msgid "Create an account"
msgstr "新增帳號"
-#: lib/action.php:457
+#: lib/action.php:458
msgid "Login to the site"
msgstr ""
-#: lib/action.php:460 lib/action.php:723
+#: lib/action.php:461 lib/action.php:724
msgid "Help"
msgstr "求救"
-#: lib/action.php:460
+#: lib/action.php:461
#, fuzzy
msgid "Help me!"
msgstr "求救"
-#: lib/action.php:463
+#: lib/action.php:464 lib/searchaction.php:127
msgid "Search"
msgstr ""
-#: lib/action.php:463
+#: lib/action.php:464
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:484
+#: lib/action.php:485
#, fuzzy
msgid "Site notice"
msgstr "新訊息"
-#: lib/action.php:550
+#: lib/action.php:551
msgid "Local views"
msgstr ""
-#: lib/action.php:616
+#: lib/action.php:617
#, fuzzy
msgid "Page notice"
msgstr "新訊息"
-#: lib/action.php:718
+#: lib/action.php:719
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:725
+#: lib/action.php:726
msgid "About"
msgstr "關於"
-#: lib/action.php:727
+#: lib/action.php:728
msgid "FAQ"
msgstr "常見問題"
-#: lib/action.php:731
+#: lib/action.php:732
msgid "TOS"
msgstr ""
-#: lib/action.php:734
+#: lib/action.php:735
msgid "Privacy"
msgstr ""
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Source"
msgstr ""
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Contact"
msgstr "好友名單"
-#: lib/action.php:740
+#: lib/action.php:741
msgid "Badge"
msgstr ""
-#: lib/action.php:768
+#: lib/action.php:769
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:771
+#: lib/action.php:772
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -3961,12 +4070,12 @@ msgstr ""
"**%%site.name%%**是由[%%site.broughtby%%](%%site.broughtbyurl%%)所提供的微型"
"部落格服務"
-#: lib/action.php:773
+#: lib/action.php:774
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%**是個微型部落格"
-#: lib/action.php:775
+#: lib/action.php:776
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3974,33 +4083,33 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:789
+#: lib/action.php:790
#, fuzzy
msgid "Site content license"
msgstr "新訊息"
-#: lib/action.php:798
+#: lib/action.php:799
msgid "All "
msgstr ""
-#: lib/action.php:803
+#: lib/action.php:804
msgid "license."
msgstr ""
-#: lib/action.php:1067
+#: lib/action.php:1068
msgid "Pagination"
msgstr ""
-#: lib/action.php:1076
+#: lib/action.php:1077
msgid "After"
msgstr ""
-#: lib/action.php:1084
+#: lib/action.php:1085
#, fuzzy
msgid "Before"
msgstr "之前的內容»"
-#: lib/action.php:1132
+#: lib/action.php:1133
msgid "There was a problem with your session token."
msgstr ""
@@ -4030,6 +4139,11 @@ msgstr "確認信箱"
msgid "Design configuration"
msgstr "確認信箱"
+#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+#, fuzzy
+msgid "Paths configuration"
+msgstr "確認信箱"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4202,11 +4316,9 @@ msgid "You are not subscribed to anyone."
msgstr "此帳號已註冊"
#: lib/command.php:620
-#, fuzzy
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "此帳號已註冊"
-msgstr[1] "此帳號已註冊"
#: lib/command.php:640
#, fuzzy
@@ -4214,11 +4326,9 @@ msgid "No one is subscribed to you."
msgstr "無此訂閱"
#: lib/command.php:642
-#, fuzzy
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "無此訂閱"
-msgstr[1] "無此訂閱"
#: lib/command.php:662
#, fuzzy
@@ -4226,11 +4336,9 @@ msgid "You are not a member of any groups."
msgstr "無法連結到伺服器:%s"
#: lib/command.php:664
-#, fuzzy
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "無法連結到伺服器:%s"
-msgstr[1] "無法連結到伺服器:%s"
#: lib/command.php:678
msgid ""
@@ -4311,7 +4419,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
@@ -4408,7 +4516,7 @@ msgstr ""
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
-#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85
msgid "Group"
msgstr ""
@@ -4455,7 +4563,7 @@ msgstr ""
msgid "Tags in %s group's notices"
msgstr ""
-#: lib/htmloutputter.php:104
+#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
msgstr ""
@@ -4489,6 +4597,14 @@ msgstr "無此通知"
msgid "Unknown file type"
msgstr ""
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
#: lib/jabber.php:192
#, php-format
msgid "[%s]"
@@ -4523,7 +4639,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:424
+#: lib/mailbox.php:227 lib/noticelist.php:452
msgid "from"
msgstr ""
@@ -4771,39 +4887,64 @@ msgstr ""
msgid "To"
msgstr ""
-#: lib/messageform.php:162 lib/noticeform.php:173
+#: lib/messageform.php:162 lib/noticeform.php:186
#, fuzzy
msgid "Available characters"
msgstr "6個以上字元"
-#: lib/noticeform.php:145
+#: lib/noticeform.php:158
#, fuzzy
msgid "Send a notice"
msgstr "新訊息"
-#: lib/noticeform.php:158
+#: lib/noticeform.php:171
#, php-format
msgid "What's up, %s?"
msgstr ""
-#: lib/noticeform.php:180
+#: lib/noticeform.php:193
msgid "Attach"
msgstr ""
-#: lib/noticeform.php:184
+#: lib/noticeform.php:197
msgid "Attach a file"
msgstr ""
-#: lib/noticelist.php:478
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "N"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr ""
+
+#: lib/noticelist.php:506
#, fuzzy
msgid "in context"
msgstr "無內容"
-#: lib/noticelist.php:498
+#: lib/noticelist.php:526
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:499
+#: lib/noticelist.php:527
msgid "Reply"
msgstr ""
@@ -4836,11 +4977,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 "無法新增訂閱"
@@ -4948,6 +5089,10 @@ msgstr "無此使用者"
msgid "Search site"
msgstr ""
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
#: lib/searchaction.php:162
msgid "Search help"
msgstr ""
@@ -4960,11 +5105,6 @@ msgstr ""
msgid "Find people on this site"
msgstr ""
-#: lib/searchgroupnav.php:82
-#, fuzzy
-msgid "Notice"
-msgstr "新訊息"
-
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
msgstr ""
@@ -5105,47 +5245,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 ""
@@ -5174,11 +5318,3 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
-
-#, fuzzy
-#~ msgid "Unlock this user"
-#~ msgstr "無此使用者"
-
-#, fuzzy
-#~ msgid "These people are subscribed to you: "
-#~ msgstr "此帳號已註冊"
diff --git a/plugins/Authentication/AuthenticationPlugin.php b/plugins/Authentication/AuthenticationPlugin.php
index cd1de1149..a76848b04 100644
--- a/plugins/Authentication/AuthenticationPlugin.php
+++ b/plugins/Authentication/AuthenticationPlugin.php
@@ -2,7 +2,7 @@
/**
* StatusNet, the distributed open-source microblogging tool
*
- * Superclass for plugins that do authentication
+ * Superclass for plugins that do authentication and/or authorization
*
* PHP version 5
*
@@ -204,7 +204,16 @@ abstract class AuthenticationPlugin extends Plugin
function onCheckSchema() {
$schema = Schema::get();
- $schema->ensureDataObject('User_username');
+ $schema->ensureTable('user_username',
+ array(new ColumnDef('provider_name', 'varchar',
+ '255', false, 'PRI'),
+ new ColumnDef('username', 'varchar',
+ '255', false, 'PRI'),
+ new ColumnDef('user_id', 'integer',
+ null, false),
+ new ColumnDef('created', 'datetime',
+ null, false),
+ new ColumnDef('modified', 'timestamp')));
return true;
}
diff --git a/plugins/Authentication/User_username.php b/plugins/Authentication/User_username.php
index 6826f2681..f30f60d83 100644
--- a/plugins/Authentication/User_username.php
+++ b/plugins/Authentication/User_username.php
@@ -2,9 +2,9 @@
/**
* Table Definition for user_username
*/
-require_once INSTALLDIR.'/classes/Plugin_DataObject.php';
+require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
-class User_username extends Plugin_DataObject
+class User_username extends Memcached_DataObject
{
###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */
@@ -43,22 +43,4 @@ class User_username extends Plugin_DataObject
return false;
}
}
-
- /**
- * Get the TableDef object that represents the table backing this class
- * @return TableDef TableDef instance
- */
- function tableDef()
- {
- return new TableDef($this->__table,
- array(new ColumnDef('provider_name', 'varchar',
- '255', false, 'PRI'),
- new ColumnDef('username', 'varchar',
- '255', false, 'PRI'),
- new ColumnDef('user_id', 'integer',
- null, false),
- new ColumnDef('created', 'datetime',
- null, false),
- new ColumnDef('modified', 'timestamp')));
- }
}
diff --git a/plugins/Facebook/FBCLoginGroupNav.php b/plugins/Facebook/FBCLoginGroupNav.php
deleted file mode 100644
index 81b2520a4..000000000
--- a/plugins/Facebook/FBCLoginGroupNav.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Menu for login group of actions
- *
- * PHP version 5
- *
- * LICENCE: This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * @category Menu
- * @package StatusNet
- * @author Evan Prodromou <evan@status.net>
- * @author Zach Copley <zach@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/
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
- exit(1);
-}
-
-require_once INSTALLDIR . '/lib/widget.php';
-
-/**
- * Menu for login group of actions
- *
- * @category Output
- * @package StatusNet
- * @author Evan Prodromou <evan@status.net>
- * @author Zach Copley <zach@status.net>
- * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link http://status.net/
- *
- * @see Widget
- */
-
-class FBCLoginGroupNav extends Widget
-{
- var $action = null;
-
- /**
- * Construction
- *
- * @param Action $action current action, used for output
- */
-
- function __construct($action=null)
- {
- parent::__construct($action);
- $this->action = $action;
- }
-
- /**
- * Show the menu
- *
- * @return void
- */
-
- function show()
- {
- $this->action->elementStart('dl', array('id' => 'site_nav_local_views'));
- $this->action->element('dt', null, _('Local views'));
- $this->action->elementStart('dd');
-
- // action => array('prompt', 'title')
- $menu = array();
-
- if (!common_config('site','openidonly')) {
- $menu['login'] = array(_('Login'),
- _('Login with a username and password'));
-
- if (!(common_config('site','closed') || common_config('site','inviteonly'))) {
- $menu['register'] = array(_('Register'),
- _('Sign up for a new account'));
- }
- }
-
- if (common_config('openid', 'enabled')) {
- $menu['openidlogin'] = array(_('OpenID'),
- _('Login or register with OpenID'));
- }
-
- $menu['FBConnectLogin'] = array(_('Facebook'),
- _('Login or register using Facebook'));
-
- $action_name = $this->action->trimmed('action');
- $this->action->elementStart('ul', array('class' => 'nav'));
-
- foreach ($menu as $menuaction => $menudesc) {
- $this->action->menuItem(common_local_url($menuaction),
- $menudesc[0],
- $menudesc[1],
- $action_name === $menuaction);
- }
-
- $this->action->elementEnd('ul');
-
- $this->action->elementEnd('dd');
- $this->action->elementEnd('dl');
- }
-}
diff --git a/plugins/Facebook/FBCSettingsNav.php b/plugins/Facebook/FBCSettingsNav.php
deleted file mode 100644
index ed02371e2..000000000
--- a/plugins/Facebook/FBCSettingsNav.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Menu for login group of actions
- *
- * PHP version 5
- *
- * LICENCE: This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * @category Menu
- * @package StatusNet
- * @author Evan Prodromou <evan@status.net>
- * @author Zach Copley <zach@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/
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
- exit(1);
-}
-
-require_once INSTALLDIR . '/lib/widget.php';
-
-/**
- * A widget for showing the connect group local nav menu
- *
- * @category Output
- * @package StatusNet
- * @author Evan Prodromou <evan@status.net>
- * @author Zach Copley <zach@status.net>
- * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link http://status.net/
- *
- * @see Widget
- */
-
-class FBCSettingsNav extends Widget
-{
- var $action = null;
-
- /**
- * Construction
- *
- * @param Action $action current action, used for output
- */
-
- function __construct($action=null)
- {
- parent::__construct($action);
- $this->action = $action;
- }
-
- /**
- * Show the menu
- *
- * @return void
- */
-
- function show()
- {
-
- $this->action->elementStart('dl', array('id' => 'site_nav_local_views'));
- $this->action->element('dt', null, _('Local views'));
- $this->action->elementStart('dd');
-
- # action => array('prompt', 'title')
- $menu = array();
- if (common_config('xmpp', 'enabled')) {
- $menu['imsettings'] =
- array(_('IM'),
- _('Updates by instant messenger (IM)'));
- }
- if (common_config('sms', 'enabled')) {
- $menu['smssettings'] =
- array(_('SMS'),
- _('Updates by SMS'));
- }
- if (common_config('twitter', 'enabled')) {
- $menu['twittersettings'] =
- array(_('Twitter'),
- _('Twitter integration options'));
- }
- $menu['FBConnectSettings'] =
- array(_('Facebook'),
- _('Facebook Connect settings'));
-
- $action_name = $this->action->trimmed('action');
- $this->action->elementStart('ul', array('class' => 'nav'));
-
- foreach ($menu as $menuaction => $menudesc) {
- $this->action->menuItem(common_local_url($menuaction),
- $menudesc[0],
- $menudesc[1],
- $action_name === $menuaction);
- }
-
- $this->action->elementEnd('ul');
-
- $this->action->elementEnd('dd');
- $this->action->elementEnd('dl');
- }
-}
diff --git a/plugins/Facebook/FBConnectLogin.php b/plugins/Facebook/FBConnectLogin.php
index f146bef7d..d2bb8054c 100644
--- a/plugins/Facebook/FBConnectLogin.php
+++ b/plugins/Facebook/FBConnectLogin.php
@@ -21,7 +21,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1);
}
-
require_once INSTALLDIR . '/plugins/Facebook/FacebookPlugin.php';
class FBConnectLoginAction extends Action
@@ -65,4 +64,9 @@ class FBConnectLoginAction extends Action
$this->elementEnd('fieldset');
}
+ function showLocalNav()
+ {
+ $nav = new LoginGroupNav($this);
+ $nav->show();
+ }
}
diff --git a/plugins/Facebook/FacebookPlugin.php b/plugins/Facebook/FacebookPlugin.php
index c5b9298f7..047477d9c 100644
--- a/plugins/Facebook/FacebookPlugin.php
+++ b/plugins/Facebook/FacebookPlugin.php
@@ -394,37 +394,43 @@ class FacebookPlugin extends Plugin
return true;
}
- /**
- * Alter the local nav menu to have a Facebook Connect login and
- * settings pages
+ /*
+ * Add a login tab for Facebook Connect
*
- * @param Action $action the current action
+ * @param Action &action the current action
*
* @return void
- *
*/
- function onStartShowLocalNavBlock($action)
+ function onEndLoginGroupNav(&$action)
{
- $action_name = get_class($action);
- $login_actions = array('LoginAction', 'RegisterAction',
- 'OpenidloginAction', 'FBConnectLoginAction');
+ $action_name = $action->trimmed('action');
- if (in_array($action_name, $login_actions)) {
- $nav = new FBCLoginGroupNav($action);
- $nav->show();
- return false;
- }
+ $action->menuItem(common_local_url('FBConnectLogin'),
+ _('Facebook'),
+ _('Login or register using Facebook'),
+ 'FBConnectLogin' === $action_name);
- $connect_actions = array('SmssettingsAction', 'ImsettingsAction',
- 'TwittersettingsAction', 'FBConnectSettingsAction');
+ return true;
+ }
- if (in_array($action_name, $connect_actions)) {
- $nav = new FBCSettingsNav($action);
- $nav->show();
- return false;
- }
+ /*
+ * Add a tab for managing Facebook Connect settings
+ *
+ * @param Action &action the current action
+ *
+ * @return void
+ */
+
+ function onEndConnectSettingsNav(&$action)
+ {
+ $action_name = $action->trimmed('action');
+
+ $action->menuItem(common_local_url('FBConnectSettings'),
+ _('Facebook'),
+ _('Facebook Connect Settings'),
+ $action_name === 'FBConnectSettings');
return true;
}
diff --git a/plugins/Facebook/facebooksettings.php b/plugins/Facebook/facebooksettings.php
index 2f182e368..d1269f101 100644
--- a/plugins/Facebook/facebooksettings.php
+++ b/plugins/Facebook/facebooksettings.php
@@ -52,21 +52,21 @@ class FacebooksettingsAction extends FacebookAction
function saveSettings() {
- $noticesync = $this->arg('noticesync');
- $replysync = $this->arg('replysync');
- $prefix = $this->trimmed('prefix');
+ $noticesync = $this->boolean('noticesync');
+ $replysync = $this->boolean('replysync');
+ $prefix = $this->trimmed('prefix');
$original = clone($this->flink);
- $this->flink->set_flags($noticesync, $replysync, false, false);
+ $this->flink->set_flags($noticesync, false, $replysync, false);
$result = $this->flink->update($original);
if ($prefix == '' || $prefix == '0') {
- // Facebook bug: saving empty strings to prefs now fails
- // http://bugs.developers.facebook.com/show_bug.cgi?id=7110
- $trimmed = $prefix . ' ';
+ // Facebook bug: saving empty strings to prefs now fails
+ // http://bugs.developers.facebook.com/show_bug.cgi?id=7110
+ $trimmed = $prefix . ' ';
} else {
- $trimmed = substr($prefix, 0, 128);
- }
+ $trimmed = substr($prefix, 0, 128);
+ }
$this->facebook->api_client->data_setUserPreference(FACEBOOK_NOTICE_PREFIX,
$trimmed);
diff --git a/plugins/FeedSub/FeedSubPlugin.php b/plugins/FeedSub/FeedSubPlugin.php
new file mode 100644
index 000000000..36d4e7802
--- /dev/null
+++ b/plugins/FeedSub/FeedSubPlugin.php
@@ -0,0 +1,117 @@
+<?php
+/*
+StatusNet Plugin: 0.9
+Plugin Name: FeedSub
+Plugin URI: http://status.net/wiki/Feed_subscription
+Description: FeedSub allows subscribing to real-time updates from external feeds supporting PubHubSubbub protocol.
+Version: 0.1
+Author: Brion Vibber <brion@status.net>
+Author URI: http://status.net/
+*/
+
+/*
+ * 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/>.
+ */
+
+/**
+ * @package FeedSubPlugin
+ * @maintainer Brion Vibber <brion@status.net>
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+
+define('FEEDSUB_SERVICE', 100); // fixme -- avoid hardcoding these?
+
+// We bundle the XML_Parse_Feed library...
+set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/extlib');
+
+class FeedSubException extends Exception
+{
+}
+
+class FeedSubPlugin extends Plugin
+{
+ /**
+ * Hook for RouterInitialized event.
+ *
+ * @param Net_URL_Mapper $m path-to-action mapper
+ * @return boolean hook return
+ */
+
+ function onRouterInitialized($m)
+ {
+ $m->connect('feedsub/callback/:feed',
+ array('action' => 'feedsubcallback'),
+ array('feed' => '[0-9]+'));
+ $m->connect('settings/feedsub',
+ array('action' => 'feedsubsettings'));
+ return true;
+ }
+
+ /**
+ * Add the feed settings page to the Connect Settings menu
+ *
+ * @param Action &$action The calling page
+ *
+ * @return boolean hook return
+ */
+ function onEndConnectSettingsNav(&$action)
+ {
+ $action_name = $action->trimmed('action');
+
+ $action->menuItem(common_local_url('feedsubsettings'),
+ dgettext('FeebSubPlugin', 'Feeds'),
+ dgettext('FeedSubPlugin', 'Feed subscription options'),
+ $action_name === 'feedsubsettings');
+
+ return true;
+ }
+
+ /**
+ * Automatically load the actions and libraries used by the plugin
+ *
+ * @param Class $cls the class
+ *
+ * @return boolean hook return
+ *
+ */
+ function onAutoload($cls)
+ {
+ $base = dirname(__FILE__);
+ $lower = strtolower($cls);
+ $files = array("$base/$lower.php");
+ if (substr($lower, -6) == 'action') {
+ $files[] = "$base/actions/" . substr($lower, 0, -6) . ".php";
+ }
+ foreach ($files as $file) {
+ if (file_exists($file)) {
+ include_once $file;
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /*
+ // auto increment seems to be broken
+ function onCheckSchema() {
+ $schema = Schema::get();
+ $schema->ensureDataObject('Feedinfo');
+ return true;
+ }
+ */
+}
diff --git a/plugins/FeedSub/README b/plugins/FeedSub/README
new file mode 100644
index 000000000..cbf3adbb9
--- /dev/null
+++ b/plugins/FeedSub/README
@@ -0,0 +1,24 @@
+Plugin to support importing updates from external RSS and Atom feeds into your timeline.
+
+Uses PubSubHubbub for push feed updates; currently non-PuSH feeds cannot be subscribed.
+
+Todo:
+* set feed icon avatar for actual profiles as well as for preview
+* use channel image and/or favicon for avatar?
+* garbage-collect subscriptions that are no longer being used
+* administrative way to kill feeds?
+* functional l10n
+* clean up subscription form look and workflow
+* use ajax for test/preview in subscription form
+* rssCloud support? (Does anything use it that doesn't support PuSH as well?)
+* possibly a polling daemon to support non-PuSH feeds?
+* likely problems with multiple feeds from the same site, such as category feeds on a blog
+ (currently each feed would publish a separate notice on a separate profile, but pointing to the same post URI.)
+ (could use the local URI I guess, but that's so icky!)
+* problems with Atom feeds that list <link rel="alternate" href="..."/> but don't have the type
+ (such as http://atomgen.appspot.com/feed/5 demo feed); currently it's not recognized and we end up with the feed's master URI
+* make it easier to see what you're subscribed to and unsub from things
+* saner treatment of fullname/nickname?
+* make use of tags/categories from feeds
+* update feed profile data when it changes
+* XML_Feed_Parser has major problems with category and link tags; consider replacing?
diff --git a/plugins/FeedSub/actions/feedsubcallback.php b/plugins/FeedSub/actions/feedsubcallback.php
new file mode 100644
index 000000000..0c4280c1f
--- /dev/null
+++ b/plugins/FeedSub/actions/feedsubcallback.php
@@ -0,0 +1,100 @@
+<?php
+/*
+ * 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/>.
+ */
+
+/**
+ * @package FeedSubPlugin
+ * @maintainer Brion Vibber <brion@status.net>
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+
+
+class FeedSubCallbackAction extends Action
+{
+ function handle()
+ {
+ parent::handle();
+ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+ $this->handlePost();
+ } else {
+ $this->handleGet();
+ }
+ }
+
+ /**
+ * Handler for POST content updates from the hub
+ */
+ function handlePost()
+ {
+ $feedid = $this->arg('feed');
+ common_log(LOG_INFO, "POST for feed id $feedid");
+ if (!$feedid) {
+ throw new ServerException('Empty or invalid feed id', 400);
+ }
+
+ $feedinfo = Feedinfo::staticGet('id', $feedid);
+ if (!$feedinfo) {
+ throw new ServerException('Unknown feed id ' . $feedid, 400);
+ }
+
+ $post = file_get_contents('php://input');
+ $feedinfo->postUpdates($post);
+ }
+
+ /**
+ * Handler for GET verification requests from the hub
+ */
+ function handleGet()
+ {
+ $mode = $this->arg('hub_mode');
+ $topic = $this->arg('hub_topic');
+ $challenge = $this->arg('hub_challenge');
+ $lease_seconds = $this->arg('hub_lease_seconds');
+ $verify_token = $this->arg('hub_verify_token');
+
+ if ($mode != 'subscribe' && $mode != 'unsubscribe') {
+ common_log(LOG_WARNING, __METHOD__ . ": bogus hub callback with mode \"$mode\"");
+ throw new ServerException("Bogus hub callback: bad mode", 404);
+ }
+
+ $feedinfo = Feedinfo::staticGet('feeduri', $topic);
+ if (!$feedinfo) {
+ common_log(LOG_WARNING, __METHOD__ . ": bogus hub callback for unknown feed $topic");
+ throw new ServerException("Bogus hub callback: unknown feed", 404);
+ }
+
+ # Can't currently set the token in our sub api
+ #if ($feedinfo->verify_token !== $verify_token) {
+ # common_log(LOG_WARNING, __METHOD__ . ": bogus hub callback with bad token \"$verify_token\" for feed $topic");
+ # throw new ServerError("Bogus hub callback: bad token", 404);
+ #}
+
+ // OK!
+ common_log(LOG_INFO, __METHOD__ . ': sub confirmed');
+ $feedinfo->sub_start = common_sql_date(time());
+ if ($lease_seconds > 0) {
+ $feedinfo->sub_end = common_sql_date(time() + $lease_seconds);
+ } else {
+ $feedinfo->sub_end = null;
+ }
+ $feedinfo->update();
+
+ print $challenge;
+ }
+}
diff --git a/plugins/FeedSub/actions/feedsubsettings.php b/plugins/FeedSub/actions/feedsubsettings.php
new file mode 100644
index 000000000..242224fac
--- /dev/null
+++ b/plugins/FeedSub/actions/feedsubsettings.php
@@ -0,0 +1,257 @@
+<?php
+/*
+ * 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/>.
+ */
+
+/**
+ * @package FeedSubPlugin
+ * @maintainer Brion Vibber <brion@status.net>
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+
+class FeedSubSettingsAction extends ConnectSettingsAction
+{
+ protected $feedurl;
+ protected $preview;
+ protected $munger;
+
+ /**
+ * Title of the page
+ *
+ * @return string Title of the page
+ */
+
+ function title()
+ {
+ return dgettext('FeedSubPlugin', 'Feed subscriptions');
+ }
+
+ /**
+ * Instructions for use
+ *
+ * @return instructions for use
+ */
+
+ function getInstructions()
+ {
+ return dgettext('FeedSubPlugin',
+ 'You can subscribe to feeds from other sites; ' .
+ 'updates will appear in your personal timeline.');
+ }
+
+ /**
+ * Content area of the page
+ *
+ * Shows a form for associating a Twitter account with this
+ * StatusNet account. Also lets the user set preferences.
+ *
+ * @return void
+ */
+
+ function showContent()
+ {
+ $user = common_current_user();
+
+ $profile = $user->getProfile();
+
+ $fuser = null;
+
+ $flink = Foreign_link::getByUserID($user->id, FEEDSUB_SERVICE);
+
+ if (!empty($flink)) {
+ $fuser = $flink->getForeignUser();
+ }
+
+ $this->elementStart('form', array('method' => 'post',
+ 'id' => 'form_settings_feedsub',
+ 'class' => 'form_settings',
+ 'action' =>
+ common_local_url('feedsubsettings')));
+
+ $this->hidden('token', common_session_token());
+
+ $this->elementStart('fieldset', array('id' => 'settings_feeds'));
+
+ $this->elementStart('ul', 'form_data');
+ $this->elementStart('li', array('id' => 'settings_twitter_login_button'));
+ $this->input('feedurl', _('Feed URL'), $this->feedurl, _('Enter the URL of a PubSubHubbub-enabled feed'));
+ $this->elementEnd('li');
+ $this->elementEnd('ul');
+
+ if ($this->preview) {
+ $this->submit('subscribe', dgettext('FeedSubPlugin', 'Subscribe'));
+ } else {
+ $this->submit('validate', dgettext('FeedSubPlugin', 'Continue'));
+ }
+
+ $this->elementEnd('fieldset');
+
+ $this->elementEnd('form');
+
+ if ($this->preview) {
+ $this->previewFeed();
+ }
+ }
+
+ /**
+ * Handle posts to this form
+ *
+ * Based on the button that was pressed, muxes out to other functions
+ * to do the actual task requested.
+ *
+ * All sub-functions reload the form with a message -- success or failure.
+ *
+ * @return void
+ */
+
+ function handlePost()
+ {
+ // CSRF protection
+ $token = $this->trimmed('token');
+ if (!$token || $token != common_session_token()) {
+ $this->showForm(_('There was a problem with your session token. '.
+ 'Try again, please.'));
+ return;
+ }
+
+ if ($this->arg('validate')) {
+ $this->validateAndPreview();
+ } else if ($this->arg('subscribe')) {
+ $this->saveFeed();
+ } else {
+ $this->showForm(_('Unexpected form submission.'));
+ }
+ }
+
+ /**
+ * Set up and add a feed
+ *
+ * @return boolean true if feed successfully read
+ * Sends you back to input form if not.
+ */
+ function validateFeed()
+ {
+ $feedurl = trim($this->arg('feedurl'));
+
+ if ($feedurl == '') {
+ $this->showForm(dgettext('FeedSubPlugin',
+ 'Empty feed URL!'));
+ return;
+ }
+ $this->feedurl = $feedurl;
+
+ // Get the canonical feed URI and check it
+ try {
+ $discover = new FeedDiscovery();
+ $uri = $discover->discoverFromURL($feedurl);
+ } catch (FeedSubBadURLException $e) {
+ $this->showForm(dgettext('FeedSubPlugin', 'Invalid URL or could not reach server.'));
+ return false;
+ } catch (FeedSubBadResponseException $e) {
+ $this->showForm(dgettext('FeedSubPlugin', 'Cannot read feed; server returned error.'));
+ return false;
+ } catch (FeedSubEmptyException $e) {
+ $this->showForm(dgettext('FeedSubPlugin', 'Cannot read feed; server returned an empty page.'));
+ return false;
+ } catch (FeedSubBadHTMLException $e) {
+ $this->showForm(dgettext('FeedSubPlugin', 'Bad HTML, could not find feed link.'));
+ return false;
+ } catch (FeedSubNoFeedException $e) {
+ $this->showForm(dgettext('FeedSubPlugin', 'Could not find a feed linked from this URL.'));
+ return false;
+ } catch (FeedSubUnrecognizedTypeException $e) {
+ $this->showForm(dgettext('FeedSubPlugin', 'Not a recognized feed type.'));
+ return false;
+ } catch (FeedSubException $e) {
+ // Any new ones we forgot about
+ $this->showForm(dgettext('FeedSubPlugin', 'Bad feed URL.'));
+ return false;
+ }
+
+ $this->munger = $discover->feedMunger();
+ $this->feedinfo = $this->munger->feedInfo();
+
+ if ($this->feedinfo->huburi == '') {
+ $this->showForm(dgettext('FeedSubPlugin', 'Feed is not PuSH-enabled; cannot subscribe.'));
+ return false;
+ }
+
+ return true;
+ }
+
+ function saveFeed()
+ {
+ if ($this->validateFeed()) {
+ $this->preview = true;
+ $this->feedinfo = Feedinfo::ensureProfile($this->munger);
+
+ // If not already in use, subscribe to updates via the hub
+ if ($this->feedinfo->sub_start) {
+ common_log(LOG_INFO, __METHOD__ . ": double the fun! new sub for {$this->feedinfo->feeduri} last subbed {$this->feedinfo->sub_start}");
+ } else {
+ $ok = $this->feedinfo->subscribe();
+ common_log(LOG_INFO, __METHOD__ . ": sub was $ok");
+ if (!$ok) {
+ $this->showForm(dgettext('FeedSubPlugin', 'Feed subscription failed! Bad response from hub.'));
+ return;
+ }
+ }
+
+ // And subscribe the current user to the local profile
+ $user = common_current_user();
+ $profile = $this->feedinfo->getProfile();
+
+ if ($user->isSubscribed($profile)) {
+ $this->showForm(dgettext('FeedSubPlugin', 'Already subscribed!'));
+ } elseif ($user->subscribeTo($profile)) {
+ $this->showForm(dgettext('FeedSubPlugin', 'Feed subscribed!'));
+ } else {
+ $this->showForm(dgettext('FeedSubPlugin', 'Feed subscription failed!'));
+ }
+ }
+ }
+
+ function validateAndPreview()
+ {
+ if ($this->validateFeed()) {
+ $this->preview = true;
+ $this->showForm(dgettext('FeedSubPlugin', 'Previewing feed:'));
+ }
+ }
+
+ function previewFeed()
+ {
+ $feedinfo = $this->munger->feedinfo();
+ $notice = $this->munger->notice(0, true); // preview
+
+ if ($notice) {
+ $this->element('b', null, 'Preview of latest post from this feed:');
+
+ $item = new NoticeList($notice, $this);
+ $item->show();
+ } else {
+ $this->element('b', null, 'No posts in this feed yet.');
+ }
+ }
+
+ function showScripts()
+ {
+ parent::showScripts();
+ $this->autofocus('feedurl');
+ }
+}
diff --git a/plugins/FeedSub/extlib/README b/plugins/FeedSub/extlib/README
new file mode 100644
index 000000000..799b40c47
--- /dev/null
+++ b/plugins/FeedSub/extlib/README
@@ -0,0 +1,9 @@
+XML_Feed_Parser 1.0.3 is not currently actively maintained, and has
+a nasty bug which breaks getting the feed target link from WordPress
+feeds and possibly others that are RSS2-formatted but include an
+<atom:link> self-link element as well.
+
+Patch from this bug report is included:
+http://pear.php.net/bugs/bug.php?id=16416
+
+If upgrading, be sure that fix is included with the future upgrade!
diff --git a/plugins/FeedSub/extlib/XML/Feed/Parser.php b/plugins/FeedSub/extlib/XML/Feed/Parser.php
new file mode 100755
index 000000000..ffe8220a5
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/Parser.php
@@ -0,0 +1,351 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * Key gateway class for XML_Feed_Parser package
+ *
+ * PHP versions 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt. If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category XML
+ * @package XML_Feed_Parser
+ * @author James Stewart <james@jystewart.net>
+ * @copyright 2005 James Stewart <james@jystewart.net>
+ * @license http://www.gnu.org/copyleft/lesser.html GNU LGPL
+ * @version CVS: $Id: Parser.php,v 1.24 2006/08/15 13:04:00 jystewart Exp $
+ * @link http://pear.php.net/package/XML_Feed_Parser/
+ */
+
+/**
+ * XML_Feed_Parser_Type is an abstract class required by all of our
+ * feed types. It makes sense to load it here to keep the other files
+ * clean.
+ */
+require_once 'XML/Feed/Parser/Type.php';
+
+/**
+ * We will throw exceptions when errors occur.
+ */
+require_once 'XML/Feed/Parser/Exception.php';
+
+/**
+ * This is the core of the XML_Feed_Parser package. It identifies feed types
+ * and abstracts access to them. It is an iterator, allowing for easy access
+ * to the entire feed.
+ *
+ * @author James Stewart <james@jystewart.net>
+ * @version Release: 1.0.3
+ * @package XML_Feed_Parser
+ */
+class XML_Feed_Parser implements Iterator
+{
+ /**
+ * This is where we hold the feed object
+ * @var Object
+ */
+ private $feed;
+
+ /**
+ * To allow for extensions, we make a public reference to the feed model
+ * @var DOMDocument
+ */
+ public $model;
+
+ /**
+ * A map between entry ID and offset
+ * @var array
+ */
+ protected $idMappings = array();
+
+ /**
+ * A storage space for Namespace URIs.
+ * @var array
+ */
+ private $feedNamespaces = array(
+ 'rss2' => array(
+ 'http://backend.userland.com/rss',
+ 'http://backend.userland.com/rss2',
+ 'http://blogs.law.harvard.edu/tech/rss'));
+ /**
+ * Detects feed types and instantiate appropriate objects.
+ *
+ * Our constructor takes care of detecting feed types and instantiating
+ * appropriate classes. For now we're going to treat Atom 0.3 as Atom 1.0
+ * but raise a warning. I do not intend to introduce full support for
+ * Atom 0.3 as it has been deprecated, but others are welcome to.
+ *
+ * @param string $feed XML serialization of the feed
+ * @param bool $strict Whether or not to validate the feed
+ * @param bool $suppressWarnings Trigger errors for deprecated feed types?
+ * @param bool $tidy Whether or not to try and use the tidy library on input
+ */
+ function __construct($feed, $strict = false, $suppressWarnings = false, $tidy = false)
+ {
+ $this->model = new DOMDocument;
+ if (! $this->model->loadXML($feed)) {
+ if (extension_loaded('tidy') && $tidy) {
+ $tidy = new tidy;
+ $tidy->parseString($feed,
+ array('input-xml' => true, 'output-xml' => true));
+ $tidy->cleanRepair();
+ if (! $this->model->loadXML((string) $tidy)) {
+ throw new XML_Feed_Parser_Exception('Invalid input: this is not ' .
+ 'valid XML');
+ }
+ } else {
+ throw new XML_Feed_Parser_Exception('Invalid input: this is not valid XML');
+ }
+
+ }
+
+ /* detect feed type */
+ $doc_element = $this->model->documentElement;
+ $error = false;
+
+ switch (true) {
+ case ($doc_element->namespaceURI == 'http://www.w3.org/2005/Atom'):
+ require_once 'XML/Feed/Parser/Atom.php';
+ require_once 'XML/Feed/Parser/AtomElement.php';
+ $class = 'XML_Feed_Parser_Atom';
+ break;
+ case ($doc_element->namespaceURI == 'http://purl.org/atom/ns#'):
+ require_once 'XML/Feed/Parser/Atom.php';
+ require_once 'XML/Feed/Parser/AtomElement.php';
+ $class = 'XML_Feed_Parser_Atom';
+ $error = 'Atom 0.3 deprecated, using 1.0 parser which won\'t provide ' .
+ 'all options';
+ break;
+ case ($doc_element->namespaceURI == 'http://purl.org/rss/1.0/' ||
+ ($doc_element->hasChildNodes() && $doc_element->childNodes->length > 1
+ && $doc_element->childNodes->item(1)->namespaceURI ==
+ 'http://purl.org/rss/1.0/')):
+ require_once 'XML/Feed/Parser/RSS1.php';
+ require_once 'XML/Feed/Parser/RSS1Element.php';
+ $class = 'XML_Feed_Parser_RSS1';
+ break;
+ case ($doc_element->namespaceURI == 'http://purl.org/rss/1.1/' ||
+ ($doc_element->hasChildNodes() && $doc_element->childNodes->length > 1
+ && $doc_element->childNodes->item(1)->namespaceURI ==
+ 'http://purl.org/rss/1.1/')):
+ require_once 'XML/Feed/Parser/RSS11.php';
+ require_once 'XML/Feed/Parser/RSS11Element.php';
+ $class = 'XML_Feed_Parser_RSS11';
+ break;
+ case (($doc_element->hasChildNodes() && $doc_element->childNodes->length > 1
+ && $doc_element->childNodes->item(1)->namespaceURI ==
+ 'http://my.netscape.com/rdf/simple/0.9/') ||
+ $doc_element->namespaceURI == 'http://my.netscape.com/rdf/simple/0.9/'):
+ require_once 'XML/Feed/Parser/RSS09.php';
+ require_once 'XML/Feed/Parser/RSS09Element.php';
+ $class = 'XML_Feed_Parser_RSS09';
+ break;
+ case ($doc_element->tagName == 'rss' and
+ $doc_element->hasAttribute('version') &&
+ $doc_element->getAttribute('version') == 0.91):
+ $error = 'RSS 0.91 has been superceded by RSS2.0. Using RSS2.0 parser.';
+ require_once 'XML/Feed/Parser/RSS2.php';
+ require_once 'XML/Feed/Parser/RSS2Element.php';
+ $class = 'XML_Feed_Parser_RSS2';
+ break;
+ case ($doc_element->tagName == 'rss' and
+ $doc_element->hasAttribute('version') &&
+ $doc_element->getAttribute('version') == 0.92):
+ $error = 'RSS 0.92 has been superceded by RSS2.0. Using RSS2.0 parser.';
+ require_once 'XML/Feed/Parser/RSS2.php';
+ require_once 'XML/Feed/Parser/RSS2Element.php';
+ $class = 'XML_Feed_Parser_RSS2';
+ break;
+ case (in_array($doc_element->namespaceURI, $this->feedNamespaces['rss2'])
+ || $doc_element->tagName == 'rss'):
+ if (! $doc_element->hasAttribute('version') ||
+ $doc_element->getAttribute('version') != 2) {
+ $error = 'RSS version not specified. Parsing as RSS2.0';
+ }
+ require_once 'XML/Feed/Parser/RSS2.php';
+ require_once 'XML/Feed/Parser/RSS2Element.php';
+ $class = 'XML_Feed_Parser_RSS2';
+ break;
+ default:
+ throw new XML_Feed_Parser_Exception('Feed type unknown');
+ break;
+ }
+
+ if (! $suppressWarnings && ! empty($error)) {
+ trigger_error($error, E_USER_WARNING);
+ }
+
+ /* Instantiate feed object */
+ $this->feed = new $class($this->model, $strict);
+ }
+
+ /**
+ * Proxy to allow feed element names to be used as method names
+ *
+ * For top-level feed elements we will provide access using methods or
+ * attributes. This function simply passes on a request to the appropriate
+ * feed type object.
+ *
+ * @param string $call - the method being called
+ * @param array $attributes
+ */
+ function __call($call, $attributes)
+ {
+ $attributes = array_pad($attributes, 5, false);
+ list($a, $b, $c, $d, $e) = $attributes;
+ return $this->feed->$call($a, $b, $c, $d, $e);
+ }
+
+ /**
+ * Proxy to allow feed element names to be used as attribute names
+ *
+ * To allow variable-like access to feed-level data we use this
+ * method. It simply passes along to __call() which in turn passes
+ * along to the relevant object.
+ *
+ * @param string $val - the name of the variable required
+ */
+ function __get($val)
+ {
+ return $this->feed->$val;
+ }
+
+ /**
+ * Provides iteration functionality.
+ *
+ * Of course we must be able to iterate... This function simply increases
+ * our internal counter.
+ */
+ function next()
+ {
+ if (isset($this->current_item) &&
+ $this->current_item <= $this->feed->numberEntries - 1) {
+ ++$this->current_item;
+ } else if (! isset($this->current_item)) {
+ $this->current_item = 0;
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * Return XML_Feed_Type object for current element
+ *
+ * @return XML_Feed_Parser_Type Object
+ */
+ function current()
+ {
+ return $this->getEntryByOffset($this->current_item);
+ }
+
+ /**
+ * For iteration -- returns the key for the current stage in the array.
+ *
+ * @return int
+ */
+ function key()
+ {
+ return $this->current_item;
+ }
+
+ /**
+ * For iteration -- tells whether we have reached the
+ * end.
+ *
+ * @return bool
+ */
+ function valid()
+ {
+ return $this->current_item < $this->feed->numberEntries;
+ }
+
+ /**
+ * For iteration -- resets the internal counter to the beginning.
+ */
+ function rewind()
+ {
+ $this->current_item = 0;
+ }
+
+ /**
+ * Provides access to entries by ID if one is specified in the source feed.
+ *
+ * As well as allowing the items to be iterated over we want to allow
+ * users to be able to access a specific entry. This is one of two ways of
+ * doing that, the other being by offset. This method can be quite slow
+ * if dealing with a large feed that hasn't yet been processed as it
+ * instantiates objects for every entry until it finds the one needed.
+ *
+ * @param string $id Valid ID for the given feed format
+ * @return XML_Feed_Parser_Type|false
+ */
+ function getEntryById($id)
+ {
+ if (isset($this->idMappings[$id])) {
+ return $this->getEntryByOffset($this->idMappings[$id]);
+ }
+
+ /*
+ * Since we have not yet encountered that ID, let's go through all the
+ * remaining entries in order till we find it.
+ * This is a fairly slow implementation, but it should work.
+ */
+ return $this->feed->getEntryById($id);
+ }
+
+ /**
+ * Retrieve entry by numeric offset, starting from zero.
+ *
+ * As well as allowing the items to be iterated over we want to allow
+ * users to be able to access a specific entry. This is one of two ways of
+ * doing that, the other being by ID.
+ *
+ * @param int $offset The position of the entry within the feed, starting from 0
+ * @return XML_Feed_Parser_Type|false
+ */
+ function getEntryByOffset($offset)
+ {
+ if ($offset < $this->feed->numberEntries) {
+ if (isset($this->feed->entries[$offset])) {
+ return $this->feed->entries[$offset];
+ } else {
+ try {
+ $this->feed->getEntryByOffset($offset);
+ } catch (Exception $e) {
+ return false;
+ }
+ $id = $this->feed->entries[$offset]->getID();
+ $this->idMappings[$id] = $offset;
+ return $this->feed->entries[$offset];
+ }
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * Retrieve version details from feed type class.
+ *
+ * @return void
+ * @author James Stewart
+ */
+ function version()
+ {
+ return $this->feed->version;
+ }
+
+ /**
+ * Returns a string representation of the feed.
+ *
+ * @return String
+ **/
+ function __toString()
+ {
+ return $this->feed->__toString();
+ }
+}
+?> \ No newline at end of file
diff --git a/plugins/FeedSub/extlib/XML/Feed/Parser/Atom.php b/plugins/FeedSub/extlib/XML/Feed/Parser/Atom.php
new file mode 100644
index 000000000..c7e218a1e
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/Parser/Atom.php
@@ -0,0 +1,365 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * Atom feed class for XML_Feed_Parser
+ *
+ * PHP versions 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt. If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category XML
+ * @package XML_Feed_Parser
+ * @author James Stewart <james@jystewart.net>
+ * @copyright 2005 James Stewart <james@jystewart.net>
+ * @license http://www.gnu.org/copyleft/lesser.html GNU LGPL 2.1
+ * @version CVS: $Id: Atom.php,v 1.29 2008/03/30 22:00:36 jystewart Exp $
+ * @link http://pear.php.net/package/XML_Feed_Parser/
+*/
+
+/**
+ * This is the class that determines how we manage Atom 1.0 feeds
+ *
+ * How we deal with constructs:
+ * date - return as unix datetime for use with the 'date' function unless specified otherwise
+ * text - return as is. optional parameter will give access to attributes
+ * person - defaults to name, but parameter based access
+ *
+ * @author James Stewart <james@jystewart.net>
+ * @version Release: 1.0.3
+ * @package XML_Feed_Parser
+ */
+class XML_Feed_Parser_Atom extends XML_Feed_Parser_Type
+{
+ /**
+ * The URI of the RelaxNG schema used to (optionally) validate the feed
+ * @var string
+ */
+ private $relax = 'atom.rnc';
+
+ /**
+ * We're likely to use XPath, so let's keep it global
+ * @var DOMXPath
+ */
+ public $xpath;
+
+ /**
+ * When performing XPath queries we will use this prefix
+ * @var string
+ */
+ private $xpathPrefix = '//';
+
+ /**
+ * The feed type we are parsing
+ * @var string
+ */
+ public $version = 'Atom 1.0';
+
+ /**
+ * The class used to represent individual items
+ * @var string
+ */
+ protected $itemClass = 'XML_Feed_Parser_AtomElement';
+
+ /**
+ * The element containing entries
+ * @var string
+ */
+ protected $itemElement = 'entry';
+
+ /**
+ * Here we map those elements we're not going to handle individually
+ * to the constructs they are. The optional second parameter in the array
+ * tells the parser whether to 'fall back' (not apt. at the feed level) or
+ * fail if the element is missing. If the parameter is not set, the function
+ * will simply return false and leave it to the client to decide what to do.
+ * @var array
+ */
+ protected $map = array(
+ 'author' => array('Person'),
+ 'contributor' => array('Person'),
+ 'icon' => array('Text'),
+ 'logo' => array('Text'),
+ 'id' => array('Text', 'fail'),
+ 'rights' => array('Text'),
+ 'subtitle' => array('Text'),
+ 'title' => array('Text', 'fail'),
+ 'updated' => array('Date', 'fail'),
+ 'link' => array('Link'),
+ 'generator' => array('Text'),
+ 'category' => array('Category'));
+
+ /**
+ * Here we provide a few mappings for those very special circumstances in
+ * which it makes sense to map back to the RSS2 spec. Key is RSS2 version
+ * value is an array consisting of the equivalent in atom and any attributes
+ * needed to make the mapping.
+ * @var array
+ */
+ protected $compatMap = array(
+ 'guid' => array('id'),
+ 'links' => array('link'),
+ 'tags' => array('category'),
+ 'contributors' => array('contributor'));
+
+ /**
+ * Our constructor does nothing more than its parent.
+ *
+ * @param DOMDocument $xml A DOM object representing the feed
+ * @param bool (optional) $string Whether or not to validate this feed
+ */
+ function __construct(DOMDocument $model, $strict = false)
+ {
+ $this->model = $model;
+
+ if ($strict) {
+ if (! $this->model->relaxNGValidateSource($this->relax)) {
+ throw new XML_Feed_Parser_Exception('Failed required validation');
+ }
+ }
+
+ $this->xpath = new DOMXPath($this->model);
+ $this->xpath->registerNamespace('atom', 'http://www.w3.org/2005/Atom');
+ $this->numberEntries = $this->count('entry');
+ }
+
+ /**
+ * Implement retrieval of an entry based on its ID for atom feeds.
+ *
+ * This function uses XPath to get the entry based on its ID. If DOMXPath::evaluate
+ * is available, we also use that to store a reference to the entry in the array
+ * used by getEntryByOffset so that method does not have to seek out the entry
+ * if it's requested that way.
+ *
+ * @param string $id any valid Atom ID.
+ * @return XML_Feed_Parser_AtomElement
+ */
+ function getEntryById($id)
+ {
+ if (isset($this->idMappings[$id])) {
+ return $this->entries[$this->idMappings[$id]];
+ }
+
+ $entries = $this->xpath->query("//atom:entry[atom:id='$id']");
+
+ if ($entries->length > 0) {
+ $xmlBase = $entries->item(0)->baseURI;
+ $entry = new $this->itemClass($entries->item(0), $this, $xmlBase);
+
+ if (in_array('evaluate', get_class_methods($this->xpath))) {
+ $offset = $this->xpath->evaluate("count(preceding-sibling::atom:entry)", $entries->item(0));
+ $this->entries[$offset] = $entry;
+ }
+
+ $this->idMappings[$id] = $entry;
+
+ return $entry;
+ }
+
+ }
+
+ /**
+ * Retrieves data from a person construct.
+ *
+ * Get a person construct. We default to the 'name' element but allow
+ * access to any of the elements.
+ *
+ * @param string $method The name of the person construct we want
+ * @param array $arguments An array which we hope gives a 'param'
+ * @return string|false
+ */
+ protected function getPerson($method, $arguments)
+ {
+ $offset = empty($arguments[0]) ? 0 : $arguments[0];
+ $parameter = empty($arguments[1]['param']) ? 'name' : $arguments[1]['param'];
+ $section = $this->model->getElementsByTagName($method);
+
+ if ($parameter == 'url') {
+ $parameter = 'uri';
+ }
+
+ if ($section->length <= $offset) {
+ return false;
+ }
+
+ $param = $section->item($offset)->getElementsByTagName($parameter);
+ if ($param->length == 0) {
+ return false;
+ }
+ return $param->item(0)->nodeValue;
+ }
+
+ /**
+ * Retrieves an element's content where that content is a text construct.
+ *
+ * Get a text construct. When calling this method, the two arguments
+ * allowed are 'offset' and 'attribute', so $parser->subtitle() would
+ * return the content of the element, while $parser->subtitle(false, 'type')
+ * would return the value of the type attribute.
+ *
+ * @todo Clarify overlap with getContent()
+ * @param string $method The name of the text construct we want
+ * @param array $arguments An array which we hope gives a 'param'
+ * @return string
+ */
+ protected function getText($method, $arguments)
+ {
+ $offset = empty($arguments[0]) ? 0: $arguments[0];
+ $attribute = empty($arguments[1]) ? false : $arguments[1];
+ $tags = $this->model->getElementsByTagName($method);
+
+ if ($tags->length <= $offset) {
+ return false;
+ }
+
+ $content = $tags->item($offset);
+
+ if (! $content->hasAttribute('type')) {
+ $content->setAttribute('type', 'text');
+ }
+ $type = $content->getAttribute('type');
+
+ if (! empty($attribute) and
+ ! ($method == 'generator' and $attribute == 'name')) {
+ if ($content->hasAttribute($attribute)) {
+ return $content->getAttribute($attribute);
+ } else if ($attribute == 'href' and $content->hasAttribute('uri')) {
+ return $content->getAttribute('uri');
+ }
+ return false;
+ }
+
+ return $this->parseTextConstruct($content);
+ }
+
+ /**
+ * Extract content appropriately from atom text constructs
+ *
+ * Because of different rules applied to the content element and other text
+ * constructs, they are deployed as separate functions, but they share quite
+ * a bit of processing. This method performs the core common process, which is
+ * to apply the rules for different mime types in order to extract the content.
+ *
+ * @param DOMNode $content the text construct node to be parsed
+ * @return String
+ * @author James Stewart
+ **/
+ protected function parseTextConstruct(DOMNode $content)
+ {
+ if ($content->hasAttribute('type')) {
+ $type = $content->getAttribute('type');
+ } else {
+ $type = 'text';
+ }
+
+ if (strpos($type, 'text/') === 0) {
+ $type = 'text';
+ }
+
+ switch ($type) {
+ case 'text':
+ case 'html':
+ return $content->textContent;
+ break;
+ case 'xhtml':
+ $container = $content->getElementsByTagName('div');
+ if ($container->length == 0) {
+ return false;
+ }
+ $contents = $container->item(0);
+ if ($contents->hasChildNodes()) {
+ /* Iterate through, applying xml:base and store the result */
+ $result = '';
+ foreach ($contents->childNodes as $node) {
+ $result .= $this->traverseNode($node);
+ }
+ return $result;
+ }
+ break;
+ case preg_match('@^[a-zA-Z]+/[a-zA-Z+]*xml@i', $type) > 0:
+ return $content;
+ break;
+ case 'application/octet-stream':
+ default:
+ return base64_decode(trim($content->nodeValue));
+ break;
+ }
+ return false;
+ }
+ /**
+ * Get a category from the entry.
+ *
+ * A feed or entry can have any number of categories. A category can have the
+ * attributes term, scheme and label.
+ *
+ * @param string $method The name of the text construct we want
+ * @param array $arguments An array which we hope gives a 'param'
+ * @return string
+ */
+ function getCategory($method, $arguments)
+ {
+ $offset = empty($arguments[0]) ? 0: $arguments[0];
+ $attribute = empty($arguments[1]) ? 'term' : $arguments[1];
+ $categories = $this->model->getElementsByTagName('category');
+ if ($categories->length <= $offset) {
+ $category = $categories->item($offset);
+ if ($category->hasAttribute($attribute)) {
+ return $category->getAttribute($attribute);
+ }
+ }
+ return false;
+ }
+
+ /**
+ * This element must be present at least once with rel="feed". This element may be
+ * present any number of further times so long as there is no clash. If no 'rel' is
+ * present and we're asked for one, we follow the example of the Universal Feed
+ * Parser and presume 'alternate'.
+ *
+ * @param int $offset the position of the link within the container
+ * @param string $attribute the attribute name required
+ * @param array an array of attributes to search by
+ * @return string the value of the attribute
+ */
+ function getLink($offset = 0, $attribute = 'href', $params = false)
+ {
+ if (is_array($params) and !empty($params)) {
+ $terms = array();
+ $alt_predicate = '';
+ $other_predicate = '';
+
+ foreach ($params as $key => $value) {
+ if ($key == 'rel' && $value == 'alternate') {
+ $alt_predicate = '[not(@rel) or @rel="alternate"]';
+ } else {
+ $terms[] = "@$key='$value'";
+ }
+ }
+ if (!empty($terms)) {
+ $other_predicate = '[' . join(' and ', $terms) . ']';
+ }
+ $query = $this->xpathPrefix . 'atom:link' . $alt_predicate . $other_predicate;
+ $links = $this->xpath->query($query);
+ } else {
+ $links = $this->model->getElementsByTagName('link');
+ }
+ if ($links->length > $offset) {
+ if ($links->item($offset)->hasAttribute($attribute)) {
+ $value = $links->item($offset)->getAttribute($attribute);
+ if ($attribute == 'href') {
+ $value = $this->addBase($value, $links->item($offset));
+ }
+ return $value;
+ } else if ($attribute == 'rel') {
+ return 'alternate';
+ }
+ }
+ return false;
+ }
+}
+
+?> \ No newline at end of file
diff --git a/plugins/FeedSub/extlib/XML/Feed/Parser/AtomElement.php b/plugins/FeedSub/extlib/XML/Feed/Parser/AtomElement.php
new file mode 100755
index 000000000..063ecb617
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/Parser/AtomElement.php
@@ -0,0 +1,261 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * AtomElement class for XML_Feed_Parser package
+ *
+ * PHP versions 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt. If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category XML
+ * @package XML_Feed_Parser
+ * @author James Stewart <james@jystewart.net>
+ * @copyright 2005 James Stewart <james@jystewart.net>
+ * @license http://www.gnu.org/copyleft/lesser.html GNU LGPL 2.1
+ * @version CVS: $Id: AtomElement.php,v 1.19 2007/03/26 12:43:11 jystewart Exp $
+ * @link http://pear.php.net/package/XML_Feed_Parser/
+ */
+
+/**
+ * This class provides support for atom entries. It will usually be called by
+ * XML_Feed_Parser_Atom with which it shares many methods.
+ *
+ * @author James Stewart <james@jystewart.net>
+ * @version Release: 1.0.3
+ * @package XML_Feed_Parser
+ */
+class XML_Feed_Parser_AtomElement extends XML_Feed_Parser_Atom
+{
+ /**
+ * This will be a reference to the parent object for when we want
+ * to use a 'fallback' rule
+ * @var XML_Feed_Parser_Atom
+ */
+ protected $parent;
+
+ /**
+ * When performing XPath queries we will use this prefix
+ * @var string
+ */
+ private $xpathPrefix = '';
+
+ /**
+ * xml:base values inherited by the element
+ * @var string
+ */
+ protected $xmlBase;
+
+ /**
+ * Here we provide a few mappings for those very special circumstances in
+ * which it makes sense to map back to the RSS2 spec or to manage other
+ * compatibilities (eg. with the Univeral Feed Parser). Key is the other version's
+ * name for the command, value is an array consisting of the equivalent in our atom
+ * api and any attributes needed to make the mapping.
+ * @var array
+ */
+ protected $compatMap = array(
+ 'guid' => array('id'),
+ 'links' => array('link'),
+ 'tags' => array('category'),
+ 'contributors' => array('contributor'));
+
+ /**
+ * Our specific element map
+ * @var array
+ */
+ protected $map = array(
+ 'author' => array('Person', 'fallback'),
+ 'contributor' => array('Person'),
+ 'id' => array('Text', 'fail'),
+ 'published' => array('Date'),
+ 'updated' => array('Date', 'fail'),
+ 'title' => array('Text', 'fail'),
+ 'rights' => array('Text', 'fallback'),
+ 'summary' => array('Text'),
+ 'content' => array('Content'),
+ 'link' => array('Link'),
+ 'enclosure' => array('Enclosure'),
+ 'category' => array('Category'));
+
+ /**
+ * Store useful information for later.
+ *
+ * @param DOMElement $element - this item as a DOM element
+ * @param XML_Feed_Parser_Atom $parent - the feed of which this is a member
+ */
+ function __construct(DOMElement $element, $parent, $xmlBase = '')
+ {
+ $this->model = $element;
+ $this->parent = $parent;
+ $this->xmlBase = $xmlBase;
+ $this->xpathPrefix = "//atom:entry[atom:id='" . $this->id . "']/";
+ $this->xpath = $this->parent->xpath;
+ }
+
+ /**
+ * Provides access to specific aspects of the author data for an atom entry
+ *
+ * Author data at the entry level is more complex than at the feed level.
+ * If atom:author is not present for the entry we need to look for it in
+ * an atom:source child of the atom:entry. If it's not there either, then
+ * we look to the parent for data.
+ *
+ * @param array
+ * @return string
+ */
+ function getAuthor($arguments)
+ {
+ /* Find out which part of the author data we're looking for */
+ if (isset($arguments['param'])) {
+ $parameter = $arguments['param'];
+ } else {
+ $parameter = 'name';
+ }
+
+ $test = $this->model->getElementsByTagName('author');
+ if ($test->length > 0) {
+ $item = $test->item(0);
+ return $item->getElementsByTagName($parameter)->item(0)->nodeValue;
+ }
+
+ $source = $this->model->getElementsByTagName('source');
+ if ($source->length > 0) {
+ $test = $this->model->getElementsByTagName('author');
+ if ($test->length > 0) {
+ $item = $test->item(0);
+ return $item->getElementsByTagName($parameter)->item(0)->nodeValue;
+ }
+ }
+ return $this->parent->getAuthor($arguments);
+ }
+
+ /**
+ * Returns the content of the content element or info on a specific attribute
+ *
+ * This element may or may not be present. It cannot be present more than
+ * once. It may have a 'src' attribute, in which case there's no content
+ * If not present, then the entry must have link with rel="alternate".
+ * If there is content we return it, if not and there's a 'src' attribute
+ * we return the value of that instead. The method can take an 'attribute'
+ * argument, in which case we return the value of that attribute if present.
+ * eg. $item->content("type") will return the type of the content. It is
+ * recommended that all users check the type before getting the content to
+ * ensure that their script is capable of handling the type of returned data.
+ * (data carried in the content element can be either 'text', 'html', 'xhtml',
+ * or any standard MIME type).
+ *
+ * @return string|false
+ */
+ protected function getContent($method, $arguments = array())
+ {
+ $attribute = empty($arguments[0]) ? false : $arguments[0];
+ $tags = $this->model->getElementsByTagName('content');
+
+ if ($tags->length == 0) {
+ return false;
+ }
+
+ $content = $tags->item(0);
+
+ if (! $content->hasAttribute('type')) {
+ $content->setAttribute('type', 'text');
+ }
+ if (! empty($attribute)) {
+ return $content->getAttribute($attribute);
+ }
+
+ $type = $content->getAttribute('type');
+
+ if (! empty($attribute)) {
+ if ($content->hasAttribute($attribute))
+ {
+ return $content->getAttribute($attribute);
+ }
+ return false;
+ }
+
+ if ($content->hasAttribute('src')) {
+ return $content->getAttribute('src');
+ }
+
+ return $this->parseTextConstruct($content);
+ }
+
+ /**
+ * For compatibility, this method provides a mapping to access enclosures.
+ *
+ * The Atom spec doesn't provide for an enclosure element, but it is
+ * generally supported using the link element with rel='enclosure'.
+ *
+ * @param string $method - for compatibility with our __call usage
+ * @param array $arguments - for compatibility with our __call usage
+ * @return array|false
+ */
+ function getEnclosure($method, $arguments = array())
+ {
+ $offset = isset($arguments[0]) ? $arguments[0] : 0;
+ $query = "//atom:entry[atom:id='" . $this->getText('id', false) .
+ "']/atom:link[@rel='enclosure']";
+
+ $encs = $this->parent->xpath->query($query);
+ if ($encs->length > $offset) {
+ try {
+ if (! $encs->item($offset)->hasAttribute('href')) {
+ return false;
+ }
+ $attrs = $encs->item($offset)->attributes;
+ $length = $encs->item($offset)->hasAttribute('length') ?
+ $encs->item($offset)->getAttribute('length') : false;
+ return array(
+ 'url' => $attrs->getNamedItem('href')->value,
+ 'type' => $attrs->getNamedItem('type')->value,
+ 'length' => $length);
+ } catch (Exception $e) {
+ return false;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Get details of this entry's source, if available/relevant
+ *
+ * Where an atom:entry is taken from another feed then the aggregator
+ * is supposed to include an atom:source element which replicates at least
+ * the atom:id, atom:title, and atom:updated metadata from the original
+ * feed. Atom:source therefore has a very similar structure to atom:feed
+ * and if we find it we will return it as an XML_Feed_Parser_Atom object.
+ *
+ * @return XML_Feed_Parser_Atom|false
+ */
+ function getSource()
+ {
+ $test = $this->model->getElementsByTagName('source');
+ if ($test->length == 0) {
+ return false;
+ }
+ $source = new XML_Feed_Parser_Atom($test->item(0));
+ }
+
+ /**
+ * Get the entry as an XML string
+ *
+ * Return an XML serialization of the feed, should it be required. Most
+ * users however, will already have a serialization that they used when
+ * instantiating the object.
+ *
+ * @return string XML serialization of element
+ */
+ function __toString()
+ {
+ $simple = simplexml_import_dom($this->model);
+ return $simple->asXML();
+ }
+}
+
+?> \ No newline at end of file
diff --git a/plugins/FeedSub/extlib/XML/Feed/Parser/Exception.php b/plugins/FeedSub/extlib/XML/Feed/Parser/Exception.php
new file mode 100755
index 000000000..1e76e3f85
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/Parser/Exception.php
@@ -0,0 +1,42 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * Keeps the exception class for XML_Feed_Parser.
+ *
+ * PHP versions 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt. If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category XML
+ * @package XML_Feed_Parser
+ * @author James Stewart <james@jystewart.net>
+ * @copyright 2005 James Stewart <james@jystewart.net>
+ * @license http://www.gnu.org/copyleft/lesser.html GNU LGPL
+ * @version CVS: $Id: Exception.php,v 1.3 2005/11/07 01:52:35 jystewart Exp $
+ * @link http://pear.php.net/package/XML_Feed_Parser/
+ */
+
+/**
+ * We are extending PEAR_Exception
+ */
+require_once 'PEAR/Exception.php';
+
+/**
+ * XML_Feed_Parser_Exception is a simple extension of PEAR_Exception, existing
+ * to help with identification of the source of exceptions.
+ *
+ * @author James Stewart <james@jystewart.net>
+ * @version Release: 1.0.3
+ * @package XML_Feed_Parser
+ */
+class XML_Feed_Parser_Exception extends PEAR_Exception
+{
+
+}
+
+?> \ No newline at end of file
diff --git a/plugins/FeedSub/extlib/XML/Feed/Parser/RSS09.php b/plugins/FeedSub/extlib/XML/Feed/Parser/RSS09.php
new file mode 100755
index 000000000..07f38f911
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/Parser/RSS09.php
@@ -0,0 +1,214 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * RSS0.9 class for XML_Feed_Parser
+ *
+ * PHP versions 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt. If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category XML
+ * @package XML_Feed_Parser
+ * @author James Stewart <james@jystewart.net>
+ * @copyright 2005 James Stewart <james@jystewart.net>
+ * @license http://www.gnu.org/copyleft/lesser.html GNU LGPL 2.1
+ * @version CVS: $Id: RSS09.php,v 1.5 2006/07/26 21:18:46 jystewart Exp $
+ * @link http://pear.php.net/package/XML_Feed_Parser/
+ */
+
+/**
+ * This class handles RSS0.9 feeds.
+ *
+ * @author James Stewart <james@jystewart.net>
+ * @version Release: 1.0.3
+ * @package XML_Feed_Parser
+ * @todo Find a Relax NG URI we can use
+ */
+class XML_Feed_Parser_RSS09 extends XML_Feed_Parser_Type
+{
+ /**
+ * The URI of the RelaxNG schema used to (optionally) validate the feed
+ * @var string
+ */
+ private $relax = '';
+
+ /**
+ * We're likely to use XPath, so let's keep it global
+ * @var DOMXPath
+ */
+ protected $xpath;
+
+ /**
+ * The feed type we are parsing
+ * @var string
+ */
+ public $version = 'RSS 0.9';
+
+ /**
+ * The class used to represent individual items
+ * @var string
+ */
+ protected $itemClass = 'XML_Feed_Parser_RSS09Element';
+
+ /**
+ * The element containing entries
+ * @var string
+ */
+ protected $itemElement = 'item';
+
+ /**
+ * Here we map those elements we're not going to handle individually
+ * to the constructs they are. The optional second parameter in the array
+ * tells the parser whether to 'fall back' (not apt. at the feed level) or
+ * fail if the element is missing. If the parameter is not set, the function
+ * will simply return false and leave it to the client to decide what to do.
+ * @var array
+ */
+ protected $map = array(
+ 'title' => array('Text'),
+ 'link' => array('Text'),
+ 'description' => array('Text'),
+ 'image' => array('Image'),
+ 'textinput' => array('TextInput'));
+
+ /**
+ * Here we map some elements to their atom equivalents. This is going to be
+ * quite tricky to pull off effectively (and some users' methods may vary)
+ * but is worth trying. The key is the atom version, the value is RSS2.
+ * @var array
+ */
+ protected $compatMap = array(
+ 'title' => array('title'),
+ 'link' => array('link'),
+ 'subtitle' => array('description'));
+
+ /**
+ * We will be working with multiple namespaces and it is useful to
+ * keep them together
+ * @var array
+ */
+ protected $namespaces = array(
+ 'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#');
+
+ /**
+ * Our constructor does nothing more than its parent.
+ *
+ * @todo RelaxNG validation
+ * @param DOMDocument $xml A DOM object representing the feed
+ * @param bool (optional) $string Whether or not to validate this feed
+ */
+ function __construct(DOMDocument $model, $strict = false)
+ {
+ $this->model = $model;
+
+ $this->xpath = new DOMXPath($model);
+ foreach ($this->namespaces as $key => $value) {
+ $this->xpath->registerNamespace($key, $value);
+ }
+ $this->numberEntries = $this->count('item');
+ }
+
+ /**
+ * Included for compatibility -- will not work with RSS 0.9
+ *
+ * This is not something that will work with RSS0.9 as it does not have
+ * clear restrictions on the global uniqueness of IDs.
+ *
+ * @param string $id any valid ID.
+ * @return false
+ */
+ function getEntryById($id)
+ {
+ return false;
+ }
+
+ /**
+ * Get details of the image associated with the feed.
+ *
+ * @return array|false an array simply containing the child elements
+ */
+ protected function getImage()
+ {
+ $images = $this->model->getElementsByTagName('image');
+ if ($images->length > 0) {
+ $image = $images->item(0);
+ $details = array();
+ if ($image->hasChildNodes()) {
+ $details = array(
+ 'title' => $image->getElementsByTagName('title')->item(0)->value,
+ 'link' => $image->getElementsByTagName('link')->item(0)->value,
+ 'url' => $image->getElementsByTagName('url')->item(0)->value);
+ } else {
+ $details = array('title' => false,
+ 'link' => false,
+ 'url' => $image->attributes->getNamedItem('resource')->nodeValue);
+ }
+ $details = array_merge($details,
+ array('description' => false, 'height' => false, 'width' => false));
+ if (! empty($details)) {
+ return $details;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * The textinput element is little used, but in the interests of
+ * completeness we will support it.
+ *
+ * @return array|false
+ */
+ protected function getTextInput()
+ {
+ $inputs = $this->model->getElementsByTagName('textinput');
+ if ($inputs->length > 0) {
+ $input = $inputs->item(0);
+ $results = array();
+ $results['title'] = isset(
+ $input->getElementsByTagName('title')->item(0)->value) ?
+ $input->getElementsByTagName('title')->item(0)->value : null;
+ $results['description'] = isset(
+ $input->getElementsByTagName('description')->item(0)->value) ?
+ $input->getElementsByTagName('description')->item(0)->value : null;
+ $results['name'] = isset(
+ $input->getElementsByTagName('name')->item(0)->value) ?
+ $input->getElementsByTagName('name')->item(0)->value : null;
+ $results['link'] = isset(
+ $input->getElementsByTagName('link')->item(0)->value) ?
+ $input->getElementsByTagName('link')->item(0)->value : null;
+ if (empty($results['link']) &&
+ $input->attributes->getNamedItem('resource')) {
+ $results['link'] = $input->attributes->getNamedItem('resource')->nodeValue;
+ }
+ if (! empty($results)) {
+ return $results;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Get details of a link from the feed.
+ *
+ * In RSS1 a link is a text element but in order to ensure that we resolve
+ * URLs properly we have a special function for them.
+ *
+ * @return string
+ */
+ function getLink($offset = 0, $attribute = 'href', $params = false)
+ {
+ $links = $this->model->getElementsByTagName('link');
+ if ($links->length <= $offset) {
+ return false;
+ }
+ $link = $links->item($offset);
+ return $this->addBase($link->nodeValue, $link);
+ }
+}
+
+?> \ No newline at end of file
diff --git a/plugins/FeedSub/extlib/XML/Feed/Parser/RSS09Element.php b/plugins/FeedSub/extlib/XML/Feed/Parser/RSS09Element.php
new file mode 100755
index 000000000..d41f36e8d
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/Parser/RSS09Element.php
@@ -0,0 +1,62 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * RSS0.9 Element class for XML_Feed_Parser
+ *
+ * PHP versions 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt. If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category XML
+ * @package XML_Feed_Parser
+ * @author James Stewart <james@jystewart.net>
+ * @copyright 2005 James Stewart <james@jystewart.net>
+ * @license http://www.gnu.org/copyleft/lesser.html GNU LGPL 2.1
+ * @version CVS: $Id: RSS09Element.php,v 1.4 2006/06/30 17:41:56 jystewart Exp $
+ * @link http://pear.php.net/package/XML_Feed_Parser/
+ */
+
+/*
+ * This class provides support for RSS 0.9 entries. It will usually be called by
+ * XML_Feed_Parser_RSS09 with which it shares many methods.
+ *
+ * @author James Stewart <james@jystewart.net>
+ * @version Release: 1.0.3
+ * @package XML_Feed_Parser
+ */
+class XML_Feed_Parser_RSS09Element extends XML_Feed_Parser_RSS09
+{
+ /**
+ * This will be a reference to the parent object for when we want
+ * to use a 'fallback' rule
+ * @var XML_Feed_Parser_RSS09
+ */
+ protected $parent;
+
+ /**
+ * Our specific element map
+ * @var array
+ */
+ protected $map = array(
+ 'title' => array('Text'),
+ 'link' => array('Link'));
+
+ /**
+ * Store useful information for later.
+ *
+ * @param DOMElement $element - this item as a DOM element
+ * @param XML_Feed_Parser_RSS1 $parent - the feed of which this is a member
+ */
+ function __construct(DOMElement $element, $parent, $xmlBase = '')
+ {
+ $this->model = $element;
+ $this->parent = $parent;
+ }
+}
+
+?> \ No newline at end of file
diff --git a/plugins/FeedSub/extlib/XML/Feed/Parser/RSS1.php b/plugins/FeedSub/extlib/XML/Feed/Parser/RSS1.php
new file mode 100755
index 000000000..60c9938ba
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/Parser/RSS1.php
@@ -0,0 +1,277 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * RSS1 class for XML_Feed_Parser
+ *
+ * PHP versions 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt. If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category XML
+ * @package XML_Feed_Parser
+ * @author James Stewart <james@jystewart.net>
+ * @copyright 2005 James Stewart <james@jystewart.net>
+ * @license http://www.gnu.org/copyleft/lesser.html GNU LGPL 2.1
+ * @version CVS: $Id: RSS1.php,v 1.10 2006/07/27 13:52:05 jystewart Exp $
+ * @link http://pear.php.net/package/XML_Feed_Parser/
+ */
+
+/**
+ * This class handles RSS1.0 feeds.
+ *
+ * @author James Stewart <james@jystewart.net>
+ * @version Release: 1.0.3
+ * @package XML_Feed_Parser
+ * @todo Find a Relax NG URI we can use
+ */
+class XML_Feed_Parser_RSS1 extends XML_Feed_Parser_Type
+{
+ /**
+ * The URI of the RelaxNG schema used to (optionally) validate the feed
+ * @var string
+ */
+ private $relax = 'rss10.rnc';
+
+ /**
+ * We're likely to use XPath, so let's keep it global
+ * @var DOMXPath
+ */
+ protected $xpath;
+
+ /**
+ * The feed type we are parsing
+ * @var string
+ */
+ public $version = 'RSS 1.0';
+
+ /**
+ * The class used to represent individual items
+ * @var string
+ */
+ protected $itemClass = 'XML_Feed_Parser_RSS1Element';
+
+ /**
+ * The element containing entries
+ * @var string
+ */
+ protected $itemElement = 'item';
+
+ /**
+ * Here we map those elements we're not going to handle individually
+ * to the constructs they are. The optional second parameter in the array
+ * tells the parser whether to 'fall back' (not apt. at the feed level) or
+ * fail if the element is missing. If the parameter is not set, the function
+ * will simply return false and leave it to the client to decide what to do.
+ * @var array
+ */
+ protected $map = array(
+ 'title' => array('Text'),
+ 'link' => array('Text'),
+ 'description' => array('Text'),
+ 'image' => array('Image'),
+ 'textinput' => array('TextInput'),
+ 'updatePeriod' => array('Text'),
+ 'updateFrequency' => array('Text'),
+ 'updateBase' => array('Date'),
+ 'rights' => array('Text'), # dc:rights
+ 'description' => array('Text'), # dc:description
+ 'creator' => array('Text'), # dc:creator
+ 'publisher' => array('Text'), # dc:publisher
+ 'contributor' => array('Text'), # dc:contributor
+ 'date' => array('Date') # dc:contributor
+ );
+
+ /**
+ * Here we map some elements to their atom equivalents. This is going to be
+ * quite tricky to pull off effectively (and some users' methods may vary)
+ * but is worth trying. The key is the atom version, the value is RSS2.
+ * @var array
+ */
+ protected $compatMap = array(
+ 'title' => array('title'),
+ 'link' => array('link'),
+ 'subtitle' => array('description'),
+ 'author' => array('creator'),
+ 'updated' => array('date'));
+
+ /**
+ * We will be working with multiple namespaces and it is useful to
+ * keep them together
+ * @var array
+ */
+ protected $namespaces = array(
+ 'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
+ 'rss' => 'http://purl.org/rss/1.0/',
+ 'dc' => 'http://purl.org/rss/1.0/modules/dc/',
+ 'content' => 'http://purl.org/rss/1.0/modules/content/',
+ 'sy' => 'http://web.resource.org/rss/1.0/modules/syndication/');
+
+ /**
+ * Our constructor does nothing more than its parent.
+ *
+ * @param DOMDocument $xml A DOM object representing the feed
+ * @param bool (optional) $string Whether or not to validate this feed
+ */
+ function __construct(DOMDocument $model, $strict = false)
+ {
+ $this->model = $model;
+ if ($strict) {
+ $validate = $this->model->relaxNGValidate(self::getSchemaDir .
+ DIRECTORY_SEPARATOR . $this->relax);
+ if (! $validate) {
+ throw new XML_Feed_Parser_Exception('Failed required validation');
+ }
+ }
+
+ $this->xpath = new DOMXPath($model);
+ foreach ($this->namespaces as $key => $value) {
+ $this->xpath->registerNamespace($key, $value);
+ }
+ $this->numberEntries = $this->count('item');
+ }
+
+ /**
+ * Allows retrieval of an entry by ID where the rdf:about attribute is used
+ *
+ * This is not really something that will work with RSS1 as it does not have
+ * clear restrictions on the global uniqueness of IDs. We will employ the
+ * _very_ hit and miss method of selecting entries based on the rdf:about
+ * attribute. If DOMXPath::evaluate is available, we also use that to store
+ * a reference to the entry in the array used by getEntryByOffset so that
+ * method does not have to seek out the entry if it's requested that way.
+ *
+ * @param string $id any valid ID.
+ * @return XML_Feed_Parser_RSS1Element
+ */
+ function getEntryById($id)
+ {
+ if (isset($this->idMappings[$id])) {
+ return $this->entries[$this->idMappings[$id]];
+ }
+
+ $entries = $this->xpath->query("//rss:item[@rdf:about='$id']");
+ if ($entries->length > 0) {
+ $classname = $this->itemClass;
+ $entry = new $classname($entries->item(0), $this);
+ if (in_array('evaluate', get_class_methods($this->xpath))) {
+ $offset = $this->xpath->evaluate("count(preceding-sibling::rss:item)", $entries->item(0));
+ $this->entries[$offset] = $entry;
+ }
+ $this->idMappings[$id] = $entry;
+ return $entry;
+ }
+ return false;
+ }
+
+ /**
+ * Get details of the image associated with the feed.
+ *
+ * @return array|false an array simply containing the child elements
+ */
+ protected function getImage()
+ {
+ $images = $this->model->getElementsByTagName('image');
+ if ($images->length > 0) {
+ $image = $images->item(0);
+ $details = array();
+ if ($image->hasChildNodes()) {
+ $details = array(
+ 'title' => $image->getElementsByTagName('title')->item(0)->value,
+ 'link' => $image->getElementsByTagName('link')->item(0)->value,
+ 'url' => $image->getElementsByTagName('url')->item(0)->value);
+ } else {
+ $details = array('title' => false,
+ 'link' => false,
+ 'url' => $image->attributes->getNamedItem('resource')->nodeValue);
+ }
+ $details = array_merge($details, array('description' => false, 'height' => false, 'width' => false));
+ if (! empty($details)) {
+ return $details;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * The textinput element is little used, but in the interests of
+ * completeness we will support it.
+ *
+ * @return array|false
+ */
+ protected function getTextInput()
+ {
+ $inputs = $this->model->getElementsByTagName('textinput');
+ if ($inputs->length > 0) {
+ $input = $inputs->item(0);
+ $results = array();
+ $results['title'] = isset(
+ $input->getElementsByTagName('title')->item(0)->value) ?
+ $input->getElementsByTagName('title')->item(0)->value : null;
+ $results['description'] = isset(
+ $input->getElementsByTagName('description')->item(0)->value) ?
+ $input->getElementsByTagName('description')->item(0)->value : null;
+ $results['name'] = isset(
+ $input->getElementsByTagName('name')->item(0)->value) ?
+ $input->getElementsByTagName('name')->item(0)->value : null;
+ $results['link'] = isset(
+ $input->getElementsByTagName('link')->item(0)->value) ?
+ $input->getElementsByTagName('link')->item(0)->value : null;
+ if (empty($results['link']) and
+ $input->attributes->getNamedItem('resource')) {
+ $results['link'] =
+ $input->attributes->getNamedItem('resource')->nodeValue;
+ }
+ if (! empty($results)) {
+ return $results;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Employs various techniques to identify the author
+ *
+ * Dublin Core provides the dc:creator, dc:contributor, and dc:publisher
+ * elements for defining authorship in RSS1. We will try each of those in
+ * turn in order to simulate the atom author element and will return it
+ * as text.
+ *
+ * @return array|false
+ */
+ function getAuthor()
+ {
+ $options = array('creator', 'contributor', 'publisher');
+ foreach ($options as $element) {
+ $test = $this->model->getElementsByTagName($element);
+ if ($test->length > 0) {
+ return $test->item(0)->value;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Retrieve a link
+ *
+ * In RSS1 a link is a text element but in order to ensure that we resolve
+ * URLs properly we have a special function for them.
+ *
+ * @return string
+ */
+ function getLink($offset = 0, $attribute = 'href', $params = false)
+ {
+ $links = $this->model->getElementsByTagName('link');
+ if ($links->length <= $offset) {
+ return false;
+ }
+ $link = $links->item($offset);
+ return $this->addBase($link->nodeValue, $link);
+ }
+}
+
+?> \ No newline at end of file
diff --git a/plugins/FeedSub/extlib/XML/Feed/Parser/RSS11.php b/plugins/FeedSub/extlib/XML/Feed/Parser/RSS11.php
new file mode 100755
index 000000000..3cd1ef15d
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/Parser/RSS11.php
@@ -0,0 +1,276 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * RSS1.1 class for XML_Feed_Parser
+ *
+ * PHP versions 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt. If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category XML
+ * @package XML_Feed_Parser
+ * @author James Stewart <james@jystewart.net>
+ * @copyright 2005 James Stewart <james@jystewart.net>
+ * @license http://www.gnu.org/copyleft/lesser.html GNU LGPL 2.1
+ * @version CVS: $Id: RSS11.php,v 1.6 2006/07/27 13:52:05 jystewart Exp $
+ * @link http://pear.php.net/package/XML_Feed_Parser/
+ */
+
+/**
+ * This class handles RSS1.1 feeds. RSS1.1 is documented at:
+ * http://inamidst.com/rss1.1/
+ *
+ * @author James Stewart <james@jystewart.net>
+ * @version Release: 1.0.3
+ * @package XML_Feed_Parser
+ * @todo Support for RDF:List
+ * @todo Ensure xml:lang is accessible to users
+ */
+class XML_Feed_Parser_RSS11 extends XML_Feed_Parser_Type
+{
+ /**
+ * The URI of the RelaxNG schema used to (optionally) validate the feed
+ * @var string
+ */
+ private $relax = 'rss11.rnc';
+
+ /**
+ * We're likely to use XPath, so let's keep it global
+ * @var DOMXPath
+ */
+ protected $xpath;
+
+ /**
+ * The feed type we are parsing
+ * @var string
+ */
+ public $version = 'RSS 1.0';
+
+ /**
+ * The class used to represent individual items
+ * @var string
+ */
+ protected $itemClass = 'XML_Feed_Parser_RSS1Element';
+
+ /**
+ * The element containing entries
+ * @var string
+ */
+ protected $itemElement = 'item';
+
+ /**
+ * Here we map those elements we're not going to handle individually
+ * to the constructs they are. The optional second parameter in the array
+ * tells the parser whether to 'fall back' (not apt. at the feed level) or
+ * fail if the element is missing. If the parameter is not set, the function
+ * will simply return false and leave it to the client to decide what to do.
+ * @var array
+ */
+ protected $map = array(
+ 'title' => array('Text'),
+ 'link' => array('Text'),
+ 'description' => array('Text'),
+ 'image' => array('Image'),
+ 'updatePeriod' => array('Text'),
+ 'updateFrequency' => array('Text'),
+ 'updateBase' => array('Date'),
+ 'rights' => array('Text'), # dc:rights
+ 'description' => array('Text'), # dc:description
+ 'creator' => array('Text'), # dc:creator
+ 'publisher' => array('Text'), # dc:publisher
+ 'contributor' => array('Text'), # dc:contributor
+ 'date' => array('Date') # dc:contributor
+ );
+
+ /**
+ * Here we map some elements to their atom equivalents. This is going to be
+ * quite tricky to pull off effectively (and some users' methods may vary)
+ * but is worth trying. The key is the atom version, the value is RSS2.
+ * @var array
+ */
+ protected $compatMap = array(
+ 'title' => array('title'),
+ 'link' => array('link'),
+ 'subtitle' => array('description'),
+ 'author' => array('creator'),
+ 'updated' => array('date'));
+
+ /**
+ * We will be working with multiple namespaces and it is useful to
+ * keep them together. We will retain support for some common RSS1.0 modules
+ * @var array
+ */
+ protected $namespaces = array(
+ 'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
+ 'rss' => 'http://purl.org/net/rss1.1#',
+ 'dc' => 'http://purl.org/rss/1.0/modules/dc/',
+ 'content' => 'http://purl.org/rss/1.0/modules/content/',
+ 'sy' => 'http://web.resource.org/rss/1.0/modules/syndication/');
+
+ /**
+ * Our constructor does nothing more than its parent.
+ *
+ * @param DOMDocument $xml A DOM object representing the feed
+ * @param bool (optional) $string Whether or not to validate this feed
+ */
+ function __construct(DOMDocument $model, $strict = false)
+ {
+ $this->model = $model;
+
+ if ($strict) {
+ $validate = $this->model->relaxNGValidate(self::getSchemaDir .
+ DIRECTORY_SEPARATOR . $this->relax);
+ if (! $validate) {
+ throw new XML_Feed_Parser_Exception('Failed required validation');
+ }
+ }
+
+ $this->xpath = new DOMXPath($model);
+ foreach ($this->namespaces as $key => $value) {
+ $this->xpath->registerNamespace($key, $value);
+ }
+ $this->numberEntries = $this->count('item');
+ }
+
+ /**
+ * Attempts to identify an element by ID given by the rdf:about attribute
+ *
+ * This is not really something that will work with RSS1.1 as it does not have
+ * clear restrictions on the global uniqueness of IDs. We will employ the
+ * _very_ hit and miss method of selecting entries based on the rdf:about
+ * attribute. Please note that this is even more hit and miss with RSS1.1 than
+ * with RSS1.0 since RSS1.1 does not require the rdf:about attribute for items.
+ *
+ * @param string $id any valid ID.
+ * @return XML_Feed_Parser_RSS1Element
+ */
+ function getEntryById($id)
+ {
+ if (isset($this->idMappings[$id])) {
+ return $this->entries[$this->idMappings[$id]];
+ }
+
+ $entries = $this->xpath->query("//rss:item[@rdf:about='$id']");
+ if ($entries->length > 0) {
+ $classname = $this->itemClass;
+ $entry = new $classname($entries->item(0), $this);
+ return $entry;
+ }
+ return false;
+ }
+
+ /**
+ * Get details of the image associated with the feed.
+ *
+ * @return array|false an array simply containing the child elements
+ */
+ protected function getImage()
+ {
+ $images = $this->model->getElementsByTagName('image');
+ if ($images->length > 0) {
+ $image = $images->item(0);
+ $details = array();
+ if ($image->hasChildNodes()) {
+ $details = array(
+ 'title' => $image->getElementsByTagName('title')->item(0)->value,
+ 'url' => $image->getElementsByTagName('url')->item(0)->value);
+ if ($image->getElementsByTagName('link')->length > 0) {
+ $details['link'] =
+ $image->getElementsByTagName('link')->item(0)->value;
+ }
+ } else {
+ $details = array('title' => false,
+ 'link' => false,
+ 'url' => $image->attributes->getNamedItem('resource')->nodeValue);
+ }
+ $details = array_merge($details,
+ array('description' => false, 'height' => false, 'width' => false));
+ if (! empty($details)) {
+ return $details;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * The textinput element is little used, but in the interests of
+ * completeness we will support it.
+ *
+ * @return array|false
+ */
+ protected function getTextInput()
+ {
+ $inputs = $this->model->getElementsByTagName('textinput');
+ if ($inputs->length > 0) {
+ $input = $inputs->item(0);
+ $results = array();
+ $results['title'] = isset(
+ $input->getElementsByTagName('title')->item(0)->value) ?
+ $input->getElementsByTagName('title')->item(0)->value : null;
+ $results['description'] = isset(
+ $input->getElementsByTagName('description')->item(0)->value) ?
+ $input->getElementsByTagName('description')->item(0)->value : null;
+ $results['name'] = isset(
+ $input->getElementsByTagName('name')->item(0)->value) ?
+ $input->getElementsByTagName('name')->item(0)->value : null;
+ $results['link'] = isset(
+ $input->getElementsByTagName('link')->item(0)->value) ?
+ $input->getElementsByTagName('link')->item(0)->value : null;
+ if (empty($results['link']) and
+ $input->attributes->getNamedItem('resource')) {
+ $results['link'] = $input->attributes->getNamedItem('resource')->nodeValue;
+ }
+ if (! empty($results)) {
+ return $results;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Attempts to discern authorship
+ *
+ * Dublin Core provides the dc:creator, dc:contributor, and dc:publisher
+ * elements for defining authorship in RSS1. We will try each of those in
+ * turn in order to simulate the atom author element and will return it
+ * as text.
+ *
+ * @return array|false
+ */
+ function getAuthor()
+ {
+ $options = array('creator', 'contributor', 'publisher');
+ foreach ($options as $element) {
+ $test = $this->model->getElementsByTagName($element);
+ if ($test->length > 0) {
+ return $test->item(0)->value;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Retrieve a link
+ *
+ * In RSS1 a link is a text element but in order to ensure that we resolve
+ * URLs properly we have a special function for them.
+ *
+ * @return string
+ */
+ function getLink($offset = 0, $attribute = 'href', $params = false)
+ {
+ $links = $this->model->getElementsByTagName('link');
+ if ($links->length <= $offset) {
+ return false;
+ }
+ $link = $links->item($offset);
+ return $this->addBase($link->nodeValue, $link);
+ }
+}
+
+?> \ No newline at end of file
diff --git a/plugins/FeedSub/extlib/XML/Feed/Parser/RSS11Element.php b/plugins/FeedSub/extlib/XML/Feed/Parser/RSS11Element.php
new file mode 100755
index 000000000..75918beda
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/Parser/RSS11Element.php
@@ -0,0 +1,151 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * RSS1 Element class for XML_Feed_Parser
+ *
+ * PHP versions 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt. If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category XML
+ * @package XML_Feed_Parser
+ * @author James Stewart <james@jystewart.net>
+ * @copyright 2005 James Stewart <james@jystewart.net>
+ * @license http://www.gnu.org/copyleft/lesser.html GNU LGPL 2.1
+ * @version CVS: $Id: RSS11Element.php,v 1.4 2006/06/30 17:41:56 jystewart Exp $
+ * @link http://pear.php.net/package/XML_Feed_Parser/
+ */
+
+/*
+ * This class provides support for RSS 1.1 entries. It will usually be called by
+ * XML_Feed_Parser_RSS11 with which it shares many methods.
+ *
+ * @author James Stewart <james@jystewart.net>
+ * @version Release: 1.0.3
+ * @package XML_Feed_Parser
+ */
+class XML_Feed_Parser_RSS11Element extends XML_Feed_Parser_RSS11
+{
+ /**
+ * This will be a reference to the parent object for when we want
+ * to use a 'fallback' rule
+ * @var XML_Feed_Parser_RSS1
+ */
+ protected $parent;
+
+ /**
+ * Our specific element map
+ * @var array
+ */
+ protected $map = array(
+ 'id' => array('Id'),
+ 'title' => array('Text'),
+ 'link' => array('Link'),
+ 'description' => array('Text'), # or dc:description
+ 'category' => array('Category'),
+ 'rights' => array('Text'), # dc:rights
+ 'creator' => array('Text'), # dc:creator
+ 'publisher' => array('Text'), # dc:publisher
+ 'contributor' => array('Text'), # dc:contributor
+ 'date' => array('Date'), # dc:date
+ 'content' => array('Content')
+ );
+
+ /**
+ * Here we map some elements to their atom equivalents. This is going to be
+ * quite tricky to pull off effectively (and some users' methods may vary)
+ * but is worth trying. The key is the atom version, the value is RSS1.
+ * @var array
+ */
+ protected $compatMap = array(
+ 'content' => array('content'),
+ 'updated' => array('lastBuildDate'),
+ 'published' => array('pubdate'),
+ 'subtitle' => array('description'),
+ 'updated' => array('date'),
+ 'author' => array('creator'),
+ 'contributor' => array('contributor')
+ );
+
+ /**
+ * Store useful information for later.
+ *
+ * @param DOMElement $element - this item as a DOM element
+ * @param XML_Feed_Parser_RSS1 $parent - the feed of which this is a member
+ */
+ function __construct(DOMElement $element, $parent, $xmlBase = '')
+ {
+ $this->model = $element;
+ $this->parent = $parent;
+ }
+
+ /**
+ * If an rdf:about attribute is specified, return that as an ID
+ *
+ * There is no established way of showing an ID for an RSS1 entry. We will
+ * simulate it using the rdf:about attribute of the entry element. This cannot
+ * be relied upon for unique IDs but may prove useful.
+ *
+ * @return string|false
+ */
+ function getId()
+ {
+ if ($this->model->attributes->getNamedItem('about')) {
+ return $this->model->attributes->getNamedItem('about')->nodeValue;
+ }
+ return false;
+ }
+
+ /**
+ * Return the entry's content
+ *
+ * The official way to include full content in an RSS1 entry is to use
+ * the content module's element 'encoded'. Often, however, the 'description'
+ * element is used instead. We will offer that as a fallback.
+ *
+ * @return string|false
+ */
+ function getContent()
+ {
+ $options = array('encoded', 'description');
+ foreach ($options as $element) {
+ $test = $this->model->getElementsByTagName($element);
+ if ($test->length == 0) {
+ continue;
+ }
+ if ($test->item(0)->hasChildNodes()) {
+ $value = '';
+ foreach ($test->item(0)->childNodes as $child) {
+ if ($child instanceof DOMText) {
+ $value .= $child->nodeValue;
+ } else {
+ $simple = simplexml_import_dom($child);
+ $value .= $simple->asXML();
+ }
+ }
+ return $value;
+ } else if ($test->length > 0) {
+ return $test->item(0)->nodeValue;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * How RSS1.1 should support for enclosures is not clear. For now we will return
+ * false.
+ *
+ * @return false
+ */
+ function getEnclosure()
+ {
+ return false;
+ }
+}
+
+?> \ No newline at end of file
diff --git a/plugins/FeedSub/extlib/XML/Feed/Parser/RSS1Element.php b/plugins/FeedSub/extlib/XML/Feed/Parser/RSS1Element.php
new file mode 100755
index 000000000..8e36d5a9b
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/Parser/RSS1Element.php
@@ -0,0 +1,116 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * RSS1 Element class for XML_Feed_Parser
+ *
+ * PHP versions 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt. If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category XML
+ * @package XML_Feed_Parser
+ * @author James Stewart <james@jystewart.net>
+ * @copyright 2005 James Stewart <james@jystewart.net>
+ * @license http://www.gnu.org/copyleft/lesser.html GNU LGPL 2.1
+ * @version CVS: $Id: RSS1Element.php,v 1.6 2006/06/30 17:41:56 jystewart Exp $
+ * @link http://pear.php.net/package/XML_Feed_Parser/
+ */
+
+/*
+ * This class provides support for RSS 1.0 entries. It will usually be called by
+ * XML_Feed_Parser_RSS1 with which it shares many methods.
+ *
+ * @author James Stewart <james@jystewart.net>
+ * @version Release: 1.0.3
+ * @package XML_Feed_Parser
+ */
+class XML_Feed_Parser_RSS1Element extends XML_Feed_Parser_RSS1
+{
+ /**
+ * This will be a reference to the parent object for when we want
+ * to use a 'fallback' rule
+ * @var XML_Feed_Parser_RSS1
+ */
+ protected $parent;
+
+ /**
+ * Our specific element map
+ * @var array
+ */
+ protected $map = array(
+ 'id' => array('Id'),
+ 'title' => array('Text'),
+ 'link' => array('Link'),
+ 'description' => array('Text'), # or dc:description
+ 'category' => array('Category'),
+ 'rights' => array('Text'), # dc:rights
+ 'creator' => array('Text'), # dc:creator
+ 'publisher' => array('Text'), # dc:publisher
+ 'contributor' => array('Text'), # dc:contributor
+ 'date' => array('Date'), # dc:date
+ 'content' => array('Content')
+ );
+
+ /**
+ * Here we map some elements to their atom equivalents. This is going to be
+ * quite tricky to pull off effectively (and some users' methods may vary)
+ * but is worth trying. The key is the atom version, the value is RSS1.
+ * @var array
+ */
+ protected $compatMap = array(
+ 'content' => array('content'),
+ 'updated' => array('lastBuildDate'),
+ 'published' => array('pubdate'),
+ 'subtitle' => array('description'),
+ 'updated' => array('date'),
+ 'author' => array('creator'),
+ 'contributor' => array('contributor')
+ );
+
+ /**
+ * Store useful information for later.
+ *
+ * @param DOMElement $element - this item as a DOM element
+ * @param XML_Feed_Parser_RSS1 $parent - the feed of which this is a member
+ */
+ function __construct(DOMElement $element, $parent, $xmlBase = '')
+ {
+ $this->model = $element;
+ $this->parent = $parent;
+ }
+
+ /**
+ * If an rdf:about attribute is specified, return it as an ID
+ *
+ * There is no established way of showing an ID for an RSS1 entry. We will
+ * simulate it using the rdf:about attribute of the entry element. This cannot
+ * be relied upon for unique IDs but may prove useful.
+ *
+ * @return string|false
+ */
+ function getId()
+ {
+ if ($this->model->attributes->getNamedItem('about')) {
+ return $this->model->attributes->getNamedItem('about')->nodeValue;
+ }
+ return false;
+ }
+
+ /**
+ * How RSS1 should support for enclosures is not clear. For now we will return
+ * false.
+ *
+ * @return false
+ */
+ function getEnclosure()
+ {
+ return false;
+ }
+}
+
+?> \ No newline at end of file
diff --git a/plugins/FeedSub/extlib/XML/Feed/Parser/RSS2.php b/plugins/FeedSub/extlib/XML/Feed/Parser/RSS2.php
new file mode 100644
index 000000000..0936bd2f5
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/Parser/RSS2.php
@@ -0,0 +1,335 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * Class representing feed-level data for an RSS2 feed
+ *
+ * PHP versions 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt. If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category XML
+ * @package XML_Feed_Parser
+ * @author James Stewart <james@jystewart.net>
+ * @copyright 2005 James Stewart <james@jystewart.net>
+ * @license http://www.gnu.org/copyleft/lesser.html GNU LGPL 2.1
+ * @version CVS: $Id: RSS2.php,v 1.12 2008/03/08 18:16:45 jystewart Exp $
+ * @link http://pear.php.net/package/XML_Feed_Parser/
+ */
+
+/**
+ * This class handles RSS2 feeds.
+ *
+ * @author James Stewart <james@jystewart.net>
+ * @version Release: 1.0.3
+ * @package XML_Feed_Parser
+ */
+class XML_Feed_Parser_RSS2 extends XML_Feed_Parser_Type
+{
+ /**
+ * The URI of the RelaxNG schema used to (optionally) validate the feed
+ * @var string
+ */
+ private $relax = 'rss20.rnc';
+
+ /**
+ * We're likely to use XPath, so let's keep it global
+ * @var DOMXPath
+ */
+ protected $xpath;
+
+ /**
+ * The feed type we are parsing
+ * @var string
+ */
+ public $version = 'RSS 2.0';
+
+ /**
+ * The class used to represent individual items
+ * @var string
+ */
+ protected $itemClass = 'XML_Feed_Parser_RSS2Element';
+
+ /**
+ * The element containing entries
+ * @var string
+ */
+ protected $itemElement = 'item';
+
+ /**
+ * Here we map those elements we're not going to handle individually
+ * to the constructs they are. The optional second parameter in the array
+ * tells the parser whether to 'fall back' (not apt. at the feed level) or
+ * fail if the element is missing. If the parameter is not set, the function
+ * will simply return false and leave it to the client to decide what to do.
+ * @var array
+ */
+ protected $map = array(
+ 'ttl' => array('Text'),
+ 'pubDate' => array('Date'),
+ 'lastBuildDate' => array('Date'),
+ 'title' => array('Text'),
+ 'link' => array('Link'),
+ 'description' => array('Text'),
+ 'language' => array('Text'),
+ 'copyright' => array('Text'),
+ 'managingEditor' => array('Text'),
+ 'webMaster' => array('Text'),
+ 'category' => array('Text'),
+ 'generator' => array('Text'),
+ 'docs' => array('Text'),
+ 'ttl' => array('Text'),
+ 'image' => array('Image'),
+ 'skipDays' => array('skipDays'),
+ 'skipHours' => array('skipHours'));
+
+ /**
+ * Here we map some elements to their atom equivalents. This is going to be
+ * quite tricky to pull off effectively (and some users' methods may vary)
+ * but is worth trying. The key is the atom version, the value is RSS2.
+ * @var array
+ */
+ protected $compatMap = array(
+ 'title' => array('title'),
+ 'rights' => array('copyright'),
+ 'updated' => array('lastBuildDate'),
+ 'subtitle' => array('description'),
+ 'date' => array('pubDate'),
+ 'author' => array('managingEditor'));
+
+ protected $namespaces = array(
+ 'dc' => 'http://purl.org/rss/1.0/modules/dc/',
+ 'content' => 'http://purl.org/rss/1.0/modules/content/');
+
+ /**
+ * Our constructor does nothing more than its parent.
+ *
+ * @param DOMDocument $xml A DOM object representing the feed
+ * @param bool (optional) $string Whether or not to validate this feed
+ */
+ function __construct(DOMDocument $model, $strict = false)
+ {
+ $this->model = $model;
+
+ if ($strict) {
+ if (! $this->model->relaxNGValidate($this->relax)) {
+ throw new XML_Feed_Parser_Exception('Failed required validation');
+ }
+ }
+
+ $this->xpath = new DOMXPath($this->model);
+ foreach ($this->namespaces as $key => $value) {
+ $this->xpath->registerNamespace($key, $value);
+ }
+ $this->numberEntries = $this->count('item');
+ }
+
+ /**
+ * Retrieves an entry by ID, if the ID is specified with the guid element
+ *
+ * This is not really something that will work with RSS2 as it does not have
+ * clear restrictions on the global uniqueness of IDs. But we can emulate
+ * it by allowing access based on the 'guid' element. If DOMXPath::evaluate
+ * is available, we also use that to store a reference to the entry in the array
+ * used by getEntryByOffset so that method does not have to seek out the entry
+ * if it's requested that way.
+ *
+ * @param string $id any valid ID.
+ * @return XML_Feed_Parser_RSS2Element
+ */
+ function getEntryById($id)
+ {
+ if (isset($this->idMappings[$id])) {
+ return $this->entries[$this->idMappings[$id]];
+ }
+
+ $entries = $this->xpath->query("//item[guid='$id']");
+ if ($entries->length > 0) {
+ $entry = new $this->itemElement($entries->item(0), $this);
+ if (in_array('evaluate', get_class_methods($this->xpath))) {
+ $offset = $this->xpath->evaluate("count(preceding-sibling::item)", $entries->item(0));
+ $this->entries[$offset] = $entry;
+ }
+ $this->idMappings[$id] = $entry;
+ return $entry;
+ }
+ }
+
+ /**
+ * Get a category from the element
+ *
+ * The category element is a simple text construct which can occur any number
+ * of times. We allow access by offset or access to an array of results.
+ *
+ * @param string $call for compatibility with our overloading
+ * @param array $arguments - arg 0 is the offset, arg 1 is whether to return as array
+ * @return string|array|false
+ */
+ function getCategory($call, $arguments = array())
+ {
+ $categories = $this->model->getElementsByTagName('category');
+ $offset = empty($arguments[0]) ? 0 : $arguments[0];
+ $array = empty($arguments[1]) ? false : true;
+ if ($categories->length <= $offset) {
+ return false;
+ }
+ if ($array) {
+ $list = array();
+ foreach ($categories as $category) {
+ array_push($list, $category->nodeValue);
+ }
+ return $list;
+ }
+ return $categories->item($offset)->nodeValue;
+ }
+
+ /**
+ * Get details of the image associated with the feed.
+ *
+ * @return array|false an array simply containing the child elements
+ */
+ protected function getImage()
+ {
+ $images = $this->xpath->query("//image");
+ if ($images->length > 0) {
+ $image = $images->item(0);
+ $desc = $image->getElementsByTagName('description');
+ $description = $desc->length ? $desc->item(0)->nodeValue : false;
+ $heigh = $image->getElementsByTagName('height');
+ $height = $heigh->length ? $heigh->item(0)->nodeValue : false;
+ $widt = $image->getElementsByTagName('width');
+ $width = $widt->length ? $widt->item(0)->nodeValue : false;
+ return array(
+ 'title' => $image->getElementsByTagName('title')->item(0)->nodeValue,
+ 'link' => $image->getElementsByTagName('link')->item(0)->nodeValue,
+ 'url' => $image->getElementsByTagName('url')->item(0)->nodeValue,
+ 'description' => $description,
+ 'height' => $height,
+ 'width' => $width);
+ }
+ return false;
+ }
+
+ /**
+ * The textinput element is little used, but in the interests of
+ * completeness...
+ *
+ * @return array|false
+ */
+ function getTextInput()
+ {
+ $inputs = $this->model->getElementsByTagName('input');
+ if ($inputs->length > 0) {
+ $input = $inputs->item(0);
+ return array(
+ 'title' => $input->getElementsByTagName('title')->item(0)->value,
+ 'description' =>
+ $input->getElementsByTagName('description')->item(0)->value,
+ 'name' => $input->getElementsByTagName('name')->item(0)->value,
+ 'link' => $input->getElementsByTagName('link')->item(0)->value);
+ }
+ return false;
+ }
+
+ /**
+ * Utility function for getSkipDays and getSkipHours
+ *
+ * This is a general function used by both getSkipDays and getSkipHours. It simply
+ * returns an array of the values of the children of the appropriate tag.
+ *
+ * @param string $tagName The tag name (getSkipDays or getSkipHours)
+ * @return array|false
+ */
+ protected function getSkips($tagName)
+ {
+ $hours = $this->model->getElementsByTagName($tagName);
+ if ($hours->length == 0) {
+ return false;
+ }
+ $skipHours = array();
+ foreach($hours->item(0)->childNodes as $hour) {
+ if ($hour instanceof DOMElement) {
+ array_push($skipHours, $hour->nodeValue);
+ }
+ }
+ return $skipHours;
+ }
+
+ /**
+ * Retrieve skipHours data
+ *
+ * The skiphours element provides a list of hours on which this feed should
+ * not be checked. We return an array of those hours (integers, 24 hour clock)
+ *
+ * @return array
+ */
+ function getSkipHours()
+ {
+ return $this->getSkips('skipHours');
+ }
+
+ /**
+ * Retrieve skipDays data
+ *
+ * The skipdays element provides a list of days on which this feed should
+ * not be checked. We return an array of those days.
+ *
+ * @return array
+ */
+ function getSkipDays()
+ {
+ return $this->getSkips('skipDays');
+ }
+
+ /**
+ * Return content of the little-used 'cloud' element
+ *
+ * The cloud element is rarely used. It is designed to provide some details
+ * of a location to update the feed.
+ *
+ * @return array an array of the attributes of the element
+ */
+ function getCloud()
+ {
+ $cloud = $this->model->getElementsByTagName('cloud');
+ if ($cloud->length == 0) {
+ return false;
+ }
+ $cloudData = array();
+ foreach ($cloud->item(0)->attributes as $attribute) {
+ $cloudData[$attribute->name] = $attribute->value;
+ }
+ return $cloudData;
+ }
+
+ /**
+ * Get link URL
+ *
+ * In RSS2 a link is a text element but in order to ensure that we resolve
+ * URLs properly we have a special function for them. We maintain the
+ * parameter used by the atom getLink method, though we only use the offset
+ * parameter.
+ *
+ * @param int $offset The position of the link within the feed. Starts from 0
+ * @param string $attribute The attribute of the link element required
+ * @param array $params An array of other parameters. Not used.
+ * @return string
+ */
+ function getLink($offset, $attribute = 'href', $params = array())
+ {
+ $xPath = new DOMXPath($this->model);
+ $links = $xPath->query('//link');
+
+ if ($links->length <= $offset) {
+ return false;
+ }
+ $link = $links->item($offset);
+ return $this->addBase($link->nodeValue, $link);
+ }
+}
+
+?> \ No newline at end of file
diff --git a/plugins/FeedSub/extlib/XML/Feed/Parser/RSS2Element.php b/plugins/FeedSub/extlib/XML/Feed/Parser/RSS2Element.php
new file mode 100755
index 000000000..6edf910dc
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/Parser/RSS2Element.php
@@ -0,0 +1,171 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * Class representing entries in an RSS2 feed.
+ *
+ * PHP versions 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt. If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category XML
+ * @package XML_Feed_Parser
+ * @author James Stewart <james@jystewart.net>
+ * @copyright 2005 James Stewart <james@jystewart.net>
+ * @license http://www.gnu.org/copyleft/lesser.html GNU LGPL 2.1
+ * @version CVS: $Id: RSS2Element.php,v 1.11 2006/07/26 21:18:47 jystewart Exp $
+ * @link http://pear.php.net/package/XML_Feed_Parser/
+ */
+
+/**
+ * This class provides support for RSS 2.0 entries. It will usually be
+ * called by XML_Feed_Parser_RSS2 with which it shares many methods.
+ *
+ * @author James Stewart <james@jystewart.net>
+ * @version Release: 1.0.3
+ * @package XML_Feed_Parser
+ */
+class XML_Feed_Parser_RSS2Element extends XML_Feed_Parser_RSS2
+{
+ /**
+ * This will be a reference to the parent object for when we want
+ * to use a 'fallback' rule
+ * @var XML_Feed_Parser_RSS2
+ */
+ protected $parent;
+
+ /**
+ * Our specific element map
+ * @var array
+ */
+ protected $map = array(
+ 'title' => array('Text'),
+ 'guid' => array('Guid'),
+ 'description' => array('Text'),
+ 'author' => array('Text'),
+ 'comments' => array('Text'),
+ 'enclosure' => array('Enclosure'),
+ 'pubDate' => array('Date'),
+ 'source' => array('Source'),
+ 'link' => array('Text'),
+ 'content' => array('Content'));
+
+ /**
+ * Here we map some elements to their atom equivalents. This is going to be
+ * quite tricky to pull off effectively (and some users' methods may vary)
+ * but is worth trying. The key is the atom version, the value is RSS2.
+ * @var array
+ */
+ protected $compatMap = array(
+ 'id' => array('guid'),
+ 'updated' => array('lastBuildDate'),
+ 'published' => array('pubdate'),
+ 'guidislink' => array('guid', 'ispermalink'),
+ 'summary' => array('description'));
+
+ /**
+ * Store useful information for later.
+ *
+ * @param DOMElement $element - this item as a DOM element
+ * @param XML_Feed_Parser_RSS2 $parent - the feed of which this is a member
+ */
+ function __construct(DOMElement $element, $parent, $xmlBase = '')
+ {
+ $this->model = $element;
+ $this->parent = $parent;
+ }
+
+ /**
+ * Get the value of the guid element, if specified
+ *
+ * guid is the closest RSS2 has to atom's ID. It is usually but not always a
+ * URI. The one attribute that RSS2 can posess is 'ispermalink' which specifies
+ * whether the guid is itself dereferencable. Use of guid is not obligatory,
+ * but is advisable. To get the guid you would call $item->id() (for atom
+ * compatibility) or $item->guid(). To check if this guid is a permalink call
+ * $item->guid("ispermalink").
+ *
+ * @param string $method - the method name being called
+ * @param array $params - parameters required
+ * @return string the guid or value of ispermalink
+ */
+ protected function getGuid($method, $params)
+ {
+ $attribute = (isset($params[0]) and $params[0] == 'ispermalink') ?
+ true : false;
+ $tag = $this->model->getElementsByTagName('guid');
+ if ($tag->length > 0) {
+ if ($attribute) {
+ if ($tag->hasAttribute("ispermalink")) {
+ return $tag->getAttribute("ispermalink");
+ }
+ }
+ return $tag->item(0)->nodeValue;
+ }
+ return false;
+ }
+
+ /**
+ * Access details of file enclosures
+ *
+ * The RSS2 spec is ambiguous as to whether an enclosure element must be
+ * unique in a given entry. For now we will assume it needn't, and allow
+ * for an offset.
+ *
+ * @param string $method - the method being called
+ * @param array $parameters - we expect the first of these to be our offset
+ * @return array|false
+ */
+ protected function getEnclosure($method, $parameters)
+ {
+ $encs = $this->model->getElementsByTagName('enclosure');
+ $offset = isset($parameters[0]) ? $parameters[0] : 0;
+ if ($encs->length > $offset) {
+ try {
+ if (! $encs->item($offset)->hasAttribute('url')) {
+ return false;
+ }
+ $attrs = $encs->item($offset)->attributes;
+ return array(
+ 'url' => $attrs->getNamedItem('url')->value,
+ 'length' => $attrs->getNamedItem('length')->value,
+ 'type' => $attrs->getNamedItem('type')->value);
+ } catch (Exception $e) {
+ return false;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Get the entry source if specified
+ *
+ * source is an optional sub-element of item. Like atom:source it tells
+ * us about where the entry came from (eg. if it's been copied from another
+ * feed). It is not a rich source of metadata in the same way as atom:source
+ * and while it would be good to maintain compatibility by returning an
+ * XML_Feed_Parser_RSS2 element, it makes a lot more sense to return an array.
+ *
+ * @return array|false
+ */
+ protected function getSource()
+ {
+ $get = $this->model->getElementsByTagName('source');
+ if ($get->length) {
+ $source = $get->item(0);
+ $array = array(
+ 'content' => $source->nodeValue);
+ foreach ($source->attributes as $attribute) {
+ $array[$attribute->name] = $attribute->value;
+ }
+ return $array;
+ }
+ return false;
+ }
+}
+
+?> \ No newline at end of file
diff --git a/plugins/FeedSub/extlib/XML/Feed/Parser/Type.php b/plugins/FeedSub/extlib/XML/Feed/Parser/Type.php
new file mode 100644
index 000000000..75052619b
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/Parser/Type.php
@@ -0,0 +1,467 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * Abstract class providing common methods for XML_Feed_Parser feeds.
+ *
+ * PHP versions 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt. If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category XML
+ * @package XML_Feed_Parser
+ * @author James Stewart <james@jystewart.net>
+ * @copyright 2005 James Stewart <james@jystewart.net>
+ * @license http://www.gnu.org/copyleft/lesser.html GNU LGPL 2.1
+ * @version CVS: $Id: Type.php,v 1.25 2008/03/08 18:39:09 jystewart Exp $
+ * @link http://pear.php.net/package/XML_Feed_Parser/
+ */
+
+/**
+ * This abstract class provides some general methods that are likely to be
+ * implemented exactly the same way for all feed types.
+ *
+ * @package XML_Feed_Parser
+ * @author James Stewart <james@jystewart.net>
+ * @version Release: 1.0.3
+ */
+abstract class XML_Feed_Parser_Type
+{
+ /**
+ * Where we store our DOM object for this feed
+ * @var DOMDocument
+ */
+ public $model;
+
+ /**
+ * For iteration we'll want a count of the number of entries
+ * @var int
+ */
+ public $numberEntries;
+
+ /**
+ * Where we store our entry objects once instantiated
+ * @var array
+ */
+ public $entries = array();
+
+ /**
+ * Store mappings between entry IDs and their position in the feed
+ */
+ public $idMappings = array();
+
+ /**
+ * Proxy to allow use of element names as method names
+ *
+ * We are not going to provide methods for every entry type so this
+ * function will allow for a lot of mapping. We rely pretty heavily
+ * on this to handle our mappings between other feed types and atom.
+ *
+ * @param string $call - the method attempted
+ * @param array $arguments - arguments to that method
+ * @return mixed
+ */
+ function __call($call, $arguments = array())
+ {
+ if (! is_array($arguments)) {
+ $arguments = array();
+ }
+
+ if (isset($this->compatMap[$call])) {
+ $tempMap = $this->compatMap;
+ $tempcall = array_pop($tempMap[$call]);
+ if (! empty($tempMap)) {
+ $arguments = array_merge($arguments, $tempMap[$call]);
+ }
+ $call = $tempcall;
+ }
+
+ /* To be helpful, we allow a case-insensitive search for this method */
+ if (! isset($this->map[$call])) {
+ foreach (array_keys($this->map) as $key) {
+ if (strtoupper($key) == strtoupper($call)) {
+ $call = $key;
+ break;
+ }
+ }
+ }
+
+ if (empty($this->map[$call])) {
+ return false;
+ }
+
+ $method = 'get' . $this->map[$call][0];
+ if ($method == 'getLink') {
+ $offset = empty($arguments[0]) ? 0 : $arguments[0];
+ $attribute = empty($arguments[1]) ? 'href' : $arguments[1];
+ $params = isset($arguments[2]) ? $arguments[2] : array();
+ return $this->getLink($offset, $attribute, $params);
+ }
+ if (method_exists($this, $method)) {
+ return $this->$method($call, $arguments);
+ }
+
+ return false;
+ }
+
+ /**
+ * Proxy to allow use of element names as attribute names
+ *
+ * For many elements variable-style access will be desirable. This function
+ * provides for that.
+ *
+ * @param string $value - the variable required
+ * @return mixed
+ */
+ function __get($value)
+ {
+ return $this->__call($value, array());
+ }
+
+ /**
+ * Utility function to help us resolve xml:base values
+ *
+ * We have other methods which will traverse the DOM and work out the different
+ * xml:base declarations we need to be aware of. We then need to combine them.
+ * If a declaration starts with a protocol then we restart the string. If it
+ * starts with a / then we add on to the domain name. Otherwise we simply tag
+ * it on to the end.
+ *
+ * @param string $base - the base to add the link to
+ * @param string $link
+ */
+ function combineBases($base, $link)
+ {
+ if (preg_match('/^[A-Za-z]+:\/\//', $link)) {
+ return $link;
+ } else if (preg_match('/^\//', $link)) {
+ /* Extract domain and suffix link to that */
+ preg_match('/^([A-Za-z]+:\/\/.*)?\/*/', $base, $results);
+ $firstLayer = $results[0];
+ return $firstLayer . "/" . $link;
+ } else if (preg_match('/^\.\.\//', $base)) {
+ /* Step up link to find place to be */
+ preg_match('/^((\.\.\/)+)(.*)$/', $link, $bases);
+ $suffix = $bases[3];
+ $count = preg_match_all('/\.\.\//', $bases[1], $steps);
+ $url = explode("/", $base);
+ for ($i = 0; $i <= $count; $i++) {
+ array_pop($url);
+ }
+ return implode("/", $url) . "/" . $suffix;
+ } else if (preg_match('/^(?!\/$)/', $base)) {
+ $base = preg_replace('/(.*\/).*$/', '$1', $base) ;
+ return $base . $link;
+ } else {
+ /* Just stick it on the end */
+ return $base . $link;
+ }
+ }
+
+ /**
+ * Determine whether we need to apply our xml:base rules
+ *
+ * Gets us the xml:base data and then processes that with regard
+ * to our current link.
+ *
+ * @param string
+ * @param DOMElement
+ * @return string
+ */
+ function addBase($link, $element)
+ {
+ if (preg_match('/^[A-Za-z]+:\/\//', $link)) {
+ return $link;
+ }
+
+ return $this->combineBases($element->baseURI, $link);
+ }
+
+ /**
+ * Get an entry by its position in the feed, starting from zero
+ *
+ * As well as allowing the items to be iterated over we want to allow
+ * users to be able to access a specific entry. This is one of two ways of
+ * doing that, the other being by ID.
+ *
+ * @param int $offset
+ * @return XML_Feed_Parser_RSS1Element
+ */
+ function getEntryByOffset($offset)
+ {
+ if (! isset($this->entries[$offset])) {
+ $entries = $this->model->getElementsByTagName($this->itemElement);
+ if ($entries->length > $offset) {
+ $xmlBase = $entries->item($offset)->baseURI;
+ $this->entries[$offset] = new $this->itemClass(
+ $entries->item($offset), $this, $xmlBase);
+ if ($id = $this->entries[$offset]->id) {
+ $this->idMappings[$id] = $this->entries[$offset];
+ }
+ } else {
+ throw new XML_Feed_Parser_Exception('No entries found');
+ }
+ }
+
+ return $this->entries[$offset];
+ }
+
+ /**
+ * Return a date in seconds since epoch.
+ *
+ * Get a date construct. We use PHP's strtotime to return it as a unix datetime, which
+ * is the number of seconds since 1970-01-01 00:00:00.
+ *
+ * @link http://php.net/strtotime
+ * @param string $method The name of the date construct we want
+ * @param array $arguments Included for compatibility with our __call usage
+ * @return int|false datetime
+ */
+ protected function getDate($method, $arguments)
+ {
+ $time = $this->model->getElementsByTagName($method);
+ if ($time->length == 0 || empty($time->item(0)->nodeValue)) {
+ return false;
+ }
+ return strtotime($time->item(0)->nodeValue);
+ }
+
+ /**
+ * Get a text construct.
+ *
+ * @param string $method The name of the text construct we want
+ * @param array $arguments Included for compatibility with our __call usage
+ * @return string
+ */
+ protected function getText($method, $arguments = array())
+ {
+ $tags = $this->model->getElementsByTagName($method);
+ if ($tags->length > 0) {
+ $value = $tags->item(0)->nodeValue;
+ return $value;
+ }
+ return false;
+ }
+
+ /**
+ * Apply various rules to retrieve category data.
+ *
+ * There is no single way of declaring a category in RSS1/1.1 as there is in RSS2
+ * and Atom. Instead the usual approach is to use the dublin core namespace to
+ * declare categories. For example delicious use both:
+ * <dc:subject>PEAR</dc:subject> and: <taxo:topics><rdf:Bag>
+ * <rdf:li resource="http://del.icio.us/tag/PEAR" /></rdf:Bag></taxo:topics>
+ * to declare a categorisation of 'PEAR'.
+ *
+ * We need to be sensitive to this where possible.
+ *
+ * @param string $call for compatibility with our overloading
+ * @param array $arguments - arg 0 is the offset, arg 1 is whether to return as array
+ * @return string|array|false
+ */
+ protected function getCategory($call, $arguments)
+ {
+ $categories = $this->model->getElementsByTagName('subject');
+ $offset = empty($arguments[0]) ? 0 : $arguments[0];
+ $array = empty($arguments[1]) ? false : true;
+ if ($categories->length <= $offset) {
+ return false;
+ }
+ if ($array) {
+ $list = array();
+ foreach ($categories as $category) {
+ array_push($list, $category->nodeValue);
+ }
+ return $list;
+ }
+ return $categories->item($offset)->nodeValue;
+ }
+
+ /**
+ * Count occurrences of an element
+ *
+ * This function will tell us how many times the element $type
+ * appears at this level of the feed.
+ *
+ * @param string $type the element we want to get a count of
+ * @return int
+ */
+ protected function count($type)
+ {
+ if ($tags = $this->model->getElementsByTagName($type)) {
+ return $tags->length;
+ }
+ return 0;
+ }
+
+ /**
+ * Part of our xml:base processing code
+ *
+ * We need a couple of methods to access XHTML content stored in feeds.
+ * This is because we dereference all xml:base references before returning
+ * the element. This method handles the attributes.
+ *
+ * @param DOMElement $node The DOM node we are iterating over
+ * @return string
+ */
+ function processXHTMLAttributes($node) {
+ $return = '';
+ foreach ($node->attributes as $attribute) {
+ if ($attribute->name == 'src' or $attribute->name == 'href') {
+ $attribute->value = $this->addBase(htmlentities($attribute->value, NULL, 'utf-8'), $attribute);
+ }
+ if ($attribute->name == 'base') {
+ continue;
+ }
+ $return .= $attribute->name . '="' . htmlentities($attribute->value, NULL, 'utf-8') .'" ';
+ }
+ if (! empty($return)) {
+ return ' ' . trim($return);
+ }
+ return '';
+ }
+
+ /**
+ * Convert HTML entities based on the current character set.
+ *
+ * @param String
+ * @return String
+ */
+ function processEntitiesForNodeValue($node)
+ {
+ if (function_exists('iconv')) {
+ $current_encoding = $node->ownerDocument->encoding;
+ $value = iconv($current_encoding, 'UTF-8', $node->nodeValue);
+ } else if ($current_encoding == 'iso-8859-1') {
+ $value = utf8_encode($node->nodeValue);
+ } else {
+ $value = $node->nodeValue;
+ }
+
+ $decoded = html_entity_decode($value, NULL, 'UTF-8');
+ return htmlentities($decoded, NULL, 'UTF-8');
+ }
+
+ /**
+ * Part of our xml:base processing code
+ *
+ * We need a couple of methods to access XHTML content stored in feeds.
+ * This is because we dereference all xml:base references before returning
+ * the element. This method recurs through the tree descending from the node
+ * and builds our string.
+ *
+ * @param DOMElement $node The DOM node we are processing
+ * @return string
+ */
+ function traverseNode($node)
+ {
+ $content = '';
+
+ /* Add the opening of this node to the content */
+ if ($node instanceof DOMElement) {
+ $content .= '<' . $node->tagName .
+ $this->processXHTMLAttributes($node) . '>';
+ }
+
+ /* Process children */
+ if ($node->hasChildNodes()) {
+ foreach ($node->childNodes as $child) {
+ $content .= $this->traverseNode($child);
+ }
+ }
+
+ if ($node instanceof DOMText) {
+ $content .= $this->processEntitiesForNodeValue($node);
+ }
+
+ /* Add the closing of this node to the content */
+ if ($node instanceof DOMElement) {
+ $content .= '</' . $node->tagName . '>';
+ }
+
+ return $content;
+ }
+
+ /**
+ * Get content from RSS feeds (atom has its own implementation)
+ *
+ * The official way to include full content in an RSS1 entry is to use
+ * the content module's element 'encoded', and RSS2 feeds often duplicate that.
+ * Often, however, the 'description' element is used instead. We will offer that
+ * as a fallback. Atom uses its own approach and overrides this method.
+ *
+ * @return string|false
+ */
+ protected function getContent()
+ {
+ $options = array('encoded', 'description');
+ foreach ($options as $element) {
+ $test = $this->model->getElementsByTagName($element);
+ if ($test->length == 0) {
+ continue;
+ }
+ if ($test->item(0)->hasChildNodes()) {
+ $value = '';
+ foreach ($test->item(0)->childNodes as $child) {
+ if ($child instanceof DOMText) {
+ $value .= $child->nodeValue;
+ } else {
+ $simple = simplexml_import_dom($child);
+ $value .= $simple->asXML();
+ }
+ }
+ return $value;
+ } else if ($test->length > 0) {
+ return $test->item(0)->nodeValue;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Checks if this element has a particular child element.
+ *
+ * @param String
+ * @param Integer
+ * @return bool
+ **/
+ function hasKey($name, $offset = 0)
+ {
+ $search = $this->model->getElementsByTagName($name);
+ return $search->length > $offset;
+ }
+
+ /**
+ * Return an XML serialization of the feed, should it be required. Most
+ * users however, will already have a serialization that they used when
+ * instantiating the object.
+ *
+ * @return string XML serialization of element
+ */
+ function __toString()
+ {
+ $simple = simplexml_import_dom($this->model);
+ return $simple->asXML();
+ }
+
+ /**
+ * Get directory holding RNG schemas. Method is based on that
+ * found in Contact_AddressBook.
+ *
+ * @return string PEAR data directory.
+ * @access public
+ * @static
+ */
+ static function getSchemaDir()
+ {
+ require_once 'PEAR/Config.php';
+ $config = new PEAR_Config;
+ return $config->get('data_dir') . '/XML_Feed_Parser/schemas';
+ }
+}
+
+?> \ No newline at end of file
diff --git a/plugins/FeedSub/extlib/XML/Feed/samples/atom10-entryonly.xml b/plugins/FeedSub/extlib/XML/Feed/samples/atom10-entryonly.xml
new file mode 100755
index 000000000..02e1c5800
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/samples/atom10-entryonly.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<entry xmlns="http://www.w3.org/2005/Atom">
+ <title>Atom draft-07 snapshot</title>
+ <link rel="alternate" type="text/html"
+ href="http://example.org/2005/04/02/atom"/>
+ <link rel='enclosure' type="audio/mpeg" length="1337"
+ href="http://example.org/audio/ph34r_my_podcast.mp3"/>
+ <id>tag:example.org,2003:3.2397</id>
+ <updated>2005-07-10T12:29:29Z</updated>
+ <published>2003-12-13T08:29:29-04:00</published>
+ <author>
+ <name>Mark Pilgrim</name>
+ <uri>http://example.org/</uri>
+ <email>f8dy@example.com</email>
+ </author>
+ <contributor>
+ <name>Sam Ruby</name>
+ </contributor>
+ <contributor>
+ <name>Joe Gregorio</name>
+ </contributor>
+ <content type="xhtml" xml:lang="en"
+ xml:base="http://diveintomark.org/">
+ <div xmlns="http://www.w3.org/1999/xhtml">
+ <p><i>[Update: The Atom draft is finished.]</i></p>
+ </div>
+ </content>
+ </entry> \ No newline at end of file
diff --git a/plugins/FeedSub/extlib/XML/Feed/samples/atom10-example1.xml b/plugins/FeedSub/extlib/XML/Feed/samples/atom10-example1.xml
new file mode 100755
index 000000000..d181d2b6f
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/samples/atom10-example1.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+
+ <title>Example Feed</title>
+ <link href="http://example.org/"/>
+ <updated>2003-12-13T18:30:02Z</updated>
+ <author>
+ <name>John Doe</name>
+ </author>
+ <id>urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6</id>
+
+ <entry>
+ <title>Atom-Powered Robots Run Amok</title>
+ <link href="http://example.org/2003/12/13/atom03"/>
+ <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id>
+ <updated>2003-12-13T18:30:02Z</updated>
+ <summary>Some text.</summary>
+ </entry>
+
+</feed> \ No newline at end of file
diff --git a/plugins/FeedSub/extlib/XML/Feed/samples/atom10-example2.xml b/plugins/FeedSub/extlib/XML/Feed/samples/atom10-example2.xml
new file mode 100755
index 000000000..98abf9d54
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/samples/atom10-example2.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <feed xmlns="http://www.w3.org/2005/Atom">
+ <title type="text">dive into mark</title>
+ <subtitle type="html">
+ A &lt;em&gt;lot&lt;/em&gt; of effort
+ went into making this effortless
+ </subtitle>
+ <updated>2005-07-31T12:29:29Z</updated>
+ <id>tag:example.org,2003:3</id>
+ <link rel="alternate" type="text/html"
+ hreflang="en" href="http://example.org/"/>
+ <link rel="self" type="application/atom+xml"
+ href="http://example.org/feed.atom"/>
+ <rights>Copyright (c) 2003, Mark Pilgrim</rights>
+ <generator uri="http://www.example.com/" version="1.0">
+ Example Toolkit
+ </generator>
+ <entry>
+ <title>Atom draft-07 snapshot</title>
+ <link rel="alternate" type="text/html"
+ href="http://example.org/2005/04/02/atom"/>
+ <link rel='enclosure' type="audio/mpeg" length="1337"
+ href="http://example.org/audio/ph34r_my_podcast.mp3"/>
+ <id>tag:example.org,2003:3.2397</id>
+ <updated>2005-07-31T12:29:29Z</updated>
+ <published>2003-12-13T08:29:29-04:00</published>
+ <author>
+ <name>Mark Pilgrim</name>
+ <uri>http://example.org/</uri>
+ <email>f8dy@example.com</email>
+ </author>
+ <contributor>
+ <name>Sam Ruby</name>
+ </contributor>
+ <contributor>
+ <name>Joe Gregorio</name>
+ </contributor>
+ <content type="xhtml" xml:lang="en"
+ xml:base="http://diveintomark.org/">
+ <div xmlns="http://www.w3.org/1999/xhtml">
+ <p><i>[Update: The Atom draft is finished.]</i></p>
+ </div>
+ </content>
+ </entry>
+ </feed> \ No newline at end of file
diff --git a/plugins/FeedSub/extlib/XML/Feed/samples/delicious.feed b/plugins/FeedSub/extlib/XML/Feed/samples/delicious.feed
new file mode 100755
index 000000000..32f9fa493
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/samples/delicious.feed
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<rdf:RDF
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns="http://purl.org/rss/1.0/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:taxo="http://purl.org/rss/1.0/modules/taxonomy/"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:syn="http://purl.org/rss/1.0/modules/syndication/"
+ xmlns:admin="http://webns.net/mvcb/"
+>
+<channel rdf:about="http://del.icio.us/tag/greenbelt">
+<title>del.icio.us/tag/greenbelt</title>
+<link>http://del.icio.us/tag/greenbelt</link>
+<description>Text</description>
+<items>
+ <rdf:Seq>
+ <rdf:li rdf:resource="http://www.greenbelt.org.uk/" />
+ <rdf:li rdf:resource="http://www.greenbelt.org.uk/" />
+ <rdf:li rdf:resource="http://www.natuerlichwien.at/rundumadum/dergruenguertel/" />
+ <rdf:li rdf:resource="http://www.flickerweb.co.uk/wiki/index.php/Tank#Seminars" />
+ <rdf:li rdf:resource="http://www.greenbelt.ca/home.htm" />
+ <rdf:li rdf:resource="http://pipwilsonbhp.blogspot.com/" />
+ <rdf:li rdf:resource="http://maggidawn.typepad.com/maggidawn/" />
+ <rdf:li rdf:resource="http://www.johndavies.org/" />
+ <rdf:li rdf:resource="http://jonnybaker.blogs.com/" />
+ </rdf:Seq>
+</items>
+</channel>
+
+<item rdf:about="http://www.greenbelt.org.uk/">
+<dc:title>Greenbelt - Homepage Section</dc:title>
+<link>http://www.greenbelt.org.uk/</link>
+<dc:creator>jonnybaker</dc:creator>
+<dc:date>2005-05-16T16:30:38Z</dc:date>
+<dc:subject>greenbelt</dc:subject>
+<taxo:topics>
+ <rdf:Bag>
+ <rdf:li resource="http://del.icio.us/tag/greenbelt" />
+ </rdf:Bag>
+</taxo:topics>
+</item>
+
+<item rdf:about="http://www.greenbelt.org.uk/">
+<title>Greenbelt festival (uk)</title>
+<link>http://www.greenbelt.org.uk/</link>
+<dc:creator>sssshhhh</dc:creator>
+<dc:date>2005-05-14T18:19:40Z</dc:date>
+<dc:subject>audiology festival gigs greenbelt</dc:subject>
+<taxo:topics>
+ <rdf:Bag>
+ <rdf:li resource="http://del.icio.us/tag/gigs" />
+ <rdf:li resource="http://del.icio.us/tag/audiology" />
+ <rdf:li resource="http://del.icio.us/tag/festival" />
+ <rdf:li resource="http://del.icio.us/tag/greenbelt" />
+ </rdf:Bag>
+</taxo:topics>
+</item>
+
+<item rdf:about="http://www.natuerlichwien.at/rundumadum/dergruenguertel/">
+<title>Natuerlichwien.at - Rundumadum</title>
+<link>http://www.natuerlichwien.at/rundumadum/dergruenguertel/</link>
+<dc:creator>egmilman47</dc:creator>
+<dc:date>2005-05-06T21:33:41Z</dc:date>
+<dc:subject>Austria Vienna Wien greenbelt nature walking</dc:subject>
+<taxo:topics>
+ <rdf:Bag>
+ <rdf:li resource="http://del.icio.us/tag/Vienna" />
+ <rdf:li resource="http://del.icio.us/tag/Wien" />
+ <rdf:li resource="http://del.icio.us/tag/Austria" />
+ <rdf:li resource="http://del.icio.us/tag/walking" />
+ <rdf:li resource="http://del.icio.us/tag/nature" />
+ <rdf:li resource="http://del.icio.us/tag/greenbelt" />
+ </rdf:Bag>
+</taxo:topics>
+</item>
+
+<item rdf:about="http://www.flickerweb.co.uk/wiki/index.php/Tank#Seminars">
+<title>Tank - GBMediaWiki</title>
+<link>http://www.flickerweb.co.uk/wiki/index.php/Tank#Seminars</link>
+<dc:creator>jystewart</dc:creator>
+<dc:date>2005-03-21T22:44:11Z</dc:date>
+<dc:subject>greenbelt</dc:subject>
+<taxo:topics>
+ <rdf:Bag>
+ <rdf:li resource="http://del.icio.us/tag/greenbelt" />
+ </rdf:Bag>
+</taxo:topics>
+</item>
+
+<item rdf:about="http://www.greenbelt.ca/home.htm">
+<title>Greenbelt homepage</title>
+<link>http://www.greenbelt.ca/home.htm</link>
+<dc:creator>Gooberoo</dc:creator>
+<dc:date>2005-03-01T22:43:17Z</dc:date>
+<dc:subject>greenbelt ontario</dc:subject>
+<taxo:topics>
+ <rdf:Bag>
+ <rdf:li resource="http://del.icio.us/tag/ontario" />
+ <rdf:li resource="http://del.icio.us/tag/greenbelt" />
+ </rdf:Bag>
+</taxo:topics>
+</item>
+
+<item rdf:about="http://pipwilsonbhp.blogspot.com/">
+<title>Pip Wilson bhp ...... blog</title>
+<link>http://pipwilsonbhp.blogspot.com/</link>
+<dc:creator>sssshhhh</dc:creator>
+<dc:date>2004-12-27T11:20:51Z</dc:date>
+<dc:subject>Greenbelt friend ideas links thinking weblog</dc:subject>
+<taxo:topics>
+ <rdf:Bag>
+ <rdf:li resource="http://del.icio.us/tag/Greenbelt" />
+ <rdf:li resource="http://del.icio.us/tag/thinking" />
+ <rdf:li resource="http://del.icio.us/tag/ideas" />
+ <rdf:li resource="http://del.icio.us/tag/links" />
+ <rdf:li resource="http://del.icio.us/tag/friend" />
+ <rdf:li resource="http://del.icio.us/tag/weblog" />
+ </rdf:Bag>
+</taxo:topics>
+</item>
+
+<item rdf:about="http://maggidawn.typepad.com/maggidawn/">
+<title>maggi dawn</title>
+<link>http://maggidawn.typepad.com/maggidawn/</link>
+<dc:creator>sssshhhh</dc:creator>
+<dc:date>2004-12-27T11:20:11Z</dc:date>
+<dc:subject>Greenbelt ideas links thinking weblog</dc:subject>
+<taxo:topics>
+ <rdf:Bag>
+ <rdf:li resource="http://del.icio.us/tag/Greenbelt" />
+ <rdf:li resource="http://del.icio.us/tag/thinking" />
+ <rdf:li resource="http://del.icio.us/tag/ideas" />
+ <rdf:li resource="http://del.icio.us/tag/links" />
+ <rdf:li resource="http://del.icio.us/tag/weblog" />
+ </rdf:Bag>
+</taxo:topics>
+</item>
+
+<item rdf:about="http://www.johndavies.org/">
+<title>John Davies</title>
+<link>http://www.johndavies.org/</link>
+<dc:creator>sssshhhh</dc:creator>
+<dc:date>2004-12-27T11:18:37Z</dc:date>
+<dc:subject>Greenbelt ideas links thinking weblog</dc:subject>
+<taxo:topics>
+ <rdf:Bag>
+ <rdf:li resource="http://del.icio.us/tag/Greenbelt" />
+ <rdf:li resource="http://del.icio.us/tag/thinking" />
+ <rdf:li resource="http://del.icio.us/tag/ideas" />
+ <rdf:li resource="http://del.icio.us/tag/links" />
+ <rdf:li resource="http://del.icio.us/tag/weblog" />
+ </rdf:Bag>
+</taxo:topics>
+</item>
+
+<item rdf:about="http://jonnybaker.blogs.com/">
+<title>jonnybaker</title>
+<link>http://jonnybaker.blogs.com/</link>
+<dc:creator>sssshhhh</dc:creator>
+<dc:date>2004-12-27T11:18:17Z</dc:date>
+<dc:subject>Greenbelt event ideas links resources thinking weblog youth</dc:subject>
+<taxo:topics>
+ <rdf:Bag>
+ <rdf:li resource="http://del.icio.us/tag/Greenbelt" />
+ <rdf:li resource="http://del.icio.us/tag/thinking" />
+ <rdf:li resource="http://del.icio.us/tag/ideas" />
+ <rdf:li resource="http://del.icio.us/tag/links" />
+ <rdf:li resource="http://del.icio.us/tag/weblog" />
+ <rdf:li resource="http://del.icio.us/tag/youth" />
+ <rdf:li resource="http://del.icio.us/tag/event" />
+ <rdf:li resource="http://del.icio.us/tag/resources" />
+ </rdf:Bag>
+</taxo:topics>
+</item>
+
+</rdf:RDF>
diff --git a/plugins/FeedSub/extlib/XML/Feed/samples/flickr.feed b/plugins/FeedSub/extlib/XML/Feed/samples/flickr.feed
new file mode 100755
index 000000000..57e83af57
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/samples/flickr.feed
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<feed version="0.3" xmlns="http://purl.org/atom/ns#"
+ xmlns:dc="http://purl.org/dc/elements/1.1/">
+
+ <title>jamesstewart - Everyone's Tagged Photos</title>
+ <link rel="alternate" type="text/html" href="http://www.flickr.com/photos/tags/jamesstewart/"/>
+ <link rel="icon" type="image/jpeg" href="http://www.flickr.com/images/buddyicon.jpg"/>
+ <info type="text/html" mode="escaped">A feed of jamesstewart - Everyone's Tagged Photos</info>
+ <modified>2005-08-01T18:50:26Z</modified>
+ <generator url="http://www.flickr.com/">Flickr</generator>
+
+ <entry>
+ <title>Oma and James</title>
+ <link rel="alternate" type="text/html" href="http://www.flickr.com/photos/30484029@N00/30367516/"/>
+ <link rel='enclosure' type="application/xml" href="http://james.anthropiccollective.org" />
+ <id>tag:flickr.com,2004:/photo/30367516</id>
+ <issued>2005-08-01T18:50:26Z</issued>
+ <modified>2005-08-01T18:50:26Z</modified>
+ <content type="text/html" mode="escaped">&lt;p&gt;&lt;a href=&quot;http://www.flickr.com/people/30484029@N00/&quot;&gt;kstewart&lt;/a&gt; posted a photo:&lt;/p&gt;
+
+&lt;p&gt;&lt;a href=&quot;http://www.flickr.com/photos/30484029@N00/30367516/&quot; title=&quot;Oma and James&quot;&gt;&lt;img src=&quot;http://photos23.flickr.com/30367516_1f685a16e8_m.jpg&quot; width=&quot;240&quot; height=&quot;180&quot; alt=&quot;Oma and James&quot; style=&quot;border: 1px solid #000000;&quot; /&gt;&lt;/a&gt;&lt;/p&gt;
+
+&lt;p&gt;I have a beautiful Oma and a gorgeous husband.&lt;/p&gt;</content>
+ <author>
+ <name>kstewart</name>
+ <url>http://www.flickr.com/people/30484029@N00/</url>
+ </author>
+ <dc:subject>jamesstewart oma stoelfamily</dc:subject>
+ </entry>
+ <entry>
+ <title></title>
+ <link rel="alternate" type="text/html" href="http://www.flickr.com/photos/buddscreek/21376174/"/>
+ <id>tag:flickr.com,2004:/photo/21376174</id>
+ <issued>2005-06-25T02:00:35Z</issued>
+ <modified>2005-06-25T02:00:35Z</modified>
+ <content type="text/html" mode="escaped">&lt;p&gt;&lt;a href=&quot;http://www.flickr.com/people/buddscreek/&quot;&gt;Lan Rover&lt;/a&gt; posted a photo:&lt;/p&gt;
+
+&lt;p&gt;&lt;a href=&quot;http://www.flickr.com/photos/buddscreek/21376174/&quot; title=&quot;&quot;&gt;&lt;img src=&quot;http://photos17.flickr.com/21376174_4314fd8d5c_m.jpg&quot; width=&quot;240&quot; height=&quot;160&quot; alt=&quot;&quot; style=&quot;border: 1px solid #000000;&quot; /&gt;&lt;/a&gt;&lt;/p&gt;
+
+&lt;p&gt;AMA Motocross Championship 2005, Budds Creek, Maryland&lt;/p&gt;</content>
+ <author>
+ <name>Lan Rover</name>
+ <url>http://www.flickr.com/people/buddscreek/</url>
+ </author>
+ <dc:subject>amamotocrosschampionship buddscreek maryland 2005 fathersday motocrossnational rickycarmichael 259 jamesstewart 4</dc:subject>
+ </entry>
+ <entry>
+ <title></title>
+ <link rel="alternate" type="text/html" href="http://www.flickr.com/photos/buddscreek/21375650/"/>
+ <id>tag:flickr.com,2004:/photo/21375650</id>
+ <issued>2005-06-25T01:56:24Z</issued>
+ <modified>2005-06-25T01:56:24Z</modified>
+ <content type="text/html" mode="escaped">&lt;p&gt;&lt;a href=&quot;http://www.flickr.com/people/buddscreek/&quot;&gt;Lan Rover&lt;/a&gt; posted a photo:&lt;/p&gt;
+
+&lt;p&gt;&lt;a href=&quot;http://www.flickr.com/photos/buddscreek/21375650/&quot; title=&quot;&quot;&gt;&lt;img src=&quot;http://photos16.flickr.com/21375650_5c60e0dab1_m.jpg&quot; width=&quot;240&quot; height=&quot;160&quot; alt=&quot;&quot; style=&quot;border: 1px solid #000000;&quot; /&gt;&lt;/a&gt;&lt;/p&gt;
+
+</content>
+ <author>
+ <name>Lan Rover</name>
+ <url>http://www.flickr.com/people/buddscreek/</url>
+ </author>
+ <dc:subject>amamotocrosschampionship buddscreek maryland 2005 fathersday motocrossnational 259 jamesstewart</dc:subject>
+ </entry>
+ <entry>
+ <title></title>
+ <link rel="alternate" type="text/html" href="http://www.flickr.com/photos/buddscreek/21375345/"/>
+ <id>tag:flickr.com,2004:/photo/21375345</id>
+ <issued>2005-06-25T01:54:11Z</issued>
+ <modified>2005-06-25T01:54:11Z</modified>
+ <content type="text/html" mode="escaped">&lt;p&gt;&lt;a href=&quot;http://www.flickr.com/people/buddscreek/&quot;&gt;Lan Rover&lt;/a&gt; posted a photo:&lt;/p&gt;
+
+&lt;p&gt;&lt;a href=&quot;http://www.flickr.com/photos/buddscreek/21375345/&quot; title=&quot;&quot;&gt;&lt;img src=&quot;http://photos15.flickr.com/21375345_4205fdd22b_m.jpg&quot; width=&quot;160&quot; height=&quot;240&quot; alt=&quot;&quot; style=&quot;border: 1px solid #000000;&quot; /&gt;&lt;/a&gt;&lt;/p&gt;
+
+</content>
+ <author>
+ <name>Lan Rover</name>
+ <url>http://www.flickr.com/people/buddscreek/</url>
+ </author>
+ <dc:subject>amamotocrosschampionship buddscreek maryland 2005 fathersday motocrossnational 259 jamesstewart</dc:subject>
+ </entry>
+ <entry>
+ <title>Lunch with Kari &amp; James, café in the crypt of St Martin in the fields</title>
+ <link rel="alternate" type="text/html" href="http://www.flickr.com/photos/fidothe/16516618/"/>
+ <id>tag:flickr.com,2004:/photo/16516618</id>
+ <issued>2005-05-30T21:56:39Z</issued>
+ <modified>2005-05-30T21:56:39Z</modified>
+ <content type="text/html" mode="escaped">&lt;p&gt;&lt;a href=&quot;http://www.flickr.com/people/fidothe/&quot;&gt;fidothe&lt;/a&gt; posted a photo:&lt;/p&gt;
+
+&lt;p&gt;&lt;a href=&quot;http://www.flickr.com/photos/fidothe/16516618/&quot; title=&quot;Lunch with Kari &amp;amp; James, café in the crypt of St Martin in the fields&quot;&gt;&lt;img src=&quot;http://photos14.flickr.com/16516618_afaa4a395e_m.jpg&quot; width=&quot;240&quot; height=&quot;180&quot; alt=&quot;Lunch with Kari &amp;amp; James, café in the crypt of St Martin in the fields&quot; style=&quot;border: 1px solid #000000;&quot; /&gt;&lt;/a&gt;&lt;/p&gt;
+
+</content>
+ <author>
+ <name>fidothe</name>
+ <url>http://www.flickr.com/people/fidothe/</url>
+ </author>
+ <dc:subject>nokia7610 london stmartininthefields clarepatterson jamesstewart parvinstewart jimstewart susanstewart</dc:subject>
+ </entry>
+ <entry>
+ <title>Stewart keeping it low over the obstacle.</title>
+ <link rel="alternate" type="text/html" href="http://www.flickr.com/photos/pqbon/10224728/"/>
+ <id>tag:flickr.com,2004:/photo/10224728</id>
+ <issued>2005-04-21T07:30:29Z</issued>
+ <modified>2005-04-21T07:30:29Z</modified>
+ <content type="text/html" mode="escaped">&lt;p&gt;&lt;a href=&quot;http://www.flickr.com/people/pqbon/&quot;&gt;pqbon&lt;/a&gt; posted a photo:&lt;/p&gt;
+
+&lt;p&gt;&lt;a href=&quot;http://www.flickr.com/photos/pqbon/10224728/&quot; title=&quot;Stewart keeping it low over the obstacle.&quot;&gt;&lt;img src=&quot;http://photos7.flickr.com/10224728_b756341957_m.jpg&quot; width=&quot;240&quot; height=&quot;180&quot; alt=&quot;Stewart keeping it low over the obstacle.&quot; style=&quot;border: 1px solid #000000;&quot; /&gt;&lt;/a&gt;&lt;/p&gt;
+
+</content>
+ <author>
+ <name>pqbon</name>
+ <url>http://www.flickr.com/people/pqbon/</url>
+ </author>
+ <dc:subject>ama hangtown motocross jamesstewart bubba</dc:subject>
+ </entry>
+ <entry>
+ <title>king james stewart</title>
+ <link rel="alternate" type="text/html" href="http://www.flickr.com/photos/jjlook/7152910/"/>
+ <id>tag:flickr.com,2004:/photo/7152910</id>
+ <issued>2005-03-22T21:53:37Z</issued>
+ <modified>2005-03-22T21:53:37Z</modified>
+ <content type="text/html" mode="escaped">&lt;p&gt;&lt;a href=&quot;http://www.flickr.com/people/jjlook/&quot;&gt;jj look&lt;/a&gt; posted a photo:&lt;/p&gt;
+
+&lt;p&gt;&lt;a href=&quot;http://www.flickr.com/photos/jjlook/7152910/&quot; title=&quot;king james stewart&quot;&gt;&lt;img src=&quot;http://photos7.flickr.com/7152910_a02ab5a750_m.jpg&quot; width=&quot;180&quot; height=&quot;240&quot; alt=&quot;king james stewart&quot; style=&quot;border: 1px solid #000000;&quot; /&gt;&lt;/a&gt;&lt;/p&gt;
+
+&lt;p&gt;11th&lt;/p&gt;</content>
+ <author>
+ <name>jj look</name>
+ <url>http://www.flickr.com/people/jjlook/</url>
+ </author>
+ <dc:subject>dilomar05 eastside austin texas 78702 kingjames stewart jamesstewart borrowed</dc:subject>
+ </entry>
+ <entry>
+ <title>It's a Grind, downtown Grand Rapids (James, Susan, Jim, Harv, Lawson)</title>
+ <link rel="alternate" type="text/html" href="http://www.flickr.com/photos/fidothe/1586562/"/>
+ <id>tag:flickr.com,2004:/photo/1586562</id>
+ <issued>2004-11-20T09:34:28Z</issued>
+ <modified>2004-11-20T09:34:28Z</modified>
+ <content type="text/html" mode="escaped">&lt;p&gt;&lt;a href=&quot;http://www.flickr.com/people/fidothe/&quot;&gt;fidothe&lt;/a&gt; posted a photo:&lt;/p&gt;
+
+&lt;p&gt;&lt;a href=&quot;http://www.flickr.com/photos/fidothe/1586562/&quot; title=&quot;It's a Grind, downtown Grand Rapids (James, Susan, Jim, Harv, Lawson)&quot;&gt;&lt;img src=&quot;http://photos2.flickr.com/1586562_0bc5313a3e_m.jpg&quot; width=&quot;240&quot; height=&quot;180&quot; alt=&quot;It's a Grind, downtown Grand Rapids (James, Susan, Jim, Harv, Lawson)&quot; style=&quot;border: 1px solid #000000;&quot; /&gt;&lt;/a&gt;&lt;/p&gt;
+
+</content>
+ <author>
+ <name>fidothe</name>
+ <url>http://www.flickr.com/people/fidothe/</url>
+ </author>
+ <dc:subject>holiday grandrapids jamesstewart</dc:subject>
+ </entry>
+ <entry>
+ <title>It's a Grind, downtown Grand Rapids (James, Susan, Jim, Harv, Lawson)</title>
+ <link rel="alternate" type="text/html" href="http://www.flickr.com/photos/fidothe/1586539/"/>
+ <id>tag:flickr.com,2004:/photo/1586539</id>
+ <issued>2004-11-20T09:28:16Z</issued>
+ <modified>2004-11-20T09:28:16Z</modified>
+ <content type="text/html" mode="escaped">&lt;p&gt;&lt;a href=&quot;http://www.flickr.com/people/fidothe/&quot;&gt;fidothe&lt;/a&gt; posted a photo:&lt;/p&gt;
+
+&lt;p&gt;&lt;a href=&quot;http://www.flickr.com/photos/fidothe/1586539/&quot; title=&quot;It's a Grind, downtown Grand Rapids (James, Susan, Jim, Harv, Lawson)&quot;&gt;&lt;img src=&quot;http://photos2.flickr.com/1586539_c51e5f2e7a_m.jpg&quot; width=&quot;240&quot; height=&quot;180&quot; alt=&quot;It's a Grind, downtown Grand Rapids (James, Susan, Jim, Harv, Lawson)&quot; style=&quot;border: 1px solid #000000;&quot; /&gt;&lt;/a&gt;&lt;/p&gt;
+
+</content>
+ <author>
+ <name>fidothe</name>
+ <url>http://www.flickr.com/people/fidothe/</url>
+ </author>
+ <dc:subject>holiday grandrapids jamesstewart</dc:subject>
+ </entry>
+ <entry>
+ <title>It's a Grind, James and Jim can't decide)</title>
+ <link rel="alternate" type="text/html" href="http://www.flickr.com/photos/fidothe/1586514/"/>
+ <id>tag:flickr.com,2004:/photo/1586514</id>
+ <issued>2004-11-20T09:25:05Z</issued>
+ <modified>2004-11-20T09:25:05Z</modified>
+ <content type="text/html" mode="escaped">&lt;p&gt;&lt;a href=&quot;http://www.flickr.com/people/fidothe/&quot;&gt;fidothe&lt;/a&gt; posted a photo:&lt;/p&gt;
+
+&lt;p&gt;&lt;a href=&quot;http://www.flickr.com/photos/fidothe/1586514/&quot; title=&quot;It's a Grind, James and Jim can't decide)&quot;&gt;&lt;img src=&quot;http://photos2.flickr.com/1586514_733c2dfa3e_m.jpg&quot; width=&quot;240&quot; height=&quot;180&quot; alt=&quot;It's a Grind, James and Jim can't decide)&quot; style=&quot;border: 1px solid #000000;&quot; /&gt;&lt;/a&gt;&lt;/p&gt;
+
+</content>
+ <author>
+ <name>fidothe</name>
+ <url>http://www.flickr.com/people/fidothe/</url>
+ </author>
+ <dc:subject>holiday grandrapids jamesstewart johnkentish</dc:subject>
+ </entry>
+
+</feed> \ No newline at end of file
diff --git a/plugins/FeedSub/extlib/XML/Feed/samples/grwifi-atom.xml b/plugins/FeedSub/extlib/XML/Feed/samples/grwifi-atom.xml
new file mode 100755
index 000000000..c351d3c16
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/samples/grwifi-atom.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="iso-8859-1"?> <feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/" xml:lang="en"> <title>Updates to Grand Rapids WiFi hotspot details</title> <link rel="alternate" type="text/html" href="http://grwifi.net/"/> <link rel="self" type="application/atom+xml" href="http://grwifi.net/atom/locations"/> <updated>2005-09-01T15:43:01-05:00</updated> <subtitle>WiFi Hotspots in Grand Rapids, MI</subtitle> <id>http://grwifi.net/atom/locations</id> <rights>Creative Commons Attribution-NonCommercial-ShareAlike 2.0 http://creativecommons.org/licenses/by-nc-sa/2.0/ </rights> <entry> <title>Hotspot Details Updated: Sweetwaters</title> <link rel="alternate" type="text/html" href="http://grwifi.net/location/sweetwaters"/> <id>http://grwifi.net/location/sweetwaters</id> <updated>2005-09-01T15:43:01-05:00</updated> <summary type="html"> The details of the WiFi hotspot at: Sweetwaters have been updated. Find out more at:
+http://grwifi.net/location/sweetwaters </summary> <author> <name>James</name> <uri>http://jystewart.net</uri> <email>james@jystewart.net</email> </author> <dc:subject>wifi hotspot</dc:subject> </entry> <entry> <title>Hotspot Details Updated: Common Ground Coffee Shop</title> <link rel="alternate" type="text/html" href="http://grwifi.net/location/common-ground"/> <id>http://grwifi.net/location/common-ground</id> <updated>2005-09-01T15:42:39-05:00</updated> <summary type="html"> The details of the WiFi hotspot at: Common Ground Coffee Shop have been updated. Find out more at:
+http://grwifi.net/location/common-ground </summary> <author> <name>James</name> <uri>http://jystewart.net</uri> <email>james@jystewart.net</email> </author> <dc:subject>wifi hotspot</dc:subject> </entry> <entry> <title>Hotspot Details Updated: Grand Rapids Public Library, Main Branch</title> <link rel="alternate" type="text/html" href="http://grwifi.net/location/grpl-main-branch"/> <id>http://grwifi.net/location/grpl-main-branch</id> <updated>2005-09-01T15:42:20-05:00</updated> <summary type="html"> The details of the WiFi hotspot at: Grand Rapids Public Library, Main Branch have been updated. Find out more at:
+http://grwifi.net/location/grpl-main-branch </summary> <author> <name>James</name> <uri>http://jystewart.net</uri> <email>james@jystewart.net</email> </author> <dc:subject>wifi hotspot</dc:subject> </entry> <entry> <title>Hotspot Details Updated: Four Friends Coffee House</title> <link rel="alternate" type="text/html" href="http://grwifi.net/location/four-friends"/> <id>http://grwifi.net/location/four-friends</id> <updated>2005-09-01T15:41:35-05:00</updated> <summary type="html"> The details of the WiFi hotspot at: Four Friends Coffee House have been updated. Find out more at:
+http://grwifi.net/location/four-friends </summary> <author> <name>James</name> <uri>http://jystewart.net</uri> <email>james@jystewart.net</email> </author> <dc:subject>wifi hotspot</dc:subject> </entry> <entry> <title>Hotspot Details Updated: Barnes and Noble, Rivertown Crossings</title> <link rel="alternate" type="text/html" href="http://grwifi.net/location/barnes-noble-rivertown"/> <id>http://grwifi.net/location/barnes-noble-rivertown</id> <updated>2005-09-01T15:40:41-05:00</updated> <summary type="html"> The details of the WiFi hotspot at: Barnes and Noble, Rivertown Crossings have been updated. Find out more at:
+http://grwifi.net/location/barnes-noble-rivertown </summary> <author> <name>James</name> <uri>http://jystewart.net</uri> <email>james@jystewart.net</email> </author> <dc:subject>wifi hotspot</dc:subject> </entry> <entry> <title>Hotspot Details Updated: The Boss Sports Bar &amp; Grille</title> <link rel="alternate" type="text/html" href="http://grwifi.net/location/boss-sports-bar"/> <id>http://grwifi.net/location/boss-sports-bar</id> <updated>2005-09-01T15:40:19-05:00</updated> <summary type="html"> The details of the WiFi hotspot at: The Boss Sports Bar &amp; Grille have been updated. Find out more at:
+http://grwifi.net/location/boss-sports-bar </summary> <author> <name>James</name> <uri>http://jystewart.net</uri> <email>james@jystewart.net</email> </author> <dc:subject>wifi hotspot</dc:subject> </entry> </feed> \ No newline at end of file
diff --git a/plugins/FeedSub/extlib/XML/Feed/samples/hoder.xml b/plugins/FeedSub/extlib/XML/Feed/samples/hoder.xml
new file mode 100755
index 000000000..099463570
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/samples/hoder.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
+ xmlns:admin="http://webns.net/mvcb/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+
+<channel>
+<title>Editor: Myself (Persian)</title>
+<link>http://editormyself.info</link>
+<description>This is a Persian (Farsi) weblog, written by Hossein Derakhshan (aka, Hoder), an Iranian Multimedia designer and a journalist who lives in Toronto since Dec 2000. He also keeps an English weblog with the same name.</description>
+<dc:language>en-us</dc:language>
+<dc:creator>hoder@hotmail.com</dc:creator>
+<dc:date>2005-10-12T19:45:32-05:00</dc:date>
+<admin:generatorAgent rdf:resource="http://www.movabletype.org/?v=3.15" />
+<sy:updatePeriod>hourly</sy:updatePeriod>
+<sy:updateFrequency>1</sy:updateFrequency>
+<sy:updateBase>2000-01-01T12:00+00:00</sy:updateBase>
+
+
+<item>
+<title>لينکدونی‌ | جلسه‌ی امریکن انترپرایز برای تقسیم قومی ایران</title>
+<link>http://www.aei.org/events/type.upcoming,eventID.1166,filter.all/event_detail.asp</link>
+<description>چطور بعضی‌ها فکر می‌کنند دست راستی‌های آمریکا از خامنه‌ای ملی‌گراترند</description>
+<guid isPermaLink="false">14645@http://i.hoder.com/</guid>
+<dc:subject>iran</dc:subject>
+<dc:date>2005-10-12T19:45:32-05:00</dc:date>
+</item>
+
+<item>
+<title>لينکدونی‌ | به صبحانه آگهی بدهید</title>
+<link>http://www.adbrite.com/mb/commerce/purchase_form.php?opid=24346&amp;afsid=1</link>
+<description>خیلی ارزان و راحت است</description>
+<guid isPermaLink="false">14644@http://i.hoder.com/</guid>
+<dc:subject>media/journalism</dc:subject>
+<dc:date>2005-10-12T17:23:15-05:00</dc:date>
+</item>
+
+<item>
+<title>لينکدونی‌ | نیروی انتظامی چگونه تابوهای هم‌جنس‌گرایانه را می‌شکند؛ فرنگوپولیس</title>
+<link>http://farangeopolis.blogspot.com/2005/10/blog-post_08.html</link>
+<description>از پس و پیش و حاشیه‌ی این ماجرا می‌توان یک مستند بی‌نظیر ساخت</description>
+<guid isPermaLink="false">14643@http://i.hoder.com/</guid>
+<dc:subject>soc_popculture</dc:subject>
+<dc:date>2005-10-12T17:06:40-05:00</dc:date>
+</item>
+
+<item>
+<title>لينکدونی‌ | بازتاب توقیف شد</title>
+<link>http://www.baztab.com/news/30201.php</link>
+<description>اگر گفتید یک وب‌سایت را چطور توقیف می‌کنند؟ لابد ماوس‌شان را قایم می‌کنند.</description>
+<guid isPermaLink="false">14642@http://i.hoder.com/</guid>
+<dc:subject>media/journalism</dc:subject>
+<dc:date>2005-10-12T14:41:57-05:00</dc:date>
+</item>
+
+<item>
+<title>لينکدونی‌ | رشد وب در سال 2005 از همیشه بیشتر بوده است&quot; بی.بی.سی</title>
+<link>http://news.bbc.co.uk/2/hi/technology/4325918.stm</link>
+<description></description>
+<guid isPermaLink="false">14640@http://i.hoder.com/</guid>
+<dc:subject>tech</dc:subject>
+<dc:date>2005-10-12T13:04:46-05:00</dc:date>
+</item>
+
+
+
+<item>
+<title>==قرعه کشی گرین کارد به زودی شروع می‌شود==</title>
+<link>http://nice.newsxphotos.biz/05/09/2007_dv_lottery_registration_to_begin_oct_5_14589.php</link>
+<description></description>
+<guid isPermaLink="false">14613@http://vagrantly.com</guid>
+<dc:subject>ads03</dc:subject>
+<dc:date>2005-09-27T04:49:22-05:00</dc:date>
+</item>
+
+
+
+
+
+
+<item>
+<title>پروژه‌ی هاروارد، قدم دوم</title>
+<link>http://editormyself.info/archives/2005/10/051012_014641.shtml</link>
+<description><![CDATA[<p>اگر یادتان باشد <a href="/archives/2005/09/050906_014504.shtml">چند وقت پیش نوشتم</a> که دانشگاه هاروارد پروژه‌ای دارد با نام آواهای جهانی که در آن به وبلاگ‌های غیر انگلیسی‌زبان می‌پردازد. خواشتم که اگر کسی علاقه دارد ایمیل بزند. تعداد زیادی جواب دادند و ابراز علاقه کردند. حالا وقت قدم دوم است.</p>
+
+<p>قدم دوم این است که برای اینکه مسوولین پروژه بتوانند تصمیم بگیرند که با چه کسی کار کنند، می‌خواهند نمونه‌ی کارهای علاقمندان مشارکت در این پرزو‌ه را ببینند.</p>
+
+<p>برای همین از همه‌ی علاقماندان، حتی کسانی که قبلا اعلام آمادگی نکرده بودند، می‌‌خواهم که یک موضوع رایج این روزهای وبلاگستان فارسی را انتخاب کنند و در هفتصد کلمه، به انگلیسی، بنویسند که وبلاگ‌دارهای درباره‌اش چه می‌گویند. لینک به پنج، شش وبلاگ و بازنویسی آنچه آنها از جنبه‌های گوناگون درباره‌ی آن موضوع نوشته‌اند با نقل قول مستقیم از آنها (البته ترجمه شده از فارسی) کافی است. دو سه جمله هم اول کار توضیح دهید که چرا این موضوع مهم است.</p>
+
+<p>متن نمونه را به آدرس ایمیل من hoder@hoder.com و نیز برای افراد زیر تا روز دوشنبه بفرستید:<br />
+ربکا : rmackinnon@cyber.law.harvard.edu<br />
+هیثم: haitham.sabbah@gmail.com</p>]]></description>
+<guid isPermaLink="false">14641@http://editormyself.info</guid>
+<dc:subject>weblog</dc:subject>
+<dc:date>2005-10-12T14:04:23-05:00</dc:date>
+</item>
+
+
+
+</channel>
+</rss> \ No newline at end of file
diff --git a/plugins/FeedSub/extlib/XML/Feed/samples/illformed_atom10.xml b/plugins/FeedSub/extlib/XML/Feed/samples/illformed_atom10.xml
new file mode 100755
index 000000000..612186897
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/samples/illformed_atom10.xml
@@ -0,0 +1,13 @@
+<!--
+Description: entry author name
+Expect: bozo and entries[0]['author_detail']['name'] == u'Example author'
+-->
+<feed xmlns="http://www.w3.org/2005/Atom">
+<entry>
+ <author>
+ <name>Example author</name>
+ <email>me@example.com</email>
+ <uri>http://example.com/</uri>
+ </author>
+</entry>
+</feed \ No newline at end of file
diff --git a/plugins/FeedSub/extlib/XML/Feed/samples/rss091-complete.xml b/plugins/FeedSub/extlib/XML/Feed/samples/rss091-complete.xml
new file mode 100755
index 000000000..b0a1fee2d
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/samples/rss091-complete.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<!DOCTYPE rss SYSTEM "http://my.netscape.com/publish/formats/rss-0.91.dtd">
+<rss version="0.91">
+<channel>
+<copyright>Copyright 1997-1999 UserLand Software, Inc.</copyright>
+<pubDate>Thu, 08 Jul 1999 07:00:00 GMT</pubDate>
+<lastBuildDate>Thu, 08 Jul 1999 16:20:26 GMT</lastBuildDate>
+<docs>http://my.userland.com/stories/storyReader$11</docs>
+<description>News and commentary from the cross-platform scripting community.</description>
+<link>http://www.scripting.com/</link>
+<title>Scripting News</title>
+<image>
+<link>http://www.scripting.com/</link>
+<title>Scripting News</title>
+<url>http://www.scripting.com/gifs/tinyScriptingNews.gif</url>
+<height>40</height>
+<width>78</width>
+<description>What is this used for?</description>
+</image>
+<managingEditor>dave@userland.com (Dave Winer)</managingEditor>
+<webMaster>dave@userland.com (Dave Winer)</webMaster>
+<language>en-us</language>
+<skipHours>
+<hour>6</hour>
+<hour>7</hour>
+<hour>8</hour>
+<hour>9</hour>
+<hour>10</hour>
+<hour>11</hour>
+</skipHours>
+<skipDays>
+<day>Sunday</day>
+</skipDays>
+<rating>(PICS-1.1 "http://www.rsac.org/ratingsv01.html" l gen true comment "RSACi North America Server" for "http://www.rsac.org" on "1996.04.16T08:15-0500" r (n 0 s 0 v 0 l 0))</rating>
+<item>
+<title>stuff</title>
+<link>http://bar</link>
+<description>This is an article about some stuff</description>
+</item>
+<textinput>
+<title>Search Now!</title>
+<description>Enter your search &lt;terms&gt;</description>
+<name>find</name>
+<link>http://my.site.com/search.cgi</link>
+</textinput>
+</channel>
+</rss> \ No newline at end of file
diff --git a/plugins/FeedSub/extlib/XML/Feed/samples/rss091-international.xml b/plugins/FeedSub/extlib/XML/Feed/samples/rss091-international.xml
new file mode 100755
index 000000000..cfe91691f
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/samples/rss091-international.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="EuC-JP"?>
+<!DOCTYPE rss SYSTEM "http://my.netscape.com/publish/formats/rss-0.91.dtd">
+<rss version="0.91">
+<channel>
+<title>膮ŸÛë´é´Ì´×´è´ŒÁ¹´Õ</title>
+<link>http://www.mozilla.org</link>
+<description>膮ŸÛë´é´Ì´×´è´ŒÁ¹´Õ</description>
+<language>ja</language> <!-- tagged as Japanese content -->
+<item>
+<title>NYÒ™Á¢¸»ÌêÛì15285.25´ƒ´‘Á£´Û´—´ÀÁ¹´ê´Ì´éÒ™Ûì¡êçÒÕ‰ÌêÁ£</title>
+<link>http://www.mozilla.org/status/</link>
+<description>This is an item description...</description>
+</item>
+<item>
+<title>‚§±Çç¡ËßÛÂҏéøÓ¸Á£Ë²®Ÿè†Ûè危ÇÌ’¡Íæ—éøë‡Á£</title>
+<link>http://www.mozilla.org/status/</link>
+<description>This is an item description...</description>
+</item>
+<item>
+<title>ËÜË”ïÌëÈšÁ¢È†Ë§æàÀ豎ˉۂÁ¢Ë‚åܼšÛ˜íËüËÁ£</title>
+<link>http://www.mozilla.org/status/</link>
+<description>This is an item description...</description>
+</item>
+<item>
+<title>2000‚øíŠåÁ¢«‘¦éÛ빏ېçéÛ§ÛÂè†ÒæÓ¸Á£Ì¾«…æ—ÕÝéøƒ¸Á£</title>
+<link>http://www.mozilla.org/status/</link>
+<description>This is an item description...</description>
+</item>
+</channel>
+</rss> \ No newline at end of file
diff --git a/plugins/FeedSub/extlib/XML/Feed/samples/rss091-simple.xml b/plugins/FeedSub/extlib/XML/Feed/samples/rss091-simple.xml
new file mode 100755
index 000000000..f0964a227
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/samples/rss091-simple.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE rss SYSTEM "http://my.netscape.com/publish/formats/rss-0.91.dtd">
+<rss version="0.91">
+<channel>
+<language>en</language>
+<description>News and commentary from the cross-platform scripting community.</description>
+<link>http://www.scripting.com/</link>
+<title>Scripting News</title>
+<image>
+<link>http://www.scripting.com/</link>
+<title>Scripting News</title>
+<url>http://www.scripting.com/gifs/tinyScriptingNews.gif</url>
+</image>
+</channel>
+</rss> \ No newline at end of file
diff --git a/plugins/FeedSub/extlib/XML/Feed/samples/rss092-sample.xml b/plugins/FeedSub/extlib/XML/Feed/samples/rss092-sample.xml
new file mode 100755
index 000000000..5d75c352b
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/samples/rss092-sample.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<!-- RSS generation done by 'Radio UserLand' on Fri, 13 Apr 2001 19:23:02 GMT -->
+<rss version="0.92">
+ <channel>
+ <title>Dave Winer: Grateful Dead</title>
+ <link>http://www.scripting.com/blog/categories/gratefulDead.html</link>
+ <description>A high-fidelity Grateful Dead song every day. This is where we&apos;re experimenting with enclosures on RSS news items that download when you&apos;re not using your computer. If it works (it will) it will be the end of the Click-And-Wait multimedia experience on the Internet. </description>
+ <lastBuildDate>Fri, 13 Apr 2001 19:23:02 GMT</lastBuildDate>
+ <docs>http://backend.userland.com/rss092</docs>
+ <managingEditor>dave@userland.com (Dave Winer)</managingEditor>
+ <webMaster>dave@userland.com (Dave Winer)</webMaster>
+ <cloud domain="data.ourfavoritesongs.com" port="80" path="/RPC2" registerProcedure="ourFavoriteSongs.rssPleaseNotify" protocol="xml-rpc"/>
+ <item>
+ <description>It&apos;s been a few days since I added a song to the Grateful Dead channel. Now that there are all these new Radio users, many of whom are tuned into this channel (it&apos;s #16 on the hotlist of upstreaming Radio users, there&apos;s no way of knowing how many non-upstreaming users are subscribing, have to do something about this..). Anyway, tonight&apos;s song is a live version of Weather Report Suite from Dick&apos;s Picks Volume 7. It&apos;s wistful music. Of course a beautiful song, oft-quoted here on Scripting News. &lt;i&gt;A little change, the wind and rain.&lt;/i&gt;
+</description>
+ <enclosure url="http://www.scripting.com/mp3s/weatherReportDicksPicsVol7.mp3" length="6182912" type="audio/mpeg"/>
+ </item>
+ <item>
+ <description>Kevin Drennan started a &lt;a href=&quot;http://deadend.editthispage.com/&quot;&gt;Grateful Dead Weblog&lt;/a&gt;. Hey it&apos;s cool, he even has a &lt;a href=&quot;http://deadend.editthispage.com/directory/61&quot;&gt;directory&lt;/a&gt;. &lt;i&gt;A Frontier 7 feature.&lt;/i&gt;</description>
+ <source url="http://scriptingnews.userland.com/xml/scriptingNews2.xml">Scripting News</source>
+ </item>
+ <item>
+ <description>&lt;a href=&quot;http://arts.ucsc.edu/GDead/AGDL/other1.html&quot;&gt;The Other One&lt;/a&gt;, live instrumental, One From The Vault. Very rhythmic very spacy, you can listen to it many times, and enjoy something new every time.</description>
+ <enclosure url="http://www.scripting.com/mp3s/theOtherOne.mp3" length="6666097" type="audio/mpeg"/>
+ </item>
+ <item>
+ <description>This is a test of a change I just made. Still diggin..</description>
+ </item>
+ <item>
+ <description>The HTML rendering almost &lt;a href=&quot;http://validator.w3.org/check/referer&quot;&gt;validates&lt;/a&gt;. Close. Hey I wonder if anyone has ever published a style guide for ALT attributes on images? What are you supposed to say in the ALT attribute? I sure don&apos;t know. If you&apos;re blind send me an email if u cn rd ths. </description>
+ </item>
+ <item>
+ <description>&lt;a href=&quot;http://www.cs.cmu.edu/~mleone/gdead/dead-lyrics/Franklin&apos;s_Tower.txt&quot;&gt;Franklin&apos;s Tower&lt;/a&gt;, a live version from One From The Vault.</description>
+ <enclosure url="http://www.scripting.com/mp3s/franklinsTower.mp3" length="6701402" type="audio/mpeg"/>
+ </item>
+ <item>
+ <description>Moshe Weitzman says Shakedown Street is what I&apos;m lookin for for tonight. I&apos;m listening right now. It&apos;s one of my favorites. &quot;Don&apos;t tell me this town ain&apos;t got no heart.&quot; Too bright. I like the jazziness of Weather Report Suite. Dreamy and soft. How about The Other One? &quot;Spanish lady come to me..&quot;</description>
+ <source url="http://scriptingnews.userland.com/xml/scriptingNews2.xml">Scripting News</source>
+ </item>
+ <item>
+ <description>&lt;a href=&quot;http://www.scripting.com/mp3s/youWinAgain.mp3&quot;&gt;The news is out&lt;/a&gt;, all over town..&lt;p&gt;
+You&apos;ve been seen, out runnin round. &lt;p&gt;
+The lyrics are &lt;a href=&quot;http://www.cs.cmu.edu/~mleone/gdead/dead-lyrics/You_Win_Again.txt&quot;&gt;here&lt;/a&gt;, short and sweet. &lt;p&gt;
+&lt;i&gt;You win again!&lt;/i&gt;
+</description>
+ <enclosure url="http://www.scripting.com/mp3s/youWinAgain.mp3" length="3874816" type="audio/mpeg"/>
+ </item>
+ <item>
+ <description>&lt;a href=&quot;http://www.getlyrics.com/lyrics/grateful-dead/wake-of-the-flood/07.htm&quot;&gt;Weather Report Suite&lt;/a&gt;: &quot;Winter rain, now tell me why, summers fade, and roses die? The answer came. The wind and rain. Golden hills, now veiled in grey, summer leaves have blown away. Now what remains? The wind and rain.&quot;</description>
+ <enclosure url="http://www.scripting.com/mp3s/weatherReportSuite.mp3" length="12216320" type="audio/mpeg"/>
+ </item>
+ <item>
+ <description>&lt;a href=&quot;http://arts.ucsc.edu/gdead/agdl/darkstar.html&quot;&gt;Dark Star&lt;/a&gt; crashes, pouring its light into ashes.</description>
+ <enclosure url="http://www.scripting.com/mp3s/darkStar.mp3" length="10889216" type="audio/mpeg"/>
+ </item>
+ <item>
+ <description>DaveNet: &lt;a href=&quot;http://davenet.userland.com/2001/01/21/theUsBlues&quot;&gt;The U.S. Blues&lt;/a&gt;.</description>
+ </item>
+ <item>
+ <description>Still listening to the US Blues. &lt;i&gt;&quot;Wave that flag, wave it wide and high..&quot;&lt;/i&gt; Mistake made in the 60s. We gave our country to the assholes. Ah ah. Let&apos;s take it back. Hey I&apos;m still a hippie. &lt;i&gt;&quot;You could call this song The United States Blues.&quot;&lt;/i&gt;</description>
+ </item>
+ <item>
+ <description>&lt;a href=&quot;http://www.sixties.com/html/garcia_stack_0.html&quot;&gt;&lt;img src=&quot;http://www.scripting.com/images/captainTripsSmall.gif&quot; height=&quot;51&quot; width=&quot;42&quot; border=&quot;0&quot; hspace=&quot;10&quot; vspace=&quot;10&quot; align=&quot;right&quot;&gt;&lt;/a&gt;In celebration of today&apos;s inauguration, after hearing all those great patriotic songs, America the Beautiful, even The Star Spangled Banner made my eyes mist up. It made my choice of Grateful Dead song of the night realllly easy. Here are the &lt;a href=&quot;http://searchlyrics2.homestead.com/gd_usblues.html&quot;&gt;lyrics&lt;/a&gt;. Click on the audio icon to the left to give it a listen. &quot;Red and white, blue suede shoes, I&apos;m Uncle Sam, how do you do?&quot; It&apos;s a different kind of patriotic music, but man I love my country and I love Jerry and the band. &lt;i&gt;I truly do!&lt;/i&gt;</description>
+ <enclosure url="http://www.scripting.com/mp3s/usBlues.mp3" length="5272510" type="audio/mpeg"/>
+ </item>
+ <item>
+ <description>Grateful Dead: &quot;Tennessee, Tennessee, ain&apos;t no place I&apos;d rather be.&quot;</description>
+ <enclosure url="http://www.scripting.com/mp3s/tennesseeJed.mp3" length="3442648" type="audio/mpeg"/>
+ </item>
+ <item>
+ <description>Ed Cone: &quot;Had a nice Deadhead experience with my wife, who never was one but gets the vibe and knows and likes a lot of the music. Somehow she made it to the age of 40 without ever hearing Wharf Rat. We drove to Jersey and back over Christmas with the live album commonly known as Skull and Roses in the CD player much of the way, and it was cool to see her discover one the band&apos;s finest moments. That song is unique and underappreciated. Fun to hear that disc again after a few years off -- you get Jerry as blues-guitar hero on Big Railroad Blues and a nice version of Bertha.&quot;</description>
+ <enclosure url="http://www.scripting.com/mp3s/darkStarWharfRat.mp3" length="27503386" type="audio/mpeg"/>
+ </item>
+ <item>
+ <description>&lt;a href=&quot;http://arts.ucsc.edu/GDead/AGDL/fotd.html&quot;&gt;Tonight&apos;s Song&lt;/a&gt;: &quot;If I get home before daylight I just might get some sleep tonight.&quot; </description>
+ <enclosure url="http://www.scripting.com/mp3s/friendOfTheDevil.mp3" length="3219742" type="audio/mpeg"/>
+ </item>
+ <item>
+ <description>&lt;a href=&quot;http://arts.ucsc.edu/GDead/AGDL/uncle.html&quot;&gt;Tonight&apos;s song&lt;/a&gt;: &quot;Come hear Uncle John&apos;s Band by the river side. Got some things to talk about here beside the rising tide.&quot;</description>
+ <enclosure url="http://www.scripting.com/mp3s/uncleJohnsBand.mp3" length="4587102" type="audio/mpeg"/>
+ </item>
+ <item>
+ <description>&lt;a href=&quot;http://www.cs.cmu.edu/~mleone/gdead/dead-lyrics/Me_and_My_Uncle.txt&quot;&gt;Me and My Uncle&lt;/a&gt;: &quot;I loved my uncle, God rest his soul, taught me good, Lord, taught me all I know. Taught me so well, I grabbed that gold and I left his dead ass there by the side of the road.&quot;
+</description>
+ <enclosure url="http://www.scripting.com/mp3s/meAndMyUncle.mp3" length="2949248" type="audio/mpeg"/>
+ </item>
+ <item>
+ <description>Truckin, like the doo-dah man, once told me gotta play your hand. Sometimes the cards ain&apos;t worth a dime, if you don&apos;t lay em down.</description>
+ <enclosure url="http://www.scripting.com/mp3s/truckin.mp3" length="4847908" type="audio/mpeg"/>
+ </item>
+ <item>
+ <description>Two-Way-Web: &lt;a href=&quot;http://www.thetwowayweb.com/payloadsForRss&quot;&gt;Payloads for RSS&lt;/a&gt;. &quot;When I started talking with Adam late last year, he wanted me to think about high quality video on the Internet, and I totally didn&apos;t want to hear about it.&quot;</description>
+ </item>
+ <item>
+ <description>A touch of gray, kinda suits you anyway..</description>
+ <enclosure url="http://www.scripting.com/mp3s/touchOfGrey.mp3" length="5588242" type="audio/mpeg"/>
+ </item>
+ <item>
+ <description>&lt;a href=&quot;http://www.sixties.com/html/garcia_stack_0.html&quot;&gt;&lt;img src=&quot;http://www.scripting.com/images/captainTripsSmall.gif&quot; height=&quot;51&quot; width=&quot;42&quot; border=&quot;0&quot; hspace=&quot;10&quot; vspace=&quot;10&quot; align=&quot;right&quot;&gt;&lt;/a&gt;In celebration of today&apos;s inauguration, after hearing all those great patriotic songs, America the Beautiful, even The Star Spangled Banner made my eyes mist up. It made my choice of Grateful Dead song of the night realllly easy. Here are the &lt;a href=&quot;http://searchlyrics2.homestead.com/gd_usblues.html&quot;&gt;lyrics&lt;/a&gt;. Click on the audio icon to the left to give it a listen. &quot;Red and white, blue suede shoes, I&apos;m Uncle Sam, how do you do?&quot; It&apos;s a different kind of patriotic music, but man I love my country and I love Jerry and the band. &lt;i&gt;I truly do!&lt;/i&gt;</description>
+ <enclosure url="http://www.scripting.com/mp3s/usBlues.mp3" length="5272510" type="audio/mpeg"/>
+ </item>
+ </channel>
+ </rss> \ No newline at end of file
diff --git a/plugins/FeedSub/extlib/XML/Feed/samples/rss10-example1.xml b/plugins/FeedSub/extlib/XML/Feed/samples/rss10-example1.xml
new file mode 100755
index 000000000..0edecf58e
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/samples/rss10-example1.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+
+<rdf:RDF
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns="http://purl.org/rss/1.0/"
+>
+
+ <channel rdf:about="http://www.xml.com/xml/news.rss">
+ <title>XML.com</title>
+ <link>http://xml.com/pub</link>
+ <description>
+ XML.com features a rich mix of information and services
+ for the XML community.
+ </description>
+
+ <image rdf:resource="http://xml.com/universal/images/xml_tiny.gif" />
+
+ <items>
+ <rdf:Seq>
+ <rdf:li resource="http://xml.com/pub/2000/08/09/xslt/xslt.html" />
+ <rdf:li resource="http://xml.com/pub/2000/08/09/rdfdb/index.html" />
+ </rdf:Seq>
+ </items>
+
+ <textinput rdf:resource="http://search.xml.com" />
+
+ </channel>
+
+ <image rdf:about="http://xml.com/universal/images/xml_tiny.gif">
+ <title>XML.com</title>
+ <link>http://www.xml.com</link>
+ <url>http://xml.com/universal/images/xml_tiny.gif</url>
+ </image>
+
+ <item rdf:about="http://xml.com/pub/2000/08/09/xslt/xslt.html">
+ <title>Processing Inclusions with XSLT</title>
+ <link>http://xml.com/pub/2000/08/09/xslt/xslt.html</link>
+ <description>
+ Processing document inclusions with general XML tools can be
+ problematic. This article proposes a way of preserving inclusion
+ information through SAX-based processing.
+ </description>
+ </item>
+
+ <item rdf:about="http://xml.com/pub/2000/08/09/rdfdb/index.html">
+ <title>Putting RDF to Work</title>
+ <link>http://xml.com/pub/2000/08/09/rdfdb/index.html</link>
+ <description>
+ Tool and API support for the Resource Description Framework
+ is slowly coming of age. Edd Dumbill takes a look at RDFDB,
+ one of the most exciting new RDF toolkits.
+ </description>
+ </item>
+
+ <textinput rdf:about="http://search.xml.com">
+ <title>Search XML.com</title>
+ <description>Search XML.com's XML collection</description>
+ <name>s</name>
+ <link>http://search.xml.com</link>
+ </textinput>
+
+</rdf:RDF> \ No newline at end of file
diff --git a/plugins/FeedSub/extlib/XML/Feed/samples/rss10-example2.xml b/plugins/FeedSub/extlib/XML/Feed/samples/rss10-example2.xml
new file mode 100755
index 000000000..26235f78f
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/samples/rss10-example2.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<rdf:RDF
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
+ xmlns:co="http://purl.org/rss/1.0/modules/company/"
+ xmlns:ti="http://purl.org/rss/1.0/modules/textinput/"
+ xmlns="http://purl.org/rss/1.0/"
+>
+
+ <channel rdf:about="http://meerkat.oreillynet.com/?_fl=rss1.0">
+ <title>Meerkat</title>
+ <link>http://meerkat.oreillynet.com</link>
+ <description>Meerkat: An Open Wire Service</description>
+ <dc:publisher>The O'Reilly Network</dc:publisher>
+ <dc:creator>Rael Dornfest (mailto:rael@oreilly.com)</dc:creator>
+ <dc:rights>Copyright &#169; 2000 O'Reilly &amp; Associates, Inc.</dc:rights>
+ <dc:date>2000-01-01T12:00+00:00</dc:date>
+ <sy:updatePeriod>hourly</sy:updatePeriod>
+ <sy:updateFrequency>2</sy:updateFrequency>
+ <sy:updateBase>2000-01-01T12:00+00:00</sy:updateBase>
+
+ <image rdf:resource="http://meerkat.oreillynet.com/icons/meerkat-powered.jpg" />
+
+ <items>
+ <rdf:Seq>
+ <rdf:li resource="http://c.moreover.com/click/here.pl?r123" />
+ </rdf:Seq>
+ </items>
+
+ <textinput rdf:resource="http://meerkat.oreillynet.com" />
+
+ </channel>
+
+ <image rdf:about="http://meerkat.oreillynet.com/icons/meerkat-powered.jpg">
+ <title>Meerkat Powered!</title>
+ <url>http://meerkat.oreillynet.com/icons/meerkat-powered.jpg</url>
+ <link>http://meerkat.oreillynet.com</link>
+ </image>
+
+ <item rdf:about="http://c.moreover.com/click/here.pl?r123">
+ <title>XML: A Disruptive Technology</title>
+ <link>http://c.moreover.com/click/here.pl?r123</link>
+ <dc:description>
+ XML is placing increasingly heavy loads on the existing technical
+ infrastructure of the Internet.
+ </dc:description>
+ <dc:publisher>The O'Reilly Network</dc:publisher>
+ <dc:creator>Simon St.Laurent (mailto:simonstl@simonstl.com)</dc:creator>
+ <dc:rights>Copyright &#169; 2000 O'Reilly &amp; Associates, Inc.</dc:rights>
+ <dc:subject>XML</dc:subject>
+ <co:name>XML.com</co:name>
+ <co:market>NASDAQ</co:market>
+ <co:symbol>XML</co:symbol>
+ </item>
+
+ <textinput rdf:about="http://meerkat.oreillynet.com">
+ <title>Search Meerkat</title>
+ <description>Search Meerkat's RSS Database...</description>
+ <name>s</name>
+ <link>http://meerkat.oreillynet.com/</link>
+ <ti:function>search</ti:function>
+ <ti:inputType>regex</ti:inputType>
+ </textinput>
+
+</rdf:RDF> \ No newline at end of file
diff --git a/plugins/FeedSub/extlib/XML/Feed/samples/rss2sample.xml b/plugins/FeedSub/extlib/XML/Feed/samples/rss2sample.xml
new file mode 100755
index 000000000..53483cc51
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/samples/rss2sample.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<rss version="2.0" xmlns:content="http://purl.org/rss/1.0.modules/content/">
+ <channel>
+ <title>Liftoff News</title>
+ <link>http://liftoff.msfc.nasa.gov/</link>
+ <description>Liftoff to Space Exploration.</description>
+ <language>en-us</language>
+ <pubDate>Tue, 10 Jun 2003 04:00:00 GMT</pubDate>
+ <lastBuildDate>Tue, 10 Jun 2003 09:41:01 GMT</lastBuildDate>
+ <docs>http://blogs.law.harvard.edu/tech/rss</docs>
+ <generator>Weblog Editor 2.0</generator>
+ <managingEditor>editor@example.com</managingEditor>
+ <webMaster>webmaster@example.com</webMaster>
+ <item>
+ <title>Star City</title>
+ <link>http://liftoff.msfc.nasa.gov/news/2003/news-starcity.asp</link>
+ <description>How do Americans get ready to work with Russians aboard the International Space Station? They take a crash course in culture, language and protocol at Russia's &lt;a href="http://howe.iki.rssi.ru/GCTC/gctc_e.htm"&gt;Star City&lt;/a&gt;.</description>
+ <pubDate>Tue, 03 Jun 2003 09:39:21 GMT</pubDate>
+ <guid>http://liftoff.msfc.nasa.gov/2003/06/03.html#item573</guid>
+ </item>
+ <item>
+ <description>Sky watchers in Europe, Asia, and parts of Alaska and Canada will experience a &lt;a href="http://science.nasa.gov/headlines/y2003/30may_solareclipse.htm"&gt;partial eclipse of the Sun&lt;/a&gt; on Saturday, May 31st.</description>
+ <pubDate>Fri, 30 May 2003 11:06:42 GMT</pubDate>
+ <guid>http://liftoff.msfc.nasa.gov/2003/05/30.html#item572</guid>
+ </item>
+ <item>
+ <title>The Engine That Does More</title>
+ <link>http://liftoff.msfc.nasa.gov/news/2003/news-VASIMR.asp</link>
+ <description>Before man travels to Mars, NASA hopes to design new engines that will let us fly through the Solar System more quickly. The proposed VASIMR engine would do that.</description>
+ <pubDate>Tue, 27 May 2003 08:37:32 GMT</pubDate>
+ <guid>http://liftoff.msfc.nasa.gov/2003/05/27.html#item571</guid>
+ <content:encoded><![CDATA[<p>Test content</p>]]></content:encoded>
+ </item>
+ <item>
+ <title>Astronauts' Dirty Laundry</title>
+ <link>http://liftoff.msfc.nasa.gov/news/2003/news-laundry.asp</link>
+ <description>Compared to earlier spacecraft, the International Space Station has many luxuries, but laundry facilities are not one of them. Instead, astronauts have other options.</description>
+ <pubDate>Tue, 20 May 2003 08:56:02 GMT</pubDate>
+ <guid>http://liftoff.msfc.nasa.gov/2003/05/20.html#item570</guid>
+ </item>
+ </channel>
+</rss> \ No newline at end of file
diff --git a/plugins/FeedSub/extlib/XML/Feed/samples/sixapart-jp.xml b/plugins/FeedSub/extlib/XML/Feed/samples/sixapart-jp.xml
new file mode 100755
index 000000000..f8a04bba5
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/samples/sixapart-jp.xml
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0">
+<channel>
+<title>Six Apart - News</title>
+<link>http://www.sixapart.jp/</link>
+<description></description>
+<language>ja</language>
+<copyright>Copyright 2005</copyright>
+<lastBuildDate>Fri, 07 Oct 2005 19:09:34 +0900</lastBuildDate>
+<generator>http://www.movabletype.org/?v=3.2-ja</generator>
+<docs>http://blogs.law.harvard.edu/tech/rss</docs>
+
+<item>
+<title>ファイブ・ディーが、Movable Typeでブログプロモーションをスタート</title>
+<description><![CDATA[<p><img alt="MIYAZAWAblog_banner.jpg" src="http://www.sixapart.jp/MIYAZAWAblog_banner.jpg" width="200" height="88" align="right" /><br />
+ファイブ・ディーは、Movable Typeで構築したプロモーション ブログ『宮沢和史 中南米ツアーblog Latin America 2005』を開設しました。</p>
+
+<p>9月21日に開設されたこのブログは、ブラジル、ホンジュラス、ニカラグア、メキシコ、キューバの5か国を巡る「Latin America 2005」ツアーに合わせ、そのツアーの模様を同行マネージャーがレポートしていきます。<br />
+さらに今月2日からは宮沢和史自身が日々録音した声をPodcastingするという点でも、ブログを使ったユニークなプロモーションとなっています。</p>
+
+<p><a href="http://www.five-d.co.jp/miyazawa/jp/blog/la2005/">「宮沢和史 中南米ツアーblog Latin America 2005」</a></p>
+
+<p>※シックス・アパートではこうしたブログを使ったプロモーションに最適な製品をご用意しております。<br />
+<ul><li><a href="/movabletype/">Movable Type</a><br />
+<li><a href="/typepad/typepad_promotion.html">TypePad Promotion</a><br />
+</ul></p>]]></description>
+<link>http://www.sixapart.jp/news/2005/10/07-1909.html</link>
+<guid>http://www.sixapart.jp/news/2005/10/07-1909.html</guid>
+<category>news</category>
+<pubDate>Fri, 07 Oct 2005 19:09:34 +0900</pubDate>
+</item>
+<item>
+<title>Movable Type 3.2日本語版の提供を開始</title>
+<description><![CDATA[<p><img alt="Movable Type Logo" src="/images/mt3-logo-small.gif" width="151" height="37"/></p>
+<p>シックス・アパートは、Movable Type 3.2日本語版の提供を開始いたしました。<br />
+ベータテストにご協力いただいた多くの皆様に、スタッフ一同、心から感謝いたします。</p>
+<p>製品概要など、詳しくは<a href="http://www.sixapart.jp/press_releases/2005/09/29-1529.html" title="Six Apart - News: シックス・アパートが、スパム対策強化の「Movable Type 3.2 日本語版」を提供開始">プレスリリース</a>をご参照下さい。</p>
+<p>ご購入のご検討は、<a href="http://www.sixapart.jp/movabletype/purchase-mt.html">Movable Typeのご購入</a>からどうぞ。</p>]]></description>
+<link>http://www.sixapart.jp/news/2005/09/29-1530.html</link>
+<guid>http://www.sixapart.jp/news/2005/09/29-1530.html</guid>
+<category>news</category>
+<pubDate>Thu, 29 Sep 2005 15:30:00 +0900</pubDate>
+</item>
+<item>
+<title>シックス・アパートが、スパム対策強化の「Movable Type 3.2 日本語版」を提供開始</title>
+<description><![CDATA[<p><プレスリリース資料></p>
+<ul>
+ <li><a href="http://www.sixapart.jp/sixapart20050929.pdf">印刷用(PDF版)</a></li>
+</ul>
+<p><strong>シックス・アパートが、スパム対策強化の「Movable Type 3.2 日本語版」を提供開始 ~ スパムの自動判別機能や新ユーザー・インターフェースで、運用管理の機能を強化 ~</strong></p>
+<p>2005年9月29日<br />
+シックス・アパート株式会社</p>
+<p>ブログ・ソフトウェア大手のシックス・アパート株式会社(本社:東京都港区、代表取締役:関 信浩)は、「Movable Type(ムーバブル・タイプ) 3.2 日本語版」(URL:<a href="http://www.sixapart.jp/movabletype/">http://www.sixapart.jp/movabletype/</a>)を9月29日より提供開始いたします。</p>]]></description>
+<link>http://www.sixapart.jp/press_releases/2005/09/29-1529.html</link>
+<guid>http://www.sixapart.jp/press_releases/2005/09/29-1529.html</guid>
+<category>Press Releases</category>
+<pubDate>Thu, 29 Sep 2005 15:29:00 +0900</pubDate>
+</item>
+<item>
+<title>スタッフを募集しています</title>
+<description><![CDATA[<p>シックス・アパートはMovable TypeやTypePadの開発エンジニアなど、スタッフを広く募集しています。具体的な募集職種は次の通りです。</p>
+
+<ul>
+<li><a href="http://www.sixapart.jp/jobs/2005/09/13-0007.html">Movable Type開発エンジニア</a></li>
+<li><a href="http://www.sixapart.jp/jobs/2005/09/13-0004.html">TypePad開発エンジニア</a></li>
+<li><a href="http://www.sixapart.jp/jobs/2005/09/13-0003.html">カスタマーサポート・ディレクター</a></li>
+<li><a href="http://www.sixapart.jp/jobs/2005/09/13-0002.html">マーケティング・広報アシスタント</a></li>
+<li><a href="http://www.sixapart.jp/jobs/2005/09/13-0001.html">開発アシスタント</a></li>
+</ul>
+
+<p>拡大を続ける、日本のブログ市場を積極的にリードする人材を、シックス・アパートは募集しています。上記以外の職種につきましても、お気軽にお問い合わせください。詳しい募集要項や応募方法については、<a href="/jobs/">求人情報のページ</a>をご覧ください。<br />
+</p>]]></description>
+<link>http://www.sixapart.jp/news/2005/09/27-0906.html</link>
+<guid>http://www.sixapart.jp/news/2005/09/27-0906.html</guid>
+<category>news</category>
+<pubDate>Tue, 27 Sep 2005 09:06:10 +0900</pubDate>
+</item>
+<item>
+<title>サイト接続不具合に関するお詫びと復旧のお知らせ</title>
+<description><![CDATA[<p>9月24日(土)の14:45ごろから、同日18:30ごろまで、シックス・アパート社のウェブサイトが不安定になっており、断続的に接続できない不具合が発生しておりました。このため、この期間中にウェブサイトの閲覧や製品のダウンロードができませんでした。</p>
+
+<p>なお現在は不具合は解消しております。みなさまにご迷惑をおかけしたことをお詫びいたします。</p>]]></description>
+<link>http://www.sixapart.jp/news/2005/09/26-1000.html</link>
+<guid>http://www.sixapart.jp/news/2005/09/26-1000.html</guid>
+<category>news</category>
+<pubDate>Mon, 26 Sep 2005 10:00:56 +0900</pubDate>
+</item>
+<item>
+<title>企業ブログ向けパッケージ「TypePad Promotion」を新発売</title>
+<description><![CDATA[<p>シックス・アパートは、ウェブログ・サービスTypePadの企業ブログ向けパッケージ「TypePad Promotion」(タイプパッド・プロモーションの発売を10月下旬から開始いたします。</p>
+
+<p>詳しくは、<a href="http://www.sixapart.jp/press_releases/2005/09/20-1500.html" title="プレスリリース: 「TypePad Promotion」新発売">プレスリリース</a>をご参照下さい。</p>]]></description>
+<link>http://www.sixapart.jp/news/2005/09/20-1500.html</link>
+<guid>http://www.sixapart.jp/news/2005/09/20-1500.html</guid>
+<category>news</category>
+<pubDate>Tue, 20 Sep 2005 15:00:01 +0900</pubDate>
+</item>
+<item>
+<title>シックス・アパートが、法人向けブログパッケージ「TypePad Promotion」を発売</title>
+<description><![CDATA[<p><プレスリリース資料><br />
+<a href="http://www.sixapart.jp/sixapart20050920.pdf">印刷用(PDF版)</a></p>
+
+<p><br />
+<strong>シックス・アパートが、法人向けブログパッケージ「TypePad Promotion」を発売<br />
+~PR/IRサイトやキャンペーンサイトなど企業のプロモーションニーズに特化~<br />
+</strong><br />
+2005年9月20日<br />
+シックス・アパート株式会社</p>
+
+<p>ブログ・サービス大手のシックス・アパート株式会社(本社:東京都港区、代表取締役:関 信浩)は、法人向けプロモーションブログ・パッケージ「TypePad Promotion(タイプパッド・プロモーション)」(URL:<a href="http://www.sixapart.jp/typepad/typepad_promotion.html">http://www.sixapart.jp/typepad/typepad_promotion.html</a>)を10月下旬より販売開始いたします。</p>]]></description>
+<link>http://www.sixapart.jp/press_releases/2005/09/20-1500.html</link>
+<guid>http://www.sixapart.jp/press_releases/2005/09/20-1500.html</guid>
+<category>Press Releases</category>
+<pubDate>Tue, 20 Sep 2005 15:00:00 +0900</pubDate>
+</item>
+<item>
+<title>Six [days] Apart Week</title>
+<description><![CDATA[<p>本日、9月16日はSix Apartの創業者ミナ・トロットの誕生日です。<br />
+私たちの会社は、創業者のトロット夫妻(ベンとミナ)の誕生日が、6日離れていることからSix [days] Apart →Six Apartという風に名付けられています。本日から22日までの6日間を社名の由来となる Six [days] Apart Weekとして、私たちのプロダクトをご紹介させていただきます。</p>
+
+<p>今日は、ブログ・サービスのTypePad(タイプパッド)をご紹介します。<br />
+<img alt="tp-logo.gif" src="http://www.sixapart.jp/tp-logo.gif" width="227" height="52" /></p>
+
+<p>TypePadは、米国PC MAGAZINE誌の2003年EDITOR'S CHOICE とBEST OF THE YEARに選ばれております。<br />
+<img alt="pcmag-ad.gif" src="http://www.sixapart.jp/pcmag-ad.gif" width="297" height="100" /><br />
+</p>]]></description>
+<link>http://www.sixapart.jp/news/2005/09/16-1941.html</link>
+<guid>http://www.sixapart.jp/news/2005/09/16-1941.html</guid>
+<category>news</category>
+<pubDate>Fri, 16 Sep 2005 19:41:47 +0900</pubDate>
+</item>
+<item>
+<title>ハイパーワークスが商用フォントを利用できるMovable Typeホスティングサービスを開始</title>
+<description><![CDATA[<p>ソフト開発会社の<a href="http://www.hyperwrx.co.jp/">有限会社ハイパーワークス</a>は、商用フォントなど多彩なフォントをブログ上で利用できるブログ・サービス「<a href="http://glyph-on.jp/">Glyph-On!(グリフォン) Movable Type ホスティング サービス</a>」の提供を開始しました。<br />
+</p>]]></description>
+<link>http://www.sixapart.jp/news/2005/09/14-1700.html</link>
+<guid>http://www.sixapart.jp/news/2005/09/14-1700.html</guid>
+<category>news</category>
+<pubDate>Wed, 14 Sep 2005 17:00:00 +0900</pubDate>
+</item>
+<item>
+<title>Movable Type開発エンジニアの募集</title>
+<description><![CDATA[<p>
+勤務形態: フルタイム<br />
+勤務地: 東京 (赤坂)<br />
+職種: ソフトウェア・エンジニア<br />
+職務内容: Movable Typeの開発業務全般<br />
+募集人数: 若干名
+</p>]]></description>
+<link>http://www.sixapart.jp/jobs/2005/09/13-0007.html</link>
+<guid>http://www.sixapart.jp/jobs/2005/09/13-0007.html</guid>
+<category>Jobs</category>
+<pubDate>Tue, 13 Sep 2005 00:07:00 +0900</pubDate>
+</item>
+<item>
+<title>TypePad開発エンジニアの募集</title>
+<description><![CDATA[<p>
+勤務形態: フルタイム<br />
+勤務地: 東京 (赤坂)<br />
+職種: アプリケーション・エンジニア<br />
+職務内容: TypePadのカスタマイズ、周辺開発<br />
+募集人数: 若干名
+</p>]]></description>
+<link>http://www.sixapart.jp/jobs/2005/09/13-0004.html</link>
+<guid>http://www.sixapart.jp/jobs/2005/09/13-0004.html</guid>
+<category>Jobs</category>
+<pubDate>Tue, 13 Sep 2005 00:04:00 +0900</pubDate>
+</item>
+<item>
+<title>カスタマーサポート・ディレクターの募集</title>
+<description><![CDATA[<p>勤務形態: フルタイム<br />
+勤務地: 東京(赤坂)<br />
+職種: カスタマーサポート・ディレクター<br />
+職務内容: TypePadやMovable Typeのカスタマーサポート業務の統括<br />
+募集人数: 若干名
+</p>
+]]></description>
+<link>http://www.sixapart.jp/jobs/2005/09/13-0003.html</link>
+<guid>http://www.sixapart.jp/jobs/2005/09/13-0003.html</guid>
+<category>Jobs</category>
+<pubDate>Tue, 13 Sep 2005 00:03:30 +0900</pubDate>
+</item>
+<item>
+<title>アルバイト(マーケティング・広報アシスタント)の募集</title>
+<description><![CDATA[<p>勤務形態: アルバイト<br />
+勤務地: 東京(港区)<br />
+職種:マーケティング・PRのアシスタント業務<br />
+募集人数: 若干名<br />
+時給:1000円~(但し、試用期間終了後に応相談)。交通費支給<br />
+時間:平日10時30分~18時30分まで。週3日以上(応相談)<br />
+</p>]]></description>
+<link>http://www.sixapart.jp/jobs/2005/09/13-0002.html</link>
+<guid>http://www.sixapart.jp/jobs/2005/09/13-0002.html</guid>
+<category>Jobs</category>
+<pubDate>Tue, 13 Sep 2005 00:02:00 +0900</pubDate>
+</item>
+<item>
+<title>アルバイト(開発アシスタント)の募集</title>
+<description><![CDATA[<p>勤務形態: アルバイト<br />
+勤務地: 東京(港区)<br />
+職種: アプリケーション開発のアシスタント業務<br />
+募集人数: 若干名<br />
+時給:1000円~(但し、試用期間終了後に応相談)。交通費支給<br />
+時間:平日10時30分~18時30分まで。週3日以上(応相談)
+</p>]]></description>
+<link>http://www.sixapart.jp/jobs/2005/09/13-0001.html</link>
+<guid>http://www.sixapart.jp/jobs/2005/09/13-0001.html</guid>
+<category>Jobs</category>
+<pubDate>Tue, 13 Sep 2005 00:01:00 +0900</pubDate>
+</item>
+<item>
+<title>TypePad Japan がバージョンアップしました。</title>
+<description><![CDATA[<p><a href="http://www.sixapart.jp/typepad/">「TypePad Japan(タイプパッドジャパン)」</a>において、本日、「TypePad 1.6 日本語版」へのバージョンアップを行いました。最新版となる「TypePad 1.6 日本語版」では、ブログデザインの機能強化、ポッドキャスティング対応、モブログ対応に加え、今回新たに大幅な容量アップが行われております。皆様、新しくなった<a href="http://www.sixapart.jp/typepad/">TypePad Japan</a>にどうぞご期待ください。</p>
+
+<p>なお、TypePadの携帯対応強化に関しましては、本日よりTypePad Japanのお客様を対象にオープン・ベータを開始しております。</p>
+
+<p>2005年9月5日発表のTypePad日本語版 1.6プレスリリースは<a href="http://www.sixapart.jp/press_releases/2005/09/05-1420.html">こちら</a>をご覧下さい。</p>]]></description>
+<link>http://www.sixapart.jp/news/2005/09/12-1953.html</link>
+<guid>http://www.sixapart.jp/news/2005/09/12-1953.html</guid>
+<category>news</category>
+<pubDate>Mon, 12 Sep 2005 19:53:07 +0900</pubDate>
+</item>
+
+
+</channel>
+</rss> \ No newline at end of file
diff --git a/plugins/FeedSub/extlib/XML/Feed/samples/technorati.feed b/plugins/FeedSub/extlib/XML/Feed/samples/technorati.feed
new file mode 100755
index 000000000..6274a32cd
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/samples/technorati.feed
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0"
+ xmlns:tapi="http://api.technorati.com/dtd/tapi-002.xml">
+ <channel>
+ <title>[Technorati] Tag results for greenbelt</title>
+ <link>http://www.technorati.com/tag/greenbelt</link>
+ <description>Posts tagged with "greenbelt" on Technorati.</description>
+ <pubDate>Mon, 08 Aug 2005 15:15:08 GMT</pubDate>
+ <category domain="http://www.technorati.com/tag">greenbelt</category>
+ <tapi:inboundblogs>2</tapi:inboundblogs>
+ <tapi:inboundlinks>2</tapi:inboundlinks>
+ <cloud domain="rpc.sys.com" port="80" path="/RPC2" registerProcedure="myCloud.rssPleaseNotify" protocol="xml-rpc" />
+ <generator>Technorati v1.0</generator>
+ <image>
+ <url>http://static.technorati.com/pix/logos/logo_reverse_sm.gif</url>
+ <title>Technorati logo</title>
+ <link>http://www.technorati.com</link>
+ </image>
+ <skipHours>
+ <hour>1</hour>
+ <hour>7</hour>
+ <hour>9</hour>
+ </skipHours>
+ <webMaster>support@technorati.com (Technorati Support)</webMaster>
+ <docs>http://blogs.law.harvad.edu/tech/rss</docs>
+ <ttl>60</ttl>
+ <item>
+ <title>Greenbelt</title>
+ <link>http://maggidawn.typepad.com/maggidawn/2005/07/greenbelt.html</link>
+ <description>So if the plan goes according to plan (!)... I'll be speaking at Greenbelt at these times: Slot 1...</description>
+ <guid isPermaLink="true">http://maggidawn.typepad.com/maggidawn/2005/07/greenbelt.html</guid>
+ <pubDate>Mon, 18 Jul 2005 02:11:42 GMT</pubDate>
+ <category>James</category>
+ <tapi:linkcreated>2005-07-11 02:08:12</tapi:linkcreated>
+ <comments>http://www.technorati.com/cosmos/search.html?url=http%3A%2F%2Fmaggidawn.typepad.com%2Fmaggidawn%2F2005%2F07%2Fgreenbelt.html</comments>
+ <tapi:inboundblogs>190</tapi:inboundblogs>
+ <tapi:inboundlinks>237</tapi:inboundlinks>
+ <source url="http://maggidawn.typepad.com/maggidawn/index.rdf">maggi dawn</source>
+ </item>
+
+ <item>
+ <title>Walking along the Greenbelt</title>
+ <link>http://pictureshomeless.blogspot.com/2005/06/walking-along-greenbelt.html</link>
+ <description>[IMG] Photo of homeless man walking near the greenbelt in Boise, Idaho Tags: photo homeless greenbelt Boise Idaho picture</description>
+ <guid isPermaLink="true">http://pictureshomeless.blogspot.com/2005/06/walking-along-greenbelt.html</guid>
+ <pubDate>Tue, 28 Jun 2005 01:41:24 GMT</pubDate>
+ <tapi:linkcreated>2005-06-26 17:24:03</tapi:linkcreated>
+ <comments>http://www.technorati.com/cosmos/search.html?url=http%3A%2F%2Fpictureshomeless.blogspot.com%2F2005%2F06%2Fwalking-along-greenbelt.html</comments>
+ <tapi:inboundblogs>2</tapi:inboundblogs>
+ <tapi:inboundlinks>2</tapi:inboundlinks>
+ </item>
+
+ </channel>
+</rss>
diff --git a/plugins/FeedSub/extlib/XML/Feed/schemas/atom.rnc b/plugins/FeedSub/extlib/XML/Feed/schemas/atom.rnc
new file mode 100755
index 000000000..e662d2626
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/schemas/atom.rnc
@@ -0,0 +1,338 @@
+# -*- rnc -*-
+# RELAX NG Compact Syntax Grammar for the
+# Atom Format Specification Version 11
+
+namespace atom = "http://www.w3.org/2005/Atom"
+namespace xhtml = "http://www.w3.org/1999/xhtml"
+namespace s = "http://www.ascc.net/xml/schematron"
+namespace local = ""
+
+start = atomFeed | atomEntry
+
+# Common attributes
+
+atomCommonAttributes =
+ attribute xml:base { atomUri }?,
+ attribute xml:lang { atomLanguageTag }?,
+ undefinedAttribute*
+
+# Text Constructs
+
+atomPlainTextConstruct =
+ atomCommonAttributes,
+ attribute type { "text" | "html" }?,
+ text
+
+atomXHTMLTextConstruct =
+ atomCommonAttributes,
+ attribute type { "xhtml" },
+ xhtmlDiv
+
+atomTextConstruct = atomPlainTextConstruct | atomXHTMLTextConstruct
+
+# Person Construct
+
+atomPersonConstruct =
+ atomCommonAttributes,
+ (element atom:name { text }
+ & element atom:uri { atomUri }?
+ & element atom:email { atomEmailAddress }?
+ & extensionElement*)
+
+# Date Construct
+
+atomDateConstruct =
+ atomCommonAttributes,
+ xsd:dateTime
+
+# atom:feed
+
+atomFeed =
+ [
+ s:rule [
+ context = "atom:feed"
+ s:assert [
+ test = "atom:author or not(atom:entry[not(atom:author)])"
+ "An atom:feed must have an atom:author unless all "
+ ~ "of its atom:entry children have an atom:author."
+ ]
+ ]
+ ]
+ element atom:feed {
+ atomCommonAttributes,
+ (atomAuthor*
+ & atomCategory*
+ & atomContributor*
+ & atomGenerator?
+ & atomIcon?
+ & atomId
+ & atomLink*
+ & atomLogo?
+ & atomRights?
+ & atomSubtitle?
+ & atomTitle
+ & atomUpdated
+ & extensionElement*),
+ atomEntry*
+ }
+
+# atom:entry
+
+atomEntry =
+ [
+ s:rule [
+ context = "atom:entry"
+ s:assert [
+ test = "atom:link[@rel='alternate'] "
+ ~ "or atom:link[not(@rel)] "
+ ~ "or atom:content"
+ "An atom:entry must have at least one atom:link element "
+ ~ "with a rel attribute of 'alternate' "
+ ~ "or an atom:content."
+ ]
+ ]
+ s:rule [
+ context = "atom:entry"
+ s:assert [
+ test = "atom:author or "
+ ~ "../atom:author or atom:source/atom:author"
+ "An atom:entry must have an atom:author "
+ ~ "if its feed does not."
+ ]
+ ]
+ ]
+ element atom:entry {
+ atomCommonAttributes,
+ (atomAuthor*
+ & atomCategory*
+ & atomContent?
+ & atomContributor*
+ & atomId
+ & atomLink*
+ & atomPublished?
+ & atomRights?
+ & atomSource?
+ & atomSummary?
+ & atomTitle
+ & atomUpdated
+ & extensionElement*)
+ }
+
+# atom:content
+
+atomInlineTextContent =
+ element atom:content {
+ atomCommonAttributes,
+ attribute type { "text" | "html" }?,
+ (text)*
+ }
+
+atomInlineXHTMLContent =
+ element atom:content {
+ atomCommonAttributes,
+ attribute type { "xhtml" },
+ xhtmlDiv
+ }
+
+atomInlineOtherContent =
+ element atom:content {
+ atomCommonAttributes,
+ attribute type { atomMediaType }?,
+ (text|anyElement)*
+ }
+
+atomOutOfLineContent =
+ element atom:content {
+ atomCommonAttributes,
+ attribute type { atomMediaType }?,
+ attribute src { atomUri },
+ empty
+ }
+
+atomContent = atomInlineTextContent
+ | atomInlineXHTMLContent
+ | atomInlineOtherContent
+ | atomOutOfLineContent
+
+# atom:author
+
+atomAuthor = element atom:author { atomPersonConstruct }
+
+# atom:category
+
+atomCategory =
+ element atom:category {
+ atomCommonAttributes,
+ attribute term { text },
+ attribute scheme { atomUri }?,
+ attribute label { text }?,
+ undefinedContent
+ }
+
+# atom:contributor
+
+atomContributor = element atom:contributor { atomPersonConstruct }
+
+# atom:generator
+
+atomGenerator = element atom:generator {
+ atomCommonAttributes,
+ attribute uri { atomUri }?,
+ attribute version { text }?,
+ text
+}
+
+# atom:icon
+
+atomIcon = element atom:icon {
+ atomCommonAttributes,
+ (atomUri)
+}
+
+# atom:id
+
+atomId = element atom:id {
+ atomCommonAttributes,
+ (atomUri)
+}
+
+# atom:logo
+
+atomLogo = element atom:logo {
+ atomCommonAttributes,
+ (atomUri)
+}
+
+# atom:link
+
+atomLink =
+ element atom:link {
+ atomCommonAttributes,
+ attribute href { atomUri },
+ attribute rel { atomNCName | atomUri }?,
+ attribute type { atomMediaType }?,
+ attribute hreflang { atomLanguageTag }?,
+ attribute title { text }?,
+ attribute length { text }?,
+ undefinedContent
+ }
+
+# atom:published
+
+atomPublished = element atom:published { atomDateConstruct }
+
+# atom:rights
+
+atomRights = element atom:rights { atomTextConstruct }
+
+# atom:source
+
+atomSource =
+ element atom:source {
+ atomCommonAttributes,
+ (atomAuthor*
+ & atomCategory*
+ & atomContributor*
+ & atomGenerator?
+ & atomIcon?
+ & atomId?
+ & atomLink*
+ & atomLogo?
+ & atomRights?
+ & atomSubtitle?
+ & atomTitle?
+ & atomUpdated?
+ & extensionElement*)
+ }
+
+# atom:subtitle
+
+atomSubtitle = element atom:subtitle { atomTextConstruct }
+
+# atom:summary
+
+atomSummary = element atom:summary { atomTextConstruct }
+
+# atom:title
+
+atomTitle = element atom:title { atomTextConstruct }
+
+# atom:updated
+
+atomUpdated = element atom:updated { atomDateConstruct }
+
+# Low-level simple types
+
+atomNCName = xsd:string { minLength = "1" pattern = "[^:]*" }
+
+# Whatever a media type is, it contains at least one slash
+atomMediaType = xsd:string { pattern = ".+/.+" }
+
+# As defined in RFC 3066
+atomLanguageTag = xsd:string {
+ pattern = "[A-Za-z]{1,8}(-[A-Za-z0-9]{1,8})*"
+}
+
+# Unconstrained; it's not entirely clear how IRI fit into
+# xsd:anyURI so let's not try to constrain it here
+atomUri = text
+
+# Whatever an email address is, it contains at least one @
+atomEmailAddress = xsd:string { pattern = ".+@.+" }
+
+# Simple Extension
+
+simpleExtensionElement =
+ element * - atom:* {
+ text
+ }
+
+# Structured Extension
+
+structuredExtensionElement =
+ element * - atom:* {
+ (attribute * { text }+,
+ (text|anyElement)*)
+ | (attribute * { text }*,
+ (text?, anyElement+, (text|anyElement)*))
+ }
+
+# Other Extensibility
+
+extensionElement =
+ simpleExtensionElement | structuredExtensionElement
+
+undefinedAttribute =
+ attribute * - (xml:base | xml:lang | local:*) { text }
+
+undefinedContent = (text|anyForeignElement)*
+
+anyElement =
+ element * {
+ (attribute * { text }
+ | text
+ | anyElement)*
+ }
+
+anyForeignElement =
+ element * - atom:* {
+ (attribute * { text }
+ | text
+ | anyElement)*
+ }
+
+# XHTML
+
+anyXHTML = element xhtml:* {
+ (attribute * { text }
+ | text
+ | anyXHTML)*
+}
+
+xhtmlDiv = element xhtml:div {
+ (attribute * { text }
+ | text
+ | anyXHTML)*
+}
+
+# EOF \ No newline at end of file
diff --git a/plugins/FeedSub/extlib/XML/Feed/schemas/rss10.rnc b/plugins/FeedSub/extlib/XML/Feed/schemas/rss10.rnc
new file mode 100755
index 000000000..725094788
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/schemas/rss10.rnc
@@ -0,0 +1,113 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- http://www.xml.com/lpt/a/2002/01/23/relaxng.html -->
+<!-- http://www.oasis-open.org/committees/relax-ng/tutorial-20011203.html -->
+<!-- http://www.zvon.org/xxl/XMLSchemaTutorial/Output/ser_wildcards_st8.html -->
+
+<grammar xmlns='http://relaxng.org/ns/structure/1.0'
+ xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+ ns='http://purl.org/rss/1.0/'
+ datatypeLibrary='http://www.w3.org/2001/XMLSchema-datatypes'>
+
+ <start>
+ <element name='RDF' ns='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
+ <ref name='RDFContent'/>
+ </element>
+ </start>
+
+ <define name='RDFContent' ns='http://purl.org/rss/1.0/'>
+ <interleave>
+ <element name='channel'>
+ <ref name='channelContent'/>
+ </element>
+ <optional>
+ <element name='image'><ref name='imageContent'/></element>
+ </optional>
+ <oneOrMore>
+ <element name='item'><ref name='itemContent'/></element>
+ </oneOrMore>
+ </interleave>
+ </define>
+
+ <define name='channelContent' combine="interleave">
+ <interleave>
+ <element name='title'><data type='string'/></element>
+ <element name='link'><data type='anyURI'/></element>
+ <element name='description'><data type='string'/></element>
+ <element name='image'>
+ <attribute name='resource' ns='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
+ <data type='anyURI'/>
+ </attribute>
+ </element>
+ <element name='items'>
+ <ref name='itemsContent'/>
+ </element>
+ <attribute name='about' ns='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
+ <data type='anyURI'/>
+ </attribute>
+ </interleave>
+ </define>
+
+ <define name="itemsContent">
+ <element name="Seq" ns='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
+ <oneOrMore>
+ <element name="li" ns='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
+ <choice>
+ <attribute name='resource'> <!-- Why doesn't RDF/RSS1.0 ns qualify this attribute? -->
+ <data type='anyURI'/>
+ </attribute>
+ <attribute name='resource' ns='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
+ <data type='anyURI'/>
+ </attribute>
+ </choice>
+ </element>
+ </oneOrMore>
+ </element>
+ </define>
+
+ <define name='imageContent'>
+ <interleave>
+ <element name='title'><data type='string'/></element>
+ <element name='link'><data type='anyURI'/></element>
+ <element name='url'><data type='anyURI'/></element>
+ <attribute name='about' ns='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
+ <data type='anyURI'/>
+ </attribute>
+ </interleave>
+ </define>
+
+ <define name='itemContent'>
+ <interleave>
+ <element name='title'><data type='string'/></element>
+ <element name='link'><data type='anyURI'/></element>
+ <optional><element name='description'><data type='string'/></element></optional>
+ <ref name="anyThing"/>
+ <attribute name='about' ns='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
+ <data type='anyURI'/>
+ </attribute>
+ </interleave>
+ </define>
+
+
+ <define name='anyThing'>
+ <zeroOrMore>
+ <choice>
+ <text/>
+ <element>
+ <anyName>
+ <except>
+ <nsName/>
+ </except>
+ </anyName>
+ <ref name='anyThing'/>
+ <zeroOrMore>
+ <attribute>
+ <anyName/>
+ </attribute>
+ </zeroOrMore>
+ </element>
+ </choice>
+ </zeroOrMore>
+ </define>
+
+</grammar>
diff --git a/plugins/FeedSub/extlib/XML/Feed/schemas/rss11.rnc b/plugins/FeedSub/extlib/XML/Feed/schemas/rss11.rnc
new file mode 100755
index 000000000..c8633766f
--- /dev/null
+++ b/plugins/FeedSub/extlib/XML/Feed/schemas/rss11.rnc
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ RELAX NG Compact Schema for RSS 1.1
+ Sean B. Palmer, inamidst.com
+ Christopher Schmidt, crschmidt.net
+ License: This schema is in the public domain
+-->
+<grammar xmlns:rss="http://purl.org/net/rss1.1#" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" ns="http://purl.org/net/rss1.1#" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+ <start>
+ <ref name="Channel"/>
+ </start>
+ <define name="Channel">
+ <a:documentation>http://purl.org/net/rss1.1#Channel</a:documentation>
+ <element name="Channel">
+ <ref name="Channel.content"/>
+
+ </element>
+ </define>
+ <define name="Channel.content">
+ <optional>
+ <ref name="AttrXMLLang"/>
+ </optional>
+ <optional>
+ <ref name="AttrXMLBase"/>
+ </optional>
+
+ <ref name="AttrRDFAbout"/>
+ <interleave>
+ <ref name="title"/>
+ <ref name="link"/>
+ <ref name="description"/>
+ <optional>
+ <ref name="image"/>
+ </optional>
+ <zeroOrMore>
+
+ <ref name="Any"/>
+ </zeroOrMore>
+ <ref name="items"/>
+ </interleave>
+ </define>
+ <define name="title">
+ <a:documentation>http://purl.org/net/rss1.1#title</a:documentation>
+ <element name="title">
+
+ <ref name="title.content"/>
+ </element>
+ </define>
+ <define name="title.content">
+ <optional>
+ <ref name="AttrXMLLang"/>
+ </optional>
+ <text/>
+ </define>
+
+ <define name="link">
+ <a:documentation>http://purl.org/net/rss1.1#link</a:documentation>
+ <element name="link">
+ <ref name="link.content"/>
+ </element>
+ </define>
+ <define name="link.content">
+ <data type="anyURI"/>
+
+ </define>
+ <define name="description">
+ <a:documentation>http://purl.org/net/rss1.1#description</a:documentation>
+ <element name="description">
+ <ref name="description.content"/>
+ </element>
+ </define>
+ <define name="description.content">
+
+ <optional>
+ <ref name="AttrXMLLang"/>
+ </optional>
+ <text/>
+ </define>
+ <define name="image">
+ <a:documentation>http://purl.org/net/rss1.1#image</a:documentation>
+ <element name="image">
+
+ <ref name="image.content"/>
+ </element>
+ </define>
+ <define name="image.content">
+ <optional>
+ <ref name="AttrXMLLang"/>
+ </optional>
+ <ref name="AttrRDFResource"/>
+ <interleave>
+
+ <ref name="title"/>
+ <optional>
+ <ref name="link"/>
+ </optional>
+ <ref name="url"/>
+ <zeroOrMore>
+ <ref name="Any"/>
+ </zeroOrMore>
+ </interleave>
+
+ </define>
+ <define name="url">
+ <a:documentation>http://purl.org/net/rss1.1#url</a:documentation>
+ <element name="url">
+ <ref name="url.content"/>
+ </element>
+ </define>
+ <define name="url.content">
+
+ <data type="anyURI"/>
+ </define>
+ <define name="items">
+ <a:documentation>http://purl.org/net/rss1.1#items</a:documentation>
+ <element name="items">
+ <ref name="items.content"/>
+ </element>
+ </define>
+
+ <define name="items.content">
+ <optional>
+ <ref name="AttrXMLLang"/>
+ </optional>
+ <ref name="AttrRDFCollection"/>
+ <zeroOrMore>
+ <ref name="item"/>
+ </zeroOrMore>
+ </define>
+
+ <define name="item">
+ <a:documentation>http://purl.org/net/rss1.1#item</a:documentation>
+ <element name="item">
+ <ref name="item.content"/>
+ </element>
+ </define>
+ <define name="item.content">
+ <optional>
+
+ <ref name="AttrXMLLang"/>
+ </optional>
+ <ref name="AttrRDFAbout"/>
+ <interleave>
+ <ref name="title"/>
+ <ref name="link"/>
+ <optional>
+ <ref name="description"/>
+ </optional>
+
+ <optional>
+ <ref name="image"/>
+ </optional>
+ <zeroOrMore>
+ <ref name="Any"/>
+ </zeroOrMore>
+ </interleave>
+ </define>
+ <define name="Any">
+
+ <a:documentation>http://purl.org/net/rss1.1#Any</a:documentation>
+ <element>
+ <anyName>
+ <except>
+ <nsName/>
+ </except>
+ </anyName>
+ <ref name="Any.content"/>
+
+ </element>
+ </define>
+ <define name="Any.content">
+ <zeroOrMore>
+ <attribute>
+ <anyName>
+ <except>
+ <nsName/>
+ <nsName ns=""/>
+
+ </except>
+ </anyName>
+ </attribute>
+ </zeroOrMore>
+ <mixed>
+ <zeroOrMore>
+ <ref name="Any"/>
+ </zeroOrMore>
+ </mixed>
+
+ </define>
+ <define name="AttrXMLLang">
+ <attribute name="xml:lang">
+ <data type="language"/>
+ </attribute>
+ </define>
+ <define name="AttrXMLBase">
+ <attribute name="xml:base">
+ <data type="anyURI"/>
+
+ </attribute>
+ </define>
+ <define name="AttrRDFAbout">
+ <attribute name="rdf:about">
+ <data type="anyURI"/>
+ </attribute>
+ </define>
+ <define name="AttrRDFResource">
+ <attribute name="rdf:parseType">
+
+ <value>Resource</value>
+ </attribute>
+ </define>
+ <define name="AttrRDFCollection">
+ <attribute name="rdf:parseType">
+ <value>Collection</value>
+ </attribute>
+ </define>
+
+</grammar>
diff --git a/plugins/FeedSub/extlib/xml-feed-parser-bug-16416.patch b/plugins/FeedSub/extlib/xml-feed-parser-bug-16416.patch
new file mode 100644
index 000000000..c53bd9737
--- /dev/null
+++ b/plugins/FeedSub/extlib/xml-feed-parser-bug-16416.patch
@@ -0,0 +1,14 @@
+diff --git a/htdocs/lib/pear/XML/Feed/Parser/RSS2.php b/htdocs/lib/pear/XML/Feed/Parser/RSS2.php
+index c5d79d1..308a4ab 100644
+--- a/htdocs/lib/pear/XML/Feed/Parser/RSS2.php
++++ b/htdocs/lib/pear/XML/Feed/Parser/RSS2.php
+@@ -321,7 +321,8 @@ class XML_Feed_Parser_RSS2 extends XML_Feed_Parser_Type
+ */
+ function getLink($offset, $attribute = 'href', $params = array())
+ {
+- $links = $this->model->getElementsByTagName('link');
++ $xPath = new DOMXPath($this->model);
++ $links = $xPath->query('//link');
+
+ if ($links->length <= $offset) {
+ return false;
diff --git a/plugins/FeedSub/feeddiscovery.php b/plugins/FeedSub/feeddiscovery.php
new file mode 100644
index 000000000..35edaca33
--- /dev/null
+++ b/plugins/FeedSub/feeddiscovery.php
@@ -0,0 +1,209 @@
+<?php
+/*
+ * 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/>.
+ */
+
+/**
+ * @package FeedSubPlugin
+ * @maintainer Brion Vibber <brion@status.net>
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+
+class FeedSubBadURLException extends FeedSubException
+{
+}
+
+class FeedSubBadResponseException extends FeedSubException
+{
+}
+
+class FeedSubEmptyException extends FeedSubException
+{
+}
+
+class FeedSubBadHTMLException extends FeedSubException
+{
+}
+
+class FeedSubUnrecognizedTypeException extends FeedSubException
+{
+}
+
+class FeedSubNoFeedException extends FeedSubException
+{
+}
+
+class FeedDiscovery
+{
+ public $uri;
+ public $type;
+ public $body;
+
+
+ public function feedMunger()
+ {
+ require_once 'XML/Feed/Parser.php';
+ $feed = new XML_Feed_Parser($this->body, false, false, true); // @fixme
+ return new FeedMunger($feed, $this->uri);
+ }
+
+ /**
+ * @param string $url
+ * @param bool $htmlOk
+ * @return string with validated URL
+ * @throws FeedSubBadURLException
+ * @throws FeedSubBadHtmlException
+ * @throws FeedSubNoFeedException
+ * @throws FeedSubEmptyException
+ * @throws FeedSubUnrecognizedTypeException
+ */
+ function discoverFromURL($url, $htmlOk=true)
+ {
+ try {
+ $client = new HTTPClient();
+ $response = $client->get($url);
+ } catch (HTTP_Request2_Exception $e) {
+ throw new FeedSubBadURLException($e);
+ }
+
+ if ($htmlOk) {
+ $type = $response->getHeader('Content-Type');
+ $isHtml = preg_match('!^(text/html|application/xhtml\+xml)!i', $type);
+ if ($isHtml) {
+ $target = $this->discoverFromHTML($response->getUrl(), $response->getBody());
+ if (!$target) {
+ throw new FeedSubNoFeedException($url);
+ }
+ return $this->discoverFromURL($target, false);
+ }
+ }
+
+ return $this->initFromResponse($response);
+ }
+
+ function initFromResponse($response)
+ {
+ if (!$response->isOk()) {
+ throw new FeedSubBadResponseException($response->getCode());
+ }
+
+ $sourceurl = $response->getUrl();
+ $body = $response->getBody();
+ if (!$body) {
+ throw new FeedSubEmptyException($sourceurl);
+ }
+
+ $type = $response->getHeader('Content-Type');
+ if (preg_match('!^(text/xml|application/xml|application/(rss|atom)\+xml)!i', $type)) {
+ $this->uri = $sourceurl;
+ $this->type = $type;
+ $this->body = $body;
+ return true;
+ } else {
+ common_log(LOG_WARNING, "Unrecognized feed type $type for $sourceurl");
+ throw new FeedSubUnrecognizedTypeException($type);
+ }
+ }
+
+ /**
+ * @param string $url source URL, used to resolve relative links
+ * @param string $body HTML body text
+ * @return mixed string with URL or false if no target found
+ */
+ function discoverFromHTML($url, $body)
+ {
+ // DOMDocument::loadHTML may throw warnings on unrecognized elements.
+ $old = error_reporting(error_reporting() & ~E_WARNING);
+ $dom = new DOMDocument();
+ $ok = $dom->loadHTML($body);
+ error_reporting($old);
+
+ if (!$ok) {
+ throw new FeedSubBadHtmlException();
+ }
+
+ // Autodiscovery links may be relative to the page's URL or <base href>
+ $base = false;
+ $nodes = $dom->getElementsByTagName('base');
+ for ($i = 0; $i < $nodes->length; $i++) {
+ $node = $nodes->item($i);
+ if ($node->hasAttributes()) {
+ $href = $node->attributes->getNamedItem('href');
+ if ($href) {
+ $base = trim($href->value);
+ }
+ }
+ }
+ if ($base) {
+ $base = $this->resolveURI($base, $url);
+ } else {
+ $base = $url;
+ }
+
+ // Ok... now on to the links!
+ // @fixme merge with the munger link checks
+ $nodes = $dom->getElementsByTagName('link');
+ for ($i = 0; $i < $nodes->length; $i++) {
+ $node = $nodes->item($i);
+ if ($node->hasAttributes()) {
+ $rel = $node->attributes->getNamedItem('rel');
+ $type = $node->attributes->getNamedItem('type');
+ $href = $node->attributes->getNamedItem('href');
+ if ($rel && $type && $href) {
+ $rel = trim($rel->value);
+ $type = trim($type->value);
+ $href = trim($href->value);
+
+ $feedTypes = array(
+ 'application/rss+xml',
+ 'application/atom+xml',
+ );
+ if (trim($rel) == 'alternate' && in_array($type, $feedTypes)) {
+ return $this->resolveURI($href, $base);
+ }
+ }
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Resolve a possibly relative URL against some absolute base URL
+ * @param string $rel relative or absolute URL
+ * @param string $base absolute URL
+ * @return string absolute URL, or original URL if could not be resolved.
+ */
+ function resolveURI($rel, $base)
+ {
+ require_once "Net/URL2.php";
+ try {
+ $relUrl = new Net_URL2($rel);
+ if ($relUrl->isAbsolute()) {
+ return $rel;
+ }
+ $baseUrl = new Net_URL2($base);
+ $absUrl = $baseUrl->resolve($relUrl);
+ return $absUrl->getURL();
+ } catch (Exception $e) {
+ common_log(LOG_WARNING, 'Unable to resolve relative link "' .
+ $rel . '" against base "' . $base . '": ' . $e->getMessage());
+ return $rel;
+ }
+ }
+}
diff --git a/plugins/FeedSub/feedinfo.php b/plugins/FeedSub/feedinfo.php
new file mode 100644
index 000000000..fff66afe9
--- /dev/null
+++ b/plugins/FeedSub/feedinfo.php
@@ -0,0 +1,212 @@
+<?php
+
+/*
+
+Subscription flow:
+
+ $feedinfo->subscribe()
+ generate random verification token
+ save to verify_token
+ sends a sub request to the hub...
+
+ feedsub/callback
+ hub sends confirmation back to us via GET
+ We verify the request, then echo back the challenge.
+ On our end, we save the time we subscribed and the lease expiration
+
+ feedsub/callback
+ hub sends us updates via POST
+ ?
+
+*/
+
+class FeedDBException extends FeedSubException
+{
+ public $obj;
+
+ function __construct($obj)
+ {
+ parent::__construct('Database insert failure');
+ $this->obj = $obj;
+ }
+}
+
+class Feedinfo extends Plugin_DataObject
+{
+ public $__table = 'feedinfo';
+
+ public $id;
+ public $profile_id;
+
+ public $feeduri;
+ public $homeuri;
+ public $huburi;
+
+ // PuSH subscription data
+ public $verify_token;
+ public $sub_start;
+ public $sub_end;
+
+ public $created;
+ public $lastupdate;
+
+
+ public /*static*/ function staticGet($k, $v=null)
+ {
+ return parent::staticGet(__CLASS__, $k, $v);
+ }
+
+ function tableDef()
+ {
+ class_exists('Schema'); // autoload hack
+ // warning: the autoincrement doesn't seem to set.
+ // alter table feedinfo change column id id int(11) not null auto_increment;
+ return new TableDef($this->__table,
+ array(new ColumnDef('id', 'integer',
+ null, false, 'PRI', '0', null, true),
+ new ColumnDef('profile_id', 'integer',
+ null, false),
+ new ColumnDef('feeduri', 'varchar',
+ 255, false, 'UNI'),
+ new ColumnDef('homeuri', 'varchar',
+ 255, false),
+ new ColumnDef('huburi', 'varchar',
+ 255, false),
+ new ColumnDef('verify_token', 'varchar',
+ 32, true),
+ new ColumnDef('sub_start', 'datetime',
+ null, true),
+ new ColumnDef('sub_end', 'datetime',
+ null, true),
+ new ColumnDef('created', 'datetime',
+ null, false),
+ new ColumnDef('lastupdate', 'datetime',
+ null, false)));
+ }
+
+ public function getProfile()
+ {
+ return Profile::staticGet('id', $this->profile_id);
+ }
+
+ /**
+ * @param FeedMunger $munger
+ * @return Feedinfo
+ */
+ public static function ensureProfile($munger)
+ {
+ $feedinfo = $munger->feedinfo();
+
+ $current = self::staticGet('feeduri', $feedinfo->feeduri);
+ if ($current) {
+ // @fixme we should probably update info as necessary
+ return $current;
+ }
+
+ $feedinfo->query('BEGIN');
+
+ try {
+ $profile = $munger->profile();
+ $result = $profile->insert();
+ if (empty($result)) {
+ throw new FeedDBException($profile);
+ }
+
+ $feedinfo->profile_id = $profile->id;
+ $result = $feedinfo->insert();
+ if (empty($result)) {
+ throw new FeedDBException($feedinfo);
+ }
+
+ $feedinfo->query('COMMIT');
+ } catch (FeedDBException $e) {
+ common_log_db_error($e->obj, 'INSERT', __FILE__);
+ $feedinfo->query('ROLLBACK');
+ return false;
+ }
+ return $feedinfo;
+ }
+
+ /**
+ * Send a subscription request to the hub for this feed.
+ * The hub will later send us a confirmation POST to /feedsub/callback.
+ *
+ * @return bool true on success, false on failure
+ */
+ public function subscribe()
+ {
+ // @fixme use the verification token
+ #$token = md5(mt_rand() . ':' . $this->feeduri);
+ #$this->verify_token = $token;
+ #$this->update(); // @fixme
+
+ try {
+ $callback = common_local_url('feedsubcallback', array('feed' => $this->id));
+ $headers = array('Content-Type: application/x-www-form-urlencoded');
+ $post = array('hub.mode' => 'subscribe',
+ 'hub.callback' => $callback,
+ 'hub.verify' => 'async',
+ //'hub.verify_token' => $token,
+ //'hub.lease_seconds' => 0,
+ 'hub.topic' => $this->feeduri);
+ $client = new HTTPClient();
+ $response = $client->post($this->huburi, $headers, $post);
+ if ($response->getStatus() >= 200 && $response->getStatus() < 300) {
+ common_log(LOG_INFO, __METHOD__ . ': sub req ok');
+ return true;
+ } else {
+ common_log(LOG_INFO, __METHOD__ . ': sub req failed');
+ return false;
+ }
+ } catch (Exception $e) {
+ // wtf!
+ common_log(LOG_ERR, __METHOD__ . ": error \"{$e->getMessage()}\" hitting hub $this->huburi subscribing to $this->feeduri");
+ return false;
+ }
+ }
+
+ /**
+ * Read and post notices for updates from the feed.
+ * Currently assumes that all items in the feed are new,
+ * coming from a PuSH hub.
+ *
+ * @param string $xml source of Atom or RSS feed
+ */
+ public function postUpdates($xml)
+ {
+ common_log(LOG_INFO, __METHOD__ . ": packet for \"$this->feeduri\"! $xml");
+ require_once "XML/Feed/Parser.php";
+ $feed = new XML_Feed_Parser($xml, false, false, true);
+ $munger = new FeedMunger($feed);
+
+ $hits = 0;
+ foreach ($feed as $index => $entry) {
+ // @fixme this might sort in wrong order if we get multiple updates
+
+ $notice = $munger->notice($index);
+ $notice->profile_id = $this->profile_id;
+
+ // Double-check for oldies
+ // @fixme this could explode horribly for multiple feeds on a blog. sigh
+ $dupe = new Notice();
+ $dupe->uri = $notice->uri;
+ $dupe->find();
+ if ($dupe->fetch()) {
+ common_log(LOG_WARNING, __METHOD__ . ": tried to save dupe notice for entry {$notice->uri} of feed {$this->feeduri}");
+ continue;
+ }
+
+ if (Event::handle('StartNoticeSave', array(&$notice))) {
+ $id = $notice->insert();
+ Event::handle('EndNoticeSave', array($notice));
+ }
+ $notice->addToInboxes();
+
+ common_log(LOG_INFO, __METHOD__ . ": saved notice {$notice->id} for entry $index of update to \"{$this->feeduri}\"");
+ $hits++;
+ }
+ if ($hits == 0) {
+ common_log(LOG_INFO, __METHOD__ . ": no updates in packet for \"$this->feeduri\"! $xml");
+ }
+ }
+}
diff --git a/plugins/FeedSub/feedinfo.sql b/plugins/FeedSub/feedinfo.sql
new file mode 100644
index 000000000..e9b53d26e
--- /dev/null
+++ b/plugins/FeedSub/feedinfo.sql
@@ -0,0 +1,14 @@
+CREATE TABLE `feedinfo` (
+ `id` int(11) NOT NULL auto_increment,
+ `profile_id` int(11) NOT NULL,
+ `feeduri` varchar(255) NOT NULL,
+ `homeuri` varchar(255) NOT NULL,
+ `huburi` varchar(255) NOT NULL,
+ `verify_token` varchar(32) default NULL,
+ `sub_start` datetime default NULL,
+ `sub_end` datetime default NULL,
+ `created` datetime NOT NULL,
+ `lastupdate` datetime NOT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `feedinfo_feeduri_idx` (`feeduri`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
diff --git a/plugins/FeedSub/feedmunger.php b/plugins/FeedSub/feedmunger.php
new file mode 100644
index 000000000..bb8075da9
--- /dev/null
+++ b/plugins/FeedSub/feedmunger.php
@@ -0,0 +1,238 @@
+<?php
+/*
+ * 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/>.
+ */
+
+/**
+ * @package FeedSubPlugin
+ * @maintainer Brion Vibber <brion@status.net>
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+
+class FeedSubPreviewNotice extends Notice
+{
+ protected $fetched = true;
+
+ function __construct($profile)
+ {
+ //parent::__construct(); // uhhh?
+ $this->profile = $profile;
+ }
+
+ function getProfile()
+ {
+ return $this->profile;
+ }
+
+ function find()
+ {
+ return true;
+ }
+
+ function fetch()
+ {
+ $got = $this->fetched;
+ $this->fetched = false;
+ return $got;
+ }
+}
+
+class FeedSubPreviewProfile extends Profile
+{
+ function getAvatar($width, $height=null)
+ {
+ return new FeedSubPreviewAvatar($width, $height);
+ }
+}
+
+class FeedSubPreviewAvatar extends Avatar
+{
+ function displayUrl() {
+ return common_path('plugins/FeedSub/images/48px-Feed-icon.svg.png');
+ }
+}
+
+class FeedMunger
+{
+ /**
+ * @param XML_Feed_Parser $feed
+ */
+ function __construct($feed, $url=null)
+ {
+ $this->feed = $feed;
+ $this->url = $url;
+ }
+
+ function feedinfo()
+ {
+ $feedinfo = new Feedinfo();
+ $feedinfo->feeduri = $this->url;
+ $feedinfo->homeuri = $this->feed->link;
+ $feedinfo->huburi = $this->getHubLink();
+ return $feedinfo;
+ }
+
+ function getAtomLink($item, $attribs=array())
+ {
+ // XML_Feed_Parser gets confused by multiple <link> elements.
+ $dom = $item->model;
+
+ // Note that RSS feeds would embed an <atom:link> so this should work for both.
+ /// http://code.google.com/p/pubsubhubbub/wiki/RssFeeds
+ // <link rel='hub' href='http://pubsubhubbub.appspot.com/'/>
+ $links = $dom->getElementsByTagNameNS('http://www.w3.org/2005/Atom', 'link');
+ for ($i = 0; $i < $links->length; $i++) {
+ $node = $links->item($i);
+ if ($node->hasAttributes()) {
+ $href = $node->attributes->getNamedItem('href');
+ if ($href) {
+ $matches = 0;
+ foreach ($attribs as $name => $val) {
+ $attrib = $node->attributes->getNamedItem($name);
+ if ($attrib && $attrib->value == $val) {
+ $matches++;
+ }
+ }
+ if ($matches == count($attribs)) {
+ return $href->value;
+ }
+ }
+ }
+ }
+ return false;
+ }
+
+ function getRssLink($item)
+ {
+ // XML_Feed_Parser gets confused by multiple <link> elements.
+ $dom = $item->model;
+
+ // Note that RSS feeds would embed an <atom:link> so this should work for both.
+ /// http://code.google.com/p/pubsubhubbub/wiki/RssFeeds
+ // <link rel='hub' href='http://pubsubhubbub.appspot.com/'/>
+ $links = $dom->getElementsByTagName('link');
+ for ($i = 0; $i < $links->length; $i++) {
+ $node = $links->item($i);
+ if (!$node->hasAttributes()) {
+ return $node->textContent;
+ }
+ }
+ return false;
+ }
+
+ function getAltLink($item)
+ {
+ // Check for an atom link...
+ $link = $this->getAtomLink($item, array('rel' => 'alternate', 'type' => 'text/html'));
+ if (!$link) {
+ $link = $this->getRssLink($item);
+ }
+ return $link;
+ }
+
+ function getHubLink()
+ {
+ return $this->getAtomLink($this->feed, array('rel' => 'hub'));
+ }
+
+ function profile($preview=false)
+ {
+ if ($preview) {
+ $profile = new FeedSubPreviewProfile();
+ } else {
+ $profile = new Profile();
+ }
+
+ // @todo validate/normalize nick?
+ $profile->nickname = $this->feed->title;
+ $profile->fullname = $this->feed->title;
+ $profile->homepage = $this->getAltLink($this->feed);
+ $profile->bio = $this->feed->description;
+ $profile->profileurl = $this->getAltLink($this->feed);
+
+ // @todo tags from categories
+ // @todo lat/lon/location?
+
+ return $profile;
+ }
+
+ function notice($index=1, $preview=false)
+ {
+ $entry = $this->feed->getEntryByOffset($index);
+ if (!$entry) {
+ return null;
+ }
+
+ if ($preview) {
+ $notice = new FeedSubPreviewNotice($this->profile(true));
+ $notice->id = -1;
+ } else {
+ $notice = new Notice();
+ }
+
+ $link = $this->getAltLink($entry);
+ $notice->uri = $link;
+ $notice->url = $link;
+ $notice->content = $this->noticeFromEntry($entry);
+ $notice->rendered = common_render_content($notice->content, $notice);
+ $notice->created = common_sql_date($entry->updated); // @fixme
+ $notice->is_local = Notice::GATEWAY;
+ $notice->source = 'feed';
+
+ return $notice;
+ }
+
+ /**
+ * @param XML_Feed_Type $entry
+ * @return string notice text, within post size limit
+ */
+ function noticeFromEntry($entry)
+ {
+ $title = $entry->title;
+ $link = $entry->link;
+
+ // @todo We can get <category> entries like this:
+ // $cats = $entry->getCategory('category', array(0, true));
+ // but it feels like an awful hack. If it's accessible cleanly,
+ // try adding #hashtags from the categories/tags on a post.
+
+ // @todo Should we force a language here?
+ $format = dgettext("FeedSubPlugin", 'New post: "%1$s" %2$s');
+ $title = $entry->title;
+ $link = $this->getAltLink($entry);
+ $out = sprintf($format, $title, $link);
+
+ // Trim link if needed...
+ $max = Notice::maxContent();
+ if (mb_strlen($out) > $max) {
+ $link = common_shorten_url($link);
+ $out = sprintf($format, $title, $link);
+ }
+
+ // Trim title if needed...
+ if (mb_strlen($out) > $max) {
+ $ellipsis = "\xe2\x80\xa6"; // U+2026 HORIZONTAL ELLIPSIS
+ $used = mb_strlen($out) - mb_strlen($title);
+ $available = $max - $used - mb_strlen($ellipsis);
+ $title = mb_substr($title, 0, $available) . $ellipsis;
+ $out = sprintf($format, $title, $link);
+ }
+
+ return $out;
+ }
+}
diff --git a/plugins/FeedSub/images/24px-Feed-icon.svg.png b/plugins/FeedSub/images/24px-Feed-icon.svg.png
new file mode 100644
index 000000000..317225814
--- /dev/null
+++ b/plugins/FeedSub/images/24px-Feed-icon.svg.png
Binary files differ
diff --git a/plugins/FeedSub/images/48px-Feed-icon.svg.png b/plugins/FeedSub/images/48px-Feed-icon.svg.png
new file mode 100644
index 000000000..bd1da4f91
--- /dev/null
+++ b/plugins/FeedSub/images/48px-Feed-icon.svg.png
Binary files differ
diff --git a/plugins/FeedSub/images/96px-Feed-icon.svg.png b/plugins/FeedSub/images/96px-Feed-icon.svg.png
new file mode 100644
index 000000000..bf16571ec
--- /dev/null
+++ b/plugins/FeedSub/images/96px-Feed-icon.svg.png
Binary files differ
diff --git a/plugins/FeedSub/images/README b/plugins/FeedSub/images/README
new file mode 100644
index 000000000..d9379c23e
--- /dev/null
+++ b/plugins/FeedSub/images/README
@@ -0,0 +1,5 @@
+Feed icon rendered from http://commons.wikimedia.org/wiki/File:Feed-icon.svg
+
+Originally distributed by the Mozilla Foundation under a MPL/GPL/LGPL tri-license:
+
+http://www.mozilla.org/MPL/boilerplate-1.1/mpl-tri-license-html
diff --git a/plugins/FeedSub/tests/FeedDiscoveryTest.php b/plugins/FeedSub/tests/FeedDiscoveryTest.php
new file mode 100644
index 000000000..1c5249701
--- /dev/null
+++ b/plugins/FeedSub/tests/FeedDiscoveryTest.php
@@ -0,0 +1,111 @@
+<?php
+
+if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
+ print "This script must be run from the command line\n";
+ exit();
+}
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
+define('STATUSNET', true);
+define('LACONICA', true);
+
+require_once INSTALLDIR . '/lib/common.php';
+require_once INSTALLDIR . '/plugins/FeedSub/feedsub.php';
+
+class FeedDiscoveryTest extends PHPUnit_Framework_TestCase
+{
+ /**
+ * @dataProvider provider
+ *
+ */
+ public function testProduction($url, $html, $expected)
+ {
+ $sub = new FeedDiscovery();
+ $url = $sub->discoverFromHTML($url, $html);
+ $this->assertEquals($expected, $url);
+ }
+
+ static public function provider()
+ {
+ $sampleHeader = <<<END
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head profile="http://gmpg.org/xfn/11">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+<title>leŭksman </title>
+
+<meta name="generator" content="WordPress 2.8.6" /> <!-- leave this for stats -->
+
+<link rel="stylesheet" href="http://leuksman.com/log/wp-content/themes/leuksman/style.css" type="text/css" media="screen" />
+<link rel="alternate" type="application/rss+xml" title="leŭksman RSS Feed" href="http://leuksman.com/log/feed/" />
+<link rel="pingback" href="http://leuksman.com/log/xmlrpc.php" />
+
+<meta name="viewport" content="width = 640" />
+
+<xmeta name="viewport" content="initial-scale=2.3, user-scalable=no" />
+
+<style type="text/css" media="screen">
+
+ #page { background: url("http://leuksman.com/log/wp-content/themes/leuksman/images/kubrickbg.jpg") repeat-y top; border: none; }
+
+</style>
+
+<link rel="EditURI" type="application/rsd+xml" title="RSD" href="http://leuksman.com/log/xmlrpc.php?rsd" />
+<link rel="wlwmanifest" type="application/wlwmanifest+xml" href="http://leuksman.com/log/wp-includes/wlwmanifest.xml" />
+<link rel='index' title='leŭksman' href='http://leuksman.com/log' />
+<meta name="generator" content="WordPress 2.8.6" />
+</head>
+<body>
+</body>
+</html>
+END;
+ return array(
+ array('http://example.com/',
+ '<html><link rel="alternate" href="http://example.com/feed/rss" type="application/rss+xml">',
+ 'http://example.com/feed/rss'),
+ array('http://example.com/atom',
+ '<html><link rel="alternate" href="http://example.com/feed/atom" type="application/atom+xml">',
+ 'http://example.com/feed/atom'),
+ array('http://example.com/empty',
+ '<html><link rel="alternate" href="http://example.com/index.pdf" type="application/pdf">',
+ false),
+ array('http://example.com/tagsoup',
+ '<body><pre><LINK rel=alternate hRef=http://example.com/feed/rss type=application/rss+xml><fnork',
+ 'http://example.com/feed/rss'),
+ // 'rel' attribute must be lowercase, alone per http://www.rssboard.org/rss-autodiscovery
+ array('http://example.com/tagsoup2',
+ '<body><pre><LINK rel=" feeders alternate 467" hRef=http://example.com/feed/rss type=application/rss+xml><fnork',
+ false),
+ array('http://example.com/tagsoup3',
+ '<body><pre><LINK rel=ALTERNATE hRef=http://example.com/feed/rss type=application/rss+xml><fnork',
+ false),
+ array('http://example.com/relative/link1',
+ '<html><link rel="alternate" href="/feed/rss" type="application/rss+xml">',
+ 'http://example.com/feed/rss'),
+ array('http://example.com/relative/link2',
+ '<html><link rel="alternate" href="../feed/rss" type="application/rss+xml">',
+ 'http://example.com/feed/rss'),
+ array('http://example.com/relative/link3',
+ '<html><link rel="alternate" href="http:/feed/rss" type="application/rss+xml">',
+ 'http://example.com/feed/rss'),
+ array('http://example.com/base/link1',
+ '<html><link rel="alternate" href="/feed/rss" type="application/rss+xml"><base href="http://target.example.com/">',
+ 'http://target.example.com/feed/rss'),
+ array('http://example.com/base/link2',
+ '<html><link rel="alternate" href="feed/rss" type="application/rss+xml"><base href="http://target.example.com/">',
+ 'http://target.example.com/feed/rss'),
+ array('http://example.com/base/link3',
+ '<html><link rel="alternate" href="http:/feed/rss" type="application/rss+xml"><base href="http://target.example.com/">',
+ 'http://target.example.com/feed/rss'),
+ // Trick question! There's a <base> but no href on it
+ array('http://example.com/relative/fauxbase',
+ '<html><link rel="alternate" href="../feed/rss" type="application/rss+xml"><base target="top">',
+ 'http://example.com/feed/rss'),
+ // Actual WordPress blog header example
+ array('http://leuksman.com/log/',
+ $sampleHeader,
+ 'http://leuksman.com/log/feed/'));
+ }
+}
diff --git a/plugins/FeedSub/tests/FeedMungerTest.php b/plugins/FeedSub/tests/FeedMungerTest.php
new file mode 100644
index 000000000..0ce24c9fb
--- /dev/null
+++ b/plugins/FeedSub/tests/FeedMungerTest.php
@@ -0,0 +1,147 @@
+<?php
+
+if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
+ print "This script must be run from the command line\n";
+ exit();
+}
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
+define('STATUSNET', true);
+define('LACONICA', true);
+
+require_once INSTALLDIR . '/lib/common.php';
+require_once INSTALLDIR . '/plugins/FeedSub/feedsub.php';
+
+require_once 'XML/Feed/Parser.php';
+
+class FeedMungerTest extends PHPUnit_Framework_TestCase
+{
+ /**
+ * @dataProvider profileProvider
+ *
+ */
+ public function testProfiles($xml, $expected)
+ {
+ $feed = new XML_Feed_Parser($xml, false, false, true);
+
+ $munger = new FeedMunger($feed);
+ $profile = $munger->profile();
+
+ foreach ($expected as $field => $val) {
+ $this->assertEquals($expected[$field], $profile->$field, "profile->$field");
+ }
+ }
+
+ static public function profileProvider()
+ {
+ return array(
+ array(self::samplefeed(),
+ array('nickname' => 'leŭksman', // @todo does this need to be asciified?
+ 'fullname' => 'leŭksman',
+ 'bio' => 'reticula, electronica, & oddities',
+ 'homepage' => 'http://leuksman.com/log')));
+ }
+
+ /**
+ * @dataProvider noticeProvider
+ *
+ */
+ public function testNotices($xml, $entryIndex, $expected)
+ {
+ $feed = new XML_Feed_Parser($xml, false, false, true);
+ $entry = $feed->getEntryByOffset($entryIndex);
+
+ $munger = new FeedMunger($feed);
+ $notice = $munger->noticeFromEntry($entry);
+
+ $this->assertTrue(mb_strlen($notice) <= Notice::maxContent());
+ $this->assertEquals($expected, $notice);
+ }
+
+ static public function noticeProvider()
+ {
+ return array(
+ array('<rss version="2.0"><channel><item><title>A fairly short title</title><link>http://example.com/short/link</link></item></channel></rss>', 0,
+ 'New post: "A fairly short title" http://example.com/short/link'),
+ // Requires URL shortening ...
+ array('<rss version="2.0"><channel><item><title>A fairly short title</title><link>http://example.com/but/a/very/long/link/indeed/this/is/far/too/long/for/mere/humans/to/comprehend/oh/my/gosh</link></item></channel></rss>', 0,
+ 'New post: "A fairly short title" http://ur1.ca/g2o1'),
+ array('<rss version="2.0"><channel><item><title>A fairly long title in this case, which will have to get cut down at some point alongside its very long link. Really who even makes titles this long? It\'s just ridiculous imo...</title><link>http://example.com/but/a/very/long/link/indeed/this/is/far/too/long/for/mere/humans/to/comprehend/oh/my/gosh</link></item></channel></rss>', 0,
+ 'New post: "A fairly long title in this case, which will have to get cut down at some point alongside its very long li…" http://ur1.ca/g2o1'),
+ // Some real sample feeds
+ array(self::samplefeed(), 0,
+ 'New post: "Compiling PHP on Snow Leopard" http://leuksman.com/log/2009/11/12/compiling-php-on-snow-leopard/'),
+ array(self::samplefeedBlogspot(), 0,
+ 'New post: "I love posting" http://briontest.blogspot.com/2009/11/i-love-posting.html'),
+ array(self::samplefeedBlogspot(), 1,
+ 'New post: "Hey dude" http://briontest.blogspot.com/2009/11/hey-dude.html'),
+ );
+ }
+
+ static protected function samplefeed()
+ {
+ $xml = '<' . '?xml version="1.0" encoding="UTF-8"?' . ">\n";
+ $samplefeed = $xml . <<<END
+<rss version="2.0"
+ xmlns:content="http://purl.org/rss/1.0/modules/content/"
+ xmlns:wfw="http://wellformedweb.org/CommentAPI/"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:atom="http://www.w3.org/2005/Atom"
+ xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
+ xmlns:slash="http://purl.org/rss/1.0/modules/slash/"
+ >
+
+<channel>
+ <title>leŭksman</title>
+ <atom:link href="http://leuksman.com/log/feed/" rel="self" type="application/rss+xml" />
+ <link>http://leuksman.com/log</link>
+ <description>reticula, electronica, &#38; oddities</description>
+
+ <lastBuildDate>Thu, 12 Nov 2009 17:44:42 +0000</lastBuildDate>
+ <generator>http://wordpress.org/?v=2.8.6</generator>
+ <language>en</language>
+ <sy:updatePeriod>hourly</sy:updatePeriod>
+ <sy:updateFrequency>1</sy:updateFrequency>
+ <item>
+
+ <title>Compiling PHP on Snow Leopard</title>
+ <link>http://leuksman.com/log/2009/11/12/compiling-php-on-snow-leopard/</link>
+ <comments>http://leuksman.com/log/2009/11/12/compiling-php-on-snow-leopard/#comments</comments>
+ <pubDate>Thu, 12 Nov 2009 17:44:42 +0000</pubDate>
+ <dc:creator>brion</dc:creator>
+ <category><![CDATA[apple]]></category>
+
+ <category><![CDATA[devel]]></category>
+
+ <guid isPermaLink="false">http://leuksman.com/log/?p=649</guid>
+ <description><![CDATA[If you&#8217;ve been having trouble compiling your own PHP installations on Mac OS X 10.6, here&#8217;s the secret to making it not suck! After running the configure script, edit the generated Makefile and make these fixes:
+
+Find the EXTRA_LIBS definition and add -lresolv to the end
+Find the EXE_EXT definition and remove .dSYM
+
+Standard make and make install [...]]]></description>
+ <content:encoded><![CDATA[<p>If you&#8217;ve been having trouble compiling your own PHP installations on Mac OS X 10.6, here&#8217;s the secret to making it not suck! After running the configure script, edit the generated Makefile and make these fixes:</p>
+<ul>
+<li>Find the <strong>EXTRA_LIBS</strong> definition and add <strong>-lresolv</strong> to the end</li>
+<li>Find the <strong>EXE_EXT</strong> definition and remove <strong>.dSYM</strong></li>
+</ul>
+<p>Standard make and make install should work from here&#8230;</p>
+<p>For reference, here&#8217;s the whole configure line I currently use; MySQL is installed from the downloadable installer; other deps from MacPorts:</p>
+<p>&#8216;./configure&#8217; &#8216;&#8211;prefix=/opt/php52&#8242; &#8216;&#8211;with-mysql=/usr/local/mysql&#8217; &#8216;&#8211;with-zlib&#8217; &#8216;&#8211;with-bz2&#8242; &#8216;&#8211;enable-mbstring&#8217; &#8216;&#8211;enable-exif&#8217; &#8216;&#8211;enable-fastcgi&#8217; &#8216;&#8211;with-xmlrpc&#8217; &#8216;&#8211;with-xsl&#8217; &#8216;&#8211;with-readline=/opt/local&#8217; &#8211;without-iconv &#8211;with-gd &#8211;with-png-dir=/opt/local &#8211;with-jpeg-dir=/opt/local &#8211;with-curl &#8211;with-gettext=/opt/local &#8211;with-mysqli=/usr/local/mysql/bin/mysql_config &#8211;with-tidy=/opt/local &#8211;enable-pcntl &#8211;with-openssl</p>
+]]></content:encoded>
+ <wfw:commentRss>http://leuksman.com/log/2009/11/12/compiling-php-on-snow-leopard/feed/</wfw:commentRss>
+ <slash:comments>0</slash:comments>
+ </item>
+</channel>
+</rss>
+END;
+ return $samplefeed;
+ }
+
+ static protected function samplefeedBlogspot()
+ {
+ return <<<END
+<?xml version='1.0' encoding='UTF-8'?><?xml-stylesheet href="http://www.blogger.com/styles/atom.css" type="text/css"?><feed xmlns='http://www.w3.org/2005/Atom' xmlns:openSearch='http://a9.com/-/spec/opensearchrss/1.0/' xmlns:georss='http://www.georss.org/georss'><id>tag:blogger.com,1999:blog-7780083508531697167</id><updated>2009-11-19T12:56:11.233-08:00</updated><title type='text'>Brion's Cool Test Blog</title><subtitle type='html'></subtitle><link rel='http://schemas.google.com/g/2005#feed' type='application/atom+xml' href='http://briontest.blogspot.com/feeds/posts/default'/><link rel='self' type='application/atom+xml' href='http://www.blogger.com/feeds/7780083508531697167/posts/default'/><link rel='alternate' type='text/html' href='http://briontest.blogspot.com/'/><link rel='hub' href='http://pubsubhubbub.appspot.com/'/><author><name>brion</name><uri>http://www.blogger.com/profile/12932299467049762017</uri><email>noreply@blogger.com</email></author><generator version='7.00' uri='http://www.blogger.com'>Blogger</generator><openSearch:totalResults>2</openSearch:totalResults><openSearch:startIndex>1</openSearch:startIndex><openSearch:itemsPerPage>25</openSearch:itemsPerPage><entry><id>tag:blogger.com,1999:blog-7780083508531697167.post-8456671879000290677</id><published>2009-11-19T12:55:00.000-08:00</published><updated>2009-11-19T12:56:11.241-08:00</updated><title type='text'>I love posting</title><content type='html'>It's pretty awesome, if you like that sort of thing.&lt;div class="blogger-post-footer"&gt;&lt;img width='1' height='1' src='https://blogger.googleusercontent.com/tracker/7780083508531697167-8456671879000290677?l=briontest.blogspot.com' alt='' /&gt;&lt;/div&gt;</content><link rel='replies' type='application/atom+xml' href='http://briontest.blogspot.com/feeds/8456671879000290677/comments/default' title='Post Comments'/><link rel='replies' type='text/html' href='http://briontest.blogspot.com/2009/11/i-love-posting.html#comment-form' title='0 Comments'/><link rel='edit' type='application/atom+xml' href='http://www.blogger.com/feeds/7780083508531697167/posts/default/8456671879000290677'/><link rel='self' type='application/atom+xml' href='http://www.blogger.com/feeds/7780083508531697167/posts/default/8456671879000290677'/><link rel='alternate' type='text/html' href='http://briontest.blogspot.com/2009/11/i-love-posting.html' title='I love posting'/><author><name>brion</name><uri>http://www.blogger.com/profile/12932299467049762017</uri><email>noreply@blogger.com</email><gd:extendedProperty xmlns:gd='http://schemas.google.com/g/2005' name='OpenSocialUserId' value='05912464053145602436'/></author><thr:total xmlns:thr='http://purl.org/syndication/thread/1.0'>0</thr:total></entry><entry><id>tag:blogger.com,1999:blog-7780083508531697167.post-8202296917897346633</id><published>2009-11-18T13:52:00.001-08:00</published><updated>2009-11-18T13:52:48.444-08:00</updated><title type='text'>Hey dude</title><content type='html'>testingggggggggg&lt;div class="blogger-post-footer"&gt;&lt;img width='1' height='1' src='https://blogger.googleusercontent.com/tracker/7780083508531697167-8202296917897346633?l=briontest.blogspot.com' alt='' /&gt;&lt;/div&gt;</content><link rel='replies' type='application/atom+xml' href='http://briontest.blogspot.com/feeds/8202296917897346633/comments/default' title='Post Comments'/><link rel='replies' type='text/html' href='http://briontest.blogspot.com/2009/11/hey-dude.html#comment-form' title='0 Comments'/><link rel='edit' type='application/atom+xml' href='http://www.blogger.com/feeds/7780083508531697167/posts/default/8202296917897346633'/><link rel='self' type='application/atom+xml' href='http://www.blogger.com/feeds/7780083508531697167/posts/default/8202296917897346633'/><link rel='alternate' type='text/html' href='http://briontest.blogspot.com/2009/11/hey-dude.html' title='Hey dude'/><author><name>brion</name><uri>http://www.blogger.com/profile/12932299467049762017</uri><email>noreply@blogger.com</email><gd:extendedProperty xmlns:gd='http://schemas.google.com/g/2005' name='OpenSocialUserId' value='05912464053145602436'/></author><thr:total xmlns:thr='http://purl.org/syndication/thread/1.0'>0</thr:total></entry></feed>
+END;
+ }
+}
diff --git a/plugins/Mapstraction/MapstractionPlugin.php b/plugins/Mapstraction/MapstractionPlugin.php
index eabd0d0f0..c0c2c5b8e 100644
--- a/plugins/Mapstraction/MapstractionPlugin.php
+++ b/plugins/Mapstraction/MapstractionPlugin.php
@@ -58,12 +58,12 @@ class MapstractionPlugin extends Plugin
*
* The way to register new actions from a plugin.
*
- * @param Router &$m reference to router
+ * @param Router $m reference to router
*
* @return boolean event handler return
*/
- function onRouterInitialized(&$m)
+ function onRouterInitialized($m)
{
$m->connect(':nickname/all/map',
array('action' => 'allmap'),
@@ -179,7 +179,9 @@ class MapstractionPlugin extends Plugin
}
$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;
@@ -226,8 +228,8 @@ class MapstractionPlugin extends Plugin
$arr = $act->twitterStatusArray($notice, true);
$arr['url'] = $notice->bestUrl();
- $arr['html'] = htmlspecialchars($notice->rendered);
- $arr['source'] = htmlspecialchars($arr['source']);
+ $arr['html'] = $notice->rendered;
+ $arr['source'] = $arr['source'];
if (!empty($notice->reply_to)) {
$reply_to = Notice::staticGet('id', $notice->reply_to);
diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php
index 6dd8a3f5a..e86725d70 100644
--- a/plugins/OpenID/OpenIDPlugin.php
+++ b/plugins/OpenID/OpenIDPlugin.php
@@ -281,8 +281,24 @@ class OpenIDPlugin extends Plugin
function onCheckSchema() {
$schema = Schema::get();
- $schema->ensureDataObject('User_openid');
- $schema->ensureDataObject('User_openid_trustroot');
+ $schema->ensureTable('user_openid',
+ array(new ColumnDef('canonical', 'varchar',
+ '255', false, 'PRI'),
+ new ColumnDef('display', 'varchar',
+ '255', false, 'UNI'),
+ new ColumnDef('user_id', 'integer',
+ null, false, 'MUL'),
+ new ColumnDef('created', 'datetime',
+ null, false),
+ new ColumnDef('modified', 'timestamp')));
+ $schema->ensureTable('user_openid_trustroot',
+ array(new ColumnDef('trustroot', 'varchar',
+ '255', false, 'PRI'),
+ new ColumnDef('user_id', 'integer',
+ null, false, 'PRI'),
+ new ColumnDef('created', 'datetime',
+ null, false),
+ new ColumnDef('modified', 'timestamp')));
return true;
}
diff --git a/plugins/OpenID/User_openid.php b/plugins/OpenID/User_openid.php
index c3624118e..801b49ecc 100644
--- a/plugins/OpenID/User_openid.php
+++ b/plugins/OpenID/User_openid.php
@@ -2,9 +2,9 @@
/**
* Table Definition for user_openid
*/
-require_once INSTALLDIR.'/classes/Plugin_DataObject.php';
+require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
-class User_openid extends Plugin_DataObject
+class User_openid extends Memcached_DataObject
{
###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */
@@ -23,7 +23,28 @@ class User_openid extends Plugin_DataObject
/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE
- static function hasOpenID($user_id)
+ function table()
+ {
+
+ $db = $this->getDatabaseConnection();
+ $dbtype = $db->phptype; // Database type is stored here. Crazy but true.
+
+ return array('canonical' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
+ 'display' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
+ 'user_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
+ 'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL,
+ 'modified' => ($dbtype == 'mysql' || $dbtype == 'mysqli') ?
+ DB_DATAOBJECT_MYSQLTIMESTAMP + DB_DATAOBJECT_NOTNULL :
+ DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME
+ );
+ }
+
+ function keys()
+ {
+ return array('canonical' => 'K', 'display' => 'U');
+ }
+
+ Static function hasOpenID($user_id)
{
$oid = new User_openid();
@@ -33,22 +54,4 @@ class User_openid extends Plugin_DataObject
return ($cnt > 0);
}
-
- /**
- * Get the TableDef object that represents the table backing this class
- * @return TableDef TableDef instance
- */
- function tableDef()
- {
- return new TableDef($this->__table,
- array(new ColumnDef('canonical', 'varchar',
- '255', false, 'PRI'),
- new ColumnDef('display', 'varchar',
- '255', false),
- new ColumnDef('user_id', 'integer',
- null, false, 'MUL'),
- new ColumnDef('created', 'datetime',
- null, false),
- new ColumnDef('modified', 'timestamp')));
- }
}
diff --git a/plugins/OpenID/User_openid_trustroot.php b/plugins/OpenID/User_openid_trustroot.php
index b208dddfd..44288945b 100644
--- a/plugins/OpenID/User_openid_trustroot.php
+++ b/plugins/OpenID/User_openid_trustroot.php
@@ -2,9 +2,9 @@
/**
* Table Definition for user_openid_trustroot
*/
-require_once INSTALLDIR.'/classes/Plugin_DataObject.php';
+require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
-class User_openid_trustroot extends Plugin_DataObject
+class User_openid_trustroot extends Memcached_DataObject
{
###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */
@@ -21,25 +21,29 @@ class User_openid_trustroot extends Plugin_DataObject
/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE
-
+
function &pkeyGet($kv)
{
return Memcached_DataObject::pkeyGet('User_openid_trustroot', $kv);
}
- /**
- * Get the TableDef object that represents the table backing this class
- * @return TableDef TableDef instance
- */
- function tableDef()
+ function table()
+ {
+ $db = $this->getDatabaseConnection();
+ $dbtype = $db->phptype; // Database type is stored here. Crazy but true.
+
+ return array('trustroot' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
+ 'user_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
+ 'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL,
+ 'modified' => ($dbtype == 'mysql' || $dbtype == 'mysqli') ?
+ DB_DATAOBJECT_MYSQLTIMESTAMP + DB_DATAOBJECT_NOTNULL :
+ DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME
+ );
+ }
+
+ function keys()
{
- return new TableDef($this->__table,
- array(new ColumnDef('trustroot', 'varchar',
- '255', false, 'PRI'),
- new ColumnDef('user_id', 'integer',
- null, false, 'PRI'),
- new ColumnDef('created', 'datetime',
- null, false),
- new ColumnDef('modified', 'timestamp')));
+ return array('trustroot' => 'K', 'user_id' => 'K');
}
+
}
diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index c5fb6de03..b737e442a 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -139,8 +139,8 @@ class RealtimePlugin extends Plugin
// Add to the public timeline
- if ($notice->is_local ||
- ($notice->is_local == 0 && !common_config('public', 'localonly'))) {
+ if ($notice->is_local == Notice::LOCAL_PUBLIC ||
+ ($notice->is_local == Notice::REMOTE_OMB && !common_config('public', 'localonly'))) {
$paths[] = array('public');
}
diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php
index 3c6803e49..fd5150638 100644
--- a/plugins/TwitterBridge/twitter.php
+++ b/plugins/TwitterBridge/twitter.php
@@ -178,7 +178,7 @@ function broadcast_oauth($notice, $flink) {
try {
$status = $client->statusesUpdate($statustxt);
- } catch (OAuthClientCurlException $e) {
+ } catch (OAuthClientException $e) {
return process_error($e, $flink);
}
diff --git a/plugins/TwitterBridge/twitterbasicauthclient.php b/plugins/TwitterBridge/twitterbasicauthclient.php
index d1cf45aec..7ee8d7d4c 100644
--- a/plugins/TwitterBridge/twitterbasicauthclient.php
+++ b/plugins/TwitterBridge/twitterbasicauthclient.php
@@ -183,7 +183,8 @@ class TwitterBasicAuthClient
'follow_redirects' => true,
'connect_timeout' => 120,
'timeout' => 120,
- 'ssl_verifypeer' => false,
+ 'ssl_verify_peer' => false,
+ 'ssl_verify_host' => false
));
if ($auth) {
diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php
index 97b999a2f..1f1f19957 100644
--- a/plugins/UserFlag/UserFlagPlugin.php
+++ b/plugins/UserFlag/UserFlagPlugin.php
@@ -48,7 +48,16 @@ class UserFlagPlugin extends Plugin
$schema = Schema::get();
// For storing user-submitted flags on profiles
- $schema->ensureDataObject('User_flag_profile');
+
+ $schema->ensureTable('user_flag_profile',
+ array(new ColumnDef('profile_id', 'integer', null,
+ false, 'PRI'),
+ new ColumnDef('user_id', 'integer', null,
+ false, 'PRI'),
+ new ColumnDef('created', 'datetime', null,
+ false, 'MUL'),
+ new ColumnDef('cleared', 'datetime', null,
+ true, 'MUL')));
return true;
}
diff --git a/plugins/UserFlag/User_flag_profile.php b/plugins/UserFlag/User_flag_profile.php
index 2fb27912d..30bd4ae68 100644
--- a/plugins/UserFlag/User_flag_profile.php
+++ b/plugins/UserFlag/User_flag_profile.php
@@ -21,9 +21,9 @@ if (!defined('STATUSNET')) {
exit(1);
}
-require_once INSTALLDIR.'/classes/Plugin_DataObject.php';
+require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
-class User_flag_profile extends Plugin_DataObject
+class User_flag_profile extends Memcached_DataObject
{
###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */
@@ -65,21 +65,4 @@ class User_flag_profile extends Plugin_DataObject
return !empty($ufp);
}
-
- /**
- * Get the TableDef object that represents the table backing this class
- * @return TableDef TableDef instance
- */
- function tableDef()
- {
- return new TableDef($this->__table,
- array(new ColumnDef('profile_id', 'integer', null,
- false, 'PRI'),
- new ColumnDef('user_id', 'integer', null,
- false, 'PRI'),
- new ColumnDef('created', 'datetime', null,
- false, 'MUL'),
- new ColumnDef('cleared', 'datetime', null,
- true, 'MUL')));
- }
}
diff --git a/scripts/pluginqueuehandler.php b/scripts/pluginqueuehandler.php
index ae807db6a..fa39bdda6 100755
--- a/scripts/pluginqueuehandler.php
+++ b/scripts/pluginqueuehandler.php
@@ -41,6 +41,12 @@ class PluginQueueHandler extends QueueHandler
return 'plugin';
}
+ function start()
+ {
+ $this->log(LOG_INFO, "INITIALIZE");
+ return true;
+ }
+
function handle_notice($notice)
{
Event::handle('HandleQueuedNotice', array(&$notice));
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index e584fae43..f1bc9c8ac 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -952,6 +952,7 @@ clear:left;
float:left;
font-size:0.95em;
margin-left:59px;
+min-width:60%;
max-width:74%;
}
#showstream .notice div.entry-content,